From 61da3277c4682d1540f79b6f9fa3730862a55052 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Fri, 11 Feb 2022 23:18:34 +0100 Subject: [PATCH] msvcp90/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/msvcp90/tests/Makefile.in | 1 - dlls/msvcp90/tests/ios.c | 14 +++++++------- dlls/msvcp90/tests/misc.c | 8 ++++---- dlls/msvcp90/tests/string.c | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp90/tests/Makefile.in b/dlls/msvcp90/tests/Makefile.in index ad6f6a0ecf0..3dfaf0b303e 100644 --- a/dlls/msvcp90/tests/Makefile.in +++ b/dlls/msvcp90/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msvcp90.dll C_SRCS = \ diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 994420dd229..b17e8f88a4d 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -566,7 +566,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); invalid_parameter++; } @@ -1922,9 +1922,9 @@ static void test_istream_tellg(void) call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &ss.base.base1, spos); rpos = call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); - ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); + ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %Id found = %Id\n", tests[i].telloff_ss, tpos.off); if (tests[i].telloff_ss != -1 && spos.off != -1) /* check if tell == seek but only if not hit EOF */ - ok(spos.off == tpos.off, "tell doesn't match seek, seek = %ld tell = %ld\n", spos.off, tpos.off); + ok(spos.off == tpos.off, "tell doesn't match seek, seek = %Id tell = %Id\n", spos.off, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); @@ -1953,9 +1953,9 @@ static void test_istream_tellg(void) call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wss.base.base1, spos); rpos = call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); - ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); + ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %Id found = %Id\n", tests[i].telloff_ss, tpos.off); if (tests[i].telloff_ss != -1 && spos.off != -1) /* check if tell == seek but only if not hit EOF */ - ok(spos.off == tpos.off, "tell doesn't match seek, seek = %ld tell = %ld\n", spos.off, tpos.off); + ok(spos.off == tpos.off, "tell doesn't match seek, seek = %Id tell = %Id\n", spos.off, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); @@ -1990,7 +1990,7 @@ static void test_istream_tellg(void) ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); - ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); + ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %Id found %Id\n", tests[i].telloff_fs, tpos.off); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); call_func1(p_basic_fstream_char_vbase_dtor, &fs); @@ -2013,7 +2013,7 @@ static void test_istream_tellg(void) ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); - ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); + ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %Id found %Id\n", tests[i].telloff_fs, tpos.off); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); call_func1(p_basic_fstream_wchar_vbase_dtor, &wfs); diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 40858bc5594..de52405559c 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -167,7 +167,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); invalid_parameter++; } @@ -585,7 +585,7 @@ static void test__Getctype(void) _locale_t locale; ret = p__Getctype(); - ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); + ok(ret.handle == 0, "ret.handle = %ld\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); @@ -595,7 +595,7 @@ static void test__Getctype(void) locale->locinfo->lc_handle[LC_COLLATE] = 0x1234567; p__free_locale(locale); ret = p__Getctype(); - ok(ret.handle == 0x1234567, "ret.handle = %d\n", ret.handle); + ok(ret.handle == 0x1234567, "ret.handle = %ld\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); @@ -619,7 +619,7 @@ static void test__Getcoll(void) locale->locinfo->lc_handle[LC_COLLATE] = 0x7654321; p__free_locale(locale); call__Getcoll(ret); - ok(ret.handle == 0x7654321, "ret.handle = %x\n", ret.handle); + ok(ret.handle == 0x7654321, "ret.handle = %lx\n", ret.handle); ok(ret.page == 0, "ret.page = %x\n", ret.page); } diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 6c919f84d95..c5e6c8c1127 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -103,7 +103,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); invalid_parameter++; }