ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernelbase: Do not map HKEY_PERFORMANCE_DATA to \Registry\PerfData. 

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-08-11 00:20:06 -05:00 committed by Alexandre Julliard
parent 7817238a87
commit a8367f1d53
3 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/advapi32/tests/registry.c
View File

@ -3903,26 +3903,21 @@ static void test_performance_keys(void)
todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret);
ret = RegOpenKeyA(keys[i], "Global", &key); ret = RegOpenKeyA(keys[i], "Global", &key);
todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret);
ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret);
ret = RegOpenKeyExA(keys[i], "Global", 0, KEY_READ, &key); ret = RegOpenKeyExA(keys[i], "Global", 0, KEY_READ, &key);
todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret);
ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret);
size = 0; size = 0;
ret = RegQueryValueA(keys[i], "Global", NULL, (LONG *)&size); ret = RegQueryValueA(keys[i], "Global", NULL, (LONG *)&size);
todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret);
ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret);
ret = RegSetValueA(keys[i], "Global", REG_SZ, "dummy", 5); ret = RegSetValueA(keys[i], "Global", REG_SZ, "dummy", 5);
todo_wine_if (keys[i] == HKEY_PERFORMANCE_DATA) ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret);
ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret);
ret = RegQueryInfoKeyA(keys[i], NULL, NULL, NULL, &key_count, NULL, ret = RegQueryInfoKeyA(keys[i], NULL, NULL, NULL, &key_count, NULL,
NULL, &value_count, NULL, NULL, NULL, NULL); NULL, &value_count, NULL, NULL, NULL, NULL);
todo_wine_if (keys[i] != HKEY_PERFORMANCE_DATA) todo_wine ok(!ret, "got %u\n", ret);
ok(!ret, "got %u\n", ret);
todo_wine ok(!key_count, "got %u subkeys\n", key_count); todo_wine ok(!key_count, "got %u subkeys\n", key_count);
todo_wine ok(value_count == 2, "got %u values\n", value_count); todo_wine ok(value_count == 2, "got %u values\n", value_count);
@ -3941,7 +3936,7 @@ static void test_performance_keys(void)
} }
ret = RegSetValueExA(HKEY_PERFORMANCE_DATA, "Global", 0, REG_SZ, (const BYTE *)"dummy", 5); ret = RegSetValueExA(HKEY_PERFORMANCE_DATA, "Global", 0, REG_SZ, (const BYTE *)"dummy", 5);
todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret);
ret = RegSetValueExA(HKEY_PERFORMANCE_TEXT, "Global", 0, REG_SZ, (const BYTE *)"dummy", 5); ret = RegSetValueExA(HKEY_PERFORMANCE_TEXT, "Global", 0, REG_SZ, (const BYTE *)"dummy", 5);
todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret); todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret);
@ -3952,7 +3947,7 @@ static void test_performance_keys(void)
if (pRegSetKeyValueW) if (pRegSetKeyValueW)
{ {
ret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, L"Global", REG_SZ, L"dummy", 10); ret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, L"Global", REG_SZ, L"dummy", 10);
todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret);
ret = pRegSetKeyValueW(HKEY_PERFORMANCE_TEXT, NULL, L"Global", REG_SZ, L"dummy", 10); ret = pRegSetKeyValueW(HKEY_PERFORMANCE_TEXT, NULL, L"Global", REG_SZ, L"dummy", 10);
todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret); todo_wine ok(ret == ERROR_BADKEY, "got %u\n", ret);
@ -3962,7 +3957,7 @@ static void test_performance_keys(void)
} }
ret = RegEnumKeyA(HKEY_PERFORMANCE_DATA, 0, buffer, buffer_size); ret = RegEnumKeyA(HKEY_PERFORMANCE_DATA, 0, buffer, buffer_size);
todo_wine ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret); ok(ret == ERROR_INVALID_HANDLE, "got %u\n", ret);
ret = RegEnumKeyA(HKEY_PERFORMANCE_TEXT, 0, buffer, buffer_size); ret = RegEnumKeyA(HKEY_PERFORMANCE_TEXT, 0, buffer, buffer_size);
todo_wine ok(ret == ERROR_NO_MORE_ITEMS, "got %u\n", ret); todo_wine ok(ret == ERROR_NO_MORE_ITEMS, "got %u\n", ret);
@ -4101,7 +4096,7 @@ static void test_perflib_key(void)
RtlInitUnicodeString(&string, L"\\Registry\\PerfData"); RtlInitUnicodeString(&string, L"\\Registry\\PerfData");
InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, NULL, NULL); InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, NULL, NULL);
ret = NtOpenKey((HANDLE *)&key, KEY_READ, &attr); ret = NtOpenKey((HANDLE *)&key, KEY_READ, &attr);
todo_wine ok(ret == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", ret); ok(ret == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", ret);
free(buffer); free(buffer);
} }

2
dlls/advapi32/tests/security.c
View File

@ -7948,7 +7948,7 @@ static void test_pseudo_handle_security(void)
ret = GetSecurityInfo(keys[i], SE_REGISTRY_KEY, ret = GetSecurityInfo(keys[i], SE_REGISTRY_KEY,
DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr); DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr);
if (keys[i] == HKEY_PERFORMANCE_DATA) if (keys[i] == HKEY_PERFORMANCE_DATA)
todo_wine ok(ret == ERROR_INVALID_HANDLE, "key %p: got error %u\n", keys[i], ret); ok(ret == ERROR_INVALID_HANDLE, "key %p: got error %u\n", keys[i], ret);
else if (keys[i] == HKEY_DYN_DATA) else if (keys[i] == HKEY_DYN_DATA)
todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED || broken(ret == ERROR_INVALID_HANDLE) /* <7 */, todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED || broken(ret == ERROR_INVALID_HANDLE) /* <7 */,
"key %p: got error %u\n", keys[i], ret); "key %p: got error %u\n", keys[i], ret);

31
dlls/kernelbase/registry.c
View File

@ -56,7 +56,7 @@ static const WCHAR * const root_key_names[] =
NULL, /* HKEY_CURRENT_USER is determined dynamically */ NULL, /* HKEY_CURRENT_USER is determined dynamically */
L"\\Registry\\Machine", L"\\Registry\\Machine",
L"\\Registry\\User", L"\\Registry\\User",
L"\\Registry\\PerfData", NULL, /* HKEY_PERFORMANCE_DATA is not a real key */
L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current", L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current",
L"\\Registry\\DynData" L"\\Registry\\DynData"
}; };
@ -330,21 +330,28 @@ static HKEY create_special_root_hkey( HKEY hkey, DWORD access )
/* map the hkey from special root to normal key if necessary */ /* map the hkey from special root to normal key if necessary */
static inline HKEY get_special_root_hkey( HKEY hkey, REGSAM access ) static inline HKEY get_special_root_hkey( HKEY hkey, REGSAM access )
{ {
HKEY ret = hkey; unsigned int index = HandleToUlong(hkey) - HandleToUlong(HKEY_SPECIAL_ROOT_FIRST);
DWORD wow64_flags = access & (KEY_WOW64_32KEY | KEY_WOW64_64KEY);
if ((HandleToUlong(hkey) >= HandleToUlong(HKEY_SPECIAL_ROOT_FIRST)) switch (HandleToUlong(hkey))
&& (HandleToUlong(hkey) <= HandleToUlong(HKEY_SPECIAL_ROOT_LAST)))
{ {
REGSAM mask = 0; case (LONG)(LONG_PTR)HKEY_CLASSES_ROOT:
if (wow64_flags)
return create_special_root_hkey( hkey, MAXIMUM_ALLOWED | wow64_flags );
/* fall through */
if (HandleToUlong(hkey) == HandleToUlong(HKEY_CLASSES_ROOT)) case (LONG)(LONG_PTR)HKEY_CURRENT_USER:
mask = KEY_WOW64_32KEY | KEY_WOW64_64KEY; case (LONG)(LONG_PTR)HKEY_LOCAL_MACHINE:
case (LONG)(LONG_PTR)HKEY_USERS:
case (LONG)(LONG_PTR)HKEY_CURRENT_CONFIG:
case (LONG)(LONG_PTR)HKEY_DYN_DATA:
if (special_root_keys[index])
return special_root_keys[index];
return create_special_root_hkey( hkey, MAXIMUM_ALLOWED );
if ((access & mask) || default:
!(ret = special_root_keys[HandleToUlong(hkey) - HandleToUlong(HKEY_SPECIAL_ROOT_FIRST)])) return hkey;
ret = create_special_root_hkey( hkey, MAXIMUM_ALLOWED | (access & mask) );
} }
return ret;
} }
@ -1565,7 +1572,7 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWO
hkey, debugstr_a(name), reserved, type, data, count, count ? *count : 0 ); hkey, debugstr_a(name), reserved, type, data, count, count ? *count : 0 );
if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER;
if (hkey != HKEY_PERFORMANCE_DATA && !(hkey = get_special_root_hkey( hkey, 0 ))) if (!(hkey = get_special_root_hkey( hkey, 0 )))
return ERROR_INVALID_HANDLE; return ERROR_INVALID_HANDLE;
if (count) datalen = *count; if (count) datalen = *count;