From: "Rémi Bernon" Subject: [PATCH v5 2/2] server: Do not detach windows if they belong to another thread. Message-Id: <20191113103100.6924-2-rbernon@codeweavers.com> Date: Wed, 13 Nov 2019 11:31:00 +0100 In-Reply-To: <20191113103100.6924-1-rbernon@codeweavers.com> References: <20191113103100.6924-1-rbernon@codeweavers.com> On thread destroy, a WM_WINE_DESTROYWINDOW is sent for the child windows living in other threads. However there's then a race condition between these threads peeking for messages and the current thread detaching its child windows from their threads -which clears their message queues. Signed-off-by: Rémi Bernon --- dlls/user32/tests/msg.c | 3 +-- server/window.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 43a6372aa8d..885d477f5e9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8603,7 +8603,6 @@ static DWORD CALLBACK create_grand_child_thread( void *param ) ok( !ret, "WaitForSingleObject returned %x, error: %u\n", ret, GetLastError() ); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - todo_wine ok( !IsWindow( hchild ), "Child window not destroyed\n" ); return 0; @@ -8798,7 +8797,7 @@ static void test_interthread_messages(void) CloseHandle( wnd_event.start_event ); CloseHandle( wnd_event.stop_event ); flush_events(); - ok_sequence(WmExitThreadSeq, "destroy child on thread exit", TRUE); + ok_sequence(WmExitThreadSeq, "destroy child on thread exit", FALSE); log_all_parent_messages--; DestroyWindow( wnd_event.hwnd ); diff --git a/server/window.c b/server/window.c index c9b131cba5d..3985ea4eb20 100644 --- a/server/window.c +++ b/server/window.c @@ -1914,7 +1914,7 @@ void destroy_window( struct window *win ) post_message( win->parent->handle, WM_PARENTNOTIFY, WM_DESTROY, win->handle ); } - detach_window_thread( win ); + if (win->thread == current) detach_window_thread( win ); if (win->win_region) free_region( win->win_region ); if (win->update_region) free_region( win->update_region ); if (win->class) release_class( win->class ); -- 2.24.0.rc2