Commit 8747fa2b authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

dwrite/tests: Fix some test failures on Win10.

parent fe848b26
...@@ -1327,7 +1327,14 @@ todo_wine ...@@ -1327,7 +1327,14 @@ todo_wine
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_UNKNOWN, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_UNKNOWN, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); todo_wine
ok(hr == S_OK || broken(hr == E_INVALIDARG) /* < win10 */, "got 0x%08x\n", hr);
if (hr == S_OK) {
ok(fontface != NULL, "got %p\n", fontface);
face_type = IDWriteFontFace_GetType(fontface);
ok(face_type == DWRITE_FONT_FACE_TYPE_TRUETYPE, "got %d\n", face_type);
IDWriteFontFace_Release(fontface);
}
IDWriteFontFile_Release(file); IDWriteFontFile_Release(file);
IDWriteFactory_Release(factory); IDWriteFactory_Release(factory);
...@@ -1953,8 +1960,10 @@ static void test_CreateCustomFontFileReference(void) ...@@ -1953,8 +1960,10 @@ static void test_CreateCustomFontFileReference(void)
factory = create_factory(); factory = create_factory();
factory2 = create_factory(); factory2 = create_factory();
if (0) { /* crashes on win10 */
hr = IDWriteFactory_RegisterFontFileLoader(factory, NULL); hr = IDWriteFactory_RegisterFontFileLoader(factory, NULL);
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
}
hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader); hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader2); hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader2);
......
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