February 2020 - Wine-commits

Alexandre Julliard : Wine release 5.3
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: website Branch: master Commit: 6e96b7e23ec167cb1fca2948bf697102fc1fffa5 URL: https://source.winehq.org/git/website.git/?a=commit;h=6e96b7e23ec167cb1fca2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 28 20:55:10 2020 +0100 Wine release 5.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020022801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2020022801.xml b/news/en/2020022801.xml new file mode 100644 index 00000000..3cc1b38f --- /dev/null +++ b/news/en/2020022801.xml @@ -0,0 +1,15 @@ +<news> +<date>February 28, 2020</date> +<title>Wine 5.3 Released</title> +<body> + The Wine development release 5.3 is now available. + <a href="{$root}/announce/5.3">What's new</a> in this release: +<ul> + <li>More work towards Ucrtbase runtime support.</li> + <li>Full support for Unicode normalization.</li> + <li>Improvements in Shell Folders handling.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : mf: Keep a list of output streams.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 4fc32ab657a2d15f9b632c4f89f46b88c6fdfb4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fc32ab657a2d15f9b632c4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:57 2020 +0300 mf: Keep a list of output streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 12685583e2..288ea60e6f 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -109,6 +109,13 @@ struct media_sink IMFMediaSink *sink; }; +struct output_node +{ + struct list entry; + IMFStreamSink *stream; + enum object_state state; +}; + struct media_session { IMFMediaSession IMFMediaSession_iface; @@ -130,6 +137,7 @@ struct media_session struct list sources; struct list source_nodes; struct list sinks; + struct list output_nodes; } presentation; struct list topologies; enum session_state state; @@ -788,6 +796,89 @@ static void session_raise_topology_set(struct media_session *session, IMFTopolog IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologySet, &GUID_NULL, status, &param); } +static HRESULT session_add_media_sink(struct media_session *session, IMFTopologyNode *node, IMFMediaSink *sink) +{ + struct media_sink *media_sink; + + LIST_FOR_EACH_ENTRY(media_sink, &session->presentation.sinks, struct media_sink, entry) + { + if (sink == media_sink->sink) + return S_FALSE; + } + + if (!(media_sink = heap_alloc_zero(sizeof(*media_sink)))) + return E_OUTOFMEMORY; + + media_sink->sink = sink; + IMFMediaSink_AddRef(media_sink->sink); + + list_add_tail(&session->presentation.sinks, &media_sink->entry); + + return S_OK; +} + +static HRESULT session_collect_output_nodes(struct media_session *session) +{ + IMFTopology *topology = session->presentation.current_topology; + IMFTopologyNode *topo_node; + struct output_node *node; + IMFCollection *nodes; + DWORD count, i; + HRESULT hr; + + if (!list_empty(&session->presentation.output_nodes)) + return S_OK; + + if (FAILED(hr = IMFTopology_GetOutputNodeCollection(topology, &nodes))) + return hr; + + if (FAILED(hr = IMFCollection_GetElementCount(nodes, &count))) + { + IMFCollection_Release(nodes); + return hr; + } + + for (i = 0; i < count; ++i) + { + IMFMediaSink *media_sink = NULL; + + if (FAILED(hr = IMFCollection_GetElement(nodes, i, (IUnknown **)&topo_node))) + break; + + if (!(node = heap_alloc_zero(sizeof(*node)))) + hr = E_OUTOFMEMORY; + + if (SUCCEEDED(hr)) + hr = IMFTopologyNode_GetObject(topo_node, (IUnknown **)&node->stream); + + if (SUCCEEDED(hr)) + hr = IMFStreamSink_GetMediaSink(node->stream, &media_sink); + + if (SUCCEEDED(hr)) + hr = session_add_media_sink(session, topo_node, media_sink); + + if (media_sink) + IMFMediaSink_Release(media_sink); + + if (SUCCEEDED(hr)) + { + list_add_tail(&session->presentation.output_nodes, &node->entry); + } + else if (node) + { + if (node->stream) + IMFStreamSink_Release(node->stream); + heap_free(node); + } + + IMFTopologyNode_Release(topo_node); + } + + IMFCollection_Release(nodes); + + return hr; +} + static void session_set_current_topology(struct media_session *session, IMFTopology *topology) { IMFMediaEvent *event; @@ -800,6 +891,7 @@ static void session_set_current_topology(struct media_session *session, IMFTopol } session_collect_source_nodes(session); + session_collect_output_nodes(session); /* FIXME: attributes are all zero for now */ if (SUCCEEDED(MFCreateMediaEvent(MESessionNotifyPresentationTime, &GUID_NULL, S_OK, NULL, &event))) @@ -1752,6 +1844,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses list_init(&object->presentation.sources); list_init(&object->presentation.source_nodes); list_init(&object->presentation.sinks); + list_init(&object->presentation.output_nodes); InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateTopology(&object->presentation.current_topology)))

1 0

Nikolay Sivov : mf: Query for optional event generator for sinks.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: c61219625c64d03e5ff05a279e379e8bcda4ac74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c61219625c64d03e5ff05a27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:58 2020 +0300 mf: Query for optional event generator for sinks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 288ea60e6f..0bbf0bac56 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -107,6 +107,7 @@ struct media_sink { struct list entry; IMFMediaSink *sink; + IMFMediaEventGenerator *event_generator; }; struct output_node @@ -573,13 +574,14 @@ static void session_clear_presentation(struct media_session *session) heap_free(src_node); } - LIST_FOR_EACH_ENTRY_SAFE(sink, sink2, &session->presentation.sinks, struct media_sink, entry) { list_remove(&sink->entry); if (sink->sink) IMFMediaSink_Release(sink->sink); + if (sink->event_generator) + IMFMediaEventGenerator_Release(sink->event_generator); heap_free(sink); } } @@ -812,6 +814,8 @@ static HRESULT session_add_media_sink(struct media_session *session, IMFTopology media_sink->sink = sink; IMFMediaSink_AddRef(media_sink->sink); + IMFMediaSink_QueryInterface(media_sink->sink, &IID_IMFMediaEventGenerator, (void **)&media_sink->event_generator); + list_add_tail(&session->presentation.sinks, &media_sink->entry); return S_OK;

1 0

Nikolay Sivov : mf: Add support for MESessionCapabilitiesChanged event.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 9eb7337a58bcd32df318c0cf4b6a44cc57e5ae89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eb7337a58bcd32df318c0cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:59 2020 +0300 mf: Add support for MESessionCapabilitiesChanged event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 0bbf0bac56..cbaa2bf23a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -142,6 +142,7 @@ struct media_session } presentation; struct list topologies; enum session_state state; + DWORD caps; CRITICAL_SECTION cs; }; @@ -798,6 +799,50 @@ static void session_raise_topology_set(struct media_session *session, IMFTopolog IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologySet, &GUID_NULL, status, &param); } +static DWORD session_get_object_rate_caps(IUnknown *object) +{ + IMFRateSupport *rate_support; + DWORD caps = 0; + float rate; + + if (SUCCEEDED(MFGetService(object, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support))) + { + rate = 0.0f; + if (SUCCEEDED(IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate)) && rate != 0.0f) + caps |= MFSESSIONCAP_RATE_FORWARD; + + rate = 0.0f; + if (SUCCEEDED(IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate)) && rate != 0.0f) + caps |= MFSESSIONCAP_RATE_REVERSE; + + IMFRateSupport_Release(rate_support); + } + + return caps; +} + +static void session_set_caps(struct media_session *session, DWORD caps) +{ + DWORD delta = session->caps ^ caps; + IMFMediaEvent *event; + + /* Delta is documented to reflect rate value changes as well, but it's not clear what to compare + them to, since session always queries for current object rates. */ + if (!delta) + return; + + session->caps = caps; + + if (FAILED(MFCreateMediaEvent(MESessionCapabilitiesChanged, &GUID_NULL, S_OK, NULL, &event))) + return; + + IMFMediaEvent_SetUINT32(event, &MF_EVENT_SESSIONCAPS, caps); + IMFMediaEvent_SetUINT32(event, &MF_EVENT_SESSIONCAPS_DELTA, delta); + + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + IMFMediaEvent_Release(event); +} + static HRESULT session_add_media_sink(struct media_session *session, IMFTopologyNode *node, IMFMediaSink *sink) { struct media_sink *media_sink; @@ -885,6 +930,9 @@ static HRESULT session_collect_output_nodes(struct media_session *session) static void session_set_current_topology(struct media_session *session, IMFTopology *topology) { + struct media_source *source; + DWORD caps, object_flags; + struct media_sink *sink; IMFMediaEvent *event; HRESULT hr; @@ -907,6 +955,46 @@ static void session_set_current_topology(struct media_session *session, IMFTopol IMFMediaEventQueue_QueueEvent(session->event_queue, event); IMFMediaEvent_Release(event); } + + /* Update session caps. */ + caps = MFSESSIONCAP_START | MFSESSIONCAP_SEEK | MFSESSIONCAP_RATE_FORWARD | MFSESSIONCAP_RATE_REVERSE | + MFSESSIONCAP_DOES_NOT_USE_NETWORK; + + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + if (!caps) + break; + + object_flags = 0; + if (SUCCEEDED(IMFMediaSource_GetCharacteristics(source->source, &object_flags))) + { + if (!(object_flags & MFMEDIASOURCE_DOES_NOT_USE_NETWORK)) + caps &= ~MFSESSIONCAP_DOES_NOT_USE_NETWORK; + if (!(object_flags & MFMEDIASOURCE_CAN_SEEK)) + caps &= ~MFSESSIONCAP_SEEK; + } + + /* Mask unsupported rate caps. */ + + caps &= session_get_object_rate_caps((IUnknown *)source->source) + | ~(MFSESSIONCAP_RATE_FORWARD | MFSESSIONCAP_RATE_REVERSE); + } + + LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) + { + if (!caps) + break; + + object_flags = 0; + if (SUCCEEDED(IMFMediaSink_GetCharacteristics(sink->sink, &object_flags))) + { + if (!(object_flags & MEDIASINK_RATELESS)) + caps &= session_get_object_rate_caps((IUnknown *)sink->sink) + | ~(MFSESSIONCAP_RATE_FORWARD | MFSESSIONCAP_RATE_REVERSE); + } + } + + session_set_caps(session, caps); } static void session_set_topology(struct media_session *session, DWORD flags, IMFTopology *topology) @@ -1242,9 +1330,22 @@ static HRESULT WINAPI mfsession_GetClock(IMFMediaSession *iface, IMFClock **cloc static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, DWORD *caps) { - FIXME("%p, %p.\n", iface, caps); + struct media_session *session = impl_from_IMFMediaSession(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, caps); + + if (!caps) + return E_POINTER; + + EnterCriticalSection(&session->cs); + if (session->state == SESSION_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + *caps = session->caps; + LeaveCriticalSection(&session->cs); + + return hr; } static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD flags, TOPOID id, IMFTopology **topology)

1 0

Nikolay Sivov : mf: Implement two-step session transition to running state.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 9122d73ccdacf506e03bcfdbcef17168bfe3328c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9122d73ccdacf506e03bcfdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:01:00 2020 +0300 mf: Implement two-step session transition to running state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 313 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 186 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9122d73ccdacf506e03b…

1 0

Nikolay Sivov : mf: Track stream sinks state to maintain session state.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 74e7e45d9f467912bff250dc6f3519de42b94555 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74e7e45d9f467912bff250dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:01:01 2020 +0300 mf: Track stream sinks state to maintain session state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 367f39cd9c..70d042cf3d 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1582,6 +1582,19 @@ static BOOL session_is_source_nodes_state(struct media_session *session, enum ob return TRUE; } +static BOOL session_is_output_nodes_state(struct media_session *session, enum object_state state) +{ + struct output_node *node; + + LIST_FOR_EACH_ENTRY(node, &session->presentation.output_nodes, struct output_node, entry) + { + if (node->state != state) + return FALSE; + } + + return TRUE; +} + static enum object_state session_get_object_state_for_event(MediaEventType event) { switch (event) @@ -1737,6 +1750,68 @@ static void session_set_source_object_state(struct media_session *session, IUnkn } } +static void session_set_sink_stream_state(struct media_session *session, IMFStreamSink *stream, + MediaEventType event_type) +{ + struct media_source *source; + struct output_node *node; + enum object_state state; + BOOL changed = FALSE; + IMFMediaEvent *event; + DWORD caps, flags; + + if ((state = session_get_object_state_for_event(event_type)) == OBJ_STATE_INVALID) + return; + + LIST_FOR_EACH_ENTRY(node, &session->presentation.output_nodes, struct output_node, entry) + { + if (stream == node->stream) + { + changed = node->state != state; + node->state = state; + break; + } + } + + if (!changed) + return; + + switch (session->state) + { + case SESSION_STATE_STARTING_SINKS: + if (!session_is_output_nodes_state(session, OBJ_STATE_STARTED)) + break; + + session->state = SESSION_STATE_RUNNING; + + caps = session->caps | MFSESSIONCAP_PAUSE; + + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + if (SUCCEEDED(IMFMediaSource_GetCharacteristics(source->source, &flags))) + { + if (!(flags & MFMEDIASOURCE_CAN_PAUSE)) + { + caps &= ~MFSESSIONCAP_PAUSE; + break; + } + } + } + + session_set_caps(session, caps); + + if (SUCCEEDED(MFCreateMediaEvent(MESessionStarted, &GUID_NULL, S_OK, NULL, &event))) + { + IMFMediaEvent_SetUINT64(event, &MF_EVENT_PRESENTATION_TIME_OFFSET, 0); + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + IMFMediaEvent_Release(event); + } + break; + default: + ; + } +} + static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); @@ -1803,6 +1878,15 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM IMFMediaSource_Release(source); + break; + case MEStreamSinkStarted: + case MEStreamSinkPaused: + case MEStreamSinkStopped: + + EnterCriticalSection(&session->cs); + session_set_sink_stream_state(session, (IMFStreamSink *)event_source, event_type); + LeaveCriticalSection(&session->cs); + break; default: ;

1 0

Nikolay Sivov : mf: Implement Pause() command for media session.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 43fd6bd94a45fe4fb047f596b35564b32be40d98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43fd6bd94a45fe4fb047f596… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:01:02 2020 +0300 mf: Implement Pause() command for media session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 70d042cf3d..b2ddad6c96 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -76,6 +76,9 @@ enum session_state SESSION_STATE_STARTING_SOURCES, SESSION_STATE_STARTING_SINKS, SESSION_STATE_RUNNING, + SESSION_STATE_PAUSING_SINKS, + SESSION_STATE_PAUSING_SOURCES, + SESSION_STATE_PAUSED, SESSION_STATE_CLOSED, SESSION_STATE_SHUT_DOWN, }; @@ -644,6 +647,34 @@ static void session_start(struct media_session *session, const GUID *time_format LeaveCriticalSection(&session->cs); } +static void session_pause(struct media_session *session) +{ + HRESULT hr; + + EnterCriticalSection(&session->cs); + + switch (session->state) + { + case SESSION_STATE_RUNNING: + + /* Transition in two steps - pause clock, wait for sinks and pause sources. */ + if (SUCCEEDED(hr = IMFPresentationClock_Pause(session->clock))) + session->state = SESSION_STATE_PAUSING_SINKS; + + break; + default: + hr = MF_E_INVALIDREQUEST; + } + + if (FAILED(hr)) + { + session->state = SESSION_STATE_PAUSED; + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, hr, NULL); + } + + LeaveCriticalSection(&session->cs); +} + static struct media_source *session_get_media_source(struct media_session *session, IMFMediaSource *source) { struct media_source *cur; @@ -1469,6 +1500,7 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, session_start(session, &op->u.start.time_format, &op->u.start.start_position); break; case SESSION_CMD_PAUSE: + session_pause(session); break; case SESSION_CMD_CLOSE: EnterCriticalSection(&session->cs); @@ -1744,6 +1776,17 @@ static void session_set_source_object_state(struct media_session *session, IUnkn if (SUCCEEDED(session_start_clock(session))) session->state = SESSION_STATE_STARTING_SINKS; + break; + case SESSION_STATE_PAUSING_SOURCES: + if (!session_is_source_nodes_state(session, OBJ_STATE_PAUSED)) + break; + + session->state = SESSION_STATE_PAUSED; + + session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); + + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, S_OK, NULL); + break; default: ; @@ -1759,6 +1802,7 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre BOOL changed = FALSE; IMFMediaEvent *event; DWORD caps, flags; + HRESULT hr; if ((state = session_get_object_state_for_event(event_type)) == OBJ_STATE_INVALID) return; @@ -1806,6 +1850,25 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre IMFMediaEventQueue_QueueEvent(session->event_queue, event); IMFMediaEvent_Release(event); } + break; + case SESSION_STATE_PAUSING_SINKS: + if (!session_is_output_nodes_state(session, OBJ_STATE_PAUSED)) + break; + + session->state = SESSION_STATE_PAUSING_SOURCES; + + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + if (FAILED(hr = IMFMediaSource_Pause(source->source))) + break; + } + + if (FAILED(hr)) + { + session->state = SESSION_STATE_PAUSED; + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, hr, NULL); + } + break; default: ;

1 0

Nikolay Sivov : mf: Allow restarting from paused state.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: d4cc70e1b6e2ea1055ea86647fc9ef721ed4a40d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4cc70e1b6e2ea1055ea8664… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:01:03 2020 +0300 mf: Allow restarting from paused state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index b2ddad6c96..485b336570 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -614,6 +614,7 @@ static void session_start(struct media_session *session, const GUID *time_format switch (session->state) { case SESSION_STATE_STOPPED: + case SESSION_STATE_PAUSED: session->presentation.time_format = *time_format; session->presentation.start_position.vt = VT_EMPTY;

1 0

Nikolay Sivov : mf: Implement Stop() command for media session.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: ddfb56c0b7fab4c116a469b24e04eb543c04d00e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddfb56c0b7fab4c116a469b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:01:04 2020 +0300 mf: Implement Stop() command for media session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 485b336570..76310040ee 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -79,6 +79,8 @@ enum session_state SESSION_STATE_PAUSING_SINKS, SESSION_STATE_PAUSING_SOURCES, SESSION_STATE_PAUSED, + SESSION_STATE_STOPPING_SINKS, + SESSION_STATE_STOPPING_SOURCES, SESSION_STATE_CLOSED, SESSION_STATE_SHUT_DOWN, }; @@ -676,6 +678,36 @@ static void session_pause(struct media_session *session) LeaveCriticalSection(&session->cs); } +static void session_stop(struct media_session *session) +{ + HRESULT hr = S_OK; + + EnterCriticalSection(&session->cs); + + switch (session->state) + { + case SESSION_STATE_RUNNING: + case SESSION_STATE_PAUSED: + + /* Transition in two steps - pause clock, wait for sinks and pause sources. */ + if (SUCCEEDED(hr = IMFPresentationClock_Stop(session->clock))) + session->state = SESSION_STATE_STOPPING_SINKS; + + break; + default: + ; + } + + if (FAILED(hr)) + { + session->state = SESSION_STATE_STOPPED; + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, hr, NULL); + } + + LeaveCriticalSection(&session->cs); +} + + static struct media_source *session_get_media_source(struct media_session *session, IMFMediaSource *source) { struct media_source *cur; @@ -1503,6 +1535,9 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, case SESSION_CMD_PAUSE: session_pause(session); break; + case SESSION_CMD_STOP: + session_stop(session); + break; case SESSION_CMD_CLOSE: EnterCriticalSection(&session->cs); if (session->state != SESSION_STATE_CLOSED) @@ -1724,6 +1759,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn MediaEventType event_type) { struct source_node *src_node; + struct output_node *out_node; struct media_source *src; enum object_state state; BOOL changed = FALSE; @@ -1788,6 +1824,22 @@ static void session_set_source_object_state(struct media_session *session, IUnkn IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, S_OK, NULL); + break; + case SESSION_STATE_STOPPING_SOURCES: + if (!session_is_source_nodes_state(session, OBJ_STATE_STOPPED)) + break; + + session->state = SESSION_STATE_STOPPED; + + LIST_FOR_EACH_ENTRY(out_node, &session->presentation.output_nodes, struct output_node, entry) + { + IMFStreamSink_Flush(out_node->stream); + } + + session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); + + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, S_OK, NULL); + break; default: ; @@ -1870,6 +1922,25 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionPaused, &GUID_NULL, hr, NULL); } + break; + case SESSION_STATE_STOPPING_SINKS: + if (!session_is_output_nodes_state(session, OBJ_STATE_STOPPED)) + break; + + session->state = SESSION_STATE_STOPPING_SOURCES; + + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + if (FAILED(hr = IMFMediaSource_Stop(source->source))) + break; + } + + if (FAILED(hr)) + { + session->state = SESSION_STATE_STOPPED; + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, hr, NULL); + } + break; default: ;

1 0

Jacek Caban : winegcc: Fix passing -delayload argument to linker.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: e7fe6c0ac2c6b4ef3e0118cd737e738729c819af URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7fe6c0ac2c6b4ef3e0118cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 28 14:52:32 2020 +0100 winegcc: Fix passing -delayload argument to linker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e53e32e22d..a5519352dd 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1260,7 +1260,7 @@ static void build(struct options* opts) if (is_pe) { for (j = 0; j < opts->delayimports->size; j++) - strarray_add(spec_args, strmake("-Wl,-delayload,%s", opts->delayimports->base[j])); + strarray_add(link_args, strmake("-Wl,-delayload,%s", opts->delayimports->base[j])); } for ( j = 0; j < files->size; j++ )

1 0