Changeset 83843 in vbox

Timestamp:

Apr 20, 2020 9:31:57 AM (5 years ago)

Author:

vboxsync

Message:

Additions/NT/Installer: VC++ 14.1 warnings. bugref:8489

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• InstallHelper/VBoxGuestInstallHelper.cpp (modified) (1 diff)
• Loader/VBoxWindowsAdditions.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp

@@ -306 +306 @@
 #ifdef UNICODE
         char *pszFileUtf8;
-        int rc = RTUtf16ToUtf8(szFile, &pszFileUtf8);
+        rc = RTUtf16ToUtf8(szFile, &pszFileUtf8);
         if (RT_SUCCESS(rc))
         {

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

@@ -71 +71 @@
             && dwRc != WAIT_OBJECT_0 + 1)
         {
-            fwprintf(stderr, L"ERROR: MsgWaitForMultipleObjects failed: %u (%u)\n", dwRc, GetLastError());
+            fwprintf(stderr, L"ERROR: MsgWaitForMultipleObjects failed: %lu (%lu)\n", dwRc, GetLastError());
             break;
         }
@@ -84 +84 @@
     else
     {
-        fwprintf(stderr, L"ERROR: GetExitCodeProcess failed: %u\n", GetLastError());
+        fwprintf(stderr, L"ERROR: GetExitCodeProcess failed: %lu\n", GetLastError());
         *piExitCode = 16;
     }
@@ -102 +102 @@
         else
         {
-            fwprintf(stderr, L"ERROR: GetExitCodeProcess failed: %u\n", GetLastError());
+            fwprintf(stderr, L"ERROR: GetExitCodeProcess failed: %lu\n", GetLastError());
             *piExitCode = 16;
         }
@@ -108 +108 @@
     else
     {
-        fwprintf(stderr, L"ERROR: WaitForSingleObjectEx failed: %u (%u)\n", WaitRc, GetLastError());
+        fwprintf(stderr, L"ERROR: WaitForSingleObjectEx failed: %lu (%lu)\n", WaitRc, GetLastError());
         *piExitCode = 16;
     }
@@ -126 +126 @@
     if (cchCurDir == 0 || cchCurDir >= sizeof(wszCurDir))
     {
-        fwprintf(stderr, L"ERROR: GetCurrentDirectoryW failed: %u (ret %u)\n", GetLastError(), cchCurDir);
+        fwprintf(stderr, L"ERROR: GetCurrentDirectoryW failed: %lu (ret %lu)\n", GetLastError(), cchCurDir);
         return 12;
     }
@@ -135 +135 @@
     if (cchModule == 0 || cchModule >= sizeof(wszModule))
     {
-        fwprintf(stderr, L"ERROR: GetModuleFileNameW failed: %u (ret %u)\n", GetLastError(), cchModule);
+        fwprintf(stderr, L"ERROR: GetModuleFileNameW failed: %lu (ret %lu)\n", GetLastError(), cchModule);
         return 13;
     }
@@ -160 +160 @@
     if (cchSuff + cchModule >= sizeof(wszModule))
     {
-        fwprintf(stderr, L"ERROR: Real installer name is too long (%u chars)\n", cchSuff + cchModule);
+        fwprintf(stderr, L"ERROR: Real installer name is too long (%u chars)\n", (unsigned)(cchSuff + cchModule));
         return 14;
     }
@@ -283 +283 @@
         else
         {
-            fwprintf(stderr, L"ERROR: Failed to execute '%ws' via ShellExecuteExW: %u\n", wszModule, GetLastError());
+            fwprintf(stderr, L"ERROR: Failed to execute '%ws' via ShellExecuteExW: %lu\n", wszModule, GetLastError());
             iRet = 9;
         }
@@ -289 +289 @@
     else
     {
-        fwprintf(stderr, L"ERROR: Failed to execute '%ws' via CreateProcessW: %u\n", wszModule, GetLastError());
+        fwprintf(stderr, L"ERROR: Failed to execute '%ws' via CreateProcessW: %lu\n", wszModule, GetLastError());
         iRet = 8;
     }