From 05c42b1df2f2c7d8dbc8d216b75454c977aae90f Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 13 Aug 2021 08:52:12 +1000 Subject: [PATCH] Rebase against 6b58d34a625ffaad181a7316009398f3c6444181. --- ...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 ef751b72..77049461 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 12860d721c1d0b07d717da5816713832fad3b6a8 Mon Sep 17 00:00:00 2001 +From d2c903e409fe9a2b428791311507af04d611d2d3 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 489f4475736..d830261e13e 100644 +index 305dec43c7f..44fecbf7400 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h -@@ -175,4 +175,7 @@ extern BOOL EMFDC_SetViewportOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HI - extern BOOL EMFDC_SetWindowExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; - extern BOOL EMFDC_SetWindowOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +@@ -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 ); +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 34d4da62..ed5a9c18 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "91494ae6f2e47254d15a47e292ff569f3b400be6" + echo "6b58d34a625ffaad181a7316009398f3c6444181" } # Show version information diff --git a/staging/upstream-commit b/staging/upstream-commit index b15563d2..f6fe954b 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -91494ae6f2e47254d15a47e292ff569f3b400be6 +6b58d34a625ffaad181a7316009398f3c6444181