Alexandre Julliard : kernel32/tests: Fix some integer to pointer conversion warnings.
Alexandre Julliard
julliard at winehq.org
Thu Jan 8 08:31:07 CST 2009
Module: wine
Branch: master
Commit: 02a1c0d7ee4da6c6178388de7cddde79cf012d94
URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a1c0d7ee4da6c6178388de7cddde79cf012d94
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jan 8 13:17:53 2009 +0100
kernel32/tests: Fix some integer to pointer conversion warnings.
---
dlls/kernel32/tests/process.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index 0568b52..22d5cbf 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -241,7 +241,7 @@ static void doChild(const char* file, const char* option)
siA.dwX, siA.dwY, siA.dwXSize, siA.dwYSize,
siA.dwXCountChars, siA.dwYCountChars, siA.dwFillAttribute,
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,
* 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.dwXCountChars, siW.dwYCountChars, siW.dwFillAttribute,
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 */
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) \
do { \
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)
static void test_Startup(void)
@@ -1292,9 +1292,9 @@ static void test_Console(void)
okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow);
/* check child correctly inherited the console */
- okChildInt("StartupInfoA", "hStdInput", (DWORD)startup.hStdInput);
- okChildInt("StartupInfoA", "hStdOutput", (DWORD)startup.hStdOutput);
- okChildInt("StartupInfoA", "hStdError", (DWORD)startup.hStdError);
+ okChildInt("StartupInfoA", "hStdInput", (DWORD_PTR)startup.hStdInput);
+ okChildInt("StartupInfoA", "hStdOutput", (DWORD_PTR)startup.hStdOutput);
+ okChildInt("StartupInfoA", "hStdError", (DWORD_PTR)startup.hStdError);
okChildInt("Console", "SizeX", (DWORD)sbi.dwSize.X);
okChildInt("Console", "SizeY", (DWORD)sbi.dwSize.Y);
okChildInt("Console", "CursorX", (DWORD)sbi.dwCursorPosition.X);
More information about the wine-cvs
mailing list