[PATCH 0/1] MR6234: win32u: Always use the dummy surface if a surface isn't needed.

[Rémi Bernon]

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

We don't need a surface when the drawing rect is empty, and it can even FPE if we use one. Release any previously created surface in this case and use the dummy surface.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6234

[PATCH 1/1] win32u: Always use the dummy surface if a surface isn't needed.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57033
---
 dlls/win32u/window.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 11336b01309..61fc9830378 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -1870,13 +1870,17 @@ static struct window_surface *create_window_surface( HWND hwnd, UINT swp_flags,
         window_surface_add_ref( new_surface );
     }
 
-    if (create_layered || is_layered) needs_surface = TRUE;
-    if (!needs_surface || IsRectEmpty( visible_rect )) needs_surface = FALSE; /* use default surface */
-    else needs_surface = !user_driver->pCreateWindowSurface( hwnd, create_layered, surface_rect, &new_surface );
+    if (IsRectEmpty( surface_rect )) needs_surface = FALSE;
+    else if (create_layered || is_layered) needs_surface = TRUE;
 
-    /* create or update window surface for top-level windows if the driver doesn't implement CreateWindowSurface */
-    if (needs_surface && new_surface == &dummy_surface && (create_opaque && !create_layered))
+    if (!needs_surface && new_surface && new_surface != &dummy_surface)
     {
+        window_surface_release( new_surface );
+        window_surface_add_ref( (new_surface = &dummy_surface) );
+    }
+    else if (needs_surface && !user_driver->pCreateWindowSurface( hwnd, create_layered, surface_rect, &new_surface ))
+    {
+        /* create or update window surface for top-level windows if the driver doesn't implement CreateWindowSurface */
         window_surface_release( new_surface );
         create_offscreen_window_surface( hwnd, surface_rect, &new_surface );
     }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6234