Changeset 19070 in vbox

Timestamp:

Apr 21, 2009 12:29:36 PM (16 years ago)

Author:

vboxsync

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

46207

Message:

Main,VBoxManage: Implemented IHost::OperatingSystem and IHost::OSVersion using RTSystemQueryOSInfo. TODO: review error reporting.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageList.cpp (modified) (2 diffs)
• Main/HostImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -417 +417 @@
             RTPrintf("Memory available: %lu MByte\n", memoryAvailable);
 
-#if 0 /* not yet implemented in Main */
             Bstr operatingSystem;
             CHECK_ERROR (Host, COMGETTER(OperatingSystem)(operatingSystem.asOutParam()));
@@ -425 +424 @@
             CHECK_ERROR (Host, COMGETTER(OSVersion)(oSVersion.asOutParam()));
             RTPrintf("Operating system version: %lS\n", oSVersion.raw());
-#endif
         }
         break;

trunk/src/VBox/Main/HostImpl.cpp

@@ -110 +110 @@
 #include <iprt/env.h>
 #include <iprt/mem.h>
+#include <iprt/system.h>
 #ifdef RT_OS_SOLARIS
 # include <iprt/path.h>
@@ -1152 +1153 @@
     AutoWriteLock alock (this);
     CHECK_READY();
-    /** @todo */
-    ReturnComNotImplemented();
+
+    char szOSName[80];
+    int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szOSName, sizeof(szOSName));
+    if (RT_FAILURE(vrc))
+        return E_FAIL; /** @todo error reporting? */
+    Bstr (szOSName).cloneTo (aOs);
+    return S_OK;
 }
 
@@ -1167 +1173 @@
     AutoWriteLock alock (this);
     CHECK_READY();
-    /** @todo */
-    ReturnComNotImplemented();
+
+    /* Get the OS release. Reserve some buffer space for the service pack. */
+    char szOSRelease[128];
+    int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szOSRelease, sizeof(szOSRelease) - 32);
+    if (RT_FAILURE(vrc))
+        return E_FAIL; /** @todo error reporting? */
+
+    /* Append the service pack if present. */
+    char szOSServicePack[80];
+    vrc = RTSystemQueryOSInfo(RTSYSOSINFO_SERVICE_PACK, szOSServicePack, sizeof(szOSServicePack));
+    if (RT_FAILURE(vrc))
+    {
+        if (vrc != VERR_NOT_SUPPORTED)
+            return E_FAIL; /** @todo error reporting? */
+        szOSServicePack[0] = '\0';
+    }
+    if (szOSServicePack[0] != '\0')
+    {
+        char *psz = strchr(szOSRelease, '\0');
+        RTStrPrintf(psz, &szOSRelease[sizeof(szOSRelease)] - psz, "sp%s", szOSServicePack);
+    }
+
+    Bstr (szOSRelease).cloneTo (aVersion);
+    return S_OK;
 }