Changeset 23856 in vbox

Timestamp:

Oct 19, 2009 11:57:22 AM (15 years ago)

Author:

vboxsync

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

53624

Message:

VbglR3: Added host version checking routines.

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp (copied) (copied from trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp )
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp (modified) (2 diffs)

trunk/include/VBox/VBoxGuestLib.h

@@ -404 +404 @@
 VBGLR3DECL(int)     VbglR3SetGuestCaps(uint32_t fOr, uint32_t fNot);
 VBGLR3DECL(int)     VbglR3WaitEvent(uint32_t fMask, uint32_t cMillies, uint32_t *pfEvents);
+VBGLR3DECL(int)     VbglR3GetAdditionsVersion(char **ppszVer, char **ppszRev);
 /** @} */
 
@@ -471 +472 @@
 VBGLR3DECL(int)     VbglR3GuestPropWait(uint32_t u32ClientId, const char *pszPatterns, void *pvBuf, uint32_t cbBuf, uint64_t u64Timestamp, uint32_t cMillies, char ** ppszName, char **ppszValue, uint64_t *pu64Timestamp, char **ppszFlags, uint32_t *pcbBufActual);
 /** @}  */
+
+/** @name Host version handling
+ * @{ */
+VBGLR3DECL(int)     VbglR3HostVersionCompare(const char *pszVer1, const char *pszVer2);
+VBGLR3DECL(bool)    VbglR3HostVersionCheckForUpdate(char **ppszHostVersion, char **ppszGuestVersion);
+VBGLR3DECL(int)     VbglR3HostVersionStore(const char* pszVer);
+/** @}  */
 # endif /* VBOX_WITH_GUEST_PROPS defined */
 

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 \
@@ -96 +98 @@
         VBoxGuestR3Lib.cpp \
         VBoxGuestR3LibGR.cpp \
-        $(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestR3LibGuestProp.cpp,) \
+        $(if $(VBOX_WITH_GUEST_PROPS), \
+                VBoxGuestR3LibGuestProp.cpp \
+                VBoxGuestR3LibHostVersion.cpp,) \
         VBoxGuestR3LibMisc.cpp \
         VBoxGuestR3LibTime.cpp

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

@@ -26 +26 @@
 #include <iprt/mem.h>
 #include <VBox/log.h>
-
 #include "VBGLR3Internal.h"
 
@@ -194 +193 @@
 }
 
+
+/** @todo Docs */
+VBGLR3DECL(int) VbglR3GetAdditionsVersion(char **ppszVer, char **ppszRev)
+{
+    int rc;
+#ifdef RT_OS_WINDOWS
+    HKEY hKey;
+    LONG r;
+
+    /* Check the new path first. */
+    r = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\VirtualBox Guest Additions", 0, KEY_READ, &hKey);
+#ifdef RT_ARCH_AMD64
+    if (r != ERROR_SUCCESS)
+    {
+        /* Check Wow6432Node (for new entries). */
+        r = 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 (FAILED(r))
+    {
+        r = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);
+#ifdef RT_ARCH_AMD64
+        if (r != ERROR_SUCCESS)
+        {
+            /* Check Wow6432Node (for new entries). */
+            r = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wow6432Node\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);
+        }
+#endif
+    }
+
+    /* Did we get something worth looking at? */
+    if (SUCCEEDED(r))
+    {
+        /* Version. */
+        DWORD dwType;
+        DWORD dwSize = 32;
+        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;
+            char *pszRev = (char*)RTMemAlloc(dwSize);
+            if (ERROR_SUCCESS == RegQueryValueEx(hKey, "Revision", NULL, &dwType, (BYTE*)(LPCTSTR)pszRev, &dwSize))
+                *ppszRev = pszRev;
+        }
+    }
+    rc = RTErrConvertFromWin32(r);
+
+    if (NULL != hKey)
+        RegCloseKey(hKey);
+#else
+#endif /* RT_OS_WINDOWS */
+    return rc;
+}