kernel32/tests: Fix some integer to pointer conversion warnings.
This commit is contained in:
parent
0014046adc
commit
02a1c0d7ee
|
@ -241,7 +241,7 @@ static void doChild(const char* file, const char* option)
|
||||||
siA.dwX, siA.dwY, siA.dwXSize, siA.dwYSize,
|
siA.dwX, siA.dwY, siA.dwXSize, siA.dwYSize,
|
||||||
siA.dwXCountChars, siA.dwYCountChars, siA.dwFillAttribute,
|
siA.dwXCountChars, siA.dwYCountChars, siA.dwFillAttribute,
|
||||||
siA.dwFlags, siA.wShowWindow,
|
siA.dwFlags, siA.wShowWindow,
|
||||||
(DWORD)siA.hStdInput, (DWORD)siA.hStdOutput, (DWORD)siA.hStdError);
|
(DWORD_PTR)siA.hStdInput, (DWORD_PTR)siA.hStdOutput, (DWORD_PTR)siA.hStdError);
|
||||||
|
|
||||||
/* since GetStartupInfoW is only implemented in win2k,
|
/* since GetStartupInfoW is only implemented in win2k,
|
||||||
* zero out before calling so we can notice the difference
|
* zero out before calling so we can notice the difference
|
||||||
|
@ -258,7 +258,7 @@ static void doChild(const char* file, const char* option)
|
||||||
siW.dwX, siW.dwY, siW.dwXSize, siW.dwYSize,
|
siW.dwX, siW.dwY, siW.dwXSize, siW.dwYSize,
|
||||||
siW.dwXCountChars, siW.dwYCountChars, siW.dwFillAttribute,
|
siW.dwXCountChars, siW.dwYCountChars, siW.dwFillAttribute,
|
||||||
siW.dwFlags, siW.wShowWindow,
|
siW.dwFlags, siW.wShowWindow,
|
||||||
(DWORD)siW.hStdInput, (DWORD)siW.hStdOutput, (DWORD)siW.hStdError);
|
(DWORD_PTR)siW.hStdInput, (DWORD_PTR)siW.hStdOutput, (DWORD_PTR)siW.hStdError);
|
||||||
|
|
||||||
/* Arguments */
|
/* Arguments */
|
||||||
childPrintf(hFile, "[Arguments]\nargcA=%d\n", myARGC);
|
childPrintf(hFile, "[Arguments]\nargcA=%d\n", myARGC);
|
||||||
|
@ -492,7 +492,7 @@ static void ok_child_stringWA( int line, const char *sect, const char *key,
|
||||||
#define okChildInt(sect, key, expect) \
|
#define okChildInt(sect, key, expect) \
|
||||||
do { \
|
do { \
|
||||||
UINT result = GetPrivateProfileIntA((sect), (key), !(expect), resfile); \
|
UINT result = GetPrivateProfileIntA((sect), (key), !(expect), resfile); \
|
||||||
ok(result == expect, "%s:%s expected %d, but got %d\n", (sect), (key), (int)(expect), result); \
|
ok(result == expect, "%s:%s expected %u, but got %u\n", (sect), (key), (UINT)(expect), result); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
static void test_Startup(void)
|
static void test_Startup(void)
|
||||||
|
@ -1292,9 +1292,9 @@ static void test_Console(void)
|
||||||
okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow);
|
okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow);
|
||||||
|
|
||||||
/* check child correctly inherited the console */
|
/* check child correctly inherited the console */
|
||||||
okChildInt("StartupInfoA", "hStdInput", (DWORD)startup.hStdInput);
|
okChildInt("StartupInfoA", "hStdInput", (DWORD_PTR)startup.hStdInput);
|
||||||
okChildInt("StartupInfoA", "hStdOutput", (DWORD)startup.hStdOutput);
|
okChildInt("StartupInfoA", "hStdOutput", (DWORD_PTR)startup.hStdOutput);
|
||||||
okChildInt("StartupInfoA", "hStdError", (DWORD)startup.hStdError);
|
okChildInt("StartupInfoA", "hStdError", (DWORD_PTR)startup.hStdError);
|
||||||
okChildInt("Console", "SizeX", (DWORD)sbi.dwSize.X);
|
okChildInt("Console", "SizeX", (DWORD)sbi.dwSize.X);
|
||||||
okChildInt("Console", "SizeY", (DWORD)sbi.dwSize.Y);
|
okChildInt("Console", "SizeY", (DWORD)sbi.dwSize.Y);
|
||||||
okChildInt("Console", "CursorX", (DWORD)sbi.dwCursorPosition.X);
|
okChildInt("Console", "CursorX", (DWORD)sbi.dwCursorPosition.X);
|
||||||
|
|
Loading…
Reference in New Issue