From 6b9d38b61c14803c5dd0905d5d634d00ca3e3522 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 17 Jun 2016 05:37:58 +0200
Subject: [PATCH] Remove disabled gdi32-PS_GEOMETRIC patchset.

Bug 39172 already has been fixed in a different way.
---
 ...ometric-pen-for-the-mapping-mode-use.patch | 99 -------------------
 patches/gdi32-PS_GEOMETRIC/definition         |  2 -
 2 files changed, 101 deletions(-)
 delete mode 100644 patches/gdi32-PS_GEOMETRIC/0001-gdi32-Scale-a-geometric-pen-for-the-mapping-mode-use.patch
 delete mode 100644 patches/gdi32-PS_GEOMETRIC/definition

diff --git a/patches/gdi32-PS_GEOMETRIC/0001-gdi32-Scale-a-geometric-pen-for-the-mapping-mode-use.patch b/patches/gdi32-PS_GEOMETRIC/0001-gdi32-Scale-a-geometric-pen-for-the-mapping-mode-use.patch
deleted file mode 100644
index 9e205b00..00000000
--- a/patches/gdi32-PS_GEOMETRIC/0001-gdi32-Scale-a-geometric-pen-for-the-mapping-mode-use.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-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
-
diff --git a/patches/gdi32-PS_GEOMETRIC/definition b/patches/gdi32-PS_GEOMETRIC/definition
deleted file mode 100644
index 82ee6930..00000000
--- a/patches/gdi32-PS_GEOMETRIC/definition
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: [39172] Scale a geometric pen for the mapping mode used by PATH_StrokePath
-Disabled: true