From 8be2c25e1995614b4bc823d674176beae375136a Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 7 Jan 2020 10:25:08 +1100 Subject: [PATCH] Dropped gdiplus-DC_Handling patchset This patchset has been disabled for 2 years and the bug it referenced is marked as fixed. --- ...s-Ignore-an-externally-set-DC-origin.patch | 28 ------------------- patches/gdiplus-DC_Handling/definition | 2 -- patches/patchinstall.sh | 4 +-- 3 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 patches/gdiplus-DC_Handling/0001-gdiplus-Ignore-an-externally-set-DC-origin.patch delete mode 100644 patches/gdiplus-DC_Handling/definition diff --git a/patches/gdiplus-DC_Handling/0001-gdiplus-Ignore-an-externally-set-DC-origin.patch b/patches/gdiplus-DC_Handling/0001-gdiplus-Ignore-an-externally-set-DC-origin.patch deleted file mode 100644 index 34314f1a..00000000 --- a/patches/gdiplus-DC_Handling/0001-gdiplus-Ignore-an-externally-set-DC-origin.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 36195993f4774dc100437f2aef60201041ee752a Mon Sep 17 00:00:00 2001 -From: Dmitry Timoshkov -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 - diff --git a/patches/gdiplus-DC_Handling/definition b/patches/gdiplus-DC_Handling/definition deleted file mode 100644 index 45b871cf..00000000 --- a/patches/gdiplus-DC_Handling/definition +++ /dev/null @@ -1,2 +0,0 @@ -# Fixes: [35372] Ignore externally set DC state in gdiplus -Disabled: true diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 8f74d7a4..c2eb64b6 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -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