Commit 5ce743d5 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

t2embed/tests: Fix some test failures on Win10.

parent f83d1414
......@@ -43,8 +43,10 @@ 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);
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)
......@@ -57,6 +59,7 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm
ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status,
expected, otm.otmfsType);
}
}
else
{
status = 0xdeadbeef;
......@@ -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);
......
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