[PATCH 0/1] MR2339: t2embed/tests: Fix the TTGetEmbeddingType() test in UTF-8 locales.
A screen-compatible memory DC uses a TrueType font by default in UTF-8 locales. This fixes the tests on w10pro64-en-AE-u8 and w10pro64-hi-u8. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2339
From: Francois Gouget <fgouget(a)codeweavers.com> A screen-compatible memory DC uses a TrueType font by default in UTF-8 locales. --- dlls/t2embed/tests/t2embed.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index 004ba5492ae..aa4e1ca2cc8 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -20,6 +20,7 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wingdi.h" #include "winuser.h" #include "t2embapi.h" @@ -100,12 +101,15 @@ static void test_TTGetEmbeddingType(void) hdc = CreateCompatibleDC(0); ret = TTGetEmbeddingType(hdc, NULL); - ok(ret == E_NOTATRUETYPEFONT, "Unexpected retval %#lx.\n", ret); + ok(ret == E_NOTATRUETYPEFONT || (ret == E_PERMISSIONSINVALID && GetACP() == CP_UTF8), + "Unexpected retval %#lx.\n", ret); status = 0xdeadbeef; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NOTATRUETYPEFONT, "Unexpected retval %#lx.\n", ret); - ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); + ok(ret == E_NOTATRUETYPEFONT || (ret == E_NONE && GetACP() == CP_UTF8), + "Unexpected retval %#lx.\n", ret); + ok(status == 0xdeadbeef || (status == EMBED_EDITABLE && GetACP() == CP_UTF8), + "Unexpected status %#lx.\n", status); memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2339
participants (2)
-
Francois Gouget -
Francois Gouget (@fgouget)