February 2020 - Wine-commits

Zhiyi Zhang : user32/tests: Add more EnumDisplaySettings tests.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 153b82b0b368a9444d2cb79db11c012a0f424e4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=153b82b0b368a9444d2cb79d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Feb 4 15:54:51 2020 +0800 user32/tests: Add more EnumDisplaySettings tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 282 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 258 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=153b82b0b368a9444d2c…

1 0

Donna Whisnant : mshtml.idl: Fix duplicated dispinterface functions.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: ec27f4838c6bef821deddf7d88d498b57f906c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec27f4838c6bef821deddf7d… Author: Donna Whisnant <WhisantDonnaE(a)JohnDeere.com> Date: Tue Feb 4 19:58:39 2020 +0100 mshtml.idl: Fix duplicated dispinterface functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 135 ----------------------------------------------------- 1 file changed, 135 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 0faa605482..67c3712fc4 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11992,18 +11992,6 @@ methods: [propget, id(DISPID_IHTMLLINKELEMENT_TYPE), displaybind, bindable] BSTR type(); - [propput, id(DISPID_IHTMLLINKELEMENT_ONLOAD), displaybind, bindable] - void onload(VARIANT v); - - [propget, id(DISPID_IHTMLLINKELEMENT_ONLOAD), displaybind, bindable] - VARIANT onload(); - - [propput, id(DISPID_IHTMLLINKELEMENT_ONERROR), displaybind, bindable] - void onerror(VARIANT v); - - [propget, id(DISPID_IHTMLLINKELEMENT_ONERROR), displaybind, bindable] - VARIANT onerror(); - [propget, id(DISPID_IHTMLLINKELEMENT_STYLESHEET)] IHTMLStyleSheet *styleSheet(); @@ -12534,18 +12522,6 @@ methods: [propget, id(DISPID_IHTMLFORMELEMENT_NAME)] BSTR name(); - [propput, id(DISPID_IHTMLFORMELEMENT_ONSUBMIT)] - void onsubmit(VARIANT v); - - [propget, id(DISPID_IHTMLFORMELEMENT_ONSUBMIT)] - VARIANT onsubmit(); - - [propput, id(DISPID_IHTMLFORMELEMENT_ONRESET)] - void onreset(VARIANT v); - - [propget, id(DISPID_IHTMLFORMELEMENT_ONRESET)] - VARIANT onreset(); - [id(DISPID_IHTMLFORMELEMENT_SUBMIT)] void submit(); @@ -13315,24 +13291,6 @@ methods: [propget, id(DISPID_IHTMLIMGELEMENT_ALIGN), displaybind, bindable] BSTR align(); - [propput, id(DISPID_IHTMLIMGELEMENT_ONLOAD), displaybind, bindable] - void onload(VARIANT v); - - [propget, id(DISPID_IHTMLIMGELEMENT_ONLOAD), displaybind, bindable] - VARIANT onload(); - - [propput, id(DISPID_IHTMLIMGELEMENT_ONERROR), displaybind, bindable] - void onerror(VARIANT v); - - [propget, id(DISPID_IHTMLIMGELEMENT_ONERROR), displaybind, bindable] - VARIANT onerror(); - - [propput, id(DISPID_IHTMLIMGELEMENT_ONABORT), displaybind, bindable] - void onabort(VARIANT v); - - [propget, id(DISPID_IHTMLIMGELEMENT_ONABORT), displaybind, bindable] - VARIANT onabort(); - [propput, id(DISPID_IHTMLIMGELEMENT_NAME), displaybind, bindable] void name(BSTR v); @@ -13883,12 +13841,6 @@ methods: [propget, id(DISPID_IHTMLBODYELEMENT_ALINK), displaybind, bindable] VARIANT aLink(); - [propput, id(DISPID_IHTMLBODYELEMENT_ONLOAD), displaybind, bindable] - void onload(VARIANT v); - - [propget, id(DISPID_IHTMLBODYELEMENT_ONLOAD), displaybind, bindable] - VARIANT onload(); - [propput, id(DISPID_IHTMLBODYELEMENT_ONUNLOAD), displaybind, bindable] void onunload(VARIANT v); @@ -13901,12 +13853,6 @@ methods: [propget, id(DISPID_IHTMLBODYELEMENT_SCROLL), displaybind, bindable] BSTR scroll(); - [propput, id(DISPID_IHTMLBODYELEMENT_ONSELECT), displaybind, bindable] - void onselect(VARIANT v); - - [propget, id(DISPID_IHTMLBODYELEMENT_ONSELECT), displaybind, bindable] - VARIANT onselect(); - [propput, id(DISPID_IHTMLBODYELEMENT_ONBEFOREUNLOAD), displaybind, bindable] void onbeforeunload(VARIANT v); @@ -14382,9 +14328,6 @@ properties: methods: WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; - [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] - IDispatch* constructor(); - [propput, id(DISPID_IHTMLAREAELEMENT_SHAPE)] void shape(BSTR v); @@ -14777,12 +14720,6 @@ methods: [propget, id(DISPID_IHTMLSELECTELEMENT_OPTIONS)] IDispatch *options(); - [propput, id(DISPID_IHTMLSELECTELEMENT_ONCHANGE), displaybind, bindable] - void onchange(VARIANT v); - - [propget, id(DISPID_IHTMLSELECTELEMENT_ONCHANGE), displaybind, bindable] - VARIANT onchange(); - [propput, id(DISPID_IHTMLSELECTELEMENT_SELECTEDINDEX)] void selectedIndex(LONG v); @@ -15478,18 +15415,6 @@ methods: [id(DISPID_IHTMLINPUTELEMENT_SELECT)] void select(); - [propput, id(DISPID_IHTMLINPUTELEMENT_ONCHANGE), displaybind, bindable] - void onchange(VARIANT v); - - [propget, id(DISPID_IHTMLINPUTELEMENT_ONCHANGE), displaybind, bindable] - VARIANT onchange(); - - [propput, id(DISPID_IHTMLINPUTELEMENT_ONSELECT), displaybind, bindable] - void onselect(VARIANT v); - - [propget, id(DISPID_IHTMLINPUTELEMENT_ONSELECT), displaybind, bindable] - VARIANT onselect(); - [propput, id(DISPID_IHTMLINPUTELEMENT_DEFAULTVALUE), displaybind, bindable, hidden] void defaultValue(BSTR v); @@ -15586,24 +15511,6 @@ methods: [propget, id(DISPID_IHTMLINPUTELEMENT_ALIGN), displaybind, bindable] BSTR align(); - [propput, id(DISPID_IHTMLINPUTELEMENT_ONLOAD), displaybind, bindable] - void onload(VARIANT v); - - [propget, id(DISPID_IHTMLINPUTELEMENT_ONLOAD), displaybind, bindable] - VARIANT onload(); - - [propput, id(DISPID_IHTMLINPUTELEMENT_ONERROR), displaybind, bindable] - void onerror(VARIANT v); - - [propget, id(DISPID_IHTMLINPUTELEMENT_ONERROR), displaybind, bindable] - VARIANT onerror(); - - [propput, id(DISPID_IHTMLINPUTELEMENT_ONABORT), displaybind, bindable] - void onabort(VARIANT v); - - [propget, id(DISPID_IHTMLINPUTELEMENT_ONABORT), displaybind, bindable] - VARIANT onabort(); - [propput, id(DISPID_IHTMLINPUTELEMENT_WIDTH)] void width(LONG v); @@ -15815,18 +15722,6 @@ methods: [id(DISPID_IHTMLTEXTAREAELEMENT_SELECT)] void select(); - [propput, id(DISPID_IHTMLTEXTAREAELEMENT_ONCHANGE), displaybind, bindable] - void onchange(VARIANT v); - - [propget, id(DISPID_IHTMLTEXTAREAELEMENT_ONCHANGE), displaybind, bindable] - VARIANT onchange(); - - [propput, id(DISPID_IHTMLTEXTAREAELEMENT_ONSELECT), displaybind, bindable] - void onselect(VARIANT v); - - [propget, id(DISPID_IHTMLTEXTAREAELEMENT_ONSELECT), displaybind, bindable] - VARIANT onselect(); - [propput, id(DISPID_IHTMLTEXTAREAELEMENT_READONLY), displaybind, bindable] void readOnly(VARIANT_BOOL v); @@ -26333,12 +26228,6 @@ methods: [propget, id(DISPID_IHTMLSCRIPTELEMENT_DEFER), displaybind, bindable] VARIANT_BOOL defer(); - [propput, id(DISPID_IHTMLSCRIPTELEMENT_ONERROR), displaybind, bindable] - void onerror(VARIANT v); - - [propget, id(DISPID_IHTMLSCRIPTELEMENT_ONERROR), displaybind, bindable] - VARIANT onerror(); - [propput, id(DISPID_IHTMLSCRIPTELEMENT_TYPE), displaybind, bindable] void type(BSTR v); @@ -26719,12 +26608,6 @@ methods: [propget, id(DISPID_IHTMLOBJECTELEMENT_HEIGHT)] VARIANT height(); - [propput, id(DISPID_IHTMLOBJECTELEMENT_ONERROR), displaybind, bindable] - void onerror(VARIANT v); - - [propget, id(DISPID_IHTMLOBJECTELEMENT_ONERROR), displaybind, bindable] - VARIANT onerror(); - [propput, id(DISPID_IHTMLOBJECTELEMENT_ALTHTML)] void altHtml(BSTR v); @@ -27039,12 +26922,6 @@ interface IHTMLFrameBase2 : IDispatch [propget, id(DISPID_IHTMLFRAMEBASE2_CONTENTWINDOW)] \ IHTMLWindow2 *contentWindow(); \ \ - [propput, id(DISPID_IHTMLFRAMEBASE2_ONLOAD), displaybind, bindable] \ - void onload(VARIANT v); \ - \ - [propget, id(DISPID_IHTMLFRAMEBASE2_ONLOAD), displaybind, bindable] \ - VARIANT onload(); \ - \ [propput, id(DISPID_IHTMLFRAMEBASE2_ALLOWTRANSPARENCY)] \ void allowTransparency(VARIANT_BOOL v); \ \ @@ -27422,18 +27299,6 @@ methods: [propget, id(DISPID_IHTMLSTYLEELEMENT_TYPE), displaybind, bindable] BSTR type(); - [propput, id(DISPID_IHTMLSTYLEELEMENT_ONLOAD), displaybind, bindable] - void onload(VARIANT v); - - [propget, id(DISPID_IHTMLSTYLEELEMENT_ONLOAD), displaybind, bindable] - VARIANT onload(); - - [propput, id(DISPID_IHTMLSTYLEELEMENT_ONERROR), displaybind, bindable] - void onerror(VARIANT v); - - [propget, id(DISPID_IHTMLSTYLEELEMENT_ONERROR), displaybind, bindable] - VARIANT onerror(); - [propget, id(DISPID_IHTMLSTYLEELEMENT_STYLESHEET)] IHTMLStyleSheet *styleSheet();

1 0

Kevin Puetz : mshtml.idl: Fix IHTMLComputedStyle declaration.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: a727b6b98c2c7ea1bed2bdacd263ff5ae6c0de70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a727b6b98c2c7ea1bed2bdac… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Feb 4 19:58:45 2020 +0100 mshtml.idl: Fix IHTMLComputedStyle declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 67c3712fc4..cbef72e364 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28027,23 +28027,23 @@ interface ILineInfo : IUnknown ] interface IHTMLComputedStyle : IUnknown { - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BOLD)] HRESULT bold([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_ITALIC)] HRESULT italic([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_UNDERLINE)] HRESULT underline([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_OVERLINE)] HRESULT overline([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_STRIKEOUT)] HRESULT strikeOut([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUBSCRIPT)] HRESULT subScript([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUPERSCRIPT)] HRESULT superScript([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_EXPLICITFACE)] HRESULT explicitFace([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTWEIGHT)] HRESULT fontWeight([retval, out] long **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTSIZE)] HRESULT fontSize([retval, out] long **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTNAME)] HRESULT fontName([retval, out] WCHAR **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_HASBGCOLOR)] HRESULT hasBgColor([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_TEXTCOLOR)] HRESULT textColor([retval, out] DWORD **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BACKGROUNDCOLOR)] HRESULT backgroundColor([retval, out] DWORD **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_PREFORMATTED)] HRESULT *preFormatted([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_DIRECTION)] HRESULT direction([retval, out] VARIANT_BOOL **p); - [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BLOCKDIRECTION)] HRESULT blockDirection([retval, out] VARIANT_BOOL **p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BOLD)] HRESULT bold([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_ITALIC)] HRESULT italic([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_UNDERLINE)] HRESULT underline([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_OVERLINE)] HRESULT overline([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_STRIKEOUT)] HRESULT strikeOut([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUBSCRIPT)] HRESULT subScript([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_SUPERSCRIPT)] HRESULT superScript([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_EXPLICITFACE)] HRESULT explicitFace([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTWEIGHT)] HRESULT fontWeight([retval, out] long *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTSIZE)] HRESULT fontSize([retval, out] long *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_FONTNAME)] HRESULT fontName([retval, out] WCHAR *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_HASBGCOLOR)] HRESULT hasBgColor([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_TEXTCOLOR)] HRESULT textColor([retval, out] DWORD *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BACKGROUNDCOLOR)] HRESULT backgroundColor([retval, out] DWORD *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_PREFORMATTED)] HRESULT preFormatted([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_DIRECTION)] HRESULT direction([retval, out] VARIANT_BOOL *p); + [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_BLOCKDIRECTION)] HRESULT blockDirection([retval, out] VARIANT_BOOL *p); [propget, id(DISPID_IHTMLCOMPUTEDSTYLE_OL)] HRESULT OL([retval, out] VARIANT_BOOL *p); HRESULT IsEqual([in] IHTMLComputedStyle *pComputedStyle,[out] VARIANT_BOOL *pfEqual); };

1 0

Jacek Caban : widl: Check dispinterfaces for duplicated methods.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 26ad9a7ba316b36774ea77ca2af64144cea61b7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=26ad9a7ba316b36774ea77ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 4 19:58:51 2020 +0100 widl: Check dispinterfaces for duplicated methods. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 92b4f8ebd5..3ef8d89ba1 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2701,6 +2701,25 @@ static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func) static void check_functions(const type_t *iface, int is_inside_library) { const statement_t *stmt; + /* check for duplicates */ + if (is_attr(iface->attrs, ATTR_DISPINTERFACE)) + { + var_list_t *methods = type_dispiface_get_methods(iface); + var_t *func, *func_iter; + + if (methods) LIST_FOR_EACH_ENTRY( func, methods, var_t, entry ) + { + LIST_FOR_EACH_ENTRY( func_iter, methods, var_t, entry ) + { + if (func == func_iter) break; + if (strcmp(func->name, func_iter->name)) continue; + if (is_attr(func->attrs, ATTR_PROPGET) != is_attr(func_iter->attrs, ATTR_PROPGET)) continue; + if (is_attr(func->attrs, ATTR_PROPPUT) != is_attr(func_iter->attrs, ATTR_PROPPUT)) continue; + if (is_attr(func->attrs, ATTR_PROPPUTREF) != is_attr(func_iter->attrs, ATTR_PROPPUTREF)) continue; + error_loc_info(&func->loc_info, "duplicated function \'%s\'\n", func->name); + } + } + } if (is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE)) { STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) )

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 6446ddeab883306d51fc19b7d22eaf8f579a332d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6446ddeab883306d51fc19b7… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Feb 3 23:25:02 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 3435f87d7a..112cad586b 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-12-13 10:36+0200\n" +"PO-Revision-Date: 2020-02-03 23:24+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3712,17 +3712,15 @@ msgstr "Tikėtasi „@“" #: jscript.rc:75 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript kompiliavimo klaida" #: jscript.rc:76 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript vykdymo klaida" #: jscript.rc:77 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Nežinoma klaida" +msgstr "Nežinoma vykdymo klaida" #: jscript.rc:54 msgid "Number expected" @@ -3770,7 +3768,7 @@ msgstr "Sintaksės klaida reguliariajame reiškinyje" #: jscript.rc:63 msgid "Exception thrown and not caught" -msgstr "" +msgstr "Išimtinė situacija sugeneruota ir neapdorota" #: jscript.rc:65 msgid "URI to be encoded contains invalid characters"

1 0

Zebediah Figura : quartz/tests: Add tests for IFilterGraph::Reconnect().
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 7a0b6a95f63d2355a9cf33d3d433c99165c45385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a0b6a95f63d2355a9cf33d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 14:15:47 2020 -0600 quartz/tests: Add tests for IFilterGraph::Reconnect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index fd946faaa9..2483c502f4 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2878,8 +2878,41 @@ todo_wine ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test Reconnect[Ex](). */ + + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Reconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + hr = IFilterGraph2_Reconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); /* Both pins are disconnected when a filter is removed. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); sink_pin.peer = &source_pin.IPin_iface; IPin_AddRef(sink_pin.peer); hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface);

1 0

Zebediah Figura : quartz/filtergraph: Implement IFilterGraph2::ReconnectEx().
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 570e0a0d3b516035469c7fb2efec27c6fa133b89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=570e0a0d3b516035469c7fb2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 14:15:48 2020 -0600 quartz/filtergraph: Implement IFilterGraph2::ReconnectEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 54 ++++++++++++++++++----------------------- dlls/quartz/tests/filtergraph.c | 25 +++++++++++++++++++ 2 files changed, 49 insertions(+), 30 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index cd4e7f40e0..60bea5542f 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -872,33 +872,13 @@ static HRESULT WINAPI FilterGraph2_ConnectDirect(IFilterGraph2 *iface, IPin *ppi return hr; } -static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *ppin) +static HRESULT WINAPI FilterGraph2_Reconnect(IFilterGraph2 *iface, IPin *pin) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); - IPin *pConnectedTo = NULL; - HRESULT hr; - PIN_DIRECTION pindir; - - IPin_QueryDirection(ppin, &pindir); - hr = IPin_ConnectedTo(ppin, &pConnectedTo); + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); - TRACE("(%p/%p)->(%p) -- %p\n", This, iface, ppin, pConnectedTo); + TRACE("graph %p, pin %p.\n", graph, pin); - if (FAILED(hr)) { - TRACE("Querying connected to failed: %x\n", hr); - return hr; - } - IPin_Disconnect(ppin); - IPin_Disconnect(pConnectedTo); - if (pindir == PINDIR_INPUT) - hr = IPin_Connect(pConnectedTo, ppin, NULL); - else - hr = IPin_Connect(ppin, pConnectedTo, NULL); - IPin_Release(pConnectedTo); - if (FAILED(hr)) - WARN("Reconnecting pins failed, pins are not connected now..\n"); - TRACE("-> %08x\n", hr); - return hr; + return IFilterGraph2_ReconnectEx(iface, pin, NULL); } static HRESULT WINAPI FilterGraph2_Disconnect(IFilterGraph2 *iface, IPin *ppin) @@ -1830,15 +1810,29 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilterForMoniker(IFilterGraph2 *ifac return S_OK; } -static HRESULT WINAPI FilterGraph2_ReconnectEx(IFilterGraph2 *iface, IPin *ppin, - const AM_MEDIA_TYPE *pmt) +static HRESULT WINAPI FilterGraph2_ReconnectEx(IFilterGraph2 *iface, IPin *pin, const AM_MEDIA_TYPE *mt) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); + PIN_DIRECTION dir; + HRESULT hr; + IPin *peer; - TRACE("(%p/%p)->(%p %p): stub !!!\n", This, iface, ppin, pmt); - strmbase_dump_media_type(pmt); + TRACE("graph %p, pin %p, mt %p.\n", graph, pin, mt); - return S_OK; + if (FAILED(hr = IPin_ConnectedTo(pin, &peer))) + return hr; + + IPin_QueryDirection(pin, &dir); + IFilterGraph2_Disconnect(iface, peer); + IFilterGraph2_Disconnect(iface, pin); + + if (dir == PINDIR_INPUT) + hr = IFilterGraph2_ConnectDirect(iface, peer, pin, mt); + else + hr = IFilterGraph2_ConnectDirect(iface, pin, peer, mt); + + IPin_Release(peer); + return hr; } static HRESULT WINAPI FilterGraph2_RenderEx(IFilterGraph2 *iface, IPin *pPinOut, DWORD dwFlags, diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 2483c502f4..b36605f396 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2910,6 +2910,31 @@ todo_wine hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ReconnectEx(graph, &source_pin.IPin_iface, NULL); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ReconnectEx(graph, &sink_pin.IPin_iface, NULL); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ReconnectEx(graph, &source_pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ReconnectEx(graph, &source_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Both pins are disconnected when a filter is removed. */ hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : quartz/tests: Use BaseOutputPinImpl_AttemptConnection().
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: b9a5b7a3b7c4b7e0ac78b6c36a74cb1cd90a4bc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9a5b7a3b7c4b7e0ac78b6c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 14:15:49 2020 -0600 quartz/tests: Use BaseOutputPinImpl_AttemptConnection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 23 +++++------------------ dlls/quartz/tests/vmr7.c | 23 +++++------------------ dlls/quartz/tests/vmr9.c | 24 +++++------------------- 3 files changed, 15 insertions(+), 55 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index f75cf2919a..4e26a18f83 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -522,31 +522,18 @@ static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDI return S_OK; } -static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface, - IPin *peer, const AM_MEDIA_TYPE *mt) +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) { - HRESULT hr; - - iface->pin.peer = peer; - IPin_AddRef(peer); - CopyMediaType(&iface->pin.mt, mt); - - if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) - { - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - IPin_Release(peer); - iface->pin.peer = NULL; - FreeMediaType(&iface->pin.mt); - } - - return hr; + return S_OK; } static const struct strmbase_source_ops testsource_ops = { .base.pin_query_accept = testsource_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, - .pfnAttemptConnection = testsource_AttemptConnection, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, }; static void testfilter_init(struct testfilter *filter) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 8a17bdcd19..bb793741e9 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -872,31 +872,18 @@ static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDI return S_OK; } -static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface, - IPin *peer, const AM_MEDIA_TYPE *mt) +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) { - HRESULT hr; - - iface->pin.peer = peer; - IPin_AddRef(peer); - CopyMediaType(&iface->pin.mt, mt); - - if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) - { - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - IPin_Release(peer); - iface->pin.peer = NULL; - FreeMediaType(&iface->pin.mt); - } - - return hr; + return S_OK; } static const struct strmbase_source_ops testsource_ops = { .base.pin_query_accept = testsource_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, - .pfnAttemptConnection = testsource_AttemptConnection, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, }; static void testfilter_init(struct testfilter *filter) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index ed3f7cd38b..a800aaeb70 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -876,32 +876,18 @@ static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDI return S_OK; } -static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface, - IPin *peer, const AM_MEDIA_TYPE *mt) +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) { - HRESULT hr; - - iface->pin.peer = peer; - IPin_AddRef(peer); - CopyMediaType(&iface->pin.mt, mt); - - if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) - { - todo_wine_if (((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader.biBitCount == 24) - ok(hr == VFW_E_TYPE_NOT_ACCEPTED || hr == E_FAIL, "Got hr %#x.\n", hr); - IPin_Release(peer); - iface->pin.peer = NULL; - FreeMediaType(&iface->pin.mt); - } - - return hr; + return S_OK; } static const struct strmbase_source_ops testsource_ops = { .base.pin_query_accept = testsource_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, - .pfnAttemptConnection = testsource_AttemptConnection, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, }; static void testfilter_init(struct testfilter *filter)

1 0

Zebediah Figura : quartz/tests: Add some tests for file source pin connection.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: f31815f760153a8785b6f1a3bde6160dec77e5aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=f31815f760153a8785b6f1a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 14:15:50 2020 -0600 quartz/tests: Add some tests for file source pin connection. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 306 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 305 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f31815f760153a8785b6…

1 0

Zebediah Figura : quartz/filesource: Accept any non-null subtype.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 76b6bcbf9857c63b5955f458c8a63ed314cfce8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b6bcbf9857c63b5955f458… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 14:15:51 2020 -0600 quartz/filesource: Accept any non-null subtype. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 3 ++- dlls/quartz/tests/filesource.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 2b7e9d58b1..4855f9834c 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -591,7 +591,8 @@ static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TY AsyncReader *filter = impl_from_strmbase_pin(iface); if (IsEqualGUID(&mt->majortype, &filter->mt.majortype) - && IsEqualGUID(&mt->subtype, &filter->mt.subtype)) + && (!IsEqualGUID(&mt->subtype, &GUID_NULL) + || IsEqualGUID(&filter->mt.subtype, &GUID_NULL))) return S_OK; return S_FALSE; diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 16322902f5..6fe19bf2c9 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -389,7 +389,7 @@ static void test_file_source_filter(void) mt.formattype = FORMAT_VideoInfo; mt.subtype = MEDIASUBTYPE_RGB32; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); mt.majortype = MEDIATYPE_Video; hr = IPin_QueryAccept(pin, &mt);

1 0