mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 04d52eb83fa5c37cfe1100f435e36c2f78918338.
This commit is contained in:
parent
dc38777093
commit
9da0fe04d3
@ -1,4 +1,4 @@
|
||||
From 33ecf353e570a23692a2b65d21adc607e7fd1d32 Mon Sep 17 00:00:00 2001
|
||||
From cd4af8450f673e49c31de5604a6b201398235baa Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Wendt <daniel.wendt@linux.com>
|
||||
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 62384601c5a..5fd28583aa9 100644
|
||||
{
|
||||
HeapFree( GetProcessHeap(), 0, points );
|
||||
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
|
||||
index 481bc14d7f3..7d37785be2a 100644
|
||||
index 37cec4bfe78..d9f18536fda 100644
|
||||
--- a/dlls/gdi32/gdi_private.h
|
||||
+++ b/dlls/gdi32/gdi_private.h
|
||||
@@ -95,4 +95,7 @@ extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT
|
||||
INT ell_width, INT ell_height ) DECLSPEC_HIDDEN;
|
||||
@@ -114,4 +114,7 @@ extern BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN;
|
||||
extern BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN;
|
||||
extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) 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;
|
||||
|
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "a5f787ac445a682ea7ced5dd78c3516d4b8b9311"
|
||||
echo "04d52eb83fa5c37cfe1100f435e36c2f78918338"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
@ -1 +1 @@
|
||||
a5f787ac445a682ea7ced5dd78c3516d4b8b9311
|
||||
04d52eb83fa5c37cfe1100f435e36c2f78918338
|
||||
|
Loading…
Reference in New Issue
Block a user