Changeset 23866 in vbox for trunk/src/VBox/Additions

Timestamp:

Oct 19, 2009 12:55:05 PM (16 years ago)

Author:

vboxsync

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

53635

Message:

VbglR3: Guest Additions version lookup on non-Windows platforms.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxGuestR3LibMisc.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -104 +104 @@
         VBoxGuestR3LibTime.cpp
 endif
-
+#VBoxGuestR3LibMisc.cpp uses VBOX_SVN_REV.
+VBoxGuestR3LibMisc.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
+VBoxGuestR3LibMisc.cpp_DEPS = $(VBOX_SVN_REV_KMK)
 
 #

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp

@@ -25 +25 @@
 *******************************************************************************/
 #include <iprt/mem.h>
+#include <iprt/string.h>
 #include <VBox/log.h>
+#include <VBox/version.h>
 #include "VBGLR3Internal.h"
 
@@ -194 +196 @@
 
 
-/** @todo Docs */
+/**
+ * Retrieves the installed Guest Additions version/revision.
+ *
+ * @returns IPRT status value
+ * @param   ppszVer    Receives pointer of allocated version string. NULL is accepted.
+ *                     The returned pointer must be freed using RTStrFree().
+ * @param   ppszRev    Receives pointer of allocated revision string. NULL is accepted.
+ *                     The returned pointer must be freed using RTStrFree().
+ */
 VBGLR3DECL(int) VbglR3GetAdditionsVersion(char **ppszVer, char **ppszRev)
 {
@@ -231 +241 @@
         DWORD dwType;
         DWORD dwSize = 32;
-        char *pszVer = (char*)RTMemAlloc(dwSize);
-        if (pszVer)
+        if (ppszVer)
         {
-            if (ERROR_SUCCESS == RegQueryValueEx(hKey, "Version", NULL, &dwType, (BYTE*)(LPCTSTR)pszVer, &dwSize))
-                *ppszVer = pszVer;
+            char *pszVer = (char*)RTMemAlloc(dwSize);
+            if (pszVer)
+            {
+                if (ERROR_SUCCESS == RegQueryValueEx(hKey, "Version", NULL, &dwType, (BYTE*)(LPCTSTR)pszVer, &dwSize))
+                    *ppszVer = pszVer;
+            }
         }
         /* Revision. */
         if (ppszRev)
         {
-            dwSize = 32;
+            dwSize = 32; /* Reset */
             char *pszRev = (char*)RTMemAlloc(dwSize);
-            if (ERROR_SUCCESS == RegQueryValueEx(hKey, "Revision", NULL, &dwType, (BYTE*)(LPCTSTR)pszRev, &dwSize))
-                *ppszRev = pszRev;
+            if (pszRev)
+            {
+                if (ERROR_SUCCESS == RegQueryValueEx(hKey, "Revision", NULL, &dwType, (BYTE*)(LPCTSTR)pszRev, &dwSize))
+                    *ppszRev = pszRev;
+            }
         }
     }
     rc = RTErrConvertFromWin32(r);
-
     if (NULL != hKey)
         RegCloseKey(hKey);
 #else
+    /* On non-Windows platforms just return the compile-time version string atm. */
+    /* Version. */
+    if (ppszVer)
+        rc = RTStrAPrintf(ppszVer, "%s", VBOX_VERSION_STRING);
+    /* Revision. */
+    if (ppszRev)
+        rc = RTStrAPrintf(ppszRev, "%s", VBOX_SVN_REV);
 #endif /* RT_OS_WINDOWS */
     return rc;