Nikolay Sivov : dwrite/tests: Fix some test failures.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Oct 24 08:32:35 CDT 2014


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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Oct 24 11:39:16 2014 +0400

dwrite/tests: Fix some test failures.

---

 dlls/dwrite/tests/font.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index 77571f0..469be88 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -940,9 +940,9 @@ if (file) {
 
     /* local loader is not registered by default */
     hr = IDWriteFactory_RegisterFontFileLoader(factory, loader);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr);
     hr = IDWriteFactory_UnregisterFontFileLoader(factory, loader);
-    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr);
     IDWriteFontFileLoader_Release(loader);
 }
     ret = TRUE;




More information about the wine-cvs mailing list