Skip to content

W
wine-winehq
Commit aea94f51 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

kernel32/tests: Declare childPrintf() as a printf-style function.

And fix the corresponding warnings. Signed-off-by: 's avatarFrancois Gouget <fgouget@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f6dc7c88
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
dlls/kernel32/tests/process.c
View file @ aea94f51
...@@ -275,7 +275,7 @@ static void get_file_name(char* buf) ...@@ -275,7 +275,7 @@ static void get_file_name(char* buf)
* static void childPrintf * static void childPrintf
* *
*/ */
static void childPrintf(HANDLE h, const char* fmt, ...) static void WINETEST_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...)
{ {
va_list valist; va_list valist;
char buffer[1024+4*MAX_LISTED_ENV_VAR]; char buffer[1024+4*MAX_LISTED_ENV_VAR];
...@@ -312,10 +312,10 @@ static void doChild(const char* file, const char* option) ...@@ -312,10 +312,10 @@ static void doChild(const char* file, const char* option)
/* output of startup info (Ansi) */ /* output of startup info (Ansi) */
GetStartupInfoA(&siA); GetStartupInfoA(&siA);
childPrintf(hFile, childPrintf(hFile,
"[StartupInfoA]\ncb=%08ld\nlpDesktop=%s\nlpTitle=%s\n" "[StartupInfoA]\ncb=%08u\nlpDesktop=%s\nlpTitle=%s\n"
"dwX=%lu\ndwY=%lu\ndwXSize=%lu\ndwYSize=%lu\n" "dwX=%u\ndwY=%u\ndwXSize=%u\ndwYSize=%u\n"
"dwXCountChars=%lu\ndwYCountChars=%lu\ndwFillAttribute=%lu\n" "dwXCountChars=%u\ndwYCountChars=%u\ndwFillAttribute=%u\n"
"dwFlags=%lu\nwShowWindow=%u\n" "dwFlags=%u\nwShowWindow=%u\n"
"hStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n", "hStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n",
siA.cb, encodeA(siA.lpDesktop), encodeA(siA.lpTitle), siA.cb, encodeA(siA.lpDesktop), encodeA(siA.lpTitle),
siA.dwX, siA.dwY, siA.dwXSize, siA.dwYSize, siA.dwX, siA.dwY, siA.dwXSize, siA.dwYSize,
...@@ -339,10 +339,10 @@ static void doChild(const char* file, const char* option) ...@@ -339,10 +339,10 @@ static void doChild(const char* file, const char* option)
memset(&siW, 0, sizeof(siW)); memset(&siW, 0, sizeof(siW));
GetStartupInfoW(&siW); GetStartupInfoW(&siW);
childPrintf(hFile, childPrintf(hFile,
"[StartupInfoW]\ncb=%08ld\nlpDesktop=%s\nlpTitle=%s\n" "[StartupInfoW]\ncb=%08u\nlpDesktop=%s\nlpTitle=%s\n"
"dwX=%lu\ndwY=%lu\ndwXSize=%lu\ndwYSize=%lu\n" "dwX=%u\ndwY=%u\ndwXSize=%u\ndwYSize=%u\n"
"dwXCountChars=%lu\ndwYCountChars=%lu\ndwFillAttribute=%lu\n" "dwXCountChars=%u\ndwYCountChars=%u\ndwFillAttribute=%u\n"
"dwFlags=%lu\nwShowWindow=%u\n" "dwFlags=%u\nwShowWindow=%u\n"
"hStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n", "hStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n",
siW.cb, encodeW(siW.lpDesktop), encodeW(siW.lpTitle), siW.cb, encodeW(siW.lpDesktop), encodeW(siW.lpTitle),
siW.dwX, siW.dwY, siW.dwXSize, siW.dwYSize, siW.dwX, siW.dwY, siW.dwXSize, siW.dwYSize,
...@@ -445,9 +445,9 @@ static void doChild(const char* file, const char* option) ...@@ -445,9 +445,9 @@ static void doChild(const char* file, const char* option)
childPrintf(hFile, "InputCP=%d\nOutputCP=%d\n", childPrintf(hFile, "InputCP=%d\nOutputCP=%d\n",
GetConsoleCP(), GetConsoleOutputCP()); GetConsoleCP(), GetConsoleOutputCP());
if (GetConsoleMode(hConIn, &modeIn)) if (GetConsoleMode(hConIn, &modeIn))
childPrintf(hFile, "InputMode=%ld\n", modeIn); childPrintf(hFile, "InputMode=%u\n", modeIn);
if (GetConsoleMode(hConOut, &modeOut)) if (GetConsoleMode(hConOut, &modeOut))
childPrintf(hFile, "OutputMode=%ld\n", modeOut); childPrintf(hFile, "OutputMode=%u\n", modeOut);
/* now that we have written all relevant information, let's change it */ /* now that we have written all relevant information, let's change it */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment