Skip to content

W
wine-cw
Commit 0fc0ef25 authored by Huw D M Davies's avatar Huw D M Davies Committed by Alexandre Julliard
Browse files
Options

Fix for metafile ExtTextOut that only includes the rectangle if either

ETO_CLIPPED or ETO_OPAQUE is set.
parent 7318acaa
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
dlls/gdi/mfdrv/text.c
View file @ 0fc0ef25
...@@ -37,12 +37,11 @@ static BOOL MFDRV_MetaExtTextOut( PHYSDEV dev, short x, short y, UINT16 flags, ...@@ -37,12 +37,11 @@ static BOOL MFDRV_MetaExtTextOut( PHYSDEV dev, short x, short y, UINT16 flags,
BOOL ret; BOOL ret;
DWORD len; DWORD len;
METARECORD *mr; METARECORD *mr;
BOOL isrect = flags & (ETO_CLIPPED | ETO_OPAQUE);
if (flags && !rect)
WARN("Inconsistent flags and rect\n");
len = sizeof(METARECORD) + (((count + 1) >> 1) * 2) + 2 * sizeof(short) len = sizeof(METARECORD) + (((count + 1) >> 1) * 2) + 2 * sizeof(short)
+ sizeof(UINT16); + sizeof(UINT16);
if (rect&&flags) if (isrect)
len += sizeof(RECT16); len += sizeof(RECT16);
if (lpDx) if (lpDx)
len+=count*sizeof(INT16); len+=count*sizeof(INT16);
...@@ -55,10 +54,10 @@ static BOOL MFDRV_MetaExtTextOut( PHYSDEV dev, short x, short y, UINT16 flags, ...@@ -55,10 +54,10 @@ static BOOL MFDRV_MetaExtTextOut( PHYSDEV dev, short x, short y, UINT16 flags,
*(mr->rdParm + 1) = x; *(mr->rdParm + 1) = x;
*(mr->rdParm + 2) = count; *(mr->rdParm + 2) = count;
*(mr->rdParm + 3) = flags; *(mr->rdParm + 3) = flags;
if (rect&&flags) memcpy(mr->rdParm + 4, rect, sizeof(RECT16)); if (isrect) memcpy(mr->rdParm + 4, rect, sizeof(RECT16));
memcpy(mr->rdParm + ((rect&&flags) ? 8 : 4), str, count); memcpy(mr->rdParm + (isrect ? 8 : 4), str, count);
if (lpDx) if (lpDx)
memcpy(mr->rdParm + ((rect&&flags) ? 8 : 4) + ((count + 1) >> 1),lpDx, memcpy(mr->rdParm + (isrect ? 8 : 4) + ((count + 1) >> 1),lpDx,
count*sizeof(INT16)); count*sizeof(INT16));
ret = MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); ret = MFDRV_WriteRecord( dev, mr, mr->rdSize * 2);
HeapFree( GetProcessHeap(), 0, mr); HeapFree( GetProcessHeap(), 0, mr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment