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

Timestamp:

Oct 16, 2009 10:54:47 PM (15 years ago)

Author:

vboxsync

Message:

VBoxClient/VBoxTray/VBgl: More Windows bits.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

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

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

@@ -198 +198 @@
 
         if (lRet != ERROR_SUCCESS)
-                rc = RTErrConvertFromWin32(lRet);
+            rc = RTErrConvertFromWin32(lRet);
 #else
 #endif

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

@@ -200 +200 @@
 #ifdef RT_OS_WINDOWS
     HKEY hKey;
+    LONG r;
 
         /* Check the new path first. */
-    rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\VirtualBox Guest Additions", 0, KEY_READ, &hKey);
+    r = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\VirtualBox Guest Additions", 0, KEY_READ, &hKey);
 #ifdef RT_ARCH_AMD64
-    if (rc != ERROR_SUCCESS)
+    if (r != ERROR_SUCCESS)
     {
         /* Check Wow6432Node (for new entries). */
-        rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wow6432Node\\Sun\\VirtualBox Guest Additions", 0, KEY_READ, &hKey);
+        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 (RT_FAILURE(rc))
-    {
-        rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);
+    if (FAILED(r))
+    {
+        r = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);
 #ifdef RT_ARCH_AMD64
-        if (rc != ERROR_SUCCESS)
+        if (r != ERROR_SUCCESS)
         {
             /* Check Wow6432Node (for new entries). */
-            rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wow6432Node\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);
+            r = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wow6432Node\\Sun\\xVM VirtualBox Guest Additions", 0, KEY_READ, &hKey);
         }
 #endif
@@ -225 +226 @@
 
     /* Did we get something worth looking at? */
-    if (RT_SUCCESS(rc))
+    if (SUCCEEDED(r))
     {
         /* Version. */
         DWORD dwType;
         DWORD dwSize = 32;
-        ppszVer = (char*)RTMemAlloc(dwSize);
-        rc = RegQueryValueEx(hKey, "Version", NULL, &dwType, (BYTE*)(LPCTSTR)*ppszVer, &dwSize);
+        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;
-                        ppszRev = (char*)RTMemAlloc(dwSize);
-                        rc = RegQueryValueEx(hKey, "Revision", NULL, &dwType, (BYTE*)(LPCTSTR)*ppszRev, &dwSize);
+                        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)