[Gdiplus 5/5] Implement GdipGetFontCollectionFamilyCount

Adam Petaccia adam at tpetaccia.com
Sat Aug 16 22:29:23 CDT 2008


---
 dlls/gdiplus/font.c       |    8 ++++++--
 dlls/gdiplus/tests/font.c |    4 +---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c
index ce43a80..f0e220c 100644
--- a/dlls/gdiplus/font.c
+++ b/dlls/gdiplus/font.c
@@ -735,12 +735,16 @@ GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection* fontCollection,
 GpStatus WINGDIPAPI GdipGetFontCollectionFamilyCount(
         GpFontCollection* fontCollection, INT* numFound)
 {
-    FIXME("stub: %p, %p\n", fontCollection, numFound);
+    TRACE("%p, %p\n", fontCollection, numFound);
 
     if (!(fontCollection && numFound))
         return InvalidParameter;
 
-    return NotImplemented;
+    *numFound = fontCollection->FamilyCount;
+
+    TRACE("Returning %d found\n", *numFound);
+
+    return Ok;
 }
 
 /*****************************************************************************
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 2b7a5c9..8145708 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -368,12 +368,9 @@ static void test_fontcollections(void)
         hastimesnr = TRUE;
     }
 
-todo_wine
-{
     stat = GdipGetFontCollectionFamilyCount(PrivateFontCollection, &count);
     expect(Ok, stat);
     expect(expected, count);
-}
 
     expected = count;
 
@@ -407,6 +404,7 @@ todo_wine
     for (i = 0; i < count; i++)
     {
         stat = GdipDeleteFontFamily(fontFamily[i]);
+todo_wine
         expect(Ok, stat);
     }
 
-- 
1.5.4.3




More information about the wine-patches mailing list