From 55f24da978c8ad6553a7b8fa874a60648dc61e44 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 27 Oct 2014 14:55:48 +0900
Subject: [PATCH] gdi32: Check the hatch masks instead of the rop masks for the
 null and mask optimization case.

---
 dlls/gdi32/dibdrv/objects.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c
index 1f05ab050a9..bc8b60d5604 100644
--- a/dlls/gdi32/dibdrv/objects.c
+++ b/dlls/gdi32/dibdrv/objects.c
@@ -1815,6 +1815,8 @@ static BOOL create_pattern_brush_bits( dib_brush *brush )
         size -= 4;
     }
 
+    if (!rop_needs_and_mask( brush->rop )) brush->masks.and = NULL;  /* ignore the and mask */
+
     return TRUE;
 }
 
@@ -1861,6 +1863,9 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL
 
     brush->dib.funcs->create_rop_masks( &brush->dib, hatches[brush->hatch],
                                         &fg_mask, &bg_mask, &brush->masks );
+
+    if (!fg_mask.and && !bg_mask.and) brush->masks.and = NULL;  /* ignore the and mask */
+
     return TRUE;
 }
 
@@ -1878,6 +1883,9 @@ static BOOL create_dither_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOO
     rgb = make_rgb_colorref( pdev->dev.hdc, &pdev->dib, brush->colorref, &got_pixel, &pixel );
 
     brush->dib.funcs->create_dither_masks( &brush->dib, brush->rop, rgb, &brush->masks );
+
+    if (!rop_needs_and_mask( brush->rop )) brush->masks.and = NULL;  /* ignore the and mask */
+
     return TRUE;
 }
 
@@ -2018,7 +2026,6 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib,
             ERR("Unexpected brush style %d\n", brush->style);
             return FALSE;
         }
-        if (!rop_needs_and_mask( brush->rop )) brush->masks.and = NULL;  /* ignore the and mask */
     }
 
     GetBrushOrgEx(pdev->dev.hdc, &origin);