Nikolay Sivov : dwrite: Support IDWriteFontList1 for font families.
Alexandre Julliard
julliard at winehq.org
Mon May 21 17:15:11 CDT 2018
Module: wine
Branch: master
Commit: f3908ad6763eeef0e750a0162ebca8855a3cfb3c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3908ad6763eeef0e750a0162ebca8855a3cfb3c
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon May 21 23:11:02 2018 +0300
dwrite: Support IDWriteFontList1 for font families.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dwrite/font.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++-
dlls/dwrite/tests/font.c | 14 ++++++--
2 files changed, 95 insertions(+), 3 deletions(-)
diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index c7824b6..9556fd3 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -124,6 +124,7 @@ struct dwrite_fontcollection {
struct dwrite_fontfamily {
IDWriteFontFamily1 IDWriteFontFamily1_iface;
+ IDWriteFontList1 IDWriteFontList1_iface;
LONG ref;
struct dwrite_fontfamily_data *data;
@@ -289,6 +290,11 @@ static inline struct dwrite_fontfamily *impl_from_IDWriteFontFamily1(IDWriteFont
return CONTAINING_RECORD(iface, struct dwrite_fontfamily, IDWriteFontFamily1_iface);
}
+static inline struct dwrite_fontfamily *impl_family_from_IDWriteFontList1(IDWriteFontList1 *iface)
+{
+ return CONTAINING_RECORD(iface, struct dwrite_fontfamily, IDWriteFontList1_iface);
+}
+
static inline struct dwrite_fontcollection *impl_from_IDWriteFontCollection1(IDWriteFontCollection1 *iface)
{
return CONTAINING_RECORD(iface, struct dwrite_fontcollection, IDWriteFontCollection1_iface);
@@ -1963,7 +1969,6 @@ static HRESULT WINAPI dwritefontfamily_QueryInterface(IDWriteFontFamily1 *iface,
if (IsEqualIID(riid, &IID_IDWriteFontFamily1) ||
IsEqualIID(riid, &IID_IDWriteFontFamily) ||
- IsEqualIID(riid, &IID_IDWriteFontList) ||
IsEqualIID(riid, &IID_IUnknown))
{
*obj = iface;
@@ -1971,6 +1976,14 @@ static HRESULT WINAPI dwritefontfamily_QueryInterface(IDWriteFontFamily1 *iface,
return S_OK;
}
+ if (IsEqualIID(riid, &IID_IDWriteFontList1) ||
+ IsEqualIID(riid, &IID_IDWriteFontList))
+ {
+ *obj = &This->IDWriteFontList1_iface;
+ IDWriteFontList1_AddRef(&This->IDWriteFontList1_iface);
+ return S_OK;
+ }
+
WARN("%s not implemented.\n", debugstr_guid(riid));
*obj = NULL;
@@ -2261,6 +2274,74 @@ static const IDWriteFontFamily1Vtbl fontfamilyvtbl = {
dwritefontfamily1_GetFontFaceReference
};
+static HRESULT WINAPI dwritefontfamilylist_QueryInterface(IDWriteFontList1 *iface, REFIID riid, void **obj)
+{
+ struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface);
+ return dwritefontfamily_QueryInterface(&This->IDWriteFontFamily1_iface, riid, obj);
+}
+
+static ULONG WINAPI dwritefontfamilylist_AddRef(IDWriteFontList1 *iface)
+{
+ struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface);
+ return dwritefontfamily_AddRef(&This->IDWriteFontFamily1_iface);
+}
+
+static ULONG WINAPI dwritefontfamilylist_Release(IDWriteFontList1 *iface)
+{
+ struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface);
+ return dwritefontfamily_Release(&This->IDWriteFontFamily1_iface);
+}
+
+static HRESULT WINAPI dwritefontfamilylist_GetFontCollection(IDWriteFontList1 *iface,
+ IDWriteFontCollection **collection)
+{
+ struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface);
+ return dwritefontfamily_GetFontCollection(&This->IDWriteFontFamily1_iface, collection);
+}
+
+static UINT32 WINAPI dwritefontfamilylist_GetFontCount(IDWriteFontList1 *iface)
+{
+ struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface);
+ return dwritefontfamily_GetFontCount(&This->IDWriteFontFamily1_iface);
+}
+
+static HRESULT WINAPI dwritefontfamilylist_GetFont(IDWriteFontList1 *iface, UINT32 index, IDWriteFont **font)
+{
+ struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface);
+ return dwritefontfamily_GetFont(&This->IDWriteFontFamily1_iface, index, font);
+}
+
+static DWRITE_LOCALITY WINAPI dwritefontfamilylist1_GetFontLocality(IDWriteFontList1 *iface, UINT32 index)
+{
+ struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface);
+ return dwritefontfamily1_GetFontLocality(&This->IDWriteFontFamily1_iface, index);
+}
+
+static HRESULT WINAPI dwritefontfamilylist1_GetFont(IDWriteFontList1 *iface, UINT32 index, IDWriteFont3 **font)
+{
+ struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface);
+ return dwritefontfamily1_GetFont(&This->IDWriteFontFamily1_iface, index, font);
+}
+
+static HRESULT WINAPI dwritefontfamilylist1_GetFontFaceReference(IDWriteFontList1 *iface, UINT32 index,
+ IDWriteFontFaceReference **reference)
+{
+ struct dwrite_fontfamily *This = impl_family_from_IDWriteFontList1(iface);
+ return dwritefontfamily1_GetFontFaceReference(&This->IDWriteFontFamily1_iface, index, reference);
+}
+
+static const IDWriteFontList1Vtbl fontfamilylistvtbl = {
+ dwritefontfamilylist_QueryInterface,
+ dwritefontfamilylist_AddRef,
+ dwritefontfamilylist_Release,
+ dwritefontfamilylist_GetFontCollection,
+ dwritefontfamilylist_GetFontCount,
+ dwritefontfamilylist_GetFont,
+ dwritefontfamilylist1_GetFontLocality,
+ dwritefontfamilylist1_GetFont,
+ dwritefontfamilylist1_GetFontFaceReference,
+};
+
static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT32 index, IDWriteFontFamily1 **family)
{
struct dwrite_fontfamily *This;
@@ -2271,6 +2352,7 @@ static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT3
if (!This) return E_OUTOFMEMORY;
This->IDWriteFontFamily1_iface.lpVtbl = &fontfamilyvtbl;
+ This->IDWriteFontList1_iface.lpVtbl = &fontfamilylistvtbl;
This->ref = 1;
This->collection = collection;
IDWriteFontCollection1_AddRef(&collection->IDWriteFontCollection1_iface);
diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index c226dba..1180ad4 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -1517,6 +1517,7 @@ if (0) /* crashes on native */
hr = IDWriteFontFamily_QueryInterface(family, &IID_IDWriteFontFamily1, (void**)&family1);
if (hr == S_OK) {
IDWriteFontFaceReference *ref, *ref1;
+ IDWriteFontList1 *fontlist1;
IDWriteFontList *fontlist;
IDWriteFont3 *font3;
IDWriteFont1 *font1;
@@ -1537,8 +1538,17 @@ if (0) /* crashes on native */
ok(hr == S_OK, "got 0x%08x\n", hr);
IDWriteFont1_Release(font1);
- hr = IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList1, (void**)&fontlist);
- ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr);
+ hr = IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList1, (void **)&fontlist1);
+ ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Failed to get interface, hr %#x.\n", hr);
+ if (hr == S_OK) {
+ hr = IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList, (void **)&fontlist);
+ ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+ ok(fontlist == (IDWriteFontList *)fontlist1, "Unexpected interface pointer.\n");
+ ok(fontlist != (IDWriteFontList *)family1, "Unexpected interface pointer.\n");
+ ok(fontlist != (IDWriteFontList *)family, "Unexpected interface pointer.\n");
+ IDWriteFontList1_Release(fontlist1);
+ IDWriteFontList_Release(fontlist);
+ }
hr = IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList, (void**)&fontlist);
ok(hr == S_OK, "got 0x%08x\n", hr);
More information about the wine-cvs
mailing list