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

9de7c3ae · qingdoa daoo · Alexandre Julliard · 585763ff · 9de7c3ae
Commit 9de7c3ae authored Jun 06, 2006 by qingdoa daoo Committed by Alexandre Julliard Jun 06, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

font.c dlls/gdi/font.c +3 -1

No files found.
--- a/dlls/gdi/font.c
+++ b/dlls/gdi/font.c
@@ -1748,6 +1748,9 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
        GDI_ReleaseObj( hdc );
        return ret;
    }
+
+    if (!lprect)
+        flags &= ~ETO_CLIPPED;
        
    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,
    {
        if(!lprect)
        {
-            if(flags & ETO_CLIPPED) goto done;
            if(flags & ETO_GLYPH_INDEX)
                GetTextExtentPointI(hdc, glyphs, count, &sz);
            else