[PATCH] dwrite/tests: Newer Win10 doesn't fail on certain QIs

[André Hentschel]

Signed-off-by: André Hentschel <nerv(a)dawncrow.de>
---
 dlls/dwrite/tests/layout.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index b54748a..828bc6c 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -5329,17 +5329,26 @@ 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);
+    todo_wine
+        ok(hr == S_OK || broken(hr == E_NOINTERFACE), "got 0x%08x\n", hr);
+        if (hr == S_OK)
+            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);
+    todo_wine
+        ok(hr == S_OK || broken(hr == E_NOINTERFACE), "got 0x%08x\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);
+    todo_wine
+        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);
-- 
2.7.4

[Nikolay Sivov]

I think we should get such version on testbot first before making the
change.

[André Hentschel]

On 07.05.2018 07:55, Nikolay Sivov wrote:
> I think we should get such version on testbot first before making the
> change.

Hi Nikolay,

I doubt Francois will do that until at least one box of the new Win10 
version is not filtered out, see:

https://test.winehq.org/data/errors.html

My patches are targeting this problem