Zebediah Figura : quartz/tests: Fix some test failures related to thread timing.
Alexandre Julliard
julliard at winehq.org
Mon May 17 15:45:33 CDT 2021
Module: wine
Branch: master
Commit: 9172ca5baa27b0c929b14a49f60333613cc30c65
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9172ca5baa27b0c929b14a49f60333613cc30c65
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon May 17 10:49:13 2021 -0500
quartz/tests: Fix some test failures related to thread timing.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/tests/videorenderer.c | 8 +++++---
dlls/quartz/tests/vmr9.c | 5 +++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index 797ea7acc7c..22cc703a539 100644
--- 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);
}
diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c
index 1697a321915..c7a84d65b7b 100644
--- 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,
More information about the wine-cvs
mailing list