gdiplus: fix font test when liberation fonts are installed

Austin English austinenglish at gmail.com
Wed Oct 17 21:48:49 CDT 2012


-- 
-Austin
-------------- next part --------------
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 568f9b7..dc2eede 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -780,7 +780,8 @@ static void test_font_substitution(void)
     memset(&lf, 0xfe, sizeof(lf));
     status = GdipGetLogFontA(font, graphics, &lf);
     expect(Ok, status);
-    ok(!lstrcmp(lf.lfFaceName, "Arial"), "wrong face name %s\n", lf.lfFaceName);
+    ok(!lstrcmp(lf.lfFaceName, "Arial") || 
+       !lstrcmp(lf.lfFaceName, "Liberation Sans"), "wrong face name %s\n", lf.lfFaceName);
     GdipDeleteFont(font);
 
     /* empty FaceName */
@@ -790,7 +791,8 @@ static void test_font_substitution(void)
     memset(&lf, 0xfe, sizeof(lf));
     status = GdipGetLogFontA(font, graphics, &lf);
     expect(Ok, status);
-    ok(!lstrcmp(lf.lfFaceName, "Arial"), "wrong face name %s\n", lf.lfFaceName);
+    ok(!lstrcmp(lf.lfFaceName, "Arial") || 
+       !lstrcmp(lf.lfFaceName, "Liberation Sans"), "wrong face name %s\n", lf.lfFaceName);
     GdipDeleteFont(font);
 
     /* zeroing out lfWeight and lfCharSet leads to font creation failure */


More information about the wine-patches mailing list