Changeset 107764 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Jan 15, 2025 9:57:00 AM (4 weeks ago)

Author:

vboxsync

Message:

Windows driver installation/VBoxDrvInst: Added the possibility to manually tweak the OS version to use for (un)installation with VBoxWinDrvInstSetOsVersion(). Can be set via '--debug-os-ver n:n' with VBoxDrvInst.

Location:

trunk/src/VBox/GuestHost/installation

Files:

• VBoxDrvInst.cpp (modified) (7 diffs)
• VBoxWinDrvInst.cpp (modified) (5 diffs)

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

@@ -141 +141 @@
     VBOXDRVINST_INSTALL_OPT_NOT_FORCE,
     VBOXDRVINST_INSTALL_OPT_NOT_SILENT,
-    VBOXDRVINST_INSTALL_OPT_IGNORE_REBOOT
+    VBOXDRVINST_INSTALL_OPT_IGNORE_REBOOT,
+    VBOXDRVINST_INSTALL_OPT_DEBUG_OS_VER
 };
 
@@ -157 +158 @@
     { "--not-force",     VBOXDRVINST_INSTALL_OPT_NOT_FORCE,     RTGETOPT_REQ_NOTHING },
     { "--not-silent",    VBOXDRVINST_INSTALL_OPT_NOT_SILENT,    RTGETOPT_REQ_NOTHING },
-    { "--ignore-reboot", VBOXDRVINST_INSTALL_OPT_IGNORE_REBOOT, RTGETOPT_REQ_NOTHING }
+    { "--ignore-reboot", VBOXDRVINST_INSTALL_OPT_IGNORE_REBOOT, RTGETOPT_REQ_NOTHING },
+    { "--debug-os-ver",  VBOXDRVINST_INSTALL_OPT_DEBUG_OS_VER,  RTGETOPT_REQ_UINT32_PAIR }
 };
 
@@ -414 +416 @@
         case VBOXDRVINST_INSTALL_OPT_NOT_SILENT:    return "Installation will not run in silent mode";
         case VBOXDRVINST_INSTALL_OPT_IGNORE_REBOOT: return "Ignores reboot requirements";
+        case VBOXDRVINST_INSTALL_OPT_DEBUG_OS_VER:  return "Overwrites the detected OS version";
         default:
             break;
@@ -432 +435 @@
     char *pszPnpId = NULL;
     char *pszInfSection = NULL;
+    uint64_t uOsVer = 0;
 
     /* By default we want to force an installation and be silent. */
@@ -487 +491 @@
                 break;
 
+            case VBOXDRVINST_INSTALL_OPT_DEBUG_OS_VER:
+                uOsVer = RTSYSTEM_MAKE_NT_VERSION(ValueUnion.PairU32.uFirst, ValueUnion.PairU32.uSecond,
+                                                  0 /* Build Version */);
+                break;
+
             default:
                 return RTGetOptPrintError(ch, &ValueUnion);
@@ -503 +512 @@
     if (RT_SUCCESS(rc))
     {
+        if (uOsVer)
+            VBoxWinDrvInstSetOsVersion(hWinDrvInst, uOsVer);
+
         rc = VBoxWinDrvInstInstallEx(hWinDrvInst, pszInfFile, pszModel, pszPnpId, fInstall);
         if (RT_SUCCESS(rc))
@@ -712 +724 @@
     RTStrmPrintf(pStrm, "\nExamples:\n");
     RTStrmPrintf(pStrm, "\t%s install   --inf-file C:\\Path\\To\\VBoxUSB.inf\n", pszProcName);
+    RTStrmPrintf(pStrm, "\t%s install   --debug-os-ver 6:0 --inf-file C:\\Path\\To\\VBoxGuest.inf\n", pszProcName);
     RTStrmPrintf(pStrm, "\t%s uninstall --inf -file C:\\Path\\To\\VBoxUSB.inf --pnp-id \"USB\\VID_80EE&PID_CAFE\"\n", pszProcName);
     RTStrmPrintf(pStrm, "\t%s uninstall --model \"VBoxUSB.AMD64\"\n", pszProcName);

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

@@ -160 +160 @@
     /** Whether a reboot is needed in order to perform the current (un)installation. */
     bool                   fReboot;
+    /** OS version to use. Detected on creation. RTSYSTEM_NT_VERSION_GET_XXX style.
+     *  Can be overwritten via VBoxWinDrvInstSetOsVersion(). */
+    uint64_t               uOsVer;
     /** Parameters for (un)installation. */
     VBOXWINDRVINSTPARMS    Parms;
@@ -948 +951 @@
             BOOL fReboot = FALSE;
 
-            uint64_t const uNtVer = RTSystemGetNtVersion();
-
             /*
              * Pre-install driver.
              */
             DWORD dwInstallFlags = 0;
-            if (uNtVer >= RTSYSTEM_MAKE_NT_VERSION(6, 0, 0)) /* for Vista / 2008 Server and up. */
+            if (pCtx->uOsVer >= RTSYSTEM_MAKE_NT_VERSION(6, 0, 0)) /* for Vista / 2008 Server and up. */
             {
                 if (pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_FORCE)
@@ -997 +998 @@
                     {
                         /* Using INSTALLFLAG_NONINTERACTIVE will trigger an invalid parameter error on Windows 2000. */
-                        if (uNtVer >= RTSYSTEM_MAKE_NT_VERSION(5, 1, 0))
+                        if (pCtx->uOsVer >= RTSYSTEM_MAKE_NT_VERSION(5, 1, 0))
                             dwInstallFlags |= INSTALLFLAG_NONINTERACTIVE;
                         else
@@ -1591 +1592 @@
         pCtx->pvUser     = pvUser;
 
-        uint64_t const uNtVer = RTSystemGetNtVersion();
+        pCtx->uOsVer     = RTSystemGetNtVersion(); /* Might be overwritten later via VBoxWinDrvInstSetOsVersion(). */
 
         vboxWinDrvInstLogInfo(pCtx, VBOX_PRODUCT " Version " VBOX_VERSION_STRING " - r%s", RTBldCfgRevisionStr());
-        vboxWinDrvInstLogInfo(pCtx, "Detected Windows version %d.%d.%d (%s)", RTSYSTEM_NT_VERSION_GET_MAJOR(uNtVer),
-                                                                              RTSYSTEM_NT_VERSION_GET_MINOR(uNtVer),
-                                                                              RTSYSTEM_NT_VERSION_GET_BUILD(uNtVer),
+        vboxWinDrvInstLogInfo(pCtx, "Detected Windows version %d.%d.%d (%s)", RTSYSTEM_NT_VERSION_GET_MAJOR(pCtx->uOsVer),
+                                                                              RTSYSTEM_NT_VERSION_GET_MINOR(pCtx->uOsVer),
+                                                                              RTSYSTEM_NT_VERSION_GET_BUILD(pCtx->uOsVer),
                                                                               RTBldCfgTargetArch());
 
@@ -1685 +1686 @@
 
 /**
+ * Sets (overwrites) the current OS version used for the (un)installation code.
+ *
+ * @param   hDrvInst            Windows driver installer handle.
+ * @param   uOsVer              OS version to set. RTSYSTEM_MAKE_NT_VERSION style.
+ */
+void VBoxWinDrvInstSetOsVersion(VBOXWINDRVINST hDrvInst, uint64_t uOsVer)
+{
+    PVBOXWINDRVINSTINTERNAL pCtx = hDrvInst;
+    VBOXWINDRVINST_VALID_RETURN_VOID(pCtx);
+
+    pCtx->uOsVer = uOsVer;
+
+    vboxWinDrvInstLogInfo(pCtx, "Set OS version to: %u.%u\n", RTSYSTEM_NT_VERSION_GET_MAJOR(pCtx->uOsVer),
+                                                              RTSYSTEM_NT_VERSION_GET_MINOR(pCtx->uOsVer));
+}
+
+/**
  * Sets the verbosity of a Windows driver installer instance.
  *