[PATCH v4 1/2] strmbase: Detach the window from the parent before destroying it.
From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> This fixes a regression introduced by 3b5198c8283d891095612c1001edb5e5788d6059. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Resent with minor changes in style and wording. dlls/strmbase/window.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 07a12eca26..71bbf73ccc 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -136,9 +136,15 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) { + BaseControlWindow *window = impl_from_BaseWindow(This); + if (!This->hWnd) return S_OK; + /* Media Player Classic deadlocks if WM_PARENTNOTIFY is sent, so unparent + * the window first. */ + IVideoWindow_put_Owner(&window->IVideoWindow_iface, (OAHWND)NULL); + SendMessageW(This->hWnd, WM_CLOSE, 0, 0); This->hWnd = NULL; -- 2.25.0
From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I've adjusted the test to ensure that no messages at all are sent, which seems to be the more salient constraint. dlls/quartz/tests/filtergraph.c | 37 ++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index ca4503117a..be1d61aae3 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4232,16 +4232,36 @@ static HWND get_renderer_hwnd(IFilterGraph2 *graph) return hwnd; } +static BOOL expect_parent_message = TRUE; + +static LRESULT CALLBACK parent_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + ok(expect_parent_message, "Got unexpected message %#x.\n", msg); + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + static void test_window_threading(void) { + static const WNDCLASSA class = + { + .lpfnWndProc = parent_proc, + .lpszClassName = "quartz_test_parent", + }; WCHAR *filename = load_resource(avifile); IFilterGraph2 *graph = create_graph(); + IVideoWindow *window; + HWND hwnd, parent; HRESULT hr; DWORD tid; ULONG ref; - HWND hwnd; BOOL ret; + RegisterClassA(&class); + + parent = CreateWindowA("quartz_test_parent", NULL, WS_OVERLAPPEDWINDOW, + 50, 50, 150, 150, NULL, NULL, NULL, NULL); + ok(!!parent, "Failed to create parent window.\n"); + hr = IFilterGraph2_RenderFile(graph, filename, NULL); if (FAILED(hr)) { @@ -4259,12 +4279,24 @@ static void test_window_threading(void) /* The thread should be processing messages, or this will hang. */ SendMessageA(hwnd, WM_NULL, 0, 0); + + /* Media Player Classic deadlocks if the parent is sent any messages + * while the video window is released. In particular, we must not send + * WM_PARENTNOTIFY. This is not achieved through window styles. */ + hr = IFilterGraph2_QueryInterface(graph, &IID_IVideoWindow, (void **)&window); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IVideoWindow_put_Owner(window, (OAHWND)parent); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IVideoWindow_Release(window); + ok(!(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_NOPARENTNOTIFY), "Window has WS_EX_NOPARENTNOTIFY.\n"); } else skip("Could not find renderer window.\n"); + expect_parent_message = FALSE; ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); + expect_parent_message = TRUE; hr = CoCreateInstance(&CLSID_FilterGraphNoThread, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); @@ -4283,6 +4315,9 @@ static void test_window_threading(void) ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); + + DestroyWindow(parent); + UnregisterClassA("quartz_test_parent", GetModuleHandleA(NULL)); ret = DeleteFileW(filename); ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } -- 2.25.0
participants (1)
-
Zebediah Figura