Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- dlls/user32/tests/dde.c | 10 +++++----- dlls/user32/tests/msg.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index eed2ac437e..934252008c 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2123,7 +2123,7 @@ static void test_PackDDElParam(void)
lparam = PackDDElParam(WM_DDE_INITIATE, 0xcafe, 0xbeef); /* value gets sign-extended despite being an LPARAM */ - ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); + ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam);
lo = hi = 0; ret = UnpackDDElParam(WM_DDE_INITIATE, lparam, &lo, &hi); @@ -2135,7 +2135,7 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret);
lparam = PackDDElParam(WM_DDE_TERMINATE, 0xcafe, 0xbeef); - ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); + ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam);
lo = hi = 0; ret = UnpackDDElParam(WM_DDE_TERMINATE, lparam, &lo, &hi); @@ -2170,7 +2170,7 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret);
lparam = PackDDElParam(WM_DDE_UNADVISE, 0xcafe, 0xbeef); - ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); + ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam);
lo = hi = 0; ret = UnpackDDElParam(WM_DDE_UNADVISE, lparam, &lo, &hi); @@ -2183,7 +2183,7 @@ static void test_PackDDElParam(void)
lparam = PackDDElParam(WM_DDE_ACK, 0xcafe, 0xbeef); /* win9x returns the input (0xbeef<<16 | 0xcafe) here */ - if (lparam != (int)0xbeefcafe) { + if (lparam != 0xbeefcafe) { ptr = GlobalLock((HGLOBAL)lparam); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(ptr[0] == 0xcafe, "Expected 0xcafe, got %08lx\n", ptr[0]); @@ -2228,7 +2228,7 @@ static void test_PackDDElParam(void) ok(ret == TRUE, "Expected TRUE, got %d\n", ret);
lparam = PackDDElParam(WM_DDE_REQUEST, 0xcafe, 0xbeef); - ok(lparam == (int)0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam); + ok(lparam == 0xbeefcafe, "Expected 0xbeefcafe, got %08lx\n", lparam);
lo = hi = 0; ret = UnpackDDElParam(WM_DDE_REQUEST, lparam, &lo, &hi); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d0f0637ee..acf131f2d9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17552,7 +17552,7 @@ START_TEST(msg) { unsigned int arg; /* Child process. */ - sscanf (test_argv[2], "%d", (unsigned int *) &arg); + sscanf (test_argv[2], "%d", &arg); do_wait_idle_child( arg ); return; }
Hi,
While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=48553
Your paranoid android.
=== w2003std (32 bit report) ===
user32: dde: Timeout
=== wvistau64 (64 bit report) ===
user32: dde.c:2126: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2138: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2173: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2231: Test failed: Expected 0xbeefcafe, got beefcafe
=== w2008s64 (64 bit report) ===
user32: dde.c:2126: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2138: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2173: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2231: Test failed: Expected 0xbeefcafe, got beefcafe
=== w7pro64 (64 bit report) ===
user32: dde.c:2126: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2138: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2173: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2231: Test failed: Expected 0xbeefcafe, got beefcafe
=== w864 (64 bit report) ===
user32: dde.c:2126: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2138: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2173: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2231: Test failed: Expected 0xbeefcafe, got beefcafe
=== w1064 (64 bit report) ===
user32: dde.c:2126: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2138: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2173: Test failed: Expected 0xbeefcafe, got beefcafe dde.c:2231: Test failed: Expected 0xbeefcafe, got beefcafe
=== w8adm (32 bit report) ===
user32: msg.c:14588: Test failed: unexpected message 31f msg.c:14589: Test failed: bad wparam 1 msg.c:14595: Test failed: unicode WM_CHAR: 0: the msg sequence is not complete: expected 0102 - actual 0000
=== debian9 (64 bit WoW report) ===
user32: dde.c:2126: Test failed: Expected 0xbeefcafe, got ffffffffbeefcafe dde.c:2138: Test failed: Expected 0xbeefcafe, got ffffffffbeefcafe dde.c:2173: Test failed: Expected 0xbeefcafe, got ffffffffbeefcafe dde.c:2231: Test failed: Expected 0xbeefcafe, got ffffffffbeefcafe
-
Marvin -
Michael Stefaniuc