Changeset 29560 in vbox

Timestamp:

May 17, 2010 3:08:09 PM (15 years ago)

Author:

vboxsync

Message:

RTSystemQueryDmiString: Added RTSYSDMISTR_MANUFACTURER and implemented it on a few systems.

Location:

trunk

Files:

• include/iprt/system.h (modified) (1 diff)
• src/VBox/Runtime/r3/darwin/RTSystemQueryDmiString-darwin.cpp (modified) (3 diffs)
• src/VBox/Runtime/r3/linux/RTSystemQueryDmiString-linux.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/solaris/RTSystemQueryDmiString-solaris.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/tstRTSystemQueryDmi.cpp (modified) (1 diff)

trunk/include/iprt/system.h

@@ -152 +152 @@
     /** The product serial. */
     RTSYSDMISTR_PRODUCT_SERIAL,
+    /** The system manufacturer. */
+    RTSYSDMISTR_MANUFACTURER,
     /** The end of the valid strings. */
     RTSYSDMISTR_END,

trunk/src/VBox/Runtime/r3/darwin/RTSystemQueryDmiString-darwin.cpp

@@ -49 +49 @@
 #define PROP_PRODUCT_SERIAL                  "IOPlatformSerialNumber"
 #define PROP_PRODUCT_UUID                    "IOPlatformUUID"
+#define PROP_MANUFACTURER                    "manufacturer"
 
 
@@ -65 +66 @@
         case RTSYSDMISTR_PRODUCT_SERIAL:  PropStringRef = CFSTR(PROP_PRODUCT_SERIAL);  break;
         case RTSYSDMISTR_PRODUCT_UUID:    PropStringRef = CFSTR(PROP_PRODUCT_UUID);    break;
+        case RTSYSDMISTR_MANUFACTURER:    PropStringRef = CFSTR(PROP_MANUFACTURER);    break;
         default:
             return VERR_NOT_SUPPORTED;
@@ -93 +95 @@
     {
         if (   enmString == RTSYSDMISTR_PRODUCT_NAME
-            || enmString == RTSYSDMISTR_PRODUCT_VERSION)
+            || enmString == RTSYSDMISTR_PRODUCT_VERSION
+            || enmString == RTSYSDMISTR_MANUFACTURER
+           )
         {
             CFDataRef DataRef = (CFDataRef)IORegistryEntryCreateCFProperty(ServiceObject, PropStringRef,

trunk/src/VBox/Runtime/r3/linux/RTSystemQueryDmiString-linux.cpp

@@ -53 +53 @@
         case RTSYSDMISTR_PRODUCT_UUID:      pszSysFsName = "id/product_uuid"; break;
         case RTSYSDMISTR_PRODUCT_SERIAL:    pszSysFsName = "id/product_serial"; break;
+        /// @todo case RTSYSDMISTR_MANUFACTURER:      pszSysFsName = "id/sys_vendor"; break;
         default:
             return VERR_NOT_SUPPORTED;

trunk/src/VBox/Runtime/r3/solaris/RTSystemQueryDmiString-solaris.cpp

@@ -85 +85 @@
                     case RTSYSDMISTR_PRODUCT_VERSION:   rc = RTStrCopy(pszBuf, cbBuf, hSMBInfo.smbi_version); break;
                     case RTSYSDMISTR_PRODUCT_SERIAL:    rc = RTStrCopy(pszBuf, cbBuf, hSMBInfo.smbi_serial);  break;
+                    case RTSYSDMISTR_MANUFACTURER:      rc = RTStrCopy(pszBuf, cbBuf, hSMBInfo.smbi_manufacturer);  break;
 
                     default:  /* make gcc happy */

trunk/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp

@@ -153 +153 @@
         case RTSYSDMISTR_PRODUCT_UUID:      pszPropName = "UUID"; break;
         case RTSYSDMISTR_PRODUCT_SERIAL:    pszPropName = "IdentifyingNumber"; break;
+        /// @todo case RTSYSDMISTR_MANUFACTURER:      pszPropName = "Vendor"; break;
+
         default:
             return VERR_NOT_SUPPORTED;

trunk/src/VBox/Runtime/testcase/tstRTSystemQueryDmi.cpp

@@ -60 +60 @@
     RTTestIPrintf(RTTESTLVL_ALWAYS, "PRODUCT_SERIAL: \"%s\", rc=%Rrc\n", szInfo, rc);
 
+    rc = RTSystemQueryDmiString(RTSYSDMISTR_MANUFACTURER, szInfo, sizeof(szInfo));
+    RTTestIPrintf(RTTESTLVL_ALWAYS, "MANUFACTURER: \"%s\", rc=%Rrc\n", szInfo, rc);
+
     /*
      * Check that unsupported stuff is terminated correctly.