Alexandros Frantzis : winewayland.drv: Avoid deadlock when determining whether a window is managed.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a71ec54df817ee721fd1026832d968ce234ced9d
URL:    https://gitlab.winehq.org/wine/wine/-/commit/a71ec54df817ee721fd1026832d968c...

Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com>
Date:   Mon Dec 11 08:55:07 2023 +0200

winewayland.drv: Avoid deadlock when determining whether a window is managed.

The is_window_managed function may acquire the (non-recursive) win_data lock
internally (is_window_managed->has_owned_popups->is_managed), so do not call
it with the win_data lock held.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55995

---

 dlls/winewayland.drv/window.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c
index 4775b64fa76..bb7f6ad6707 100644
--- a/dlls/winewayland.drv/window.c
+++ b/dlls/winewayland.drv/window.c
@@ -463,17 +463,23 @@ void WAYLAND_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags,
                               const RECT *visible_rect, const RECT *valid_rects,
                               struct window_surface *surface)
 {
-    struct wayland_win_data *data = wayland_win_data_get(hwnd);
+    struct wayland_win_data *data;
+    BOOL managed;
 
     TRACE("hwnd %p window %s client %s visible %s after %p flags %08x\n",
           hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect),
           wine_dbgstr_rect(visible_rect), insert_after, swp_flags);
 
-    if (!data) return;
+    /* Get the managed state with win_data unlocked, as is_window_managed
+     * may need to query win_data information about other HWNDs and thus
+     * acquire the lock itself internally. */
+    managed = is_window_managed(hwnd, swp_flags, window_rect);
+
+    if (!(data = wayland_win_data_get(hwnd))) return;
 
     data->window_rect = *window_rect;
     data->client_rect = *client_rect;
-    data->managed = is_window_managed(hwnd, swp_flags, window_rect);
+    data->managed = managed;
 
     if (surface) window_surface_add_ref(surface);
     if (data->window_surface) window_surface_release(data->window_surface);