Alexandre Julliard : gdi32: Make sure the bounds are always updated in ExtTextOutW.

Alexandre Julliard julliard at winehq.org
Thu May 31 13:30:40 CDT 2012


Module: wine
Branch: master
Commit: af4871f862a224452e06c1d4c1c465d6dfa54e66
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=af4871f862a224452e06c1d4c1c465d6dfa54e66

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Apr 23 17:49:59 2012 +0200

gdi32: Make sure the bounds are always updated in ExtTextOutW.

---

 dlls/gdi32/dibdrv/graphics.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c
index 835f7d7..0237acf 100644
--- a/dlls/gdi32/dibdrv/graphics.c
+++ b/dlls/gdi32/dibdrv/graphics.c
@@ -675,7 +675,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
         free_clipped_rects( &clipped_rects );
         get_clipped_rects( &pdev->dib, NULL, pdev->clip, &clipped_rects );
     }
-    if (!clipped_rects.count) return TRUE;
+    if (!clipped_rects.count) goto done;
 
     text_color = get_pixel_color( pdev, GetTextColor( pdev->dev.hdc ), TRUE );
     get_aa_ranges( pdev->dib.funcs->pixel_to_colorref( &pdev->dib, text_color ), ranges );
@@ -712,9 +712,9 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
             origin.y += metrics.gmCellIncY;
         }
     }
-    add_clipped_bounds( pdev, &bounds, pdev->clip );
 
 done:
+    add_clipped_bounds( pdev, &bounds, pdev->clip );
     free_clipped_rects( &clipped_rects );
     return TRUE;
 }




More information about the wine-cvs mailing list