Nikolay Sivov : dwrite: Implement GetFontFamily() for IDWriteFontCollection1.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 54b89a2942d455190a2e38a99df573a06bf43a5e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=54b89a2942d455190a2e38a99d...

Author: Nikolay Sivov 
Date:   Tue Apr 19 09:39:26 2016 +0300

dwrite: Implement GetFontFamily() for IDWriteFontCollection1.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/dwrite/font.c       | 26 ++++++++++++++++----------
 dlls/dwrite/tests/font.c |  5 +----
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index 4120cf6..fef11e6 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -133,7 +133,7 @@ struct dwrite_fontfamily {

struct dwrite_fontfamily_data *data;

-    IDWriteFontCollection* collection;
+    IDWriteFontCollection1 *collection;
 };

struct dwrite_font {
@@ -1715,7 +1715,7 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily1 *iface)

if (!ref)
     {
-        IDWriteFontCollection_Release(This->collection);
+        IDWriteFontCollection1_Release(This->collection);
         release_fontfamily_data(This->data);
         heap_free(This);
     }
@@ -1726,10 +1726,11 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily1 *iface)
 static HRESULT WINAPI dwritefontfamily_GetFontCollection(IDWriteFontFamily1 *iface, IDWriteFontCollection **collection)
 {
     struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily1(iface);
+
     TRACE("(%p)->(%p)\n", This, collection);

-    *collection = This->collection;
-    IDWriteFontCollection_AddRef(This->collection);
+    *collection = (IDWriteFontCollection*)This->collection;
+    IDWriteFontCollection_AddRef(*collection);
     return S_OK;
 }

@@ -1971,7 +1972,7 @@ static const IDWriteFontFamily1Vtbl fontfamilyvtbl = {
     dwritefontfamily1_GetFontFaceReference
 };

-static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily1 **family)
+static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, IDWriteFontCollection1 *collection, IDWriteFontFamily1 **family)
 {
     struct dwrite_fontfamily *This;

@@ -1983,7 +1984,7 @@ static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, IDWriteFon
     This->IDWriteFontFamily1_iface.lpVtbl = &fontfamilyvtbl;
     This->ref = 1;
     This->collection = collection;
-    IDWriteFontCollection_AddRef(collection);
+    IDWriteFontCollection1_AddRef(collection);
     This->data = data;
     InterlockedIncrement(&This->data->ref);

@@ -2082,7 +2083,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection1
         return E_FAIL;
     }

-    return create_fontfamily(This->family_data[index], (IDWriteFontCollection*)iface, (IDWriteFontFamily1**)family);
+    return create_fontfamily(This->family_data[index], iface, (IDWriteFontFamily1**)family);
 }

static UINT32 collection_find_family(struct dwrite_fontcollection *collection, const WCHAR *name)
@@ -2176,7 +2177,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec
     if (!found_font)
         return DWRITE_E_NOFONT;

-    hr = create_fontfamily(found_family, (IDWriteFontCollection*)iface, &family);
+    hr = create_fontfamily(found_family, iface, &family);
     if (FAILED(hr))
         return hr;

@@ -2198,9 +2199,14 @@ static HRESULT WINAPI dwritefontcollection1_GetFontFamily(IDWriteFontCollection1
 {
     struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection1(iface);

-    FIXME("(%p)->(%p): stub\n", This, family);
+    TRACE("(%p)->(%u %p)\n", This, index, family);

-    return E_NOTIMPL;
+    if (index >= This->family_count) {
+        *family = NULL;
+        return E_FAIL;
+    }
+
+    return create_fontfamily(This->family_data[index], iface, family);
 }

static const IDWriteFontCollection1Vtbl fontcollectionvtbl = {
diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index a57b9ae..515ece4 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -2073,14 +2073,11 @@ static void test_system_fontcollection(void)

family1 = (void*)0xdeadbeef;
         hr = IDWriteFontCollection1_GetFontFamily(collection1, ~0u, &family1);
-    todo_wine {
         ok(hr == E_FAIL, "got 0x%08x\n", hr);
         ok(family1 == NULL, "got %p\n", family1);
-    }
+
         hr = IDWriteFontCollection1_GetFontFamily(collection1, 0, &family1);
-    todo_wine
         ok(hr == S_OK, "got 0x%08x\n", hr);
-    if (hr == S_OK)
         IDWriteFontFamily1_Release(family1);
         IDWriteFontCollection1_Release(collection1);
     }