[ros-diffs] [gedmurphy] 28858: preset in case of failure

Author: gedmurphy
Date: Wed Sep  5 00:28:44 2007
New Revision: 28858

URL: http://svn.reactos.org/svn/reactos?rev=28858&view=rev
Log:
preset in case of failure

Modified:
    trunk/reactos/dll/win32/setupapi/devinst.c

Modified: trunk/reactos/dll/win32/setupapi/devinst.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst…
==============================================================================
--- trunk/reactos/dll/win32/setupapi/devinst.c (original)
+++ trunk/reactos/dll/win32/setupapi/devinst.c Wed Sep  5 00:28:44 2007
@@ -2787,7 +2787,9 @@
                 goto cleanup;
             }
 
+            ClassGUID = GUID_NULL;
             dwSize = MAX_GUID_STRING_LEN * sizeof(WCHAR);
+
             if (RegQueryValueExW(hKey,
                                  REGSTR_VAL_CLASSGUID,
                                  NULL,
@@ -2798,8 +2800,7 @@
                 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))