[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

Alexandre Julliard julliard at winehq.org
Sun Jun 17 20:03:11 UTC 2012


The following commit has been merged in the wheezy branch:
commit 714e2e04a77e87ac13b65ad564b8661b5bee5047
Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Apr 9 15:13:31 2012 +0200

    gdi32: Fix GetClipBox return value for non-memory DCs.
    (cherry picked from commit 1ca6ed774835187d14a4b536812bb9fb38e57ac0)

diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c
index ef2dc12..c413e1a 100644
--- a/dlls/gdi32/clipping.c
+++ b/dlls/gdi32/clipping.c
@@ -409,7 +409,11 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect )
         if (get_dc_visrect( dc, &visrect ) && !intersect_rect( rect, rect, &visrect ))
             ret = NULLREGION;
     }
-    else ret = get_dc_visrect( dc, rect ) ? SIMPLEREGION : NULLREGION;
+    else
+    {
+        ret = is_rect_empty( &dc->vis_rect ) ? ERROR : SIMPLEREGION;
+        *rect = dc->vis_rect;
+    }
 
     if (dc->layout & LAYOUT_RTL)
     {

-- 
Debian Wine packaging



More information about the pkg-wine-party mailing list