Skip to content

W
wine-cw
Commit 9de7c3ae authored by qingdoa daoo's avatar qingdoa daoo Committed by Alexandre Julliard
Browse files
Options

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

parent 585763ff
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
dlls/gdi/font.c
View file @ 9de7c3ae
...@@ -1748,6 +1748,9 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, ...@@ -1748,6 +1748,9 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
GDI_ReleaseObj( hdc ); GDI_ReleaseObj( hdc );
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 )
{ {
...@@ -1800,7 +1803,6 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, ...@@ -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
......
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