Vincent Povirk : gdiplus: Clean up HRGN when GdipGetRegionBounds succeeds too.

Alexandre Julliard julliard at winehq.org
Mon Mar 28 14:21:56 CDT 2011


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

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Mon Mar 21 10:39:59 2011 -0500

gdiplus: Clean up HRGN when GdipGetRegionBounds succeeds too.

---

 dlls/gdiplus/region.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c
index f11f3ca..0afbdbd 100644
--- a/dlls/gdiplus/region.c
+++ b/dlls/gdiplus/region.c
@@ -683,17 +683,18 @@ GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics,
         return Ok;
     }
 
-    if(!GetRgnBox(hrgn, &r)){
-        DeleteObject(hrgn);
-        return GenericError;
+    if(GetRgnBox(hrgn, &r)){
+        rect->X = r.left;
+        rect->Y = r.top;
+        rect->Width  = r.right  - r.left;
+        rect->Height = r.bottom - r.top;
     }
+    else
+        status = GenericError;
 
-    rect->X = r.left;
-    rect->Y = r.top;
-    rect->Width  = r.right  - r.left;
-    rect->Height = r.bottom - r.top;
+    DeleteObject(hrgn);
 
-    return Ok;
+    return status;
 }
 
 /*****************************************************************************




More information about the wine-cvs mailing list