From 3a06e69a1184bae342c343c04cb4b6fc28ce7b2a Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 21 Oct 2017 13:14:13 +0100 Subject: [PATCH] [MSXML3_WINETEST] Sync with Wine Staging 2.16. CORE-13762 --- modules/rostests/winetests/msxml3/CMakeLists.txt | 4 +++- modules/rostests/winetests/msxml3/schema.c | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/rostests/winetests/msxml3/CMakeLists.txt b/modules/rostests/winetests/msxml3/CMakeLists.txt index 20b23b96665..7fee075ca8e 100644 --- a/modules/rostests/winetests/msxml3/CMakeLists.txt +++ b/modules/rostests/winetests/msxml3/CMakeLists.txt @@ -1,5 +1,7 @@ -add_definitions(-DUSE_WINE_TODOS) +add_definitions( + -DUSE_WINE_TODOS + -DWINETEST_USE_DBGSTR_LONGLONG) list(APPEND SOURCE domdoc.c diff --git a/modules/rostests/winetests/msxml3/schema.c b/modules/rostests/winetests/msxml3/schema.c index d108d6257b0..9c785fd05d3 100644 --- a/modules/rostests/winetests/msxml3/schema.c +++ b/modules/rostests/winetests/msxml3/schema.c @@ -440,9 +440,8 @@ static const CHAR szOpenSeqXML4[] = ""; #define _expect64(expr, str, base, TYPE, CONV) { \ TYPE v1 = expr; \ TYPE v2 = CONV(str, NULL, base); \ - ok(v1 == v2, #expr "returned 0x%08x%08x, expected 0x%08x%08x\n", \ - (ULONG)((ULONG64)v1 >> 32), (ULONG)((ULONG64)v2 & (ULONG64)0xffffffff), \ - (ULONG)((ULONG64)v1 >> 32), (ULONG)((ULONG64)v2 & (ULONG64)0xffffffff)); \ + ok(v1 == v2, #expr "returned %s, expected %s\n", \ + wine_dbgstr_longlong(v1), wine_dbgstr_longlong(v2)); \ } #define expect_int64(expr, x, base) _expect64(expr, #x, base, LONG64, _strtoi64) -- 2.17.1