From dc4126e8c6a174a010587483c1b9f393b5ee15d8 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Fri, 11 Feb 2022 23:05:00 +0100 Subject: [PATCH] msvcp140/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/msvcp140/tests/Makefile.in | 1 - dlls/msvcp140/tests/msvcp140.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp140/tests/Makefile.in b/dlls/msvcp140/tests/Makefile.in index 4c4f7688109..aa82d0cba06 100644 --- a/dlls/msvcp140/tests/Makefile.in +++ b/dlls/msvcp140/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcp140.dll C_SRCS = \ diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index c79e425190b..b24c5e0f53d 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -301,7 +301,7 @@ static BOOL init(void) static void test_thrd(void) { ok(p__Thrd_id() == GetCurrentThreadId(), - "expected same id, got _Thrd_id %u GetCurrentThreadId %u\n", + "expected same id, got _Thrd_id %u GetCurrentThreadId %lu\n", p__Thrd_id(), GetCurrentThreadId()); } @@ -529,7 +529,7 @@ static void test_chore(void) ok(chore.callback == chore_callback, "chore.callback = %p, expected %p\n", chore.callback, chore_callback); ok(chore.arg == event, "chore.arg = %p, expected %p\n", chore.arg, event); wait = WaitForSingleObject(event, 500); - ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait); + ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", wait); if(!GetProcAddress(GetModuleHandleA("kernel32"), "CreateThreadpoolWork")) { @@ -545,12 +545,12 @@ static void test_chore(void) ok(old_chore.work != chore.work, "new threadpool work was not created\n"); p__Release_chore(&old_chore); wait = WaitForSingleObject(event, 500); - ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait); + ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", wait); ret = p__Reschedule_chore(&chore); ok(!ret, "_Reschedule_chore returned %d\n", ret); wait = WaitForSingleObject(event, 500); - ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", wait); + ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %ld\n", wait); p__Release_chore(&chore); ok(!chore.work, "chore.work != NULL\n"); @@ -1256,12 +1256,12 @@ static void test__Winerror_message(void) ret = p__Winerror_message(0, buf, sizeof(buf)); ok(ret == ret_fm || (ret_fm > 2 && buf_fm[ret_fm - 1] == '\n' && buf_fm[ret_fm - 2] == '\r' && ret + 2 == ret_fm), - "ret = %u, expected %u\n", ret, ret_fm); + "ret = %lu, expected %lu\n", ret, ret_fm); ok(!strncmp(buf, buf_fm, ret), "buf = %s, expected %s\n", buf, buf_fm); memset(buf, 'a', sizeof(buf)); ret = p__Winerror_message(0, buf, 2); - ok(!ret, "ret = %u\n", ret); + ok(!ret, "ret = %lu\n", ret); ok(buf[0] == 'a', "buf = %s\n", buf); }