Dmitry Timoshkov : gdi: Remove StrokePath workaround for a DC transformation change bug.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Feb 8 09:12:34 CST 2006


Module: wine
Branch: refs/heads/master
Commit: 1ecef1c97e8e538b265745aded65d41d50d4c6cd
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=1ecef1c97e8e538b265745aded65d41d50d4c6cd

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Wed Feb  8 12:35:18 2006 +0100

gdi: Remove StrokePath workaround for a DC transformation change bug.

---

 dlls/gdi/path.c |   36 ------------------------------------
 1 files changed, 0 insertions(+), 36 deletions(-)

diff --git a/dlls/gdi/path.c b/dlls/gdi/path.c
index 1e98fe5..aceee7e 100644
--- a/dlls/gdi/path.c
+++ b/dlls/gdi/path.c
@@ -1653,8 +1653,6 @@ static BOOL PATH_StrokePath(DC *dc, GdiP
     SIZE szViewportExt, szWindowExt;
     DWORD mapMode, graphicsMode;
     XFORM xform;
-    HGDIOBJ hOldPen;
-    HPEN hNewPen;
     BOOL ret = TRUE;
 
     if(dc->funcs->pStrokePath)
@@ -1662,36 +1660,6 @@ static BOOL PATH_StrokePath(DC *dc, GdiP
 
     if(pPath->state != PATH_Closed)
         return FALSE;
-
-    /* Convert pen properties from logical to device units for MWT_IDENTITY */
-    hOldPen = GetCurrentObject(dc->hSelf, OBJ_PEN);
-    if(GetObjectType(hOldPen) == OBJ_EXTPEN) {
-	EXTLOGPEN elp;
-	LOGBRUSH lb;
-	GetObjectW(hOldPen, sizeof(EXTLOGPEN), &elp);
-	if(elp.elpPenStyle & PS_GEOMETRIC) {
-	    INTERNAL_WSTODS(dc, &elp.elpWidth);
-	    if(elp.elpPenStyle & PS_USERSTYLE)
-		for(i = 0; i < elp.elpNumEntries; i++)
-		    INTERNAL_WSTODS(dc, &elp.elpStyleEntry[i]);
-	}
-	lb.lbStyle = elp.elpBrushStyle;
-	lb.lbColor = elp.elpColor;
-	lb.lbHatch = elp.elpHatch;
-        if(elp.elpPenStyle & PS_USERSTYLE)
-	    hNewPen = ExtCreatePen(elp.elpPenStyle, elp.elpWidth, &lb,
-	                           elp.elpNumEntries, elp.elpStyleEntry);
-        else
-	    hNewPen = ExtCreatePen(elp.elpPenStyle, elp.elpWidth, &lb,
-	                           0, NULL);
-    } else /* OBJ_PEN */ {
-	LOGPEN lp;
-	GetObjectW(hOldPen, sizeof(LOGPEN), &lp);
-	if(lp.lopnWidth.x > 0)
-	    INTERNAL_WSTODS(dc, (DWORD*)&lp.lopnWidth.x);
-	hNewPen = CreatePenIndirect(&lp);
-    }
-    SelectObject(dc->hSelf, hNewPen);
     
     /* Save the mapping mode info */
     mapMode=GetMapMode(dc->hSelf);
@@ -1808,10 +1776,6 @@ static BOOL PATH_StrokePath(DC *dc, GdiP
         MoveToEx(dc->hSelf, pt.x, pt.y, NULL);
     }
 
-    /* Restore old pen */
-    DeleteObject(hNewPen);
-    SelectObject(dc->hSelf, hOldPen);
-
     return ret;
 }
 




More information about the wine-cvs mailing list