Commit bcd793bf authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

gdiplus/tests: Don't check for hardcoded family font names.

Only check that each font family is different and that we can create fonts from them.
parent 8973c20f
...@@ -34,6 +34,7 @@ static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ...@@ -34,6 +34,7 @@ static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t','
static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'};
static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'};
static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0};
static const WCHAR LiberationSerif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0};
static void test_createfont(void) static void test_createfont(void)
{ {
...@@ -284,60 +285,62 @@ static void test_fontfamily_properties (void) ...@@ -284,60 +285,62 @@ static void test_fontfamily_properties (void)
} }
} }
static void test_getgenerics (void) static void check_family(const char* context, GpFontFamily *family, WCHAR *name)
{ {
GpStatus stat; GpStatus stat;
GpFontFamily* family; GpFont* font;
WCHAR familyName[LF_FACESIZE];
ZeroMemory(familyName, sizeof(familyName)/sizeof(WCHAR));
stat = GdipGetGenericFontFamilySansSerif (&family); *name = 0;
if (stat == FontFamilyNotFound) stat = GdipGetFamilyName(family, name, LANG_NEUTRAL);
ok(stat == Ok, "could not get the %s family name: %.8x\n", context, stat);
stat = GdipCreateFont(family, 12, FontStyleRegular, UnitPixel, &font);
ok(stat == Ok, "could not create a font for the %s family: %.8x\n", context, stat);
if (stat == Ok)
{ {
skip("Microsoft Sans Serif not installed\n"); stat = GdipDeleteFont(font);
goto serif; ok(stat == Ok, "could not delete the %s family font: %.8x\n", context, stat);
} }
stat = GdipDeleteFontFamily(family);
ok(stat == Ok, "could not delete the %s family: %.8x\n", context, stat);
}
static void test_getgenerics (void)
{
GpStatus stat;
GpFontFamily *family;
WCHAR sansname[LF_FACESIZE], serifname[LF_FACESIZE], mononame[LF_FACESIZE];
int missingfonts = 0;
stat = GdipGetGenericFontFamilySansSerif(&family);
expect (Ok, stat); expect (Ok, stat);
stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); if (stat == FontFamilyNotFound)
expect (Ok, stat); missingfonts = 1;
if (!lstrcmpiW(familyName, Tahoma))
todo_wine ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0),
"Expected Microsoft Sans Serif, got Tahoma\n");
else else
ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0), check_family("Sans Serif", family, sansname);
"Expected Microsoft Sans Serif, got %s\n", wine_dbgstr_w(familyName));
stat = GdipDeleteFontFamily (family);
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);
stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL);
expect (Ok, stat);
ok (lstrcmpiW(familyName, TimesNewRoman) == 0,
"Expected Times New Roman, got %s\n", wine_dbgstr_w(familyName));
stat = GdipDeleteFontFamily (family);
expect (Ok, stat); expect (Ok, stat);
monospace:
stat = GdipGetGenericFontFamilyMonospace (&family);
if (stat == FontFamilyNotFound) if (stat == FontFamilyNotFound)
{ missingfonts = 1;
skip("Courier New not installed\n"); else
return; check_family("Serif", family, serifname);
}
expect (Ok, stat); stat = GdipGetGenericFontFamilyMonospace(&family);
stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL);
expect (Ok, stat);
ok (lstrcmpiW(familyName, CourierNew) == 0,
"Expected Courier New, got %s\n", wine_dbgstr_w(familyName));
stat = GdipDeleteFontFamily (family);
expect (Ok, stat); expect (Ok, stat);
if (stat == FontFamilyNotFound)
missingfonts = 1;
else
check_family("Monospace", family, mononame);
if (missingfonts && strcmp(winetest_platform, "wine") == 0)
trace("You may need to install either the Microsoft Web Fonts or the Liberation Fonts\n");
/* Check that the family names are all different */
ok(lstrcmpiW(sansname, serifname) != 0, "Sans Serif and Serif families should be different: %s\n", wine_dbgstr_w(sansname));
ok(lstrcmpiW(sansname, mononame) != 0, "Sans Serif and Monospace families should be different: %s\n", wine_dbgstr_w(sansname));
ok(lstrcmpiW(serifname, mononame) != 0, "Serif and Monospace families should be different: %s\n", wine_dbgstr_w(serifname));
} }
static void test_installedfonts (void) static void test_installedfonts (void)
......
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