Changeset 106839 in vbox for trunk/src/VBox/Installer/win/InstallHelper

Timestamp:

Nov 5, 2024 5:22:30 PM (5 months ago)

Author:

vboxsync

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

165750

Message:

Windows driver installation: Made it a bit smarter wrt model / PnP ID detection within files. bugref:10762

File:

• trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (1 diff)

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -1472 +1472 @@
             || rc == VERR_NOT_FOUND) /* VBoxDrvInstInfSection is optional. */
         {
-            char *pszPnpId = NULL;
-            rc = VBoxMsiQueryPropUtf8(hModule, "VBoxDrvInstPnpId", &pszPnpId);
+            char *pszModel = NULL;
+            rc = VBoxMsiQueryPropUtf8(hModule, "VBoxDrvInstModel", &pszModel);
             if (   RT_SUCCESS(rc)
-                || rc == VERR_NOT_FOUND) /* VBoxDrvInstHwId is optional. */
-            {
-                uint32_t fFlags = VBOX_WIN_DRIVERINSTALL_F_NONE;
-
-                DWORD dwVal;
-                rc = VBoxMsiQueryPropInt32(hModule, "VBoxDrvInstFlagForce", &dwVal);
-                if (RT_SUCCESS(rc))
-                    fFlags |= VBOX_WIN_DRIVERINSTALL_F_FORCE;
-                rc = VBoxMsiQueryPropInt32(hModule, "VBoxDrvInstFlagSilent", &dwVal);
-                if (RT_SUCCESS(rc))
-                    fFlags |= VBOX_WIN_DRIVERINSTALL_F_SILENT;
-
-                VBOXWINDRVINST hWinDrvInst;
-                rc = VBoxWinDrvInstCreateEx(&hWinDrvInst, 1 /* uVerbostiy */, &vboxWinDrvInstLogCallback, &hModule /* pvUser */);
-                if (RT_SUCCESS(rc))
+                || rc == VERR_NOT_FOUND) /* VBoxDrvInstModel is optional. */
+            {
+                char *pszPnpId = NULL;
+                rc = VBoxMsiQueryPropUtf8(hModule, "VBoxDrvInstPnpId", &pszPnpId);
+                if (   RT_SUCCESS(rc)
+                    || rc == VERR_NOT_FOUND) /* VBoxDrvInstPnpId is optional. */
                 {
-                    if (pszInfSection && *pszInfSection)
-                        rc = VBoxWinDrvInstInstallExecuteInf(hWinDrvInst, pszInfFile, pszInfSection, fFlags);
-                    else
-                        rc = VBoxWinDrvInstInstall(hWinDrvInst, pszInfFile, pszPnpId, fFlags);
-
-                    VBoxWinDrvInstDestroy(hWinDrvInst);
+                    uint32_t fFlags = VBOX_WIN_DRIVERINSTALL_F_NONE;
+
+                    DWORD dwVal;
+                    rc = VBoxMsiQueryPropInt32(hModule, "VBoxDrvInstFlagForce", &dwVal);
+                    if (RT_SUCCESS(rc))
+                        fFlags |= VBOX_WIN_DRIVERINSTALL_F_FORCE;
+                    rc = VBoxMsiQueryPropInt32(hModule, "VBoxDrvInstFlagSilent", &dwVal);
+                    if (RT_SUCCESS(rc))
+                        fFlags |= VBOX_WIN_DRIVERINSTALL_F_SILENT;
+
+                    VBOXWINDRVINST hWinDrvInst;
+                    rc = VBoxWinDrvInstCreateEx(&hWinDrvInst, 1 /* uVerbostiy */, &vboxWinDrvInstLogCallback, &hModule /* pvUser */);
+                    if (RT_SUCCESS(rc))
+                    {
+                        if (pszInfSection && *pszInfSection)
+                            rc = VBoxWinDrvInstInstallExecuteInf(hWinDrvInst, pszInfFile, pszInfSection, fFlags);
+                        else
+                            rc = VBoxWinDrvInstInstallEx(hWinDrvInst, pszInfFile, pszModel, pszPnpId, fFlags);
+
+                        VBoxWinDrvInstDestroy(hWinDrvInst);
+                    }
+
+                    RTStrFree(pszPnpId);
                 }
 
-                RTStrFree(pszPnpId);
+                RTStrFree(pszModel);
             }