Nikolay Sivov : gdi32/tests: Fix some test failures on newer Win10 releases.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Tue Nov 13 12:03:35 2018 +0300

gdi32/tests: Fix some test failures on newer Win10 releases.

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

---

 dlls/gdi32/tests/font.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 0d07709..4f10e2f 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -1003,10 +1003,10 @@ static void test_bitmap_font_metrics(void)
             memset(&gm, 0, sizeof(gm));
             SetLastError(0xdeadbeef);
             ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat);
-            todo_wine {
+            todo_wine
             ok(ret == GDI_ERROR, "GetGlyphOutline should fail for a bitmap font\n");
-            ok(GetLastError() == ERROR_CAN_NOT_COMPLETE, "expected ERROR_CAN_NOT_COMPLETE, got %u\n", GetLastError());
-            }
+            ret = GetLastError();
+            ok(ret == ERROR_CAN_NOT_COMPLETE || ret == 0xdeadbeef /* Win10 */, "Unexpected error %d.\n", ret);
 
             bRet = GetTextMetricsA(hdc, &tm);
             ok(bRet, "GetTextMetrics error %d\n", GetLastError());