Dropped gdiplus-DC_Handling patchset

This patchset has been disabled for 2 years and the bug it referenced is marked as fixed.
This commit is contained in:
Alistair Leslie-Hughes 2020-01-07 10:25:08 +11:00
parent 7059b2e1ec
commit 8be2c25e19
3 changed files with 2 additions and 32 deletions

View File

@ -1,28 +0,0 @@
From 36195993f4774dc100437f2aef60201041ee752a Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Mon, 26 Dec 2016 21:17:29 +0800
Subject: gdiplus: Ignore an externally set DC origin.
gdiplus maintains its own graphics state.
FIXME: perhaps some other places need a similar fix.
---
dlls/gdiplus/graphics.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index f9a6f3e..e086dfc 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -497,6 +497,8 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst
save = SaveDC(graphics->hdc);
+ SetViewportOrgEx(graphics->hdc, 0, 0, NULL);
+
if (hrgn)
ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND);
--
2.9.0

View File

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

View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "0747fd29d8f429a3421207b52eabe11cfcdf877d"
echo "37dec9f144501fb93e173214578b759122ac999a"
}
# Show version information
@ -2201,7 +2201,7 @@ fi
# | Modified files:
# | * dlls/activeds/Makefile.in, dlls/activeds/activeds_main.c, dlls/adsldp/Makefile.in, dlls/adsldp/adsldp.c,
# | dlls/adsldp/adsldp.idl, dlls/adsldp/adsldp.rgs, dlls/adsldp/rsrc.rc, dlls/adsldp/tests/Makefile.in,
# | dlls/adsldp/tests/ldap.c, dlls/adsldp/tests/sysinfo.c, include/adserr.h, include/iads.idl
# | dlls/adsldp/tests/ldap.c, dlls/adsldp/tests/sysinfo.c, include/Makefile.in, include/adserr.h, include/iads.idl
# |
if test "$enable_activeds_ADsOpenObject" -eq 1; then
patch_apply activeds-ADsOpenObject/0001-include-Add-adserr.h.patch