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

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 9de7c3ae7839334ba1c9420f55d8edb8be70aae8
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=9de7c3ae7839334ba1c9420f...

Author: qingdoa daoo <qingdao33122(a)yahoo.com>
Date:   Tue Jun  6 11:42:45 2006 +0800

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

---

 dlls/gdi/font.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c
index ed482af..33a03f6 100644
--- a/dlls/gdi/font.c
+++ b/dlls/gdi/font.c
@@ -1748,6 +1748,9 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x,
         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,
     {
         if(!lprect)
         {
-            if(flags & ETO_CLIPPED) goto done;
             if(flags & ETO_GLYPH_INDEX)
                 GetTextExtentPointI(hdc, glyphs, count, &sz);
             else