Changeset 96603 in vbox for trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestDrvInst.cpp

Timestamp:

Sep 5, 2022 6:12:44 PM (2 years ago)

Author:

vboxsync

Message:

Add/NT/Inst: Fixed some bugs in the NT4 video driver installation helper. bugref:10261

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestDrvInst.cpp (modified) (11 diffs)

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestDrvInst.cpp

@@ -98 +98 @@
 
 /**
- * Inner video driver installation function.
+ * Inner NT4 video driver installation function.
  *
  * This can normally return immediately on errors as the parent will do the
  * cleaning up.
  */
-static RTEXITCODE InstallVideoDriverInner(WCHAR const * const pwszDriverDir, HDEVINFO hDevInfo, HINF *phInf)
-{
-    /*
-     * Get the first found driver.
-     * Our Inf file only contains one so this is fine.
-     */
-    SP_DRVINFO_DATA_W drvInfoData = { sizeof(SP_DRVINFO_DATA) };
+static RTEXITCODE InstallNt4VideoDriverInner(WCHAR const * const pwszDriverDir, HDEVINFO hDevInfo, HINF *phInf)
+{
+    /*
+     * Get the first found driver - our Inf file only contains one so this is ok.
+     *
+     * Note! We must use the V1 structure here as it is the only NT4 recognizes.
+     *       There are four versioned structures:
+     *          - SP_ALTPLATFORM_INFO
+     *          - SP_DRVINFO_DATA_W
+     *          - SP_BACKUP_QUEUE_PARAMS_W
+     *          - SP_INF_SIGNER_INFO_W,
+     *       but we only make use of SP_DRVINFO_DATA_W.
+     */
+    SetLastError(NO_ERROR);
+    SP_DRVINFO_DATA_V1_W drvInfoData = { sizeof(drvInfoData) };
     if (!SetupDiEnumDriverInfoW(hDevInfo, NULL, SPDIT_CLASSDRIVER, 0, &drvInfoData))
         return ErrorMsgLastErr("SetupDiEnumDriverInfoW");
@@ -120 +128 @@
         SP_DRVINFO_DETAIL_DATA_W s;
         uint64_t                 au64Padding[(sizeof(SP_DRVINFO_DETAIL_DATA_W) + 256) / sizeof(uint64_t)];
-    } DriverInfoDetailData = { { sizeof(SP_DRVINFO_DETAIL_DATA) } };
+    } DriverInfoDetailData = { { sizeof(DriverInfoDetailData.s) } };
     DWORD                    cbReqSize            = NULL;
     if (   !SetupDiGetDriverInfoDetailW(hDevInfo, NULL, &drvInfoData,
@@ -164 +172 @@
      * ...
      */
-    SP_DEVINFO_DATA deviceInfoData = { sizeof(SP_DEVINFO_DATA) };
+    SP_DEVINFO_DATA deviceInfoData = { sizeof(deviceInfoData) };
     /* Check for existing first. */
     BOOL fDevInfoOkay = SetupDiOpenDeviceInfoW(hDevInfo, wszDevInstanceId, NULL, 0, &deviceInfoData);
@@ -190 +198 @@
          * Redo the install parameter thing with deviceInfoData.
          */
-        SP_DEVINSTALL_PARAMS_W DeviceInstallParams = { sizeof(SP_DEVINSTALL_PARAMS) };
+        SP_DEVINSTALL_PARAMS_W DeviceInstallParams = { sizeof(DeviceInstallParams) };
         if (!SetupDiGetDeviceInstallParamsW(hDevInfo, &deviceInfoData, &DeviceInstallParams))
             return ErrorMsgLastErr("SetupDiGetDeviceInstallParamsW(#2)"); /** @todo Original code didn't return here. */
 
-        DeviceInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
+        DeviceInstallParams.cbSize = sizeof(DeviceInstallParams);
         DeviceInstallParams.Flags |= DI_NOFILECOPY      /* We did our own file copying */
                                    | DI_DONOTCALLCONFIGMG
@@ -212 +220 @@
 
         /*
-         * Repeate the query at the start of the function.
-         */
-        drvInfoData.cbSize = sizeof(SP_DRVINFO_DATA);
+         * Repeat the query at the start of the function.
+         */
+        drvInfoData.cbSize = sizeof(drvInfoData);
         if (!SetupDiEnumDriverInfoW(hDevInfo, &deviceInfoData, SPDIT_CLASSDRIVER, 0, &drvInfoData))
             return ErrorMsgLastErr("SetupDiEnumDriverInfoW(#2)");
@@ -343 +351 @@
  * @param   pwszDriverDir     The base directory where we find the INF.
  */
-static RTEXITCODE InstallVideoDriver(WCHAR const * const pwszDriverDir)
+static RTEXITCODE InstallNt4VideoDriver(WCHAR const * const pwszDriverDir)
 {
     /*
@@ -356 +364 @@
      */
     RTEXITCODE rcExit = RTEXITCODE_FAILURE;
-    SP_DEVINSTALL_PARAMS_W DeviceInstallParams = { sizeof(SP_DEVINSTALL_PARAMS) };
+    SP_DEVINSTALL_PARAMS_W DeviceInstallParams = { sizeof(DeviceInstallParams) };
     if (SetupDiGetDeviceInstallParamsW(hDevInfo, NULL, &DeviceInstallParams))
     {
@@ -362 +370 @@
          * Insert our install parameters and update hDevInfo with them.
          */
-        DeviceInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
+        DeviceInstallParams.cbSize = sizeof(DeviceInstallParams);
         DeviceInstallParams.Flags |= DI_NOFILECOPY /* We did our own file copying */
                                    | DI_DONOTCALLCONFIGMG
@@ -380 +388 @@
                 {
                     HINF hInf = NULL;
-                    rcExit = InstallVideoDriverInner(pwszDriverDir, hDevInfo, &hInf);
+                    rcExit = InstallNt4VideoDriverInner(pwszDriverDir, hDevInfo, &hInf);
 
                     if (hInf)
@@ -479 +487 @@
         if (cwcInstallDir > 0)
         {
-            while (cwcInstallDir > 0 && RTPATH_IS_SEP(wszInstallDir[cwcInstallDir - 1]))
+            while (cwcInstallDir > 0 && !RTPATH_IS_SEP(wszInstallDir[cwcInstallDir - 1]))
                 cwcInstallDir--;
             if (!cwcInstallDir) /* paranoia^3 */
@@ -492 +500 @@
              */
             if (fInstall)
-                rcExit = InstallVideoDriver(wszInstallDir);
+                rcExit = InstallNt4VideoDriver(wszInstallDir);
             else
                 rcExit = UninstallDrivers();