Nikolay Sivov : dwrite/tests: Fix fallback builder test skip.

Alexandre Julliard julliard at winehq.org
Fri Sep 22 15:49:06 CDT 2017


Module: wine
Branch: master
Commit: f2090cb415bef834d5d8c993feee16cc6e071006
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f2090cb415bef834d5d8c993feee16cc6e071006

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Sep 22 15:34:50 2017 +0300

dwrite/tests: Fix fallback builder test skip.

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

---

 dlls/dwrite/tests/layout.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index ba3e852..493eaf3 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -4672,17 +4672,15 @@ static void test_FontFallbackBuilder(void)
     hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2);
     IDWriteFactory_Release(factory);
 
-    if (factory2) {
-        EXPECT_REF(factory2, 1);
-        hr = IDWriteFactory2_CreateFontFallbackBuilder(factory2, &builder);
-        EXPECT_REF(factory2, 2);
-    }
-
     if (hr != S_OK) {
-        skip("IDWriteFontFallbackBuilder is not supported\n");
+        win_skip("IDWriteFontFallbackBuilder is not supported\n");
         return;
     }
 
+    EXPECT_REF(factory2, 1);
+    hr = IDWriteFactory2_CreateFontFallbackBuilder(factory2, &builder);
+    EXPECT_REF(factory2, 2);
+
     fallback = NULL;
     EXPECT_REF(factory2, 2);
     EXPECT_REF(builder, 1);




More information about the wine-cvs mailing list