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

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 7ad64a043120711d01513f8d439542bd22d9fd04
Author: Huw Davies <huw at codeweavers.com>
Date:   Wed Mar 14 14:15:13 2012 +0000

    gdi32: Correctly propagate the enumproc's return value.
    (cherry picked from commit 41fb856961449fdb303ec9c1ffa7d6073ff86254)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 4191904..74a7e27 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -121,6 +121,7 @@ struct font_enum
   LPARAM              lpData;
   BOOL                unicode;
   HDC                 hdc;
+  INT                 retval;
 };
 
 /*
@@ -721,6 +722,7 @@ static INT CALLBACK FONT_EnumInstance( const LOGFONTW *plf, const TEXTMETRICW *p
             ptm = (TEXTMETRICW *)&tmA;
         }
         ret = pfe->lpEnumFunc( plf, ptm, fType, pfe->lpData );
+        pfe->retval = ret;
     }
     return ret;
 }
@@ -745,10 +747,11 @@ static INT FONT_EnumFontFamiliesEx( HDC hDC, LPLOGFONTW plf, FONTENUMPROCW efpro
         fe.lpData = lParam;
         fe.unicode = unicode;
         fe.hdc = hDC;
-	ret = physdev->funcs->pEnumFonts( physdev, plf, FONT_EnumInstance, (LPARAM)&fe );
+        fe.retval = 1;
+        ret = physdev->funcs->pEnumFonts( physdev, plf, FONT_EnumInstance, (LPARAM)&fe );
         release_dc_ptr( dc );
     }
-    return ret;
+    return ret ? fe.retval : 0;
 }
 
 /***********************************************************************

-- 
Debian Wine packaging