Changeset 63091 in vbox for trunk/src/VBox

Timestamp:

Aug 6, 2016 3:09:17 PM (8 years ago)

Author:

vboxsync

Message:

GA/NT/Installer: warnings

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• Loader/VBoxWindowsAdditions.cpp (modified) (3 diffs)
• VBoxDrvInst.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Installer/Loader/VBoxWindowsAdditions.cpp

@@ -22 +22 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#include <iprt/cdefs.h>
 #include <iprt/win/windows.h>
 #ifndef ERROR_ELEVATION_REQUIRED    /* Windows Vista and later. */
@@ -33 +34 @@
 static BOOL IsWow64(void)
 {
-    BOOL bIsWow64 = FALSE;
+    BOOL fIsWow64 = FALSE;
     typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS)(HANDLE, PBOOL);
     LPFN_ISWOW64PROCESS fnIsWow64Process = (LPFN_ISWOW64PROCESS)GetProcAddress(GetModuleHandle(L"kernel32"), "IsWow64Process");
     if (fnIsWow64Process != NULL)
     {
-        if (!fnIsWow64Process(GetCurrentProcess(), &bIsWow64))
+        if (!fnIsWow64Process(GetCurrentProcess(), &fIsWow64))
         {
             fwprintf(stderr, L"ERROR: Could not determine process type!\n");
 
             /* Error in retrieving process type - assume that we're running on 32bit. */
-            bIsWow64 = FALSE;
-        }
-    }
-    return bIsWow64;
+            fIsWow64 = FALSE;
+        }
+    }
+    return fIsWow64;
 }
 
@@ -114 +115 @@
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
+    RT_NOREF(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
+
     /*
      * Gather the parameters of the real installer program.

trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp

@@ -1263 +1263 @@
                 if (pbVal == NULL) /* By default interpret value as string */
                 {
-                    pbVal = (BYTE*)argv[7];
-                    dwValSize = _tcslen(argv[7]);
+                    pbVal = (BYTE *)argv[7];
+                    dwValSize = (DWORD)_tcslen(argv[7]);
                 }
                 if (argc > 9)