Changeset 21150 in vbox for trunk

Timestamp:

Jul 2, 2009 10:16:15 AM (16 years ago)

Author:

vboxsync

Message:

VBoxService/common: Fixed Guest Additions version lookup.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

@@ -266 +266 @@
                     dwActiveSession = g_pfnWTSGetActiveConsoleSessionId();
 
-                /*VBoxServiceVerbose(3, ("vboxVMInfoThread: Users: Current active session ID: %ld\n", dwActiveSession));*/
+                /*VBoxServiceVerbose(3, ("Users: Current active session ID: %ld\n", dwActiveSession));*/
 
                 if (SidTypeUser == ownerType)
@@ -337 +337 @@
     DWORD dwType = 0;
 
-    /* First try the old registry path ... */
-    rc = RegOpenKeyExA (HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);
+    /* Check the new path first. */
+    rc = RegOpenKeyExA (HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\VirtualBox Guest Additions", 0, KEY_READ, &hKey);
     if ((rc != ERROR_SUCCESS) && (rc != ERROR_FILE_NOT_FOUND))
-    {
-        /* Old registry path does not exist -- maybe the new one does? */
-        rc = RegOpenKeyExA (HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\VirtualBox Guest Additions", 0, KEY_READ, &hKey);
+    {  
+        /* New path does not exist, check the old one ... */
+        rc = RegOpenKeyExA (HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);
         if ((rc != ERROR_SUCCESS) && (rc != ERROR_FILE_NOT_FOUND))
         {
+            /* Nothing seems to exist, print some warning. */
             VBoxServiceError("Failed to open registry key (guest additions)! Error: %d\n", rc);
             return 1;