From: Elizabeth Figura <zfigura@codeweavers.com> --- 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