[PATCH 0/1] MR9239: winex11: Give colormap ownership to the surface after it's allocated.

[Rémi Bernon]

Should fix some remaining `XFreeColormap` X errors.

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

[PATCH 1/1] winex11: Give colormap ownership to the surface after it's allocated.

[Rémi Bernon]

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

---
 dlls/winex11.drv/init.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 1211cbabaa7..e7a56252e4e 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -446,9 +446,10 @@ Window x11drv_client_surface_create( HWND hwnd, int format, struct client_surfac
     if (!colormap) return None;
 
     if (!(surface = client_surface_create( sizeof(*surface), &x11drv_client_surface_funcs, hwnd ))) goto failed;
+    surface->colormap = colormap;
+
     if (!(surface->window = create_client_window( hwnd, &visual, colormap ))) goto failed;
     if (!NtUserGetClientRect( hwnd, &surface->rect, NtUserGetDpiForWindow( hwnd ) )) goto failed;
-    surface->colormap = colormap;
 
     TRACE( "Created %s for client window %lx\n", debugstr_client_surface( &surface->client ), surface->window );
     *client = &surface->client;
@@ -456,7 +457,7 @@ Window x11drv_client_surface_create( HWND hwnd, int format, struct client_surfac
 
 failed:
     if (surface) client_surface_release( &surface->client );
-    if (colormap != default_colormap) XFreeColormap( gdi_display, colormap );
+    else if (colormap != default_colormap) XFreeColormap( gdi_display, colormap );
     return None;
 }
 
-- 
GitLab

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