setupapi: Respect samDesired in SetupDiOpenClassRegKeyExW.

a9d74cf9 · Juan Lang · Alexandre Julliard · 243ac3ed · a9d74cf9
Commit a9d74cf9 authored Sep 21, 2007 by Juan Lang Committed by Alexandre Julliard Sep 24, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 34 additions and 22 deletions

devinst.c dlls/setupapi/devinst.c +34 -22

No files found.
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -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,
+    if (!ClassGuid)
-		      lpKeyName,
-		      0,
-		      KEY_ALL_ACCESS,
-		      &hClassesKey))
    {
-	return INVALID_HANDLE_VALUE;
+        if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-    }
+                          lpKeyName,
+                          0,
-    if (ClassGuid == NULL)
+                          samDesired,
+                          &hClassesKey))
+        {
+            return INVALID_HANDLE_VALUE;
+        }
        return hClassesKey;
+    }
+    else
+    {
+        WCHAR bracedGuidString[39];
-    SETUPDI_GuidToString(ClassGuid, bracedGuidString);
+        SETUPDI_GuidToString(ClassGuid, bracedGuidString);
-    if (RegOpenKeyExW(hClassesKey,
+        if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-		      bracedGuidString,
+                          lpKeyName,
-		      0,
+                          0,
-		      KEY_ALL_ACCESS,
+                          samDesired,
-		      &hClassKey))
+                          &hClassesKey))
-    {
+        {
-	RegCloseKey(hClassesKey);
+            return INVALID_HANDLE_VALUE;
-	return INVALID_HANDLE_VALUE;
+        }
-    }
+        if (RegOpenKeyExW(hClassesKey,
+                          bracedGuidString,
+                          0,
+                          samDesired,
+                          &hClassKey))
+        {
+            RegCloseKey(hClassesKey);
+            return INVALID_HANDLE_VALUE;
+        }
-    RegCloseKey(hClassesKey);
+        RegCloseKey(hClassesKey);
-    return hClassKey;
+        return hClassKey;
+    }
 }
 /***********************************************************************