Aric Stewart : dwrite: Basic implementation for FontCollectionLoader registration.

[Alexandre Julliard]

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

Author: Aric Stewart 
Date:   Wed Aug  6 17:01:09 2014 -0500

dwrite: Basic implementation for FontCollectionLoader registration.

---

dlls/dwrite/main.c       | 56 ++++++++++++++++++++++++++++++++++++++++++++----
 dlls/dwrite/tests/font.c | 50 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+), 4 deletions(-)

diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c
index 3e2553c..566a6eb 100644
--- a/dlls/dwrite/main.c
+++ b/dlls/dwrite/main.c
@@ -362,6 +362,9 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale,
 struct dwritefactory{
     IDWriteFactory IDWriteFactory_iface;
     LONG ref;
+
+    IDWriteFontCollectionLoader **loaders;
+    LONG loader_count;
 };

static inline struct dwritefactory *impl_from_IDWriteFactory(IDWriteFactory *iface)
@@ -404,6 +407,11 @@ static ULONG WINAPI dwritefactory_Release(IDWriteFactory *iface)
     TRACE("(%p)->(%d)\n", This, ref);

if (!ref) {
+        int i;
+        for (i = 0; i < This->loader_count; i++)
+            if (This->loaders[i])
+                IDWriteFontCollectionLoader_Release(This->loaders[i]);
+        heap_free(This->loaders);
         heap_free(This);
     }

@@ -433,17 +441,55 @@ static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory *i
 static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory *iface,
     IDWriteFontCollectionLoader *loader)
 {
+    int i;
     struct dwritefactory *This = impl_from_IDWriteFactory(iface);
-    FIXME("(%p)->(%p): stub\n", This, loader);
-    return E_NOTIMPL;
+
+    TRACE("(%p)->(%p)\n", This, loader);
+
+    for (i = 0; i < This->loader_count; i++)
+        if (This->loaders[i] == loader)
+            return DWRITE_E_ALREADYREGISTERED;
+        else if (This->loaders[i] == NULL)
+            break;
+
+    if (i == This->loader_count)
+    {
+        IDWriteFontCollectionLoader **new_list = NULL;
+        int new_count = 0;
+
+        new_count = This->loader_count * 2;
+        new_list = heap_realloc(This->loaders, new_count * sizeof(*This->loaders));
+
+        if (!new_list)
+            return E_OUTOFMEMORY;
+        else
+        {
+            This->loader_count = new_count;
+            This->loaders = new_list;
+        }
+    }
+    IDWriteFontCollectionLoader_AddRef(loader);
+    This->loaders[i] = loader;
+
+    return S_OK;
 }

static HRESULT WINAPI dwritefactory_UnregisterFontCollectionLoader(IDWriteFactory *iface,
     IDWriteFontCollectionLoader *loader)
 {
+    int i;
     struct dwritefactory *This = impl_from_IDWriteFactory(iface);
-    FIXME("(%p)->(%p): stub\n", This, loader);
-    return E_NOTIMPL;
+
+    TRACE("(%p)->(%p)\n", This, loader);
+
+    for (i = 0; i < This->loader_count; i++)
+        if (This->loaders[i] == loader) break;
+    if (i == This->loader_count)
+            return E_INVALIDARG;
+    IDWriteFontCollectionLoader_Release(This->loaders[i]);
+    This->loaders[i] = NULL;
+
+    return S_OK;
 }

static HRESULT WINAPI dwritefactory_CreateFontFileReference(IDWriteFactory *iface,
@@ -639,6 +685,8 @@ HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnkno

This->IDWriteFactory_iface.lpVtbl = &dwritefactoryvtbl;
     This->ref = 1;
+    This->loader_count = 2;
+    This->loaders = heap_alloc_zero(sizeof(*This->loaders) * 2);

*factory = (IUnknown*)&This->IDWriteFactory_iface;

diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index 50b01a8..6366817 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -673,6 +673,55 @@ if (0) /* crashes on native */
     IDWriteFontFace_Release(fontface);
 }

+static HRESULT WINAPI fontcollectionloader_QueryInterface(IDWriteFontCollectionLoader *iface, REFIID riid, void **obj)
+{
+    *obj = iface;
+    return S_OK;
+}
+
+static ULONG WINAPI fontcollectionloader_AddRef(IDWriteFontCollectionLoader *iface)
+{
+    return 2;
+}
+
+static ULONG WINAPI fontcollectionloader_Release(IDWriteFontCollectionLoader *iface)
+{
+    return 1;
+}
+
+static HRESULT WINAPI fontcollectionloader_CreateEnumeratorFromKey(IDWriteFontCollectionLoader *iface, IDWriteFactory * factory, const void * collectionKey, UINT32  collectionKeySize, IDWriteFontFileEnumerator ** fontFileEnumerator)
+{
+    return S_OK;
+}
+
+static const struct IDWriteFontCollectionLoaderVtbl dwritefontcollectionloadervtbl = {
+    fontcollectionloader_QueryInterface,
+    fontcollectionloader_AddRef,
+    fontcollectionloader_Release,
+    fontcollectionloader_CreateEnumeratorFromKey
+};
+
+static void test_CustomFontCollection(void)
+{
+    IDWriteFontCollectionLoader collection = { &dwritefontcollectionloadervtbl };
+    IDWriteFontCollectionLoader collection2 = { &dwritefontcollectionloadervtbl };
+    HRESULT hr;
+
+    hr = IDWriteFactory_RegisterFontCollectionLoader(factory, &collection);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    hr = IDWriteFactory_RegisterFontCollectionLoader(factory, &collection2);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    hr = IDWriteFactory_RegisterFontCollectionLoader(factory, &collection);
+    ok(hr == DWRITE_E_ALREADYREGISTERED, "got 0x%08x\n", hr);
+
+    hr = IDWriteFactory_UnregisterFontCollectionLoader(factory, &collection);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    hr = IDWriteFactory_UnregisterFontCollectionLoader(factory, &collection);
+    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+    hr = IDWriteFactory_UnregisterFontCollectionLoader(factory, &collection2);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+}
+
 START_TEST(font)
 {
     HRESULT hr;
@@ -693,6 +742,7 @@ START_TEST(font)
     test_GetMetrics();
     test_system_fontcollection();
     test_ConvertFontFaceToLOGFONT();
+    test_CustomFontCollection();

IDWriteFactory_Release(factory);
 }