Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32k]

Browse source 
- Fix crash in PATH_ExtTextOut. See bug 6587.
- Sync Information:
  Huw Davies <huw@codeweavers.com> : Add support for ETO_PDY and improve world transform support.
  Massimo Del Fedele <max@veneto.com> : 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 <dmitry@codeweavers.com> : The MAT2 parameter of GetGlyphOutline is mandatory.





svn path=/trunk/; revision=54209
This commit is contained in:
James Tabor 2011-10-19 23:50:54 +00:00
parent 8fce909318
commit 6bbe25388c
1 changed files with 29 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
reactos/subsystems/win32/win32k/objects/path.c
View file

@ -1909,7 +1909,6 @@ PATH_add_outline(PDC dc, INT x, INT y, TTPOLYGONHEADER *header, DWORD size)
pt.x = x + int_from_fixed(header->pfxStart.x); pt.x = x + int_from_fixed(header->pfxStart.x);
pt.y = y - int_from_fixed(header->pfxStart.y); pt.y = y - int_from_fixed(header->pfxStart.y);
IntLPtoDP(dc, &pt, 1);
PATH_AddEntry(pPath, &pt, PT_MOVETO); PATH_AddEntry(pPath, &pt, PT_MOVETO);
curve = (TTPOLYCURVE *)(header + 1); curve = (TTPOLYCURVE *)(header + 1);
@ -1928,7 +1927,6 @@ PATH_add_outline(PDC dc, INT x, INT y, TTPOLYGONHEADER *header, DWORD size)
{ {
pt.x = x + int_from_fixed(curve->apfx[i].x); pt.x = x + int_from_fixed(curve->apfx[i].x);
pt.y = y - int_from_fixed(curve->apfx[i].y); pt.y = y - int_from_fixed(curve->apfx[i].y);
IntLPtoDP(dc, &pt, 1);
PATH_AddEntry(pPath, &pt, PT_LINETO); PATH_AddEntry(pPath, &pt, PT_LINETO);
} }
break; break;
@ -1947,13 +1945,11 @@ PATH_add_outline(PDC dc, INT x, INT y, TTPOLYGONHEADER *header, DWORD size)
pts[0].x = x + int_from_fixed(ptfx.x); pts[0].x = x + int_from_fixed(ptfx.x);
pts[0].y = y - int_from_fixed(ptfx.y); pts[0].y = y - int_from_fixed(ptfx.y);
IntLPtoDP(dc, &pts[0], 1);
for (i = 0; i < curve->cpfx; i++) for (i = 0; i < curve->cpfx; i++)
{ {
pts[i + 1].x = x + int_from_fixed(curve->apfx[i].x); pts[i + 1].x = x + int_from_fixed(curve->apfx[i].x);
pts[i + 1].y = y - int_from_fixed(curve->apfx[i].y); 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); PATH_BezierTo(pPath, pts, curve->cpfx + 1);
@ -1986,37 +1982,13 @@ PATH_ExtTextOut(PDC dc, INT x, INT y, UINT flags, const RECTL *lprc,
LPCWSTR str, UINT count, const INT *dx) LPCWSTR str, UINT count, const INT *dx)
{ {
unsigned int idx; unsigned int idx;
double cosEsc, sinEsc; POINT offset = {0, 0};
PDC_ATTR pdcattr;
PTEXTOBJ TextObj;
LOGFONTW lf;
POINTL org;
INT offset = 0, xoff = 0, yoff = 0;
if (!count) return TRUE; 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++) for (idx = 0; idx < count; idx++)
{ {
MAT2 identity = { {0,1},{0,0},{0,0},{0,1} };
GLYPHMETRICS gm; GLYPHMETRICS gm;
DWORD dwSize; DWORD dwSize;
void *outline; void *outline;
@ -2027,36 +1999,44 @@ PATH_ExtTextOut(PDC dc, INT x, INT y, UINT flags, const RECTL *lprc,
&gm, &gm,
0, 0,
NULL, NULL,
NULL, &identity,
TRUE); TRUE);
if (!dwSize) return FALSE; if (dwSize == GDI_ERROR) return FALSE;
outline = ExAllocatePoolWithTag(PagedPool, dwSize, TAG_PATH); /* add outline only if char is printable */
if (!outline) return FALSE; if (dwSize)
{
outline = ExAllocatePoolWithTag(PagedPool, dwSize, TAG_PATH);
if (!outline) return FALSE;
ftGdiGetGlyphOutline( dc, ftGdiGetGlyphOutline( dc,
str[idx], str[idx],
GGO_GLYPH_INDEX | GGO_NATIVE, GGO_GLYPH_INDEX | GGO_NATIVE,
&gm, &gm,
dwSize, dwSize,
outline, outline,
NULL, &identity,
TRUE); TRUE);
PATH_add_outline(dc, org.x + x + xoff, org.x + y + yoff, outline, dwSize); PATH_add_outline(dc, x + offset.x, y + offset.y, outline, dwSize);
ExFreePoolWithTag(outline, TAG_PATH); ExFreePoolWithTag(outline, TAG_PATH);
}
if (dx) if (dx)
{ {
offset += dx[idx]; if (flags & ETO_PDY)
xoff = offset * cosEsc; {
yoff = offset * -sinEsc; offset.x += dx[idx * 2];
offset.y += dx[idx * 2 + 1];
}
else
offset.x += dx[idx];
} }
else else
{ {
xoff += gm.gmCellIncX; offset.x += gm.gmCellIncX;
yoff += gm.gmCellIncY; offset.y += gm.gmCellIncY;
} }
} }
return TRUE; return TRUE;