Changeset 23839 in vbox

Timestamp:

Oct 17, 2009 8:21:39 AM (15 years ago)

Author:

vboxsync

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

53597

Message:

VBoxClient/VBoxTray/VBgl: Windows build fixes.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

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

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

@@ -98 +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/VBoxGuestR3LibHostVersion.cpp

@@ -41 +41 @@
  * @returns 0 if equal, 1 if Ver1 is greater, 2 if Ver2 is greater.
  *
- * @param   pszVer1             First version string to compare.
+ * @param   pszVer1     First version string to compare.
  * @param   pszVer2     First version string to compare.
  *
@@ -146 +146 @@
                     LogFlow(("Update found."));
                 }
-                else rc = VERR_VERSION_MISMATCH; /* No update found. */
+                else rc = VERR_VERSION_MISMATCH; /* No update found */
             }
         }
@@ -153 +153 @@
     if (RT_FAILURE(rc))
     {
-        if (*ppszHostVersion)
-            VbglR3GuestPropReadValueFree(*ppszHostVersion);
-        if (*ppszGuestVersion)
-            VbglR3GuestPropReadValueFree(*ppszGuestVersion);
+        if (*ppszHostVersion)
+            VbglR3GuestPropReadValueFree(*ppszHostVersion);
+        if (*ppszGuestVersion)
+            VbglR3GuestPropReadValueFree(*ppszGuestVersion);
     }
     return rc == VINF_SUCCESS ? true : false;
@@ -171 +171 @@
     if (RT_FAILURE(rc))
     {
-    LogFlow(("Failed to connect to the guest property service! Error: %d\n", rc));
+        LogFlow(("Failed to connect to the guest property service! Error: %d\n", rc));
     }
     else
     {
 #ifdef RT_OS_WINDOWS
-        HKEY hKey;
-        long lRet;
-        lRet = RegCreateKeyEx (HKEY_LOCAL_MACHINE,
-                                                   "SOFTWARE\\Sun\\VirtualBox Guest Additions",
-                                                   0,           /* Reserved */
-                                                   NULL,        /* lpClass [in, optional] */
-                                                   0,           /* dwOptions [in] */
-                                                   KEY_WRITE,
-                                                   NULL,        /* lpSecurityAttributes [in, optional] */
-                                                   &hKey,
-                                                   NULL);       /* lpdwDisposition [out, optional] */
-        if (lRet == ERROR_SUCCESS)
-        {
-            lRet = RegSetValueEx(hKey, "HostVerLastChecked", 0, REG_SZ, (BYTE*)pszVBoxHostVer, (DWORD)(strlen(pszVBoxHostVer)*sizeof(char)));
-            if (lRet != ERROR_SUCCESS)
-                    LogFlow(("Could not write HostVerLastChecked! Error = %ld\n", lRet));
-            RegCloseKey(hKey);
-        }
-        else
-            LogFlow(("Could not open registry key! Error = %ld\n", lRet));
-
-        if (lRet != ERROR_SUCCESS)
-            rc = RTErrConvertFromWin32(lRet);
+        HKEY hKey;
+        long lRet;
+        lRet = RegCreateKeyEx (HKEY_LOCAL_MACHINE,
+                               "SOFTWARE\\Sun\\VirtualBox Guest Additions",
+                               0,           /* Reserved */
+                               NULL,        /* lpClass [in, optional] */
+                               0,           /* dwOptions [in] */
+                               KEY_WRITE,
+                               NULL,        /* lpSecurityAttributes [in, optional] */
+                               &hKey,
+                               NULL);       /* lpdwDisposition [out, optional] */
+        if (lRet == ERROR_SUCCESS)
+        {
+            lRet = RegSetValueEx(hKey, "HostVerLastChecked", 0, REG_SZ, (BYTE*)pszVer, (DWORD)(strlen(pszVer)*sizeof(char)));
+            if (lRet != ERROR_SUCCESS)
+                LogFlow(("Could not write HostVerLastChecked! Error = %ld\n", lRet));
+            RegCloseKey(hKey);
+        }
+        else
+            LogFlow(("Could not open registry key! Error = %ld\n", lRet));
+    
+        if (lRet != ERROR_SUCCESS)
+            rc = RTErrConvertFromWin32(lRet);
 #else
 #endif

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

@@ -235 +235 @@
         {
             if (ERROR_SUCCESS == RegQueryValueEx(hKey, "Version", NULL, &dwType, (BYTE*)(LPCTSTR)pszVer, &dwSize))
-                ppszVer = pszVer;
+                *ppszVer = pszVer;
         }
         /* Revision. */
@@ -241 +241 @@
         {
             dwSize = 32;
-            char pszRev = (char*)RTMemAlloc(dwSize);
+            char *pszRev = (char*)RTMemAlloc(dwSize);
             if (ERROR_SUCCESS == RegQueryValueEx(hKey, "Revision", NULL, &dwType, (BYTE*)(LPCTSTR)pszRev, &dwSize))
-                ppszRev = pszRev;
+                *ppszRev = pszRev;
         }
     }