From 45ee7577c49c672c7684d83513def38f327288a9 Mon Sep 17 00:00:00 2001 From: Adam Petaccia Date: Thu, 3 Jul 2008 14:25:56 -0400 Subject: [PATCH] gdiplus: test_fontfamily: Don't use a pointer-to-pointer construct. --- dlls/gdiplus/tests/font.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 1aed45fc731..38d807b0f34 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -150,49 +150,37 @@ static void test_logfont(void) static void test_fontfamily (void) { - GpFontFamily** family = NULL; + GpFontFamily* family; WCHAR itsName[LF_FACESIZE]; GpStatus stat; /* FontFamily can not be NULL */ - stat = GdipCreateFontFamilyFromName (arial , NULL, family); + stat = GdipCreateFontFamilyFromName (arial , NULL, NULL); expect (InvalidParameter, stat); - family = GdipAlloc (sizeof (GpFontFamily*)); - /* FontFamily must be able to actually find the family. - * If it can't, any subsequent calls should fail - * - * We currently fail (meaning we don't) because we don't actually - * test to see if we can successfully get a family + * If it can't, any subsequent calls should fail. */ - stat = GdipCreateFontFamilyFromName (nonexistant, NULL, family); + stat = GdipCreateFontFamilyFromName (nonexistant, NULL, &family); expect (FontFamilyNotFound, stat); - stat = GdipGetFamilyName (*family,itsName, LANG_NEUTRAL); - expect (InvalidParameter, stat); - ok ((lstrcmpiW(itsName,nonexistant) != 0), + ok ((lstrcmpiW(itsName, nonexistant) != 0), "Expected a non-zero value for nonexistant font!\n"); - stat = GdipDeleteFontFamily(*family); - expect (InvalidParameter, stat); - stat = GdipCreateFontFamilyFromName (arial, NULL, family); + stat = GdipCreateFontFamilyFromName (arial, NULL, &family); expect (Ok, stat); - stat = GdipGetFamilyName (*family, itsName, LANG_NEUTRAL); + stat = GdipGetFamilyName (family, itsName, LANG_NEUTRAL); expect (Ok, stat); - expect (0, lstrcmpiW(itsName,arial)); + expect (0, lstrcmpiW(itsName, arial)); if (0) { /* Crashes on Windows XP SP2, Vista, and so Wine as well */ - stat = GdipGetFamilyName (*family, NULL, LANG_NEUTRAL); + stat = GdipGetFamilyName (family, NULL, LANG_NEUTRAL); expect (Ok, stat); } - stat = GdipDeleteFontFamily(*family); - expect (Ok, stat); - - GdipFree (family); + GdipDeleteFontFamily(family); }