Huw Davies : gdiplus: Skip some tests if certain fonts are not installed.

[Alexandre Julliard]

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

Author: Huw Davies <huw at codeweavers.com>
Date:   Thu Jul 17 16:45:31 2008 +0100

gdiplus: Skip some tests if certain fonts are not installed.

---

 dlls/gdiplus/tests/font.c |   88 +++++++++++++++++++++++++++-----------------
 1 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 0487655..5f6494b 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -53,6 +53,11 @@ static void test_createfont(void)
     stat = GdipDeleteFont(font);
     expect (InvalidParameter, stat);
     stat = GdipCreateFontFamilyFromName(arial, NULL, &fontfamily);
+    if(stat == FontFamilyNotFound)
+    {
+        skip("Arial not installed\n");
+        return;
+    }
     expect (Ok, stat);
     stat = GdipCreateFont(fontfamily, 12, FontStyleRegular, UnitPoint, &font);
     expect (Ok, stat);
@@ -174,6 +179,11 @@ todo_wine
 }
 
     stat = GdipCreateFontFamilyFromName (arial, NULL, &family);
+    if(stat == FontFamilyNotFound)
+    {
+        skip("Arial not installed\n");
+        return;
+    }
     expect (Ok, stat);
 
     stat = GdipGetFamilyName (family, itsName, LANG_NEUTRAL);
@@ -205,46 +215,56 @@ static void test_fontfamily_properties (void)
     GpStatus stat;
     UINT16 result = 0;
 
-    GdipCreateFontFamilyFromName(arial, NULL, &FontFamily);
+    stat = GdipCreateFontFamilyFromName(arial, NULL, &FontFamily);
+    if(stat == FontFamilyNotFound)
+        skip("Arial not installed\n");
+    else
+    {
 todo_wine
 {
-    stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result);
-    expect(Ok, stat);
-    ok (result == 2355, "Expected 2355, got %d\n", result);
+        stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result);
+        expect(Ok, stat);
+        ok (result == 2355, "Expected 2355, got %d\n", result);
 }
-    result = 0;
-    stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result);
-    expect(Ok, stat);
-    ok(result == 2048, "Expected 2048, got %d\n", result);
-    result = 0;
-    stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result);
-    expect(Ok, stat);
-    ok(result == 1854, "Expected 1854, got %d\n", result);
-    result = 0;
-    stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result);
-    ok(result == 434, "Expected 434, got %d\n", result);
-    GdipDeleteFontFamily(FontFamily);
-
-    GdipCreateFontFamilyFromName(TimesNewRoman, NULL, &FontFamily);
-    result = 0;
+        result = 0;
+        stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result);
+        expect(Ok, stat);
+        ok(result == 2048, "Expected 2048, got %d\n", result);
+        result = 0;
+        stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result);
+        expect(Ok, stat);
+        ok(result == 1854, "Expected 1854, got %d\n", result);
+        result = 0;
+        stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result);
+        ok(result == 434, "Expected 434, got %d\n", result);
+        GdipDeleteFontFamily(FontFamily);
+    }
+
+    stat = GdipCreateFontFamilyFromName(TimesNewRoman, NULL, &FontFamily);
+    if(stat == FontFamilyNotFound)
+        skip("Times New Roman not installed\n");
+    else
+    {
+        result = 0;
 todo_wine
 {
-    stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result);
-    expect(Ok, stat);
-    ok(result == 2355, "Expected 2355, got %d\n", result);
+        stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result);
+        expect(Ok, stat);
+        ok(result == 2355, "Expected 2355, got %d\n", result);
 }
-    result = 0;
-    stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result);
-    expect(Ok, stat);
-    ok(result == 2048, "Expected 2048, got %d\n", result);
-    result = 0;
-    stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result);
-    expect(Ok, stat);
-    ok(result == 1825, "Expected 1825, got %d\n", result);
-    result = 0;
-    stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result);
-    ok(result == 443, "Expected 443 got %d\n", result);
-    GdipDeleteFontFamily(FontFamily);
+        result = 0;
+        stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result);
+        expect(Ok, stat);
+        ok(result == 2048, "Expected 2048, got %d\n", result);
+        result = 0;
+        stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result);
+        expect(Ok, stat);
+        ok(result == 1825, "Expected 1825, got %d\n", result);
+        result = 0;
+        stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result);
+        ok(result == 443, "Expected 443 got %d\n", result);
+        GdipDeleteFontFamily(FontFamily);
+    }
 }
 
 static void test_getgenerics (void)