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

gdi: Don't treat a NULL rect as an empty rect in ExtTextOutW.

This commit is contained in:
qingdoa daoo 2006-06-06 11:42:45 +08:00 committed by Alexandre Julliard
parent 585763ffa9
commit 9de7c3ae78
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/gdi/font.c
View File

@ -1749,6 +1749,9 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
return ret; return ret;
} }
if (!lprect)
flags &= ~ETO_CLIPPED;
if( !(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && BidiAvail && count > 0 ) if( !(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && BidiAvail && count > 0 )
{ {
reordered_str = HeapAlloc(GetProcessHeap(), 0, count*sizeof(WCHAR)); reordered_str = HeapAlloc(GetProcessHeap(), 0, count*sizeof(WCHAR));
@ -1800,7 +1803,6 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
{ {
if(!lprect) if(!lprect)
{ {
if(flags & ETO_CLIPPED) goto done;
if(flags & ETO_GLYPH_INDEX) if(flags & ETO_GLYPH_INDEX)
GetTextExtentPointI(hdc, glyphs, count, &sz); GetTextExtentPointI(hdc, glyphs, count, &sz);
else else