[Gdiplus 03/16] test_getgenerics: Don't use a pointer-to-pointer construct.
Adam Petaccia
adam at tpetaccia.com
Wed Jul 2 12:24:42 CDT 2008
Also update variable names. Hopes to reduce possible errors and unnecessary dereferencing.
---
dlls/gdiplus/tests/font.c | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 59a6cb7..e710c30 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -189,42 +189,38 @@ static void test_fontfamily (void)
static void test_getgenerics (void)
{
GpStatus stat;
- GpFontFamily** family;
+ GpFontFamily* FontFamily;
WCHAR familyName[LF_FACESIZE];
ZeroMemory(familyName, sizeof(familyName)/sizeof(WCHAR));
- family = GdipAlloc (sizeof (GpFontFamily*));
-
- stat = GdipGetGenericFontFamilySansSerif (family);
+ stat = GdipGetGenericFontFamilySansSerif (&FontFamily);
expect (Ok, stat);
- stat = GdipGetFamilyName (*family, familyName, LANG_NEUTRAL);
+ stat = GdipGetFamilyName (FontFamily, familyName, LANG_NEUTRAL);
expect (Ok, stat);
ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0) ||
(lstrcmpiW(familyName,MSSansSerif) == 0),
"Expected Microsoft Sans Serif or MS Sans Serif, got %s\n",
debugstr_w(familyName));
- stat = GdipDeleteFontFamily (*family);
+ stat = GdipDeleteFontFamily (FontFamily);
expect (Ok, stat);
- stat = GdipGetGenericFontFamilySerif (family);
+ stat = GdipGetGenericFontFamilySerif (&FontFamily);
expect (Ok, stat);
- stat = GdipGetFamilyName (*family, familyName, LANG_NEUTRAL);
+ stat = GdipGetFamilyName (FontFamily, familyName, LANG_NEUTRAL);
expect (Ok, stat);
ok (lstrcmpiW(familyName, TimesNewRoman) == 0,
"Expected Times New Roman, got %s\n", debugstr_w(familyName));
- stat = GdipDeleteFontFamily (*family);
+ stat = GdipDeleteFontFamily (FontFamily);
expect (Ok, stat);
- stat = GdipGetGenericFontFamilyMonospace (family);
+ stat = GdipGetGenericFontFamilyMonospace (&FontFamily);
expect (Ok, stat);
- stat = GdipGetFamilyName (*family, familyName, LANG_NEUTRAL);
+ stat = GdipGetFamilyName (FontFamily, familyName, LANG_NEUTRAL);
expect (Ok, stat);
ok (lstrcmpiW(familyName, CourierNew) == 0,
"Expected Courier New, got %s\n", debugstr_w(familyName));
- stat = GdipDeleteFontFamily (*family);
+ stat = GdipDeleteFontFamily (FontFamily);
expect (Ok, stat);
-
- GdipFree (family);
}
START_TEST(font)
--
1.5.4.3
More information about the wine-patches
mailing list