Rebase against 9a53298eed493080fb132d0cd57fffa95b00b1ec.

This commit is contained in:
Sebastian Lackner
2017-10-05 05:12:57 +02:00
parent 48c730f761
commit 3945cbfe36
9 changed files with 70 additions and 171 deletions

View File

@ -1,29 +0,0 @@
From c1d9a2c8a3b018f3b5c244d62c3515e2f5a47d49 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Mon, 26 Dec 2016 21:22:02 +0800
Subject: gdiplus: Ignore an externally set DC clipping region.
gdiplus maintains its own graphics state.
FIXME: perhaps some other places need a similar fix.
---
dlls/gdiplus/graphics.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index e086dfc..47b7bda 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -499,8 +499,7 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst
SetViewportOrgEx(graphics->hdc, 0, 0, NULL);
- if (hrgn)
- ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND);
+ ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY);
if (hregion)
ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND);
--
2.9.0

View File

@ -1 +1,2 @@
Fixes: [35372] Ignore externally set DC state in gdiplus
Disabled: true