gdiplus: test_getgenerics: Don't use a pointer-to-pointer construct.
This commit is contained in:
parent
45ee7577c4
commit
148f184c23
|
@ -187,42 +187,38 @@ static void test_fontfamily (void)
|
||||||
static void test_getgenerics (void)
|
static void test_getgenerics (void)
|
||||||
{
|
{
|
||||||
GpStatus stat;
|
GpStatus stat;
|
||||||
GpFontFamily** family;
|
GpFontFamily* family;
|
||||||
WCHAR familyName[LF_FACESIZE];
|
WCHAR familyName[LF_FACESIZE];
|
||||||
ZeroMemory(familyName, sizeof(familyName)/sizeof(WCHAR));
|
ZeroMemory(familyName, sizeof(familyName)/sizeof(WCHAR));
|
||||||
|
|
||||||
family = GdipAlloc (sizeof (GpFontFamily*));
|
stat = GdipGetGenericFontFamilySansSerif (&family);
|
||||||
|
|
||||||
stat = GdipGetGenericFontFamilySansSerif (family);
|
|
||||||
expect (Ok, stat);
|
expect (Ok, stat);
|
||||||
stat = GdipGetFamilyName (*family, familyName, LANG_NEUTRAL);
|
stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL);
|
||||||
expect (Ok, stat);
|
expect (Ok, stat);
|
||||||
ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0) ||
|
ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0) ||
|
||||||
(lstrcmpiW(familyName,MSSansSerif) == 0),
|
(lstrcmpiW(familyName,MSSansSerif) == 0),
|
||||||
"Expected Microsoft Sans Serif or MS Sans Serif, got %s\n",
|
"Expected Microsoft Sans Serif or MS Sans Serif, got %s\n",
|
||||||
debugstr_w(familyName));
|
debugstr_w(familyName));
|
||||||
stat = GdipDeleteFontFamily (*family);
|
stat = GdipDeleteFontFamily (family);
|
||||||
expect (Ok, stat);
|
expect (Ok, stat);
|
||||||
|
|
||||||
stat = GdipGetGenericFontFamilySerif (family);
|
stat = GdipGetGenericFontFamilySerif (&family);
|
||||||
expect (Ok, stat);
|
expect (Ok, stat);
|
||||||
stat = GdipGetFamilyName (*family, familyName, LANG_NEUTRAL);
|
stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL);
|
||||||
expect (Ok, stat);
|
expect (Ok, stat);
|
||||||
ok (lstrcmpiW(familyName, TimesNewRoman) == 0,
|
ok (lstrcmpiW(familyName, TimesNewRoman) == 0,
|
||||||
"Expected Times New Roman, got %s\n", debugstr_w(familyName));
|
"Expected Times New Roman, got %s\n", debugstr_w(familyName));
|
||||||
stat = GdipDeleteFontFamily (*family);
|
stat = GdipDeleteFontFamily (family);
|
||||||
expect (Ok, stat);
|
expect (Ok, stat);
|
||||||
|
|
||||||
stat = GdipGetGenericFontFamilyMonospace (family);
|
stat = GdipGetGenericFontFamilyMonospace (&family);
|
||||||
expect (Ok, stat);
|
expect (Ok, stat);
|
||||||
stat = GdipGetFamilyName (*family, familyName, LANG_NEUTRAL);
|
stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL);
|
||||||
expect (Ok, stat);
|
expect (Ok, stat);
|
||||||
ok (lstrcmpiW(familyName, CourierNew) == 0,
|
ok (lstrcmpiW(familyName, CourierNew) == 0,
|
||||||
"Expected Courier New, got %s\n", debugstr_w(familyName));
|
"Expected Courier New, got %s\n", debugstr_w(familyName));
|
||||||
stat = GdipDeleteFontFamily (*family);
|
stat = GdipDeleteFontFamily (family);
|
||||||
expect (Ok, stat);
|
expect (Ok, stat);
|
||||||
|
|
||||||
GdipFree (family);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
START_TEST(font)
|
START_TEST(font)
|
||||||
|
|
Loading…
Reference in New Issue