Alexandre Julliard : gdi32: Don' t set the bitmap owner when selecting a pattern brush.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Mon Nov  7 22:21:37 2011 +0100

gdi32: Don't set the bitmap owner when selecting a pattern brush.

---

dlls/gdi32/bitmap.c      |    2 +-
 dlls/gdi32/brush.c       |   10 ----------
 dlls/gdi32/gdi_private.h |    4 +---
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c
index 282e22b..45c3011 100644
--- a/dlls/gdi32/bitmap.c
+++ b/dlls/gdi32/bitmap.c
@@ -530,7 +530,7 @@ static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp )
  * bitmap is selected into a device to initialize the bitmap function
  * table.
  */
-BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev )
+static BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev )
 {
     BITMAPOBJ *bitmap;
     BOOL ret = TRUE;
diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c
index 579e9fd..a360a1d 100644
--- a/dlls/gdi32/brush.c
+++ b/dlls/gdi32/brush.c
@@ -488,16 +488,6 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc )
             if (bmp && bmp->funcs != physdev->funcs) store_bitmap_bits( brush, bmp );
             GDI_ReleaseObj( bitmap );
         }
-        if (brush->logbrush.lbStyle == BS_PATTERN)
-        {
-            PHYSDEV pattern_dev = physdev;
-            /* FIXME: This will go away once the dib driver implements
-               pattern brushes */
-            if(pattern_dev == dc->dibdrv)
-                pattern_dev = GET_NEXT_PHYSDEV( physdev, pSelectBrush );
-
-            BITMAP_SetOwnerDC( bitmap, pattern_dev );
-        }

info   = brush->info;
         bits   = brush->bits.ptr;
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 3b3022a..c23a5cc 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -228,9 +228,7 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src
                            BITMAPINFO *dst_info, struct bitblt_coords *dst,
                            struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN;

-/* bitmap.c */
-extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN;
-
+/* brush.c */
 extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN;

/* clipping.c */