marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

t2embed/tests: Fix some test failures on Win10. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Nikolay Sivov 2019-10-20 16:35:43 +03:00 committed by Alexandre Julliard
parent f83d141454
commit 5ce743d53b
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/t2embed/tests/t2embed.c
View File

@ -43,19 +43,22 @@ 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 (fsType == LICENSE_INSTALLABLE)
expected = EMBED_INSTALLABLE;
else if (fsType & LICENSE_EDITABLE)
expected = EMBED_EDITABLE;
else if (fsType & LICENSE_PREVIEWPRINT)
expected = EMBED_PREVIEWPRINT;
else if (fsType & LICENSE_NOEMBEDDING)
expected = EMBED_NOEMBEDDING;
if (ret == E_NONE)
{
if (fsType == LICENSE_INSTALLABLE)
expected = EMBED_INSTALLABLE;
else if (fsType & LICENSE_EDITABLE)
expected = EMBED_EDITABLE;
else if (fsType & LICENSE_PREVIEWPRINT)
expected = EMBED_PREVIEWPRINT;
else if (fsType & LICENSE_NOEMBEDDING)
expected = EMBED_NOEMBEDDING;
ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status,
expected, otm.otmfsType);
ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status,
expected, otm.otmfsType);
}
}
else
{
@ -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);