Changeset 26617 in vbox for trunk/src/VBox

Timestamp:

Feb 17, 2010 3:56:50 PM (15 years ago)

Author:

vboxsync

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

57814

Message:

DevFwCommon.cpp: Allow more than 3 chars for product version and 12 for product name. RTSystemQueryDmiString zap the buffer regardless of status, so use a 2nd buffer for the host strings. Log the values we take from the host.

File:

• trunk/src/VBox/Devices/PC/DevFwCommon.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/PC/DevFwCommon.cpp

@@ -59 +59 @@
 static const char   *s_szDefDmiBIOSReleaseDate  = "12/01/2006";
 static const char   *s_szDefDmiSystemVendor     = "innotek GmbH";
-static       char    s_szDefDmiSystemProduct[13]  = "VirtualBox";
-static       char    s_szDefDmiSystemVersion[4]   = "1.2";
+static const char   *s_szDefDmiSystemProduct    = "VirtualBox";
+static const char   *s_szDefDmiSystemVersion    = "1.2";
 static const char   *s_szDefDmiSystemSerial     = "0";
 static const char   *s_szDefDmiSystemFamily     = "Virtual Machine";
@@ -67 +67 @@
 static const char   *s_szDefDmiChassisSerial    = "";
 static const char   *s_szDefDmiChassisAssetTag  = "";
+
+static       char    g_szHostDmiSystemProduct[64];
+static       char    g_szHostDmiSystemVersion[64];
 
 
@@ -304 +307 @@
     return (u8Sum == 0);
 }
+
 /*
  * Macmini2,1 - matches Mac Mini
@@ -312 +316 @@
 
     rc = RTSystemQueryDmiString(RTSYSDMISTR_PRODUCT_NAME,
-                                s_szDefDmiSystemProduct,
-                                sizeof s_szDefDmiSystemProduct);
-    if (RT_FAILURE(rc))
+                                g_szHostDmiSystemProduct, sizeof(g_szHostDmiSystemProduct));
+    if (RT_SUCCESS(rc))
     {
-        // ignore rc?
+        s_szDefDmiSystemProduct = g_szHostDmiSystemProduct;
+        LogRel(("DMI: Using DmiSystemProduct from host: %s\n", g_szHostDmiSystemProduct));
     }
 
     rc = RTSystemQueryDmiString(RTSYSDMISTR_PRODUCT_VERSION,
-                                s_szDefDmiSystemVersion,
-                                sizeof s_szDefDmiSystemVersion);
-    if (RT_FAILURE(rc))
+                                g_szHostDmiSystemVersion, sizeof(g_szHostDmiSystemVersion));
+    if (RT_SUCCESS(rc))
     {
-        // ignore rc?
+        s_szDefDmiSystemVersion = g_szHostDmiSystemVersion;
+        LogRel(("DMI: Using DmiSystemVersion from host: %s\n", g_szHostDmiSystemVersion));
     }
 }