Skip to content

W
wine-cw
Commit 6da1e08d authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

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.
parent bd7a1a4d
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
dlls/t2embed/tests/t2embed.c
View file @ 6da1e08d
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "t2embapi.h" #include "t2embapi.h"
...@@ -100,12 +101,15 @@ static void test_TTGetEmbeddingType(void) ...@@ -100,12 +101,15 @@ static void test_TTGetEmbeddingType(void)
hdc = CreateCompatibleDC(0); hdc = CreateCompatibleDC(0);
ret = TTGetEmbeddingType(hdc, NULL); 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; status = 0xdeadbeef;
ret = TTGetEmbeddingType(hdc, &status); ret = TTGetEmbeddingType(hdc, &status);
ok(ret == E_NOTATRUETYPEFONT, "Unexpected retval %#lx.\n", ret); ok(ret == E_NOTATRUETYPEFONT || (ret == E_NONE && GetACP() == CP_UTF8),
ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); "Unexpected retval %#lx.\n", ret);
ok(status == 0xdeadbeef || (status == EMBED_EDITABLE && GetACP() == CP_UTF8),
"Unexpected status %#lx.\n", status);
memset(&logfont, 0, sizeof(logfont)); memset(&logfont, 0, sizeof(logfont));
logfont.lfHeight = 12; logfont.lfHeight = 12;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment