[PATCH] gdi32/tests: Fix some test failures on newer Win10 releases.
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0d0770905d..0e895fef11 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1003,10 +1003,11 @@ 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 == 0xdeadbeef || broken(ret == ERROR_CAN_NOT_COMPLETE) /* before Win10 */, + "Unexpected error %d.\n", ret); bRet = GetTextMetricsA(hdc, &tm); ok(bRet, "GetTextMetrics error %d\n", GetLastError()); -- 2.19.1
On Mon, Nov 12, 2018 at 08:58:14AM +0300, Nikolay Sivov wrote:
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0d0770905d..0e895fef11 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1003,10 +1003,11 @@ 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 == 0xdeadbeef || broken(ret == ERROR_CAN_NOT_COMPLETE) /* before Win10 */, + "Unexpected error %d.\n", ret);
I'm not sure I'd classify pre-Win10 behaviour as broken, so just accepting both without the broken() would be better. Huw.
participants (2)
-
Huw Davies -
Nikolay Sivov