Rémi Bernon : wineandroid: Hold the lock while reading window surface bits.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b44730a39e78d692c15624ea45d8c0a41466c7cc
URL:    https://gitlab.winehq.org/wine/wine/-/commit/b44730a39e78d692c15624ea45d8c0a...

Author: Rémi Bernon 
Date:   Wed May 29 16:20:52 2024 +0200

wineandroid: Hold the lock while reading window surface bits.

To avoid hiding the change in the next commit.

---

dlls/wineandroid.drv/window.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c
index 8314876f1c4..d1c93b5ceff 100644
--- a/dlls/wineandroid.drv/window.c
+++ b/dlls/wineandroid.drv/window.c
@@ -695,8 +695,12 @@ static void android_surface_flush( struct window_surface *window_surface )
              surface->header.rect.bottom - surface->header.rect.top );
     needs_flush = intersect_rect( &rect, &rect, &window_surface->bounds );
     reset_bounds( &window_surface->bounds );
-    window_surface_unlock( window_surface );
-    if (!needs_flush) return;
+
+    if (!needs_flush)
+    {
+        window_surface_unlock( window_surface );
+        return;
+    }

TRACE( "flushing %p hwnd %p surface %s rect %s bits %p alpha %02x key %08x region %u rects\n",
            surface, surface->hwnd, wine_dbgstr_rect( &surface->header.rect ),
@@ -760,6 +764,8 @@ static void android_surface_flush( struct window_surface *window_surface )
     }
     else TRACE( "Unable to lock surface %p window %p buffer %p\n",
                 surface, surface->hwnd, surface->window );
+
+    window_surface_unlock( window_surface );
 }

/***********************************************************************