Nikolay Sivov : dwrite: Add partial implementation for IDWriteFontFace5::Equals().

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 4b439db446be1ac03a46a0f4ec8d4be705ce1420
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4b439db446be1ac03a46a0f4e...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Fri Aug 21 15:39:27 2020 +0300

dwrite: Add partial implementation for IDWriteFontFace5::Equals().

Issue with missing method spotted by Brendan Shanks.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit ab94abb14f74fe863ae40dafc7a8301db22792fc)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/dwrite/font.c       | 17 +++++++++++++++++
 dlls/dwrite/tests/font.c | 11 ++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index 9f3e005236e..9099ed42a5c 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -1471,6 +1471,22 @@ static HRESULT WINAPI dwritefontface5_GetFontResource(IDWriteFontFace5 *iface, I
     return IDWriteFactory7_CreateFontResource(fontface->factory, fontface->files[0], fontface->index, resource);
 }
 
+static BOOL WINAPI dwritefontface5_Equals(IDWriteFontFace5 *iface, IDWriteFontFace *other)
+{
+    struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface), *other_face;
+
+    TRACE("%p, %p.\n", iface, other);
+
+    if (!(other_face = unsafe_impl_from_IDWriteFontFace(other)))
+        return FALSE;
+
+    /* TODO: add variations support */
+
+    return fontface->index == other_face->index &&
+            fontface->simulations == other_face->simulations &&
+            is_same_fontfile(fontface->files[0], other_face->files[0]);
+}
+
 static const IDWriteFontFace5Vtbl dwritefontfacevtbl =
 {
     dwritefontface_QueryInterface,
@@ -1530,6 +1546,7 @@ static const IDWriteFontFace5Vtbl dwritefontfacevtbl =
     dwritefontface5_GetFontAxisValues,
     dwritefontface5_HasVariations,
     dwritefontface5_GetFontResource,
+    dwritefontface5_Equals,
 };
 
 static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace5 **fontface)
diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index b2892b8e854..23630a73bf6 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -1779,13 +1779,14 @@ static void test_CreateFontFace(void)
     IDWriteFontCollection *collection;
     DWRITE_FONT_FILE_TYPE file_type;
     DWRITE_FONT_FACE_TYPE face_type;
+    IDWriteFontFace5 *fontface5;
     IDWriteGdiInterop *interop;
     IDWriteFont *font, *font2;
     IDWriteFontFamily *family;
     IDWriteFactory *factory;
     IDWriteFontFile *file;
+    BOOL supported, ret;
     LOGFONTW logfont;
-    BOOL supported;
     UINT32 count;
     WCHAR *path;
     HRESULT hr;
@@ -1870,6 +1871,14 @@ static void test_CreateFontFace(void)
     ok(hr == S_OK, "got 0x%08x\n", hr);
     ok(fontface == fontface2, "got %p, was %p\n", fontface2, fontface);
 
+    /* Trivial equality test */
+    if (SUCCEEDED(IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5)))
+    {
+        ret = IDWriteFontFace5_Equals(fontface5, fontface2);
+        ok(ret, "Unexpected result %d.\n", ret);
+        IDWriteFontFace5_Release(fontface5);
+    }
+
     IDWriteFontFace_Release(fontface);
     IDWriteFontFace_Release(fontface2);
     IDWriteFont_Release(font2);