Huw Davies : gdi32: Skip vdmx records with charset == 0.

Alexandre Julliard julliard at winehq.org
Wed Aug 28 14:03:11 CDT 2013


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

Author: Huw Davies <huw at codeweavers.com>
Date:   Wed Aug 28 14:21:13 2013 +0100

gdi32: Skip vdmx records with charset == 0.

---

 dlls/gdi32/freetype.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 3d61ad1..d9f111a 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4512,6 +4512,8 @@ static LONG load_VDMX(GdiFont *font, LONG height)
 
 	TRACE("Ratios[%d] %d  %d : %d -> %d\n", i, ratio.bCharSet, ratio.xRatio, ratio.yStartRatio, ratio.yEndRatio);
 
+        if (!ratio.bCharSet) continue;
+
 	if((ratio.xRatio == 0 &&
 	    ratio.yStartRatio == 0 &&
 	    ratio.yEndRatio == 0) ||
@@ -4526,10 +4528,7 @@ static LONG load_VDMX(GdiFont *font, LONG height)
 	    }
     }
 
-    if(offset == -1) {
-	FIXME("No suitable ratio found\n");
-	return ppem;
-    }
+    if(offset == -1) return 0;
 
     if(get_font_data(font, MS_VDMX_TAG, offset, &group, 4) != GDI_ERROR) {
 	USHORT recs;




More information about the wine-cvs mailing list