quartz/tests: Fix some test failures related to thread timing.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

quartz/tests: Fix some test failures related to thread timing.
9172ca5b · Zebediah Figura · Alexandre Julliard · 44472fae · 9172ca5b · 9172ca5b
Commit 9172ca5b authored May 17, 2021 by Zebediah Figura Committed by Alexandre Julliard May 17, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

videorenderer.c dlls/quartz/tests/videorenderer.c +5 -3

vmr9.c dlls/quartz/tests/vmr9.c +3 -2

No files found.
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -971,7 +971,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control
    thread = send_frame(input);
    ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n");
-    hr = IMediaControl_GetState(control, 0, &state);
+    hr = IMediaControl_GetState(control, 1000, &state);
    ok(hr == S_OK, "Got hr %#x.\n", hr);
    hr = IPin_BeginFlush(pin);
@@ -1083,7 +1083,8 @@ static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input
    hr = IPin_BeginFlush(pin);
    ok(hr == S_OK, "Got hr %#x.\n", hr);
    hr = join_thread(thread);
-    ok(hr == S_OK, "Got hr %#x.\n", hr);
+    /* If the frame makes it to Receive() in time to be rendered, we get S_OK. */
+    ok(hr == S_OK || hr == E_FAIL, "Got hr %#x.\n", hr);
    hr = IPin_EndFlush(pin);
    ok(hr == S_OK, "Got hr %#x.\n", hr);
@@ -1093,7 +1094,8 @@ static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input
    hr = IMediaControl_Stop(control);
    ok(hr == S_OK, "Got hr %#x.\n", hr);
    hr = join_thread(thread);
-    ok(hr == S_OK, "Got hr %#x.\n", hr);
+    /* If the frame makes it to Receive() in time to be rendered, we get S_OK. */
+    ok(hr == S_OK || hr == E_FAIL, "Got hr %#x.\n", hr);
    IMediaSeeking_Release(seeking);
 }

--- a/dlls/quartz/tests/vmr9.c
+++ b/dlls/quartz/tests/vmr9.c
@@ -1199,7 +1199,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control
    thread = send_frame(input);
    ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n");
-    hr = IMediaControl_GetState(control, 0, &state);
+    hr = IMediaControl_GetState(control, 1000, &state);
    ok(hr == S_OK, "Got hr %#x.\n", hr);
    hr = IPin_BeginFlush(pin);
@@ -1453,7 +1453,8 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IMediaControl *cont
    hr = IMediaControl_Stop(control);
    ok(hr == S_OK, "Got hr %#x.\n", hr);
    hr = join_thread(thread);
-    ok(hr == S_OK, "Got hr %#x.\n", hr);
+    /* If the frame makes it to Receive() in time to be rendered, we get S_OK. */
+    ok(hr == S_OK || hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr);
 }
 static void test_current_image(IBaseFilter *filter, IMemInputPin *input,