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

setupapi: Respect samDesired in SetupDiOpenClassRegKeyExW.

This commit is contained in:
Juan Lang 2007-09-21 11:32:24 -07:00 committed by Alexandre Julliard
parent 243ac3ed75
commit a9d74cf994
1 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
dlls/setupapi/devinst.c
View File

@ -2337,7 +2337,6 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW(
PCWSTR MachineName,
PVOID Reserved)
{
WCHAR bracedGuidString[39];
HKEY hClassesKey;
HKEY hClassKey;
LPCWSTR lpKeyName;
@ -2363,33 +2362,46 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW(
return INVALID_HANDLE_VALUE;
}
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
lpKeyName,
0,
KEY_ALL_ACCESS,
&hClassesKey))
if (!ClassGuid)
{
return INVALID_HANDLE_VALUE;
}
if (ClassGuid == NULL)
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
lpKeyName,
0,
samDesired,
&hClassesKey))
{
return INVALID_HANDLE_VALUE;
}
return hClassesKey;
SETUPDI_GuidToString(ClassGuid, bracedGuidString);
if (RegOpenKeyExW(hClassesKey,
bracedGuidString,
0,
KEY_ALL_ACCESS,
&hClassKey))
{
RegCloseKey(hClassesKey);
return INVALID_HANDLE_VALUE;
}
else
{
WCHAR bracedGuidString[39];
RegCloseKey(hClassesKey);
SETUPDI_GuidToString(ClassGuid, bracedGuidString);
return hClassKey;
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
lpKeyName,
0,
samDesired,
&hClassesKey))
{
return INVALID_HANDLE_VALUE;
}
if (RegOpenKeyExW(hClassesKey,
bracedGuidString,
0,
samDesired,
&hClassKey))
{
RegCloseKey(hClassesKey);
return INVALID_HANDLE_VALUE;
}
RegCloseKey(hClassesKey);
return hClassKey;
}
}
/***********************************************************************