wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Nikolay Sivov : mf: Set presentation clock for sinks, subscribe to sink events.
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: wine Branch: master Commit: 3bd1e1edf7d8187f1e1902cd3900a22086bd6bbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bd1e1edf7d8187f1e1902cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 4 14:42:48 2019 +0300 mf: Set presentation clock for sinks, subscribe to sink events. 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 fa8d58ad9d..bf1e48aaf7 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -99,6 +99,12 @@ struct media_source struct list streams; }; +struct media_sink +{ + struct list entry; + IMFMediaSink *sink; +}; + struct media_session { IMFMediaSession IMFMediaSession_iface; @@ -117,6 +123,7 @@ struct media_session { struct queued_topology current_topology; struct list sources; + struct list sinks; } presentation; struct list topologies; enum session_state state; @@ -467,6 +474,7 @@ static void session_clear_presentation(struct media_session *session) { struct media_source *source, *source2; struct media_stream *stream, *stream2; + struct media_sink *sink, *sink2; if (session->presentation.current_topology.topology) { @@ -490,6 +498,15 @@ static void session_clear_presentation(struct media_session *session) IMFMediaSource_Release(source->source); heap_free(source); } + + 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); + heap_free(sink); + } } static void session_start(struct media_session *session, const GUID *time_format, const PROPVARIANT *start_position) @@ -1142,6 +1159,71 @@ static BOOL session_set_source_state(struct media_session *session, IMFMediaSour return ret; } +static HRESULT session_set_sinks_clock(struct media_session *session) +{ + IMFTopology *topology = session->presentation.current_topology.topology; + IMFTopologyNode *node; + IMFCollection *nodes; + DWORD count, i; + HRESULT hr; + + if (!list_empty(&session->presentation.sinks)) + 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) + { + IMFStreamSink *stream_sink = NULL; + struct media_sink *sink; + + if (FAILED(hr = IMFCollection_GetElement(nodes, i, (IUnknown **)&node))) + break; + + if (!(sink = heap_alloc_zero(sizeof(*sink)))) + hr = E_OUTOFMEMORY; + + if (SUCCEEDED(hr)) + hr = IMFTopologyNode_GetObject(node, (IUnknown **)&stream_sink); + + if (SUCCEEDED(hr)) + hr = IMFStreamSink_GetMediaSink(stream_sink, &sink->sink); + + if (SUCCEEDED(hr)) + hr = IMFMediaSink_SetPresentationClock(sink->sink, session->clock); + + if (SUCCEEDED(hr)) + hr = IMFStreamSink_BeginGetEvent(stream_sink, &session->events_callback, (IUnknown *)stream_sink); + + if (stream_sink) + IMFStreamSink_Release(stream_sink); + + if (SUCCEEDED(hr)) + { + list_add_tail(&session->presentation.sinks, &sink->entry); + } + else if (sink) + { + if (sink->sink) + IMFMediaSink_Release(sink->sink); + heap_free(sink); + } + + IMFTopologyNode_Release(node); + } + + IMFCollection_Release(nodes); + + return hr; +} + static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); @@ -1194,9 +1276,19 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM ret = session_set_source_state(session, (IMFMediaSource *)event_source, source_state); if (ret && event_type == MESourceStarted) + { session_set_topo_status(session, &session->presentation.current_topology, S_OK, MF_TOPOSTATUS_STARTED_SOURCE); + if (session->state == SESSION_STATE_STARTING) + { + if (SUCCEEDED(session_set_sinks_clock(session))) + { + session->state = SESSION_STATE_RUNNING; + } + } + } + LeaveCriticalSection(&session->cs); break; case MENewStream: @@ -1371,6 +1463,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses object->refcount = 1; list_init(&object->topologies); list_init(&object->presentation.sources); + list_init(&object->presentation.sinks); InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateEventQueue(&object->event_queue)))

1 0

Nikolay Sivov : mf: Send MF_TOPOSTATUS_STARTED_SOURCE status notification after all sources were started successfully.
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: wine Branch: master Commit: 01bab1876dc3e9563712c791d214ebd2b3752cdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=01bab1876dc3e9563712c791… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 4 14:42:47 2019 +0300 mf: Send MF_TOPOSTATUS_STARTED_SOURCE status notification after all sources were started successfully. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e23481d5c9..fa8d58ad9d 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1127,18 +1127,19 @@ static HRESULT session_add_media_stream(struct media_source *source, IMFMediaStr return S_OK; } -static void session_set_source_state(struct media_session *session, IMFMediaSource *source, enum source_state state) +static BOOL session_set_source_state(struct media_session *session, IMFMediaSource *source, enum source_state state) { struct media_source *cur; + BOOL ret = TRUE; LIST_FOR_EACH_ENTRY(cur, &session->presentation.sources, struct media_source, entry) { if (source == cur->source) - { cur->state = state; - break; - } + ret &= cur->state == state; } + + return ret; } static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) @@ -1153,6 +1154,7 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM IMFMediaStream *stream; PROPVARIANT value; HRESULT hr; + BOOL ret; if (FAILED(hr = IMFAsyncResult_GetState(result, (IUnknown **)&event_source))) return hr; @@ -1189,7 +1191,12 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM source_state = SOURCE_STATE_STOPPED; EnterCriticalSection(&session->cs); - session_set_source_state(session, (IMFMediaSource *)event_source, source_state); + + ret = session_set_source_state(session, (IMFMediaSource *)event_source, source_state); + if (ret && event_type == MESourceStarted) + session_set_topo_status(session, &session->presentation.current_topology, S_OK, + MF_TOPOSTATUS_STARTED_SOURCE); + LeaveCriticalSection(&session->cs); break; case MENewStream:

1 0

Nikolay Sivov : mf: Rearrange topology queueing logic to simplify status notifications.
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: wine Branch: master Commit: 82f03261b85f58f0eaaa915b868c4631b07af7a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82f03261b85f58f0eaaa915b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 4 14:42:46 2019 +0300 mf: Rearrange topology queueing logic to simplify status notifications. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 128 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 54 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 9c0b80e340..e23481d5c9 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -66,6 +66,7 @@ struct queued_topology { struct list entry; IMFTopology *topology; + MF_TOPOSTATUS status; }; enum session_state @@ -114,7 +115,7 @@ struct media_session IMFQualityManager *quality_manager; struct { - IMFTopology *current_topology; + struct queued_topology current_topology; struct list sources; } presentation; struct list topologies; @@ -356,6 +357,31 @@ static void session_clear_topologies(struct media_session *session) } } +static void session_set_topo_status(struct media_session *session, struct queued_topology *topology, HRESULT status, + MF_TOPOSTATUS topo_status) +{ + IMFMediaEvent *event; + PROPVARIANT param; + + if (topo_status == MF_TOPOSTATUS_INVALID) + return; + + if (topo_status > topology->status) + { + param.vt = topology ? VT_UNKNOWN : VT_EMPTY; + param.punkVal = topology ? (IUnknown *)topology->topology : NULL; + + if (FAILED(MFCreateMediaEvent(MESessionTopologyStatus, &GUID_NULL, status, &param, &event))) + return; + + IMFMediaEvent_SetUINT32(event, &MF_EVENT_TOPOLOGY_STATUS, topo_status); + topology->status = topo_status; + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + } + + IMFMediaEvent_Release(event); +} + static HRESULT session_bind_output_nodes(IMFTopology *topology) { MF_TOPOLOGY_TYPE node_type; @@ -422,19 +448,19 @@ static IMFTopology *session_get_next_topology(struct media_session *session) { struct queued_topology *queued; - if (!session->presentation.current_topology) + if (!session->presentation.current_topology.topology) { struct list *head = list_head(&session->topologies); if (!head) return NULL; queued = LIST_ENTRY(head, struct queued_topology, entry); - session->presentation.current_topology = queued->topology; + session->presentation.current_topology = *queued; list_remove(&queued->entry); heap_free(queued); } - return session->presentation.current_topology; + return session->presentation.current_topology.topology; } static void session_clear_presentation(struct media_session *session) @@ -442,10 +468,10 @@ static void session_clear_presentation(struct media_session *session) struct media_source *source, *source2; struct media_stream *stream, *stream2; - if (session->presentation.current_topology) + if (session->presentation.current_topology.topology) { - IMFTopology_Release(session->presentation.current_topology); - session->presentation.current_topology = NULL; + IMFTopology_Release(session->presentation.current_topology.topology); + session->presentation.current_topology.topology = NULL; } LIST_FOR_EACH_ENTRY_SAFE(source, source2, &session->presentation.sources, struct media_source, entry) @@ -924,6 +950,16 @@ static HRESULT WINAPI session_commands_callback_GetParameters(IMFAsyncCallback * return E_NOTIMPL; } +static void session_raise_topology_set(struct media_session *session, IMFTopology *topology, HRESULT status) +{ + PROPVARIANT param; + + param.vt = topology ? VT_UNKNOWN : VT_EMPTY; + param.punkVal = (IUnknown *)topology; + + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologySet, &GUID_NULL, status, &param); +} + static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct session_op *op = impl_op_from_IUnknown(IMFAsyncResult_GetStateNoAddRef(result)); @@ -944,26 +980,12 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, { IMFTopology *topology = op->u.set_topology.topology; MF_TOPOSTATUS topo_status = MF_TOPOSTATUS_INVALID; - struct queued_topology *queued_topology; + struct queued_topology *queued_topology = NULL; DWORD flags = op->u.set_topology.flags; - PROPVARIANT param; - if (flags & MFSESSION_SETTOPOLOGY_CLEAR_CURRENT) - { - EnterCriticalSection(&session->cs); - if ((topology && topology == session->presentation.current_topology) || !topology) - { - /* FIXME: stop current topology, queue next one. */ - session_clear_presentation(session); - } - else - status = S_FALSE; - topo_status = MF_TOPOSTATUS_READY; - LeaveCriticalSection(&session->cs); - } - else if (topology) + /* Resolve unless claimed to be full. */ + if (!(flags & MFSESSION_SETTOPOLOGY_CLEAR_CURRENT) && topology) { - /* Resolve unless claimed to be full. */ if (!(flags & MFSESSION_SETTOPOLOGY_NORESOLUTION)) { IMFTopology *resolved_topology = NULL; @@ -984,47 +1006,45 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, { if (!(queued_topology = heap_alloc_zero(sizeof(*queued_topology)))) status = E_OUTOFMEMORY; - else - { - EnterCriticalSection(&session->cs); - - if (flags & MFSESSION_SETTOPOLOGY_IMMEDIATE) - { - session_clear_topologies(session); - session_clear_presentation(session); - } - - queued_topology->topology = topology; - IMFTopology_AddRef(queued_topology->topology); - list_add_tail(&session->topologies, &queued_topology->entry); + } - LeaveCriticalSection(&session->cs); - } + if (SUCCEEDED(status)) + { + queued_topology->topology = topology; + IMFTopology_AddRef(queued_topology->topology); } } - if (topology) + EnterCriticalSection(&session->cs); + + if (flags & MFSESSION_SETTOPOLOGY_CLEAR_CURRENT) { - param.vt = VT_UNKNOWN; - param.punkVal = (IUnknown *)topology; + if ((topology && topology == session->presentation.current_topology.topology) || !topology) + { + /* FIXME: stop current topology, queue next one. */ + session_clear_presentation(session); + } + else + status = S_FALSE; + topo_status = MF_TOPOSTATUS_READY; + queued_topology = &session->presentation.current_topology; } - else - param.vt = VT_EMPTY; - - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionTopologySet, &GUID_NULL, - status, &param); - if (topo_status != MF_TOPOSTATUS_INVALID) + else if (queued_topology) { - IMFMediaEvent *event; - - if (SUCCEEDED(MFCreateMediaEvent(MESessionTopologyStatus, &GUID_NULL, status, &param, &event))) + if (flags & MFSESSION_SETTOPOLOGY_IMMEDIATE) { - IMFMediaEvent_SetUINT32(event, &MF_EVENT_TOPOLOGY_STATUS, topo_status); - IMFMediaEventQueue_QueueEvent(session->event_queue, event); - IMFMediaEvent_Release(event); + session_clear_topologies(session); + session_clear_presentation(session); } + + list_add_tail(&session->topologies, &queued_topology->entry); } + session_raise_topology_set(session, topology, status); + session_set_topo_status(session, queued_topology, status, topo_status); + + LeaveCriticalSection(&session->cs); + break; } case SESSION_CMD_START:

1 0

Nikolay Sivov : mf: Unify trace formats for session methods.
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: wine Branch: master Commit: 7c5fcfffe7b3a001c980f19cb6ed1cee049c26c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c5fcfffe7b3a001c980f19c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 4 14:42:45 2019 +0300 mf: Unify trace formats for session methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 5ac8bd97ae..9c0b80e340 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -550,7 +550,7 @@ static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID ri { struct media_session *session = impl_from_IMFMediaSession(iface); - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if (IsEqualIID(riid, &IID_IMFMediaSession) || IsEqualIID(riid, &IID_IMFMediaEventGenerator) || @@ -577,7 +577,7 @@ static ULONG WINAPI mfsession_AddRef(IMFMediaSession *iface) struct media_session *session = impl_from_IMFMediaSession(iface); ULONG refcount = InterlockedIncrement(&session->refcount); - TRACE("(%p) refcount=%u\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); return refcount; } @@ -587,7 +587,7 @@ static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) struct media_session *session = impl_from_IMFMediaSession(iface); ULONG refcount = InterlockedDecrement(&session->refcount); - TRACE("(%p) refcount=%u\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { @@ -614,7 +614,7 @@ static HRESULT WINAPI mfsession_GetEvent(IMFMediaSession *iface, DWORD flags, IM { struct media_session *session = impl_from_IMFMediaSession(iface); - TRACE("(%p)->(%#x, %p)\n", iface, flags, event); + TRACE("%p, %#x, %p.\n", iface, flags, event); return IMFMediaEventQueue_GetEvent(session->event_queue, flags, event); } @@ -623,7 +623,7 @@ static HRESULT WINAPI mfsession_BeginGetEvent(IMFMediaSession *iface, IMFAsyncCa { struct media_session *session = impl_from_IMFMediaSession(iface); - TRACE("(%p)->(%p, %p)\n", iface, callback, state); + TRACE("%p, %p, %p.\n", iface, callback, state); return IMFMediaEventQueue_BeginGetEvent(session->event_queue, callback, state); } @@ -632,7 +632,7 @@ static HRESULT WINAPI mfsession_EndGetEvent(IMFMediaSession *iface, IMFAsyncResu { struct media_session *session = impl_from_IMFMediaSession(iface); - TRACE("(%p)->(%p, %p)\n", iface, result, event); + TRACE("%p, %p, %p.\n", iface, result, event); return IMFMediaEventQueue_EndGetEvent(session->event_queue, result, event); } @@ -642,7 +642,7 @@ static HRESULT WINAPI mfsession_QueueEvent(IMFMediaSession *iface, MediaEventTyp { struct media_session *session = impl_from_IMFMediaSession(iface); - TRACE("(%p)->(%d, %s, %#x, %p)\n", iface, event_type, debugstr_guid(ext_type), hr, value); + TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); return IMFMediaEventQueue_QueueEventParamVar(session->event_queue, event_type, ext_type, hr, value); } @@ -758,7 +758,7 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) struct session_op *op; HRESULT hr; - TRACE("(%p)\n", iface); + TRACE("%p.\n", iface); if (FAILED(hr = create_session_op(SESSION_CMD_CLOSE, &op))) return hr; @@ -774,7 +774,7 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) struct media_session *session = impl_from_IMFMediaSession(iface); HRESULT hr = S_OK; - FIXME("(%p)\n", iface); + FIXME("%p.\n", iface); EnterCriticalSection(&session->cs); if (session->state == SESSION_STATE_SHUT_DOWN) @@ -803,14 +803,14 @@ static HRESULT WINAPI mfsession_GetClock(IMFMediaSession *iface, IMFClock **cloc static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, DWORD *caps) { - FIXME("(%p)->(%p)\n", iface, caps); + FIXME("%p, %p.\n", iface, caps); return E_NOTIMPL; } static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD flags, TOPOID id, IMFTopology **topology) { - FIXME("(%p)->(%#x, %s, %p)\n", iface, flags, wine_dbgstr_longlong(id), topology); + FIXME("%p, %#x, %s, %p.\n", iface, flags, wine_dbgstr_longlong(id), topology); return E_NOTIMPL; }

1 0

Nikolay Sivov : mf: Add async command for stopping the session.
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: wine Branch: master Commit: 3471b779a5aa33fee991cb7e2c8eb3005592a966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3471b779a5aa33fee991cb7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 4 14:42:44 2019 +0300 mf: Add async command for stopping the session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 6b993b1d60..5ac8bd97ae 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -39,6 +39,7 @@ enum session_command SESSION_CMD_SET_TOPOLOGY, SESSION_CMD_START, SESSION_CMD_PAUSE, + SESSION_CMD_STOP, }; struct session_op @@ -736,9 +737,19 @@ static HRESULT WINAPI mfsession_Pause(IMFMediaSession *iface) static HRESULT WINAPI mfsession_Stop(IMFMediaSession *iface) { - FIXME("(%p)\n", iface); + struct media_session *session = impl_from_IMFMediaSession(iface); + struct session_op *op; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + if (FAILED(hr = create_session_op(SESSION_CMD_STOP, &op))) + return hr; + + hr = session_submit_command(session, op); + IUnknown_Release(&op->IUnknown_iface); + + return hr; } static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface)

1 0

Nikolay Sivov : mf: Add async command for session pause.
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: wine Branch: master Commit: b91a701c529bcc1f4ca885e9ff4104189899c33c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b91a701c529bcc1f4ca885e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 4 14:42:43 2019 +0300 mf: Add async command for session pause. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 169ba7403b..6b993b1d60 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -38,6 +38,7 @@ enum session_command SESSION_CMD_CLOSE, SESSION_CMD_SET_TOPOLOGY, SESSION_CMD_START, + SESSION_CMD_PAUSE, }; struct session_op @@ -718,9 +719,19 @@ static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format static HRESULT WINAPI mfsession_Pause(IMFMediaSession *iface) { - FIXME("(%p)\n", iface); + struct media_session *session = impl_from_IMFMediaSession(iface); + struct session_op *op; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + if (FAILED(hr = create_session_op(SESSION_CMD_PAUSE, &op))) + return hr; + + hr = session_submit_command(session, op); + IUnknown_Release(&op->IUnknown_iface); + + return hr; } static HRESULT WINAPI mfsession_Stop(IMFMediaSession *iface) @@ -1010,6 +1021,8 @@ 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: + break; case SESSION_CMD_CLOSE: EnterCriticalSection(&session->cs); if (session->state != SESSION_STATE_CLOSED)

1 0

Alistair Leslie-Hughes : include: Add space sim direct input defines.
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: wine Branch: master Commit: a9bc8a3bcf8860677c520c1ca37207e7794c5bc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9bc8a3bcf8860677c520c1c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 4 03:48:53 2019 +0000 include: Add space sim direct input defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dinput.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/include/dinput.h b/include/dinput.h index aca7005e31..92c6255cf3 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -2217,6 +2217,38 @@ extern const DIDATAFORMAT c_dfDIJoystick2; #define DIBUTTON_FLYINGH_GLANCE_UP_LINK 0x0607c4e0 #define DIBUTTON_FLYINGH_GLANCE_DOWN_LINK 0x0607c4e8 +#define DIVIRTUAL_SPACESIM 0x07000000 +#define DIBUTTON_SPACESIM_FIRE 0x07000401 +#define DIBUTTON_SPACESIM_WEAPONS 0x07000402 +#define DIBUTTON_SPACESIM_TARGET 0x07000403 +#define DIBUTTON_SPACESIM_MENU 0x070004fd +#define DIBUTTON_SPACESIM_VIEW 0x07004404 +#define DIBUTTON_SPACESIM_DISPLAY 0x07004405 +#define DIBUTTON_SPACESIM_RAISE 0x07004406 +#define DIBUTTON_SPACESIM_LOWER 0x07004407 +#define DIBUTTON_SPACESIM_GEAR 0x07004408 +#define DIBUTTON_SPACESIM_FIRESECONDARY 0x07004409 +#define DIBUTTON_SPACESIM_PAUSE 0x070044fc +#define DIBUTTON_SPACESIM_DEVICE 0x070044fe +#define DIHATSWITCH_SPACESIM_GLANCE 0x07004601 +#define DIBUTTON_SPACESIM_LEFT_LINK 0x0700c4e4 +#define DIBUTTON_SPACESIM_RIGHT_LINK 0x0700c4ec +#define DIAXIS_SPACESIM_LATERAL 0x07008201 +#define DIAXIS_SPACESIM_MOVE 0x07010202 +#define DIBUTTON_SPACESIM_FORWARD_LINK 0x070144e0 +#define DIBUTTON_SPACESIM_BACKWARD_LINK 0x070144e8 +#define DIAXIS_SPACESIM_CLIMB 0x0701c204 +#define DIAXIS_SPACESIM_ROTATE 0x07024205 +#define DIBUTTON_SPACESIM_TURN_LEFT_LINK 0x070244e4 +#define DIBUTTON_SPACESIM_TURN_RIGHT_LINK 0x070244ec +#define DIAXIS_SPACESIM_THROTTLE 0x07038203 +#define DIBUTTON_SPACESIM_FASTER_LINK 0x0703c4e0 +#define DIBUTTON_SPACESIM_SLOWER_LINK 0x0703c4e8 +#define DIBUTTON_SPACESIM_GLANCE_UP_LINK 0x0707c4e0 +#define DIBUTTON_SPACESIM_GLANCE_LEFT_LINK 0x0707c4e4 +#define DIBUTTON_SPACESIM_GLANCE_DOWN_LINK 0x0707c4e8 +#define DIBUTTON_SPACESIM_GLANCE_RIGHT_LINK 0x0707c4ec + /***************************************************************************** * IDirectInputA interface */

1 0

Alexandre Julliard : kernel32: Move system locale enumeration functions to kernelbase.
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: wine Branch: master Commit: a7c190d35f7196b131567b49193803154521c309 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7c190d35f7196b131567b49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 4 21:48:32 2019 +0200 kernel32: Move system locale enumeration functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 16 +- dlls/kernel32/locale.c | 690 +--------------------------------------- dlls/kernelbase/kernelbase.h | 1 + dlls/kernelbase/kernelbase.spec | 24 +- dlls/kernelbase/locale.c | 354 +++++++++++++++++++++ dlls/kernelbase/main.c | 3 + loader/wine.inf.in | 366 ++++++++++++--------- 7 files changed, 617 insertions(+), 837 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7c190d35f7196b13156…

1 0

Alexandre Julliard : kernel32: Move SearchPath functions to kernelbase.
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: wine Branch: master Commit: 8d25965e12717b266f2fc74bb10d915234d16772 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d25965e12717b266f2fc74b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 4 09:44:29 2019 +0200 kernel32: Move SearchPath functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/path.c | 294 ---------------------------------------- dlls/kernelbase/file.c | 244 +++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/loader.c | 2 +- 5 files changed, 249 insertions(+), 299 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d25965e12717b266f2f…

1 0

Rémi Bernon : vkd3d: Implement ID3D12Resource::WriteToSubresource().
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: vkd3d Branch: master Commit: 5553d27085420be2c1c3447857eedbb2d8b16da8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5553d27085420be2c1c3447… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 2 17:34:59 2019 +0200 vkd3d: Implement ID3D12Resource::WriteToSubresource(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++--- tests/d3d12.c | 14 +++---- 2 files changed, 111 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f9738f3..ccd1230 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1289,12 +1289,111 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(ID3D12Resourc UINT dst_sub_resource, const D3D12_BOX *dst_box, const void *src_data, UINT src_row_pitch, UINT src_slice_pitch) { - FIXME("iface %p, dst_sub_resource %u, dst_box %p, src_data %p, " - "src_row_pitch %u, src_slice_pitch %u stub!\n", - iface, dst_sub_resource, dst_box, - src_data, src_row_pitch, src_slice_pitch); + struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); + const struct vkd3d_vk_device_procs *vk_procs; + VkImageSubresource vk_sub_resource; + const struct vkd3d_format *format; + VkSubresourceLayout vk_layout; + struct d3d12_device *device; + BYTE *dst_data, *dst; + BYTE const *src; + unsigned int y, z; + D3D12_BOX box; + size_t size; + HRESULT hr; + + TRACE("iface %p, src_data %p, src_row_pitch %u, src_slice_pitch %u, " + "dst_sub_resource %u, dst_box %s.\n", + iface, src_data, src_row_pitch, src_slice_pitch, dst_sub_resource, debug_d3d12_box(dst_box)); - return E_NOTIMPL; + if (d3d12_resource_is_buffer(resource)) + { + WARN("Buffers are not supported.\n"); + return E_INVALIDARG; + } + + device = resource->device; + vk_procs = &device->vk_procs; + + if (!(format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, 0))) + { + ERR("Invalid DXGI format %#x.\n", resource->desc.Format); + return E_INVALIDARG; + } + if (format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) + { + FIXME("Not supported for format %#x.\n", format->dxgi_format); + return E_NOTIMPL; + } + + vk_sub_resource.arrayLayer = dst_sub_resource / resource->desc.MipLevels; + vk_sub_resource.mipLevel = dst_sub_resource % resource->desc.MipLevels; + vk_sub_resource.aspectMask = format->vk_aspect_mask; + + if (dst_box) + { + if (!d3d12_resource_validate_box(resource, dst_sub_resource, dst_box)) + { + WARN("Invalid box %s.\n", debug_d3d12_box(dst_box)); + return E_INVALIDARG; + } + + box = *dst_box; + } + else + { + box.left = 0; + box.top = 0; + box.front = 0; + box.right = d3d12_resource_desc_get_width(&resource->desc, vk_sub_resource.mipLevel); + box.bottom = d3d12_resource_desc_get_height(&resource->desc, vk_sub_resource.mipLevel); + box.back = d3d12_resource_desc_get_depth(&resource->desc, vk_sub_resource.mipLevel); + } + if (box.right <= box.left || box.bottom <= box.top || box.back <= box.front) + { + WARN("Empty box %s.\n", debug_d3d12_box(dst_box)); + return S_OK; + } + + if (!d3d12_resource_is_cpu_accessible(resource)) + { + FIXME_ONCE("Not implemented for this resource type.\n"); + return E_NOTIMPL; + } + if (!(resource->flags & VKD3D_RESOURCE_LINEAR_TILING)) + { + FIXME_ONCE("Not implemented for image tiling other than VK_IMAGE_TILING_LINEAR.\n"); + return E_NOTIMPL; + } + + VK_CALL(vkGetImageSubresourceLayout(device->vk_device, resource->u.vk_image, &vk_sub_resource, &vk_layout)); + TRACE("Offset %#"PRIx64", size %#"PRIx64", row pitch %#"PRIx64", depth pitch %#"PRIx64".\n", + vk_layout.offset, vk_layout.size, vk_layout.rowPitch, vk_layout.depthPitch); + + if (FAILED(hr = d3d12_heap_map(resource->heap, resource->heap_offset, resource, (void **)&dst_data))) + { + WARN("Failed to map resource %p, hr %#x.\n", resource, hr); + return hr; + } + + dst_data += vk_layout.offset; + dst_data += box.left / format->block_width * format->byte_count * format->block_byte_count; + size = (box.right - box.left) / format->block_width * format->byte_count * format->block_byte_count; + for (z = box.front; z < box.back; ++z) + { + src = (uint8_t *)src_data + (z - box.front) * src_slice_pitch; + dst = dst_data + z * vk_layout.depthPitch + box.top / format->block_height * vk_layout.rowPitch; + for (y = box.top; y < box.bottom; y += format->block_height) + { + memcpy(dst, src, size); + src += src_row_pitch; + dst += vk_layout.rowPitch; + } + } + + d3d12_heap_unmap(resource->heap, resource); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_resource_ReadFromSubresource(ID3D12Resource *iface, diff --git a/tests/d3d12.c b/tests/d3d12.c index ffefbac..9fe47c6 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30507,7 +30507,7 @@ static void test_read_write_subresource(void) set_box(&box, 0, 0, 0, 1, 1, 1); hr = ID3D12Resource_WriteToSubresource(rb_buffer, 0, &box, dst_buffer, row_pitch, slice_pitch); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(rb_buffer, dst_buffer, row_pitch, slice_pitch, 0, &box); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); @@ -30554,7 +30554,7 @@ static void test_read_write_subresource(void) /* NULL box */ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, dst_buffer, row_pitch, slice_pitch); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, NULL); todo_if(is_nvidia_device(device)) @@ -30567,7 +30567,7 @@ static void test_read_write_subresource(void) set_box(&box, 0, 0, 0, 0, 0, 0); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, &box); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -30596,18 +30596,18 @@ static void test_read_write_subresource(void) if (i) { hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, zero_buffer, row_pitch, slice_pitch); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 1 */ set_box(&box, 0, 0, 0, 2, 2, 2); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 2 */ set_box(&box, 2, 2, 2, 11, 13, 17); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, slice_pitch); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } else { @@ -30711,7 +30711,7 @@ static void test_read_write_subresource(void) if (got != expected) break; } - todo ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); + ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); release_resource_readback(&rb); ID3D12Resource_Release(src_texture);

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2019