Nikolay Sivov : t2embed/tests: Fix some test failures on Win10.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5ce743d53bcc12493e28497ff7c12d41023d67f8
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5ce743d53bcc12493e28497ff...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Sun Oct 20 16:35:43 2019 +0300

t2embed/tests: Fix some test failures on Win10.

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

---

 dlls/t2embed/tests/t2embed.c | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c
index 9f278a57d1..4ffc3daed1 100644
--- a/dlls/t2embed/tests/t2embed.c
+++ b/dlls/t2embed/tests/t2embed.c
@@ -43,19 +43,22 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm
         UINT fsType = otm.otmfsType & 0xf;
 
         ret = TTGetEmbeddingType(hdc, &status);
-        ok(ret == E_NONE, "got %d\n", ret);
-
-        if (fsType == LICENSE_INSTALLABLE)
-            expected = EMBED_INSTALLABLE;
-        else if (fsType & LICENSE_EDITABLE)
-            expected = EMBED_EDITABLE;
-        else if (fsType & LICENSE_PREVIEWPRINT)
-            expected = EMBED_PREVIEWPRINT;
-        else if (fsType & LICENSE_NOEMBEDDING)
-            expected = EMBED_NOEMBEDDING;
-
-        ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status,
-            expected, otm.otmfsType);
+        ok(ret == E_NONE || ret == E_NOTATRUETYPEFONT, "Unexpected return value %#x.\n", ret);
+
+        if (ret == E_NONE)
+        {
+            if (fsType == LICENSE_INSTALLABLE)
+                expected = EMBED_INSTALLABLE;
+            else if (fsType & LICENSE_EDITABLE)
+                expected = EMBED_EDITABLE;
+            else if (fsType & LICENSE_PREVIEWPRINT)
+                expected = EMBED_PREVIEWPRINT;
+            else if (fsType & LICENSE_NOEMBEDDING)
+                expected = EMBED_NOEMBEDDING;
+
+            ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status,
+                    expected, otm.otmfsType);
+        }
     }
     else
     {
@@ -170,14 +173,6 @@ static void test_TTIsEmbeddingEnabled(void)
 
     hdc = CreateCompatibleDC(0);
 
-    ret = TTIsEmbeddingEnabled(hdc, NULL);
-    ok(ret == E_ERRORACCESSINGFACENAME, "got %#x\n", ret);
-
-    status = 123;
-    ret = TTIsEmbeddingEnabled(hdc, &status);
-    ok(ret == E_ERRORACCESSINGFACENAME, "got %#x\n", ret);
-    ok(status == 123, "got %u\n", status);
-
     memset(&logfont, 0, sizeof(logfont));
     logfont.lfHeight = 12;
     logfont.lfWeight = FW_NORMAL;
@@ -187,6 +182,9 @@ static void test_TTIsEmbeddingEnabled(void)
 
     old_font = SelectObject(hdc, hfont);
 
+    ret = TTIsEmbeddingEnabled(hdc, NULL);
+    ok(ret == E_PBENABLEDINVALID, "Unexpected return value %#x.\n", ret);
+
     status = 123;
     ret = TTIsEmbeddingEnabled(hdc, &status);
     ok(ret == E_NONE, "got %#x\n", ret);