From 9b1e1b2aadcdebf09ef306677844701d6177cf82 Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang@gmail.com>
Date: Fri, 21 Sep 2007 11:33:05 -0700
Subject: [PATCH] setupapi: Set last error on failure in
 SetupDiOpenClassRegKeyExW.

---
 dlls/setupapi/devinst.c | 44 ++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index a91b12047bd..c2644e23237 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -2338,8 +2338,9 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW(
         PVOID Reserved)
 {
     HKEY hClassesKey;
-    HKEY hClassKey;
+    HKEY key;
     LPCWSTR lpKeyName;
+    LONG l;
 
     if (MachineName != NULL)
     {
@@ -2364,15 +2365,16 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW(
 
     if (!ClassGuid)
     {
-        if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+        if ((l = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
                           lpKeyName,
                           0,
                           samDesired,
-                          &hClassesKey))
+                          &hClassesKey)))
         {
-            return INVALID_HANDLE_VALUE;
+            SetLastError(l);
+            hClassesKey = INVALID_HANDLE_VALUE;
         }
-        return hClassesKey;
+        key = hClassesKey;
     }
     else
     {
@@ -2380,28 +2382,30 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW(
 
         SETUPDI_GuidToString(ClassGuid, bracedGuidString);
 
-        if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+        if (!(l = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
                           lpKeyName,
                           0,
                           samDesired,
-                          &hClassesKey))
-        {
-            return INVALID_HANDLE_VALUE;
-        }
-        if (RegOpenKeyExW(hClassesKey,
-                          bracedGuidString,
-                          0,
-                          samDesired,
-                          &hClassKey))
+                          &hClassesKey)))
         {
+            if ((l = RegOpenKeyExW(hClassesKey,
+                              bracedGuidString,
+                              0,
+                              samDesired,
+                              &key)))
+            {
+                SetLastError(l);
+                key = INVALID_HANDLE_VALUE;
+            }
             RegCloseKey(hClassesKey);
-            return INVALID_HANDLE_VALUE;
         }
-
-        RegCloseKey(hClassesKey);
-
-        return hClassKey;
+        else
+        {
+            SetLastError(l);
+            key = INVALID_HANDLE_VALUE;
+        }
     }
+    return key;
 }
 
 /***********************************************************************