[MSXML3_WINETEST] Sync with Wine Staging 2.16. CORE-13762

diff --git a/modules/rostests/winetests/msxml3/CMakeLists.txt b/modules/rostests/winetests/msxml3/CMakeLists.txt
index 20b23b9..7fee075 100644 (file)
--- 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 d108d62..9c785fd 100644 (file)
--- a/modules/rostests/winetests/msxml3/schema.c
+++ b/modules/rostests/winetests/msxml3/schema.c
@@ -440,9 +440,8 @@ static const CHAR szOpenSeqXML4[] = "<test><x/><x/><y/><z/><z/><v/></test>";
 #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)