Changeset 107903 in vbox for trunk/src/VBox/GuestHost/installation/VBoxWinDrvStore.cpp

Timestamp:

Jan 22, 2025 11:03:23 PM (3 weeks ago)

Author:

vboxsync

Message:

Windows driver installation: VBoxWinDrvStoreQuery doesn't take a DOS-style wildcard pattern, but a RTStrSimplePatternMatch-styled one. Don't lowercase the input pattern more than once in vboxWinDrvStoreListQueryEx, and just call a string a string till you get more complicated matching input. Also, coding style dictates use of 'static' where ever possible. bugref:10762

File:

• trunk/src/VBox/GuestHost/installation/VBoxWinDrvStore.cpp (modified) (14 diffs)

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

@@ -119 +119 @@
  * Duplicates a Windows driver store entry.
  *
- * @returns Duplicated Windows driver store entry.
+ * @returns Duplicated Windows driver store entry.  Caller must correct
+ *          VBOXWINDRVSTOREENTRY::Node (list entry) immediately.
  * @param   pEntry              Windows driver store list to duplicate.
  */
-PVBOXWINDRVSTOREENTRY vboxWinDrvStoreEntryDup(PVBOXWINDRVSTOREENTRY pEntry)
+static PVBOXWINDRVSTOREENTRY vboxWinDrvStoreEntryDup(PVBOXWINDRVSTOREENTRY pEntry)
 {
     return (PVBOXWINDRVSTOREENTRY)RTMemDup(pEntry, sizeof(VBOXWINDRVSTOREENTRY));
@@ -132 +133 @@
  * @param   pList               Windows driver store list to initialize.
  */
-void vboxWinDrvStoreListInit(PVBOXWINDRVSTORELIST pList)
+static void vboxWinDrvStoreListInit(PVBOXWINDRVSTORELIST pList)
 {
     RT_BZERO(pList, sizeof(VBOXWINDRVSTORELIST));
@@ -145 +146 @@
  * @param   ppList              Where to return the created Windows driver store list on success.
  */
-int vboxWinDrvStoreListCreate(PVBOXWINDRVSTORELIST *ppList)
+static int vboxWinDrvStoreListCreate(PVBOXWINDRVSTORELIST *ppList)
 {
     PVBOXWINDRVSTORELIST pList = (PVBOXWINDRVSTORELIST)RTMemAlloc(sizeof(VBOXWINDRVSTORELIST));
@@ -163 +164 @@
  *                              The pointer will be invalid after return.
  */
-void vboxWinDrvStoreListDestroy(PVBOXWINDRVSTORELIST pList)
+static void vboxWinDrvStoreListDestroy(PVBOXWINDRVSTORELIST pList)
 {
     if (!pList)
@@ -227 +228 @@
  * @param   pList               Driver store list to query.
  * @param   enmType             Query type.
- * @param   pvType              Query data. Must match \a enmType.
+ * @param   pszTypeConst        Query data. Must match \a enmType.
  * @param   ppListResults       Where to return found results on success.
  *                              Must be destroyed with VBoxWinDrvStoreListFree().
  */
-static int vboxWinDrvStoreListQueryEx(PVBOXWINDRVSTORELIST pList, VBOXWINDRVSTORELISTQUERYTYPE enmType, const void *pvType,
+static int vboxWinDrvStoreListQueryEx(PVBOXWINDRVSTORELIST pList, VBOXWINDRVSTORELISTQUERYTYPE enmType, const char *pszTypeConst,
                                       PVBOXWINDRVSTORELIST *ppListResults)
 {
@@ -240 +241 @@
     /* Currently all query types require strings, so do this for all query times for now. */
     char *pszType = NULL;
-    if (pvType)
-    {
-        AssertReturn(RTStrIsValidEncoding((const char *)pvType), VERR_INVALID_PARAMETER);
-        pszType = RTStrDup((const char *)pvType);
+    if (pszTypeConst)
+    {
+        AssertReturn(RTStrIsValidEncoding(pszTypeConst), VERR_INVALID_PARAMETER);
+        pszType = RTStrDup(pszTypeConst);
         AssertPtrReturnStmt(pszType, VBoxWinDrvStoreListFree(pListResults), VERR_NO_MEMORY);
-    }
-
-    PRTUTF16 papszHaystacks[4] = { NULL }; /* Array of haystacks to search in. */
-    size_t   cHaystacks        = 0;        /* Number of haystacks to search in, zero-based. */
+
+        /* Convert strings to lowercase, as RTStrSimplePatternMatch() is case sensitive. */
+        RTStrToLower(pszType);
+    }
 
     PVBOXWINDRVSTOREENTRY pCur;
@@ -255 +256 @@
         bool fFound = false;
         if (pszType == NULL) /* No query type specified? Then directly add the entry to the list. */
-        {
             fFound = true;
-        }
         else
         {
+            PRTUTF16 apszHaystacks[3] = {};  /* Array of haystacks to search in. */
+            size_t   cHaystacks = 0;         /* Number of haystacks to search in, zero-based. */
             switch (enmType)
             {
                 case VBOXWINDRVSTORELISTQUERYTYPE_PNP_ID:
                 {
-                    papszHaystacks[cHaystacks++] = pCur->wszPnpId;
+                    apszHaystacks[cHaystacks++] = pCur->wszPnpId;
                     break;
                 }
                 case VBOXWINDRVSTORELISTQUERYTYPE_MODEL_NAME:
                 {
-                    papszHaystacks[cHaystacks++] = pCur->wszModel;
+                    apszHaystacks[cHaystacks++] = pCur->wszModel;
                     break;
                 }
                 case VBOXWINDRVSTORELISTQUERYTYPE_DRIVER_NAME:
                 {
-                    papszHaystacks[cHaystacks++] = pCur->wszDriverName;
+                    apszHaystacks[cHaystacks++] = pCur->wszDriverName;
                     break;
                 }
                 case VBOXWINDRVSTORELISTQUERYTYPE_ANY:
                 {
-                    papszHaystacks[cHaystacks++] = pCur->wszPnpId;
-                    papszHaystacks[cHaystacks++] = pCur->wszModel;
-                    papszHaystacks[cHaystacks++] = pCur->wszDriverName;
+                    apszHaystacks[cHaystacks++] = pCur->wszPnpId;
+                    apszHaystacks[cHaystacks++] = pCur->wszModel;
+                    apszHaystacks[cHaystacks++] = pCur->wszDriverName;
                     break;
                 }
@@ -289 +290 @@
                     break;
             }
-
             if (RT_FAILURE(rc))
                 break;
 
+            Assert(cHaystacks <= RT_ELEMENTS(apszHaystacks));
             for (size_t i = 0; i < cHaystacks; i++)
             {
                 /* Slow, but does the job for now. */
                 char *pszHaystack;
-                rc = RTUtf16ToUtf8(papszHaystacks[i], &pszHaystack);
+                rc = RTUtf16ToUtf8(apszHaystacks[i], &pszHaystack);
                 if (RT_SUCCESS(rc))
                 {
-                    /* Convert strings to lowercase first, as RTStrSimplePatternMatch() is case sensitive. */
-                    RTStrToLower(pszType);
                     RTStrToLower(pszHaystack);
 
@@ -322 +321 @@
                 AssertFailedBreakStmt(rc = VERR_NO_MEMORY);
         }
-
-        cHaystacks = 0;
     }
 
@@ -528 +525 @@
  * @returns VBox status code.
  * @param   pDrvStore           Driver store to query.
- * @param   pszPattern          Pattern to query for. DOS-style wildcards supported.
+ * @param   pszPattern          Pattern (RTStrSimplePatternMatch) to query for.
  * @param   ppResults           Where to return the results list on success.
  *                              Must be free'd with VBoxWinDrvStoreListFree().
@@ -555 +552 @@
  * @returns VBox status code.
  * @param   pDrvStore           Driver store to query.
- * @param   pszPnpId            PnP ID to query. DOS-style wildcards supported.
+ * @param   pszPnpId            PnP ID pattern (RTStrSimplePatternMatch) to
+ *                              query.
  * @param   ppResults           Where to return the results list on success.
  *                              Must be free'd with VBoxWinDrvStoreListFree().
@@ -561 +559 @@
 int VBoxWinDrvStoreQueryByPnpId(PVBOXWINDRVSTORE pDrvStore, const char *pszPnpId, PVBOXWINDRVSTORELIST *ppResults)
 {
-    return vboxWinDrvStoreListQueryEx(&pDrvStore->lstDrivers, VBOXWINDRVSTORELISTQUERYTYPE_PNP_ID, (const char *)pszPnpId,
-                                      ppResults);
+    return vboxWinDrvStoreListQueryEx(&pDrvStore->lstDrivers, VBOXWINDRVSTORELISTQUERYTYPE_PNP_ID, pszPnpId, ppResults);
 }
 
@@ -570 +567 @@
  * @returns VBox status code.
  * @param   pDrvStore           Driver store to query.
- * @param   pszPnpId            Model name to query. DOS-style wildcards supported.
+ * @param   pszPnpId            Model name pattern (RTStrSimplePatternMatch) to
+ *                              query.
  * @param   ppResults           Where to return the results list on success.
  *                              Must be free'd with VBoxWinDrvStoreListFree().
@@ -576 +574 @@
 int VBoxWinDrvStoreQueryByModelName(PVBOXWINDRVSTORE pDrvStore, const char *pszModelName, PVBOXWINDRVSTORELIST *ppResults)
 {
-    return vboxWinDrvStoreListQueryEx(&pDrvStore->lstDrivers, VBOXWINDRVSTORELISTQUERYTYPE_MODEL_NAME, (const char *)pszModelName,
-                                      ppResults);
+    return vboxWinDrvStoreListQueryEx(&pDrvStore->lstDrivers, VBOXWINDRVSTORELISTQUERYTYPE_MODEL_NAME, pszModelName, ppResults);
 }