September 2015 - Wine-commits

Nikolay Sivov : dwrite: Make sure same files are scanned once when building font collection.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: b4ce95c1ab06ec57dd240d3501974db97ae73684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ce95c1ab06ec57dd240d350… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 3 23:52:22 2015 +0300 dwrite: Make sure same files are scanned once when building font collection. --- dlls/dwrite/font.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index baa5ace..a181395 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2866,7 +2866,13 @@ static void fontfamily_add_oblique_simulated_face(struct dwrite_fontfamily_data HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerator *enumerator, BOOL is_system, IDWriteFontCollection **ret) { + struct fontfile_enum { + struct list entry; + IDWriteFontFile *file; + }; + struct fontfile_enum *fileenum, *fileenum2; struct dwrite_fontcollection *collection; + struct list scannedfiles; BOOL current = FALSE; HRESULT hr = S_OK; UINT32 i; @@ -2886,12 +2892,13 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat TRACE("building font collection:\n"); + list_init(&scannedfiles); while (hr == S_OK) { DWRITE_FONT_FACE_TYPE face_type; DWRITE_FONT_FILE_TYPE file_type; + BOOL supported, same = FALSE; IDWriteFontFile *file; UINT32 face_count; - BOOL supported; current = FALSE; hr = IDWriteFontFileEnumerator_MoveNext(enumerator, &current); @@ -2902,6 +2909,17 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat if (FAILED(hr)) break; + /* check if we've scanned this file already */ + LIST_FOR_EACH_ENTRY(fileenum, &scannedfiles, struct fontfile_enum, entry) { + if ((same = is_same_fontfile(fileenum->file, file))) + break; + } + + if (same) { + IDWriteFontFile_Release(file); + continue; + } + /* failed font files are skipped */ hr = IDWriteFontFile_Analyze(file, &supported, &file_type, &face_type, &face_count); if (FAILED(hr) || !supported || face_count == 0) { @@ -2911,6 +2929,11 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat continue; } + /* add to scanned list */ + fileenum = heap_alloc(sizeof(*fileenum)); + fileenum->file = file; + list_add_tail(&scannedfiles, &fileenum->entry); + for (i = 0; i < face_count; i++) { IDWriteLocalizedStrings *family_name = NULL; struct dwrite_font_data *font_data; @@ -2948,8 +2971,12 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat if (FAILED(hr)) break; } + } - IDWriteFontFile_Release(file); + LIST_FOR_EACH_ENTRY_SAFE(fileenum, fileenum2, &scannedfiles, struct fontfile_enum, entry) { + IDWriteFontFile_Release(fileenum->file); + list_remove(&fileenum->entry); + heap_free(fileenum); } for (i = 0; i < collection->family_count; i++) {

1 0

Bruno Jesus : quartz: Skip AVI bad chunks while looking for the LIST chunk.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: c49e9d085d905cdb2aac021dfefad7bc3f409b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c49e9d085d905cdb2aac021df… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 3 23:12:58 2015 +0800 quartz: Skip AVI bad chunks while looking for the LIST chunk. --- dlls/quartz/avisplit.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 6059511..d62ec2b 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1109,24 +1109,18 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, return E_FAIL; } - pos += sizeof(RIFFCHUNK) + list.cb; - hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); - - while (list.fcc == ckidAVIPADDING || (list.fcc == FOURCC_LIST && list.fccListType != listtypeAVIMOVIE)) + /* Skip any chunks until we find the LIST chunk */ + do { pos += sizeof(RIFFCHUNK) + list.cb; - hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); } + while (hr == S_OK && (list.fcc != FOURCC_LIST || + (list.fcc == FOURCC_LIST && list.fccListType != listtypeAVIMOVIE))); - if (list.fcc != FOURCC_LIST) - { - ERR("Expected LIST, but got %.04s\n", (LPSTR)&list.fcc); - return E_FAIL; - } - if (list.fccListType != listtypeAVIMOVIE) + if (hr != S_OK) { - ERR("Expected AVI movie list, but got %.04s\n", (LPSTR)&list.fccListType); + ERR("Failed to find LIST chunk from AVI file\n"); return E_FAIL; } @@ -1134,21 +1128,18 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, /* FIXME: AVIX files are extended beyond the FOURCC chunk "AVI ", and thus won't be played here, * once I get one of the files I'll try to fix it */ - if (hr == S_OK) - { - This->rtStart = pAviSplit->CurrentChunkOffset = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFLIST)); - pos += list.cb + sizeof(RIFFCHUNK); - - pAviSplit->EndOfFile = This->rtStop = MEDIATIME_FROM_BYTES(pos); - if (pos > total) - { - ERR("File smaller (%x%08x) then EndOfFile (%x%08x)\n", (DWORD)(total >> 32), (DWORD)total, (DWORD)(pAviSplit->EndOfFile >> 32), (DWORD)pAviSplit->EndOfFile); - return E_FAIL; - } + This->rtStart = pAviSplit->CurrentChunkOffset = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFLIST)); + pos += list.cb + sizeof(RIFFCHUNK); - hr = IAsyncReader_SyncRead(This->pReader, BYTES_FROM_MEDIATIME(pAviSplit->CurrentChunkOffset), sizeof(pAviSplit->CurrentChunk), (BYTE *)&pAviSplit->CurrentChunk); + pAviSplit->EndOfFile = This->rtStop = MEDIATIME_FROM_BYTES(pos); + if (pos > total) + { + ERR("File smaller (%x%08x) then EndOfFile (%x%08x)\n", (DWORD)(total >> 32), (DWORD)total, (DWORD)(pAviSplit->EndOfFile >> 32), (DWORD)pAviSplit->EndOfFile); + return E_FAIL; } + hr = IAsyncReader_SyncRead(This->pReader, BYTES_FROM_MEDIATIME(pAviSplit->CurrentChunkOffset), sizeof(pAviSplit->CurrentChunk), (BYTE *)&pAviSplit->CurrentChunk); + props->cbAlign = 1; props->cbPrefix = 0; /* Comrades, prevent shortage of buffers, or you will feel the consequences! DA! */

1 0

Gerald Pfeifer : rpcrt4/tests: Cast to ULONGLONG instead of LONGLONG to avoid shift overflow.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: e6ca322fb15e09e9a4fcc37db86d21f4257e2fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ca322fb15e09e9a4fcc37db… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Sep 4 00:39:24 2015 +0200 rpcrt4/tests: Cast to ULONGLONG instead of LONGLONG to avoid shift overflow. --- dlls/rpcrt4/tests/ndr_marshall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d6befe5..aeecf8c 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -965,7 +965,7 @@ static void test_simple_struct(void) s1.c = 0xa5; s1.l1 = 0xdeadbeef; s1.l2 = 0xcafebabe; - s1.ll = ((LONGLONG) 0xbadefeed << 32) | 0x2468ace0; + s1.ll = ((ULONGLONG) 0xbadefeed << 32) | 0x2468ace0; wiredatalen = 24; memcpy(wiredata, &s1, wiredatalen);

1 0

Dmitry Timoshkov : msscript.ocx: Add missing 'vararg' attribute to the Run () methods.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: b6520ef6e7135c34a221c9efa88f09441a12c60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6520ef6e7135c34a221c9efa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 4 15:24:17 2015 +0800 msscript.ocx: Add missing 'vararg' attribute to the Run() methods. --- dlls/msscript.ocx/msscript.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.idl b/dlls/msscript.ocx/msscript.idl index 5090c8f..efc00ff 100644 --- a/dlls/msscript.ocx/msscript.idl +++ b/dlls/msscript.ocx/msscript.idl @@ -103,7 +103,7 @@ library MSScriptControl [id(0x07d2)] HRESULT ExecuteStatement([in] BSTR Statement); - [id(0x07d3)] + [id(0x07d3), vararg] HRESULT Run( [in] BSTR ProcedureName, [in] SAFEARRAY(VARIANT) *Parameters, @@ -234,7 +234,7 @@ library MSScriptControl [id(0x07d2)] HRESULT ExecuteStatement([in] BSTR Statement); - [id(0x07d3)] + [id(0x07d3), vararg] HRESULT Run( [in] BSTR ProcedureName, [in] SAFEARRAY(VARIANT) *Parameters,

1 0

Dmitry Timoshkov : oleaut32/tests: Avoid using a reserved keyword ' _restrict' in an idl.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: 2952822effc71fd423e402c87aade7bcc1379f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2952822effc71fd423e402c87… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 4 15:24:28 2015 +0800 oleaut32/tests: Avoid using a reserved keyword '_restrict' in an idl. --- dlls/oleaut32/tests/tmarshal.c | 4 ++-- dlls/oleaut32/tests/tmarshal.idl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index a2fa6e8..e8d5e64 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -825,7 +825,7 @@ static HRESULT WINAPI Widget_put_prop_req_arg( return S_OK; } -static HRESULT WINAPI Widget__restrict(IWidget* iface, INT *i) +static HRESULT WINAPI Widget_pos_restrict(IWidget* iface, INT *i) { trace("restrict\n"); *i = DISPID_TM_RESTRICTED; @@ -875,7 +875,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_ByRefUInt, Widget_put_prop_opt_arg, Widget_put_prop_req_arg, - Widget__restrict, + Widget_pos_restrict, Widget_neg_restrict }; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index bf90384..33a4df9 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -175,7 +175,7 @@ library TestTypelib HRESULT prop_req_arg([in] INT req, [in] INT i); [id(DISPID_TM_RESTRICTED), restricted] - HRESULT _restrict([out, retval] INT *i); + HRESULT pos_restrict([out, retval] INT *i); [id(DISPID_TM_NEG_RESTRICTED), restricted] HRESULT neg_restrict([out, retval] INT *i);

1 0

Dmitry Timoshkov : oleaut32/tests: Add a test for calling a varargs method using typelib marshaller.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: c28244a92ed52649a876180115c817a590c324ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28244a92ed52649a87618011… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 4 15:24:34 2015 +0800 oleaut32/tests: Add a test for calling a varargs method using typelib marshaller. --- dlls/oleaut32/tests/tmarshal.c | 29 +++++++++++++++++++++++++++-- dlls/oleaut32/tests/tmarshal.idl | 3 +++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index e8d5e64..1893534 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -839,6 +839,13 @@ static HRESULT WINAPI Widget_neg_restrict(IWidget* iface, INT *i) return S_OK; } +static HRESULT WINAPI Widget_VarArg_Run( + IWidget *iface, BSTR name, SAFEARRAY *params, VARIANT *result) +{ + trace("VarArg_Run(%p,%p,%p)\n", name, params, result); + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -876,7 +883,8 @@ static const struct IWidgetVtbl Widget_VTable = Widget_put_prop_opt_arg, Widget_put_prop_req_arg, Widget_pos_restrict, - Widget_neg_restrict + Widget_neg_restrict, + Widget_VarArg_Run }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1492,7 +1500,7 @@ static void test_typelibmarshal(void) dispparams.rgdispidNamedArgs = NULL; dispparams.rgvarg = vararg; hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); - ok_ole_success(hr, ITypeInfo_Invoke); + ok_ole_success(hr, IDispatch_Invoke); /* call VarArg, even one (non-optional, non-safearray) named argument is not allowed */ dispidNamed = 0; @@ -1502,6 +1510,23 @@ static void test_typelibmarshal(void) ok(hr == DISP_E_NONAMEDARGS, "IDispatch_Invoke should have returned DISP_E_NONAMEDARGS instead of 0x%08x\n", hr); dispidNamed = DISPID_PROPERTYPUT; + /* call VarArg_Run */ + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_BSTR; + V_BSTR(&vararg[1]) = SysAllocString(szCat); + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_BSTR; + V_BSTR(&vararg[0]) = SysAllocString(NULL); + dispparams.cNamedArgs = 0; + dispparams.cArgs = 2; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); +todo_wine + ok_ole_success(hr, IDispatch_Invoke); + SysFreeString(V_BSTR(&vararg[1])); + SysFreeString(V_BSTR(&vararg[0])); + /* call Error */ dispparams.cNamedArgs = 0; dispparams.cArgs = 0; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 33a4df9..ff9cac3 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -179,6 +179,9 @@ library TestTypelib [id(DISPID_TM_NEG_RESTRICTED), restricted] HRESULT neg_restrict([out, retval] INT *i); + + [id(DISPID_TM_VARARG_RUN), vararg] + HRESULT VarArg_Run([in] BSTR name, [in] SAFEARRAY(VARIANT) params, [out, retval] VARIANT *result); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 879d974..d603a56 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -44,6 +44,7 @@ #define DISPID_TM_RESTRICTED 25 #define DISPID_TM_NEG_RESTRICTED -26 #define DISPID_TM_TESTSECONDIFACE 27 +#define DISPID_TM_VARARG_RUN 28 #define DISPID_NOA_BSTRRET 1 #define DISPID_NOA_ERROR 2

1 0

Jactry Zeng : riched20: Repaint paragraph after undo format setting of the paragraph.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: 515b4a972561827cd954ee7ca34aaeb5a3621a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=515b4a972561827cd954ee7ca… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Sep 4 15:54:18 2015 +0800 riched20: Repaint paragraph after undo format setting of the paragraph. --- dlls/riched20/undo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 9db690e..7b22e6d 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -341,6 +341,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) add_undo_set_para_fmt( editor, &para->member.para ); *para->member.para.pFmt = undo->u.set_para_fmt.fmt; para->member.para.border = undo->u.set_para_fmt.border; + para->member.para.nFlags |= MEPF_REWRAP; break; } case undo_set_char_fmt:

1 0

Aric Stewart : hidclass.sys: Implement creating/destroying HID devices.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: 0aca2d7dc9d8b981422c7c2846301666d4b8d610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aca2d7dc9d8b981422c7c284… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 1 15:02:13 2015 -0500 hidclass.sys: Implement creating/destroying HID devices. --- dlls/hidclass.sys/Makefile.in | 1 + dlls/hidclass.sys/device.c | 196 ++++++++++++++++++++++++++++++++++++++++++ dlls/hidclass.sys/hid.h | 30 +++++++ dlls/hidclass.sys/parse.h | 72 ++++++++++++++++ include/ddk/hidport.h | 43 +++++++++ 5 files changed, 342 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0aca2d7dc9d8b981422c7…

1 0

Nikolay Sivov : dwrite: Make CreateFontFace() fail with DWRITE_E_FILEFORMAT for supported types in case of type mismatch.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: fe848b26c7504b2178c02d1212a2172bfba798c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe848b26c7504b2178c02d121… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 4 12:15:41 2015 +0300 dwrite: Make CreateFontFace() fail with DWRITE_E_FILEFORMAT for supported types in case of type mismatch. --- dlls/dwrite/main.c | 5 ++++- dlls/dwrite/tests/font.c | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index ce4299c..c996827 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -818,9 +818,12 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory2 *iface, if (FAILED(hr)) return hr; - if (!is_supported || (face_type != req_facetype)) + if (!is_supported) return E_FAIL; + if (face_type != req_facetype) + return DWRITE_E_FILEFORMAT; + hr = IDWriteFontFile_GetReferenceKey(*font_files, &key, &key_size); if (FAILED(hr)) return hr; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7617dbb..2a625d5 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1307,12 +1307,11 @@ if (0) /* crashes on native */ /* try mismatching face type, the one that's not supported */ hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_CFF, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); -todo_wine ok(hr == DWRITE_E_FILEFORMAT, "got 0x%08x\n", hr); hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == DWRITE_E_FILEFORMAT || broken(hr == E_FAIL) /* < win10 */, "got 0x%08x\n", hr); hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_RAW_CFF, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); todo_wine

1 0

Nikolay Sivov : dwrite/tests: Fix some test failures on Win10.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: 8747fa2b9f6ca9546aec5817d95974100101ae55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8747fa2b9f6ca9546aec5817d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 4 12:16:08 2015 +0300 dwrite/tests: Fix some test failures on Win10. --- dlls/dwrite/tests/font.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2a625d5..dfe782d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1327,7 +1327,14 @@ todo_wine 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); - 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); IDWriteFactory_Release(factory); @@ -1953,8 +1960,10 @@ static void test_CreateCustomFontFileReference(void) factory = create_factory(); factory2 = create_factory(); +if (0) { /* crashes on win10 */ hr = IDWriteFactory_RegisterFontFileLoader(factory, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +} hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader2);

1 0