[PATCH v2 1/5] quartz/tests: Bail out if connecting returns E_FAIL.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47911 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 928484ccb6a..fa63b5b85cc 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -941,7 +941,7 @@ static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) { - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED || hr == E_FAIL, "Got hr %#x.\n", hr); IPin_Release(peer); iface->pin.peer = NULL; FreeMediaType(&iface->pin.mtCurrent); @@ -1016,6 +1016,11 @@ static void test_connect_pin(void) vih.bmiHeader.biBitCount = bpp_tests[j]; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + if (hr == E_FAIL) + { + skip("Got E_FAIL when connecting.\n"); + goto out; + } ok(hr == S_OK, "Got hr %#x for subtype %s and bpp %u.\n", hr, wine_dbgstr_guid(subtype_tests[i]), bpp_tests[j]); @@ -1087,6 +1092,7 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(pin, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); +out: IPin_Release(pin); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); -- 2.23.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Avoids test failures like <http://test.winehq.org/data/89d9bcb1f19a03ffafa9a93a5f32049b4bfdaa00/win10_newtb-w1064v1809-hi-32/quartz:videorenderer.html> dlls/quartz/tests/videorenderer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 69bbc57949d..b7b1cb405e8 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1881,7 +1881,7 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our for (i = 0; i < ARRAY_SIZE(drain_tests); ++i) { SendMessageA(hwnd, drain_tests[i], 0xdeadbeef, 0); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = PeekMessageA(&msg, 0, drain_tests[i], drain_tests[i], PM_REMOVE); ok(ret, "Expected a message.\n"); ok(msg.hwnd == our_hwnd, "Got hwnd %p.\n", msg.hwnd); ok(msg.message == drain_tests[i], "Got message %#x.\n", msg.message); @@ -1889,7 +1889,7 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our ok(!msg.lParam, "Got lparam %#lx.\n", msg.lParam); DispatchMessageA(&msg); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = PeekMessageA(&msg, 0, drain_tests[i], drain_tests[i], PM_REMOVE); ok(!ret, "Got unexpected message %#x.\n", msg.message); } -- 2.23.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Avoids test failures like <http://test.winehq.org/data/65fba0987310e635f27468a5b4a448794b5871e5/xp_acer-aspire-one-xp/quartz:filtergraph.html>. dlls/quartz/tests/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f925db8a39b..ef6bfd01751 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -778,7 +778,7 @@ static void test_render_with_multithread(void) thread = CreateThread(NULL, 0, call_RenderFile_multithread, graph, 0, NULL); - ok(WaitForSingleObject(thread, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ok(!WaitForSingleObject(thread, 10000), "Wait timed out.\n"); IFilterGraph2_Release(graph); CloseHandle(thread); CoUninitialize(); -- 2.23.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=57711 Your paranoid android. === w8 (32 bit report) === quartz: filtergraph.c:527: Test failed: didn't get EOS filtergraph.c:532: Test failed: expected 2ccdba, got 0 === w8adm (32 bit report) === quartz: filtergraph.c:527: Test failed: didn't get EOS filtergraph.c:532: Test failed: expected 2ccdba, got 0 === w864 (32 bit report) === quartz: filtergraph.c:527: Test failed: didn't get EOS filtergraph.c:532: Test failed: expected 2ccdba, got 0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- In an attempt to fix failures like <http://test.winehq.org/data/15bf3eee2cf05ce98011458fc5e715f4524c4ebd/win7_fg-win7u64-1spie9-de/quartz:filtergraph.html>. dlls/quartz/tests/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index ef6bfd01751..f22c863f743 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -512,7 +512,7 @@ static void test_media_event(IFilterGraph2 *graph) while (!got_eos) { - if (WaitForSingleObject(event, 1000) == WAIT_TIMEOUT) + if (WaitForSingleObject(event, 2000) == WAIT_TIMEOUT) break; while ((hr = IMediaEvent_GetEvent(media_event, &code, &lparam1, &lparam2, 0)) == S_OK) -- 2.23.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=57712 Your paranoid android. === debian10 (32 bit WoW report) === quartz: filtergraph: Timeout
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes hangs like <http://test.winehq.org/data/71e96bd3b757a2b058b6a769c341d81f82329d79/linux_cw-gtx560-t32/quartz:filtergraph.html>. dlls/quartz/filtergraph.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0808ec9d6c8..47ce5af59d1 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -990,6 +990,10 @@ static DWORD WINAPI message_thread_run(void *ctx) IFilterGraphImpl *graph = ctx; MSG msg; + /* Make sure we have a message queue. */ + PeekMessageW(&msg, NULL, 0, 0, PM_NOREMOVE); + SetEvent(graph->message_thread_ret); + CoInitializeEx(NULL, COINIT_MULTITHREADED); for (;;) @@ -5728,8 +5732,9 @@ static HRESULT filter_graph_common_create(IUnknown *outer, void **out, BOOL thre if (threaded) { - fimpl->message_thread = CreateThread(NULL, 0, message_thread_run, fimpl, 0, &fimpl->message_thread_id); fimpl->message_thread_ret = CreateEventW(NULL, FALSE, FALSE, NULL); + fimpl->message_thread = CreateThread(NULL, 0, message_thread_run, fimpl, 0, &fimpl->message_thread_id); + WaitForSingleObject(fimpl->message_thread_ret, INFINITE); } else fimpl->message_thread = NULL; -- 2.23.0
participants (2)
-
Marvin -
Zebediah Figura