August 2022 - Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Implement document.location with a hook.
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: a4d6dc79b139e0adbbe1753b601af7ce0ec5d05a URL: https://gitlab.winehq.org/wine/wine/-/commit/a4d6dc79b139e0adbbe1753b601af7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 12 17:07:29 2022 +0300 mshtml: Implement document.location with a hook. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 3cbd229f19e..350996f893e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1064,6 +1064,16 @@ static HRESULT WINAPI HTMLDocument_get_location(IHTMLDocument2 *iface, IHTMLLoca return IHTMLWindow2_get_location(&This->window->base.IHTMLWindow2_iface, p); } +static HRESULT IHTMLDocument2_location_hook(HTMLDocument *doc, WORD flags, DISPPARAMS *dp, VARIANT *res, + EXCEPINFO *ei, IServiceProvider *caller) +{ + if(!(flags & DISPATCH_PROPERTYPUT) || !doc->window) + return S_FALSE; + + return IDispatchEx_InvokeEx(&doc->window->base.IDispatchEx_iface, DISPID_IHTMLWINDOW2_LOCATION, + 0, flags, dp, res, ei, caller); +} + static HRESULT WINAPI HTMLDocument_get_lastModified(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); @@ -4944,11 +4954,6 @@ static HRESULT WINAPI DocDispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID V_VT(pvarRes) = VT_I4; V_I4(pvarRes) = This->window->readystate; return S_OK; - case DISPID_IHTMLDOCUMENT2_LOCATION: - if(!(wFlags & DISPATCH_PROPERTYPUT)) - break; - return IDispatchEx_InvokeEx(&This->window->base.IDispatchEx_iface, DISPID_IHTMLWINDOW2_LOCATION, - lcid, wFlags, pdp, pvarRes, pei, pspCaller); default: break; } @@ -5905,6 +5910,12 @@ static IHTMLEventObj *HTMLDocumentNode_set_current_event(DispatchEx *dispex, IHT return default_set_current_event(This->window, event); } +static HRESULT HTMLDocumentNode_location_hook(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *res, + EXCEPINFO *ei, IServiceProvider *caller) +{ + return IHTMLDocument2_location_hook(&impl_from_DispatchEx(dispex)->basedoc, flags, dp, res, ei, caller); +} + static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { { NULL, @@ -5932,7 +5943,6 @@ static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { static const tid_t HTMLDocumentNode_iface_tids[] = { IHTMLDOMNode_tid, IHTMLDOMNode2_tid, - IHTMLDocument2_tid, IHTMLDocument4_tid, IHTMLDocument5_tid, IDocumentSelector_tid, @@ -5941,6 +5951,11 @@ static const tid_t HTMLDocumentNode_iface_tids[] = { static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { + static const dispex_hook_t document2_hooks[] = { + {DISPID_IHTMLDOCUMENT2_LOCATION, HTMLDocumentNode_location_hook}, + {DISPID_UNKNOWN} + }; + HTMLDOMNode_init_dispex_info(info, mode); if(mode >= COMPAT_MODE_IE9) { @@ -5957,6 +5972,7 @@ static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t dispex_info_add_interface(info, IHTMLDocument6_tid, NULL); dispex_info_add_interface(info, IHTMLDocument3_tid, NULL); } + dispex_info_add_interface(info, IHTMLDocument2_tid, document2_hooks); } static dispex_static_data_t HTMLDocumentNode_dispex = { @@ -6248,18 +6264,34 @@ static const ICustomDocVtbl CustomDocVtbl = { CustomDoc_SetUIHandler }; +static HRESULT HTMLDocumentObj_location_hook(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *res, + EXCEPINFO *ei, IServiceProvider *caller) +{ + return IHTMLDocument2_location_hook(&CONTAINING_RECORD(dispex, HTMLDocumentObj, dispex)->basedoc, flags, dp, res, ei, caller); +} + static const tid_t HTMLDocumentObj_iface_tids[] = { - IHTMLDocument2_tid, IHTMLDocument3_tid, IHTMLDocument4_tid, IHTMLDocument5_tid, 0 }; + +static void HTMLDocumentObj_init_dispex_info(dispex_data_t *info, compat_mode_t mode) +{ + static const dispex_hook_t document2_hooks[] = { + {DISPID_IHTMLDOCUMENT2_LOCATION, HTMLDocumentObj_location_hook}, + {DISPID_UNKNOWN} + }; + dispex_info_add_interface(info, IHTMLDocument2_tid, document2_hooks); +} + static dispex_static_data_t HTMLDocumentObj_dispex = { L"HTMLDocumentObj", NULL, DispHTMLDocument_tid, - HTMLDocumentObj_iface_tids + HTMLDocumentObj_iface_tids, + HTMLDocumentObj_init_dispex_info }; static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID riid, void **ppv)

1 0

Gabriel Ivăncescu : mshtml: Return DISP_E_MEMBERNOTFOUND when not finding member by DISPID.
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: 6b75f930022e49c5baa58642ac88a5ecb0c4dda3 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b75f930022e49c5baa58642ac88a5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Aug 12 17:07:30 2022 +0300 mshtml: Return DISP_E_MEMBERNOTFOUND when not finding member by DISPID. DISP_E_UNKNOWNNAME is for when retrieving the DISPID itself. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 14 +++++++------- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlelemcol.c | 2 +- dlls/mshtml/tests/events.c | 2 -- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 7ab1df49cc5..3f5d4bbce76 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1009,7 +1009,7 @@ static HRESULT get_builtin_func(dispex_data_t *data, DISPID id, func_info_t **re } WARN("invalid id %lx\n", id); - return DISP_E_UNKNOWNNAME; + return DISP_E_MEMBERNOTFOUND; } static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID *ret) @@ -1366,7 +1366,7 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD HRESULT hres; hres = get_builtin_func(This->info, id, &func); - if(id == DISPID_VALUE && hres == DISP_E_UNKNOWNNAME) + if(id == DISPID_VALUE && hres == DISP_E_MEMBERNOTFOUND) return dispex_value(This, lcid, flags, dp, res, ei, caller); if(FAILED(hres)) return hres; @@ -1686,7 +1686,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc switch(get_dispid_type(id)) { case DISPEXPROP_CUSTOM: if(!This->info->desc->vtbl || !This->info->desc->vtbl->invoke) - return DISP_E_UNKNOWNNAME; + return DISP_E_MEMBERNOTFOUND; return This->info->desc->vtbl->invoke(This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); case DISPEXPROP_DYNAMIC: { @@ -1694,7 +1694,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc dynamic_prop_t *prop; if(!get_dynamic_data(This) || This->dynamic_data->prop_cnt <= idx) - return DISP_E_UNKNOWNNAME; + return DISP_E_MEMBERNOTFOUND; prop = This->dynamic_data->props+idx; @@ -1712,7 +1712,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return invoke_disp_value(This, V_DISPATCH(&prop->var), lcid, wFlags, pdp, pvarRes, pei, pspCaller); case DISPATCH_PROPERTYGET: if(prop->flags & DYNPROP_DELETED) - return DISP_E_UNKNOWNNAME; + return DISP_E_MEMBERNOTFOUND; V_VT(pvarRes) = VT_EMPTY; return variant_copy(pvarRes, &prop->var); case DISPATCH_PROPERTYPUT: @@ -1826,7 +1826,7 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS DWORD idx = id - DISPID_DYNPROP_0; if(!get_dynamic_data(This) || This->dynamic_data->prop_cnt <= idx) - return DISP_E_UNKNOWNNAME; + return DISP_E_MEMBERNOTFOUND; *pbstrName = SysAllocString(This->dynamic_data->props[idx].name); if(!*pbstrName) @@ -1874,7 +1874,7 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DWORD idx = id - DISPID_DYNPROP_0; if(!get_dynamic_data(This) || This->dynamic_data->prop_cnt <= idx) - return DISP_E_UNKNOWNNAME; + return DISP_E_MEMBERNOTFOUND; return next_dynamic_id(This, idx+1, pid); } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 350996f893e..e7074952983 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5843,7 +5843,7 @@ static HRESULT HTMLDocumentNode_invoke(DispatchEx *dispex, DISPID id, LCID lcid, i = id - MSHTML_DISPID_CUSTOM_MIN; if(!This->nsdoc || i >= This->elem_vars_cnt) - return DISP_E_UNKNOWNNAME; + return DISP_E_MEMBERNOTFOUND; nsAString_InitDepend(&name_str, This->elem_vars[i]); nsres = nsIDOMHTMLDocument_GetElementsByName(This->nsdoc, &name_str, &node_list); @@ -5854,7 +5854,7 @@ static HRESULT HTMLDocumentNode_invoke(DispatchEx *dispex, DISPID id, LCID lcid, nsres = nsIDOMNodeList_Item(node_list, 0, &nsnode); nsIDOMNodeList_Release(node_list); if(NS_FAILED(nsres) || !nsnode) - return DISP_E_UNKNOWNNAME; + return DISP_E_MEMBERNOTFOUND; hres = get_node(nsnode, TRUE, &node); if(FAILED(hres)) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f8fa285999e..d341623d4d5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1124,7 +1124,7 @@ static HRESULT HTMLRectCollection_invoke(DispatchEx *dispex, DISPID id, LCID lci nsres = nsIDOMClientRectList_Item(This->rect_list, id - MSHTML_DISPID_CUSTOM_MIN, &rect); if(NS_FAILED(nsres) || !rect) { WARN("Unknown item\n"); - return DISP_E_UNKNOWNNAME; + return DISP_E_MEMBERNOTFOUND; } hres = create_html_rect(rect, dispex_compat_mode(&This->dispex), &html_rect); diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 385bd9038b2..180f75d630b 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -591,7 +591,7 @@ static HRESULT HTMLElementCollection_invoke(DispatchEx *dispex, DISPID id, LCID idx = id - DISPID_ELEMCOL_0; if(idx >= This->len) - return DISP_E_UNKNOWNNAME; + return DISP_E_MEMBERNOTFOUND; switch(flags) { case DISPATCH_PROPERTYGET: diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index c5210e721d2..87151987f16 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2542,12 +2542,10 @@ static void test_timeout(IHTMLDocument2 *doc) V_VT(&var) = VT_EMPTY; hres = IDispatch_Invoke(disp, DISPID_IHTMLWINDOW2_SETINTERVAL, &IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &dp, &var, NULL, &argerr); - todo_wine ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke(DISPID_IHTMLWINDOW2_SETINTERVAL) returned: %08lx\n", hres); hres = IDispatch_Invoke(disp, DISPID_IHTMLWINDOW2_SETTIMEOUT, &IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &dp, &var, NULL, &argerr); - todo_wine ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke(DISPID_IHTMLWINDOW2_SETTIMEOUT) returned: %08lx\n", hres); SysFreeString(V_BSTR(&args[1])); IDispatch_Release(disp);

1 0

Jacek Caban : wow64win: Always set output bits pointer in wow64_NtGdiCreateDIBSection.
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: 76e28e6029aa64302ef2b009750955051b7c6d1a URL: https://gitlab.winehq.org/wine/wine/-/commit/76e28e6029aa64302ef2b009750955… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 13:53:53 2022 +0200 wow64win: Always set output bits pointer in wow64_NtGdiCreateDIBSection. --- dlls/wow64win/gdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index f13ed3da1f0..5ddadaa642b 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -136,7 +136,7 @@ NTSTATUS WINAPI wow64_NtGdiCreateDIBSection( UINT *args ) ret = NtGdiCreateDIBSection( hdc, section, offset, bmi, usage, header_size, flags, color_space, addr_32to64( &bits, bits32 )); - if (ret) put_addr( bits32, bits ); + put_addr( bits32, bits ); return HandleToUlong( ret ); }

1 0

Robert Wilhelm : wshom: Use signed type for ExitCode in IWshShell3::Run().
by Alexandre Julliard Aug. 13, 2022

Aug. 13, 2022

Module: wine Branch: master Commit: 484f028338f3a3ff26c2a8a0da17daed8d433c59 URL: https://gitlab.winehq.org/wine/wine/-/commit/484f028338f3a3ff26c2a8a0da17da… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Aug 11 22:03:16 2022 +0200 wshom: Use signed type for ExitCode in IWshShell3::Run(). DWORD is unsigned and will be converted to VT_UI4 variant when used from VBScript. But VT_UI4 is no VBScript data type and should not be used as retval. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53542 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/wshom.ocx/shell.c | 6 ++++-- dlls/wshom.ocx/tests/wshom.c | 15 ++++++++------- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index e04844458b1..41913dcadd5 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1329,7 +1329,7 @@ static WCHAR *split_command( BSTR cmd, WCHAR **params ) return ret; } -static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, DWORD *exit_code) +static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, int *exit_code) { SHELLEXECUTEINFOW info; int waitforprocess; @@ -1384,9 +1384,11 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, { if (waitforprocess) { + DWORD code; WaitForSingleObject(info.hProcess, INFINITE); - GetExitCodeProcess(info.hProcess, exit_code); + GetExitCodeProcess(info.hProcess, &code); CloseHandle(info.hProcess); + *exit_code = code; } else *exit_code = 0; diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 0e30ea9ed9a..4867843678a 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -81,7 +81,8 @@ static void test_wshshell(void) EXCEPINFO ei; VARIANT arg, res, arg2; BSTR str, ret; - DWORD retval, attrs; + int retval; + DWORD attrs; UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -227,19 +228,19 @@ static void test_wshshell(void) retval = 10; hr = IWshShell3_Run(sh3, str, NULL, &arg2, &retval); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); - ok(retval == 10, "Unexpected retval %lu.\n", retval); + ok(retval == 10, "Unexpected retval %d.\n", retval); retval = 10; hr = IWshShell3_Run(sh3, str, &arg, NULL, &retval); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); - ok(retval == 10, "Unexpected retval %lu.\n", retval); + ok(retval == 10, "Unexpected retval %d.\n", retval); retval = 10; V_VT(&arg2) = VT_ERROR; V_ERROR(&arg2) = 0; hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == DISP_E_TYPEMISMATCH, "Unexpected hr %#lx.\n", hr); - ok(retval == 10, "Unexpected retval %lu.\n", retval); + ok(retval == 10, "Unexpected retval %d.\n", retval); SysFreeString(str); V_VT(&arg2) = VT_BOOL; @@ -249,14 +250,14 @@ static void test_wshshell(void) str = SysAllocString(L"cmd.exe /c rd /s /q c:\\nosuchdir"); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %lu.\n", retval); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %d.\n", retval); SysFreeString(str); retval = 0xdeadbeef; str = SysAllocString(L"\"cmd.exe \" /c rd /s /q c:\\nosuchdir"); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %lu.\n", retval); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %d.\n", retval); SysFreeString(str); GetSystemDirectoryW(path, ARRAY_SIZE(path)); @@ -280,7 +281,7 @@ static void test_wshshell(void) str = SysAllocString(buf); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %lu.\n", retval); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %d.\n", retval); SysFreeString(str); DeleteFileW(path2); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index 00391d52838..a0175bb1604 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -528,7 +528,7 @@ library IWshRuntimeLibrary [in] BSTR Command, [in, optional] VARIANT* WindowStyle, [in, optional] VARIANT* WaitOnReturn, - [out, retval] DWORD* out_ExitCode); + [out, retval] int* out_ExitCode); [id(0x03e9)] HRESULT Popup( diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index 8d4a8f03e17..c69362d6fac 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -528,7 +528,7 @@ library IWshRuntimeLibrary [in] BSTR Command, [in, optional] VARIANT* WindowStyle, [in, optional] VARIANT* WaitOnReturn, - [out, retval] DWORD* out_ExitCode); + [out, retval] int* out_ExitCode); [id(0x03e9)] HRESULT Popup(

1 0

Jeremy Newman : Wine-Bugs has moved over to Mailman v3
by Alexandre Julliard Aug. 12, 2022

Aug. 12, 2022

Module: website Branch: master Commit: 0cec2716a9c887a0ce8d096e2ea214612ba5b3d8 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/0cec2716a9c887a0ce8d096e2e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Aug 12 10:30:41 2022 -0500 Wine-Bugs has moved over to Mailman v3 --- templates/en/forums.template | 4 ++-- templates/fr/forums.template | 4 ++-- templates/ko/forums.template | 4 ++-- templates/nl/forums.template | 4 ++-- templates/pl/forums.template | 4 ++-- templates/pt/forums.template | 4 ++-- templates/tr/forums.template | 4 ++-- templates/zh-cn/forums.template | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 648a35ee..5f96768b 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -85,8 +85,8 @@ You can set your subscription to not send you email, or send as a digest. <li> <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">(Un-)Subscribe</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">Archive</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">(Un-)Subscribe</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs(a)winehq.org/">Archive</a>] A high traffic (100/day) read-only list for monitoring activity on the <a href="https://bugs.winehq.org/">Bug Tracking Database</a>. </li> diff --git a/templates/fr/forums.template b/templates/fr/forums.template index 66e719a9..774a2f35 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -56,8 +56,8 @@ Voici les plus utiles pour les utilisateurs : <li> <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">(Dés-)inscription</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">Archive</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">(Dés-)inscription</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs(a)winehq.org/">Archive</a>] Une liste haut trafic (100 messages par jour) en lecture seule pour la surveillances des activités sur la <a href="//bugs.winehq.org/">base de données de suivi de bogues</a>. </li> diff --git a/templates/ko/forums.template b/templates/ko/forums.template index 35637b3c..a3dcc8e9 100644 --- a/templates/ko/forums.template +++ b/templates/ko/forums.template @@ -73,8 +73,8 @@ href="https://www.winehq.org/mailman3/postorius/lists/?all-lists">웹 페이지< </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">구독/해지</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">메시지 기록</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">구독/해지</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs(a)winehq.org/">메시지 기록</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> <a href="//bugs.winehq.org/">버그 추적 데이터베이스</a>의 활동을 알려 주는 읽기 전용 메일링 리스트입니다. 메시지 전송 빈도: 1일에 100여통(높음) diff --git a/templates/nl/forums.template b/templates/nl/forums.template index 02296331..54e55901 100644 --- a/templates/nl/forums.template +++ b/templates/nl/forums.template @@ -71,8 +71,8 @@ Anders behandeld de software van de mailinglijsten uw bericht als spam. <li> <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">In- uitschrijven</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">Archief</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">In- uitschrijven</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs(a)winehq.org/">Archief</a>] Een drukke lijst (100/dag) die alle activiteit op de <a href="//bugs.winehq.org/">Bug Tracking Database</a> laat zien. </li> diff --git a/templates/pl/forums.template b/templates/pl/forums.template index 1f6ecfec..2087e4bd 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -67,8 +67,8 @@ oprogramowanie listy mailingowej. </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">(Wy-/Za-)pisz</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">Archiwum</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">(Wy-/Za-)pisz</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs(a)winehq.org/">Archiwum</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> Wysoki ruch (100/dziennie) lista tylko-do-odczytu do monitorowania aktywności <a href="//bugs.winehq.org/">bazy danych śledzącej błędy</a>. diff --git a/templates/pt/forums.template b/templates/pt/forums.template index f044ec53..4151864f 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -68,8 +68,8 @@ do contrário o seu email será tratado como um possível spam pelo software da </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">(Des-)Inscrever</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">Arquivo</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">(Des-)Inscrever</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs(a)winehq.org/">Arquivo</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> Uma lista de alto tráfego (100/dia) de somente leitura para monitorar a atividade na <a href="//bugs.winehq.org/">Banco de Dados de Bugs</a>. diff --git a/templates/tr/forums.template b/templates/tr/forums.template index c1652b31..55b8607e 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -62,8 +62,8 @@ </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">Abone ol/iptal et</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">Arşiv</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">Abone ol/iptal et</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs(a)winehq.org/">Arşiv</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> <a href="//bugs.winehq.org/">Hata İzleme Veritabanı</a> üzerinde etkinliği takip etmek için kullanılan yüksek trafikli (100/gün) salt okunur bir liste. </li> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index 1a2dbf1f..3c62b4c8 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -62,8 +62,8 @@ <li> <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-bugs">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-bugs/">存档</a>] + [<a href="https://www.winehq.org/mailman3/postorius/lists/wine-bugs.winehq.org/">（取消）订阅</a>] + [<a href="https://www.winehq.org/mailman3/hyperkitty/list/wine-bugs(a)winehq.org/">存档</a>] 一个大流量（100封/天）的只读列表，用于监听 <a href="//bugs.winehq.org/">Bug Tracking Database</a> 的活动。 </li>

1 0

Zhiyi Zhang : winegstreamer: Always check the return value from mf_media_type_from_wg_format().
by Alexandre Julliard Aug. 11, 2022

Aug. 11, 2022

Module: wine Branch: master Commit: 6f8990b4318b25709cd90f6e10e8f3fdaa89c4c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f8990b4318b25709cd90f6e10e8f3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 1 17:19:48 2022 +0800 winegstreamer: Always check the return value from mf_media_type_from_wg_format(). mf_media_type_from_wg_format() may return NULL. Fix Airborne Kingdom crash at start because WG_AUDIO_FORMAT_UNKNOWN is passed to mf_media_type_from_wg_format(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index f07b83f413e..43beb71838a 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -879,6 +879,12 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) IMFMediaType *base_type = mf_media_type_from_wg_format(&format); GUID base_subtype; + if (!base_type) + { + hr = MF_E_INVALIDMEDIATYPE; + goto done; + } + IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); stream_types[0] = base_type; @@ -911,8 +917,8 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) WG_AUDIO_FORMAT_F32LE, }; - stream_types[0] = mf_media_type_from_wg_format(&format); - type_count = 1; + if ((stream_types[0] = mf_media_type_from_wg_format(&format))) + type_count = 1; for (i = 0; i < ARRAY_SIZE(audio_types); i++) { @@ -921,7 +927,8 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) continue; new_format = format; new_format.u.audio.format = audio_types[i]; - stream_types[type_count++] = mf_media_type_from_wg_format(&new_format); + if ((stream_types[type_count] = mf_media_type_from_wg_format(&new_format))) + type_count++; } } else

1 0

Zhiyi Zhang : winegstreamer: Trace mf_media_type_from_wg_format_{audio|video}().
by Alexandre Julliard Aug. 11, 2022

Aug. 11, 2022

Module: wine Branch: master Commit: b5becc2ee8b70753b9fc538cfdd92c2b4be5911c URL: https://gitlab.winehq.org/wine/wine/-/commit/b5becc2ee8b70753b9fc538cfdd92c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 1 17:39:20 2022 +0800 winegstreamer: Trace mf_media_type_from_wg_format_{audio|video}(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winegstreamer/mfplat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 55f9ae6323d..d6620c0d08a 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -435,6 +435,7 @@ static IMFMediaType *mf_media_type_from_wg_format_audio(const struct wg_format * } } + FIXME("Unknown audio format %#x.\n", format->u.audio.format); return NULL; } @@ -478,6 +479,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * } } + FIXME("Unknown video format %#x.\n", format->u.video.format); return NULL; }

1 0

Nikolay Sivov : dwrite/fallback: Add Georgian and Armenian ranges.
by Alexandre Julliard Aug. 11, 2022

Aug. 11, 2022

Module: wine Branch: master Commit: 857ec56f45b6a9a63f1c24935c398baae99ac551 URL: https://gitlab.winehq.org/wine/wine/-/commit/857ec56f45b6a9a63f1c24935c398b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 16:57:08 2022 +0300 dwrite/fallback: Add Georgian and Armenian ranges. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index c528ccf7001..53b0853e7d6 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -222,6 +222,8 @@ system_fallback_config[] = { "0000-007F, 0080-00FF, 0100-017F, 0180-024F, " "0250-02AF, 02B0-02FF, 0300-036F", L"Tahoma" }, + { "0530-058F, FB10-FB1C", L"Noto Sans Armenian" }, + { "0590-05FF, FB1D-FB4F", L"Noto Sans Hebrew" }, { "0600-06FF, 0750-077F, " @@ -252,6 +254,8 @@ system_fallback_config[] = { "1000-109F, A9E0-A9FF, AA60-AA7F", L"Noto Sans Myanmar" }, + { "10A0-10FF, 2D00-2D2F", L"Noto Sans Georgian" }, + /* Hangul Jamo - 1100-11FF Hangul Compatibility Jamo - 3130-318F Enc. CJK (Paren Hangul) - 3200-321F

1 0

Nikolay Sivov : mfreadwrite/writer: Create archive sink automatically when writer is created from url/bytestream.
by Alexandre Julliard Aug. 11, 2022

Aug. 11, 2022

Module: wine Branch: master Commit: aaebf839f701655361b612cf6e238f80a21d3e8e URL: https://gitlab.winehq.org/wine/wine/-/commit/aaebf839f701655361b612cf6e238f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 12:07:41 2022 +0300 mfreadwrite/writer: Create archive sink automatically when writer is created from url/bytestream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/Makefile.in | 2 +- dlls/mfreadwrite/mf_private.h | 4 +- dlls/mfreadwrite/reader.c | 6 +- dlls/mfreadwrite/writer.c | 127 +++++++++++++++++++++++++++++++++++------- 4 files changed, 115 insertions(+), 24 deletions(-) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index 440d5ba96cd..552ba6d2638 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfreadwrite.dll IMPORTLIB = mfreadwrite -IMPORTS = mfuuid uuid mfplat ole32 +IMPORTS = mfuuid uuid mfplat ole32 kernelbase EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mfreadwrite/mf_private.h b/dlls/mfreadwrite/mf_private.h index 4e23ab7b3e0..7d8172a383a 100644 --- a/dlls/mfreadwrite/mf_private.h +++ b/dlls/mfreadwrite/mf_private.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -extern HRESULT create_sink_writer_from_stream(IMFByteStream *stream, IMFAttributes *attributes, - REFIID riid, void **out) DECLSPEC_HIDDEN; +extern HRESULT create_sink_writer_from_url(const WCHAR *url, IMFByteStream *stream, + IMFAttributes *attributes, REFIID riid, void **out) DECLSPEC_HIDDEN; extern HRESULT create_sink_writer_from_sink(IMFMediaSink *sink, IMFAttributes *attributes, REFIID riid, void **out) DECLSPEC_HIDDEN; diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 76348458fac..aac59deba76 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2594,6 +2594,10 @@ static HRESULT WINAPI readwrite_factory_CreateInstanceFromURL(IMFReadWriteClassF { return create_source_reader_from_url(url, attributes, &IID_IMFSourceReader, out); } + else if (IsEqualGUID(clsid, &CLSID_MFSinkWriter)) + { + return create_sink_writer_from_url(url, NULL, attributes, riid, out); + } FIXME("Unsupported %s.\n", debugstr_guid(clsid)); @@ -2621,7 +2625,7 @@ static HRESULT WINAPI readwrite_factory_CreateInstanceFromObject(IMFReadWriteCla hr = IUnknown_QueryInterface(unk, &IID_IMFMediaSink, (void **)&sink); if (stream) - hr = create_sink_writer_from_stream(stream, attributes, riid, out); + hr = create_sink_writer_from_url(NULL, stream, attributes, riid, out); else if (sink) hr = create_sink_writer_from_sink(sink, attributes, riid, out); diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index 1f33c0791ec..a3f77c4415b 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -22,6 +22,8 @@ #include "mfapi.h" #include "mfidl.h" #include "mfreadwrite.h" +#include "pathcch.h" +#include "wine/mfinternal.h" #include "mf_private.h" #include "wine/debug.h" @@ -196,24 +198,6 @@ HRESULT create_sink_writer_from_sink(IMFMediaSink *sink, IMFAttributes *attribut return hr; } -HRESULT create_sink_writer_from_stream(IMFByteStream *stream, IMFAttributes *attributes, - REFIID riid, void **out) -{ - struct sink_writer *object; - HRESULT hr; - - object = malloc(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - object->IMFSinkWriter_iface.lpVtbl = &sink_writer_vtbl; - object->refcount = 1; - - hr = IMFSinkWriter_QueryInterface(&object->IMFSinkWriter_iface, riid, out); - IMFSinkWriter_Release(&object->IMFSinkWriter_iface); - return hr; -} - /*********************************************************************** * MFCreateSinkWriterFromMediaSink (mfreadwrite.@) */ @@ -224,13 +208,116 @@ HRESULT WINAPI MFCreateSinkWriterFromMediaSink(IMFMediaSink *sink, IMFAttributes return create_sink_writer_from_sink(sink, attributes, &IID_IMFSinkWriter, (void **)writer); } +static HRESULT sink_writer_get_sink_factory_class(const WCHAR *url, IMFAttributes *attributes, CLSID *clsid) +{ + static const struct extension_map + { + const WCHAR *ext; + const GUID *guid; + } ext_map[] = + { + { L".mp4", &MFTranscodeContainerType_MPEG4 }, + { L".mp3", &MFTranscodeContainerType_MP3 }, + { L".wav", &MFTranscodeContainerType_WAVE }, + { L".avi", &MFTranscodeContainerType_AVI }, + }; + static const struct + { + const GUID *container; + const CLSID *clsid; + } class_map[] = + { + { &MFTranscodeContainerType_MPEG4, &CLSID_MFMPEG4SinkClassFactory }, + { &MFTranscodeContainerType_MP3, &CLSID_MFMP3SinkClassFactory }, + { &MFTranscodeContainerType_WAVE, &CLSID_MFWAVESinkClassFactory }, + { &MFTranscodeContainerType_AVI, &CLSID_MFAVISinkClassFactory }, + }; + const WCHAR *extension; + GUID container; + unsigned int i; + + if (url) + { + if (!attributes || FAILED(IMFAttributes_GetGUID(attributes, &MF_TRANSCODE_CONTAINERTYPE, &container))) + { + const struct extension_map *map = NULL; + + if (FAILED(PathCchFindExtension(url, PATHCCH_MAX_CCH, &extension))) return E_INVALIDARG; + if (!extension || !*extension) return E_INVALIDARG; + + for (i = 0; i < ARRAY_SIZE(ext_map); ++i) + { + map = &ext_map[i]; + + if (!wcsicmp(map->ext, extension)) + break; + } + + if (!map) + { + WARN("Couldn't find container type for extension %s.\n", debugstr_w(extension)); + return E_INVALIDARG; + } + + container = *map->guid; + } + } + else + { + if (!attributes) return E_INVALIDARG; + if (FAILED(IMFAttributes_GetGUID(attributes, &MF_TRANSCODE_CONTAINERTYPE, &container))) return E_INVALIDARG; + } + + for (i = 0; i < ARRAY_SIZE(class_map); ++i) + { + if (IsEqualGUID(&container, &class_map[i].container)) + { + *clsid = *class_map[i].clsid; + return S_OK; + } + } + + WARN("Couldn't find factory class for container %s.\n", debugstr_guid(&container)); + return E_INVALIDARG; +} + +HRESULT create_sink_writer_from_url(const WCHAR *url, IMFByteStream *bytestream, IMFAttributes *attributes, + REFIID riid, void **out) +{ + IMFSinkClassFactory *factory; + IMFMediaSink *sink; + CLSID clsid; + HRESULT hr; + + if (FAILED(hr = sink_writer_get_sink_factory_class(url, attributes, &clsid))) return hr; + + if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFSinkClassFactory, (void **)&factory))) + { + WARN("Failed to create a sink factory, hr %#lx.\n", hr); + return hr; + } + + hr = IMFSinkClassFactory_CreateMediaSink(factory, bytestream, NULL, NULL, &sink); + IMFSinkClassFactory_Release(factory); + if (FAILED(hr)) + { + WARN("Failed to create a sink, hr %#lx.\n", hr); + return hr; + } + + hr = create_sink_writer_from_sink(sink, attributes, riid, out); + IMFMediaSink_Release(sink); + + return hr; +} + /*********************************************************************** * MFCreateSinkWriterFromURL (mfreadwrite.@) */ HRESULT WINAPI MFCreateSinkWriterFromURL(const WCHAR *url, IMFByteStream *bytestream, IMFAttributes *attributes, IMFSinkWriter **writer) { - FIXME("%s, %p, %p, %p.\n", debugstr_w(url), bytestream, attributes, writer); + TRACE("%s, %p, %p, %p.\n", debugstr_w(url), bytestream, attributes, writer); - return E_NOTIMPL; + return create_sink_writer_from_url(url, bytestream, attributes, &IID_IMFSinkWriter, (void **)writer); }

1 0

Nikolay Sivov : mfreadwrite/writer: Create output stream if it wasn't provided.
by Alexandre Julliard Aug. 11, 2022

Aug. 11, 2022

Module: wine Branch: master Commit: 4244b4b138b35ede1653731b4dc54a0edb091bbd URL: https://gitlab.winehq.org/wine/wine/-/commit/4244b4b138b35ede1653731b4dc54a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 16:03:39 2022 +0300 mfreadwrite/writer: Create output stream if it wasn't provided. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 13 +++++++++++++ dlls/mfreadwrite/writer.c | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index c36e1a7e04d..95f615767d5 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1291,6 +1291,18 @@ done: DestroyWindow(window); } +static void test_sink_writer(void) +{ + IMFSinkWriter *writer; + HRESULT hr; + + hr = MFCreateSinkWriterFromURL(NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + + hr = MFCreateSinkWriterFromURL(NULL, NULL, NULL, &writer); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); +} + START_TEST(mfplat) { HRESULT hr; @@ -1304,6 +1316,7 @@ START_TEST(mfplat) test_source_reader(); test_source_reader_from_media_source(); test_reader_d3d9(); + test_sink_writer(); hr = MFShutdown(); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index a3f77c4415b..f4bd08b8cda 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -289,6 +289,9 @@ HRESULT create_sink_writer_from_url(const WCHAR *url, IMFByteStream *bytestream, CLSID clsid; HRESULT hr; + if (!url && !bytestream) + return E_INVALIDARG; + if (FAILED(hr = sink_writer_get_sink_factory_class(url, attributes, &clsid))) return hr; if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFSinkClassFactory, (void **)&factory))) @@ -297,8 +300,18 @@ HRESULT create_sink_writer_from_url(const WCHAR *url, IMFByteStream *bytestream, return hr; } + if (bytestream) + IMFByteStream_AddRef(bytestream); + else if (FAILED(hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_DELETE_IF_EXIST, 0, url, &bytestream))) + { + WARN("Failed to create output file stream, hr %#lx.\n", hr); + IMFSinkClassFactory_Release(factory); + return hr; + } + hr = IMFSinkClassFactory_CreateMediaSink(factory, bytestream, NULL, NULL, &sink); IMFSinkClassFactory_Release(factory); + IMFByteStream_Release(bytestream); if (FAILED(hr)) { WARN("Failed to create a sink, hr %#lx.\n", hr);

1 0