[ros-diffs] [akhaldi] 75859: [QUARTZ_WINETEST] Sync with Wine Staging 2.16. CORE-13762

Author: akhaldi
Date: Sat Sep 16 20:45:12 2017
New Revision: 75859

URL: http://svn.reactos.org/svn/reactos?rev=75859&view=rev
Log:
[QUARTZ_WINETEST] Sync with Wine Staging 2.16. CORE-13762

Modified:
    trunk/rostests/winetests/quartz/CMakeLists.txt
    trunk/rostests/winetests/quartz/filtergraph.c

Modified: trunk/rostests/winetests/quartz/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeLis…
==============================================================================
--- trunk/rostests/winetests/quartz/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/CMakeLists.txt	[iso-8859-1] Sat Sep 16 20:45:12 2017
@@ -1,3 +1,5 @@
+
+add_definitions(-DWINETEST_USE_DBGSTR_LONGLONG)
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
 

Modified: trunk/rostests/winetests/quartz/filtergraph.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr…
==============================================================================
--- trunk/rostests/winetests/quartz/filtergraph.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/filtergraph.c	[iso-8859-1] Sat Sep 16 20:45:12 2017
@@ -581,21 +581,21 @@
     pos = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, NULL);
     ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr);
-    ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got
(%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos);
+    ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got
(%s)\n", wine_dbgstr_longlong(pos));
 
     pos = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, &TIME_FORMAT_MEDIA_TIME,
0x123456789a, NULL);
     ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr);
-    ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got
(%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos);
+    ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got
(%s)\n", wine_dbgstr_longlong(pos));
 
     pos = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a,
&TIME_FORMAT_MEDIA_TIME);
     ok(hr == S_OK, "ConvertTimeFormat failed: %08x\n", hr);
-    ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got
(%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos);
+    ok(pos == 0x123456789a, "ConvertTimeFormat: expected 123456789a, got
(%s)\n", wine_dbgstr_longlong(pos));
 
     hr = IMediaSeeking_GetCurrentPosition(seeking, &pos);
     ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr);
-    ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32),
(DWORD)pos);
+    ok(pos == 0, "Position != 0 (%s)\n", wine_dbgstr_longlong(pos));
 
     hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_ReturnTime, NULL,
AM_SEEKING_NoPositioning);
     ok(hr == S_OK, "SetPositions failed: %08x\n", hr);
@@ -606,7 +606,7 @@
     pos = 0xdeadbeef;
     hr = IMediaSeeking_GetCurrentPosition(seeking, &pos);
     ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr);
-    ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32),
(DWORD)pos);
+    ok(pos == 0, "Position != 0 (%s)\n", wine_dbgstr_longlong(pos));
 
     hr = IMediaControl_GetState(control, 1000, NULL);
     ok(hr == E_POINTER, "GetState expected %08x, got %08x\n", E_POINTER, hr);