Changeset 23836 in vbox for trunk/src/VBox/Additions

Timestamp:

Oct 16, 2009 10:36:52 PM (16 years ago)

Author:

vboxsync

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

53594

Message:

VBoxClient/VBoxTray/VBgl: Windows build fixes.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxHostVersion.cpp (modified) (1 diff)
• common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp (modified) (2 diffs)

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

@@ -30 +30 @@
 int VBoxCheckHostVersion ()
 {
-        int rc;
-        char *pszHostVersion;
-        char *pszGuestVersion;
-        rc = VbglR3HostVersionCheckForUpdate(&pszHostVersion, &pszGuestVersion);
-        if (RT_SUCCESS(rc))
-        {
-                char szMsg[256]; /* Sizes according to MSDN. */
-                char szTitle[64];
+    int rc;
+    char *pszHostVersion;
+    char *pszGuestVersion;
+    rc = VbglR3HostVersionCheckForUpdate(&pszHostVersion, &pszGuestVersion);
+    if (RT_SUCCESS(rc))
+    {
+        char szMsg[256]; /* Sizes according to MSDN. */
+        char szTitle[64];
 
-                /** @todo add some translation macros here */
-                _snprintf(szTitle, sizeof(szTitle), "VirtualBox Guest Additions update available!");
-                _snprintf(szMsg, sizeof(szMsg), "Your guest is currently running the Guest Additions version %s. "
-                                                                                "We recommend updating to the latest version (%s) by choosing the "
-                                                                                "install option from the Devices menu.", pszGuestVersion, pszHostVersion);
+        /** @todo add some translation macros here */
+        _snprintf(szTitle, sizeof(szTitle), "VirtualBox Guest Additions update available!");
+        _snprintf(szMsg, sizeof(szMsg), "Your guest is currently running the Guest Additions version %s. "
+                                        "We recommend updating to the latest version (%s) by choosing the "
+                                        "install option from the Devices menu.", pszGuestVersion, pszHostVersion);
 
-                rc = showBalloonTip(gInstance, gToolWindow, ID_TRAYICON, szMsg, szTitle, 5000, 0);
+        rc = showBalloonTip(gInstance, gToolWindow, ID_TRAYICON, szMsg, szTitle, 5000, 0);
         if (RT_FAILURE(rc))
             Log(("VBoxTray: Could not show version notifier balloon tooltip! rc = %d\n", rc));
 
-                VbglR3GuestPropReadValueFree(pszHostVersion);
-                VbglR3GuestPropReadValueFree(pszGuestVersion);
-        }
+        VbglR3GuestPropReadValueFree(pszHostVersion);
+        VbglR3GuestPropReadValueFree(pszGuestVersion);
+    }
 
     /* If we didn't have to check for the host version then this is not an error */

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

@@ -26 +26 @@
 #include <iprt/mem.h>
 #include <VBox/log.h>
-#ifdef RT_OS_WINDOWS
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
-#endif
-
 #include "VBGLR3Internal.h"
 
@@ -233 +228 @@
     {
         /* Version. */
-        dwSize = 32;
-        pszVer = (char*)RTMemAlloc(dwSize);
+        DWORD dwType;
+        DWORD dwSize = 32;
+        ppszVer = (char*)RTMemAlloc(dwSize);
         rc = RegQueryValueEx(hKey, "Version", NULL, &dwType, (BYTE*)(LPCTSTR)*ppszVer, &dwSize);
         /* Revision. */