Changeset 107059 in vbox

Timestamp:

Nov 20, 2024 1:50:22 PM (2 months ago)

Author:

vboxsync

Message:

Windows driver installation: Added VBOX_WIN_DRIVERINSTALL_F_DRYRUN to make it possible to run in dry-run mode (no actual installation performed). Required for testcases. bugref:10762

Location:

trunk

Files:

• include/VBox/GuestHost/VBoxWinDrvInst.h (modified) (1 diff)
• src/VBox/GuestHost/installation/VBoxWinDrvInst.cpp (modified) (8 diffs)

trunk/include/VBox/GuestHost/VBoxWinDrvInst.h

@@ -85 +85 @@
 /** Force driver installation, even if a newer driver version already is installed (overwrite). */
 #define VBOX_WIN_DRIVERINSTALL_F_FORCE      RT_BIT(1)
+/** Run in dry mode (no real (un)installation performed). */
+#define VBOX_WIN_DRIVERINSTALL_F_DRYRUN     RT_BIT(2)
 /** Validation mask. */
-#define VBOX_WIN_DRIVERINSTALL_F_VALID_MASK 0x3
+#define VBOX_WIN_DRIVERINSTALL_F_VALID_MASK 0x7
 
 int VBoxWinDrvInstCreate(PVBOXWINDRVINST hDrvInst);

trunk/src/VBox/GuestHost/installation/VBoxWinDrvInst.cpp

@@ -1011 +1011 @@
                 vboxWinDrvInstLogVerbose(pCtx, 1, "Using g_pfnDiInstallDriverW(), dwInstallFlags=%#x", dwInstallFlags);
 
-                fRc = g_pfnDiInstallDriverW(NULL /* hWndParent */, pParms->pwszInfFile, dwInstallFlags, &fReboot);
+                if (!(pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_DRYRUN))
+                    fRc = g_pfnDiInstallDriverW(NULL /* hWndParent */, pParms->pwszInfFile, dwInstallFlags, &fReboot);
+                else
+                    fRc = TRUE;
                 if (!fRc)
                 {
@@ -1056 +1059 @@
                                              pParms->u.UnInstall.pwszPnpId, pParms->pwszInfFile, dwInstallFlags);
 
-                    fRc = g_pfnUpdateDriverForPlugAndPlayDevicesW(NULL /* hWndParent */,
-                                                                  pParms->u.UnInstall.pwszPnpId,
-                                                                  pParms->pwszInfFile, dwInstallFlags, &fReboot);
+                    if (!(pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_DRYRUN))
+                        fRc = g_pfnUpdateDriverForPlugAndPlayDevicesW(NULL /* hWndParent */,
+                                                                      pParms->u.UnInstall.pwszPnpId,
+                                                                      pParms->pwszInfFile, dwInstallFlags, &fReboot);
+                    else
+                        fRc = TRUE;
+
                     if (!fRc)
                     {
@@ -1101 +1108 @@
                     {
                         RTUTF16 wszDstPathAbs[RTPATH_MAX] = { 0 };
-                        fRc = g_pfnSetupCopyOEMInfW(wszInfFileAbs, wszSrcPathAbs, SPOST_PATH, 0,
-                                                    wszDstPathAbs, RT_ELEMENTS(wszDstPathAbs), NULL, NULL);
+                        if (!(pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_DRYRUN))
+                            fRc = g_pfnSetupCopyOEMInfW(wszInfFileAbs, wszSrcPathAbs, SPOST_PATH, 0,
+                                                        wszDstPathAbs, RT_ELEMENTS(wszDstPathAbs), NULL, NULL);
+                        else
+                            fRc = TRUE;
 
                         vboxWinDrvInstLogVerbose(pCtx, 1, "   INF file: %ls", wszInfFileAbs);
@@ -1445 +1455 @@
             vboxWinDrvInstLogVerbose(pCtx, 1, "Using DiUninstallDriverW()");
             BOOL fReboot = FALSE;
-            fRc = g_pfnDiUninstallDriverW(NULL /* hWndParent */, pCur->wszInfFile, 0 /* Flags */, &fReboot);
+            if (!(pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_DRYRUN))
+                fRc = g_pfnDiUninstallDriverW(NULL /* hWndParent */, pCur->wszInfFile, 0 /* Flags */, &fReboot);
+            else
+                fRc = TRUE;
             if (fRc)
                 pCtx->fReboot = RT_BOOL(fReboot);
@@ -1466 +1479 @@
                 dwUninstallFlags |= SUOI_FORCEDELETE;
 
-            fRc = g_pfnSetupUninstallOEMInfW(pCur->wszInfFile, dwUninstallFlags, NULL /* pReserved */);
+            if (!(pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_DRYRUN))
+                fRc = g_pfnSetupUninstallOEMInfW(pCur->wszInfFile, dwUninstallFlags, NULL /* pReserved */);
+            else
+                fRc = FALSE;
         }
 
@@ -1550 +1566 @@
     bool const fInstall = pParms->enmMode == VBOXWINDRVINSTMODE_INSTALL
                        || pParms->enmMode == VBOXWINDRVINSTMODE_INSTALL_INFSECTION;
+
+    if (pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_DRYRUN)
+        vboxWinDrvInstLogWarn(pCtx, "Dry-run mode active -- no installation performed!");
 
     const char * const pszLogAction = fInstall ? "Installing" : "Uninstalling";
@@ -1563 +1582 @@
     {
         vboxWinDrvInstLogInfo(pCtx, "Setting non-interactive mode ...");
-        g_pfnSetupSetNonInteractiveMode(TRUE /* fEnable */);
+        if (!(pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_DRYRUN))
+            g_pfnSetupSetNonInteractiveMode(TRUE /* fEnable */);
     }
 
@@ -1772 +1792 @@
     int rc = RTPathReal(pszInfFile, szInfPathAbs, sizeof(szInfPathAbs));
     if (RT_SUCCESS(rc))
+    {
         rc = RTStrToUtf16(szInfPathAbs, &pCtx->Parms.pwszInfFile);
-
-    if (RT_FAILURE(rc))
-        vboxWinDrvInstLogError(pCtx, "Failed to build path for INF file \"%s\", rc=%Rrc", pszInfFile, rc);
+        if (RT_FAILURE(rc))
+            vboxWinDrvInstLogError(pCtx, "Failed to build path for INF file \"%s\", rc=%Rrc", pszInfFile, rc);
+    }
+    else
+        vboxWinDrvInstLogError(pCtx, "Determining real path for INF file \"%s\" failed, rc=%Rrc", pszInfFile, rc);
 
     if (RT_SUCCESS(rc) && pszModel) /* Model is optional. */