From 0e58986d4f9838eaf14a5589891dd130e03ede3f Mon Sep 17 00:00:00 2001
From: Huw Davies <huw@codeweavers.com>
Date: Wed, 11 Aug 2004 18:49:34 +0000
Subject: [PATCH] Don't ever return a bitmap font if the driver can't use it.

---
 dlls/gdi/freetype.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c
index fc532a54ac1..06db51609c8 100644
--- a/dlls/gdi/freetype.c
+++ b/dlls/gdi/freetype.c
@@ -1726,9 +1726,18 @@ GdiFont WineEngCreateFontInstance(DC *dc, HFONT hfont)
     }
 
     if(!family) {
-        family = FontList;
-	csi.fs.fsCsb[0] = 0;
-	FIXME("just using first face for now\n");
+        for(family = FontList; family; family = family->next) {
+            if(family->FirstFace->scalable || can_use_bitmap) {
+                csi.fs.fsCsb[0] = 0;
+                break;
+                FIXME("just using first face for now\n");
+            }
+        }
+        if(!family) {
+            FIXME("can't find a single appropriate font - bailing\n");
+            free_font(ret);
+            return NULL;
+        }
     }
 
     it = lf.lfItalic ? 1 : 0;
-- 
2.11.4.GIT