[ros-diffs] [hpoussin] 18446: Process AddReg directive in main section to install

Process AddReg directive in main section to install
Simplify a call to SetupInstallFromInfSectionW
Fix a warning (thanks w3seek)
Modified: trunk/reactos/lib/setupapi/devinst.c
  _____

Modified: trunk/reactos/lib/setupapi/devinst.c
--- trunk/reactos/lib/setupapi/devinst.c	2005-10-14 18:00:39 UTC
(rev 18445)
+++ trunk/reactos/lib/setupapi/devinst.c	2005-10-14 18:09:17 UTC
(rev 18446)
@@ -2936,7 +2936,7 @@

{
             LIST_ENTRY ClassCoInstallersListHead;
             LIST_ENTRY DeviceCoInstallersListHead;
-            HMODULE ClassInstallerLibrary;
+            HMODULE ClassInstallerLibrary = NULL;
             CLASS_INSTALL_PROC ClassInstaller = NULL;
             COINSTALLER_CONTEXT_DATA Context;
             PLIST_ENTRY ListEntry;
@@ -4828,7 +4828,6 @@
     HKEY hClassKey = INVALID_HANDLE_VALUE;
     LONG rc;
     HWND hWnd;
-    PVOID callback_context;
     BOOL ret = FALSE; /* Return value */

TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData);
@@ -4916,6 +4915,17 @@
     if (hKey == INVALID_HANDLE_VALUE)
         goto cleanup;

+    /* Install main section */
+    /* Files have already been copied in SetupDiInstallDriverFiles.
+     * Process only registry entries. */
+    *pSectionName = '\0';
+    Result = SetupInstallFromInfSectionW(hWnd, hInf, SectionName,
+        SPINST_REGISTRY, hKey, NULL, 0,
+        SetupDefaultQueueCallbackW, NULL,
+        NULL, NULL);
+    if (!Result)
+        goto cleanup;
+
     /* Write information to driver key */
     *pSectionName = UNICODE_NULL;
     TRACE("Write information to driver key\n");
@@ -5048,12 +5058,10 @@

/* Install .HW section */
     wcscpy(pSectionName, L".HW");
-    callback_context = SetupInitDefaultQueueCallback(hWnd);
     Result = SetupInstallFromInfSectionW(hWnd, hInf, SectionName,
         SPINST_REGISTRY, hKey, NULL, 0,
-        SetupDefaultQueueCallbackW, callback_context,
+        SetupDefaultQueueCallbackW, NULL,
         NULL, NULL);
-    SetupTermDefaultQueueCallback(callback_context);
     if (!Result)
         goto cleanup;