Alexandre Julliard : winex11: Make sure the cursor bitmaps are owned by x11drv.

Alexandre Julliard julliard at winehq.org
Wed Sep 14 12:25:39 CDT 2011


Module: wine
Branch: master
Commit: dc1056284fa1fc4c50c707987761c05834747e3a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dc1056284fa1fc4c50c707987761c05834747e3a

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Sep 14 14:53:59 2011 +0200

winex11: Make sure the cursor bitmaps are owned by x11drv.

---

 dlls/winex11.drv/mouse.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index d70f152..0ba57d1 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -1081,6 +1081,11 @@ static Cursor create_xlib_cursor( HDC hdc, const ICONINFOEXW *icon, int width, i
 
     if (has_alpha)
     {
+        /* make sure the bitmaps are owned by x11drv */
+        HBITMAP orig = SelectObject( hdc, icon->hbmMask );
+        SelectObject( hdc, xor_bitmap );
+        SelectObject( hdc, orig );
+
         memset( mask_bits, 0, width_bytes * height );
         for (y = 0, ptr = color_bits; y < height; y++)
             for (x = 0; x < width; x++, ptr++)




More information about the wine-cvs mailing list