Changeset 106839 in vbox

Timestamp:

Nov 5, 2024 5:22:30 PM (7 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

Location:

trunk

Files:

• include/VBox/GuestHost/VBoxWinDrvInst.h (modified) (1 diff)
• src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp (modified) (1 diff)
• src/VBox/GuestHost/installation/VBoxWinDrvCommon.cpp (modified) (4 diffs)
• src/VBox/GuestHost/installation/VBoxWinDrvInst.cpp (modified) (20 diffs)
• src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (1 diff)

trunk/include/VBox/GuestHost/VBoxWinDrvInst.h

@@ -95 +95 @@
 unsigned VBoxWinDrvInstSetVerbosity(VBOXWINDRVINST hDrvInst, uint8_t uVerbosity);
 void VBoxWinDrvInstSetLogCallback(VBOXWINDRVINST hDrvInst, PFNVBOXWINDRIVERLOGMSG pfnLog, void *pvUser);
-int VBoxWinDrvInstInstall(VBOXWINDRVINST hDrvInst, const char *pszInfFile, const char *pszPnpId, uint32_t fFlags);
+int VBoxWinDrvInstInstallEx(VBOXWINDRVINST hDrvInst, const char *pszInfFile, const char *pszModel, const char *pszPnpId, uint32_t fFlags);
+int VBoxWinDrvInstInstall(VBOXWINDRVINST hDrvInst, const char *pszInfFile, uint32_t fFlags);
 int VBoxWinDrvInstInstallExecuteInf(VBOXWINDRVINST hDrvInst, const char *pszInfFile, const char *pszSection, uint32_t fFlags);
 int VBoxWinDrvInstUninstall(VBOXWINDRVINST hDrvInst, const char *pszInfFile, const char *pszModel, const char *pszPnPId, uint32_t fFlags);

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

@@ -617 +617 @@
             if (RT_SUCCESS(rc))
             {
-                rc = VBoxWinDrvInstInstall(hWinDrvInst, pszInfFile, pszPnpId,
-                                           VBOX_WIN_DRIVERINSTALL_F_SILENT | VBOX_WIN_DRIVERINSTALL_F_FORCE);
+                rc = VBoxWinDrvInstInstallEx(hWinDrvInst, pszInfFile, NULL /* pszModel */, pszPnpId,
+                                             VBOX_WIN_DRIVERINSTALL_F_SILENT | VBOX_WIN_DRIVERINSTALL_F_FORCE);
 
                 VBoxWinDrvInstDestroy(hWinDrvInst);

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

@@ -139 +139 @@
  *
  * @returns VBox status code.
+ * @retval  VERR_NOT_FOUND if no model has been found.
  * @param   hInf                INF handle to use.
  * @param   ppwszValue          Where to return the model name on success.
  * @param   pcwcValue           Where to return the number of characters for \a ppwszValue. Optional an can be NULL.
+ *
+ * @note    Only for non-"primitive" drivers.
  */
 int VBoxWinDrvInfQueryModelsSectionName(HINF hInf, PRTUTF16 *ppwszValue, PDWORD pcwcValue)
@@ -152 +155 @@
     static PRTUTF16 s_apwszSections[] =
     {
-        /* The more specific (using decorations), the better. Try these first. */
-        L"Manufacturer"     VBOXWINDRVINF_DOT_NT_NATIVE_ARCH_STR,
-        L"DefaultInstall"   VBOXWINDRVINF_DOT_NT_NATIVE_ARCH_STR,
-        L"DefaultUninstall" VBOXWINDRVINF_DOT_NT_NATIVE_ARCH_STR,
-        /* Try undecorated sections last. */
+        /* Most likely (and doesn't have a decoration). */
         L"Manufacturer",
-        L"DefaultInstall",
-        L"DefaultUninstall"
+        L"Manufacturer" VBOXWINDRVINF_DOT_NT_NATIVE_ARCH_STR,
+        /* Note: Don't search for "DefaultInstall" or "DefaultUninstall" sections here, as
+         *       those only are used for "primitive" drivers. */
     };
 
@@ -419 +419 @@
  *
  * @returns VBox status code.
+ * @retval  VERR_NOT_FOUND if no model has been found.
  * @param   hInf                INF handle to use.
  * @param   ppwszModel          Where to return the model on success.
  *                              Needs to be free'd by RTUtf16Free().
+ *
+ * @note    Only for non-"primitive" drivers.
  */
 int VBoxWinDrvInfQueryFirstModel(HINF hInf, PRTUTF16 *ppwszModel)
@@ -434 +437 @@
  *
  * @returns VBox status code.
+ * @retval  VERR_NOT_FOUND if no PnP ID has been found.
  * @param   hInf                INF handle to use.
  * @param   pwszModel           Model to query PnP ID for.
  * @param   ppwszPnPId          Where to return the PnP ID on success.
  *                              Needs to be free'd by RTUtf16Free().
+ *
+ * @note    Only for non-"primitive" drivers.
  */
 int VBoxWinDrvInfQueryFirstPnPId(HINF hInf, PRTUTF16 pwszModel, PRTUTF16 *ppwszPnPId)
 {
+    if (!pwszModel) /* No model given? Bail out early. */
+        return VERR_NOT_FOUND;
+
     *ppwszPnPId = NULL;
 

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

@@ -647 +647 @@
         case VBOXWINDRVINSTMODE_UNINSTALL:
         {
+            RTUtf16Free(pParms->u.UnInstall.pwszModel);
+            pParms->u.UnInstall.pwszModel = NULL;
             RTUtf16Free(pParms->u.UnInstall.pwszPnpId);
             pParms->u.UnInstall.pwszPnpId = NULL;
@@ -758 +760 @@
  * @param   pwszInfPathAbs      Absolute path of INF file to use for [un]installation.
  * @param   pwszSection         Section to invoke for [un]installation.
+ *                              If NULL, the "DefaultInstall" / "DefaultUninstall" section will be tried.
  * @param   pfnCallback         Callback to invoke for each found section.
  */
@@ -763 +766 @@
                                    PFNVBOXWINDRVINST_TRYINFSECTION_CALLBACK pfnCallback)
 {
-    vboxWinDrvInstLogVerbose(pCtx, 1, "Trying section \"%ls\"", pwszSection);
+    if (pwszSection)
+        vboxWinDrvInstLogVerbose(pCtx, 1, "Trying section \"%ls\"", pwszSection);
 
     /* Sorted by most likely-ness. */
@@ -812 +816 @@
                 vboxWinDrvInstLogError(pCtx, "Trying INF section failed with %Rrc", rc);
         }
+
+        if (RT_SUCCESS(rc)) /* Bail out if callback above succeeded. */
+            break;
     }
 
     if (rc == VERR_NOT_FOUND)
     {
-        vboxWinDrvInstLogWarn(pCtx, "No matching section to try found -- buggy driver?");
+        vboxWinDrvInstLogWarn(pCtx, "No matching sections to try found -- buggy driver?");
         rc = VINF_SUCCESS;
     }
@@ -1058 +1065 @@
 static int vboxWinDrvInstallPerform(PVBOXWINDRVINSTINTERNAL pCtx, PVBOXWINDRVINSTPARMS pParms)
 {
-    int rc = VINF_SUCCESS;
+    int rc = vboxWinDrvParmsDetermine(pCtx, pParms, false /* fForce */);
+    if (RT_FAILURE(rc))
+        return rc;
 
     switch (pParms->enmMode)
@@ -1076 +1085 @@
              */
             DWORD dwInstallFlags = 0;
-            if (uNtVer >= RTSYSTEM_MAKE_NT_VERSION(6, 0, 0)) /* for Vista / 2008 Server and up. */
+            if (uNtVer >= RTSYSTEM_MAKE_NT_VERSION(66, 0, 0)) /* for Vista / 2008 Server and up. */
             {
                 if (pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_FORCE)
@@ -1084 +1093 @@
 
                 fRc = g_pfnDiInstallDriverW(NULL /* hWndParent */, pParms->pwszInfFile, dwInstallFlags, &fReboot);
+                if (!fRc)
+                {
+                    DWORD const dwErr = GetLastError();
+
+                    /*
+                     * Work around an error code wich only appears on old(er) Windows Server editions (e.g. 2012 R2 or 2016)
+                     * where SetupAPI tells "unable to mark devices that match new inf", which ultimately results in
+                     * ERROR_LINE_NOT_FOUND. This probably is because of primitive drivers which don't have a PnP ID set in
+                     * the INF file.
+                     *
+                     * pnputil.exe also gives the same error in the SetupAPI log when handling the very same INF file.
+                     *
+                     * So skip this error and pretend everything is fine. */
+                    if (dwErr == ERROR_LINE_NOT_FOUND)
+                        fRc = true;
+
+                    if (!fRc)
+                        rc = vboxWinDrvInstLogLastError(pCtx, "DiInstallDriverW() failed");
+                }
+
                 if (fRc)
                 {
-                    rc = vboxWinDrvParmsDetermine(pCtx, pParms, true /* fForce */);
-                    if (RT_SUCCESS(rc))
-                        /* rc ignored, keep going */ vboxWinDrvTryInfSection(pCtx,
-                                                                             pParms->pwszInfFile, pParms->u.UnInstall.pwszModel,
-                                                                             vboxWinDrvInstallTryInfSectionCallback);
+                    rc = vboxWinDrvTryInfSection(pCtx,
+                                                 pParms->pwszInfFile, pParms->u.UnInstall.pwszModel,
+                                                 vboxWinDrvInstallTryInfSectionCallback);
                 }
-                else
-                    rc = vboxWinDrvInstLogLastError(pCtx, "DiInstallDriverW() failed");
             }
             else /* For Windows 2000 and below. */
             {
-                /* If no PnP ID (Hardware ID) is explicitly given, try guessing the PnP ID from the given INF file. */
-                size_t cchPnpId = RTUtf16Len(pParms->u.UnInstall.pwszPnpId);
-                if (   !cchPnpId
-                    || cchPnpId > MAX_DEVICE_ID_LEN)
-                {
-                    vboxWinDrvInstLogInfo(pCtx, "PnP ID not specified explicitly or invalid, determining from given INF file");
-                    rc = vboxWinDrvParmsDetermine(pCtx, pParms, true /* fForce */);
-                    if (RT_SUCCESS(rc))
-                        cchPnpId = RTUtf16Len(pParms->u.UnInstall.pwszPnpId);
-                }
-
-                if (RT_FAILURE(rc))
-                    break;
-
-                /* Still not having any PnP ID? */
-                if (cchPnpId == 0)
-                {
-                    vboxWinDrvInstLogError(pCtx, "No (valid) PnP ID found; can't continue");
-                    rc = VERR_NOT_FOUND;
-                    break;
-                }
-                else
+                bool fPreInstall     = false; /* Whether to pre-install the driver. */
+                bool fInstallSection = false; /* Whether to install the section of the specified driver model. */
+
+                if (pParms->u.UnInstall.pwszPnpId)
                 {
                     if (pParms->fFlags & VBOX_WIN_DRIVERINSTALL_F_SILENT)
@@ -1147 +1154 @@
                                 vboxWinDrvInstLogInfo(pCtx, "Device (\"%ls\") not found (yet), pre-installing driver ...",
                                                       pParms->u.UnInstall.pwszPnpId);
-
-                                RTUTF16 wszInfFileAbs[RTPATH_MAX] = { 0 };
-                                LPWSTR  pwszInfFile = NULL;
-                                if (   GetFullPathNameW(pParms->pwszInfFile, RT_ELEMENTS(wszInfFileAbs), wszInfFileAbs, &pwszInfFile)
-                                    && pwszInfFile)
-                                {
-                                    RTUTF16 wszSrcPathAbs[RTPATH_MAX] = { 0 };
-                                    rc = RTUtf16CopyEx(wszSrcPathAbs, RT_ELEMENTS(wszSrcPathAbs), wszInfFileAbs,
-                                                       RTUtf16Len(wszInfFileAbs) - RTUtf16Len(pwszInfFile));
-                                    if (RT_SUCCESS(rc))
-                                    {
-                                        RTUTF16 wszDstPathAbs[RTPATH_MAX] = { 0 };
-                                        fRc = g_pfnSetupCopyOEMInfW(wszInfFileAbs, wszSrcPathAbs, SPOST_PATH, 0,
-                                                                    wszDstPathAbs, RT_ELEMENTS(wszDstPathAbs), NULL, NULL);
-
-                                        vboxWinDrvInstLogVerbose(pCtx, 1, "   INF file: %ls", wszInfFileAbs);
-                                        vboxWinDrvInstLogVerbose(pCtx, 1, "Source path: %ls", wszSrcPathAbs);
-                                        vboxWinDrvInstLogVerbose(pCtx, 1, "  Dest path: %ls", wszDstPathAbs);
-
-                                        if (fRc)
-                                            vboxWinDrvInstLogInfo(pCtx, "Copying OEM INF successful");
-                                        else
-                                            rc = vboxWinDrvInstLogLastError(pCtx, "Installation(SetupCopyOEMInfW) failed");
-                                    }
-                                }
-                                else
-                                    rc = vboxWinDrvInstLogLastError(pCtx, "GetFullPathNameW() failed");
+                                fPreInstall = true;
                                 break;
                             }
@@ -1179 +1160 @@
                             case ERROR_NO_DRIVER_SELECTED:
                             {
-                                rc = vboxWinDrvParmsDetermine(pCtx, pParms, true /* fForce */);
-                                if (RT_SUCCESS(rc))
-                                {
-                                    if (pParms->u.UnInstall.pwszModel)
-                                        rc = vboxWinDrvInstallInfSectionEx(pCtx, pCtx->Parms.pwszInfFile,
-                                                                           pParms->u.UnInstall.pwszModel);
-                                }
+                                vboxWinDrvInstLogWarn(pCtx, "Not able to select a driver from the given INF, using given model");
+                                fInstallSection = true;
                                 break;
                             }
@@ -1195 +1171 @@
                     }
                 }
+                else
+                {
+                    fPreInstall     = true;
+                    fInstallSection = true;
+                }
+
+                if (fPreInstall)
+                {
+                    RTUTF16 wszInfFileAbs[RTPATH_MAX] = { 0 };
+                    LPWSTR  pwszInfFile = NULL;
+                    if (   GetFullPathNameW(pParms->pwszInfFile, RT_ELEMENTS(wszInfFileAbs), wszInfFileAbs, &pwszInfFile)
+                        && pwszInfFile)
+                    {
+                        RTUTF16 wszSrcPathAbs[RTPATH_MAX] = { 0 };
+                        rc = RTUtf16CopyEx(wszSrcPathAbs, RT_ELEMENTS(wszSrcPathAbs), wszInfFileAbs,
+                                           RTUtf16Len(wszInfFileAbs) - RTUtf16Len(pwszInfFile));
+                        if (RT_SUCCESS(rc))
+                        {
+                            RTUTF16 wszDstPathAbs[RTPATH_MAX] = { 0 };
+                            fRc = g_pfnSetupCopyOEMInfW(wszInfFileAbs, wszSrcPathAbs, SPOST_PATH, 0,
+                                                        wszDstPathAbs, RT_ELEMENTS(wszDstPathAbs), NULL, NULL);
+
+                            vboxWinDrvInstLogVerbose(pCtx, 1, "   INF file: %ls", wszInfFileAbs);
+                            vboxWinDrvInstLogVerbose(pCtx, 1, "Source path: %ls", wszSrcPathAbs);
+                            vboxWinDrvInstLogVerbose(pCtx, 1, "  Dest path: %ls", wszDstPathAbs);
+
+                            if (fRc)
+                                vboxWinDrvInstLogInfo(pCtx, "Copying OEM INF successful");
+                            else
+                                rc = vboxWinDrvInstLogLastError(pCtx, "Installation(SetupCopyOEMInfW) failed");
+                        }
+                    }
+                    else
+                        rc = vboxWinDrvInstLogLastError(pCtx, "GetFullPathNameW() failed");
+                }
+
+                if (fInstallSection)
+                {
+                    rc = vboxWinDrvTryInfSection(pCtx,
+                                                 pParms->pwszInfFile, pParms->u.UnInstall.pwszModel,
+                                                 vboxWinDrvInstallTryInfSectionCallback);
+                }
             }
 
@@ -1218 +1236 @@
 
 /**
+ * Returns whether the given (in)installation parameters are valid or not.
+ *
+ * @returns \c true if valid, \c false if not.
+ * @param   pCtx                Windows driver installer context.
+ * @param   pParms              Windows driver (un)installation parameters to validate.
+ */
+static bool vboxWinDrvParmsAreValid(PVBOXWINDRVINSTINTERNAL pCtx, PVBOXWINDRVINSTPARMS pParms)
+{
+    if (pParms->u.UnInstall.pwszPnpId)
+    {
+        size_t const cchPnpId = RTUtf16Len(pParms->u.UnInstall.pwszPnpId);
+        if (   !cchPnpId
+            || cchPnpId > MAX_DEVICE_ID_LEN)
+        {
+            vboxWinDrvInstLogVerbose(pCtx, 1, "PnP ID not specified explicitly or invalid");
+            return false;
+        }
+    }
+
+    return true;
+}
+
+/**
  * Determines (un)installation parameters from a given set of parameters, logged.
  *
@@ -1225 +1266 @@
  * @param   pParms              Windows driver installation parameters to determine for.
  * @param   fForce              Whether to overwrite already set parameters or not.
+ *
+ * @note    Only can deal with the first model / PnP ID found for now.
  */
 static int vboxWinDrvParmsDetermine(PVBOXWINDRVINSTINTERNAL pCtx, PVBOXWINDRVINSTPARMS pParms, bool fForce)
@@ -1240 +1283 @@
             if (!pParms->u.UnInstall.pwszModel || fForce)
             {
-                vboxWinDrvInstLogVerbose(pCtx, 1, "Determining first model ...");
-                VBoxWinDrvInfQueryFirstModel(hInf, &pParms->u.UnInstall.pwszModel);
+                vboxWinDrvInstLogVerbose(pCtx, 1, "Determining model ...");
+                if (fForce)
+                {
+                    RTUtf16Free(pParms->u.UnInstall.pwszModel);
+                    pParms->u.UnInstall.pwszModel = NULL;
+                }
+                rc = VBoxWinDrvInfQueryFirstModel(hInf, &pParms->u.UnInstall.pwszModel);
+                if (rc == VERR_NOT_FOUND)
+                {
+                    vboxWinDrvInstLogVerbose(pCtx, 1, "No model found, probably a primitive driver");
+                    rc = VINF_SUCCESS; /* Reset rc, non-fatal. */
+                }
             }
             if (!pParms->u.UnInstall.pwszPnpId  || fForce)
             {
-                vboxWinDrvInstLogVerbose(pCtx, 1, "Determining first PnP ID ...");
-                VBoxWinDrvInfQueryFirstPnPId(hInf,
-                                             pParms->u.UnInstall.pwszModel, &pParms->u.UnInstall.pwszPnpId);
+                if (pParms->u.UnInstall.pwszModel)
+                {
+                    vboxWinDrvInstLogVerbose(pCtx, 1, "Determining PnP ID ...");
+                    if (fForce)
+                    {
+                        RTUtf16Free(pParms->u.UnInstall.pwszPnpId);
+                        pParms->u.UnInstall.pwszPnpId = NULL;
+                    }
+                    /* ignore rc */ VBoxWinDrvInfQueryFirstPnPId(hInf,
+                                                                 pParms->u.UnInstall.pwszModel, &pParms->u.UnInstall.pwszPnpId);
+                }
+                else
+                    vboxWinDrvInstLogVerbose(pCtx, 1, "No first model found/set, skipping determining PnP ID");
             }
             VBoxWinDrvInfClose(hInf);
@@ -1258 +1321 @@
              || pParms->u.UnInstall.pwszPnpId)
     {
+        /* Nothing to do for us here. */
         rc = VINF_SUCCESS;
     }
@@ -1439 +1503 @@
             {
                 rc = vboxWinDrvUninstallFromDriverStore(pCtx, pParms, pList);
-                if (RT_SUCCESS(rc))
-                {
-
-                }
 
                 VBoxWinDrvStoreListFree(pList);
@@ -1494 +1554 @@
     }
 
+    if (!vboxWinDrvParmsAreValid(pCtx, pParms))
+    {
+        vboxWinDrvInstLogError(pCtx, "%s parameters are invalid, can't continue", fInstall ? "Installation" : "Uninstallation");
+        return VERR_INVALID_PARAMETER;
+    }
+
     int rc;
     if (fInstall)
@@ -1510 +1576 @@
         }
     }
-    else
-        vboxWinDrvInstLogError(pCtx, "Unable to %sinstall driver, rc=%Rrc", fInstall ? "" : "un", rc);
+
+    /* Note: Call vboxWinDrvInstLogEx() to not increase the error/warn count here. */
+    if (pCtx->cErrors)
+        vboxWinDrvInstLogEx(pCtx, VBOXWINDRIVERLOGTYPE_ERROR, "%sstalling driver(s) failed with %u errors, %u warnings (rc=%Rrc)",
+                            fInstall ? "In" : "Unin", pCtx->cErrors, pCtx->cWarnings, rc);
+    else if (pCtx->cWarnings)
+        vboxWinDrvInstLogEx(pCtx, VBOXWINDRIVERLOGTYPE_WARN, "%sstalling driver(s) succeeded with %u warnings",
+                            fInstall ? "In" : "Unin", pCtx->cWarnings);
 
     return rc;
@@ -1665 +1737 @@
 
 /**
- * Installs a driver.
+ * Installs a driver, extended version.
  *
  * @returns VBox status code.
  * @param   hDrvInst            Windows driver installer handle to use.
  * @param   pszInfFile          INF file to use.
+ * @param   pszModel            Model name to use. Optional and can be NULL.
  * @param   pszPnpId            PnP ID to use. NT-style wildcards supported. Optional and can be NULL.
  * @param   fFlags              Installation flags (of type VBOX_WIN_DRIVERINSTALL_F_XXX) to use.
  */
-int VBoxWinDrvInstInstall(VBOXWINDRVINST hDrvInst, const char *pszInfFile, const char *pszPnpId, uint32_t fFlags)
+int VBoxWinDrvInstInstallEx(VBOXWINDRVINST hDrvInst,
+                            const char *pszInfFile, const char *pszModel, const char *pszPnpId, uint32_t fFlags)
 {
     PVBOXWINDRVINSTINTERNAL pCtx = hDrvInst;
@@ -1691 +1765 @@
         vboxWinDrvInstLogError(pCtx, "Failed to build path for INF file \"%s\", rc=%Rrc", pszInfFile, rc);
 
-    if (RT_SUCCESS(rc) && pszPnpId) /* PnP ID is optional. */
+    if (RT_SUCCESS(rc) && pszModel) /* Model is optional. */
+        rc = RTStrToUtf16(pszModel, &pCtx->Parms.u.UnInstall.pwszModel);
+    if (RT_SUCCESS(rc) && pszPnpId) /* Ditto. */
         rc = RTStrToUtf16(pszPnpId, &pCtx->Parms.u.UnInstall.pwszPnpId);
 
@@ -1708 +1784 @@
 
     return rc;
+}
+
+/**
+ * Installs a driver.
+ *
+ * @returns VBox status code.
+ * @param   hDrvInst            Windows driver installer handle to use.
+ * @param   pszInfFile          INF file to use.
+ * @param   fFlags              Installation flags (of type VBOX_WIN_DRIVERINSTALL_F_XXX) to use.
+ *
+ * @note    This function tries determining the model / PnP ID from the given INF file.
+ *          To control the behavior exactly, use VBoxWinDrvInstInstallEx().
+ */
+int VBoxWinDrvInstInstall(VBOXWINDRVINST hDrvInst, const char *pszInfFile, uint32_t fFlags)
+{
+    return VBoxWinDrvInstInstallEx(hDrvInst, pszInfFile, NULL /* pszModel */, NULL /* pszPnpId */, fFlags);
 }
 

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);
             }