From 94337e021c82e327ff41d666173de2b623b97438 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 14 Aug 2021 15:52:01 +1000 Subject: [PATCH] Rebase against 7f144646ffac6f3632d0c39b217dbd433c1154a0. --- ...ix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch | 10 +++++----- patches/patchinstall.sh | 2 +- staging/upstream-commit | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch b/patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch index 77049461..4b9218cf 100644 --- a/patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch +++ b/patches/gdi32-rotation/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch @@ -1,4 +1,4 @@ -From d2c903e409fe9a2b428791311507af04d611d2d3 Mon Sep 17 00:00:00 2001 +From b4010603ae2bab3a4fdc8b57efaebe47254eb168 Mon Sep 17 00:00:00 2001 From: Daniel Wendt Date: Fri, 15 Nov 2013 12:52:37 +0100 Subject: [PATCH] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing @@ -116,12 +116,12 @@ index c6f11ae6a69..e4a5f7bab8b 100644 { HeapFree( GetProcessHeap(), 0, points ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h -index 305dec43c7f..44fecbf7400 100644 +index 6d23e7e0ecc..e8e08d00b81 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h -@@ -188,4 +188,7 @@ extern BOOL EMFDC_StretchBlt( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_ - HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src, - DWORD rop ); +@@ -208,4 +208,7 @@ extern BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT wid + INT height_src, const void *bits, const BITMAPINFO *info, + UINT coloruse, DWORD rop ) DECLSPEC_HIDDEN; +BOOL xform_has_rotate_and_uniform_scale_and_shear( const XFORM *xform ) DECLSPEC_HIDDEN; +BOOL xform_decompose_rotation_and_translation( XFORM *xform, XFORM *rotation_and_translation ) DECLSPEC_HIDDEN; diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index ed5a9c18..e4e240b6 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "6b58d34a625ffaad181a7316009398f3c6444181" + echo "7f144646ffac6f3632d0c39b217dbd433c1154a0" } # Show version information diff --git a/staging/upstream-commit b/staging/upstream-commit index f6fe954b..258290be 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -6b58d34a625ffaad181a7316009398f3c6444181 +7f144646ffac6f3632d0c39b217dbd433c1154a0