reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-26 05:00:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some issues in EMFDRV_ExtTextOut.

Browse Source
This commit is contained in:
Dmitry Timoshkov 2003-05-19 18:48:37 +00:00 committed by Alexandre Julliard
parent 6ac675188a
commit 7faae4c5d5
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/gdi/enhmfdrv/graphics.c
View File

@ -643,8 +643,7 @@ BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
BOOL ret;
EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev;
nSize = sizeof(*pemr) + (count+1)/2 * 2 * sizeof(WCHAR) +
(lpDx ? count * sizeof(INT) : 0);
nSize = sizeof(*pemr) + ((count+1) & ~1) * sizeof(WCHAR) + count * sizeof(INT);
TRACE("%s count %d nSize = %ld\n", debugstr_wn(str, count), count, nSize);
pemr = HeapAlloc(GetProcessHeap(), 0, nSize);
@ -675,13 +674,18 @@ BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
pemr->emrtext.rcl.bottom = lprect->bottom;
}
if(lpDx) {
pemr->emrtext.offDx = sizeof(*pemr) + (count+1)/2 * 2 * sizeof(WCHAR);
pemr->emrtext.offDx = pemr->emrtext.offString + count * sizeof(WCHAR);
if(lpDx)
memcpy((char*)pemr + pemr->emrtext.offDx, lpDx, count * sizeof(INT));
} else
pemr->emrtext.offDx = 0; /* FIXME: actually Windows fills out the array
using GetCharWidth in this case */
else
{
UINT i;
INT *dx = (INT *)((char*)pemr + pemr->emrtext.offDx);
for (i = 0; i < count; i++)
{
GetCharWidth32W(physDev->hdc, str[i], str[i], &dx[i]);
}
}
ret = EMFDRV_WriteRecord( dev, &pemr->emr );
if(ret)