Author: jimtabor
Date: Wed Oct 19 23:50:54 2011
New Revision: 54209
URL: http://svn.reactos.org/svn/reactos?rev=54209&view=rev
Log:
[Win32k]
- Fix crash in PATH_ExtTextOut. See bug 6587.
- Sync Information:
Huw Davies <[email protected]> : Add support for ETO_PDY and improve world
transform support.
Massimo Del Fedele <[email protected]> : Fix PATH_add_outline when mapping mode
!= MM_TEXT. PATH_ExtTextOut remove incorrect shift to DC origin. Correctly
handle space char on Path_ExtTextOut().
Dmitry Timoshkov <[email protected]> : The MAT2 parameter of
GetGlyphOutline is mandatory.
Modified:
trunk/reactos/subsystems/win32/win32k/objects/path.c
Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/path.c?rev=54209&r1=54208&r2=54209&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Wed Oct
19 23:50:54 2011
@@ -1909,7 +1909,6 @@
pt.x = x + int_from_fixed(header->pfxStart.x);
pt.y = y - int_from_fixed(header->pfxStart.y);
- IntLPtoDP(dc, &pt, 1);
PATH_AddEntry(pPath, &pt, PT_MOVETO);
curve = (TTPOLYCURVE *)(header + 1);
@@ -1928,7 +1927,6 @@
{
pt.x = x + int_from_fixed(curve->apfx[i].x);
pt.y = y - int_from_fixed(curve->apfx[i].y);
- IntLPtoDP(dc, &pt, 1);
PATH_AddEntry(pPath, &pt, PT_LINETO);
}
break;
@@ -1947,13 +1945,11 @@
pts[0].x = x + int_from_fixed(ptfx.x);
pts[0].y = y - int_from_fixed(ptfx.y);
- IntLPtoDP(dc, &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);
- IntLPtoDP(dc, &pts[i + 1], 1);
}
PATH_BezierTo(pPath, pts, curve->cpfx + 1);
@@ -1986,37 +1982,13 @@
LPCWSTR str, UINT count, const INT *dx)
{
unsigned int idx;
- double cosEsc, sinEsc;
- PDC_ATTR pdcattr;
- PTEXTOBJ TextObj;
- LOGFONTW lf;
- POINTL org;
- INT offset = 0, xoff = 0, yoff = 0;
+ POINT offset = {0, 0};
if (!count) return TRUE;
- pdcattr = dc->pdcattr;
-
- TextObj = RealizeFontInit( pdcattr->hlfntNew);
- if ( !TextObj ) return FALSE;
-
- FontGetObject( TextObj, sizeof(lf), &lf);
- TEXTOBJ_UnlockText(TextObj);
-
- if (lf.lfEscapement != 0)
- {
- cosEsc = cos(lf.lfEscapement * M_PI / 1800);
- sinEsc = sin(lf.lfEscapement * M_PI / 1800);
- } else
- {
- cosEsc = 1;
- sinEsc = 0;
- }
-
- org = dc->ptlDCOrig;
-
for (idx = 0; idx < count; idx++)
{
+ MAT2 identity = { {0,1},{0,0},{0,0},{0,1} };
GLYPHMETRICS gm;
DWORD dwSize;
void *outline;
@@ -2027,36 +1999,44 @@
&gm,
0,
NULL,
- NULL,
+ &identity,
TRUE);
- if (!dwSize) return FALSE;
-
- outline = ExAllocatePoolWithTag(PagedPool, dwSize, TAG_PATH);
- if (!outline) return FALSE;
-
- ftGdiGetGlyphOutline( dc,
- str[idx],
- GGO_GLYPH_INDEX | GGO_NATIVE,
- &gm,
- dwSize,
- outline,
- NULL,
- TRUE);
-
- PATH_add_outline(dc, org.x + x + xoff, org.x + y + yoff, outline,
dwSize);
-
- ExFreePoolWithTag(outline, TAG_PATH);
+ if (dwSize == GDI_ERROR) return FALSE;
+
+ /* add outline only if char is printable */
+ if (dwSize)
+ {
+ outline = ExAllocatePoolWithTag(PagedPool, dwSize, TAG_PATH);
+ if (!outline) return FALSE;
+
+ ftGdiGetGlyphOutline( dc,
+ str[idx],
+ GGO_GLYPH_INDEX | GGO_NATIVE,
+ &gm,
+ dwSize,
+ outline,
+ &identity,
+ TRUE);
+
+ PATH_add_outline(dc, x + offset.x, y + offset.y, outline, dwSize);
+
+ ExFreePoolWithTag(outline, TAG_PATH);
+ }
if (dx)
{
- offset += dx[idx];
- xoff = offset * cosEsc;
- yoff = offset * -sinEsc;
+ if (flags & ETO_PDY)
+ {
+ offset.x += dx[idx * 2];
+ offset.y += dx[idx * 2 + 1];
+ }
+ else
+ offset.x += dx[idx];
}
else
{
- xoff += gm.gmCellIncX;
- yoff += gm.gmCellIncY;
+ offset.x += gm.gmCellIncX;
+ offset.y += gm.gmCellIncY;
}
}
return TRUE;
