mirror of
https://github.com/reactos/reactos.git
synced 2025-07-31 18:42:14 +00:00
[BASE][BOOT][WIN32SS]
* Fix some format string / argument mismatches. By Andre Guibert de Bruet. CORE-7995 #resolve #comment Thanks! svn path=/trunk/; revision=63084
This commit is contained in:
parent
174da99a46
commit
3d22f7e832
8 changed files with 16 additions and 16 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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]);
|
||||
}
|
||||
|
||||
|
|
|
@ -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]);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue