November 2023 - Wine-Commits

Alfred Agrell : quartz/tests: Add tests for CLSID_CMpegVideoCodec.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: wine Branch: master Commit: 012de8b265d4ee1b76e8bc65425a3aa081345e7f URL: https://gitlab.winehq.org/wine/wine/-/commit/012de8b265d4ee1b76e8bc65425a3a… Author: Alfred Agrell <floating(a)muncher.se> Date: Tue Sep 26 23:53:55 2023 +0200 quartz/tests: Add tests for CLSID_CMpegVideoCodec. --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/mpegvideo.c | 1620 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1621 insertions(+)

1 0

Gabriel Ivăncescu : mshtml: Keep ref from the document node to the inner window.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: wine Branch: master Commit: ce9ef35b92ffc0b67674db03ea323cdddb352cd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce9ef35b92ffc0b67674db03ea323c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 1 17:00:40 2023 +0200 mshtml: Keep ref from the document node to the inner window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9750ad19765..f1da5eaad07 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5700,6 +5700,12 @@ void detach_document_node(HTMLDocumentNode *doc) { unsigned i; + if(doc->window) { + HTMLInnerWindow *window = doc->window; + doc->window = NULL; + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + } + while(!list_empty(&doc->plugin_hosts)) detach_plugin_host(LIST_ENTRY(list_head(&doc->plugin_hosts), PluginHost, entry)); @@ -5855,6 +5861,15 @@ static void *HTMLDocumentNode_query_interface(DispatchEx *dispex, REFIID riid) return HTMLDOMNode_query_interface(&This->node.event_target.dispex, riid); } +static void HTMLDocumentNode_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLDocumentNode *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->window) + note_cc_edge((nsISupports*)&This->window->base.IHTMLWindow2_iface, "window", cb); +} + static void HTMLDocumentNode_unlink(DispatchEx *dispex) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); @@ -5865,13 +5880,8 @@ static void HTMLDocumentNode_unlink(DispatchEx *dispex) detach_document_node(This); This->dom_document = NULL; This->html_document = NULL; - This->window = NULL; }else if(This->window) { detach_document_node(This); - - /* document fragments own reference to inner window */ - IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); - This->window = NULL; } } @@ -6057,7 +6067,7 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { { .query_interface = HTMLDocumentNode_query_interface, .destructor = HTMLDocumentNode_destructor, - .traverse = HTMLDOMNode_traverse, + .traverse = HTMLDocumentNode_traverse, .unlink = HTMLDocumentNode_unlink, .get_name = HTMLDocumentNode_get_name, .invoke = HTMLDocumentNode_invoke, @@ -6166,6 +6176,9 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindo doc->outer_window = window ? window->base.outer_window : NULL; doc->window = window; + if(window) + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + ConnectionPointContainer_Init(&doc->cp_container, (IUnknown*)&doc->IHTMLDocument2_iface, HTMLDocumentNode_cpc); HTMLDocumentNode_Persist_Init(doc); HTMLDocumentNode_Service_Init(doc); @@ -6241,8 +6254,6 @@ static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *do if(!doc_frag) return E_OUTOFMEMORY; - IHTMLWindow2_AddRef(&doc_frag->window->base.IHTMLWindow2_iface); - HTMLDOMNode_Init(doc_node, &doc_frag->node, nsnode, &HTMLDocumentNode_dispex); doc_frag->node.vtbl = &HTMLDocumentFragmentImplVtbl; doc_frag->document_mode = lock_document_mode(doc_node);

1 0

Louis Lenders : uxtheme: Add stub for AllowDarkModeForWindow.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: wine Branch: master Commit: 29d5ce6b7a40635e2c4904ece9b8381a8132f248 URL: https://gitlab.winehq.org/wine/wine/-/commit/29d5ce6b7a40635e2c4904ece9b838… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Oct 31 07:59:03 2023 +0100 uxtheme: Add stub for AllowDarkModeForWindow. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55742 --- dlls/uxtheme/system.c | 10 ++++++++++ dlls/uxtheme/uxtheme.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 6b202bb48a7..2c041356930 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1291,6 +1291,16 @@ BOOL WINAPI ShouldAppsUseDarkMode(void) return !light_theme; } +/********************************************************************** + * AllowDarkModeForWindow (UXTHEME.133) + * + */ +BOOL WINAPI AllowDarkModeForWindow(HWND hwnd, BOOL allow) +{ + FIXME("%p %d: stub\n", hwnd, allow); + return FALSE; +} + /********************************************************************** * SetPreferredAppMode (UXTHEME.135) * diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 6bcebffe0a5..1cf8ae7e418 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -43,6 +43,7 @@ 62 stub -noname ServerClearStockObjects 63 stub -noname MarkSelection 132 stdcall -noname ShouldAppsUseDarkMode() +133 stdcall -noname AllowDarkModeForWindow(ptr long) 135 stdcall -noname SetPreferredAppMode(long) 138 stdcall -noname ShouldSystemUseDarkMode()

1 0

Alfred Agrell : winegstreamer: Use the new output_compressed property instead of mpegaudioparse in MPEG splitter.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: wine Branch: master Commit: 5c24b7e56b5c22d53cd79a8fc018f09a33bc8223 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c24b7e56b5c22d53cd79a8fc018f0… Author: Alfred Agrell <floating(a)muncher.se> Date: Fri Oct 20 00:10:28 2023 +0200 winegstreamer: Use the new output_compressed property instead of mpegaudioparse in MPEG splitter. --- dlls/winegstreamer/quartz_parser.c | 2 +- dlls/winegstreamer/unixlib.h | 1 - dlls/winegstreamer/wg_parser.c | 26 -------------------------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index eb31f19b33d..0e8a5068aff 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -2214,7 +2214,7 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) struct parser *object; HRESULT hr; - if (FAILED(hr = parser_create(WG_PARSER_MPEGAUDIOPARSE, FALSE, &object))) + if (FAILED(hr = parser_create(WG_PARSER_DECODEBIN, TRUE, &object))) return hr; strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops); diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 14895cd2fca..201131e31ab 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -202,7 +202,6 @@ enum wg_parser_type { WG_PARSER_DECODEBIN, WG_PARSER_AVIDEMUX, - WG_PARSER_MPEGAUDIOPARSE, WG_PARSER_WAVPARSE, }; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 9aec97231e0..2015b1f46c5 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1806,31 +1806,6 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) return TRUE; } -static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) -{ - struct wg_parser_stream *stream; - GstElement *element; - - if (!(element = create_element("mpegaudioparse", "good"))) - return FALSE; - - gst_bin_add(GST_BIN(parser->container), element); - - if (!link_src_to_element(parser->my_src, element)) - return FALSE; - - if (!(stream = create_stream(parser))) - return FALSE; - - if (!link_element_to_sink(element, stream->my_sink)) - return FALSE; - gst_pad_set_active(stream->my_sink, 1); - - parser->no_more_pads = true; - - return TRUE; -} - static BOOL wave_parser_init_gst(struct wg_parser *parser) { struct wg_parser_stream *stream; @@ -1862,7 +1837,6 @@ static NTSTATUS wg_parser_create(void *args) { [WG_PARSER_DECODEBIN] = decodebin_parser_init_gst, [WG_PARSER_AVIDEMUX] = avi_parser_init_gst, - [WG_PARSER_MPEGAUDIOPARSE] = mpeg_audio_parser_init_gst, [WG_PARSER_WAVPARSE] = wave_parser_init_gst, };

1 0

Alfred Agrell : quartz/tests: Add tests for new CLSID_MPEG1Splitter functionality.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: wine Branch: master Commit: 65ea18ba78b87042cb3ac25a544573bdd9538d34 URL: https://gitlab.winehq.org/wine/wine/-/commit/65ea18ba78b87042cb3ac25a544573… Author: Alfred Agrell <floating(a)muncher.se> Date: Tue Sep 26 23:53:42 2023 +0200 quartz/tests: Add tests for new CLSID_MPEG1Splitter functionality. --- dlls/quartz/tests/mpegsplit.c | 183 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 173 insertions(+), 10 deletions(-)

1 0

Alfred Agrell : winegstreamer: Add program stream and video output support to CLSID_MPEG1Splitter.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: wine Branch: master Commit: e8e5e8b5c94f7ec7dfd00fc7684be4f7263fe725 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8e5e8b5c94f7ec7dfd00fc7684be4… Author: Alfred Agrell <floating(a)muncher.se> Date: Fri Oct 20 02:30:45 2023 +0200 winegstreamer: Add program stream and video output support to CLSID_MPEG1Splitter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=9127 --- dlls/winegstreamer/quartz_parser.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index a5528e0e218..5f7b85b861b 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -2205,10 +2205,10 @@ static HRESULT mpeg_splitter_sink_query_accept(struct strmbase_pin *iface, const { if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Stream)) return S_FALSE; - if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1Audio)) + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1Audio) + || IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1System)) return S_OK; if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1Video) - || IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1System) || IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1VideoCD)) FIXME("Unsupported subtype %s.\n", wine_dbgstr_guid(&mt->subtype)); return S_FALSE; @@ -2223,8 +2223,28 @@ static const struct strmbase_sink_ops mpeg_splitter_sink_ops = static BOOL mpeg_splitter_filter_init_gst(struct parser *filter) { - if (!create_pin(filter, wg_parser_get_stream(filter->wg_parser, 0), L"Audio")) - return FALSE; + wg_parser_t parser = filter->wg_parser; + unsigned int i, stream_count; + wg_parser_stream_t stream; + struct wg_format fmt; + + stream_count = wg_parser_get_stream_count(parser); + for (i = 0; i < stream_count; ++i) + { + stream = wg_parser_get_stream(parser, i); + wg_parser_stream_get_preferred_format(stream, &fmt); + if (fmt.major_type == WG_MAJOR_TYPE_VIDEO_MPEG1) + { + if (!create_pin(filter, wg_parser_get_stream(parser, i), L"Video")) + return FALSE; + } + else if (fmt.major_type == WG_MAJOR_TYPE_AUDIO_MPEG1) + { + if (!create_pin(filter, wg_parser_get_stream(parser, i), L"Audio")) + return FALSE; + } + else FIXME("unexpected format %u\n", fmt.major_type); + } return TRUE; }

1 0

Alfred Agrell : winegstreamer: Add WG_MAJOR_TYPE_VIDEO_MPEG1 media type.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: wine Branch: master Commit: 7b2611827a35acb130c490a256275387a9685f7e URL: https://gitlab.winehq.org/wine/wine/-/commit/7b2611827a35acb130c490a2562753… Author: Alfred Agrell <floating(a)muncher.se> Date: Thu Oct 5 17:30:01 2023 +0200 winegstreamer: Add WG_MAJOR_TYPE_VIDEO_MPEG1 media type. --- dlls/winegstreamer/mfplat.c | 1 + dlls/winegstreamer/quartz_parser.c | 140 +++++++++++++++++++++++++++---------- dlls/winegstreamer/unixlib.h | 6 ++ dlls/winegstreamer/wg_format.c | 54 ++++++++++++++ dlls/winegstreamer/wg_transform.c | 2 + dlls/winegstreamer/wm_reader.c | 4 ++ 6 files changed, 172 insertions(+), 35 deletions(-)

1 0

Alfred Agrell : winegstreamer: Implement CLSID_CMpegVideoCodec.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: wine Branch: master Commit: 481fd0ec3b3fa37afaac4563be503687db0c4be7 URL: https://gitlab.winehq.org/wine/wine/-/commit/481fd0ec3b3fa37afaac4563be5036… Author: Alfred Agrell <floating(a)muncher.se> Date: Fri Oct 20 02:31:37 2023 +0200 winegstreamer: Implement CLSID_CMpegVideoCodec. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=9127 --- dlls/winegstreamer/gst_private.h | 2 + dlls/winegstreamer/main.c | 38 ++++++++ dlls/winegstreamer/quartz_parser.c | 6 ++ dlls/winegstreamer/quartz_transform.c | 141 +++++++++++++++++++++++++++ dlls/winegstreamer/wg_transform.c | 2 +- dlls/winegstreamer/winegstreamer_classes.idl | 7 ++ 6 files changed, 195 insertions(+), 1 deletion(-)

1 0

Alfred Agrell : winegstreamer: Clamp QoS events to stay inside the stream's running time.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: wine Branch: master Commit: 2c9f646602343a0bfd7b53f4b580c143d627e1be URL: https://gitlab.winehq.org/wine/wine/-/commit/2c9f646602343a0bfd7b53f4b580c1… Author: Alfred Agrell <floating(a)muncher.se> Date: Fri Oct 20 23:09:39 2023 +0200 winegstreamer: Clamp QoS events to stay inside the stream's running time. --- dlls/winegstreamer/wg_parser.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 2d2e3450ccb..70c25d8c0a0 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -461,6 +461,7 @@ static NTSTATUS wg_parser_stream_notify_qos(void *args) { const struct wg_parser_stream_notify_qos_params *params = args; struct wg_parser_stream *stream = get_stream(params->stream); + GstClockTimeDiff diff = params->diff * 100; GstClockTime stream_time; GstEvent *event; @@ -468,6 +469,8 @@ static NTSTATUS wg_parser_stream_notify_qos(void *args) * file (or other medium), but gst_event_new_qos() expects the timestamp in * running time. */ stream_time = gst_segment_to_running_time(&stream->segment, GST_FORMAT_TIME, params->timestamp * 100); + if (diff < (GstClockTimeDiff)-stream_time) + diff = -stream_time; if (stream_time == -1) { /* This can happen legitimately if the sample falls outside of the @@ -478,7 +481,7 @@ static NTSTATUS wg_parser_stream_notify_qos(void *args) } if (!(event = gst_event_new_qos(params->underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, - params->proportion, params->diff * 100, stream_time))) + params->proportion, diff, stream_time))) GST_ERROR("Failed to create QOS event.\n"); push_event(stream->my_sink, event);

1 0

Alfred Agrell : winegstreamer: Implement parts of IAMStreamSelect::Info in CLSID_MPEG1Splitter.
by Alexandre Julliard Nov. 1, 2023

Nov. 1, 2023

Module: wine Branch: master Commit: 21c5627e2a6e4a9d418a49a18b7e1ae62ac0200b URL: https://gitlab.winehq.org/wine/wine/-/commit/21c5627e2a6e4a9d418a49a18b7e1a… Author: Alfred Agrell <floating(a)muncher.se> Date: Fri Oct 20 14:29:07 2023 +0200 winegstreamer: Implement parts of IAMStreamSelect::Info in CLSID_MPEG1Splitter. --- dlls/winegstreamer/quartz_parser.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index b1a463af531..fe050602db6 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1526,9 +1526,41 @@ static HRESULT WINAPI stream_select_Info(IAMStreamSelect *iface, LONG index, AM_MEDIA_TYPE **mt, DWORD *flags, LCID *lcid, DWORD *group, WCHAR **name, IUnknown **object, IUnknown **unknown) { - FIXME("iface %p, index %ld, mt %p, flags %p, lcid %p, group %p, name %p, object %p, unknown %p, stub!\n", - iface, index, mt, flags, lcid, group, name, object, unknown); - return E_NOTIMPL; + struct parser *filter = impl_from_IAMStreamSelect(iface); + HRESULT hr = S_OK; + + FIXME("filter %p, index %ld, mt %p, flags %p, lcid %p, group %p, name %p, object %p, unknown %p, semi-stub!\n", + filter, index, mt, flags, lcid, group, name, object, unknown); + EnterCriticalSection(&filter->filter.filter_cs); + + if (!filter->sink.pin.peer) + { + LeaveCriticalSection(&filter->filter.filter_cs); + return VFW_E_NOT_CONNECTED; + } + if (index < 0 || index >= filter->source_count) + { + LeaveCriticalSection(&filter->filter.filter_cs); + return S_FALSE; + } + + if (mt) + *mt = CreateMediaType(&filter->sources[index]->pin.pin.mt); + if (flags) /* todo */ + *flags = 0; + if (lcid) /* todo */ + *lcid = 0; + if (group) /* todo */ + *group = 0; + if (name) /* todo */ + *name = NULL; + if (object) /* todo */ + *object = NULL; + if (unknown) + *unknown = NULL; + + LeaveCriticalSection(&filter->filter.filter_cs); + return hr; } static HRESULT WINAPI stream_select_Enable(IAMStreamSelect *iface, LONG index, DWORD flags)

1 0