Commit e4cc0bc4 authored by Adam Petaccia's avatar Adam Petaccia Committed by Alexandre Julliard

gdiplus: Skip the generic font tests if we don't have the required fonts.

parent 2f366935
...@@ -108,6 +108,11 @@ todo_wine { ...@@ -108,6 +108,11 @@ todo_wine {
memcpy(&lfw.lfFaceName, arial, 6 * sizeof(WCHAR)); memcpy(&lfw.lfFaceName, arial, 6 * sizeof(WCHAR));
stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font); stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font);
if (stat == FileNotFound)
{
skip("Arial not installed.\n");
return;
}
expect(Ok, stat); expect(Ok, stat);
stat = GdipGetLogFontW(font, graphics, &lfw2); stat = GdipGetLogFontW(font, graphics, &lfw2);
expect(Ok, stat); expect(Ok, stat);
...@@ -282,6 +287,11 @@ static void test_getgenerics (void) ...@@ -282,6 +287,11 @@ static void test_getgenerics (void)
ZeroMemory(familyName, sizeof(familyName)/sizeof(WCHAR)); ZeroMemory(familyName, sizeof(familyName)/sizeof(WCHAR));
stat = GdipGetGenericFontFamilySansSerif (&family); stat = GdipGetGenericFontFamilySansSerif (&family);
if (stat == FontFamilyNotFound)
{
skip("Microsoft Sans Serif not installed\n");
goto serif;
}
expect (Ok, stat); expect (Ok, stat);
stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL);
expect (Ok, stat); expect (Ok, stat);
...@@ -292,7 +302,13 @@ static void test_getgenerics (void) ...@@ -292,7 +302,13 @@ static void test_getgenerics (void)
stat = GdipDeleteFontFamily (family); stat = GdipDeleteFontFamily (family);
expect (Ok, stat); expect (Ok, stat);
serif:
stat = GdipGetGenericFontFamilySerif (&family); stat = GdipGetGenericFontFamilySerif (&family);
if (stat == FontFamilyNotFound)
{
skip("Times New Roman not installed\n");
goto monospace;
}
expect (Ok, stat); expect (Ok, stat);
stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL);
expect (Ok, stat); expect (Ok, stat);
...@@ -301,7 +317,13 @@ static void test_getgenerics (void) ...@@ -301,7 +317,13 @@ static void test_getgenerics (void)
stat = GdipDeleteFontFamily (family); stat = GdipDeleteFontFamily (family);
expect (Ok, stat); expect (Ok, stat);
monospace:
stat = GdipGetGenericFontFamilyMonospace (&family); stat = GdipGetGenericFontFamilyMonospace (&family);
if (stat == FontFamilyNotFound)
{
skip("Courier New not installed\n");
return;
}
expect (Ok, stat); expect (Ok, stat);
stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL);
expect (Ok, stat); expect (Ok, stat);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment