gdi32/path.c Fix ExtTextOut() for MapModes != MM_TEXT - BUG 17170

Massimo Del Fedele max at veneto.com
Sun Mar 15 18:36:18 CDT 2009


---
 dlls/gdi32/path.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c
index ba57661..6c85c82 100644
--- a/dlls/gdi32/path.c
+++ b/dlls/gdi32/path.c
@@ -1353,7 +1353,6 @@ static BOOL PATH_add_outline(DC *dc, INT x, INT y, TTPOLYGONHEADER *header, DWOR
 
         pt.x = x + int_from_fixed(header->pfxStart.x);
         pt.y = y - int_from_fixed(header->pfxStart.y);
-        LPtoDP(dc->hSelf, &pt, 1);
         PATH_AddEntry(pPath, &pt, PT_MOVETO);
 
         curve = (TTPOLYCURVE *)(header + 1);
@@ -1372,7 +1371,6 @@ static BOOL PATH_add_outline(DC *dc, INT x, INT y, TTPOLYGONHEADER *header, DWOR
                 {
                     pt.x = x + int_from_fixed(curve->apfx[i].x);
                     pt.y = y - int_from_fixed(curve->apfx[i].y);
-                    LPtoDP(dc->hSelf, &pt, 1);
                     PATH_AddEntry(pPath, &pt, PT_LINETO);
                 }
                 break;
@@ -1391,13 +1389,11 @@ static BOOL PATH_add_outline(DC *dc, INT x, INT y, TTPOLYGONHEADER *header, DWOR
 
                 pts[0].x = x + int_from_fixed(ptfx.x);
                 pts[0].y = y - int_from_fixed(ptfx.y);
-                LPtoDP(dc->hSelf, &pts[0], 1);
 
                 for(i = 0; i < curve->cpfx; i++)
                 {
                     pts[i + 1].x = x + int_from_fixed(curve->apfx[i].x);
                     pts[i + 1].y = y - int_from_fixed(curve->apfx[i].y);
-                    LPtoDP(dc->hSelf, &pts[i + 1], 1);
                 }
 
                 PATH_BezierTo(pPath, pts, curve->cpfx + 1);
@@ -1429,7 +1425,6 @@ BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc,
     unsigned int idx;
     double cosEsc, sinEsc;
     LOGFONTW lf;
-    POINT org;
     HDC hdc = dc->hSelf;
     INT offset = 0, xoff = 0, yoff = 0;
 
@@ -1450,8 +1445,6 @@ BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc,
         sinEsc = 0;
     }
 
-    GetDCOrgEx(hdc, &org);
-
     for (idx = 0; idx < count; idx++)
     {
         static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} };
@@ -1467,7 +1460,7 @@ BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc,
 
             GetGlyphOutlineW(hdc, str[idx], GGO_GLYPH_INDEX | GGO_NATIVE, &gm, dwSize, outline, &identity);
 
-            PATH_add_outline(dc, org.x + x + xoff, org.x + y + yoff, outline, dwSize);
+            PATH_add_outline(dc, x + xoff, y + yoff, outline, dwSize);
 
             HeapFree(GetProcessHeap(), 0, outline);
         }
-- 
1.5.6.3


--------------060004050000050409080008--




More information about the wine-patches mailing list