Changeset 108085 in vbox for trunk/src

Timestamp:

Feb 5, 2025 6:05:14 PM (3 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167379

Message:

Windows driver installation: Added installer shim detection by comparing the OS versions found by the API vs. the one found in the registry. Use the one in the registry by default if they differ -- ignore the build version, log an info instead of warning. bugref:10762

File:

• trunk/src/VBox/GuestHost/installation/VBoxWinDrvInst.cpp (modified) (1 diff)

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

@@ -1986 +1986 @@
                      * version which is being reported via API calls. So compare the both OS versions
                      * and prefer the one being reported via the registry if they don't match.
+                     * Ignore the build number (too specific).
                      *
                      * The OS version to use still can be later tweaked using VBoxWinDrvInstSetOsVersion(). */
-                    if (   (pCtx->uOsVer != uRegOsVer)
-                        && RTSYSTEM_NT_VERSION_GET_MAJOR(uRegOsVer) > 4 /* XP+ */)
+                    if (   (   RTSYSTEM_NT_VERSION_GET_MAJOR(pCtx->uOsVer) != RTSYSTEM_NT_VERSION_GET_MAJOR(uRegOsVer)
+                            || RTSYSTEM_NT_VERSION_GET_MINOR(pCtx->uOsVer) != RTSYSTEM_NT_VERSION_GET_MINOR(uRegOsVer))
+                        && RTSYSTEM_NT_VERSION_GET_MAJOR(uRegOsVer) > 4 /* Only XP+ */)
                     {
-                        vboxWinDrvInstLogWarn(pCtx, "Detected Windows version (%u.%u) does not match the one stored in the registry (%u.%u)",
+                        vboxWinDrvInstLogInfo(pCtx, "Detected Windows version (%u.%u) does not match the one stored in the registry (%u.%u)",
                                               RTSYSTEM_NT_VERSION_GET_MAJOR(pCtx->uOsVer),
                                               RTSYSTEM_NT_VERSION_GET_MINOR(pCtx->uOsVer),
                                               RTSYSTEM_NT_VERSION_GET_MAJOR(uRegOsVer),
                                               RTSYSTEM_NT_VERSION_GET_MINOR(uRegOsVer));
+                        vboxWinDrvInstLogInfo(pCtx, "This might be due a compatibility layer or MSI installer engine shimming the Windows version");
 
                         /* Override the OS version from the API with the one found in the registry. */