mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Added patch to scale a geometric pen for the mapping mode used by PATH_StrokePath.
This commit is contained in:
Sebastian Lackner
parent
066e207750
commit
953ae16ca9
@ -0,0 +1,99 @@
|
||||
From d38154ce2bc69ba06931d0c64d3c2ac11bb68409 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Tue, 31 May 2016 20:19:53 +0800
|
||||
Subject: gdi32: Scale a geometric pen for the mapping mode used by
|
||||
PATH_StrokePath. (v2)
|
||||
|
||||
PS_GEOMETRIC pens specify width in logical units, therefore we need to scale
|
||||
currently selected geometric pen for the new mapping mode.
|
||||
---
|
||||
dlls/gdi32/path.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 52 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c
|
||||
index e09cd0b..f609dc2 100644
|
||||
--- a/dlls/gdi32/path.c
|
||||
+++ b/dlls/gdi32/path.c
|
||||
@@ -1603,6 +1603,31 @@ static BOOL PATH_StrokePath( HDC hdc, const struct gdi_path *pPath )
|
||||
DWORD mapMode, graphicsMode;
|
||||
XFORM xform;
|
||||
BOOL ret = TRUE;
|
||||
+ HPEN hpen;
|
||||
+ int logpen_size;
|
||||
+ EXTLOGPEN *logpen;
|
||||
+
|
||||
+ /* PS_GEOMETRIC pens specify width in logical units, therefore we need
|
||||
+ * to scale currently selected geometric pen for the new mapping mode.
|
||||
+ */
|
||||
+ hpen = GetCurrentObject(hdc, OBJ_PEN);
|
||||
+ logpen_size = GetObjectW(hpen, 0, NULL);
|
||||
+ logpen = HeapAlloc(GetProcessHeap(), 0, logpen_size);
|
||||
+ if (!logpen) return FALSE;
|
||||
+ GetObjectW(hpen, logpen_size, logpen);
|
||||
+ if (logpen->elpPenStyle & PS_GEOMETRIC)
|
||||
+ {
|
||||
+ POINT pen_width;
|
||||
+ pen_width.x = logpen->elpWidth;
|
||||
+ pen_width.y = 0;
|
||||
+ LPtoDP(hdc, &pen_width, 1);
|
||||
+ logpen->elpWidth = pen_width.x;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ HeapFree(GetProcessHeap(), 0, logpen);
|
||||
+ logpen = NULL;
|
||||
+ }
|
||||
|
||||
/* Save the mapping mode info */
|
||||
mapMode=GetMapMode(hdc);
|
||||
@@ -1621,13 +1646,31 @@ static BOOL PATH_StrokePath( HDC hdc, const struct gdi_path *pPath )
|
||||
ModifyWorldTransform(hdc, &xform, MWT_IDENTITY);
|
||||
SetGraphicsMode(hdc, graphicsMode);
|
||||
|
||||
+ if (logpen)
|
||||
+ {
|
||||
+ POINT pen_width;
|
||||
+ LOGBRUSH logbrush;
|
||||
+
|
||||
+ pen_width.x = logpen->elpWidth;
|
||||
+ pen_width.y = 0;
|
||||
+ DPtoLP(hdc, &pen_width, 1);
|
||||
+ logpen->elpWidth = pen_width.x;
|
||||
+ logbrush.lbStyle = logpen->elpBrushStyle;
|
||||
+ logbrush.lbColor = logpen->elpColor;
|
||||
+ logbrush.lbHatch = logpen->elpHatch;
|
||||
+ hpen = ExtCreatePen(logpen->elpPenStyle, logpen->elpWidth,
|
||||
+ &logbrush, logpen->elpNumEntries,
|
||||
+ logpen->elpNumEntries ? logpen->elpStyleEntry : NULL);
|
||||
+ hpen = SelectObject(hdc, hpen);
|
||||
+ }
|
||||
+
|
||||
/* Allocate enough memory for the worst case without beziers (one PT_MOVETO
|
||||
* and the rest PT_LINETO with PT_CLOSEFIGURE at the end) plus some buffer
|
||||
* space in case we get one to keep the number of reallocations small. */
|
||||
nAlloc = pPath->count + 1 + 300;
|
||||
pLinePts = HeapAlloc(GetProcessHeap(), 0, nAlloc * sizeof(POINT));
|
||||
nLinePts = 0;
|
||||
-
|
||||
+
|
||||
for(i = 0; i < pPath->count; i++) {
|
||||
if((i == 0 || (pPath->flags[i-1] & PT_CLOSEFIGURE)) &&
|
||||
(pPath->flags[i] != PT_MOVETO)) {
|
||||
@@ -1693,6 +1736,14 @@ static BOOL PATH_StrokePath( HDC hdc, const struct gdi_path *pPath )
|
||||
end:
|
||||
HeapFree(GetProcessHeap(), 0, pLinePts);
|
||||
|
||||
+ /* Restore original not scaled pen */
|
||||
+ if (logpen)
|
||||
+ {
|
||||
+ hpen = SelectObject(hdc, hpen);
|
||||
+ DeleteObject(hpen);
|
||||
+ HeapFree(GetProcessHeap(), 0, logpen);
|
||||
+ }
|
||||
+
|
||||
/* Restore the old mapping mode */
|
||||
SetMapMode(hdc, mapMode);
|
||||
SetWindowExtEx(hdc, szWindowExt.cx, szWindowExt.cy, NULL);
|
||||
--
|
||||
2.8.0
|
||||
|
||||
1
patches/gdi32-PS_GEOMETRIC/definition
Normal file
1
patches/gdi32-PS_GEOMETRIC/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [39172] Scale a geometric pen for the mapping mode used by PATH_StrokePath
|
||||
@ -149,6 +149,7 @@ patch_enable_all ()
|
||||
enable_fsutil_Stub_Program="$1"
|
||||
enable_gdi32_Lazy_Font_Initialization="$1"
|
||||
enable_gdi32_MultiMonitor="$1"
|
||||
enable_gdi32_PS_GEOMETRIC="$1"
|
||||
enable_gdi32_Path_Metafile="$1"
|
||||
enable_gdi32_Symbol_Truetype_Font="$1"
|
||||
enable_gdiplus_GdipCreateMetafileFromStream="$1"
|
||||
@ -626,6 +627,9 @@ patch_enable ()
|
||||
gdi32-MultiMonitor)
|
||||
enable_gdi32_MultiMonitor="$2"
|
||||
;;
|
||||
gdi32-PS_GEOMETRIC)
|
||||
enable_gdi32_PS_GEOMETRIC="$2"
|
||||
;;
|
||||
gdi32-Path_Metafile)
|
||||
enable_gdi32_Path_Metafile="$2"
|
||||
;;
|
||||
@ -3710,6 +3714,21 @@ if test "$enable_gdi32_MultiMonitor" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset gdi32-PS_GEOMETRIC
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#39172] Scale a geometric pen for the mapping mode used by PATH_StrokePath
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/gdi32/path.c
|
||||
# |
|
||||
if test "$enable_gdi32_PS_GEOMETRIC" -eq 1; then
|
||||
patch_apply gdi32-PS_GEOMETRIC/0001-gdi32-Scale-a-geometric-pen-for-the-mapping-mode-use.patch
|
||||
(
|
||||
echo '+ { "Dmitry Timoshkov", "gdi32: Scale a geometric pen for the mapping mode used by PATH_StrokePath.", 2 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset gdi32-Path_Metafile
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user