gdi32: PATH_ExtTextOut remove incorrect shift to DC origin.
This commit is contained in:
parent
23acdb7143
commit
a11a450e33
|
@ -1429,7 +1429,6 @@ BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc,
|
||||||
unsigned int idx;
|
unsigned int idx;
|
||||||
double cosEsc, sinEsc;
|
double cosEsc, sinEsc;
|
||||||
LOGFONTW lf;
|
LOGFONTW lf;
|
||||||
POINT org;
|
|
||||||
HDC hdc = dc->hSelf;
|
HDC hdc = dc->hSelf;
|
||||||
INT offset = 0, xoff = 0, yoff = 0;
|
INT offset = 0, xoff = 0, yoff = 0;
|
||||||
|
|
||||||
|
@ -1450,8 +1449,6 @@ BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc,
|
||||||
sinEsc = 0;
|
sinEsc = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
GetDCOrgEx(hdc, &org);
|
|
||||||
|
|
||||||
for (idx = 0; idx < count; idx++)
|
for (idx = 0; idx < count; idx++)
|
||||||
{
|
{
|
||||||
static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} };
|
static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} };
|
||||||
|
@ -1470,7 +1467,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);
|
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);
|
HeapFree(GetProcessHeap(), 0, outline);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue