Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 64443: [ADVAPI32] - Implement RegQueryValueEx for HKCR subkeys CORE-8582
by jgardou＠svn.reactos.org 01 Oct '14

01 Oct '14

Author: jgardou Date: Wed Oct 1 17:48:26 2014 New Revision: 64443 URL: http://svn.reactos.org/svn/reactos?rev=64443&view=rev Log: [ADVAPI32] - Implement RegQueryValueEx for HKCR subkeys CORE-8582 Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/dll/win32/advapi32/reg/reg.h Modified: trunk/reactos/dll/win32/advapi32/reg/hkcr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/hkc… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/hkcr.c [iso-8859-1] Wed Oct 1 17:48:26 2014 @@ -268,6 +268,7 @@ return ErrorCode; } +/* HKCR version of RegDeleteKeyExW */ LONG WINAPI DeleteHKCRKey( @@ -329,3 +330,68 @@ return ErrorCode; } + +/* HKCR version of RegQueryValueExW */ +LONG +WINAPI +QueryHKCRValue( + _In_ HKEY hKey, + _In_ LPCWSTR Name, + _In_ LPDWORD Reserved, + _In_ LPDWORD Type, + _In_ LPBYTE Data, + _In_ LPDWORD Count) +{ + HKEY QueriedKey; + LONG ErrorCode; + + ASSERT(IsHKCRKey(hKey)); + + /* Remove the HKCR flag while we're working */ + hKey = (HKEY)(((ULONG_PTR)hKey) & ~0x2); + + ErrorCode = GetPreferredHKCRKey(hKey, &QueriedKey); + + if (ErrorCode == ERROR_FILE_NOT_FOUND) + { + /* The key doesn't exist on HKCU side, no chance for a value in it */ + return RegQueryValueExW(hKey, Name, Reserved, Type, Data, Count); + } + + if (ErrorCode != ERROR_SUCCESS) + { + /* Somehow we failed for another reason (maybe deleted key or whatever) */ + return ErrorCode; + } + + ErrorCode = RegQueryValueExW(QueriedKey, Name, Reserved, Type, Data, Count); + + /* Close it if we must */ + if (QueriedKey != hKey) + { + /* The original key is on the machine view */ + RegCloseKey(QueriedKey); + } + + /* Anything else than ERROR_FILE_NOT_FOUND means that we found it, even if it is with failures. */ + if (ErrorCode != ERROR_FILE_NOT_FOUND) + return ErrorCode; + + /* If we're here, we must open from HKLM key. */ + ErrorCode = GetFallbackHKCRKey(hKey, &QueriedKey); + if (ErrorCode != ERROR_SUCCESS) + { + /* Maybe the key doesn't exist in the HKLM view */ + return ErrorCode; + } + + ErrorCode = RegQueryValueExW(QueriedKey, Name, Reserved, Type, Data, Count); + + /* Close it if we must */ + if (QueriedKey != hKey) + { + RegCloseKey(QueriedKey); + } + + return ErrorCode; +} Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Wed Oct 1 17:48:26 2014 @@ -4082,12 +4082,13 @@ */ LONG WINAPI -RegQueryValueExW(HKEY hkeyorg, - LPCWSTR name, - LPDWORD reserved, - LPDWORD type, - LPBYTE data, - LPDWORD count) +RegQueryValueExW( + _In_ HKEY hkeyorg, + _In_ LPCWSTR name, + _In_ LPDWORD reserved, + _In_ LPDWORD type, + _In_ LPBYTE data, + _In_ LPDWORD count) { HANDLE hkey; NTSTATUS status; @@ -4107,6 +4108,13 @@ if (!NT_SUCCESS(status)) { return RtlNtStatusToDosError(status); + } + + if (IsHKCRKey(hkey)) + { + LONG ErrorCode = QueryHKCRValue(hkey, name, reserved, type, data, count); + ClosePredefKey(hkey); + return ErrorCode; } RtlInitUnicodeString( &name_str, name ); Modified: trunk/reactos/dll/win32/advapi32/reg/reg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.h [iso-8859-1] Wed Oct 1 17:48:26 2014 @@ -39,3 +39,13 @@ _In_ REGSAM RegSam, _In_ DWORD Reserved); +LONG +WINAPI +QueryHKCRValue( + _In_ HKEY hKey, + _In_ LPCWSTR Name, + _In_ LPDWORD Reserved, + _In_ LPDWORD Type, + _In_ LPBYTE Data, + _In_ LPDWORD Count); +

1 0

[jgardou] 64442: [ADVAPI32] - Correctly use RtlCreateUnicodeStringFromAsciiz and check for its return value in various places. It allocates a buffer and initializes is it as empty even if the passe...
by jgardou＠svn.reactos.org 01 Oct '14

01 Oct '14

Author: jgardou Date: Wed Oct 1 17:48:17 2014 New Revision: 64442 URL: http://svn.reactos.org/svn/reactos?rev=64442&view=rev Log: [ADVAPI32] - Correctly use RtlCreateUnicodeStringFromAsciiz and check for its return value in various places. It allocates a buffer and initializes is it as empty even if the passed ASCII buffer is NULL. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Wed Oct 1 17:48:17 2014 @@ -1039,8 +1039,26 @@ UNICODE_STRING ClassString; DWORD ErrorCode; - RtlCreateUnicodeStringFromAsciiz(&ClassString, lpClass); - RtlCreateUnicodeStringFromAsciiz(&SubKeyString, (LPSTR)lpSubKey); + RtlInitEmptyUnicodeString(&ClassString, NULL, 0); + RtlInitEmptyUnicodeString(&SubKeyString, NULL, 0); + + if (lpClass) + { + if (!RtlCreateUnicodeStringFromAsciiz(&ClassString, lpClass)) + { + ErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Exit; + } + } + + if (lpSubKey) + { + if (!RtlCreateUnicodeStringFromAsciiz(&SubKeyString, lpSubKey)) + { + ErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Exit; + } + } ErrorCode = RegCreateKeyExW( hKey, @@ -1053,6 +1071,7 @@ phkResult, lpdwDisposition); +Exit: RtlFreeUnicodeString(&SubKeyString); RtlFreeUnicodeString(&ClassString); @@ -1222,7 +1241,13 @@ LONG ErrorCode; UNICODE_STRING SubKeyName; - RtlCreateUnicodeStringFromAsciiz(&SubKeyName, (LPSTR)lpSubKey); + if (lpSubKey) + { + if (!RtlCreateUnicodeStringFromAsciiz(&SubKeyName, lpSubKey)) + return ERROR_NOT_ENOUGH_MEMORY; + } + else + RtlInitEmptyUnicodeString(&SubKeyName, NULL, 0); ErrorCode = RegDeleteKeyExW(hKey, SubKeyName.Buffer, samDesired, Reserved); @@ -3048,15 +3073,32 @@ UNICODE_STRING KeyName; LONG ErrorCode; - RtlCreateUnicodeStringFromAsciiz(&KeyName, - (LPSTR)lpSubKey); - RtlCreateUnicodeStringFromAsciiz(&FileName, - (LPSTR)lpFile); + RtlInitEmptyUnicodeString(&KeyName, NULL, 0); + RtlInitEmptyUnicodeString(&FileName, NULL, 0); + + if (lpSubKey) + { + if (!RtlCreateUnicodeStringFromAsciiz(&KeyName, lpSubKey)) + { + ErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Exit; + } + } + + if (lpFile) + { + if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFile)) + { + ErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Exit; + } + } ErrorCode = RegLoadKeyW(hKey, KeyName.Buffer, FileName.Buffer); +Exit: RtlFreeUnicodeString(&FileName); RtlFreeUnicodeString(&KeyName); @@ -3313,8 +3355,13 @@ TRACE("RegOpenKeyExA hKey 0x%x lpSubKey %s ulOptions 0x%x samDesired 0x%x phkResult %p\n", hKey, lpSubKey, ulOptions, samDesired, phkResult); - RtlCreateUnicodeStringFromAsciiz(&SubKeyString, - (LPSTR)lpSubKey); + if (lpSubKey) + { + if (!RtlCreateUnicodeStringFromAsciiz(&SubKeyString, lpSubKey)) + return ERROR_NOT_ENOUGH_MEMORY; + } + else + RtlInitEmptyUnicodeString(&SubKeyString, NULL, 0); ErrorCode = RegOpenKeyExW(hKey, SubKeyString.Buffer, ulOptions, samDesired, phkResult); @@ -3963,7 +4010,10 @@ return ERROR_INVALID_PARAMETER; if (name) - RtlCreateUnicodeStringFromAsciiz(&nameW, name); + { + if (!RtlCreateUnicodeStringFromAsciiz(&nameW, name)) + return ERROR_NOT_ENOUGH_MEMORY; + } else RtlInitEmptyUnicodeString(&nameW, NULL, 0); @@ -4205,18 +4255,43 @@ UNICODE_STRING OldFile; LONG ErrorCode; - RtlCreateUnicodeStringFromAsciiz(&SubKey, - (PCSZ)lpSubKey); - RtlCreateUnicodeStringFromAsciiz(&OldFile, - (PCSZ)lpOldFile); - RtlCreateUnicodeStringFromAsciiz(&NewFile, - (PCSZ)lpNewFile); + RtlInitEmptyUnicodeString(&SubKey, NULL, 0); + RtlInitEmptyUnicodeString(&OldFile, NULL, 0); + RtlInitEmptyUnicodeString(&NewFile, NULL, 0); + + if (lpSubKey) + { + if (!RtlCreateUnicodeStringFromAsciiz(&SubKey, lpSubKey)) + { + ErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Exit; + } + } + + if (lpOldFile) + { + if (!RtlCreateUnicodeStringFromAsciiz(&OldFile, lpOldFile)) + { + ErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Exit; + } + } + + if (lpNewFile) + { + if (!RtlCreateUnicodeStringFromAsciiz(&NewFile, lpNewFile)) + { + ErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Exit; + } + } ErrorCode = RegReplaceKeyW(hKey, SubKey.Buffer, NewFile.Buffer, OldFile.Buffer); +Exit: RtlFreeUnicodeString(&OldFile); RtlFreeUnicodeString(&NewFile); RtlFreeUnicodeString(&SubKey); @@ -4373,8 +4448,13 @@ UNICODE_STRING FileName; LONG ErrorCode; - RtlCreateUnicodeStringFromAsciiz(&FileName, - (PCSZ)lpFile); + if (lpFile) + { + if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFile)) + return ERROR_NOT_ENOUGH_MEMORY; + } + else + RtlInitEmptyUnicodeString(&FileName, NULL, 0); ErrorCode = RegRestoreKeyW(hKey, FileName.Buffer, @@ -4474,8 +4554,14 @@ UNICODE_STRING FileName; LONG ErrorCode; - RtlCreateUnicodeStringFromAsciiz(&FileName, - (LPSTR)lpFile); + if (lpFile) + { + if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFile)) + return ERROR_NOT_ENOUGH_MEMORY; + } + else + RtlInitEmptyUnicodeString(&FileName, NULL, 0); + ErrorCode = RegSaveKeyW(hKey, FileName.Buffer, lpSecurityAttributes); @@ -4579,8 +4665,14 @@ UNICODE_STRING FileName; LONG ErrorCode; - RtlCreateUnicodeStringFromAsciiz(&FileName, - (LPSTR)lpFile); + if (lpFile) + { + if (!RtlCreateUnicodeStringFromAsciiz(&FileName, lpFile)) + return ERROR_NOT_ENOUGH_MEMORY; + } + else + RtlInitEmptyUnicodeString(&FileName, NULL, 0); + ErrorCode = RegSaveKeyExW(hKey, FileName.Buffer, lpSecurityAttributes, @@ -4917,8 +5009,13 @@ UNICODE_STRING KeyName; DWORD ErrorCode; - RtlCreateUnicodeStringFromAsciiz(&KeyName, - (LPSTR)lpSubKey); + if (lpSubKey) + { + if (!RtlCreateUnicodeStringFromAsciiz(&KeyName, lpSubKey)) + return ERROR_NOT_ENOUGH_MEMORY; + } + else + RtlInitEmptyUnicodeString(&KeyName, NULL, 0); ErrorCode = RegUnLoadKeyW(hKey, KeyName.Buffer);

1 0

[jgardou] 64441: [ADVAPI32] - Rewrite RegQueryValueExA as a wrapper arount RegQueryValueExW CORE-8582
by jgardou＠svn.reactos.org 01 Oct '14

01 Oct '14

Author: jgardou Date: Wed Oct 1 17:48:04 2014 New Revision: 64441 URL: http://svn.reactos.org/svn/reactos?rev=64441&view=rev Log: [ADVAPI32] - Rewrite RegQueryValueExA as a wrapper arount RegQueryValueExW CORE-8582 Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Wed Oct 1 17:48:04 2014 @@ -3942,102 +3942,86 @@ */ LONG WINAPI -RegQueryValueExA(HKEY hkeyorg, - LPCSTR name, - LPDWORD reserved, - LPDWORD type, - LPBYTE data, - LPDWORD count) -{ - HANDLE hkey; - NTSTATUS status; - ANSI_STRING nameA; +RegQueryValueExA( + _In_ HKEY hkeyorg, + _In_ LPCSTR name, + _In_ LPDWORD reserved, + _Out_opt_ LPDWORD type, + _Out_opt_ LPBYTE data, + _Inout_opt_ LPDWORD count) +{ UNICODE_STRING nameW; - DWORD total_size, datalen = 0; - char buffer[256], *buf_ptr = buffer; - KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; - static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); - - TRACE("(%p,%s,%p,%p,%p,%p=%d)\n", - hkeyorg, debugstr_a(name), reserved, type, data, count, count ? *count : 0 ); - - if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; - status = MapDefaultKey(&hkey, hkeyorg); - if (!NT_SUCCESS(status)) - { - return RtlNtStatusToDosError(status); - } - - if (count) datalen = *count; - if (!data && count) *count = 0; - - RtlInitAnsiString( &nameA, name ); - if ((status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE ))) - { - ClosePredefKey(hkey); - return RtlNtStatusToDosError(status); - } - - status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, - buffer, sizeof(buffer), &total_size ); - if (status && status != STATUS_BUFFER_OVERFLOW) goto done; - - /* we need to fetch the contents for a string type even if not requested, - * because we need to compute the length of the ASCII string. */ - if (data || is_string(info->Type)) - { - /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) - { - if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); - if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size ))) - { - status = STATUS_NO_MEMORY; - goto done; - } - info = (KEY_VALUE_PARTIAL_INFORMATION *)buf_ptr; - status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, - buf_ptr, total_size, &total_size ); - } - - if (status) goto done; - - if (is_string(info->Type)) - { - DWORD len; - - RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info_size), - total_size - info_size ); - if (data && len) - { - if (len > datalen) status = STATUS_BUFFER_OVERFLOW; - else - { - RtlUnicodeToMultiByteN( (char*)data, len, NULL, (WCHAR *)(buf_ptr + info_size), - total_size - info_size ); - /* if the type is REG_SZ and data is not 0-terminated - * and there is enough space in the buffer NT appends a \0 */ - if (len < datalen && data[len-1]) data[len] = 0; - } - } - total_size = len + info_size; - } - else if (data) - { - if (total_size - info_size > datalen) status = STATUS_BUFFER_OVERFLOW; - else memcpy( data, buf_ptr + info_size, total_size - info_size ); - } - } - else status = STATUS_SUCCESS; - - if (type) *type = info->Type; - if (count) *count = total_size - info_size; - - done: - if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); - RtlFreeUnicodeString( &nameW ); - ClosePredefKey(hkey); - return RtlNtStatusToDosError(status); + DWORD DataLength; + DWORD ErrorCode; + DWORD BufferSize = 0; + WCHAR* Buffer; + CHAR* DataStr = (CHAR*)data; + DWORD LocalType; + + /* Validate those parameters, the rest will be done with the first RegQueryValueExW call */ + if ((data && !count) || reserved) + return ERROR_INVALID_PARAMETER; + + if (name) + RtlCreateUnicodeStringFromAsciiz(&nameW, name); + else + RtlInitEmptyUnicodeString(&nameW, NULL, 0); + + ErrorCode = RegQueryValueExW(hkeyorg, nameW.Buffer, NULL, &LocalType, NULL, &BufferSize); + if (ErrorCode != ERROR_SUCCESS) + { + if (!data) + *count = 0; + RtlFreeUnicodeString(&nameW); + return ErrorCode; + } + + /* See if we can directly handle the call without caring for conversion */ + if (!is_string(LocalType) || !count) + { + ErrorCode = RegQueryValueExW(hkeyorg, nameW.Buffer, reserved, type, data, count); + RtlFreeUnicodeString(&nameW); + return ErrorCode; + } + + /* Allocate a unicode string to get the data */ + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferSize); + if (!Buffer) + { + RtlFreeUnicodeString(&nameW); + return ERROR_NOT_ENOUGH_MEMORY; + } + + ErrorCode = RegQueryValueExW(hkeyorg, nameW.Buffer, reserved, type, (LPBYTE)Buffer, &BufferSize); + if (ErrorCode != ERROR_SUCCESS) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + RtlFreeUnicodeString(&nameW); + return ErrorCode; + } + + /* We don't need this anymore */ + RtlFreeUnicodeString(&nameW); + + DataLength = *count; + RtlUnicodeToMultiByteSize(count, Buffer, BufferSize); + + if ((!data) || (DataLength < *count)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + return data ? ERROR_MORE_DATA : ERROR_SUCCESS; + } + + /* We can finally do the conversion */ + RtlUnicodeToMultiByteN(DataStr, DataLength, NULL, Buffer, BufferSize); + + /* NULL-terminate if there is enough room */ + if ((DataLength > *count) && (DataStr[*count - 1] != '\0')) + DataStr[*count] = '\0'; + + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + + return ERROR_SUCCESS; }

1 0

[jgardou] 64440: [ADVAPI32_APITEST] - Add a few more tests for corner cases of RegCreateKeyEx API with HKCR subkeys CORE-8582
by jgardou＠svn.reactos.org 01 Oct '14

01 Oct '14

Author: jgardou Date: Wed Oct 1 17:28:45 2014 New Revision: 64440 URL: http://svn.reactos.org/svn/reactos?rev=64440&view=rev Log: [ADVAPI32_APITEST] - Add a few more tests for corner cases of RegCreateKeyEx API with HKCR subkeys CORE-8582 Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/HKEY_CL… ============================================================================== --- trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] Wed Oct 1 17:28:45 2014 @@ -112,6 +112,7 @@ HKEY UserKey, UserSubKey; HKEY ClassesRootKey, ClassesRootSubKey; DWORD ErrorCode; + DWORD Disposition; /* First create a subkey in HKLM */ ErrorCode = RegCreateKeyExW( @@ -309,6 +310,24 @@ /* Verify it has opened the HKCU one */ ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKLM_HKCU"); + /* Try the same thing, but this time with RegCreateKeyEx API */ + RegCloseKey(ClassesRootKey); + ErrorCode = RegCreateKeyExW( + HKEY_CLASSES_ROOT, + L"Apitest_HKLM_HKCU", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &ClassesRootKey, + &Disposition); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootKey), "\n"); + /* Verify it has opened the HKCU one */ + ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKLM_HKCU"); + ok_hex(Disposition, REG_OPENED_EXISTING_KEY); + /* Deleting it from HKCR first deletes the one in HKCU */ ErrorCode = RegDeleteKeyW(HKEY_CLASSES_ROOT, L"Apitest_HKLM_HKCU"); ok_dec(ErrorCode, ERROR_SUCCESS); @@ -374,6 +393,24 @@ ok_dec(ErrorCode, ERROR_SUCCESS); ok(IS_HKCR(ClassesRootSubKey), "\n"); ok_key_name(ClassesRootSubKey, &HKCU_ClassesPath, L"Apitest_HKLM\\HKCU_Subkey"); + + /* Try the same thing, but this time with RegCreateKeyEx API */ + RegCloseKey(ClassesRootSubKey); + ErrorCode = RegCreateKeyExW( + ClassesRootKey, + L"HKCU_Subkey", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &ClassesRootSubKey, + &Disposition); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootSubKey), "\n"); + /* Verify it has opened the HKCU one */ + ok_key_name(ClassesRootSubKey, &HKCU_ClassesPath, L"Apitest_HKLM\\HKCU_Subkey"); + ok_hex(Disposition, REG_OPENED_EXISTING_KEY); /* This one now exists */ ErrorCode = RegOpenKeyExW( @@ -488,31 +525,49 @@ ok_dec(ErrorCode, ERROR_SUCCESS); ok(!IS_HKCR(MachineKey), "\n"); - /* Delete */ + /* Delete this subkey */ ErrorCode = RegDeleteKeyW(MachineKey, L"HKLM_Subkey"); ok_dec(ErrorCode, ERROR_SUCCESS); ok_key_deleted(MachineSubKey); ok_key_deleted(ClassesRootSubKey); - /* Rery creating a subkey with this HKCR handle (which points to HKCU). - * It should now be created in the HKLM view. */ + /* Create another subkey, this time from HKCU */ + ErrorCode = RegCreateKeyExW( + HKEY_CURRENT_USER, + L"Software\\Classes\\Apitest_HKCU\\HKCU_Subkey", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &UserSubKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(!IS_HKCR(UserSubKey), "\n"); + + /* And try creating it again as a subkey of this HKCR handle (which points to HKCU). */ ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKCU"); ErrorCode = RegCreateKeyExW( ClassesRootKey, - L"HKCR_Subkey", + L"HKCU_Subkey", 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &ClassesRootSubKey, - NULL); + &Disposition); ok_dec(ErrorCode, ERROR_SUCCESS); ok(IS_HKCR(ClassesRootSubKey), "\n"); - ok_key_name(ClassesRootSubKey, &HKLM_ClassesPath, L"Apitest_HKCU\\HKCR_Subkey"); - RegDeleteKeyW(MachineKey, L"HKCR_Subkey"); + /* This time the one in HKCU is opened */ + ok_key_name(ClassesRootSubKey, &HKCU_ClassesPath, L"Apitest_HKCU\\HKCU_Subkey"); + ok_hex(Disposition, REG_OPENED_EXISTING_KEY); + /* Let's see if we can delete it */ + RegDeleteKeyW(ClassesRootKey, L"HKCU_Subkey"); ok_key_deleted(ClassesRootSubKey); RegCloseKey(ClassesRootSubKey); + ok_key_deleted(UserSubKey); + RegCloseKey(UserSubKey); RegCloseKey(MachineSubKey); RegCloseKey(ClassesRootSubKey);

1 0

[jgardou] 64439: [ADVAPI32_APITEST] - Add more tests for HKCR subkeys creation. CORE-8582
by jgardou＠svn.reactos.org 01 Oct '14

01 Oct '14

Author: jgardou Date: Wed Oct 1 15:59:54 2014 New Revision: 64439 URL: http://svn.reactos.org/svn/reactos?rev=64439&view=rev Log: [ADVAPI32_APITEST] - Add more tests for HKCR subkeys creation. CORE-8582 Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/HKEY_CL… ============================================================================== --- trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] Wed Oct 1 15:59:54 2014 @@ -432,6 +432,26 @@ ok(IS_HKCR(ClassesRootKey), "\n"); ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKCU"); + /* Try creating a subkey with this HKCR handle, which points to a subkey in HKCU. */ + ErrorCode = RegCreateKeyExW( + ClassesRootKey, + L"HKCR_Subkey", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &ClassesRootSubKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootSubKey), "\n"); + /* It is in fact created in HKLM */ + ok_key_name(ClassesRootSubKey, &HKLM_ClassesPath, L"Apitest_HKCU\\HKCR_Subkey"); + /* Let's see if we can delete it */ + RegDeleteKeyW(ClassesRootKey, L"HKCR_Subkey"); + ok_key_deleted(ClassesRootSubKey); + RegCloseKey(ClassesRootSubKey); + /* Create a corresponding subkey in HKLM */ ErrorCode = RegCreateKeyExW( HKEY_LOCAL_MACHINE, @@ -446,7 +466,8 @@ ok_dec(ErrorCode, ERROR_SUCCESS); ok(!IS_HKCR(MachineSubKey), "\n"); - /* Open it as an HKCR subkey */ + /* Open it from the HKCR handle (which is still pointing to HKCU) */ + ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKCU"); ErrorCode = RegOpenKeyExW( ClassesRootKey, L"HKLM_Subkey", @@ -472,6 +493,27 @@ ok_dec(ErrorCode, ERROR_SUCCESS); ok_key_deleted(MachineSubKey); ok_key_deleted(ClassesRootSubKey); + + /* Rery creating a subkey with this HKCR handle (which points to HKCU). + * It should now be created in the HKLM view. */ + ok_key_name(ClassesRootKey, &HKCU_ClassesPath, L"Apitest_HKCU"); + ErrorCode = RegCreateKeyExW( + ClassesRootKey, + L"HKCR_Subkey", + 0, + NULL, + 0, + MAXIMUM_ALLOWED, + NULL, + &ClassesRootSubKey, + NULL); + ok_dec(ErrorCode, ERROR_SUCCESS); + ok(IS_HKCR(ClassesRootSubKey), "\n"); + ok_key_name(ClassesRootSubKey, &HKLM_ClassesPath, L"Apitest_HKCU\\HKCR_Subkey"); + RegDeleteKeyW(MachineKey, L"HKCR_Subkey"); + ok_key_deleted(ClassesRootSubKey); + RegCloseKey(ClassesRootSubKey); + RegCloseKey(MachineSubKey); RegCloseKey(ClassesRootSubKey);

1 0

[tfaber] 64438: [WINE:TEST.H] - Correctly count broken and win_skip (depending on USE_WINE_TODOS) when WINETEST_PLATFORM=reactos
by tfaber＠svn.reactos.org 01 Oct '14

01 Oct '14

Author: tfaber Date: Wed Oct 1 14:16:18 2014 New Revision: 64438 URL: http://svn.reactos.org/svn/reactos?rev=64438&view=rev Log: [WINE:TEST.H] - Correctly count broken and win_skip (depending on USE_WINE_TODOS) when WINETEST_PLATFORM=reactos Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Wed Oct 1 14:16:18 2014 @@ -306,7 +306,11 @@ int broken( int condition ) { - return (strcmp(winetest_platform, "windows") == 0) && condition; + return ((strcmp(winetest_platform, "windows") == 0) +#ifndef USE_WINE_TODOS + || (strcmp(winetest_platform, "reactos") == 0) +#endif + ) && condition; } /* @@ -411,7 +415,11 @@ { __winetest_va_list valist; __winetest_va_start(valist, msg); - if ((strcmp(winetest_platform, "windows") == 0) || (strcmp(winetest_platform, "reactos") == 0)) + if ((strcmp(winetest_platform, "windows") == 0) +#ifndef USE_WINE_TODOS + || (strcmp(winetest_platform, "reactos") == 0) +#endif + ) winetest_vskip(msg, valist); else winetest_vok(0, msg, valist);

1 0

[akhaldi] 64437: [HNETCFG][OLEACC][WBEMDISP] * Add missing stdole2 dependency. Spotted by Thomas Kriese. CORE-8585 #resolve #comment Fixed in r64437. Thanks!
by akhaldi＠svn.reactos.org 01 Oct '14

01 Oct '14

Author: akhaldi Date: Wed Oct 1 11:12:48 2014 New Revision: 64437 URL: http://svn.reactos.org/svn/reactos?rev=64437&view=rev Log: [HNETCFG][OLEACC][WBEMDISP] * Add missing stdole2 dependency. Spotted by Thomas Kriese. CORE-8585 #resolve #comment Fixed in r64437. Thanks! Modified: trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt trunk/reactos/dll/win32/oleacc/CMakeLists.txt trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt Modified: trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt [iso-8859-1] Wed Oct 1 11:12:48 2014 @@ -27,6 +27,7 @@ set_source_files_properties(hnetcfg.rc PROPERTIES OBJECT_DEPENDS "${hnetcfg_rc_deps}") set_module_type(hnetcfg win32dll) +add_dependencies(hnetcfg stdole2) target_link_libraries(hnetcfg wine uuid) add_importlibs(hnetcfg ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) add_pch(hnetcfg hnetcfg_private.h SOURCE) Modified: trunk/reactos/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] Wed Oct 1 11:12:48 2014 @@ -17,6 +17,7 @@ set_source_files_properties(oleacc.rc PROPERTIES OBJECT_DEPENDS "${oleacc_rc_deps}") add_library(oleacc SHARED ${SOURCE} oleacc.rc) +add_dependencies(oleacc stdole2) set_module_type(oleacc win32dll) target_link_libraries(oleacc wine) add_importlibs(oleacc user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt [iso-8859-1] Wed Oct 1 11:12:48 2014 @@ -26,7 +26,7 @@ set_module_type(wbemdisp win32dll) target_link_libraries(wbemdisp uuid wine) -add_dependencies(wbemdisp wbemdisp_idlheader) +add_dependencies(wbemdisp stdole2 wbemdisp_idlheader) add_importlibs(wbemdisp oleaut32 msvcrt kernel32 ntdll) add_pch(wbemdisp wbemdisp_private.h SOURCE) add_cd_file(TARGET wbemdisp DESTINATION reactos/system32/wbem FOR all)

1 0

[akhaldi] 64436: [ITSS] * Add missing wineheaders dependency. Spotted by Thomas Kriese. CORE-8586 #resolve #comment Fixed in r64436. Thanks!
by akhaldi＠svn.reactos.org 01 Oct '14

01 Oct '14

Author: akhaldi Date: Wed Oct 1 11:07:06 2014 New Revision: 64436 URL: http://svn.reactos.org/svn/reactos?rev=64436&view=rev Log: [ITSS] * Add missing wineheaders dependency. Spotted by Thomas Kriese. CORE-8586 #resolve #comment Fixed in r64436. Thanks! Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/CMakeLists.… ============================================================================== --- trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] Wed Oct 1 11:07:06 2014 @@ -24,4 +24,5 @@ target_link_libraries(itss uuid wine) add_importlibs(itss urlmon shlwapi ole32 msvcrt kernel32 ntdll) add_pch(itss precomp.h SOURCE) +add_dependencies(itss wineheaders) add_cd_file(TARGET itss DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 64435: [DX10GUID] * Add missing d3d_idl_headers dependency. Spotted by Thomas Kriese. CORE-8588 #resolve #comment Fixed in r64434. Thanks!
by akhaldi＠svn.reactos.org 01 Oct '14

01 Oct '14

Author: akhaldi Date: Wed Oct 1 11:03:51 2014 New Revision: 64435 URL: http://svn.reactos.org/svn/reactos?rev=64435&view=rev Log: [DX10GUID] * Add missing d3d_idl_headers dependency. Spotted by Thomas Kriese. CORE-8588 #resolve #comment Fixed in r64434. Thanks! Modified: trunk/reactos/lib/sdk/dxguid/CMakeLists.txt Modified: trunk/reactos/lib/sdk/dxguid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/dxguid/CMakeLists.… ============================================================================== --- trunk/reactos/lib/sdk/dxguid/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/dxguid/CMakeLists.txt [iso-8859-1] Wed Oct 1 11:03:51 2014 @@ -3,4 +3,4 @@ add_library(dx10guid dx10guid.c) add_dependencies(dxguid psdk) -add_dependencies(dx10guid psdk) +add_dependencies(dx10guid psdk d3d_idl_headers)

1 0

[akhaldi] 64434: [MSADP32.ACM] * Delete this duplicate.
by akhaldi＠svn.reactos.org 01 Oct '14

01 Oct '14

Author: akhaldi Date: Wed Oct 1 11:00:12 2014 New Revision: 64434 URL: http://svn.reactos.org/svn/reactos?rev=64434&view=rev Log: [MSADP32.ACM] * Delete this duplicate. Removed: trunk/reactos/dll/win32/msacm32/msadp32/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs