ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Compute the extents of the whole string at once in ExtTextOut.

Browse Source
This commit is contained in:
Alexandre Julliard 2012-12-20 14:32:58 +01:00
parent 718e2f256e
commit 0da8c0d92e
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/gdi32/font.c
View File

@ -2232,46 +2232,49 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
if(char_extra || dc->breakExtra || breakRem || lpDx || lf.lfEscapement != 0) if(char_extra || dc->breakExtra || breakRem || lpDx || lf.lfEscapement != 0)
{ {
UINT i; UINT i;
SIZE tmpsz;
POINT total = {0, 0}, desired[2]; POINT total = {0, 0}, desired[2];
deltas = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*deltas)); deltas = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*deltas));
for(i = 0; i < count; i++) if (lpDx)
{ {
if(lpDx) if (flags & ETO_PDY)
{ {
if(flags & ETO_PDY) for (i = 0; i < count; i++)
{ {
deltas[i].x = lpDx[i * 2] + char_extra; deltas[i].x = lpDx[i * 2] + char_extra;
deltas[i].y = -lpDx[i * 2 + 1]; deltas[i].y = -lpDx[i * 2 + 1];
} }
}
else else
{
for (i = 0; i < count; i++)
{ {
deltas[i].x = lpDx[i] + char_extra; deltas[i].x = lpDx[i] + char_extra;
deltas[i].y = 0; deltas[i].y = 0;
} }
}
} }
else else
{ {
if(flags & ETO_GLYPH_INDEX) INT *dx = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*dx) );
GetTextExtentPointI(hdc, glyphs + i, 1, &tmpsz);
else
GetTextExtentPointW(hdc, reordered_str + i, 1, &tmpsz);
deltas[i].x = tmpsz.cx; if (flags & ETO_GLYPH_INDEX)
GetTextExtentExPointI( hdc, glyphs, count, -1, NULL, dx, &sz );
else
GetTextExtentExPointW( hdc, reordered_str, count, -1, NULL, dx, &sz );
deltas[0].x = dx[0];
deltas[0].y = 0;
for (i = 1; i < count; i++)
{
deltas[i].x = dx[i] - dx[i - 1];
deltas[i].y = 0; deltas[i].y = 0;
} }
HeapFree( GetProcessHeap(), 0, dx );
}
if (!(flags & ETO_GLYPH_INDEX) && (dc->breakExtra || breakRem) && reordered_str[i] == tm.tmBreakChar) for(i = 0; i < count; i++)
{ {
deltas[i].x = deltas[i].x + dc->breakExtra;
if (breakRem > 0)
{
breakRem--;
deltas[i].x++;
}
}
total.x += deltas[i].x; total.x += deltas[i].x;
total.y += deltas[i].y; total.y += deltas[i].y;