Changeset 106869 in vbox for trunk/src

Timestamp:

Nov 7, 2024 9:40:41 AM (3 weeks ago)

Author:

vboxsync

Message:

Windows driver installation: Renamed VBoxWinDrvInfQueryModelsSectionName() -> VBoxWinDrvInfQueryModel(), implemented better detection of driver models which have an extended decoration. Added VBoxWinDrvInfQueryInstallSection[Ex](). bugref:10762

Location:

trunk/src/VBox/GuestHost/installation

Files:

• VBoxWinDrvCommon.cpp (modified) (7 diffs)
• VBoxWinDrvCommon.h (modified) (1 diff)

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

@@ -37 +37 @@
 #include <iprt/assert.h>
 #include <iprt/dir.h>
-#include <iprt/errcore.h>
 #include <iprt/ldr.h>
 #include <iprt/list.h>
@@ -47 +46 @@
 #include <iprt/utf16.h>
 
-#ifdef DEBUG
-# include <iprt/stream.h>
-#endif
+#include <VBox/err.h> /* For VERR_PLATFORM_ARCH_NOT_SUPPORTED.*/
 
 #include "VBoxWinDrvCommon.h"
@@ -136 +133 @@
 
 /**
- * Queries for the model name in an INF file.
+ * Queries a model name from an INF file.
  *
  * @returns VBox status code.
  * @retval  VERR_NOT_FOUND if no model has been found.
  * @param   hInf                INF handle to use.
+ * @param   uIndex              Index of model to query.
+ *                              Currently only the first model (index 0) is supported.
  * @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.
@@ -146 +145 @@
  * @note    Only for non-"primitive" drivers.
  */
-int VBoxWinDrvInfQueryModelsSectionName(HINF hInf, PRTUTF16 *ppwszValue, PDWORD pcwcValue)
-{
+int VBoxWinDrvInfQueryModel(HINF hInf, unsigned uIndex, PRTUTF16 *ppwszValue, PDWORD pcwcValue)
+{
+    AssertReturn(uIndex == 0, VERR_INVALID_PARAMETER);
+
     *ppwszValue = NULL;
     if (pcwcValue)
@@ -176 +177 @@
         return rc;
 
-    LPWSTR pwszModels;
-    DWORD  cwcModels;
-    rc = VBoxWinDrvInfQueryKeyValue(&InfCtx, 1, &pwszModels, &cwcModels);
+    PRTUTF16 pwszModel;
+    DWORD    cwcModels;
+    rc = VBoxWinDrvInfQueryKeyValue(&InfCtx, 1, &pwszModel, &cwcModels);
     if (RT_FAILURE(rc))
         return rc;
 
-    LPWSTR pwszPlatform = NULL;
-    DWORD  cwcPlatform  = 0;
-    bool   fArch        = false;
-    bool   fNt          = false;
-
-    LPWSTR pwszPlatformCur;
-    DWORD  cwcPlatformCur;
-    for (DWORD i = 2; (rc = VBoxWinDrvInfQueryKeyValue(&InfCtx, i, &pwszPlatformCur, &cwcPlatformCur)) == VINF_SUCCESS; ++i)
-    {
-        if (RTUtf16ICmpAscii(pwszPlatformCur, "NT" VBOXWINDRVINF_NATIVE_ARCH_STR) == 0)
-            fArch = true;
-        else
+    PRTUTF16 pwszResult = NULL;
+    DWORD    cwcResult  = 0;
+
+    PRTUTF16 pwszPlatform = NULL;
+    DWORD    cwcPlatform;
+    rc = VBoxWinDrvInfQueryKeyValue(&InfCtx, 2, &pwszPlatform, &cwcPlatform);
+    if (RT_SUCCESS(rc)) /* Platform is optional. */
+    {
+        /* Note! The platform can be more specific, e.g. "NTAMD64.6.0". */
+        if (RTUtf16FindAscii(pwszPlatform, VBOXWINDRVINF_NT_NATIVE_ARCH_STR) == 0)
         {
-            if (   fNt
-                || RTUtf16ICmpAscii(pwszPlatformCur, "NT") != 0)
+            RTUTF16 wszSection[VBOXWINDRVINF_MAX_INF_SECTION_NAME];
+            rc = RTUtf16Copy(wszSection, sizeof(wszSection), pwszModel);
+            if (RT_SUCCESS(rc))
             {
-                RTMemFree(pwszPlatformCur);
-                pwszPlatformCur = NULL;
-                continue;
+                rc = RTUtf16Cat(wszSection, sizeof(wszSection), VBOXWINDRVINF_DECORATION_SEP_UTF16_STR);
+                if (RT_SUCCESS(rc))
+                {
+                    rc = RTUtf16Cat(wszSection, sizeof(wszSection), pwszPlatform);
+                    if (RT_SUCCESS(rc))
+                    {
+                        pwszResult = RTUtf16Dup(wszSection);
+                        if (pwszResult)
+                        {
+                            cwcResult = (DWORD)RTUtf16Len(wszSection);
+                        }
+                        else
+                            rc = VERR_NO_MEMORY;
+                    }
+                }
             }
-            fNt = true;
-        }
-
-        cwcPlatform = cwcPlatformCur;
-        if (pwszPlatform)
-            RTMemFree(pwszPlatform);
-        pwszPlatform = pwszPlatformCur;
-        pwszPlatformCur = NULL;
-    }
-
-    rc = VINF_SUCCESS;
-
-    LPWSTR pwszResult = NULL;
-    DWORD  cwcResult = 0;
-    if (pwszPlatform)
-    {
-        pwszResult = (LPWSTR)RTMemAlloc((cwcModels + cwcPlatform) * sizeof(pwszResult[0]));
-        if (pwszResult)
-        {
-            memcpy(pwszResult, pwszModels, (cwcModels - 1) * sizeof(pwszResult[0]));
-            pwszResult[cwcModels - 1] = L'.';
-            memcpy(&pwszResult[cwcModels], pwszPlatform, cwcPlatform * sizeof(pwszResult[0]));
-            cwcResult = cwcModels + cwcPlatform;
         }
         else
-            rc = VERR_NO_MEMORY;
-    }
-    else
-    {
-        pwszResult = pwszModels;
+            rc = VERR_PLATFORM_ARCH_NOT_SUPPORTED;
+    }
+    else /* Model w/o platform. */
+    {
+        pwszResult = pwszModel;
         cwcResult  = cwcModels;
-        pwszModels = NULL;
-    }
-
-    if (pwszModels)
-        RTMemFree(pwszModels);
-    if (pwszPlatform)
-        RTMemFree(pwszPlatform);
+        pwszModel  = NULL;
+
+        rc = VINF_SUCCESS;
+    }
+
+    RTMemFree(pwszModel);
+    RTMemFree(pwszPlatform);
 
     if (RT_SUCCESS(rc))
@@ -249 +238 @@
 
     return rc;
+}
+
+int VBoxWinDrvInfQueryInstallSectionEx(HINF hInf, PCRTUTF16 pwszModel, PRTUTF16 *ppwszValue, PDWORD pcwcValue)
+{
+    INFCONTEXT InfCtx;
+    int rc = VBoxWinDrvInfQueryContext(hInf, pwszModel, NULL, &InfCtx);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    return VBoxWinDrvInfQueryKeyValue(&InfCtx, 1, ppwszValue, pcwcValue);
+}
+
+int VBoxWinDrvInfQueryInstallSection(HINF hInf, PCRTUTF16 pwszModel, PRTUTF16 *ppwszValue)
+{
+    return VBoxWinDrvInfQueryInstallSectionEx(hInf, pwszModel, ppwszValue, NULL);
 }
 
@@ -430 +434 @@
     *ppwszModel = NULL;
 
-    return VBoxWinDrvInfQueryModelsSectionName(hInf, ppwszModel, NULL);
+    return VBoxWinDrvInfQueryModel(hInf, 0 /* Index */, ppwszModel, NULL);
 }
 

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

@@ -46 +46 @@
 int VBoxWinDrvInfQueryFirstPnPId(HINF hInf, PRTUTF16 pwszModel, PRTUTF16 *ppwszPnPId);
 int VBoxWinDrvInfQueryKeyValue(PINFCONTEXT pCtx, DWORD iValue, PRTUTF16 *ppwszValue, PDWORD pcwcValue);
-int VBoxWinDrvInfQueryModelsSectionName(HINF hInf, PRTUTF16 *ppwszValue, PDWORD pcwcValue);
+int VBoxWinDrvInfQueryModel(HINF hInf, PRTUTF16 *ppwszValue, PDWORD pcwcValue);
+int VBoxWinDrvInfQueryInstallSectionEx(HINF hInf, PCRTUTF16 pwszModel, PRTUTF16 *ppwszValue, PDWORD pcwcValue);
+int VBoxWinDrvInfQueryInstallSection(HINF hInf, PCRTUTF16 pwszModel, PRTUTF16 *ppwszValue);
 int VBoxWinDrvInfQuerySectionVerEx(HINF hInf, UINT uIndex, PVBOXWINDRVINFSEC_VERSION pVer);
 int VBoxWinDrvInfQuerySectionVer(HINF hInf, PVBOXWINDRVINFSEC_VERSION pVer);