Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ADVAPI32] RegEnumKeyExW on HKCR keys must work with just KEY_ENUMERATE_SUB_KEYS access (#5872)

Browse source 
This fixes Windows RegEdit when the same HKCR key exists in HKCU and HKLM.
This commit is contained in:
Whindmar Saksit 2023-11-15 11:07:28 +01:00 committed by GitHub
parent 2414a21a38
commit 8025785730
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
dll/win32/advapi32/reg/hkcr.c
View file

@ -214,6 +214,30 @@ GetPreferredHKCRKey(
return ErrorCode;
}
static
LONG
GetSubkeyInfoHelper(
_In_ HKEY hKey,
_Out_opt_ LPDWORD lpSubKeys,
_Out_opt_ LPDWORD lpMaxSubKeyLen)
{
LONG err = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, lpSubKeys, lpMaxSubKeyLen,
NULL, NULL, NULL, NULL, NULL, NULL);
if (err != ERROR_ACCESS_DENIED)
return err;
/* Windows RegEdit only uses KEY_ENUMERATE_SUB_KEYS when enumerating but
* KEY_QUERY_VALUE is required to get the info in EnumHKCRKey.
*/
if (RegOpenKeyExW(hKey, NULL, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
{
err = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, lpSubKeys, lpMaxSubKeyLen,
NULL, NULL, NULL, NULL, NULL, NULL);
RegCloseKey(hKey);
}
return err;
}
/* HKCR version of RegCreateKeyExW. */
LONG
WINAPI
@ -654,19 +678,7 @@ EnumHKCRKey(
}
/* Get some info on the HKCU side */
ErrorCode = RegQueryInfoKeyW(
PreferredKey,
NULL,
NULL,
NULL,
&NumPreferredSubKeys,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
ErrorCode = GetSubkeyInfoHelper(PreferredKey, &NumPreferredSubKeys, NULL);
if (ErrorCode != ERROR_SUCCESS)
goto Exit;
@ -692,19 +704,7 @@ EnumHKCRKey(
dwIndex -= NumPreferredSubKeys;
/* Get some info */
ErrorCode = RegQueryInfoKeyW(
FallbackKey,
NULL,
NULL,
NULL,
NULL,
&MaxFallbackSubKeyLen,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
ErrorCode = GetSubkeyInfoHelper(FallbackKey, NULL, &MaxFallbackSubKeyLen);
if (ErrorCode != ERROR_SUCCESS)
{
ERR("Could not query info of key %p (Err: %d)\n", FallbackKey, ErrorCode);