Piotr Caban : msvcr100/tests: Build without -DWINE_NO_LONG_TYPES.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 52f7dcc5558e056a9104e1ec12baaee5e469acb5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=52f7dcc5558e056a9104e1ec12baaee5e469acb5

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Fri Feb 11 23:18:47 2022 +0100

msvcr100/tests: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msvcr100/tests/Makefile.in |  1 -
 dlls/msvcr100/tests/msvcr100.c  | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/dlls/msvcr100/tests/Makefile.in b/dlls/msvcr100/tests/Makefile.in
index bcb6d6fd13c..a7652df38d2 100644
--- a/dlls/msvcr100/tests/Makefile.in
+++ b/dlls/msvcr100/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL   = msvcr100.dll
 
 C_SRCS = \
diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c
index bdd44fa405a..4319f31a400 100644
--- a/dlls/msvcr100/tests/msvcr100.c
+++ b/dlls/msvcr100/tests/msvcr100.c
@@ -66,7 +66,7 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression,
     ok(function == NULL, "function is not NULL\n");
     ok(file == NULL, "file is not NULL\n");
     ok(line == 0, "line = %u\n", line);
-    ok(arg == 0, "arg = %lx\n", (UINT_PTR)arg);
+    ok(arg == 0, "arg = %Ix\n", arg);
 }
 
 #ifdef __i386__
@@ -251,7 +251,7 @@ static BOOL init(void)
     SetLastError(0xdeadbeef);
     hcrt = LoadLibraryA("msvcr100.dll");
     if (!hcrt) {
-        win_skip("msvcr100.dll not installed (got %d)\n", GetLastError());
+        win_skip("msvcr100.dll not installed (got %ld)\n", GetLastError());
         return FALSE;
     }
 
@@ -691,34 +691,34 @@ static void test__SpinWait(void)
     CHECK_CALLED(yield_func);
 
     ul = call_func1(pSpinWait__NumberOfSpins, &sp);
-    ok(ul == 1, "_SpinWait::_NumberOfSpins returned %u\n", ul);
+    ok(ul == 1, "_SpinWait::_NumberOfSpins returned %lu\n", ul);
 
     sp.spin = 2;
     b = call_func1(pSpinWait__ShouldSpinAgain, &sp);
     ok(b, "_SpinWait::_ShouldSpinAgain returned %x\n", b);
-    ok(sp.spin == 1, "sp.spin = %u\n", sp.spin);
+    ok(sp.spin == 1, "sp.spin = %lu\n", sp.spin);
     b = call_func1(pSpinWait__ShouldSpinAgain, &sp);
     ok(!b, "_SpinWait::_ShouldSpinAgain returned %x\n", b);
-    ok(sp.spin == 0, "sp.spin = %u\n", sp.spin);
+    ok(sp.spin == 0, "sp.spin = %lu\n", sp.spin);
     b = call_func1(pSpinWait__ShouldSpinAgain, &sp);
     ok(b, "_SpinWait::_ShouldSpinAgain returned %x\n", b);
-    ok(sp.spin == -1, "sp.spin = %u\n", sp.spin);
+    ok(sp.spin == -1, "sp.spin = %lu\n", sp.spin);
 
     call_func2(pSpinWait__SetSpinCount, &sp, 2);
     b = call_func1(pSpinWait__SpinOnce, &sp);
     ok(b, "_SpinWait::_SpinOnce returned %x\n", b);
-    ok(sp.spin == 1, "sp.spin = %u\n", sp.spin);
+    ok(sp.spin == 1, "sp.spin = %lu\n", sp.spin);
     b = call_func1(pSpinWait__SpinOnce, &sp);
     ok(b, "_SpinWait::_SpinOnce returned %x\n", b);
-    ok(sp.spin == 0, "sp.spin = %u\n", sp.spin);
+    ok(sp.spin == 0, "sp.spin = %lu\n", sp.spin);
     SET_EXPECT(yield_func);
     b = call_func1(pSpinWait__SpinOnce, &sp);
     ok(b, "_SpinWait::_SpinOnce returned %x\n", b);
-    ok(sp.spin == 0, "sp.spin = %u\n", sp.spin);
+    ok(sp.spin == 0, "sp.spin = %lu\n", sp.spin);
     CHECK_CALLED(yield_func);
     b = call_func1(pSpinWait__SpinOnce, &sp);
     ok(!b, "_SpinWait::_SpinOnce returned %x\n", b);
-    ok(sp.spin==0 || sp.spin==4000, "sp.spin = %u\n", sp.spin);
+    ok(sp.spin==0 || sp.spin==4000, "sp.spin = %lu\n", sp.spin);
 
     call_func1(pSpinWait_dtor, &sp);
 }
@@ -763,7 +763,7 @@ static void test_reader_writer_lock(void)
 
     call_func1(preader_writer_lock_lock, rw_lock);
     thread = CreateThread(NULL, 0, lock_read_thread, rw_lock, 0, NULL);
-    ok(thread != NULL, "CreateThread failed: %d\n", GetLastError());
+    ok(thread != NULL, "CreateThread failed: %ld\n", GetLastError());
     WaitForSingleObject(thread, INFINITE);
     ok(GetExitCodeThread(thread, &d), "GetExitCodeThread failed\n");
     ok(!d, "reader_writer_lock::try_lock_read succeeded on already locked object\n");
@@ -772,7 +772,7 @@ static void test_reader_writer_lock(void)
 
     call_func1(preader_writer_lock_lock_read, rw_lock);
     thread = CreateThread(NULL, 0, lock_read_thread, rw_lock, 0, NULL);
-    ok(thread != NULL, "CreateThread failed: %d\n", GetLastError());
+    ok(thread != NULL, "CreateThread failed: %ld\n", GetLastError());
     WaitForSingleObject(thread, INFINITE);
     ok(GetExitCodeThread(thread, &d), "GetExitCodeThread failed\n");
     ok(d, "reader_writer_lock::try_lock_read failed on object locked for reading\n");
@@ -951,7 +951,7 @@ static void test_ExternalContextBase(void)
     ok(id == 0, "Context::Id() = %u\n", id);
 
     thread = CreateThread(NULL, 0, external_context_thread, NULL, 0, NULL);
-    ok(thread != NULL, "CreateThread failed: %d\n", GetLastError());
+    ok(thread != NULL, "CreateThread failed: %ld\n", GetLastError());
     WaitForSingleObject(thread, INFINITE);
     CloseHandle(thread);
 }