[PATCH 2/2] dwrite/tests: Fix some test failures on Win10

Nikolay Sivov nsivov at codeweavers.com
Fri Sep 4 04:16:08 CDT 2015


---

-------------- next part --------------
>From 06b42275ee0be23beaccb904169c82bcb1bdc131 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri, 4 Sep 2015 12:13:50 +0300
Subject: [PATCH 2/2] dwrite/tests: Fix some test failures on Win10

---
 dlls/dwrite/tests/font.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index 2a625d5..dfe782d 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -1327,7 +1327,14 @@ todo_wine
     ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
 
     hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_UNKNOWN, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface);
-    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+todo_wine
+    ok(hr == S_OK || broken(hr == E_INVALIDARG) /* < win10 */, "got 0x%08x\n", hr);
+    if (hr == S_OK) {
+        ok(fontface != NULL, "got %p\n", fontface);
+        face_type = IDWriteFontFace_GetType(fontface);
+        ok(face_type == DWRITE_FONT_FACE_TYPE_TRUETYPE, "got %d\n", face_type);
+        IDWriteFontFace_Release(fontface);
+    }
 
     IDWriteFontFile_Release(file);
     IDWriteFactory_Release(factory);
@@ -1953,8 +1960,10 @@ static void test_CreateCustomFontFileReference(void)
     factory = create_factory();
     factory2 = create_factory();
 
+if (0) { /* crashes on win10 */
     hr = IDWriteFactory_RegisterFontFileLoader(factory, NULL);
     ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
+}
     hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader);
     ok(hr == S_OK, "got 0x%08x\n", hr);
     hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader2);
-- 
2.1.4



More information about the wine-patches mailing list