wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 8b9f1e12841298591387e2b7590191610a37986e.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-09-04 08:24:36 +10:00
parent 4b48df5032
commit f3b03ce5a1
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch
View File

@@ -1,4 +1,4 @@
From 6ccddc7e2faf2dbde5f20d983e3f64e0cb8e2821 Mon Sep 17 00:00:00 2001
From 017514cff847b53d409bf5c8735c30d26474ed8f Mon Sep 17 00:00:00 2001
From: Daniel Wendt <daniel.wendt@linux.com>
Date: Tue, 10 Dec 2013 14:55:32 +0100
Subject: [PATCH] gdi32: fix for rotated ellipse
@@ -9,10 +9,10 @@ Bug: http://bugs.winehq.org/show_bug.cgi?id=35331
1 file changed, 42 insertions(+), 18 deletions(-)
diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c
index 5d246eea07f..2b33233dee9 100644
index da9144f0862..6a0519644f4 100644
--- a/dlls/gdi32/dibdrv/graphics.c
+++ b/dlls/gdi32/dibdrv/graphics.c
@@ -1534,6 +1534,23 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
@@ -1535,6 +1535,23 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
BOOL ret = TRUE;
HRGN outline = 0, interior = 0;
@@ -36,7 +36,7 @@ index 5d246eea07f..2b33233dee9 100644
if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE;
pt[0].x = pt[0].y = 0;
@@ -1554,23 +1571,6 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
@@ -1555,23 +1572,6 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
return FALSE;
}
@@ -45,7 +45,7 @@ index 5d246eea07f..2b33233dee9 100644
- ellipse_width, ellipse_height )))
- {
- HeapFree( GetProcessHeap(), 0, points );
- if (outline) DeleteObject( outline );
- if (outline) NtGdiDeleteObjectApp( outline );
- return FALSE;
- }
-
@@ -53,14 +53,14 @@ index 5d246eea07f..2b33233dee9 100644
- if (interior && !outline)
- {
- ret = brush_region( pdev, interior );
- DeleteObject( interior );
- NtGdiDeleteObjectApp( interior );
- interior = 0;
- }
-
count = ellipse_first_quadrant( ellipse_width, ellipse_height, points );
if (dc->attr->arc_direction == AD_CLOCKWISE)
@@ -1614,13 +1614,37 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
@@ -1615,13 +1615,37 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
}
count = end + 1;
@@ -77,7 +77,7 @@ index 5d246eea07f..2b33233dee9 100644
+ !(interior = CreatePolygonRgn(points, count, ALTERNATE)))
+ {
+ HeapFree( GetProcessHeap(), 0, points );
+ if (outline) DeleteObject( outline );
+ if (outline) NtGdiDeleteObjectApp( outline );
+ return FALSE;
+ }
+
@@ -85,7 +85,7 @@ index 5d246eea07f..2b33233dee9 100644
+ if (interior && !outline)
+ {
+ ret = brush_region( pdev, interior );
+ DeleteObject( interior );
+ NtGdiDeleteObjectApp( interior );
+ interior = 0;
+ }
+
@@ -97,8 +97,8 @@ index 5d246eea07f..2b33233dee9 100644
{
- NtGdiCombineRgn( interior, interior, outline, RGN_DIFF );
ret = brush_region( pdev, interior );
DeleteObject( interior );
NtGdiDeleteObjectApp( interior );
}
--
2.30.2
2.33.0