dwrite: Support IDWriteTextFormat2 for layout.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dwrite: Support IDWriteTextFormat2 for layout.
8b9ba16e · Nikolay Sivov · Alexandre Julliard · f3908ad6 · 8b9ba16e · 8b9ba16e
Commit 8b9ba16e authored May 22, 2018 by Nikolay Sivov Committed by Alexandre Julliard May 22, 2018
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

layout.c dlls/dwrite/layout.c +0 -0

layout.c dlls/dwrite/tests/layout.c +11 -3

No files found.
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -5329,17 +5329,25 @@ static void test_InvalidateLayout(void)
        IDWriteTextFormat2_Release(format2);

        hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat2, (void**)&format2);
-        ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr);
+        ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Unexpected hr %#x.\n", hr);
+        if (hr == S_OK) {
+            ok(format != (IDWriteTextFormat *)format2, "Unexpected interface pointer.\n");
+            IDWriteTextFormat2_Release(format2);
+        }

        hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat1, (void**)&format1);
        ok(hr == S_OK, "got 0x%08x\n", hr);

        hr = IDWriteTextFormat1_QueryInterface(format1, &IID_IDWriteTextFormat2, (void**)&format2);
-        ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr);
+        ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Unexpected hr %#x.\n", hr);
+        if (hr == S_OK)
+            IDWriteTextFormat2_Release(format2);
        IDWriteTextFormat1_Release(format1);

        hr = IDWriteTextLayout3_QueryInterface(layout3, &IID_IDWriteTextFormat2, (void**)&format2);
-        ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr);
+        ok(hr == S_OK || broken(hr == E_NOINTERFACE), "got 0x%08x\n", hr);
+        if (hr == S_OK)
+            IDWriteTextFormat2_Release(format2);

        hr = IDWriteTextLayout3_InvalidateLayout(layout3);
        ok(hr == S_OK, "got 0x%08x\n", hr);