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

Timestamp:

Nov 20, 2024 2:14:22 PM (2 months ago)

Author:

vboxsync

Message:

Windows driver installation: Also detect if an INF has a Default *and* a Manufacturer section in VBoxWinDrvInfGetTypeEx(), which is considered as being invalid. bugref:10762

File:

• trunk/src/VBox/GuestHost/installation/VBoxWinDrvCommon.cpp (modified) (3 diffs)

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

@@ -82 +82 @@
 
     /* Sorted by most likely-ness. */
-    static PRTUTF16 s_apwszSections[] =
+    static PRTUTF16 s_apwsManufacturerSections[] =
     {
         /* Most likely (and doesn't have a decoration). */
@@ -93 +93 @@
     INFCONTEXT InfCtx;
     size_t     i;
-    for (i = 0; i < RT_ELEMENTS(s_apwszSections); i++)
-    {
-        PRTUTF16 const pwszSection = s_apwszSections[i];
-        rc = vboxWinDrvInfQueryContext(hInf, pwszSection, NULL, &InfCtx);
+
+    PCRTUTF16 pwszManufacturerSection = NULL;
+    for (i = 0; i < RT_ELEMENTS(s_apwsManufacturerSections); i++)
+    {
+        rc = vboxWinDrvInfQueryContext(hInf, s_apwsManufacturerSections[i], NULL, &InfCtx);
         if (RT_SUCCESS(rc))
+        {
+            pwszManufacturerSection = s_apwsManufacturerSections[i];
             break;
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        if (ppwszSection)
-            *ppwszSection = RTUtf16Dup(s_apwszSections[i]);
-
-        return VBOXWINDRVINFTYPE_NORMAL;
+        }
     }
 
@@ -122 +118 @@
     };
 
+    PCRTUTF16 pwszPrimitiveSection = NULL;
     for (i = 0; i < RT_ELEMENTS(s_apwszPrimitiveSections); i++)
     {
-        PRTUTF16 const pwszSection = s_apwszPrimitiveSections[i];
-        rc = vboxWinDrvInfQueryContext(hInf, pwszSection, NULL, &InfCtx);
+        rc = vboxWinDrvInfQueryContext(hInf, s_apwszPrimitiveSections[i], NULL, &InfCtx);
         if (RT_SUCCESS(rc))
+        {
+            pwszPrimitiveSection = s_apwszPrimitiveSections[i];
             break;
-    }
-
-    if (RT_SUCCESS(rc))
+        }
+    }
+
+    /* If both sections are present, consider this INF file as being invalid.
+     * Only one or the other has to be present. */
+    if (   pwszManufacturerSection
+        && pwszPrimitiveSection)
+    {
+        return VBOXWINDRVINFTYPE_INVALID;
+    }
+    else if (pwszManufacturerSection)
     {
         if (ppwszSection)
-            *ppwszSection = RTUtf16Dup(s_apwszPrimitiveSections[i]);
+            *ppwszSection = RTUtf16Dup(pwszManufacturerSection);
+
+        return VBOXWINDRVINFTYPE_NORMAL;
+    }
+    else if (pwszPrimitiveSection)
+    {
+        if (ppwszSection)
+            *ppwszSection = RTUtf16Dup(pwszPrimitiveSection);
 
         return VBOXWINDRVINFTYPE_PRIMITIVE;