Changeset 106923 in vbox for trunk

Timestamp:

Nov 11, 2024 10:49:58 AM (6 months ago)

Author:

vboxsync

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

165849

Message:

Windows driver installation: Renamed + added some more defines. bugref:10762

Location:

trunk

Files:

• include/VBox/GuestHost/VBoxWinDrvDefs.h (modified) (2 diffs)
• src/VBox/GuestHost/installation/VBoxWinDrvCommon.cpp (modified) (1 diff)

trunk/include/VBox/GuestHost/VBoxWinDrvDefs.h

@@ -65 +65 @@
 #define VBOXWINDRVINF_DOT_NT_NATIVE_ARCH_STR VBOXWINDRVINF_DECORATION_SEP_STR VBOXWINDRVINF_NT_NATIVE_ARCH_STR
 
-/** Maximum catalog file (.cat) length (in characters). */
-#define VBOXWINDRVINF_MAX_CATALOG_FILE     255
-/** Maximum driver version length (in characters). */
-#define VBOXWINDRVINF_MAX_DRIVER_VER       255
-/** Maximum provider name length (in characters). */
-#define VBOXWINDRVINF_MAX_PROVIDER_FILE    255
+/** Maximum INF catalog file (.cat) length (in characters). */
+#define VBOXWINDRVINF_MAX_CATALOG_FILE_LEN     255
+/** Maximum INF driver version length (in characters). */
+#define VBOXWINDRVINF_MAX_DRIVER_VER_LEN       255
+/** Maximum INF provider name length (in characters). */
+#define VBOXWINDRVINF_MAX_PROVIDER_NAME_LEN    255
 /** Maximum INF section name length (in characters). */
-#define VBOXWINDRVINF_MAX_INF_SECTION_NAME 255
+#define VBOXWINDRVINF_MAX_SECTION_NAME_LEN     255
+/** Maximum INF model name length (in characters). */
+#define VBOXWINDRVINF_MAX_MODEL_NAME_LEN       255
+/** Maximum INF PnP ID length (in characters). */
+#define VBOXWINDRVINF_MAX_PNP_ID_LEN           255
+
 
 /**
@@ -80 +85 @@
 {
     /** Catalog (.cat) file. */
-    RTUTF16 wszCatalogFile[VBOXWINDRVINF_MAX_CATALOG_FILE];
+    RTUTF16 wszCatalogFile[VBOXWINDRVINF_MAX_CATALOG_FILE_LEN];
     /** Driver version. */
-    RTUTF16 wszDriverVer[VBOXWINDRVINF_MAX_DRIVER_VER];
+    RTUTF16 wszDriverVer[VBOXWINDRVINF_MAX_DRIVER_VER_LEN];
     /** Provider name. */
-    RTUTF16 wszProvider[VBOXWINDRVINF_MAX_PROVIDER_FILE];
+    RTUTF16 wszProvider[VBOXWINDRVINF_MAX_PROVIDER_NAME_LEN];
 } VBOXWINDRVINFSEC_VERSION;
 /** Pointer to structure for keeping INF Version section information. */

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

@@ -256 +256 @@
         if (RTUtf16FindAscii(pwszPlatform, VBOXWINDRVINF_NT_NATIVE_ARCH_STR) == 0)
         {
-            RTUTF16 wszSection[VBOXWINDRVINF_MAX_INF_SECTION_NAME];
+            RTUTF16 wszSection[VBOXWINDRVINF_MAX_SECTION_NAME_LEN];
             rc = RTUtf16Copy(wszSection, sizeof(wszSection), pwszModel);
             if (RT_SUCCESS(rc))