Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[weiden] 17559: implemented CreateSymbolicLink() (not tested/verified yet!)
by weiden＠svn.reactos.com 26 Aug '05

26 Aug '05

implemented CreateSymbolicLink() (not tested/verified yet!) Modified: trunk/reactos/lib/kernel32/file/create.c Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/lib/kernel32/file/create.c --- trunk/reactos/lib/kernel32/file/create.c 2005-08-26 13:06:24 UTC (rev 17558) +++ trunk/reactos/lib/kernel32/file/create.c 2005-08-26 13:47:56 UTC (rev 17559) @@ -359,15 +359,109 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL CreateSymbolicLinkW(IN LPCWSTR lpSymlinkFileName, IN LPCWSTR lpTargetFileName, IN DWORD dwFlags) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + UNICODE_STRING NtSymLink, NtTargetName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hTarget, hSymbolicLink; + NTSTATUS Status; + BOOL Ret = FALSE; + + if(!lpSymlinkFileName || !lpTargetFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!RtlDosPathNameToNtPathName_U((LPWSTR)lpSymlinkFileName, + &NtSymLink, + NULL, + NULL)) + { + /* FIXME - right error code? */ + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + if (!RtlDosPathNameToNtPathName_U((LPWSTR)lpTargetFileName, + &NtTargetName, + NULL, + NULL)) + { + /* FIXME - right error code? */ + SetLastError(ERROR_PATH_NOT_FOUND); + goto Cleanup2; + } + + /* + * Try to open the target + */ + InitializeObjectAttributes(&ObjectAttributes, + &NtTargetName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + if (dwFlags == SYMLINK_FLAG_DIRECTORY) + { + Status = NtOpenDirectoryObject(&hTarget, + SYNCHRONIZE, + &ObjectAttributes); + } + else + { + IO_STATUS_BLOCK IoStatusBlock; + + Status = NtOpenFile(&hTarget, + SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_REPARSE_POINT); + } + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + goto Cleanup; + } + + NtClose(hTarget); + + /* + * Create the symbolic link + */ + InitializeObjectAttributes(&ObjectAttributes, + &NtSymLink, + OBJ_PERMANENT, + NULL, + NULL); + + Status = NtCreateSymbolicLinkObject(&hSymbolicLink, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &NtTargetName); + if (NT_SUCCESS(Status)) + { + NtClose(hSymbolicLink); + Ret = TRUE; + } + else + { + SetLastErrorByStatus(Status); + } + +Cleanup: + RtlFreeUnicodeString(&NtTargetName); +Cleanup2: + RtlFreeUnicodeString(&NtSymLink); + + return Ret; } _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2005-08-26 13:06:24 UTC (rev 17558) +++ trunk/reactos/w32api/include/winbase.h 2005-08-26 13:47:56 UTC (rev 17559) @@ -504,6 +504,9 @@ #define QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX 0x00000004 #define QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE 0x00000008 #define QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS 0x00000010 +#if (_WIN32_WINNT >= 0x0600) +#define SYMLINK_FLAG_DIRECTORY 0x1 +#endif #endif /* (_WIN32_WINNT >= 0x0501) */ #if (_WIN32_WINNT >= 0x0500) #define REPLACEFILE_WRITE_THROUGH 0x00000001

1 0

[hbirr] 17558: Call the correct user mode dispatch function in KiDispatchException. The bug was introduced by r17053.
by hbirr＠svn.reactos.com 26 Aug '05

26 Aug '05

Call the correct user mode dispatch function in KiDispatchException. The bug was introduced by r17053. Modified: trunk/reactos/ntoskrnl/ke/catch.c _____ Modified: trunk/reactos/ntoskrnl/ke/catch.c --- trunk/reactos/ntoskrnl/ke/catch.c 2005-08-26 09:53:00 UTC (rev 17557) +++ trunk/reactos/ntoskrnl/ke/catch.c 2005-08-26 13:06:24 UTC (rev 17558) @@ -161,7 +161,7 @@ DPRINT1("User-mode stack was invalid. Terminating target thread\n"); } /* Set EIP to the User-mode Dispathcer */ - Tf->Eip = (ULONG)KeRaiseUserExceptionDispatcher; + Tf->Eip = (ULONG)KeUserExceptionDispatcher; return; }

1 0

[weiden] 17557: removed obsolete variable in RegOpenUserClassesRoot()
by weiden＠svn.reactos.com 26 Aug '05

26 Aug '05

removed obsolete variable in RegOpenUserClassesRoot() Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-08-26 09:49:19 UTC (rev 17556) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-08-26 09:53:00 UTC (rev 17557) @@ -2308,7 +2308,6 @@ ULONG RequiredLength; UNICODE_STRING UserSidString, UserClassesKeyRoot; OBJECT_ATTRIBUTES ObjectAttributes; - LONG ErrorCode; NTSTATUS Status; /* check parameters */ @@ -2333,8 +2332,7 @@ /* NOTE - as opposed to all other registry functions windows does indeed change the last error code in case the caller supplied a invalid handle for example! */ - ErrorCode = RtlNtStatusToDosError (Status); - return ErrorCode; + return RtlNtStatusToDosError (Status); } TokenUserData = RtlAllocateHeap(ProcessHeap, @@ -2365,8 +2363,7 @@ /* NOTE - as opposed to all other registry functions windows does indeed change the last error code in case the caller supplied a invalid handle for example! */ - ErrorCode = RtlNtStatusToDosError (Status); - return ErrorCode; + return RtlNtStatusToDosError (Status); } /* @@ -3974,7 +3971,7 @@ IN ULONG Reserved, IN LPCSTR pszDirectory OPTIONAL) { - DPRINT1("RegLoadMUIStringW(0x%p, 0x%p, 0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n", + DPRINT1("RegLoadMUIStringA(0x%p, 0x%p, 0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n", hKey, pszValue, pszOutBuf, cbOutBuf, Reserved, pszDirectory); return ERROR_CALL_NOT_IMPLEMENTED; }

1 0

[weiden] 17556: RegLoadMUIStringA/W are not implemented yet...
by weiden＠svn.reactos.com 26 Aug '05

26 Aug '05

RegLoadMUIStringA/W are not implemented yet... Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-08-26 09:48:13 UTC (rev 17555) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-08-26 09:49:19 UTC (rev 17556) @@ -3945,7 +3945,7 @@ /*********************************************************************** * * RegLoadMUIStringW * - * @implemented + * @unimplemented */ LONG STDCALL RegLoadMUIStringW(IN HKEY hKey, @@ -3964,7 +3964,7 @@ /*********************************************************************** * * RegLoadMUIStringA * - * @implemented + * @unimplemented */ LONG STDCALL RegLoadMUIStringA(IN HKEY hKey,

1 0

[weiden] 17555: added stubs for RegLoadMUIStringA/W()
by weiden＠svn.reactos.com 26 Aug '05

26 Aug '05

added stubs for RegLoadMUIStringA/W() Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-08-26 09:40:37 UTC (rev 17554) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-08-26 09:48:13 UTC (rev 17555) @@ -494,6 +494,8 @@ RegGetKeySecurity@16 RegLoadKeyA@12 RegLoadKeyW@12 +RegLoadMUIStringA@24 +RegLoadMUIStringW@24 RegNotifyChangeKeyValue@20 RegOpenCurrentUser@8 RegOpenKeyA@12 _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-08-26 09:40:37 UTC (rev 17554) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-08-26 09:48:13 UTC (rev 17555) @@ -3941,4 +3941,43 @@ return ERROR_SUCCESS; } + +/********************************************************************** ** + * RegLoadMUIStringW + * + * @implemented + */ +LONG STDCALL +RegLoadMUIStringW(IN HKEY hKey, + IN LPCWSTR pszValue OPTIONAL, + OUT LPWSTR pszOutBuf, + IN ULONG cbOutBuf, + IN ULONG Reserved, + IN LPCWSTR pszDirectory OPTIONAL) +{ + DPRINT1("RegLoadMUIStringW(0x%p, 0x%p, 0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n", + hKey, pszValue, pszOutBuf, cbOutBuf, Reserved, pszDirectory); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/********************************************************************** ** + * RegLoadMUIStringA + * + * @implemented + */ +LONG STDCALL +RegLoadMUIStringA(IN HKEY hKey, + IN LPCSTR pszValue OPTIONAL, + OUT LPSTR pszOutBuf, + IN ULONG cbOutBuf, + IN ULONG Reserved, + IN LPCSTR pszDirectory OPTIONAL) +{ + DPRINT1("RegLoadMUIStringW(0x%p, 0x%p, 0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n", + hKey, pszValue, pszOutBuf, cbOutBuf, Reserved, pszDirectory); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + /* EOF */

1 0

[weiden] 17554: implemented RegDisablePredefinedCacheEx()
by weiden＠svn.reactos.com 26 Aug '05

26 Aug '05

implemented RegDisablePredefinedCacheEx() Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-08-25 23:54:39 UTC (rev 17553) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-08-26 09:40:37 UTC (rev 17554) @@ -483,6 +483,7 @@ RegDeleteValueA@8 RegDeleteValueW@8 ;RegDisablePredefinedCache +RegDisablePredefinedCacheEx@0 RegEnumKeyA@16 RegEnumKeyExA@32 RegEnumKeyExW@32 _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-08-25 23:54:39 UTC (rev 17553) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-08-26 09:40:37 UTC (rev 17554) @@ -31,11 +31,16 @@ static RTL_CRITICAL_SECTION HandleTableCS; static HANDLE DefaultHandleTable[MAX_DEFAULT_HANDLES]; static HANDLE ProcessHeap; +static BOOLEAN DefaultHandlesDisabled = FALSE; /* PROTOTYPES ***************************************************************/ static NTSTATUS MapDefaultKey (PHANDLE ParentKey, HKEY Key); static VOID CloseDefaultKeys(VOID); +#define CloseDefaultKey(Handle) \ + if ((ULONG_PTR)Handle & 0x1) { \ + NtClose(Handle); \ + } static NTSTATUS OpenClassesRootKey(PHANDLE KeyHandle); static NTSTATUS OpenLocalMachineKey (PHANDLE KeyHandle); @@ -83,18 +88,19 @@ static NTSTATUS -MapDefaultKey (PHANDLE RealKey, - HKEY Key) +MapDefaultKey (OUT PHANDLE RealKey, + IN HKEY Key) { PHANDLE Handle; ULONG Index; + BOOLEAN DoOpen; NTSTATUS Status = STATUS_SUCCESS; TRACE("MapDefaultKey (Key %x)\n", Key); if (((ULONG)Key & 0xF0000000) != 0x80000000) { - *RealKey = (HANDLE)Key; + *RealKey = (HANDLE)((ULONG_PTR)Key & ~0x1); return STATUS_SUCCESS; } @@ -106,9 +112,20 @@ } RtlEnterCriticalSection (&HandleTableCS); - Handle = &DefaultHandleTable[Index]; - if (*Handle == NULL) + + if (!DefaultHandlesDisabled) { + Handle = &DefaultHandleTable[Index]; + DoOpen = (*Handle == NULL); + } + else + { + Handle = RealKey; + DoOpen = TRUE; + } + + if (DoOpen) + { /* create/open the default handle */ switch (Index) { @@ -144,14 +161,19 @@ default: WARN("MapDefaultHandle() no handle creator\n"); Status = STATUS_INVALID_PARAMETER; + break; } } - RtlLeaveCriticalSection (&HandleTableCS); - if (NT_SUCCESS(Status)) - { - *RealKey = *Handle; - } + if (NT_SUCCESS(Status)) + { + if (!DefaultHandlesDisabled) + *RealKey = *Handle; + else + *(PULONG_PTR)Handle |= 0x1; + } + + RtlLeaveCriticalSection (&HandleTableCS); return Status; } @@ -257,6 +279,21 @@ /*********************************************************************** * + * RegDisablePredefinedCacheEx + * + * @implemented + */ +LONG STDCALL +RegDisablePredefinedCacheEx(VOID) +{ + RtlEnterCriticalSection (&HandleTableCS); + DefaultHandlesDisabled = TRUE; + RtlLeaveCriticalSection (&HandleTableCS); + return ERROR_SUCCESS; +} + + +/********************************************************************** ** * RegCloseKey * * @implemented @@ -307,7 +344,7 @@ IN LPCWSTR lpSubKey OPTIONAL, IN HKEY hKeyDest) { - HANDLE DestKeyHandle, KeyHandle, SubKeyHandle = NULL; + HANDLE DestKeyHandle, KeyHandle, CurKey, SubKeyHandle = NULL; NTSTATUS Status; Status = MapDefaultKey(&KeyHandle, @@ -321,7 +358,7 @@ hKeyDest); if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError(Status); + goto Cleanup2; } if (lpSubKey != NULL) @@ -343,9 +380,13 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError(Status); + goto Cleanup; } + + CurKey = SubKeyHandle; } + else + CurKey = KeyHandle; /* FIXME - copy all keys and values recursively */ Status = STATUS_NOT_IMPLEMENTED; @@ -355,6 +396,11 @@ NtClose(SubKeyHandle); } +Cleanup: + CloseDefaultKey(DestKeyHandle); +Cleanup2: + CloseDefaultKey(KeyHandle); + if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError(Status); @@ -549,7 +595,7 @@ /* get the real parent key */ Status = MapDefaultKey (&ParentKey, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -581,6 +627,8 @@ RtlFreeUnicodeString (&ClassString); } + CloseDefaultKey(ParentKey); + TRACE("Status %x\n", Status); if (!NT_SUCCESS(Status)) { @@ -617,7 +665,7 @@ /* get the real parent key */ Status = MapDefaultKey (&ParentKey, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError(Status); @@ -639,6 +687,9 @@ dwOptions, samDesired, lpdwDisposition); + + CloseDefaultKey(ParentKey); + TRACE("Status %x\n", Status); if (!NT_SUCCESS(Status)) { @@ -709,7 +760,7 @@ NTSTATUS Status; Status = MapDefaultKey (&ParentKey, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -729,11 +780,15 @@ RtlFreeUnicodeString (&SubKeyName); if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError (Status); + goto Cleanup; } Status = NtDeleteKey (TargetKey); NtClose (TargetKey); + +Cleanup: + CloseDefaultKey(ParentKey); + if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError(Status); @@ -759,7 +814,7 @@ NTSTATUS Status; Status = MapDefaultKey (&ParentKey, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -777,11 +832,15 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError (Status); + goto Cleanup; } Status = NtDeleteKey (TargetKey); NtClose (TargetKey); + +Cleanup: + CloseDefaultKey(ParentKey); + if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -802,7 +861,7 @@ IN LPCWSTR lpValueName OPTIONAL) { UNICODE_STRING ValueName; - HANDLE KeyHandle, SubKeyHandle = NULL; + HANDLE KeyHandle, CurKey, SubKeyHandle = NULL; NTSTATUS Status; Status = MapDefaultKey(&KeyHandle, @@ -831,22 +890,27 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError(Status); + goto Cleanup; } - KeyHandle = SubKeyHandle; + CurKey = SubKeyHandle; } + else + CurKey = KeyHandle; RtlInitUnicodeString(&ValueName, (LPWSTR)lpValueName); - Status = NtDeleteValueKey(KeyHandle, + Status = NtDeleteValueKey(CurKey, &ValueName); if (SubKeyHandle != NULL) { NtClose(SubKeyHandle); } + +Cleanup: + CloseDefaultKey(KeyHandle); if (!NT_SUCCESS(Status)) { @@ -915,7 +979,7 @@ RegDeleteTreeW(IN HKEY hKey, IN LPCWSTR lpSubKey OPTIONAL) { - HANDLE KeyHandle, SubKeyHandle = NULL; + HANDLE KeyHandle, CurKey, SubKeyHandle = NULL; NTSTATUS Status; Status = MapDefaultKey(&KeyHandle, @@ -944,11 +1008,13 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError(Status); + goto Cleanup; } - KeyHandle = SubKeyHandle; + CurKey = SubKeyHandle; } + else + CurKey = KeyHandle; /* FIXME - delete all keys recursively */ Status = STATUS_NOT_IMPLEMENTED; @@ -958,6 +1024,9 @@ NtClose(SubKeyHandle); } +Cleanup: + CloseDefaultKey(KeyHandle); + if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError(Status); @@ -1013,7 +1082,7 @@ IN LPCVOID lpData OPTIONAL, IN DWORD cbData) { - HANDLE KeyHandle, SubKeyHandle = NULL; + HANDLE KeyHandle, CurKey, SubKeyHandle = NULL; NTSTATUS Status; LONG Ret; @@ -1043,13 +1112,16 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError(Status); + Ret = RtlNtStatusToDosError(Status); + goto Cleanup; } - KeyHandle = SubKeyHandle; + CurKey = SubKeyHandle; } + else + CurKey = KeyHandle; - Ret = RegSetValueExW(KeyHandle, + Ret = RegSetValueExW(CurKey, lpValueName, 0, dwType, @@ -1060,6 +1132,9 @@ { NtClose(SubKeyHandle); } + +Cleanup: + CloseDefaultKey(KeyHandle); return Ret; } @@ -1078,7 +1153,7 @@ IN LPCVOID lpData OPTIONAL, IN DWORD cbData) { - HANDLE KeyHandle, SubKeyHandle = NULL; + HANDLE KeyHandle, CurKey, SubKeyHandle = NULL; NTSTATUS Status; LONG Ret; @@ -1097,7 +1172,8 @@ if (!RtlCreateUnicodeStringFromAsciiz(&SubKeyName, (LPSTR)lpSubKey)) { - return ERROR_NOT_ENOUGH_MEMORY; + Ret = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; } InitializeObjectAttributes(&ObjectAttributes, @@ -1114,13 +1190,16 @@ if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError(Status); + Ret = RtlNtStatusToDosError(Status); + goto Cleanup; } - KeyHandle = SubKeyHandle; + CurKey = SubKeyHandle; } + else + CurKey = KeyHandle; - Ret = RegSetValueExA(KeyHandle, + Ret = RegSetValueExA(CurKey, lpValueName, 0, dwType, @@ -1131,6 +1210,9 @@ { NtClose(SubKeyHandle); } + +Cleanup: + CloseDefaultKey(KeyHandle); return Ret; } @@ -1150,7 +1232,7 @@ NTSTATUS Status; Status = MapDefaultKey (&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -1161,6 +1243,9 @@ Status = NtDeleteValueKey (KeyHandle, &ValueName); RtlFreeUnicodeString (&ValueName); + + CloseDefaultKey(KeyHandle); + if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -1184,7 +1269,7 @@ HANDLE KeyHandle; Status = MapDefaultKey (&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -1195,6 +1280,9 @@ Status = NtDeleteValueKey (KeyHandle, &ValueName); + + CloseDefaultKey(KeyHandle); + if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -1330,7 +1418,8 @@ KeyInfo = RtlAllocateHeap (ProcessHeap, 0, BufferSize); if (KeyInfo == NULL) { - return ERROR_OUTOFMEMORY; + ErrorCode = ERROR_OUTOFMEMORY; + goto Cleanup; } Status = NtEnumerateKey (KeyHandle, @@ -1416,7 +1505,10 @@ 0, KeyInfo); - return ErrorCode; +Cleanup: + CloseDefaultKey(KeyHandle); + + return ErrorCode; } @@ -1450,7 +1542,7 @@ NTSTATUS Status; Status = MapDefaultKey(&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -1488,7 +1580,8 @@ BufferSize); if (KeyInfo == NULL) { - return ERROR_OUTOFMEMORY; + ErrorCode = ERROR_OUTOFMEMORY; + goto Cleanup; } Status = NtEnumerateKey (KeyHandle, @@ -1560,6 +1653,9 @@ 0, KeyInfo); +Cleanup: + CloseDefaultKey(KeyHandle); + return ErrorCode; } @@ -1607,7 +1703,10 @@ { if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size ))) - return ERROR_NOT_ENOUGH_MEMORY; + { + status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; status = NtEnumerateValueKey( KeyHandle, index, KeyValueFullInformation, buf_ptr, total_size, &total_size ); @@ -1670,6 +1769,7 @@ done: if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); + CloseDefaultKey(KeyHandle); return RtlNtStatusToDosError(status); } @@ -1729,7 +1829,10 @@ { if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size ))) - return ERROR_NOT_ENOUGH_MEMORY; + { + status = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; status = NtEnumerateValueKey( KeyHandle, index, KeyValueFullInformation, buf_ptr, total_size, &total_size ); @@ -1774,6 +1877,7 @@ done: if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); + CloseDefaultKey(KeyHandle); return RtlNtStatusToDosError(status); } @@ -1794,13 +1898,16 @@ } Status = MapDefaultKey (&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); } Status = NtFlushKey (KeyHandle); + + CloseDefaultKey(KeyHandle); + if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -1830,7 +1937,7 @@ } Status = MapDefaultKey(&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { TRACE("MapDefaultKey() failed (Status %lx)\n", Status); @@ -1842,6 +1949,9 @@ pSecurityDescriptor, *lpcbSecurityDescriptor, lpcbSecurityDescriptor); + + CloseDefaultKey(KeyHandle); + if (!NT_SUCCESS(Status)) { WARN("NtQuerySecurityObject() failed (Status %lx)\n", Status); @@ -1898,6 +2008,7 @@ UNICODE_STRING KeyName; HANDLE KeyHandle; NTSTATUS Status; + LONG ErrorCode = ERROR_SUCCESS; if (hKey == HKEY_PERFORMANCE_DATA) { @@ -1905,7 +2016,7 @@ } Status = MapDefaultKey (&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -1916,7 +2027,8 @@ NULL, NULL)) { - return ERROR_BAD_PATHNAME; + ErrorCode = ERROR_BAD_PATHNAME; + goto Cleanup; } InitializeObjectAttributes (&FileObjectAttributes, @@ -1941,10 +2053,14 @@ if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError (Status); + ErrorCode = RtlNtStatusToDosError (Status); + goto Cleanup; } - return ERROR_SUCCESS; +Cleanup: + CloseDefaultKey(KeyHandle); + + return ErrorCode; } @@ -1963,6 +2079,7 @@ IO_STATUS_BLOCK IoStatusBlock; HANDLE KeyHandle; NTSTATUS Status; + LONG ErrorCode = ERROR_SUCCESS; if (hKey == HKEY_PERFORMANCE_DATA) { @@ -1975,7 +2092,7 @@ } Status = MapDefaultKey (&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -1995,10 +2112,12 @@ fAsynchronous); if (!NT_SUCCESS(Status) && Status != STATUS_TIMEOUT) { - return RtlNtStatusToDosError (Status); + ErrorCode = RtlNtStatusToDosError (Status); } - return ERROR_SUCCESS; + CloseDefaultKey(KeyHandle); + + return ErrorCode; } @@ -2090,6 +2209,7 @@ UNICODE_STRING SubKeyString; HANDLE KeyHandle; NTSTATUS Status; + LONG ErrorCode = ERROR_SUCCESS; TRACE("RegOpenKeyExA hKey 0x%x lpSubKey %s ulOptions 0x%x samDesired 0x%x phkResult %p\n", hKey, lpSubKey, ulOptions, samDesired, phkResult); @@ -2111,10 +2231,12 @@ RtlFreeUnicodeString (&SubKeyString); if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError (Status); + ErrorCode = RtlNtStatusToDosError (Status); } + + CloseDefaultKey(KeyHandle); - return ERROR_SUCCESS; + return ErrorCode; } @@ -2134,6 +2256,7 @@ UNICODE_STRING SubKeyString; HANDLE KeyHandle; NTSTATUS Status; + LONG ErrorCode = ERROR_SUCCESS; TRACE("RegOpenKeyExW hKey 0x%x lpSubKey %S ulOptions 0x%x samDesired 0x%x phkResult %p\n", hKey, lpSubKey, ulOptions, samDesired, phkResult); @@ -2159,10 +2282,12 @@ if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError (Status); + ErrorCode = RtlNtStatusToDosError (Status); } + + CloseDefaultKey(KeyHandle); - return ERROR_SUCCESS; + return ErrorCode; } @@ -2430,7 +2555,8 @@ FullInfoSize); if (FullInfo == NULL) { - return ERROR_OUTOFMEMORY; + ErrorCode = ERROR_OUTOFMEMORY; + goto Cleanup; } FullInfo->ClassLength = ClassLength; @@ -2458,7 +2584,8 @@ FullInfo); } - return RtlNtStatusToDosError (Status); + ErrorCode = RtlNtStatusToDosError (Status); + goto Cleanup; } TRACE("SubKeys %d\n", FullInfo->SubKeys); @@ -2515,7 +2642,8 @@ FullInfo); } - return RtlNtStatusToDosError (Status); + ErrorCode = RtlNtStatusToDosError (Status); + goto Cleanup; } } @@ -2545,6 +2673,9 @@ FullInfo); } +Cleanup: + CloseDefaultKey(KeyHandle); + return ErrorCode; } @@ -2711,7 +2842,8 @@ if (lpData != NULL && lpcbData == NULL) { - return ERROR_INVALID_PARAMETER; + ErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; } RtlInitUnicodeString (&ValueName, @@ -2722,7 +2854,8 @@ BufferSize); if (ValueInfo == NULL) { - return ERROR_OUTOFMEMORY; + ErrorCode = ERROR_OUTOFMEMORY; + goto Cleanup; } Status = NtQueryValueKey (KeyHandle, @@ -2790,6 +2923,9 @@ 0, ValueInfo); +Cleanup: + CloseDefaultKey(KeyHandle); + return ErrorCode; } @@ -3013,7 +3149,7 @@ hKey, lpSubKey, lpValue, lpcbValue ? *lpcbValue : 0); Status = MapDefaultKey (&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -3034,7 +3170,8 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError (Status); + ErrorCode = RtlNtStatusToDosError (Status); + goto Cleanup; } CloseRealKey = TRUE; } @@ -3055,6 +3192,9 @@ NtClose (RealKey); } +Cleanup: + CloseDefaultKey(KeyHandle); + return ErrorCode; } @@ -3116,6 +3256,7 @@ HANDLE RealKeyHandle; HANDLE KeyHandle; NTSTATUS Status; + LONG ErrorCode = ERROR_SUCCESS; if (hKey == HKEY_PERFORMANCE_DATA) { @@ -3123,7 +3264,7 @@ } Status = MapDefaultKey (&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -3144,7 +3285,8 @@ &KeyObjectAttributes); if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError (Status); + ErrorCode = RtlNtStatusToDosError (Status); + goto Cleanup; } CloseRealKey = TRUE; } @@ -3164,7 +3306,8 @@ { NtClose (RealKeyHandle); } - return ERROR_INVALID_PARAMETER; + ErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; } InitializeObjectAttributes (&NewObjectAttributes, @@ -3184,7 +3327,8 @@ { NtClose (RealKeyHandle); } - return ERROR_INVALID_PARAMETER; + ErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; } InitializeObjectAttributes (&OldObjectAttributes, @@ -3210,7 +3354,10 @@ return RtlNtStatusToDosError (Status); } - return ERROR_SUCCESS; +Cleanup: + CloseDefaultKey(KeyHandle); + + return ErrorCode; } @@ -3263,7 +3410,7 @@ } Status = MapDefaultKey (&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -3274,7 +3421,8 @@ NULL, NULL)) { - return ERROR_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; + goto Cleanup; } InitializeObjectAttributes (&ObjectAttributes, @@ -3292,13 +3440,17 @@ RtlFreeUnicodeString (&FileName); if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError (Status); + goto Cleanup; } Status = NtRestoreKey (KeyHandle, FileHandle, (ULONG)dwFlags); NtClose (FileHandle); + +Cleanup: + CloseDefaultKey(KeyHandle); + if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -3351,7 +3503,7 @@ NTSTATUS Status; Status = MapDefaultKey (&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -3362,7 +3514,8 @@ NULL, NULL)) { - return ERROR_INVALID_PARAMETER; + Status = STATUS_INVALID_PARAMETER; + goto Cleanup; } if (lpSecurityAttributes != NULL) @@ -3389,12 +3542,16 @@ RtlFreeUnicodeString (&FileName); if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError (Status); + goto Cleanup; } Status = NtSaveKey (KeyHandle, FileHandle); NtClose (FileHandle); + +Cleanup: + CloseDefaultKey(KeyHandle); + if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -3423,7 +3580,7 @@ } Status = MapDefaultKey (&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -3432,6 +3589,9 @@ Status = NtSetSecurityObject (KeyHandle, SecurityInformation, pSecurityDescriptor); + + CloseDefaultKey(KeyHandle); + if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -3547,7 +3707,7 @@ NTSTATUS Status; Status = MapDefaultKey (&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -3579,6 +3739,9 @@ dwType, (PVOID)lpData, (ULONG)cbData); + + CloseDefaultKey(KeyHandle); + if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -3659,7 +3822,7 @@ LONG ErrorCode; Status = MapDefaultKey (&KeyHandle, - hKey); + hKey); if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); @@ -3679,7 +3842,8 @@ &ObjectAttributes); if (!NT_SUCCESS(Status)) { - return RtlNtStatusToDosError (Status); + ErrorCode = RtlNtStatusToDosError (Status); + goto Cleanup; } CloseRealKey = TRUE; [truncated at 1000 lines; 20 more skipped]

1 0

[sedwards] 17553: Why this thing ships with its own GetConsoleWindow function I don't understand. Rename it and make the rest of the code use it. Compiles fine on gcc 3.x and msvc6 and works properly.
by sedwards＠svn.reactos.com 25 Aug '05

25 Aug '05

Why this thing ships with its own GetConsoleWindow function I don't understand. Rename it and make the rest of the code use it. Compiles fine on gcc 3.x and msvc6 and works properly. Modified: trunk/reactos/apps/utils/net/telnet/src/tnclass.cpp Modified: trunk/reactos/apps/utils/net/telnet/src/tnmisc.cpp Modified: trunk/reactos/apps/utils/net/telnet/src/tnmisc.h _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tnclass.cpp --- trunk/reactos/apps/utils/net/telnet/src/tnclass.cpp 2005-08-25 23:20:34 UTC (rev 17552) +++ trunk/reactos/apps/utils/net/telnet/src/tnclass.cpp 2005-08-25 23:54:39 UTC (rev 17553) @@ -78,7 +78,7 @@ telSetConsoleTitle("No Connection"); // Change the icon - hConsoleWindow = GetConsoleWindow(); + hConsoleWindow = TelnetGetConsoleWindow(); iconChange = SetIcon(hConsoleWindow, 0, &oldBIcon, &oldSIcon, ini.get_startdir()); if (WSAStartup(MAKEWORD(1, 1), &WsaData)) { @@ -105,7 +105,7 @@ Console(GetStdHandle(STD_OUTPUT_HANDLE)), TelHandler(Network, Console, Parser), ThreadParams(TelHandler), -Clipboard(GetConsoleWindow(), Network), +Clipboard(TelnetGetConsoleWindow(), Network), Mouse(Clipboard), Scroller(Mouse, ini.get_scroll_size()), Parser(Console, KeyTrans, Scroller, Network, Charmap) { @@ -117,7 +117,7 @@ Console(GetStdHandle(STD_OUTPUT_HANDLE)), TelHandler(Network, Console, Parser), ThreadParams(TelHandler), -Clipboard(GetConsoleWindow(), Network), +Clipboard(TelnetGetConsoleWindow(), Network), Mouse(Clipboard), Scroller(Mouse, ini.get_scroll_size()), Parser(Console, KeyTrans, Scroller, Network, Charmap) { _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tnmisc.cpp --- trunk/reactos/apps/utils/net/telnet/src/tnmisc.cpp 2005-08-25 23:20:34 UTC (rev 17552) +++ trunk/reactos/apps/utils/net/telnet/src/tnmisc.cpp 2005-08-25 23:54:39 UTC (rev 17553) @@ -110,7 +110,7 @@ // Paul Brannan 8/7/98 // This code is from Michael 'Hacker' Krelin (author of KINSole) // (slightly modified) -HWND GetConsoleWindow() { +HWND TelnetGetConsoleWindow() { DWORD pid = GetCurrentProcessId(), wpid; char title[512], *t = title; HWND hrv = NULL; _____ Modified: trunk/reactos/apps/utils/net/telnet/src/tnmisc.h --- trunk/reactos/apps/utils/net/telnet/src/tnmisc.h 2005-08-25 23:20:34 UTC (rev 17552) +++ trunk/reactos/apps/utils/net/telnet/src/tnmisc.h 2005-08-25 23:54:39 UTC (rev 17553) @@ -9,7 +9,7 @@ int GetWin32Version(void); -HWND GetConsoleWindow(); +HWND TelnetGetConsoleWindow(void); bool SetIcon(HWND hConsoleWindow, HANDLE hIcon, LPARAM *pOldBIcon, LPARAM *pOldSIcon, const char *icondir);

1 0

[sedwards] 17552: minor build fixes for msvc
by sedwards＠svn.reactos.com 25 Aug '05

25 Aug '05

minor build fixes for msvc Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/filecomp.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-08-25 22:50:44 UTC (rev 17551) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-08-25 23:20:34 UTC (rev 17552) @@ -54,7 +54,7 @@ int copy (TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH], INT append, DWORD lpdwFlags, BOOL bTouch) { TCHAR szMsg[RC_STRING_MAX_SIZE]; - FILETIME srctime; + FILETIME srctime,NewFileTime; HANDLE hFileSrc; HANDLE hFileDest; LPBYTE buffer; @@ -66,6 +66,7 @@ TCHAR TrueDest[MAX_PATH]; TCHAR TempSrc[MAX_PATH]; TCHAR * FileName; + SYSTEMTIME CurrentTime; #ifdef _DEBUG @@ -84,9 +85,6 @@ return 0; } - FILETIME NewFileTime; - SYSTEMTIME CurrentTime; - GetSystemTime(&CurrentTime); SystemTimeToFileTime(&CurrentTime, &NewFileTime); if(SetFileTime(hFileSrc,(LPFILETIME) NULL, (LPFILETIME) NULL, &NewFileTime)) _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-08-25 22:50:44 UTC (rev 17551) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-08-25 23:20:34 UTC (rev 17552) @@ -1990,7 +1990,6 @@ ConOutPrintf("(L) Lowercase : %i\n", stFlags.bLowerCase ); ConOutPrintf("(N) New : %i\n", stFlags.bNewLongList ); ConOutPrintf("(O) Order : %i\n", stFlags.stOrderBy.sCriteriaCount ); - int i; for (i =0;i<stFlags.stOrderBy.sCriteriaCount;i++) ConOutPrintf(" Order Criteria [%i]: %i (Reversed: %i)\n",i, stFlags.stOrderBy.eCriteria[i], stFlags.stOrderBy.bCriteriaRev[i] ); ConOutPrintf("(P) Pause : %i\n", stFlags.bPause ); _____ Modified: trunk/reactos/subsys/system/cmd/filecomp.c --- trunk/reactos/subsys/system/cmd/filecomp.c 2005-08-25 22:50:44 UTC (rev 17551) +++ trunk/reactos/subsys/system/cmd/filecomp.c 2005-08-25 23:20:34 UTC (rev 17552) @@ -541,7 +541,6 @@ /* Keeps track of what element was last selected */ static INT Sel; BOOL NeededQuote = FALSE; - strOut[0] = _T('\0'); /* Copy the string, str can be edited and orginal should not be */ @@ -677,10 +676,12 @@ /* space in the name */ if(_tcschr(FileList[Sel].Name, _T(' '))) { + INT LastSpace; + BOOL bInside; /* It needs a " at the end */ NeededQuote = TRUE; - INT LastSpace = -1; - BOOL bInside = FALSE; + LastSpace = -1; + bInside = FALSE; /* Find the place to put the " at the start */ for(i = 0; i < _tcslen(szPrefix); i++) {

1 0

[sedwards] 17551: fix msvc compile
by sedwards＠svn.reactos.com 25 Aug '05

25 Aug '05

fix msvc compile Modified: trunk/reactos/apps/utils/net/arp/arp.c _____ Modified: trunk/reactos/apps/utils/net/arp/arp.c --- trunk/reactos/apps/utils/net/arp/arp.c 2005-08-25 22:49:26 UTC (rev 17550) +++ trunk/reactos/apps/utils/net/arp/arp.c 2005-08-25 22:50:44 UTC (rev 17551) @@ -8,8 +8,8 @@ * GM 27/06/05 Created * */ - - + +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <stdio.h> #include <stdlib.h> @@ -18,11 +18,8 @@ #include <ctype.h> #include <winsock2.h> #include <iphlpapi.h> + -#define WIN32_LEAN_AND_MEAN -#define UNICODE -#define _UNICODE - /* * Globals */

1 0

[sedwards] 17550: disable the custom rules for Winebuild for now
by sedwards＠svn.reactos.com 25 Aug '05

25 Aug '05

disable the custom rules for Winebuild for now Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-08-25 22:43:20 UTC (rev 17549) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-08-25 22:49:26 UTC (rev 17550) @@ -534,7 +534,7 @@ fprintf ( OUT, "!ENDIF \r\n" ); fprintf ( OUT, "\r\n" ); } - +#if 0 if ( module.name == "winebuild" ) { fprintf ( OUT, "# Begin Special Build Tool\r\n" ); @@ -547,6 +547,7 @@ output_dir.c_str() ); fprintf ( OUT, "# End Special Build Tool\r\n" ); } +#endif fprintf ( OUT, "# Begin Target\r\n" ); fprintf ( OUT, "\r\n" ); for ( i = 0; i < cfgs.size(); i++ ) @@ -566,7 +567,7 @@ { source_file = string(".\\") + source_file; } - +#if 0 if ( !strcmp ( &source_file[source_file.size()-5], ".spec" ) ) { string basename = string ( source_file.c_str(), source_file.size() - 5 ); @@ -580,7 +581,7 @@ fprintf ( OUT, "SOURCE=%s\r\n", dbg_c_file.c_str() ); fprintf ( OUT, "# End Source File\r\n" ); } - +#endif fprintf ( OUT, "# Begin Source File\r\n" ); fprintf ( OUT, "\r\n" ); @@ -588,6 +589,7 @@ if ( !strcmp ( &source_file[source_file.size()-5], ".spec" ) ) { +#if 0 string basename = string ( source_file.c_str(), source_file.size() - 5 ); string spec_file = source_file; @@ -661,6 +663,7 @@ fprintf ( OUT, "\"%s\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\r\n", dbg_c_file.c_str() ); fprintf ( OUT, " $(BuildCmds)\r\n" ); fprintf ( OUT, "# End Custom Build\r\n" ); +#endif } /*else if ( source_file =~ /([^\\]*?\.h)$/ ) { @@ -707,7 +710,6 @@ fprintf ( OUT, "# End Source File\r\n" ); } fprintf ( OUT, "# End Group\r\n" ); - fprintf ( OUT, "# Begin Group \"Header Files\"\r\n" ); fprintf ( OUT, "\r\n" ); fprintf ( OUT, "# PROP Default_Filter \"h;hpp;hxx;hm;inl\"\r\n" );

1 0

← Newer
1
2
3
4
5
6
7
8
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005