From d8e78cc66b179c23484814e39a998d6a841a96f4 Mon Sep 17 00:00:00 2001
From: Gunnar Dalsnes <hardon@online.no>
Date: Mon, 4 Jul 2005 21:54:36 +0000
Subject: [PATCH] hopefully fix something in CreateClassKey

svn path=/trunk/; revision=16415
---
 reactos/lib/setupapi/devinst.c | 43 +++++++++++++++-------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/reactos/lib/setupapi/devinst.c b/reactos/lib/setupapi/devinst.c
index ee6a6b40802..58b00cb632f 100644
--- a/reactos/lib/setupapi/devinst.c
+++ b/reactos/lib/setupapi/devinst.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 #include "wine/port.h"
- 
+
 #include <stdarg.h>
 
 #include "windef.h"
@@ -1302,30 +1302,26 @@ static HKEY CreateClassKey(HINF hInf)
 			   MAX_PATH - 1,
 			   &RequiredSize))
     {
-	return INVALID_HANDLE_VALUE;
+        return INVALID_HANDLE_VALUE;
     }
 
     lstrcpyW(FullBuffer, ControlClass);
     lstrcatW(FullBuffer, Buffer);
 
-    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-		      FullBuffer,
-		      0,
-		      KEY_ALL_ACCESS,
-		      &hClassKey))
-    {
-	if (!SetupGetLineTextW(NULL,
+
+    if (!SetupGetLineTextW(NULL,
 			       hInf,
 			       Version,
 			       Class,
 			       Buffer,
 			       MAX_PATH,
 			       &RequiredSize))
-	{
-	    return INVALID_HANDLE_VALUE;
-	}
+    {
+        RegDeleteKeyW(HKEY_LOCAL_MACHINE, FullBuffer);
+        return INVALID_HANDLE_VALUE;
+    }
 
-	if (RegCreateKeyExW(HKEY_LOCAL_MACHINE,
+    if (ERROR_SUCCESS != RegCreateKeyExW(HKEY_LOCAL_MACHINE,
 			    FullBuffer,
 			    0,
 			    NULL,
@@ -1333,24 +1329,22 @@ static HKEY CreateClassKey(HINF hInf)
 			    KEY_ALL_ACCESS,
 			    NULL,
 			    &hClassKey,
-			    NULL))
-	{
-	    return INVALID_HANDLE_VALUE;
-	}
-
+             NULL))
+    {
+        RegDeleteKeyW(HKEY_LOCAL_MACHINE, FullBuffer);
+        return INVALID_HANDLE_VALUE;
     }
 
-    if (RegSetValueExW(hClassKey,
+    if (ERROR_SUCCESS != RegSetValueExW(hClassKey,
 		       Class,
 		       0,
 		       REG_SZ,
 		       (LPBYTE)Buffer,
-		       RequiredSize * sizeof(WCHAR)))
+             RequiredSize * sizeof(WCHAR)))
     {
-	RegCloseKey(hClassKey);
-	RegDeleteKeyW(HKEY_LOCAL_MACHINE,
-		      FullBuffer);
-	return INVALID_HANDLE_VALUE;
+        RegCloseKey(hClassKey);
+        RegDeleteKeyW(HKEY_LOCAL_MACHINE, FullBuffer);
+        return INVALID_HANDLE_VALUE;
     }
 
     return hClassKey;
@@ -1397,6 +1391,7 @@ BOOL WINAPI SetupDiInstallClassW(
 	SetupCloseInfFile(hInf);
 	return FALSE;
     }
+    RegCloseKey(hClassKey);
 
 
     /* Try to append a layout file */