Changeset 23845 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/helpers.cpp

Timestamp:

Oct 19, 2009 8:49:10 AM (15 years ago)

Author:

vboxsync

Message:

VBoxClient/VBoxTray/VBgl: Reverted last check-ins to redo D-BUS movement.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/helpers.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/helpers.cpp

@@ -256 +256 @@
     return 0;
 }
+
+/** @todo move this in guest lib, also used in a similar way in VBoxService */
+int getAdditionsVersion(char *pszVer, size_t cbSizeVer, char *pszRev, size_t cbSizeRev)
+{
+    HKEY hKey;
+    int rc;
+
+    /* 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))
+    {
+        DWORD dwSize;
+        DWORD dwType;
+
+        /* Revision. */
+        dwSize = cbSizeRev;
+        rc = RegQueryValueEx(hKey, "Revision", NULL, &dwType, (BYTE*)(LPCTSTR)pszRev, &dwSize);
+        /* Version. */
+        dwSize = cbSizeVer;
+        rc = RegQueryValueEx(hKey, "Version", NULL, &dwType, (BYTE*)(LPCTSTR)pszVer, &dwSize);
+    }
+
+    if (NULL != hKey)
+        RegCloseKey(hKey);
+
+    return rc;
+}