[BASE][BOOT][WIN32SS]

* Fix some format string / argument mismatches. By Andre Guibert de Bruet.
CORE-7995 #resolve #comment Thanks!

svn path=/trunk/; revision=63084

diff --git a/reactos/base/services/umpnpmgr/umpnpmgr.c b/reactos/base/services/umpnpmgr/umpnpmgr.c
index c821105..f683e9f 100644 (file)
--- a/reactos/base/services/umpnpmgr/umpnpmgr.c
+++ b/reactos/base/services/umpnpmgr/umpnpmgr.c
@@ -1620,7 +1620,7 @@ DWORD PNP_CreateDevInst(
         dwInstanceNumber = 0;
         do
         {
-            swprintf(szGeneratedInstance, L"Root\\%ls\\%04d",
+            swprintf(szGeneratedInstance, L"Root\\%ls\\%04lu",
                      pszDeviceID, dwInstanceNumber);
 
             /* Try to create a device instance with this ID */
@@ -2115,7 +2115,7 @@ DWORD PNP_HwProfFlags(
     else
     {
         swprintf(szKeyName,
-                 L"System\\CurrentControlSet\\HardwareProfiles\\%04u\\System\\CurrentControlSet\\Enum",
+                 L"System\\CurrentControlSet\\HardwareProfiles\\%04lu\\System\\CurrentControlSet\\Enum",
                  ulConfig);
     }
 

diff --git a/reactos/base/setup/usetup/mui.c b/reactos/base/setup/usetup/mui.c
index 174f2f9..71a6250 100644 (file)
--- a/reactos/base/setup/usetup/mui.c
+++ b/reactos/base/setup/usetup/mui.c
@@ -461,7 +461,7 @@ AddKbLayoutsToRegistry(IN const MUI_LAYOUTS * MuiLayouts)
         }
         else
         {
-            swprintf(szLangID, L"d%03u%s", uCount, MuiLayouts[uIndex].LangID);
+            swprintf(szLangID, L"d%03lu%s", uCount, MuiLayouts[uIndex].LangID);
             Status = NtSetValueKey(KeyHandle,
                                    &ValueName,
                                    0,

diff --git a/reactos/base/shell/explorer/services/startup.c b/reactos/base/shell/explorer/services/startup.c
index b0dbf43..875166e 100644 (file)
--- a/reactos/base/shell/explorer/services/startup.c
+++ b/reactos/base/shell/explorer/services/startup.c
@@ -93,7 +93,7 @@ static BOOL pendingRename()
         }
         else
         {
-            printf("Couldn't open key, error %ld\n", res);
+            printf("Couldn't open key, error %lu\n", res);
             res=FALSE;
         }
 
@@ -113,7 +113,7 @@ static BOOL pendingRename()
 
     if (res!=ERROR_SUCCESS)
     {
-        printf("Couldn't query value's length (%ld)\n", res);
+        printf("Couldn't query value's length (%lu)\n", res);
         res=FALSE;
         goto end;
     }
@@ -369,7 +369,7 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
         if ((res=RegEnumValueW(hkRun, i, szValue, &nValLength, 0, &type,
                         (LPBYTE)szCmdLine, &nDataLength))!=ERROR_SUCCESS)
         {
-            printf("Couldn't read in value %ld - %ld\n", i, res);
+            printf("Couldn't read in value %lu - %ld\n", i, res);
 
             continue;
         }
@@ -379,22 +379,22 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
 
         if (bDelete && (res=RegDeleteValueW(hkRun, szValue))!=ERROR_SUCCESS)
         {
-            printf("Couldn't delete value - %ld, %ld. Running command anyways.\n", i, res);
+            printf("Couldn't delete value - %lu, %ld. Running command anyways.\n", i, res);
         }
 
         if (type!=REG_SZ)
         {
-            printf("Incorrect type of value #%ld (%ld)\n", i, type);
+            printf("Incorrect type of value #%lu (%lu)\n", i, type);
 
             continue;
         }
 
         if ((res=runCmd(szCmdLine, NULL, bSynchronous, FALSE))==INVALID_RUNCMD_RETURN)
         {
-            printf("Error running cmd #%ld (%ld)\n", i, GetLastError());
+            printf("Error running cmd #%lu (%ld)\n", i, GetLastError());
         }
 
-        printf("Done processing cmd #%ld\n", i);
+        printf("Done processing cmd #%lu\n", i);
     }
 
     free(szValue);

diff --git a/reactos/base/system/msiexec/service.c b/reactos/base/system/msiexec/service.c
index 47a2859..831a680 100644 (file)
--- a/reactos/base/system/msiexec/service.c
+++ b/reactos/base/system/msiexec/service.c
@@ -73,7 +73,7 @@ static BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode,
 
 static void WINAPI ServiceCtrlHandler(DWORD code)
 {
-    WINE_TRACE("%d\n", code);
+    WINE_TRACE("%u\n", code);
 
     switch (code)
     {
@@ -83,7 +83,7 @@ static void WINAPI ServiceCtrlHandler(DWORD code)
             KillService();
             return;
         default:
-            fprintf(stderr, "Unhandled service control code: %d\n", code);
+            fprintf(stderr, "Unhandled service control code: %u\n", code);
             break;
     }
 

diff --git a/reactos/base/system/services/database.c b/reactos/base/system/services/database.c
index aea3f89..39563d8 100644 (file)
--- a/reactos/base/system/services/database.c
+++ b/reactos/base/system/services/database.c
@@ -99,7 +99,7 @@ ScmCreateNewControlPipe(PSERVICE_IMAGE pServiceImage)
     }
 
     /* Create '\\.\pipe\net\NtControlPipeXXX' instance */
-    swprintf(szControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%u", ServiceCurrent);
+    swprintf(szControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%lu", ServiceCurrent);
 
     DPRINT("PipeName: %S\n", szControlPipeName);
 

diff --git a/reactos/boot/armllb/os/loader.c b/reactos/boot/armllb/os/loader.c
index 05689d9..addf9dc 100644 (file)
--- a/reactos/boot/armllb/os/loader.c
+++ b/reactos/boot/armllb/os/loader.c
@@ -115,7 +115,7 @@ LlbHwLoadOsLoaderFromRam(VOID)
     /* Set parameters for the OS loader */
     snprintf(CommandLine,
              sizeof(CommandLine),
-             "rdbase=0x%x rdsize=0x%x rdoffset=%s",
+             "rdbase=0x%lx rdsize=0x%lx rdoffset=%s",
              RootFs, Size, Offset);
     LlbSetCommandLine(CommandLine);
     

diff --git a/reactos/win32ss/user/winsrv/consrv/settings.c b/reactos/win32ss/user/winsrv/consrv/settings.c
index e1ea885..7373f04 100644 (file)
--- a/reactos/win32ss/user/winsrv/consrv/settings.c
+++ b/reactos/win32ss/user/winsrv/consrv/settings.c
@@ -351,7 +351,7 @@ do {
          * or we are saving settings for a particular console, which differs
          * from the default ones.
          */
-        swprintf(szValueName, L"ColorTable%02d", i);
+        swprintf(szValueName, L"ColorTable%02u", i);
         SetConsoleSetting(szValueName, REG_DWORD, sizeof(DWORD), &ConsoleInfo->Colors[i], s_Colors[i]);
     }
 

diff --git a/reactos/win32ss/user/winsrv/consrv_new/settings.c b/reactos/win32ss/user/winsrv/consrv_new/settings.c
index 738d5bf..f85fe13 100644 (file)
--- a/reactos/win32ss/user/winsrv/consrv_new/settings.c
+++ b/reactos/win32ss/user/winsrv/consrv_new/settings.c
@@ -355,7 +355,7 @@ do {
          * or we are saving settings for a particular console, which differs
          * from the default ones.
          */
-        swprintf(szValueName, L"ColorTable%02d", i);
+        swprintf(szValueName, L"ColorTable%02u", i);
         SetConsoleSetting(szValueName, REG_DWORD, sizeof(DWORD), &ConsoleInfo->Colors[i], s_Colors[i]);
     }