[setupapi] brace the guid in SetupDiOpenClassRegKeyExW

[Damjan Jovanovic]

SetupDiOpenClassRegKeyExW (a highly buggy function) doesn't brace the
GUID string under HKLM\System\CurrentControlSet\Control\Class like it
should. Patch + test included.

Changelog:
* Brace the GUID string in SetupDiOpenClassRegKeyExW and test Windows
does it too.

Damjan Jovanovic
-------------- next part --------------
--- a/dlls/setupapi/devinst.c	2006-09-14 21:35:08.000000000 +0200
+++ b/dlls/setupapi/devinst.c	2006-09-18 21:37:03.000000000 +0200
@@ -1413,6 +1413,7 @@
         PVOID Reserved)
 {
     LPWSTR lpGuidString;
+    WCHAR bracedGuidString[39];
     HKEY hClassesKey;
     HKEY hClassKey;
     LPCWSTR lpKeyName;
@@ -1455,19 +1456,22 @@
 	RegCloseKey(hClassesKey);
 	return INVALID_HANDLE_VALUE;
     }
+    bracedGuidString[0] = (WCHAR) '{';
+    memcpy(&bracedGuidString[1], lpGuidString, 36*sizeof(WCHAR));
+    bracedGuidString[37] = (WCHAR) '}';
+    bracedGuidString[38] = 0;
+    RpcStringFreeW(&lpGuidString);
 
     if (RegOpenKeyExW(hClassesKey,
-		      lpGuidString,
+		      bracedGuidString,
 		      0,
 		      KEY_ALL_ACCESS,
 		      &hClassKey))
     {
-	RpcStringFreeW(&lpGuidString);
 	RegCloseKey(hClassesKey);
 	return INVALID_HANDLE_VALUE;
     }
 
-    RpcStringFreeW(&lpGuidString);
     RegCloseKey(hClassesKey);
 
     return hClassKey;
--- a/dlls/setupapi/tests/Makefile.in	2006-07-10 18:01:08.000000000 +0200
+++ b/dlls/setupapi/tests/Makefile.in	2006-09-18 20:58:08.000000000 +0200
@@ -3,7 +3,7 @@
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = setupapi.dll
-IMPORTS   = setupapi kernel32
+IMPORTS   = setupapi kernel32 advapi32
 
 CTESTS = \
 	devinst.c \
--- a/dlls/setupapi/tests/devinst.c	2006-09-14 21:35:08.000000000 +0200
+++ b/dlls/setupapi/tests/devinst.c	2006-09-18 21:49:59.000000000 +0200
@@ -87,6 +87,7 @@
     /* This is a unique guid for testing purposes */
     GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,
         0x00,0x11,0x95,0x5c,0x2b,0xdb}};
+    CHAR guidString[] = "{6a55b5a4-3f65-11db-b704-0011955c2bdb}";
     HKEY hkey;
 
     /* Check return value for non-existent key */
@@ -94,6 +95,30 @@
         DIOCR_INSTALLER, NULL, NULL);
     ok(hkey == INVALID_HANDLE_VALUE,
         "returned %p (expected INVALID_HANDLE_VALUE)\n", hkey);
+
+    /* Test it for a key that exists */
+    hkey = SetupDiOpenClassRegKey(NULL, KEY_ALL_ACCESS);
+    if (hkey != INVALID_HANDLE_VALUE)
+    {
+        HKEY classKey;
+        if (RegCreateKeyA(hkey, guidString, &classKey) == ERROR_SUCCESS)
+        {
+            RegCloseKey(classKey);
+            SetLastError(0xdeadbeef);
+            classKey = pSetupDiOpenClassRegKeyExA(&guid, KEY_ALL_ACCESS,
+                DIOCR_INSTALLER, NULL, NULL);
+            ok(classKey != INVALID_HANDLE_VALUE,
+                "opening class registry key failed with error %ld\n",
+                GetLastError());
+            if (classKey != INVALID_HANDLE_VALUE)
+                RegCloseKey(classKey);
+            RegDeleteKeyA(hkey, guidString);
+        }
+        else
+            trace("failed to create registry key for test\n");
+    }
+    else
+        trace("failed to open classes key\n");
 }
 
 START_TEST(devinst)