Piotr Caban : msvcr90/tests: Build without -DWINE_NO_LONG_TYPES.
Alexandre Julliard
julliard at winehq.org
Mon Feb 14 15:41:28 CST 2022
Module: wine
Branch: master
Commit: 0fc71d4440fc75c886bfc9d84450e60ba5a6b9a4
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc71d4440fc75c886bfc9d84450e60ba5a6b9a4
Author: Piotr Caban <piotr at codeweavers.com>
Date: Fri Feb 11 23:41:38 2022 +0100
msvcr90/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/msvcr90/tests/Makefile.in | 1 -
dlls/msvcr90/tests/msvcr90.c | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/msvcr90/tests/Makefile.in b/dlls/msvcr90/tests/Makefile.in
index 9da4bd99c4f..9db8275e020 100644
--- a/dlls/msvcr90/tests/Makefile.in
+++ b/dlls/msvcr90/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
TESTDLL = msvcr90.dll
C_SRCS = \
diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c
index 99b0766acb7..63a2254d187 100644
--- a/dlls/msvcr90/tests/msvcr90.c
+++ b/dlls/msvcr90/tests/msvcr90.c
@@ -339,7 +339,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);
ok(errno != 0xdeadbeef, "errno not set\n");
}
@@ -353,7 +353,7 @@ static BOOL init(void)
SetLastError(0xdeadbeef);
hcrt = LoadLibraryA("msvcr90.dll");
if (!hcrt) {
- win_skip("msvcr90.dll not installed (got %d)\n", GetLastError());
+ win_skip("msvcr90.dll not installed (got %ld)\n", GetLastError());
return FALSE;
}
@@ -1181,7 +1181,7 @@ static void test_getptd(void)
int dec, sign;
void *mbcinfo, *locinfo;
- ok(ptd->tid == tid, "ptd->tid = %x, expected %x\n", ptd->tid, tid);
+ ok(ptd->tid == tid, "ptd->tid = %lx, expected %lx\n", ptd->tid, tid);
ok(ptd->handle == INVALID_HANDLE_VALUE, "ptd->handle = %p\n", ptd->handle);
ok(p_errno() == &ptd->thread_errno, "ptd->thread_errno is different then _errno()\n");
ok(p_doserrno() == &ptd->thread_doserrno, "ptd->thread_doserrno is different then __doserrno()\n");
@@ -1258,7 +1258,7 @@ struct block_file_arg
FILE *write;
HANDLE init;
HANDLE finish;
- int deadlock_test;
+ LONG deadlock_test;
};
static DWORD WINAPI block_file(void *arg)
More information about the wine-cvs
mailing list