commit e9307d09a65c36a76835bd41b3ef2823a9df2bd4
author Alexandre Julliard <julliard@winehq.org> Thu Feb 21 20:23:32 2008 +0100
committer Alexandre Julliard <julliard@winehq.org> Thu Feb 21 20:23:32 2008 +0100
tree e9b490c699ede8d42e8bf1670ef6cb59e2ba981f
parent b5511ac6bfb1613aabc6e9b11a1272117783ce52

winex11: Keep track of the window colormap and free it on destroy.

dlls/winex11.drv/window.c

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 2fc8660..2d93104 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -360,12 +360,13 @@
     {
         XSetWindowAttributes attrib;
 
+        data->colormap = XCreateColormap(display, parent, vis->visual,
+                                         (vis->class == PseudoColor ||
+                                          vis->class == GrayScale ||
+                                          vis->class == DirectColor) ?
+                                         AllocAll : AllocNone);
         attrib.override_redirect = True;
-        attrib.colormap = XCreateColormap(display, parent, vis->visual,
-                                          (vis->class == PseudoColor ||
-                                           vis->class == GrayScale ||
-                                           vis->class == DirectColor) ?
-                                          AllocAll : AllocNone);
+        attrib.colormap = data->colormap;
         XInstallColormap(gdi_display, attrib.colormap);
 
         data->gl_drawable = XCreateWindow(display, parent, -w, 0, w, h, 0,
@@ -1294,6 +1295,13 @@
     destroy_whole_window( display, data );
     destroy_icon_window( display, data );
 
+    if (data->colormap)
+    {
+        wine_tsx11_lock();
+        XFreeColormap( display, data->colormap );
+        wine_tsx11_unlock();
+    }
+
     if (thread_data->last_focus == hwnd) thread_data->last_focus = 0;
     if (data->hWMIconBitmap) DeleteObject( data->hWMIconBitmap );
     if (data->hWMIconMask) DeleteObject( data->hWMIconMask);