From cc461f59203139df7eddfd59580d40146ddc6d63 Mon Sep 17 00:00:00 2001
From: Ged Murphy <gedmurphy@reactos.org>
Date: Tue, 4 Sep 2007 20:28:44 +0000
Subject: [PATCH] preset in case of failure

svn path=/trunk/; revision=28858
---
 reactos/dll/win32/setupapi/devinst.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/reactos/dll/win32/setupapi/devinst.c b/reactos/dll/win32/setupapi/devinst.c
index 779a8341046..09aa8cbd286 100644
--- a/reactos/dll/win32/setupapi/devinst.c
+++ b/reactos/dll/win32/setupapi/devinst.c
@@ -2787,7 +2787,9 @@ SetupDiOpenDeviceInfoW(
                 goto cleanup;
             }
 
+            ClassGUID = GUID_NULL;
             dwSize = MAX_GUID_STRING_LEN * sizeof(WCHAR);
+
             if (RegQueryValueExW(hKey,
                                  REGSTR_VAL_CLASSGUID,
                                  NULL,
@@ -2798,8 +2800,7 @@ SetupDiOpenDeviceInfoW(
                 szClassGuid[MAX_GUID_STRING_LEN - 2] = UNICODE_NULL;
 
                 /* Convert a string to a ClassGuid */
-                if (UuidFromStringW(&szClassGuid[1], &ClassGUID) != RPC_S_OK)
-                    ClassGUID = GUID_NULL;
+                UuidFromStringW(&szClassGuid[1], &ClassGUID);
             }
 
             if (!CreateDeviceInfoElement(list, DeviceInstanceId, &ClassGUID, &deviceInfo))