Rémi Bernon : win32u: Get rid of the unnecessary offscreen window surface struct.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6f047d8c85a910b18be8967b89d8faacac4b453b
URL:    https://gitlab.winehq.org/wine/wine/-/commit/6f047d8c85a910b18be8967b89d8faa...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Wed Jun 12 12:16:53 2024 +0200

win32u: Get rid of the unnecessary offscreen window surface struct.

---

 dlls/win32u/dce.c | 51 +++++++++++++++------------------------------------
 1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c
index 4f86e6fb01d..91bcb02a6a8 100644
--- a/dlls/win32u/dce.c
+++ b/dlls/win32u/dce.c
@@ -92,34 +92,19 @@ struct window_surface dummy_surface =
  * Off-screen window surface.
  */
 
-struct offscreen_window_surface
-{
-    struct window_surface header;
-    BITMAPINFO info;
-};
-
-static const struct window_surface_funcs offscreen_window_surface_funcs;
-
-static struct offscreen_window_surface *impl_from_window_surface( struct window_surface *base )
-{
-    if (!base || base->funcs != &offscreen_window_surface_funcs) return NULL;
-    return CONTAINING_RECORD( base, struct offscreen_window_surface, header );
-}
-
-static void offscreen_window_surface_set_clip( struct window_surface *base, const RECT *rects, UINT count )
+static void offscreen_window_surface_set_clip( struct window_surface *surface, const RECT *rects, UINT count )
 {
 }
 
-static BOOL offscreen_window_surface_flush( struct window_surface *base, const RECT *rect, const RECT *dirty,
+static BOOL offscreen_window_surface_flush( struct window_surface *surface, const RECT *rect, const RECT *dirty,
                                             const BITMAPINFO *color_info, const void *color_bits )
 {
     return TRUE;
 }
 
-static void offscreen_window_surface_destroy( struct window_surface *base )
+static void offscreen_window_surface_destroy( struct window_surface *surface )
 {
-    struct offscreen_window_surface *impl = impl_from_window_surface( base );
-    free( impl );
+    free( surface );
 }
 
 static const struct window_surface_funcs offscreen_window_surface_funcs =
@@ -129,22 +114,19 @@ static const struct window_surface_funcs offscreen_window_surface_funcs =
     offscreen_window_surface_destroy
 };
 
-void create_offscreen_window_surface( HWND hwnd, const RECT *surface_rect, struct window_surface **surface )
+void create_offscreen_window_surface( HWND hwnd, const RECT *surface_rect, struct window_surface **window_surface )
 {
     char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
     BITMAPINFO *info = (BITMAPINFO *)buffer;
-    struct offscreen_window_surface *impl;
+    struct window_surface *surface, *previous;
 
-    TRACE( "hwnd %p, surface_rect %s, surface %p.\n", hwnd, wine_dbgstr_rect( surface_rect ), surface );
+    TRACE( "hwnd %p, surface_rect %s, window_surface %p.\n", hwnd, wine_dbgstr_rect( surface_rect ), window_surface );
 
     /* check that old surface is an offscreen_window_surface, or release it */
-    if ((impl = impl_from_window_surface( *surface )))
-    {
-        /* if the rect didn't change, keep the same surface */
-        if (EqualRect( surface_rect, &impl->header.rect )) return;
-        window_surface_release( &impl->header );
-    }
-    else if (*surface) window_surface_release( *surface );
+    if ((previous = *window_surface) && previous->funcs == &offscreen_window_surface_funcs &&
+        EqualRect( surface_rect, &previous->rect )) return;
+    if (previous) window_surface_release( previous );
+    *window_surface = NULL;
 
     memset( info, 0, sizeof(*info) );
     info->bmiHeader.biSize        = sizeof(info->bmiHeader);
@@ -156,14 +138,11 @@ void create_offscreen_window_surface( HWND hwnd, const RECT *surface_rect, struc
     info->bmiHeader.biCompression = BI_RGB;
 
     /* create a new window surface */
-    *surface = NULL;
-    if (!(impl = calloc(1, sizeof(*impl)))) return;
-    window_surface_init( &impl->header, &offscreen_window_surface_funcs, hwnd, surface_rect, info, 0 );
-    impl->info = *info;
-
-    TRACE( "created window surface %p\n", &impl->header );
+    if (!(surface = calloc(1, sizeof(*surface)))) return;
+    window_surface_init( surface, &offscreen_window_surface_funcs, hwnd, surface_rect, info, 0 );
 
-    *surface = &impl->header;
+    TRACE( "created window surface %p\n", surface );
+    *window_surface = surface;
 }
 
 /* window surface common helpers */