Changeset 23835 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Oct 16, 2009 10:24:40 PM (16 years ago)

Author:

vboxsync

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

53593

Message:

VBoxClient/VBoxTray/VBgl: More bits for host version checking.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxGuestR3LibHostVersion.cpp (added)
• VBoxGuestR3LibMisc.cpp (modified) (2 diffs)

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

@@ -86 +86 @@
         VBoxGuestR3LibDaemonize.cpp \
         VBoxGuestR3LibGR.cpp \
-        $(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestR3LibGuestProp.cpp,) \
+        $(if $(VBOX_WITH_GUEST_PROPS), \
+                VBoxGuestR3LibGuestProp.cpp \
+                VBoxGuestR3LibHostVersion.cpp,) \
         VBoxGuestR3LibMouse.cpp \
         VBoxGuestR3LibMisc.cpp \

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

@@ -26 +26 @@
 #include <iprt/mem.h>
 #include <VBox/log.h>
+#ifdef RT_OS_WINDOWS
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+#endif
 
 #include "VBGLR3Internal.h"
@@ -194 +198 @@
 }
 
+
+/** @todo Docs */
+VBGLR3DECL(int) VbglR3GetAdditionsVersion(char **ppszVer, char **ppszRev)
+{
+    int rc;
+#ifdef RT_OS_WINDOWS
+    HKEY hKey;
+
+        /* Check the new path first. */
+    rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\VirtualBox Guest Additions", 0, KEY_READ, &hKey);
+#ifdef RT_ARCH_AMD64
+    if (rc != ERROR_SUCCESS)
+    {
+        /* Check Wow6432Node (for new entries). */
+        rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wow6432Node\\Sun\\VirtualBox Guest Additions", 0, KEY_READ, &hKey);
+    }
+#endif
+
+    /* Still no luck? Then try the old xVM paths ... */
+    if (RT_FAILURE(rc))
+    {
+        rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);
+#ifdef RT_ARCH_AMD64
+        if (rc != ERROR_SUCCESS)
+        {
+            /* Check Wow6432Node (for new entries). */
+            rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wow6432Node\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);
+        }
+#endif
+    }
+
+    /* Did we get something worth looking at? */
+    if (RT_SUCCESS(rc))
+    {
+        /* Version. */
+        dwSize = 32;
+        pszVer = (char*)RTMemAlloc(dwSize);
+        rc = RegQueryValueEx(hKey, "Version", NULL, &dwType, (BYTE*)(LPCTSTR)*ppszVer, &dwSize);
+        /* Revision. */
+        if (ppszRev)
+        {
+                        dwSize = 32;
+                        ppszRev = (char*)RTMemAlloc(dwSize);
+                        rc = RegQueryValueEx(hKey, "Revision", NULL, &dwType, (BYTE*)(LPCTSTR)*ppszRev, &dwSize);
+                }
+    }
+
+    if (NULL != hKey)
+        RegCloseKey(hKey);
+#else
+#endif /* RT_OS_WINDOWS */
+    return rc;
+}