[PATCH 0/7] MR11021: Use %I64 instead of wine_dbgstr_longlong() in some DLLs.

[Elizabeth Figura (＠zfigura)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11021

[PATCH 1/7] quartz/tests: Use %I64.

[Elizabeth Figura]

From: Elizabeth Figura <[e-mail]>

---
 dlls/quartz/tests/avidec.c        |  10 +-
 dlls/quartz/tests/avisplit.c      |  44 +++----
 dlls/quartz/tests/filesource.c    |   4 +-
 dlls/quartz/tests/filtergraph.c   | 185 +++++++++++++++---------------
 dlls/quartz/tests/memallocator.c  |  52 ++++-----
 dlls/quartz/tests/mpegaudio.c     |   8 +-
 dlls/quartz/tests/mpeglayer3.c    |  21 ++--
 dlls/quartz/tests/mpegsplit.c     |  41 +++----
 dlls/quartz/tests/mpegvideo.c     |  12 +-
 dlls/quartz/tests/systemclock.c   |   9 +-
 dlls/quartz/tests/videorenderer.c |   2 +-
 dlls/quartz/tests/vmr7.c          |   4 +-
 dlls/quartz/tests/vmr9.c          |   4 +-
 dlls/quartz/tests/waveparser.c    |  41 +++----
 14 files changed, 208 insertions(+), 229 deletions(-)

diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c
index 2df7a57b273..4edb027e5ae 100644
--- a/dlls/quartz/tests/avidec.c
+++ b/dlls/quartz/tests/avidec.c
@@ -1035,13 +1035,13 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample
     else if (testmode == 1)
     {
         ok(hr == VFW_S_NO_STOP_TIME, "Got hr %#lx.\n", hr);
-        ok(start == 20000, "Got start time %s.\n", wine_dbgstr_longlong(start));
+        ok(start == 20000, "Got start time %I64d.\n", start);
     }
     else
     {
         ok(hr == S_OK, "Got hr %#lx.\n", hr);
-        ok(start == 20000, "Got start time %s.\n", wine_dbgstr_longlong(start));
-        ok(stop == 30000, "Got stop time %s.\n", wine_dbgstr_longlong(stop));
+        ok(start == 20000, "Got start time %I64d.\n", start);
+        ok(stop == 30000, "Got stop time %I64d.\n", stop);
     }
 
     hr = IMediaSample_GetMediaTime(sample, &start, &stop);
@@ -1074,8 +1074,8 @@ static HRESULT testsink_new_segment(struct strmbase_sink *iface,
 {
     struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter);
     ++filter->got_new_segment;
-    ok(start == 10000, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(stop == 20000, "Got stop %s.\n", wine_dbgstr_longlong(stop));
+    ok(start == 10000, "Got start %I64d.\n", start);
+    ok(stop == 20000, "Got stop %I64d.\n", stop);
     ok(rate == 1.0, "Got rate %.16e.\n", rate);
     return S_OK;
 }
diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c
index 70e9b14d902..ddba8e790cd 100644
--- a/dlls/quartz/tests/avisplit.c
+++ b/dlls/quartz/tests/avisplit.c
@@ -1630,13 +1630,11 @@ static void test_seeking(void)
         if (hr == S_OK)
         {
             todo_wine_if(time_format_tests[i].wine_todo)
-                ok(result == time_format_tests[i].target_time, "wrong value %s at test %u.\n",
-                        wine_dbgstr_longlong(result), i);
+                ok(result == time_format_tests[i].target_time, "Got time %I64d for test %u.\n", result, i);
         }
         else
         {
-            ok(result == 0xdeadbeef, "result was modified at test %u: %s.\n",
-                    i, wine_dbgstr_longlong(result));
+            ok(result == 0xdeadbeef, "Got time %I64d for test %u.\n", result, i);
         }
     }
 
@@ -1665,37 +1663,34 @@ static void test_seeking(void)
     stop = current = 0xdeadbeef;
     hr = IMediaSeeking_GetStopPosition(seeking, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(stop == duration, "Expected time %s, got %s.\n",
-            wine_dbgstr_longlong(duration), wine_dbgstr_longlong(stop));
+    ok(stop == duration, "Expected time %I64d, got %I64d.\n", duration, stop);
     hr = IMediaSeeking_GetCurrentPosition(seeking, ¤t);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current));
+    ok(!current, "Got time %I64d.\n", current);
     stop = current = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == duration, "Expected time %s, got %s.\n",
-            wine_dbgstr_longlong(duration), wine_dbgstr_longlong(stop));
+    ok(!current, "Got time %I64d.\n", current);
+    ok(stop == duration, "Expected time %I64d, got %I64d.\n", duration, stop);
 
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x123456789a, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x123456789a, "Got time %I64d.\n", time);
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x123456789a, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x123456789a, "Got time %I64d.\n", time);
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, NULL, 123, &TIME_FORMAT_FRAME);
     todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    todo_wine ok(time == 123 * one_second, "Got time %s.\n", wine_dbgstr_longlong(time));
+    todo_wine ok(time == 123 * one_second, "Got time %I64d.\n", time);
 
     earliest = latest = 0xdeadbeef;
     hr = IMediaSeeking_GetAvailable(seeking, &earliest, &latest);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!earliest, "Got time %s.\n", wine_dbgstr_longlong(earliest));
-    ok(latest == duration, "Expected time %s, got %s.\n",
-            wine_dbgstr_longlong(duration), wine_dbgstr_longlong(latest));
+    ok(!earliest, "Got time %I64d.\n", earliest);
+    ok(latest == duration, "Expected time %I64d, got %I64d.\n", duration, latest);
 
     rate = 0;
     hr = IMediaSeeking_GetRate(seeking, &rate);
@@ -1720,23 +1715,23 @@ static void test_seeking(void)
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning,
             &stop, AM_SEEKING_AbsolutePositioning);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 1500 * one_msec, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 3500 * one_msec, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current == 1500 * one_msec, "Got time %I64d.\n", current);
+    ok(stop == 3500 * one_msec, "Got time %I64d.\n", stop);
 
     stop = current = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     /* Native snaps to the nearest frame. */
-    ok(current > 0 && current < duration, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop > 0 && stop < duration && stop > current, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current > 0 && current < duration, "Got time %I64d.\n", current);
+    ok(stop > 0 && stop < duration && stop > current, "Got time %I64d.\n", stop);
 
     current = 1500 * one_msec;
     stop = 3500 * one_msec;
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime,
             &stop, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current > 0 && current < duration, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop > 0 && stop < duration && stop > current, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current > 0 && current < duration, "Got time %I64d.\n", current);
+    ok(stop > 0 && stop < duration && stop > current, "Got time %I64d.\n", stop);
 
     hr = IMediaSeeking_GetStopPosition(seeking, &prev_stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -1749,9 +1744,8 @@ static void test_seeking(void)
     stop = current = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == prev_stop, "Expected time %s, got %s.\n",
-            wine_dbgstr_longlong(prev_stop), wine_dbgstr_longlong(stop));
+    ok(!current, "Got time %I64d.\n", current);
+    ok(stop == prev_stop, "Expected time %I64d, got %I64d.\n", prev_stop, stop);
 
     IMediaSeeking_Release(seeking);
     IPin_Release(pin);
diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c
index 268b265ac77..229eef40b98 100644
--- a/dlls/quartz/tests/filesource.c
+++ b/dlls/quartz/tests/filesource.c
@@ -1044,8 +1044,8 @@ static void test_async_reader(void)
 
     hr = IAsyncReader_Length(reader, &length, &available);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(length == 600, "Got length %s.\n", wine_dbgstr_longlong(length));
-    ok(available == 600, "Got available length %s.\n", wine_dbgstr_longlong(available));
+    ok(length == 600, "Got length %I64d.\n", length);
+    ok(available == 600, "Got available length %I64d.\n", available);
 
     memset(buffer, 0xcc, sizeof(buffer));
     hr = IAsyncReader_SyncRead(reader, 0, 10, buffer);
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 087c37be538..fad2d47990c 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -358,30 +358,29 @@ static void test_media_seeking(IFilterGraph2 *graph)
     pos = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(pos == 0x123456789a, "got %s\n", wine_dbgstr_longlong(pos));
+    ok(pos == 0x123456789a, "Got time %I64d.\n", pos);
 
     pos = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(pos == 0x123456789a, "got %s\n", wine_dbgstr_longlong(pos));
+    ok(pos == 0x123456789a, "Got time %I64d.\n", pos);
 
     pos = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &pos, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(pos == 0x123456789a, "got %s\n", wine_dbgstr_longlong(pos));
+    ok(pos == 0x123456789a, "Got time %I64d.\n", pos);
 
     hr = IMediaSeeking_GetCurrentPosition(seeking, &pos);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(pos == 0, "got %s\n", wine_dbgstr_longlong(pos));
+    ok(pos == 0, "Got time %I64d.\n", pos);
 
     hr = IMediaSeeking_GetDuration(seeking, &duration);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(duration > 0, "got %s\n", wine_dbgstr_longlong(duration));
+    ok(duration > 0, "Got duration %I64d.\n", duration);
 
     hr = IMediaSeeking_GetStopPosition(seeking, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(stop == duration || stop == duration + 1, "expected %s, got %s\n",
-        wine_dbgstr_longlong(duration), wine_dbgstr_longlong(stop));
+    ok(stop == duration || stop == duration + 1, "Expected time %I64d, got %I64d.\n", duration, stop);
 
     hr = IMediaSeeking_SetPositions(seeking, NULL, AM_SEEKING_ReturnTime, NULL, AM_SEEKING_NoPositioning);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -396,7 +395,7 @@ static void test_media_seeking(IFilterGraph2 *graph)
     pos = 0xdeadbeef;
     hr = IMediaSeeking_GetCurrentPosition(seeking, &pos);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(pos == 0, "Position != 0 (%s)\n", wine_dbgstr_longlong(pos));
+    ok(pos == 0, "Got time %I64d.\n", pos);
     IFilterGraph2_SetDefaultSyncSource(graph);
 
     IMediaSeeking_Release(seeking);
@@ -527,7 +526,7 @@ static void test_media_event(IFilterGraph2 *graph)
     hr = IMediaSeeking_GetCurrentPosition(seeking, ¤t);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     flaky_wine
-    ok(current == stop, "expected %s, got %s\n", wine_dbgstr_longlong(stop), wine_dbgstr_longlong(current));
+    ok(current == stop, "Expected %I64d, got %I64d.\n", stop, current);
 
     hr = IMediaControl_Pause(control);
     ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr);
@@ -546,7 +545,7 @@ static void test_media_event(IFilterGraph2 *graph)
 
     hr = IMediaSeeking_GetCurrentPosition(seeking, ¤t);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current != stop, "Got current position %s.\n", wine_dbgstr_longlong(current));
+    ok(current != stop, "Got current position %I64d.\n", current);
 
     hr = IMediaControl_Stop(control);
     ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr);
@@ -1470,7 +1469,7 @@ static HRESULT WINAPI testfilter_Pause(IBaseFilter *iface)
 static HRESULT WINAPI testfilter_Run(IBaseFilter *iface, REFERENCE_TIME start)
 {
     struct testfilter *filter = impl_from_IBaseFilter(iface);
-    if (winetest_debug > 1) trace("%p->Run(%s)\n", filter, wine_dbgstr_longlong(start));
+    if (winetest_debug > 1) trace("%p->Run(%I64d)\n", filter, start);
 
     ok(filter->state == filter->expect_run_prev, "Expected previous state %#x, got %#x.\n",
             filter->expect_run_prev, filter->state);
@@ -1748,8 +1747,8 @@ static HRESULT WINAPI testseek_SetPositions(IMediaSeeking *iface, LONGLONG *curr
     DWORD current_flags, LONGLONG *stop, DWORD stop_flags )
 {
     struct testfilter *filter = impl_from_IMediaSeeking(iface);
-    if (winetest_debug > 1) trace("%p->SetPositions(%s, %#lx, %s, %#lx)\n",
-            iface, wine_dbgstr_longlong(*current), current_flags, wine_dbgstr_longlong(*stop), stop_flags);
+    if (winetest_debug > 1) trace("%p->SetPositions(%I64d, %#lx, %I64d, %#lx)\n",
+            iface, *current, current_flags, *stop, stop_flags);
     ok(filter->state != State_Running, "Filter should be paused or stopped while seeking.\n");
     filter->seek_current = *current;
     filter->seek_stop = *stop;
@@ -3527,10 +3526,9 @@ static void test_filter_state(void)
     check_filter_state(graph, State_Running);
     if (winetest_interactive) /* Timing problems make this test too liable to fail. */
         ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000,
-                "Expected time near %s, got %s.\n",
-                wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time));
-    ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n",
-        wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time));
+                "Expected time near %I64d, got %I64d.\n", start_time, source.start_time);
+    ok(sink.start_time == source.start_time, "Expected time %I64d, got %I64d.\n",
+            source.start_time, sink.start_time);
 
     hr = IMediaControl_Pause(control);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -3645,8 +3643,8 @@ static void test_filter_state(void)
     hr = IMediaFilter_Run(filter, 0xdeadbeef);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     check_filter_state(graph, State_Running);
-    ok(source.start_time == 0xdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(source.start_time));
-    ok(sink.start_time == 0xdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(sink.start_time));
+    ok(source.start_time == 0xdeadbeef, "Got time %I64d.\n", source.start_time);
+    ok(sink.start_time == 0xdeadbeef, "Got time %I64d.\n", sink.start_time);
 
     hr = IMediaFilter_Pause(filter);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -3655,8 +3653,8 @@ static void test_filter_state(void)
     hr = IMediaFilter_Run(filter, 0xdeadf00d);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     check_filter_state(graph, State_Running);
-    ok(source.start_time == 0xdeadf00d, "Got time %s.\n", wine_dbgstr_longlong(source.start_time));
-    ok(sink.start_time == 0xdeadf00d, "Got time %s.\n", wine_dbgstr_longlong(sink.start_time));
+    ok(source.start_time == 0xdeadf00d, "Got time %I64d.\n", source.start_time);
+    ok(sink.start_time == 0xdeadf00d, "Got time %I64d.\n", sink.start_time);
 
     hr = IMediaFilter_Pause(filter);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -3674,10 +3672,9 @@ static void test_filter_state(void)
     check_filter_state(graph, State_Running);
     if (winetest_interactive) /* Timing problems make this test too liable to fail. */
         ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000,
-                "Expected time near %s, got %s.\n",
-                wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time));
-    ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n",
-        wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time));
+                "Expected time near %I64d, got %I64d.\n", start_time, source.start_time);
+    ok(sink.start_time == source.start_time, "Expected time %I64d, got %I64d.\n",
+            source.start_time, sink.start_time);
 
     Sleep(600);
     hr = IMediaFilter_Pause(filter);
@@ -3690,10 +3687,9 @@ static void test_filter_state(void)
     check_filter_state(graph, State_Running);
     if (winetest_interactive) /* Timing problems make this test too liable to fail. */
         ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000,
-                "Expected time near %s, got %s.\n",
-                wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time));
-    ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n",
-        wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time));
+                "Expected time near %I64d, got %I64d.\n", start_time, source.start_time);
+    ok(sink.start_time == source.start_time, "Expected time %I64d, got %I64d.\n",
+            source.start_time, sink.start_time);
 
     hr = IMediaFilter_Pause(filter);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -3706,10 +3702,9 @@ static void test_filter_state(void)
     check_filter_state(graph, State_Running);
     if (winetest_interactive) /* Timing problems make this test too liable to fail. */
         ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000,
-                "Expected time near %s, got %s.\n",
-                wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time));
-    ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n",
-        wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time));
+                "Expected time near %I64d, got %I64d.\n", start_time, source.start_time);
+    ok(sink.start_time == source.start_time, "Expected time %I64d, got %I64d.\n",
+            source.start_time, sink.start_time);
 
     hr = IMediaFilter_Stop(filter);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -3724,9 +3719,9 @@ static void test_filter_state(void)
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     check_filter_state(graph, State_Running);
     todo_wine ok(source.start_time > 0 && source.start_time < 500 * 10000,
-            "Got time %s.\n", wine_dbgstr_longlong(source.start_time));
-    ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n",
-        wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time));
+            "Got time %I64d.\n", source.start_time);
+    ok(sink.start_time == source.start_time, "Expected time %I64d, got %I64d.\n",
+            source.start_time, sink.start_time);
 
     hr = IMediaControl_Stop(control);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -4607,22 +4602,22 @@ static void test_graph_seeking(void)
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, NULL, 0x123456789a, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x123456789a, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x123456789a, "Got time %I64d.\n", time);
 
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x123456789a, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x123456789a, "Got time %I64d.\n", time);
 
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x123456789a, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x123456789a, "Got time %I64d.\n", time);
 
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, &TIME_FORMAT_MEDIA_TIME);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x123456789a, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x123456789a, "Got time %I64d.\n", time);
 
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, &TIME_FORMAT_NONE, 0x123456789a, &TIME_FORMAT_MEDIA_TIME);
     todo_wine ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr);
@@ -4636,12 +4631,12 @@ static void test_graph_seeking(void)
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, &TIME_FORMAT_NONE, 0x123456789a, &TIME_FORMAT_NONE);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x123456789a, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x123456789a, "Got time %I64d.\n", time);
 
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, &testguid, 0x123456789a, &testguid);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x123456789a, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x123456789a, "Got time %I64d.\n", time);
 
     hr = IMediaSeeking_GetDuration(seeking, NULL);
     ok(hr == E_POINTER, "Got hr %#lx.\n", hr);
@@ -4665,14 +4660,14 @@ static void test_graph_seeking(void)
     current = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!current, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(!current, "Got time %I64d.\n", time);
 
     hr = IMediaSeeking_GetCurrentPosition(seeking, NULL);
     ok(hr == E_POINTER, "Got hr %#lx.\n", hr);
     current = 0xdeadbeef;
     hr = IMediaSeeking_GetCurrentPosition(seeking, ¤t);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!current, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(!current, "Got time %I64d.\n", time);
 
     hr = IMediaSeeking_GetAvailable(seeking, &earliest, &latest);
     todo_wine ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr);
@@ -4843,7 +4838,7 @@ static void test_graph_seeking(void)
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, &testguid, 0x123456789a, &testguid);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x123456789a, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x123456789a, "Got time %I64d.\n", time);
 
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, &testguid, 0x123456789a, &TIME_FORMAT_NONE);
     todo_wine ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr);
@@ -4855,24 +4850,24 @@ static void test_graph_seeking(void)
     filter2.seek_duration = 0x23456;
     hr = IMediaSeeking_GetDuration(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x23456, "Got time %I64d.\n", time);
 
     filter2.seek_duration = 0x12345;
     filter1.seek_duration = 0x23456;
     hr = IMediaSeeking_GetDuration(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x23456, "Got time %I64d.\n", time);
 
     filter1.seek_hr = filter2.seek_hr = 0xbeef;
     hr = IMediaSeeking_GetDuration(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x23456, "Got time %I64d.\n", time);
 
     filter1.seek_hr = E_NOTIMPL;
     filter2.seek_hr = S_OK;
     hr = IMediaSeeking_GetDuration(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x12345, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x12345, "Got time %I64d.\n", time);
 
     filter1.seek_hr = 0xdeadbeef;
     hr = IMediaSeeking_GetDuration(seeking, &time);
@@ -4890,24 +4885,24 @@ static void test_graph_seeking(void)
     filter2.seek_stop = 0x65432;
     hr = IMediaSeeking_GetStopPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x65432, "Got time %I64d.\n", time);
 
     filter2.seek_stop = 0x54321;
     filter1.seek_stop = 0x65432;
     hr = IMediaSeeking_GetStopPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x65432, "Got time %I64d.\n", time);
 
     filter1.seek_hr = filter2.seek_hr = 0xbeef;
     hr = IMediaSeeking_GetStopPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x65432, "Got time %I64d.\n", time);
 
     filter1.seek_hr = E_NOTIMPL;
     filter2.seek_hr = S_OK;
     hr = IMediaSeeking_GetStopPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x54321, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x54321, "Got time %I64d.\n", time);
 
     filter1.seek_hr = 0xdeadbeef;
     hr = IMediaSeeking_GetStopPosition(seeking, &time);
@@ -4923,7 +4918,7 @@ static void test_graph_seeking(void)
 
     hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!time, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(!time, "Got time %I64d.\n", time);
 
     flush_cached_seeking(graph, &filter1);
     flush_cached_seeking(graph, &filter2);
@@ -4931,8 +4926,8 @@ static void test_graph_seeking(void)
     current = stop = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(!current, "Got time %I64d.\n", current);
+    ok(stop == 0x65432, "Got time %I64d.\n", stop);
 
     flush_cached_seeking(graph, &filter1);
     flush_cached_seeking(graph, &filter2);
@@ -4942,12 +4937,12 @@ static void test_graph_seeking(void)
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning,
             &stop, AM_SEEKING_AbsolutePositioning);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop));
-    ok(filter1.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_current));
-    ok(filter1.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_stop));
-    ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current));
-    ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop));
+    ok(current == 0x123, "Got time %I64d.\n", current);
+    ok(stop == 0x321, "Got time %I64d.\n", stop);
+    ok(filter1.seek_current == 0x123, "Got time %I64d.\n", filter1.seek_current);
+    ok(filter1.seek_stop == 0x321, "Got time %I64d.\n", filter1.seek_stop);
+    ok(filter2.seek_current == 0x123, "Got time %I64d.\n", filter2.seek_current);
+    ok(filter2.seek_stop == 0x321, "Got time %I64d.\n", filter2.seek_stop);
 
     filter1.seek_hr = filter2.seek_hr = 0xbeef;
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning,
@@ -4973,37 +4968,37 @@ static void test_graph_seeking(void)
 
     hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 12340000, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 12340000, "Got time %I64d.\n", time);
 
     current = stop = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 12340000, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current == 12340000, "Got time %I64d.\n", current);
+    ok(stop == 0x321, "Got time %I64d.\n", stop);
 
     current = 0x123;
     stop = 0x321;
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime,
             &stop, AM_SEEKING_AbsolutePositioning);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 12340000, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop));
-    ok(filter1.seek_current == 12340000, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_current));
-    ok(filter1.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_stop));
-    ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current));
-    ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop));
+    ok(current == 12340000, "Got time %I64d.\n", current);
+    ok(stop == 0x321, "Got time %I64d.\n", stop);
+    ok(filter1.seek_current == 12340000, "Got time %I64d.\n", filter1.seek_current);
+    ok(filter1.seek_stop == 0x321, "Got time %I64d.\n", filter1.seek_stop);
+    ok(filter2.seek_current == 0x123, "Got time %I64d.\n", filter2.seek_current);
+    ok(filter2.seek_stop == 0x321, "Got time %I64d.\n", filter2.seek_stop);
 
     current = 0x123;
     stop = 0x321;
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning,
             &stop, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 43210000, "Got time %s.\n", wine_dbgstr_longlong(stop));
-    ok(filter1.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_current));
-    ok(filter1.seek_stop == 43210000, "Got time %s.\n", wine_dbgstr_longlong(filter1.seek_stop));
-    ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current));
-    ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop));
+    ok(current == 0x123, "Got time %I64d.\n", current);
+    ok(stop == 43210000, "Got time %I64d.\n", stop);
+    ok(filter1.seek_current == 0x123, "Got time %I64d.\n", filter1.seek_current);
+    ok(filter1.seek_stop == 43210000, "Got time %I64d.\n", filter1.seek_stop);
+    ok(filter2.seek_current == 0x123, "Got time %I64d.\n", filter2.seek_current);
+    ok(filter2.seek_stop == 0x321, "Got time %I64d.\n", filter2.seek_stop);
 
     flush_cached_seeking(graph, &filter1);
     flush_cached_seeking(graph, &filter2);
@@ -5051,14 +5046,14 @@ static void test_graph_seeking(void)
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     if (winetest_interactive) /* Timing problems make this test too liable to fail. */
         ok(compare_time(time, 1234 * 10000, 40 * 10000),
-                "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(time));
+                "Expected about 1234ms, got %I64d.\n", time);
     current = stop = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     if (winetest_interactive) /* Timing problems make this test too liable to fail. */
         ok(compare_time(current, 1234 * 10000, 40 * 10000),
-                "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 9000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));
+                "Expected about 1234ms, got %I64d.\n", current);
+    ok(stop == 9000 * 10000, "Got time %I64d.\n", stop);
 
     /* This remains true even if NoFlush is specified. */
     current = 1000 * 10000;
@@ -5074,14 +5069,14 @@ static void test_graph_seeking(void)
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     if (winetest_interactive) /* Timing problems make this test too liable to fail. */
         ok(compare_time(time, 1334 * 10000, 80 * 10000),
-                "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time));
+                "Expected about 1334ms, got %I64d.\n", time);
     current = stop = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     if (winetest_interactive) /* Timing problems make this test too liable to fail. */
         ok(compare_time(current, 1334 * 10000, 80 * 10000),
-                "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));
+                "Expected about 1334ms, got %I64d.\n", current);
+    ok(stop == 8000 * 10000, "Got time %I64d.\n", stop);
 
     hr = IMediaControl_Pause(control);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -5094,20 +5089,20 @@ static void test_graph_seeking(void)
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     if (winetest_interactive) /* Timing problems make this test too liable to fail. */
         ok(compare_time(time, 1334 * 10000, 80 * 10000),
-                "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time));
+                "Expected about 1334ms, got %I64d.\n", time);
     current = stop = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     if (winetest_interactive) /* Timing problems make this test too liable to fail. */
         ok(compare_time(current, 1334 * 10000, 80 * 10000),
-                "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));
+                "Expected about 1334ms, got %I64d.\n", current);
+    ok(stop == 8000 * 10000, "Got time %I64d.\n", stop);
 
     hr = IMediaControl_Stop(control);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 12340000, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 12340000, "Got time %I64d.\n", time);
 
     hr = IMediaFilter_SetSyncSource(filter, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -5118,12 +5113,12 @@ static void test_graph_seeking(void)
     Sleep(100);
     hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    todo_wine ok(!time, "Got time %s.\n", wine_dbgstr_longlong(time));
+    todo_wine ok(!time, "Got time %I64d.\n", time);
     current = stop = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    todo_wine ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(!stop, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    todo_wine ok(!current, "Got time %I64d.\n", current);
+    ok(!stop, "Got time %I64d.\n", stop);
 
     hr = IMediaControl_Stop(control);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -5142,21 +5137,21 @@ static void test_graph_seeking(void)
 
     hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time < 5000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time < 5000 * 10000, "Got time %I64d.\n", time);
 
     hr = IMediaEventSink_Notify(eventsink, EC_COMPLETE, S_OK, (LONG_PTR)&filter1.IBaseFilter_iface);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
 
     hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time < 5000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time < 5000 * 10000, "Got time %I64d.\n", time);
 
     hr = IMediaEventSink_Notify(eventsink, EC_COMPLETE, S_OK, (LONG_PTR)&filter2.IBaseFilter_iface);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
 
     hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 6000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 6000 * 10000, "Got time %I64d.\n", time);
 
     hr = IMediaControl_Stop(control);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -5169,7 +5164,7 @@ static void test_graph_seeking(void)
 
     hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time < 5000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time < 5000 * 10000, "Got time %I64d.\n", time);
 
     hr = IMediaEventSink_Notify(eventsink, EC_COMPLETE, S_OK, (LONG_PTR)&filter1.IBaseFilter_iface);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -5179,7 +5174,7 @@ static void test_graph_seeking(void)
 
     hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 6000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 6000 * 10000, "Got time %I64d.\n", time);
 
     hr = IMediaSeeking_SetTimeFormat(seeking, &TIME_FORMAT_MEDIA_TIME);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c
index 37df9a24bd2..5efd565c35a 100644
--- a/dlls/quartz/tests/memallocator.c
+++ b/dlls/quartz/tests/memallocator.c
@@ -194,8 +194,8 @@ static void test_sample_time(void)
     end = 0xdeadf00d;
     hr = IMediaSample_GetTime(sample, &start, &end);
     ok(hr == VFW_E_SAMPLE_TIME_NOT_SET, "Got hr %#lx.\n", hr);
-    ok(start == 0xdeadbeef, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(end == 0xdeadf00d, "Got end %s.\n", wine_dbgstr_longlong(end));
+    ok(start == 0xdeadbeef, "Got start %I64d.\n", start);
+    ok(end == 0xdeadf00d, "Got end %I64d.\n", end);
 
     hr = IMediaSample2_GetProperties(sample2, sizeof(props), (BYTE *)&props);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -218,13 +218,13 @@ static void test_sample_time(void)
     start = end = 0;
     hr = IMediaSample_GetTime(sample, &start, &end);
     ok(hr == VFW_S_NO_STOP_TIME, "Got hr %#lx.\n", hr);
-    ok(start == 0x123, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(end == 0x124, "Got end %s.\n", wine_dbgstr_longlong(end));
+    ok(start == 0x123, "Got start %I64d.\n", start);
+    ok(end == 0x124, "Got end %I64d.\n", end);
 
     hr = IMediaSample2_GetProperties(sample2, sizeof(props), (BYTE *)&props);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     ok(props.dwSampleFlags == AM_SAMPLE_TIMEVALID, "Got flags %#lx.\n", props.dwSampleFlags);
-    ok(props.tStart == 0x123, "Got start %s.\n", wine_dbgstr_longlong(props.tStart));
+    ok(props.tStart == 0x123, "Got start %I64d.\n", props.tStart);
 
     hr = IMediaSample_SetTime(sample, NULL, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -255,15 +255,15 @@ static void test_sample_time(void)
     start = end = 0;
     hr = IMediaSample_GetTime(sample, &start, &end);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start == 0x123, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(end == 0x321, "Got end %s.\n", wine_dbgstr_longlong(end));
+    ok(start == 0x123, "Got start %I64d.\n", start);
+    ok(end == 0x321, "Got end %I64d.\n", end);
 
     hr = IMediaSample2_GetProperties(sample2, sizeof(props), (BYTE *)&props);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     ok(props.dwSampleFlags == (AM_SAMPLE_TIMEVALID | AM_SAMPLE_STOPVALID),
             "Got flags %#lx.\n", props.dwSampleFlags);
-    ok(props.tStart == 0x123, "Got start %s.\n", wine_dbgstr_longlong(props.tStart));
-    ok(props.tStop == 0x321, "Got end %s.\n", wine_dbgstr_longlong(props.tStop));
+    ok(props.tStart == 0x123, "Got start %I64d.\n", props.tStart);
+    ok(props.tStop == 0x321, "Got end %I64d.\n", props.tStop);
 
     props.dwSampleFlags = 0;
     hr = IMediaSample2_SetProperties(sample2, sizeof(props), (BYTE *)&props);
@@ -284,13 +284,13 @@ static void test_sample_time(void)
     start = end = 0;
     hr = IMediaSample_GetTime(sample, &start, &end);
     ok(hr == VFW_S_NO_STOP_TIME, "Got hr %#lx.\n", hr);
-    ok(start == 0x123, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(end == 0x124, "Got end %s.\n", wine_dbgstr_longlong(end));
+    ok(start == 0x123, "Got start %I64d.\n", start);
+    ok(end == 0x124, "Got end %I64d.\n", end);
 
     hr = IMediaSample2_GetProperties(sample2, sizeof(props), (BYTE *)&props);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     ok(props.dwSampleFlags == AM_SAMPLE_TIMEVALID, "Got flags %#lx.\n", props.dwSampleFlags);
-    ok(props.tStart == 0x123, "Got start %s.\n", wine_dbgstr_longlong(props.tStart));
+    ok(props.tStart == 0x123, "Got start %I64d.\n", props.tStart);
 
     props.dwSampleFlags = AM_SAMPLE_TIMEVALID | AM_SAMPLE_STOPVALID;
     props.tStart = 0x1234;
@@ -301,15 +301,15 @@ static void test_sample_time(void)
     start = end = 0;
     hr = IMediaSample_GetTime(sample, &start, &end);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start == 0x1234, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(end == 0x4321, "Got end %s.\n", wine_dbgstr_longlong(end));
+    ok(start == 0x1234, "Got start %I64d.\n", start);
+    ok(end == 0x4321, "Got end %I64d.\n", end);
 
     hr = IMediaSample2_GetProperties(sample2, sizeof(props), (BYTE *)&props);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     ok(props.dwSampleFlags == (AM_SAMPLE_TIMEVALID | AM_SAMPLE_STOPVALID),
             "Got flags %#lx.\n", props.dwSampleFlags);
-    ok(props.tStart == 0x1234, "Got start %s.\n", wine_dbgstr_longlong(props.tStart));
-    ok(props.tStop == 0x4321, "Got end %s.\n", wine_dbgstr_longlong(props.tStop));
+    ok(props.tStart == 0x1234, "Got start %I64d.\n", props.tStart);
+    ok(props.tStop == 0x4321, "Got end %I64d.\n", props.tStop);
 
     IMediaSample2_Release(sample2);
     IMediaSample_Release(sample);
@@ -325,8 +325,8 @@ static void test_sample_time(void)
     end = 0xdeadf00d;
     hr = IMediaSample_GetTime(sample, &start, &end);
     ok(hr == VFW_E_SAMPLE_TIME_NOT_SET, "Got hr %#lx.\n", hr);
-    ok(start == 0xdeadbeef, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(end == 0xdeadf00d, "Got end %s.\n", wine_dbgstr_longlong(end));
+    ok(start == 0xdeadbeef, "Got start %I64d.\n", start);
+    ok(end == 0xdeadf00d, "Got end %I64d.\n", end);
 
     hr = IMediaSample2_GetProperties(sample2, sizeof(props), (BYTE *)&props);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -365,8 +365,8 @@ static void test_media_time(void)
     end = 0xdeadf00d;
     hr = IMediaSample_GetMediaTime(sample, &start, &end);
     ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#lx.\n", hr);
-    ok(start == 0xdeadbeef, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(end == 0xdeadf00d, "Got end %s.\n", wine_dbgstr_longlong(end));
+    ok(start == 0xdeadbeef, "Got start %I64d.\n", start);
+    ok(end == 0xdeadf00d, "Got end %I64d.\n", end);
 
     hr = IMediaSample_SetMediaTime(sample, NULL, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -397,8 +397,8 @@ static void test_media_time(void)
     start = end = 0;
     hr = IMediaSample_GetMediaTime(sample, &start, &end);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start == 0x123, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(end == 0x321, "Got end %s.\n", wine_dbgstr_longlong(end));
+    ok(start == 0x123, "Got start %I64d.\n", start);
+    ok(end == 0x321, "Got end %I64d.\n", end);
 
     IMediaSample_Release(sample);
 
@@ -411,8 +411,8 @@ static void test_media_time(void)
     end = 0xdeadf00d;
     hr = IMediaSample_GetMediaTime(sample, &start, &end);
     ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#lx.\n", hr);
-    ok(start == 0xdeadbeef, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(end == 0xdeadf00d, "Got end %s.\n", wine_dbgstr_longlong(end));
+    ok(start == 0xdeadbeef, "Got start %I64d.\n", start);
+    ok(end == 0xdeadf00d, "Got end %I64d.\n", end);
 
     start = 0x123;
     end = 0x321;
@@ -473,7 +473,7 @@ static void test_sample_properties(void)
     ok(!props.dwTypeSpecificFlags, "Got type-specific flags %#lx.\n", props.dwTypeSpecificFlags);
     ok(!props.dwSampleFlags, "Got flags %#lx.\n", props.dwSampleFlags);
     ok(props.lActual == 65536, "Got actual length %ld.\n", props.lActual);
-    ok(!props.tStart, "Got sample start %s.\n", wine_dbgstr_longlong(props.tStart));
+    ok(!props.tStart, "Got sample start %I64d.\n", props.tStart);
     ok(!props.dwStreamId, "Got stream ID %#lx.\n", props.dwStreamId);
     ok(!props.pMediaType, "Got media type %p.\n", props.pMediaType);
     ok(props.pbBuffer == data, "Expected pointer %p, got %p.\n", data, props.pbBuffer);
@@ -640,7 +640,7 @@ static void test_sample_properties(void)
     ok(!props.dwTypeSpecificFlags, "Got type-specific flags %#lx.\n", props.dwTypeSpecificFlags);
     ok(!props.dwSampleFlags, "Got flags %#lx.\n", props.dwSampleFlags);
     ok(props.lActual == 123, "Got actual length %ld.\n", props.lActual);
-    ok(!props.tStart, "Got sample start %s.\n", wine_dbgstr_longlong(props.tStart));
+    ok(!props.tStart, "Got sample start %I64d.\n", props.tStart);
     ok(!props.dwStreamId, "Got stream ID %#lx.\n", props.dwStreamId);
     ok(!props.pMediaType, "Got media type %p.\n", props.pMediaType);
     ok(props.cbBuffer == 65536, "Got buffer length %ld.\n", props.cbBuffer);
diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c
index 804cbbcc3d1..873ea515213 100644
--- a/dlls/quartz/tests/mpegaudio.c
+++ b/dlls/quartz/tests/mpegaudio.c
@@ -1012,8 +1012,8 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     if (filter->got_sample == 1)
     {
-        ok(start == filter->expected_start_time, "Got start time %s.\n", wine_dbgstr_longlong(start));
-        ok(stop == filter->expected_stop_time, "Got stop time %s.\n", wine_dbgstr_longlong(stop));
+        ok(start == filter->expected_start_time, "Got start time %I64d.\n", start);
+        ok(stop == filter->expected_stop_time, "Got stop time %I64d.\n", stop);
     }
 
     return S_OK;
@@ -1024,8 +1024,8 @@ static HRESULT testsink_new_segment(struct strmbase_sink *iface,
 {
     struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter);
     ++filter->got_new_segment;
-    ok(start == 10000, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(stop == 20000, "Got stop %s.\n", wine_dbgstr_longlong(stop));
+    ok(start == 10000, "Got start %I64d.\n", start);
+    ok(stop == 20000, "Got stop %I64d.\n", stop);
     ok(rate == 1.0, "Got rate %.16e.\n", rate);
     return S_OK;
 }
diff --git a/dlls/quartz/tests/mpeglayer3.c b/dlls/quartz/tests/mpeglayer3.c
index 7f7b8bf245f..a0152767c41 100644
--- a/dlls/quartz/tests/mpeglayer3.c
+++ b/dlls/quartz/tests/mpeglayer3.c
@@ -1012,8 +1012,8 @@ static HRESULT testsink_new_segment(struct strmbase_sink *iface,
 {
     struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter);
     ++filter->got_new_segment;
-    ok(start == 10000, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(stop == 20000, "Got stop %s.\n", wine_dbgstr_longlong(stop));
+    ok(start == 10000, "Got start %I64d.\n", start);
+    ok(stop == 20000, "Got stop %I64d.\n", stop);
     ok(rate == 1.0, "Got rate %.16e.\n", rate);
     return S_OK;
 }
@@ -1341,10 +1341,9 @@ static void test_sample_processing(IMediaControl *control,
             "Got size %lu.\n", testsink->sample_size);
     ok(testsink->sample_actual == 2304 || testsink->sample_actual == 4608,
             "Got valid size %lu.\n", testsink->sample_actual);
-    ok(testsink->sample_start_time == 0, "Got start time %s.\n",
-            wine_dbgstr_longlong(testsink->sample_start_time));
+    ok(testsink->sample_start_time == 0, "Got start time %I64d.\n", testsink->sample_start_time);
     ok(testsink->sample_stop_time == (testsink->sample_actual == 2304 ? 360000 : 720000),
-            "Got stop time %s.\n", wine_dbgstr_longlong(testsink->sample_stop_time));
+            "Got stop time %I64d.\n", testsink->sample_stop_time);
     testsink->got_sample = 0;
 
     hr = IMediaControl_Stop(control);
@@ -1367,10 +1366,10 @@ static void test_sample_processing(IMediaControl *control,
             "Got size %lu.\n", testsink->sample_size);
     ok(testsink->sample_actual == 2304 || testsink->sample_actual == 4608,
             "Got valid size %lu.\n", testsink->sample_actual);
-    ok(testsink->sample_start_time == 22222, "Got start time %s.\n",
-            wine_dbgstr_longlong(testsink->sample_start_time));
+    ok(testsink->sample_start_time == 22222, "Got start time %I64d.\n",
+            testsink->sample_start_time);
     ok(testsink->sample_stop_time == (testsink->sample_actual == 2304 ? 382222 : 742222),
-            "Got stop time %s.\n", wine_dbgstr_longlong(testsink->sample_stop_time));
+            "Got stop time %I64d.\n", testsink->sample_stop_time);
     testsink->got_sample = 0;
 
     hr = IMediaControl_Stop(control);
@@ -1394,10 +1393,10 @@ static void test_sample_processing(IMediaControl *control,
             "Got size %lu.\n", testsink->sample_size);
     ok(testsink->sample_actual == 2304 || testsink->sample_actual == 4608,
             "Got valid size %lu.\n", testsink->sample_actual);
-    ok(testsink->sample_start_time == 22222, "Got start time %s.\n",
-            wine_dbgstr_longlong(testsink->sample_start_time));
+    ok(testsink->sample_start_time == 22222, "Got start time %I64d.\n",
+            testsink->sample_start_time);
     ok(testsink->sample_stop_time == (testsink->sample_actual == 2304 ? 382222 : 742222),
-            "Got stop time %s.\n", wine_dbgstr_longlong(testsink->sample_stop_time));
+            "Got stop time %I64d.\n", testsink->sample_stop_time);
     testsink->got_sample = 0;
 
     hr = IMediaControl_Stop(control);
diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c
index 1d62f0000ee..bebb7d39fcc 100644
--- a/dlls/quartz/tests/mpegsplit.c
+++ b/dlls/quartz/tests/mpegsplit.c
@@ -1723,33 +1723,30 @@ static void test_seeking(void)
     stop = current = 0xdeadbeef;
     hr = IMediaSeeking_GetStopPosition(seeking, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(stop == duration, "Expected time %s, got %s.\n",
-            wine_dbgstr_longlong(duration), wine_dbgstr_longlong(stop));
+    ok(stop == duration, "Expected time %I64d, got %I64d.\n", duration, stop);
     hr = IMediaSeeking_GetCurrentPosition(seeking, ¤t);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current));
+    ok(!current, "Got time %I64d.\n", current);
     stop = current = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == duration, "Expected time %s, got %s.\n",
-            wine_dbgstr_longlong(duration), wine_dbgstr_longlong(stop));
+    ok(!current, "Got time %I64d.\n", current);
+    ok(stop == duration, "Expected time %I64d, got %I64d.\n", duration, stop);
 
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x123456789a, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x123456789a, "Got time %I64d.\n", time);
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x123456789a, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x123456789a, "Got time %I64d.\n", time);
 
     earliest = latest = 0xdeadbeef;
     hr = IMediaSeeking_GetAvailable(seeking, &earliest, &latest);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!earliest, "Got time %s.\n", wine_dbgstr_longlong(earliest));
-    ok(latest == duration, "Expected time %s, got %s.\n",
-            wine_dbgstr_longlong(duration), wine_dbgstr_longlong(latest));
+    ok(!earliest, "Got time %I64d.\n", earliest);
+    ok(latest == duration, "Expected time %I64d, got %I64d.\n", duration, latest);
 
     rate = 0;
     hr = IMediaSeeking_GetRate(seeking, &rate);
@@ -1774,30 +1771,30 @@ static void test_seeking(void)
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning,
             &stop, AM_SEEKING_AbsolutePositioning);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 200 * 10000, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 400 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current == 200 * 10000, "Got time %I64d.\n", current);
+    ok(stop == 400 * 10000, "Got time %I64d.\n", stop);
 
     stop = current = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 200 * 10000, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 400 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current == 200 * 10000, "Got time %I64d.\n", current);
+    ok(stop == 400 * 10000, "Got time %I64d.\n", stop);
 
     current = 200 * 10000;
     stop = 400 * 10000;
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime,
             &stop, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 200 * 10000, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 400 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current == 200 * 10000, "Got time %I64d.\n", current);
+    ok(stop == 400 * 10000, "Got time %I64d.\n", stop);
 
     current = 100 * 10000;
     stop = 200 * 10000;
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime,
             &stop, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 100 * 10000, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 200 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current == 100 * 10000, "Got time %I64d.\n", current);
+    ok(stop == 200 * 10000, "Got time %I64d.\n", stop);
 
     current = 50 * 10000;
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning,
@@ -1807,8 +1804,8 @@ static void test_seeking(void)
     stop = current = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 50 * 10000, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 200 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current == 50 * 10000, "Got time %I64d.\n", current);
+    ok(stop == 200 * 10000, "Got time %I64d.\n", stop);
 
     IMediaSeeking_Release(seeking);
     IPin_Release(pin);
@@ -2192,7 +2189,7 @@ static void test_video_read_position(void)
 
     hr = IFilterGraph2_ConnectDirect(graph, &testsource.source.pin.IPin_iface, sink, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(testsource.read_position == total, "Got 0x%s, expected 0x%s.\n", wine_dbgstr_longlong(testsource.read_position), wine_dbgstr_longlong(total));
+    ok(testsource.read_position == total, "Got %#I64x, expected %#I64x.\n", testsource.read_position, total);
 
     IAsyncReader_Release(testsource.reader);
     IPin_Release(sink);
diff --git a/dlls/quartz/tests/mpegvideo.c b/dlls/quartz/tests/mpegvideo.c
index d5e8a1c30df..3bcf466e888 100644
--- a/dlls/quartz/tests/mpegvideo.c
+++ b/dlls/quartz/tests/mpegvideo.c
@@ -954,11 +954,11 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample
 
     if (filter->got_sample == 0 && filter->expected_start_time != (REFERENCE_TIME)-1)
     {
-        ok(start == filter->expected_start_time, "Got start time %s, expected %s.\n",
-                wine_dbgstr_longlong(start), wine_dbgstr_longlong(filter->expected_start_time));
+        ok(start == filter->expected_start_time, "Got start time %I64d, expected %I64d.\n",
+                start, filter->expected_start_time);
         todo_wine
-            ok(stop == filter->expected_stop_time, "Got stop time %s, expected %s.\n",
-                wine_dbgstr_longlong(stop), wine_dbgstr_longlong(filter->expected_stop_time));
+            ok(stop == filter->expected_stop_time, "Got stop time %I64d, expected %I64d.\n",
+                stop, filter->expected_stop_time);
     }
 
     ++filter->got_sample;
@@ -971,8 +971,8 @@ static HRESULT testsink_new_segment(struct strmbase_sink *iface,
 {
     struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter);
     ++filter->got_new_segment;
-    ok(start == 10000, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(stop == 20000, "Got stop %s.\n", wine_dbgstr_longlong(stop));
+    ok(start == 10000, "Got start %I64d.\n", start);
+    ok(stop == 20000, "Got stop %I64d.\n", stop);
     ok(rate == 1.0, "Got rate %.16e.\n", rate);
     return S_OK;
 }
diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c
index 65bc406f35f..5eea6bce7d9 100644
--- a/dlls/quartz/tests/systemclock.c
+++ b/dlls/quartz/tests/systemclock.c
@@ -173,23 +173,20 @@ static void test_get_time(void)
 
     hr = IReferenceClock_GetTime(clock, &time1);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time1 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %s.\n",
-            wine_dbgstr_longlong(time1));
+    ok(time1 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %I64d.\n", time1);
 
     ticks = (REFERENCE_TIME)timeGetTime() * 10000;
 
     hr = IReferenceClock_GetTime(clock, &time2);
     ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#lx.\n", hr);
-    ok(time2 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %s.\n",
-            wine_dbgstr_longlong(time1));
+    ok(time2 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %I64d.\n", time1);
 
     ok(time2 >= ticks && ticks >= time1, "Got timestamps %I64d, %I64d, %I64d.\n", time1, ticks, time2);
 
     Sleep(100);
     hr = IReferenceClock_GetTime(clock, &time2);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time2 - time1 > 80 * 10000, "Expected about %s, but got %s.\n",
-            wine_dbgstr_longlong(time1 + 80 * 10000), wine_dbgstr_longlong(time2));
+    ok(time2 - time1 > 80 * 10000, "Expected about %I64d, but got %I64d.\n", time1 + 80 * 10000, time2);
 
     ref = IReferenceClock_Release(clock);
     ok(!ref, "Got outstanding refcount %ld.\n", ref);
diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index 09f11a30c90..54681e68304 100644
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -1044,7 +1044,7 @@ static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input
 
     hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 10000000, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 10000000, "Got time %I64d.\n", time);
 
     ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n");
 
diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c
index 0e799efb960..e1bb00a20de 100644
--- a/dlls/quartz/tests/vmr7.c
+++ b/dlls/quartz/tests/vmr7.c
@@ -3277,8 +3277,8 @@ static HRESULT WINAPI presenter_PresentImage(IVMRImagePresenter *iface, DWORD_PT
     ok(cookie == 0xabacab, "Got cookie %#Ix.\n", cookie);
     ok(info->dwFlags == VMRSample_TimeValid, "Got flags %#lx.\n", info->dwFlags);
     todo_wine ok(info->lpSurf == presenter->surfaces[5 - presenter->got_PresentImage], "Got unexpected surface.\n");
-    ok(!info->rtStart, "Got start time %s.\n", wine_dbgstr_longlong(info->rtStart));
-    ok(info->rtEnd == 10000000, "Got end time %s.\n", wine_dbgstr_longlong(info->rtEnd));
+    ok(!info->rtStart, "Got start time %I64d.\n", info->rtStart);
+    ok(info->rtEnd == 10000000, "Got end time %I64d.\n", info->rtEnd);
     todo_wine ok(info->szAspectRatio.cx == 120, "Got aspect ratio width %ld.\n", info->szAspectRatio.cx);
     todo_wine ok(info->szAspectRatio.cy == 60, "Got aspect ratio height %ld.\n", info->szAspectRatio.cy);
     ok(EqualRect(&info->rcSrc, &rect), "Got source rect %s.\n", wine_dbgstr_rect(&info->rcSrc));
diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c
index 0d64e813a7f..1c24a1f70e7 100644
--- a/dlls/quartz/tests/vmr9.c
+++ b/dlls/quartz/tests/vmr9.c
@@ -3019,8 +3019,8 @@ static HRESULT WINAPI presenter_PresentImage(IVMRImagePresenter9 *iface, DWORD_P
     IDirect3DDevice9_Release(device);
     ok(cookie == 0xabacab, "Got cookie %#Ix.\n", cookie);
     todo_wine ok(info->dwFlags == VMR9Sample_TimeValid, "Got flags %#lx.\n", info->dwFlags);
-    ok(!info->rtStart, "Got start time %s.\n", wine_dbgstr_longlong(info->rtStart));
-    ok(info->rtEnd == 10000000, "Got end time %s.\n", wine_dbgstr_longlong(info->rtEnd));
+    ok(!info->rtStart, "Got start time %I64d.\n", info->rtStart);
+    ok(info->rtEnd == 10000000, "Got end time %I64d.\n", info->rtEnd);
     todo_wine ok(info->szAspectRatio.cx == 120, "Got aspect ratio width %ld.\n", info->szAspectRatio.cx);
     todo_wine ok(info->szAspectRatio.cy == 60, "Got aspect ratio height %ld.\n", info->szAspectRatio.cy);
     ok(EqualRect(&info->rcSrc, &rect), "Got source rect %s.\n", wine_dbgstr_rect(&info->rcSrc));
diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c
index 1c86a39c730..6dc240ff714 100644
--- a/dlls/quartz/tests/waveparser.c
+++ b/dlls/quartz/tests/waveparser.c
@@ -934,37 +934,34 @@ static void test_seeking(void)
     stop = current = 0xdeadbeef;
     hr = IMediaSeeking_GetStopPosition(seeking, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(stop == duration, "Expected time %s, got %s.\n",
-            wine_dbgstr_longlong(duration), wine_dbgstr_longlong(stop));
+    ok(stop == duration, "Expected time %I64d, got %I64d.\n", duration, stop);
     hr = IMediaSeeking_GetCurrentPosition(seeking, ¤t);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current));
+    ok(!current, "Got time %I64d.\n", current);
     stop = current = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == duration, "Expected time %s, got %s.\n",
-            wine_dbgstr_longlong(duration), wine_dbgstr_longlong(stop));
+    ok(!current, "Got time %I64d.\n", current);
+    ok(stop == duration, "Expected time %I64d, got %I64d.\n", duration, stop);
 
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, &TIME_FORMAT_MEDIA_TIME, 0x123456789a, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x123456789a, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x123456789a, "Got time %I64d.\n", time);
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, NULL, 0x123456789a, &TIME_FORMAT_MEDIA_TIME);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0x123456789a, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0x123456789a, "Got time %I64d.\n", time);
     time = 0xdeadbeef;
     hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, NULL, 441, &TIME_FORMAT_SAMPLE);
     todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    todo_wine ok(time == 100000, "Got time %s.\n", wine_dbgstr_longlong(time));
+    todo_wine ok(time == 100000, "Got time %I64d.\n", time);
 
     earliest = latest = 0xdeadbeef;
     hr = IMediaSeeking_GetAvailable(seeking, &earliest, &latest);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(!earliest, "Got time %s.\n", wine_dbgstr_longlong(earliest));
-    ok(latest == duration, "Expected time %s, got %s.\n",
-            wine_dbgstr_longlong(duration), wine_dbgstr_longlong(latest));
+    ok(!earliest, "Got time %I64d.\n", earliest);
+    ok(latest == duration, "Expected time %I64d, got %I64d.\n", duration, latest);
 
     rate = 0;
     hr = IMediaSeeking_GetRate(seeking, &rate);
@@ -989,30 +986,30 @@ static void test_seeking(void)
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning,
             &stop, AM_SEEKING_AbsolutePositioning);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 200 * 10000, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 400 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current == 200 * 10000, "Got time %I64d.\n", current);
+    ok(stop == 400 * 10000, "Got time %I64d.\n", stop);
 
     stop = current = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 200 * 10000, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 400 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current == 200 * 10000, "Got time %I64d.\n", current);
+    ok(stop == 400 * 10000, "Got time %I64d.\n", stop);
 
     current = 200 * 10000;
     stop = 400 * 10000;
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime,
             &stop, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 200 * 10000, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 400 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current == 200 * 10000, "Got time %I64d.\n", current);
+    ok(stop == 400 * 10000, "Got time %I64d.\n", stop);
 
     current = 100 * 10000;
     stop = 200 * 10000;
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime,
             &stop, AM_SEEKING_AbsolutePositioning | AM_SEEKING_ReturnTime);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 100 * 10000, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 200 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current == 100 * 10000, "Got time %I64d.\n", current);
+    ok(stop == 200 * 10000, "Got time %I64d.\n", stop);
 
     current = 50 * 10000;
     hr = IMediaSeeking_SetPositions(seeking, ¤t, AM_SEEKING_AbsolutePositioning,
@@ -1022,8 +1019,8 @@ static void test_seeking(void)
     stop = current = 0xdeadbeef;
     hr = IMediaSeeking_GetPositions(seeking, ¤t, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current == 50 * 10000, "Got time %s.\n", wine_dbgstr_longlong(current));
-    ok(stop == 200 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));
+    ok(current == 50 * 10000, "Got time %I64d.\n", current);
+    ok(stop == 200 * 10000, "Got time %I64d.\n", stop);
 
     IMediaSeeking_Release(seeking);
     IPin_Release(pin);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/11021

[PATCH 2/7] quartz: Use %I64.

[Elizabeth Figura]

From: Elizabeth Figura <[e-mail]>

---
 dlls/quartz/filesource.c  |  3 +--
 dlls/quartz/filtergraph.c | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index 2f85808d43e..02cae5b654b 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -872,8 +872,7 @@ static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader *iface,
     HRESULT hr;
     BOOL ret;
 
-    TRACE("filter %p, offset %s, length %ld, buffer %p.\n",
-            filter, wine_dbgstr_longlong(offset), length, buffer);
+    TRACE("filter %p, offset %#I64x, length %ld, buffer %p.\n", filter, offset, length, buffer);
 
     ret = sync_read(filter->file, offset, length, buffer, &read_len);
     if (ret)
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 79fcc425e53..efe604530db 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -2320,8 +2320,7 @@ static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *d
 
     LeaveCriticalSection(&graph->cs);
 
-    TRACE("Returning hr %#lx, duration %s (%s seconds).\n", hr,
-            wine_dbgstr_longlong(*duration), debugstr_time(*duration));
+    TRACE("Returning hr %#lx, duration %I64d (%s seconds).\n", hr, *duration, debugstr_time(*duration));
     return hr;
 }
 
@@ -2362,7 +2361,7 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLON
 
     LeaveCriticalSection(&graph->cs);
 
-    TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(*stop), debugstr_time(*stop));
+    TRACE("Returning %I64d (%s seconds).\n", *stop, debugstr_time(*stop));
     return hr;
 }
 
@@ -2392,7 +2391,7 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONG
 
     LeaveCriticalSection(&graph->cs);
 
-    TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(ret), debugstr_time(ret));
+    TRACE("Returning %I64d (%s seconds).\n", ret, debugstr_time(ret));
     *current = ret;
 
     return S_OK;
@@ -2403,8 +2402,8 @@ static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGL
 {
     struct filter_graph *This = impl_from_IMediaSeeking(iface);
 
-    TRACE("(%p/%p)->(%p, %s, 0x%s, %s)\n", This, iface, pTarget,
-        debugstr_guid(pTargetFormat), wine_dbgstr_longlong(Source), debugstr_guid(pSourceFormat));
+    TRACE("graph %p, target %p, target_format %s, source %I64d, source_format %s.\n",
+            This, pTarget, debugstr_guid(pTargetFormat), Source, debugstr_guid(pSourceFormat));
 
     if (!pSourceFormat)
         pSourceFormat = &This->timeformatseek;
@@ -2428,15 +2427,12 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *
     struct filter *filter;
     FILTER_STATE state;
 
-    TRACE("graph %p, current %s, current_flags %#lx, stop %s, stop_flags %#lx.\n", graph,
-            current_ptr ? wine_dbgstr_longlong(*current_ptr) : "<null>", current_flags,
-            stop_ptr ? wine_dbgstr_longlong(*stop_ptr): "<null>", stop_flags);
+    TRACE("graph %p, current %p, current_flags %#lx, stop %p, stop_flags %#lx.\n",
+            graph, current_ptr, current_flags, stop_ptr, stop_flags);
     if (current_ptr)
-        TRACE("Setting current position to %s (%s seconds).\n",
-                wine_dbgstr_longlong(*current_ptr), debugstr_time(*current_ptr));
+        TRACE("Setting current position to %I64d (%s seconds).\n", *current_ptr, debugstr_time(*current_ptr));
     if (stop_ptr)
-        TRACE("Setting stop position to %s (%s seconds).\n",
-                wine_dbgstr_longlong(*stop_ptr), debugstr_time(*stop_ptr));
+        TRACE("Setting stop position to %I64d (%s seconds).\n", *stop_ptr, debugstr_time(*stop_ptr));
 
     if ((current_flags & 0x7) != AM_SEEKING_AbsolutePositioning
             && (current_flags & 0x7) != AM_SEEKING_NoPositioning)
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/11021

[PATCH 3/7] qasf/tests: Use %I64.

[Elizabeth Figura]

From: Elizabeth Figura <[e-mail]>

---
 dlls/qasf/tests/dmowrapper.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c
index b8d033d7a8f..6aaf3969645 100644
--- a/dlls/qasf/tests/dmowrapper.c
+++ b/dlls/qasf/tests/dmowrapper.c
@@ -324,27 +324,27 @@ static HRESULT WINAPI dmo_ProcessInput(IMediaObject *iface, DWORD index,
     if (testmode == 0 || testmode == 12 || testmode == 100)
     {
         ok(!flags, "Got flags %#lx.\n", flags);
-        ok(!timestamp, "Got timestamp %s.\n", wine_dbgstr_longlong(timestamp));
-        ok(!timelength, "Got length %s.\n", wine_dbgstr_longlong(timelength));
+        ok(!timestamp, "Got timestamp %I64d.\n", timestamp);
+        ok(!timelength, "Got length %I64d.\n", timelength);
     }
     else if (testmode == 1)
     {
         ok(flags == (DMO_INPUT_DATA_BUFFERF_TIME | DMO_INPUT_DATA_BUFFERF_TIMELENGTH), "Got flags %#lx.\n", flags);
-        ok(timestamp == 20000, "Got timestamp %s.\n", wine_dbgstr_longlong(timestamp));
-        ok(timelength == 1, "Got length %s.\n", wine_dbgstr_longlong(timelength));
+        ok(timestamp == 20000, "Got timestamp %I64d.\n", timestamp);
+        ok(timelength == 1, "Got length %I64d.\n", timelength);
     }
     else if (testmode == 6)
     {
         ok(flags == (DMO_INPUT_DATA_BUFFERF_TIME | DMO_INPUT_DATA_BUFFERF_TIMELENGTH
                 | DMO_INPUT_DATA_BUFFERF_SYNCPOINT), "Got flags %#lx.\n", flags);
-        ok(timestamp == 20000, "Got timestamp %s.\n", wine_dbgstr_longlong(timestamp));
-        ok(timelength == 10000, "Got length %s.\n", wine_dbgstr_longlong(timelength));
+        ok(timestamp == 20000, "Got timestamp %I64d.\n", timestamp);
+        ok(timelength == 10000, "Got length %I64d.\n", timelength);
     }
     else
     {
         ok(flags == (DMO_INPUT_DATA_BUFFERF_TIME | DMO_INPUT_DATA_BUFFERF_TIMELENGTH), "Got flags %#lx.\n", flags);
-        ok(timestamp == 20000, "Got timestamp %s.\n", wine_dbgstr_longlong(timestamp));
-        ok(timelength == 10000, "Got length %s.\n", wine_dbgstr_longlong(timelength));
+        ok(timestamp == 20000, "Got timestamp %I64d.\n", timestamp);
+        ok(timelength == 10000, "Got length %I64d.\n", timelength);
     }
 
     testdmo_buffer = buffer;
@@ -1259,15 +1259,15 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample
     if (testmode == 8)
     {
         ok(hr == VFW_S_NO_STOP_TIME, "Got hr %#lx.\n", hr);
-        ok(start == 5000, "Got start time %s.\n", wine_dbgstr_longlong(start));
+        ok(start == 5000, "Got start time %I64d.\n", start);
     }
     else if (testmode == 9)
         ok(hr == VFW_E_SAMPLE_TIME_NOT_SET, "Got hr %#lx.\n", hr);
     else
     {
         ok(hr == S_OK, "Got hr %#lx.\n", hr);
-        ok(start == 5000, "Got start time %s.\n", wine_dbgstr_longlong(start));
-        ok(stop == 6000, "Got stop time %s.\n", wine_dbgstr_longlong(stop));
+        ok(start == 5000, "Got start time %I64d.\n", start);
+        ok(stop == 6000, "Got stop time %I64d.\n", stop);
     }
 
     hr = IMediaSample_GetMediaTime(sample, &start, &stop);
@@ -1307,8 +1307,8 @@ static HRESULT testsink_new_segment(struct strmbase_sink *iface,
 {
     struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter);
     ++filter->got_new_segment;
-    ok(start == 10000, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(stop == 20000, "Got stop %s.\n", wine_dbgstr_longlong(stop));
+    ok(start == 10000, "Got start %I64d.\n", start);
+    ok(stop == 20000, "Got stop %I64d.\n", stop);
     ok(rate == 1.0, "Got rate %.16e.\n", rate);
     return 0xdeadbeef;
 }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/11021

[PATCH 4/7] qcap/tests: Use %I64.

[Elizabeth Figura]

From: Elizabeth Figura <[e-mail]>

---
 dlls/qcap/tests/avimux.c         |  4 ++--
 dlls/qcap/tests/smartteefilter.c | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c
index 8d11c5cbf04..5fdc3caa244 100644
--- a/dlls/qcap/tests/avimux.c
+++ b/dlls/qcap/tests/avimux.c
@@ -783,12 +783,12 @@ static void test_seeking(void)
     hr = IMediaSeeking_GetDuration(seeking, &time);
     todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
     if (hr == S_OK)
-        ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time));
+        ok(!time, "Got duration %I64d.\n", time);
 
     hr = IMediaSeeking_GetCurrentPosition(seeking, &time);
     todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr);
     if (hr == S_OK)
-        ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time));
+        ok(!time, "Got duration %I64d.\n", time);
 
     hr = IMediaSeeking_GetStopPosition(seeking, &time);
     ok(hr == E_NOTIMPL, "Got hr %#lx.\n", hr);
diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c
index a25889d2a4d..bae2a03d5a2 100644
--- a/dlls/qcap/tests/smartteefilter.c
+++ b/dlls/qcap/tests/smartteefilter.c
@@ -803,8 +803,8 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample
     else
     {
         ok(hr == S_OK, "Got hr %#lx.\n", hr);
-        ok(start == 30000, "Got start time %s.\n", wine_dbgstr_longlong(start));
-        ok(stop == 40000, "Got stop time %s.\n", wine_dbgstr_longlong(stop));
+        ok(start == 30000, "Got start time %I64d.\n", start);
+        ok(stop == 40000, "Got stop time %I64d.\n", stop);
     }
 
     hr = IMediaSample_GetMediaTime(sample, &start, &stop);
@@ -815,8 +815,8 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample
     else
     {
         ok(hr == S_OK, "Got hr %#lx.\n", hr);
-        ok(start == 10000, "Got start time %s.\n", wine_dbgstr_longlong(start));
-        ok(stop == 20000, "Got stop time %s.\n", wine_dbgstr_longlong(stop));
+        ok(start == 10000, "Got start time %I64d.\n", start);
+        ok(stop == 20000, "Got stop time %I64d.\n", stop);
     }
 
     hr = IMediaSample_IsDiscontinuity(sample);
@@ -835,8 +835,8 @@ static HRESULT testsink_new_segment(struct strmbase_sink *iface,
         REFERENCE_TIME start, REFERENCE_TIME stop, double rate)
 {
     struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter);
-    ok(start == 10000, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(stop == 20000, "Got stop %s.\n", wine_dbgstr_longlong(stop));
+    ok(start == 10000, "Got start %I64d.\n", start);
+    ok(stop == 20000, "Got stop %I64d.\n", stop);
     ok(rate == 1.0, "Got rate %.16e.\n", rate);
     SetEvent(filter->segment_event);
     return S_OK;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/11021

[PATCH 5/7] qedit/tests: Use %I64.

[Elizabeth Figura]

From: Elizabeth Figura <[e-mail]>

---
 dlls/qedit/tests/samplegrabber.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c
index 9daa67355b2..f12326ca844 100644
--- a/dlls/qedit/tests/samplegrabber.c
+++ b/dlls/qedit/tests/samplegrabber.c
@@ -752,13 +752,13 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample
 
     hr = IMediaSample_GetTime(sample, &start, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start == 30000, "Got start time %s.\n", wine_dbgstr_longlong(start));
-    ok(stop == 40000, "Got stop time %s.\n", wine_dbgstr_longlong(stop));
+    ok(start == 30000, "Got start time %I64d.\n", start);
+    ok(stop == 40000, "Got stop time %I64d.\n", stop);
 
     hr = IMediaSample_GetMediaTime(sample, &start, &stop);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start == 10000, "Got start time %s.\n", wine_dbgstr_longlong(start));
-    ok(stop == 20000, "Got stop time %s.\n", wine_dbgstr_longlong(stop));
+    ok(start == 10000, "Got start time %I64d.\n", start);
+    ok(stop == 20000, "Got stop time %I64d.\n", stop);
 
     hr = IMediaSample_IsDiscontinuity(sample);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -777,8 +777,8 @@ static HRESULT testsink_new_segment(struct strmbase_sink *iface,
 {
     struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter);
     ++filter->got_new_segment;
-    ok(start == 10000, "Got start %s.\n", wine_dbgstr_longlong(start));
-    ok(stop == 20000, "Got stop %s.\n", wine_dbgstr_longlong(stop));
+    ok(start == 10000, "Got start %I64d.\n", start);
+    ok(stop == 20000, "Got stop %I64d.\n", stop);
     ok(rate == 1.0, "Got rate %.16e.\n", rate);
     return S_OK;
 }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/11021

[PATCH 6/7] amstream/tests: Use %I64.

[Elizabeth Figura]

From: Elizabeth Figura <[e-mail]>

---
 dlls/amstream/tests/amstream.c | 204 ++++++++++++++++-----------------
 1 file changed, 102 insertions(+), 102 deletions(-)

diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c
index b3f555fa735..dbff4eb42f9 100644
--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -621,7 +621,7 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path)
     duration = 0xdeadbeefdeadbeefULL;
     hr = IAMMultiMediaStream_GetDuration(mmstream, &duration);
     ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr);
-    ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration));
+    ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %I64d.\n", duration);
 
     hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -638,12 +638,12 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path)
     if (audio_hr == S_OK)
     {
         ok(hr == S_OK, "Got hr %#lx.\n", hr);
-        ok(duration == 1000000LL, "Got duration %s.\n", wine_dbgstr_longlong(duration));
+        ok(duration == 1000000LL, "Got duration %I64d.\n", duration);
     }
     else
     {
         ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
-        ok(!duration, "Got duration %s.\n", wine_dbgstr_longlong(duration));
+        ok(!duration, "Got duration %I64d.\n", duration);
     }
 
     ref = IAMMultiMediaStream_Release(mmstream);
@@ -656,7 +656,7 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path)
     duration = 0xdeadbeefdeadbeefULL;
     hr = IAMMultiMediaStream_GetDuration(mmstream, &duration);
     ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
-    ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration));
+    ok(duration == 0, "Got duration %I64d.\n", duration);
 
     ref = IAMMultiMediaStream_Release(mmstream);
     ok(!ref, "Got outstanding refcount %ld.\n", ref);
@@ -669,7 +669,7 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path)
     duration = 0xdeadbeefdeadbeefULL;
     hr = IAMMultiMediaStream_GetDuration(mmstream, &duration);
     ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
-    ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration));
+    ok(duration == 0, "Got duration %I64d.\n", duration);
 
     ref = IAMMultiMediaStream_Release(mmstream);
     ok(!ref, "Got outstanding refcount %ld.\n", ref);
@@ -684,7 +684,7 @@ static void test_mmstream_get_duration(const WCHAR *test_avi_path)
     duration = 0xdeadbeefdeadbeefULL;
     hr = IAMMultiMediaStream_GetDuration(mmstream, &duration);
     ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
-    ok(duration == 0, "Got duration %s.\n", wine_dbgstr_longlong(duration));
+    ok(duration == 0, "Got duration %I64d.\n", duration);
 
     ref = IAMMultiMediaStream_Release(mmstream);
     ok(!ref, "Got outstanding refcount %ld.\n", ref);
@@ -4858,8 +4858,8 @@ static void test_audiostream_new_segment(void)
     end_time = 0xdeadbeefdeadbeef;
     hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start_time == 23456789, "Got start time %s.\n", wine_dbgstr_longlong(start_time));
-    ok(end_time == 23459057, "Got end time %s.\n", wine_dbgstr_longlong(end_time));
+    ok(start_time == 23456789, "Got start time %I64d.\n", start_time);
+    ok(end_time == 23459057, "Got end time %I64d.\n", end_time);
 
     hr = IPin_NewSegment(pin, 11111111, 22222222, 2.0);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -4880,8 +4880,8 @@ static void test_audiostream_new_segment(void)
     end_time = 0xdeadbeefdeadbeef;
     hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start_time == 23456789, "Got start time %s.\n", wine_dbgstr_longlong(start_time));
-    ok(end_time == 23459057, "Got end time %s.\n", wine_dbgstr_longlong(end_time));
+    ok(start_time == 23456789, "Got start time %I64d.\n", start_time);
+    ok(end_time == 23459057, "Got end time %I64d.\n", end_time);
 
     hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -5424,7 +5424,7 @@ static void test_audiostreamsample_get_sample_times(void)
     current_time = 0xdeadbeefdeadbeef;
     hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, ¤t_time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current_time == 0, "Got current time %s.\n", wine_dbgstr_longlong(current_time));
+    ok(current_time == 0, "Got current time %I64d.\n", current_time);
 
     hr = IMediaFilter_SetSyncSource(graph_media_filter, &clock.IReferenceClock_iface);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -5432,7 +5432,7 @@ static void test_audiostreamsample_get_sample_times(void)
     current_time = 0xdeadbeefdeadbeef;
     hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, ¤t_time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current_time == 0, "Got current time %s.\n", wine_dbgstr_longlong(current_time));
+    ok(current_time == 0, "Got current time %I64d.\n", current_time);
 
     hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -5447,31 +5447,31 @@ static void test_audiostreamsample_get_sample_times(void)
     current_time = 0xdeadbeefdeadbeef;
     hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, ¤t_time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current_time == 0xdeadbeefddf15da1 + filter_start_time, "Expected current time %s, got %s.\n",
-            wine_dbgstr_longlong(0xdeadbeefddf15da1 + filter_start_time), wine_dbgstr_longlong(current_time));
+    ok(current_time == 0xdeadbeefddf15da1 + filter_start_time, "Expected current time %I64d, got %I64d.\n",
+            0xdeadbeefddf15da1 + filter_start_time, current_time);
 
     clock.get_time_hr = S_OK;
 
     current_time = 0xdeadbeefdeadbeef;
     hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, ¤t_time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current_time == filter_start_time, "Expected current time %s, got %s.\n",
-            wine_dbgstr_longlong(filter_start_time), wine_dbgstr_longlong(current_time));
+    ok(current_time == filter_start_time, "Expected current time %I64d, got %I64d.\n",
+            filter_start_time, current_time);
 
     clock.time = 23456789;
 
     current_time = 0xdeadbeefdeadbeef;
     hr = IAudioStreamSample_GetSampleTimes(stream_sample, NULL, NULL, ¤t_time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current_time == filter_start_time + 11111111, "Expected current time %s, got %s.\n",
-            wine_dbgstr_longlong(filter_start_time + 11111111), wine_dbgstr_longlong(current_time));
+    ok(current_time == filter_start_time + 11111111, "Expected current time %I64d, got %I64d.\n",
+            filter_start_time + 11111111, current_time);
 
     start_time = 0xdeadbeefdeadbeef;
     end_time = 0xdeadbeefdeadbeef;
     hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start_time == 0, "Got start time %s.\n", wine_dbgstr_longlong(start_time));
-    ok(end_time == 0, "Got end time %s.\n", wine_dbgstr_longlong(end_time));
+    ok(start_time == 0, "Got start time %I64d.\n", start_time);
+    ok(end_time == 0, "Got end time %I64d.\n", end_time);
 
     media_sample = ammediastream_allocate_sample(&source, test_data, 8);
     start_time = 12345678;
@@ -5489,8 +5489,8 @@ static void test_audiostreamsample_get_sample_times(void)
     end_time = 0xdeadbeefdeadbeef;
     hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start_time == 12345678, "Got start time %s.\n", wine_dbgstr_longlong(start_time));
-    ok(end_time == 12347946, "Got end time %s.\n", wine_dbgstr_longlong(end_time));
+    ok(start_time == 12345678, "Got start time %I64d.\n", start_time);
+    ok(end_time == 12347946, "Got end time %I64d.\n", end_time);
 
     media_sample = ammediastream_allocate_sample(&source, test_data, 6);
     start_time = 12345678;
@@ -5508,8 +5508,8 @@ static void test_audiostreamsample_get_sample_times(void)
     end_time = 0xdeadbeefdeadbeef;
     hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start_time == 12347946, "Got start time %s.\n", wine_dbgstr_longlong(start_time));
-    ok(end_time == 12346585, "Got end time %s.\n", wine_dbgstr_longlong(end_time));
+    ok(start_time == 12347946, "Got start time %I64d.\n", start_time);
+    ok(end_time == 12346585, "Got end time %I64d.\n", end_time);
 
     hr = IPin_EndOfStream(pin);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -5521,8 +5521,8 @@ static void test_audiostreamsample_get_sample_times(void)
     end_time = 0xdeadbeefdeadbeef;
     hr = IAudioStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start_time == 12346585, "Got start time %s.\n", wine_dbgstr_longlong(start_time));
-    ok(end_time == 12348399, "Got end time %s.\n", wine_dbgstr_longlong(end_time));
+    ok(start_time == 12346585, "Got start time %I64d.\n", start_time);
+    ok(end_time == 12348399, "Got end time %I64d.\n", end_time);
 
     hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -6536,8 +6536,8 @@ static void test_ddrawstream_new_segment(void)
     end_time = 0xdeadbeefdeadbeef;
     hr = IDirectDrawStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start_time == 23456789, "Got start time %s.\n", wine_dbgstr_longlong(start_time));
-    ok(end_time == 34567900, "Got end time %s.\n", wine_dbgstr_longlong(end_time));
+    ok(start_time == 23456789, "Got start time %I64d.\n", start_time);
+    ok(end_time == 34567900, "Got end time %I64d.\n", end_time);
 
     hr = IPin_NewSegment(pin, 11111111, 22222222, 2.0);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -6558,8 +6558,8 @@ static void test_ddrawstream_new_segment(void)
     end_time = 0xdeadbeefdeadbeef;
     hr = IDirectDrawStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start_time == 23456789, "Got start time %s.\n", wine_dbgstr_longlong(start_time));
-    ok(end_time == 34567900, "Got end time %s.\n", wine_dbgstr_longlong(end_time));
+    ok(start_time == 23456789, "Got start time %I64d.\n", start_time);
+    ok(end_time == 34567900, "Got end time %I64d.\n", end_time);
 
     hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -6625,7 +6625,7 @@ static void test_ddrawstream_get_time_per_frame(void)
     frame_time = 0xdeadbeefdeadbeef;
     hr = IDirectDrawMediaStream_GetTimePerFrame(ddraw_stream, &frame_time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(frame_time == 12345678, "Got frame time %s.\n", wine_dbgstr_longlong(frame_time));
+    ok(frame_time == 12345678, "Got frame time %I64d.\n", frame_time);
 
     ref = IAMMultiMediaStream_Release(mmstream);
     ok(!ref, "Got outstanding refcount %ld.\n", ref);
@@ -7341,21 +7341,21 @@ static void check_mediastreamfilter_set_positions(IMediaSeeking *seeking, struct
     hr = IMediaSeeking_SetPositions(seeking, ¤t_position, AM_SEEKING_AbsolutePositioning,
             &stop_position, AM_SEEKING_AbsolutePositioning);
     ok(hr == expected_hr, "Got hr %#lx.\n", hr);
-    ok(source1->current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n",
-            wine_dbgstr_longlong(source1->current_position));
-    ok(source1->stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n",
-            wine_dbgstr_longlong(source1->stop_position));
+    ok(source1->current_position == 0xdeadbeefdeadbeefULL, "Got current position %I64d.\n",
+            source1->current_position);
+    ok(source1->stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %I64d.\n",
+            source1->stop_position);
     if (SUCCEEDED(expected_hr))
     {
-        ok(source2->current_position == 12345678, "Got current position %s.\n",
-                wine_dbgstr_longlong(source2->current_position));
-        ok(source2->stop_position == 87654321, "Got stop position %s.\n",
-                wine_dbgstr_longlong(source2->stop_position));
+        ok(source2->current_position == 12345678, "Got current position %I64d.\n",
+                source2->current_position);
+        ok(source2->stop_position == 87654321, "Got stop position %I64d.\n",
+                source2->stop_position);
     }
-    ok(source3->current_position == 0xdeadbeefdeadbeefULL, "Got current position %s.\n",
-            wine_dbgstr_longlong(source3->current_position));
-    ok(source3->stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n",
-            wine_dbgstr_longlong(source3->stop_position));
+    ok(source3->current_position == 0xdeadbeefdeadbeefULL, "Got current position %I64d.\n",
+            source3->current_position);
+    ok(source3->stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %I64d.\n",
+            source3->stop_position);
 }
 
 static void check_mediastreamfilter_get_duration(IMediaSeeking *seeking, struct testfilter *source1,
@@ -7368,9 +7368,9 @@ static void check_mediastreamfilter_get_duration(IMediaSeeking *seeking, struct
     hr = IMediaSeeking_GetDuration(seeking, &duration);
     ok(hr == expected_hr, "Got hr %#lx.\n", hr);
     if (SUCCEEDED(expected_hr))
-        ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", wine_dbgstr_longlong(duration));
+        ok(duration == 0x8000000000000000ULL, "Got duration %I64d.\n", duration);
     else
-        ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration));
+        ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %I64d.\n", duration);
 }
 
 static void check_mediastreamfilter_get_stop_position(IMediaSeeking *seeking, struct testfilter *source1,
@@ -7383,9 +7383,9 @@ static void check_mediastreamfilter_get_stop_position(IMediaSeeking *seeking, st
     hr = IMediaSeeking_GetStopPosition(seeking, &stop);
     ok(hr == expected_hr, "Got hr %#lx.\n", hr);
     if (SUCCEEDED(expected_hr))
-        ok(stop == 0x8000000000000000ULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop));
+        ok(stop == 0x8000000000000000ULL, "Got stop position %I64d.\n", stop);
     else
-        ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop));
+        ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %I64d.\n", stop);
 }
 
 static void check_mediastreamfilter_is_format_supported(IMediaSeeking *seeking, struct testfilter *source1,
@@ -7444,11 +7444,11 @@ static void test_mediastreamfilter_get_current_stream_time(void)
     time = 0xdeadbeefdeadbeef;
     hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time);
     ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
-    ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0, "Got time %I64d.\n", time);
     time = 0xdeadbeefdeadbeef;
     hr = IAMMultiMediaStream_GetTime(mmstream, &time);
     ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
-    ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0, "Got time %I64d.\n", time);
 
     hr = IMediaFilter_SetSyncSource(media_filter, &clock.IReferenceClock_iface);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -7458,11 +7458,11 @@ static void test_mediastreamfilter_get_current_stream_time(void)
     time = 0xdeadbeefdeadbeef;
     hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time);
     ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
-    ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0, "Got time %I64d.\n", time);
     time = 0xdeadbeefdeadbeef;
     hr = IAMMultiMediaStream_GetTime(mmstream, &time);
     ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
-    ok(time == 0, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0, "Got time %I64d.\n", time);
 
     clock.time = 23456789;
     clock.get_time_hr = S_OK;
@@ -7478,11 +7478,11 @@ static void test_mediastreamfilter_get_current_stream_time(void)
     time = 0xdeadbeefdeadbeef;
     hr = IMediaStreamFilter_GetCurrentStreamTime(filter, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 11111101 + filter_start_time, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 11111101 + filter_start_time, "Got time %I64d.\n", time);
     time = 0xdeadbeefdeadbeef;
     hr = IAMMultiMediaStream_GetTime(mmstream, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 11111101 + filter_start_time, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 11111101 + filter_start_time, "Got time %I64d.\n", time);
 
     ref = IAMMultiMediaStream_Release(mmstream);
     ok(!ref, "Got outstanding refcount %ld.\n", ref);
@@ -7512,7 +7512,7 @@ static void test_mediastreamfilter_reference_time_to_stream_time(void)
     time = 0xdeadbeefdeadbeef;
     hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time);
     ok(hr == S_FALSE, "Got hr %#lx.\n", hr);
-    ok(time == 0xdeadbeefdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0xdeadbeefdeadbeef, "Got time %I64d.\n", time);
 
     hr = IMediaStreamFilter_SetSyncSource(filter, &clock.IReferenceClock_iface);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -7529,7 +7529,7 @@ static void test_mediastreamfilter_reference_time_to_stream_time(void)
     time = 0xdeadbeefdeadbeef;
     hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0xdeadbeefdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0xdeadbeefdeadbeef, "Got time %I64d.\n", time);
 
     hr = IMediaStreamFilter_Run(filter, 23456789);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -7537,7 +7537,7 @@ static void test_mediastreamfilter_reference_time_to_stream_time(void)
     time = 0xdeadbeefdeadbeef;
     hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0xdeadbeefdd47d2da, "Got time %I64d.\n", time);
 
     clock.time = 34567890;
     clock.get_time_hr = S_OK;
@@ -7545,7 +7545,7 @@ static void test_mediastreamfilter_reference_time_to_stream_time(void)
     time = 0xdeadbeefdeadbeef;
     hr = IMediaStreamFilter_ReferenceTimeToStreamTime(filter, &time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(time == 0xdeadbeefdd47d2da, "Got time %s.\n", wine_dbgstr_longlong(time));
+    ok(time == 0xdeadbeefdd47d2da, "Got time %I64d.\n", time);
 
     ref = IMediaStreamFilter_Release(filter);
     ok(!ref, "Got outstanding refcount %ld.\n", ref);
@@ -7610,8 +7610,8 @@ static void test_mediastreamfilter_wait_until(void)
     ok(!WaitForSingleObject(cookie1.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n");
     ok(WaitForSingleObject(thread1, 100) == WAIT_TIMEOUT, "WaitUntil returned prematurely.\n");
 
-    ok(cookie1.base == 23456789, "Got base %s.\n", wine_dbgstr_longlong(cookie1.base));
-    ok(cookie1.offset == 12345678, "Got offset %s.\n", wine_dbgstr_longlong(cookie1.offset));
+    ok(cookie1.base == 23456789, "Got base %I64d.\n", cookie1.base);
+    ok(cookie1.offset == 12345678, "Got offset %I64d.\n", cookie1.offset);
     ok(!!cookie1.event, "Expected non-NULL event.\n");
 
     SetEvent(cookie1.event);
@@ -7635,8 +7635,8 @@ static void test_mediastreamfilter_wait_until(void)
     ok(!WaitForSingleObject(cookie1.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n");
     ok(WaitForSingleObject(thread1, 100) == WAIT_TIMEOUT, "WaitUntil returned prematurely.\n");
 
-    ok(cookie1.base == 23456789, "Got base %s.\n", wine_dbgstr_longlong(cookie1.base));
-    ok(cookie1.offset == 12345678, "Got offset %s.\n", wine_dbgstr_longlong(cookie1.offset));
+    ok(cookie1.base == 23456789, "Got base %I64d.\n", cookie1.base);
+    ok(cookie1.offset == 12345678, "Got offset %I64d.\n", cookie1.offset);
     ok(!!cookie1.event, "Expected non-NULL event.\n");
 
     clock.advise_time_cookie = &cookie2;
@@ -7648,8 +7648,8 @@ static void test_mediastreamfilter_wait_until(void)
     ok(!WaitForSingleObject(cookie2.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n");
     ok(WaitForSingleObject(thread2, 100) == WAIT_TIMEOUT, "WaitUntil returned prematurely.\n");
 
-    ok(cookie2.base == 11111111, "Got base %s.\n", wine_dbgstr_longlong(cookie2.base));
-    ok(cookie2.offset == 12345678, "Got offset %s.\n", wine_dbgstr_longlong(cookie2.offset));
+    ok(cookie2.base == 11111111, "Got base %I64d.\n", cookie2.base);
+    ok(cookie2.offset == 12345678, "Got offset %I64d.\n", cookie2.offset);
     ok(!!cookie2.event, "Expected non-NULL event.\n");
 
     SetEvent(cookie1.event);
@@ -8713,9 +8713,9 @@ static void test_ddrawstream_qc(void)
     ok(source.qc_notify_quality.Proportion == 0xdeadbeef, "Got proportion %ld.\n",
             source.qc_notify_quality.Proportion);
     ok(source.qc_notify_quality.Late == 0xdeadbeef,
-            "Got late %s.\n", wine_dbgstr_longlong(source.qc_notify_quality.Late));
-    ok(source.qc_notify_quality.TimeStamp == 0xdeadbeef, "Got time stamp %s.\n",
-            wine_dbgstr_longlong(source.qc_notify_quality.TimeStamp));
+            "Got late %I64d.\n", source.qc_notify_quality.Late);
+    ok(source.qc_notify_quality.TimeStamp == 0xdeadbeef, "Got time stamp %I64d.\n",
+            source.qc_notify_quality.TimeStamp);
 
     hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -8762,9 +8762,9 @@ static void test_ddrawstream_qc(void)
     ok(source.qc_notify_quality.Proportion == 0xdeadbeef, "Got proportion %ld.\n",
             source.qc_notify_quality.Proportion);
     ok(source.qc_notify_quality.Late == 0xdeadbeef,
-            "Got late %s.\n", wine_dbgstr_longlong(source.qc_notify_quality.Late));
-    ok(source.qc_notify_quality.TimeStamp == 0xdeadbeef, "Got time stamp %s.\n",
-            wine_dbgstr_longlong(source.qc_notify_quality.TimeStamp));
+            "Got late %I64d.\n", source.qc_notify_quality.Late);
+    ok(source.qc_notify_quality.TimeStamp == 0xdeadbeef, "Got time stamp %I64d.\n",
+            source.qc_notify_quality.TimeStamp);
 
     clock.time = 12345678 - filter_start_time + 11111111 + 200000;
 
@@ -8782,10 +8782,10 @@ static void test_ddrawstream_qc(void)
             source.qc_notify_quality.Type);
     ok(source.qc_notify_quality.Proportion == 1000, "Got proportion %ld.\n",
             source.qc_notify_quality.Proportion);
-    ok(source.qc_notify_quality.Late == 0, "Got late %s.\n",
-            wine_dbgstr_longlong(source.qc_notify_quality.Late));
-    ok(source.qc_notify_quality.TimeStamp == start_time, "Got time stamp %s.\n",
-            wine_dbgstr_longlong(source.qc_notify_quality.TimeStamp));
+    ok(source.qc_notify_quality.Late == 0, "Got late %I64d.\n",
+            source.qc_notify_quality.Late);
+    ok(source.qc_notify_quality.TimeStamp == start_time, "Got time stamp %I64d.\n",
+            source.qc_notify_quality.TimeStamp);
 
     /* Test Update() after Reveive(). */
     source.qc_notify_sender = (IBaseFilter *)0xdeadbeef;
@@ -8815,9 +8815,9 @@ static void test_ddrawstream_qc(void)
     ok(source.qc_notify_quality.Proportion == 0xdeadbeef, "Got proportion %ld.\n",
             source.qc_notify_quality.Proportion);
     ok(source.qc_notify_quality.Late == 0xdeadbeef,
-            "Got late %s.\n", wine_dbgstr_longlong(source.qc_notify_quality.Late));
-    ok(source.qc_notify_quality.TimeStamp == 0xdeadbeef, "Got time stamp %s.\n",
-            wine_dbgstr_longlong(source.qc_notify_quality.TimeStamp));
+            "Got late %I64d.\n", source.qc_notify_quality.Late);
+    ok(source.qc_notify_quality.TimeStamp == 0xdeadbeef, "Got time stamp %I64d.\n",
+            source.qc_notify_quality.TimeStamp);
 
     clock.time = 12345678 - filter_start_time + 11111111 + 500000;
 
@@ -8833,10 +8833,10 @@ static void test_ddrawstream_qc(void)
             source.qc_notify_quality.Type);
     ok(source.qc_notify_quality.Proportion == 1000, "Got proportion %ld.\n",
             source.qc_notify_quality.Proportion);
-    ok(source.qc_notify_quality.Late == 100000, "Got late %s.\n",
-            wine_dbgstr_longlong(source.qc_notify_quality.Late));
-    ok(source.qc_notify_quality.TimeStamp == start_time, "Got time stamp %s.\n",
-            wine_dbgstr_longlong(source.qc_notify_quality.TimeStamp));
+    ok(source.qc_notify_quality.Late == 100000, "Got late %I64d.\n",
+            source.qc_notify_quality.Late);
+    ok(source.qc_notify_quality.TimeStamp == start_time, "Got time stamp %I64d.\n",
+            source.qc_notify_quality.TimeStamp);
 
     hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -10671,8 +10671,8 @@ static void test_ddrawstreamsample_completion_status(void)
     ok(!WaitForSingleObject(cookie.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n");
     ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Receive returned prematurely.\n");
 
-    ok(cookie.base == 11111111 + 10000, "Got base %s.\n", wine_dbgstr_longlong(cookie.base));
-    ok(cookie.offset == 12345678 - filter_start_time, "Got offset %s.\n", wine_dbgstr_longlong(cookie.offset));
+    ok(cookie.base == 11111111 + 10000, "Got base %I64d.\n", cookie.base);
+    ok(cookie.offset == 12345678 - filter_start_time, "Got offset %I64d.\n", cookie.offset);
 
     hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0);
     ok(hr == MS_S_PENDING, "Got hr %#lx.\n", hr);
@@ -10698,8 +10698,8 @@ static void test_ddrawstreamsample_completion_status(void)
     ok(!WaitForSingleObject(cookie.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n");
     ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Receive returned prematurely.\n");
 
-    ok(cookie.base == 11111111 + 20000, "Got base %s.\n", wine_dbgstr_longlong(cookie.base));
-    ok(cookie.offset == 12345678 - filter_start_time, "Got offset %s.\n", wine_dbgstr_longlong(cookie.offset));
+    ok(cookie.base == 11111111 + 20000, "Got base %I64d.\n", cookie.base);
+    ok(cookie.offset == 12345678 - filter_start_time, "Got offset %I64d.\n", cookie.offset);
 
     hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_NOUPDATEOK, 0);
     ok(hr == MS_S_NOUPDATE, "Got hr %#lx.\n", hr);
@@ -10727,8 +10727,8 @@ static void test_ddrawstreamsample_completion_status(void)
     ok(!WaitForSingleObject(cookie.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n");
     ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Receive returned prematurely.\n");
 
-    ok(cookie.base == 11111111 + 30000, "Got base %s.\n", wine_dbgstr_longlong(cookie.base));
-    ok(cookie.offset == 12345678 - filter_start_time, "Got offset %s.\n", wine_dbgstr_longlong(cookie.offset));
+    ok(cookie.base == 11111111 + 30000, "Got base %I64d.\n", cookie.base);
+    ok(cookie.offset == 12345678 - filter_start_time, "Got offset %I64d.\n", cookie.offset);
 
     hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_NOUPDATEOK | COMPSTAT_WAIT, INFINITE);
     ok(hr == MS_S_NOUPDATE, "Got hr %#lx.\n", hr);
@@ -10756,8 +10756,8 @@ static void test_ddrawstreamsample_completion_status(void)
     ok(!WaitForSingleObject(cookie.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n");
     ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Receive returned prematurely.\n");
 
-    ok(cookie.base == 11111111 + 40000, "Got base %s.\n", wine_dbgstr_longlong(cookie.base));
-    ok(cookie.offset == 12345678 - filter_start_time, "Got offset %s.\n", wine_dbgstr_longlong(cookie.offset));
+    ok(cookie.base == 11111111 + 40000, "Got base %I64d.\n", cookie.base);
+    ok(cookie.offset == 12345678 - filter_start_time, "Got offset %I64d.\n", cookie.offset);
 
     hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_ABORT, 0);
     ok(hr == MS_S_NOUPDATE, "Got hr %#lx.\n", hr);
@@ -10784,8 +10784,8 @@ static void test_ddrawstreamsample_completion_status(void)
     ok(!WaitForSingleObject(cookie.advise_time_called_event, 2000), "Expected AdviseTime to be called.\n");
     ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Receive returned prematurely.\n");
 
-    ok(cookie.base == 11111111 + 50000, "Got base %s.\n", wine_dbgstr_longlong(cookie.base));
-    ok(cookie.offset == 12345678 - filter_start_time, "Got offset %s.\n", wine_dbgstr_longlong(cookie.offset));
+    ok(cookie.base == 11111111 + 50000, "Got base %I64d.\n", cookie.base);
+    ok(cookie.offset == 12345678 - filter_start_time, "Got offset %I64d.\n", cookie.offset);
 
     hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -10880,7 +10880,7 @@ static void test_ddrawstreamsample_get_sample_times(void)
     current_time = 0xdeadbeefdeadbeef;
     hr = IDirectDrawStreamSample_GetSampleTimes(stream_sample, NULL, NULL, ¤t_time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current_time == 0, "Got current time %s.\n", wine_dbgstr_longlong(current_time));
+    ok(current_time == 0, "Got current time %I64d.\n", current_time);
 
     hr = IMediaFilter_SetSyncSource(graph_media_filter, &clock.IReferenceClock_iface);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -10888,7 +10888,7 @@ static void test_ddrawstreamsample_get_sample_times(void)
     current_time = 0xdeadbeefdeadbeef;
     hr = IDirectDrawStreamSample_GetSampleTimes(stream_sample, NULL, NULL, ¤t_time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current_time == 0, "Got current time %s.\n", wine_dbgstr_longlong(current_time));
+    ok(current_time == 0, "Got current time %I64d.\n", current_time);
 
     hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -10901,31 +10901,31 @@ static void test_ddrawstreamsample_get_sample_times(void)
     current_time = 0xdeadbeefdeadbeef;
     hr = IDirectDrawStreamSample_GetSampleTimes(stream_sample, NULL, NULL, ¤t_time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current_time == 0xdeadbeefddf15da1 + filter_start_time, "Expected current time %s, got %s.\n",
-            wine_dbgstr_longlong(0xdeadbeefddf15da1 + filter_start_time), wine_dbgstr_longlong(current_time));
+    ok(current_time == 0xdeadbeefddf15da1 + filter_start_time, "Expected current time %I64d, got %I64d.\n",
+            0xdeadbeefddf15da1 + filter_start_time, current_time);
 
     clock.get_time_hr = S_OK;
 
     current_time = 0xdeadbeefdeadbeef;
     hr = IDirectDrawStreamSample_GetSampleTimes(stream_sample, NULL, NULL, ¤t_time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current_time == filter_start_time, "Expected current time %s, got %s.\n",
-            wine_dbgstr_longlong(filter_start_time), wine_dbgstr_longlong(current_time));
+    ok(current_time == filter_start_time, "Expected current time %I64d, got %I64d.\n",
+            filter_start_time, current_time);
 
     clock.time = 23456789;
 
     current_time = 0xdeadbeefdeadbeef;
     hr = IDirectDrawStreamSample_GetSampleTimes(stream_sample, NULL, NULL, ¤t_time);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(current_time == filter_start_time + 11111111, "Expected current time %s, got %s.\n",
-            wine_dbgstr_longlong(filter_start_time + 11111111), wine_dbgstr_longlong(current_time));
+    ok(current_time == filter_start_time + 11111111, "Expected current time %I64d, got %I64d.\n",
+            filter_start_time + 11111111, current_time);
 
     start_time = 0xdeadbeefdeadbeef;
     end_time = 0xdeadbeefdeadbeef;
     hr = IDirectDrawStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start_time == 0, "Got start time %s.\n", wine_dbgstr_longlong(start_time));
-    ok(end_time == 0, "Got end time %s.\n", wine_dbgstr_longlong(end_time));
+    ok(start_time == 0, "Got start time %I64d.\n", start_time);
+    ok(end_time == 0, "Got end time %I64d.\n", end_time);
 
     hr = IDirectDrawStreamSample_Update(stream_sample, SSUPDATE_ASYNC, NULL, NULL, 0);
     ok(hr == MS_S_PENDING, "Got hr %#lx.\n", hr);
@@ -10943,8 +10943,8 @@ static void test_ddrawstreamsample_get_sample_times(void)
     end_time = 0xdeadbeefdeadbeef;
     hr = IDirectDrawStreamSample_GetSampleTimes(stream_sample, &start_time, &end_time, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-    ok(start_time == 12345678, "Got start time %s.\n", wine_dbgstr_longlong(start_time));
-    ok(end_time == 23456789, "Got end time %s.\n", wine_dbgstr_longlong(end_time));
+    ok(start_time == 12345678, "Got start time %I64d.\n", start_time);
+    ok(end_time == 23456789, "Got end time %I64d.\n", end_time);
 
     hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/11021

[PATCH 7/7] amstream: Use %I64.

[Elizabeth Figura]

From: Elizabeth Figura <[e-mail]>

---
 dlls/amstream/audiostream.c |  3 +--
 dlls/amstream/ddrawstream.c |  3 +--
 dlls/amstream/filter.c      | 13 ++++++-------
 dlls/amstream/multimedia.c  |  6 +++---
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c
index 8e1c96b4b5e..29f52d1b6c1 100644
--- a/dlls/amstream/audiostream.c
+++ b/dlls/amstream/audiostream.c
@@ -1210,8 +1210,7 @@ static HRESULT WINAPI audio_sink_NewSegment(IPin *iface, REFERENCE_TIME start, R
 {
     struct audio_stream *stream = impl_from_IPin(iface);
 
-    TRACE("stream %p, start %s, stop %s, rate %0.16e\n",
-            stream, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop), rate);
+    TRACE("stream %p, start %I64d, stop %I64d, rate %0.16e.\n", stream, start, stop, rate);
 
     EnterCriticalSection(&stream->cs);
 
diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index 55ab7ab25d4..fc4eba59470 100644
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -1456,8 +1456,7 @@ static HRESULT WINAPI ddraw_sink_NewSegment(IPin *iface, REFERENCE_TIME start, R
 {
     struct ddraw_stream *stream = impl_from_IPin(iface);
 
-    TRACE("stream %p, start %s, stop %s, rate %0.16e\n",
-            stream, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop), rate);
+    TRACE("stream %p, start %I64d, stop %I64d, rate %0.16e.\n", stream, start, stop, rate);
 
     EnterCriticalSection(&stream->cs);
 
diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c
index 8a7e4fc372c..ae03cdee76d 100644
--- a/dlls/amstream/filter.c
+++ b/dlls/amstream/filter.c
@@ -345,7 +345,7 @@ static HRESULT WINAPI filter_Run(IMediaStreamFilter *iface, REFERENCE_TIME start
 {
     struct filter *filter = impl_from_IMediaStreamFilter(iface);
 
-    TRACE("iface %p, start %s.\n", iface, wine_dbgstr_longlong(start));
+    TRACE("iface %p, start %I64d.\n", iface, start);
 
     EnterCriticalSection(&filter->cs);
 
@@ -728,7 +728,7 @@ static HRESULT WINAPI filter_WaitUntil(IMediaStreamFilter *iface, REFERENCE_TIME
     struct list *entry;
     HRESULT hr;
 
-    TRACE("filter %p, time %s.\n", iface, wine_dbgstr_longlong(time));
+    TRACE("filter %p, time %I64d.\n", iface, time);
 
     EnterCriticalSection(&filter->cs);
 
@@ -993,8 +993,8 @@ static HRESULT WINAPI filter_seeking_GetCurrentPosition(IMediaSeeking *iface, LO
 static HRESULT WINAPI filter_seeking_ConvertTimeFormat(IMediaSeeking *iface, LONGLONG *target,
         const GUID *target_format, LONGLONG source, const GUID *source_format)
 {
-    FIXME("iface %p, target %p, target_format %s, source 0x%s, source_format %s, stub!\n", iface, target, debugstr_guid(target_format),
-            wine_dbgstr_longlong(source), debugstr_guid(source_format));
+    FIXME("iface %p, target %p, target_format %s, source %#I64x, source_format %s, stub!\n",
+            iface, target, debugstr_guid(target_format), source, debugstr_guid(source_format));
 
     return E_NOTIMPL;
 }
@@ -1006,9 +1006,8 @@ static HRESULT WINAPI filter_seeking_SetPositions(IMediaSeeking *iface, LONGLONG
     IMediaSeeking *seeking;
     HRESULT hr;
 
-    TRACE("iface %p, current %s, current_flags %#lx, stop %s, stop_flags %#lx.\n", iface,
-            current_ptr ? wine_dbgstr_longlong(*current_ptr) : "<null>", current_flags,
-            stop_ptr ? wine_dbgstr_longlong(*stop_ptr): "<null>", stop_flags);
+    TRACE("iface %p, current %p, current_flags %#lx, stop %p, stop_flags %#lx.\n",
+            iface, current_ptr, current_flags, stop_ptr, stop_flags);
 
     EnterCriticalSection(&filter->cs);
 
diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c
index dc855901c77..29203f0697a 100644
--- a/dlls/amstream/multimedia.c
+++ b/dlls/amstream/multimedia.c
@@ -200,11 +200,11 @@ static HRESULT WINAPI multimedia_stream_GetDuration(IAMMultiMediaStream *iface,
 
 static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_TIME seek_time)
 {
-    struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface);
+    struct multimedia_stream *mmstream = impl_from_IAMMultiMediaStream(iface);
 
-    TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(seek_time));
+    TRACE("mmstream %p, seek_time %I64d.\n", mmstream, seek_time);
 
-    return IMediaSeeking_SetPositions(This->media_seeking, &seek_time, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning);
+    return IMediaSeeking_SetPositions(mmstream->media_seeking, &seek_time, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning);
 }
 
 static HRESULT WINAPI multimedia_stream_GetEndOfStream(IAMMultiMediaStream *iface, HANDLE *eos)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/11021