October 2019 - Wine-commits

Zebediah Figura : widl: Write pointer classes for explicitly declared arrays only if they are top-level parameters.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: dd35baa8e326462c1c3ea31b2023e62b2d8f6ee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd35baa8e326462c1c3ea31b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 4 23:43:35 2019 -0500 widl: Write pointer classes for explicitly declared arrays only if they are top-level parameters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1ad3e63c6a..c4ccd99771 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3611,7 +3611,8 @@ static unsigned int write_type_tfs(FILE *file, const attr_list_t *attrs, { int ptr_type; ptr_type = get_pointer_fc_context(type, attrs, context); - if (ptr_type != FC_RP || type_array_is_decl_as_ptr(type)) + if (type_array_is_decl_as_ptr(type) + || (ptr_type != FC_RP && context == TYPE_CONTEXT_TOPLEVELPARAM)) { unsigned int absoff = type->typestring_offset; short reloff = absoff - (*typeformat_offset + 2);

1 0

Zebediah Figura : widl: Also compute buffer size for non-ref arrays.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 8746bf094f87c2cd389e94bd76866f3884fb6b20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8746bf094f87c2cd389e94bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 4 23:43:36 2019 -0500 widl: Also compute buffer size for non-ref arrays. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47886 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c4ccd99771..f37c7b0d67 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3865,16 +3865,13 @@ static unsigned int get_required_buffer_size_type( } case TGT_ARRAY: - if (get_pointer_fc(type, attrs, toplevel_param) == FC_RP) + switch (get_array_fc(type)) { - switch (get_array_fc(type)) - { - case FC_SMFARRAY: - case FC_LGFARRAY: - return type_array_get_dim(type) * - get_required_buffer_size_type(type_array_get_element_type(type), name, - NULL, FALSE, alignment); - } + case FC_SMFARRAY: + case FC_LGFARRAY: + return type_array_get_dim(type) * + get_required_buffer_size_type(type_array_get_element_type(type), name, + NULL, FALSE, alignment); } break;

1 0

Sven Baars : scrrun/tests: Fix some test failures on Windows 2003.
by Alexandre Julliard 07 Oct '19

07 Oct '19

Module: wine Branch: master Commit: 673e130c4ff3a904faae4a23829dddaa6ae49864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=673e130c4ff3a904faae4a23… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Oct 5 19:25:00 2019 +0200 scrrun/tests: Fix some test failures on Windows 2003. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index ed49856921..46d452f113 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1897,7 +1897,7 @@ todo_wine lstrcatW(buffW, crlfW); str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -1920,7 +1920,7 @@ todo_wine lstrcatW(buffW, L"123"); str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -1942,7 +1942,7 @@ todo_wine str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!wcscmp(str, L"123"), "got %s\n", wine_dbgstr_w(str)); ITextStream_Release(stream); @@ -1960,7 +1960,7 @@ todo_wine str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!wcscmp(str, L"test"), "got %s\n", wine_dbgstr_w(str)); ITextStream_Release(stream); @@ -1981,7 +1981,7 @@ todo_wine str = NULL; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!lstrcmpW(L"test123", str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -2003,7 +2003,7 @@ todo_wine str = (void*)0xdeadbeef; hr = ITextStream_Read(stream, 500, &str); - ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); ok(!wcscmp(str, L"test string"), "got %s\n", wine_dbgstr_w(str)); ITextStream_Release(stream);

1 0

Jeremy Newman : fix outdated ereg() calls
by Jeremy Newman 07 Oct '19

07 Oct '19

Module: appdb Branch: master Commit: ba9f80fe7c014fcbefb7fdbd9d6a77bbd0289b77 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=ba9f80fe7c014fcbefb7fdb… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Oct 7 09:22:38 2019 -0500 fix outdated ereg() calls --- include/tableve.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/include/tableve.php b/include/tableve.php index f9828c6..4ca7c36 100644 --- a/include/tableve.php +++ b/include/tableve.php @@ -100,7 +100,7 @@ class TableVE { { $field = query_fetch_field($hResult, $i); - if(ereg("^impl_(.+)$", $field->table, $arr)) + if(preg_match("/^impl_(.+)$/", $field->table, $arr)) { if($cur_impl != $arr[1]) echo "<tr><th class='box-label' colspan=2> ".ucfirst($arr[1])." Implementation </th></tr>\n"; @@ -154,7 +154,7 @@ class TableVE { $field = query_fetch_field($hResult, $i); $len = query_field_len($hResult, $i); - if(ereg("^impl_(.+)$", $field->table, $arr)) + if(preg_match("/^impl_(.+)$/", $field->table, $arr)) { if($cur_impl != $arr[1]) echo "<tr><th class='box-label' colspan=2> ".ucfirst($arr[1])." Implementation </th></tr>\n"; @@ -339,11 +339,8 @@ class TableVE { reset($this->table_ids); foreach ($this->table_ids as $table => $id) { - $r = "^$table$"; - //echo "Checking $r against $name <br>\n"; - if(ereg($r, $name)) + if(preg_match("/^$table$/", $name)) { - //echo "ID for $name -> $id <br>\n"; return $id; } } @@ -363,7 +360,7 @@ class TableVE { foreach ($vars as $varname => $arr) { - if(!ereg("^FIELD_([a-zA-Z_]+)___(.+)$", $varname, $regs)) + if(!preg_match("/^FIELD_([a-zA-Z_]+)___(.+)$/", $varname, $regs)) continue; $tables[$regs[1]][] = $regs[2]; @@ -424,7 +421,7 @@ class TableVE { addmsg("Database Operation Complete!","green"); } - if(ereg("^impl_.+$", $table)) + if(preg_match("/^impl_.+$/", $table)) { $value = $fieldnames["apiid"][$i]; query_parameters("UPDATE ? SET lastmodby = '?' WHERE apiid = '?'",

1 0

Jeremy Newman : fix outdatded ereg()
by Jeremy Newman 07 Oct '19

07 Oct '19

Module: appdb Branch: master Commit: fa06b308139f1acc99b6bd293593b5647dc9785d URL: https://source.winehq.org/git/appdb.git/?a=commit;h=fa06b308139f1acc99b6bd2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Oct 7 09:18:20 2019 -0500 fix outdatded ereg() --- preferences.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preferences.php b/preferences.php index 5481a09..b1f3236 100644 --- a/preferences.php +++ b/preferences.php @@ -46,7 +46,7 @@ if(isset($aClean['sSubmit']) && $aClean['sSubmit'] == "Update") { /* if a parameter lacks 'pref_' at its head it isn't a */ /* preference so skip over processing it */ - if(!ereg("^pref_(.+)$", $sKey, $arr)) + if(!preg_match("/^pref_(.+)$/", $sKey, $arr)) continue; $oUser->setPref($arr[1], $sValue); }

1 0

Alistair Leslie-Hughes : dmime/tests: Break out of loop if we fail to get segment pointer.
by Alexandre Julliard 04 Oct '19

04 Oct '19

Module: wine Branch: master Commit: 7d954f23356f0aaf49b1ef0c4bed83041cb41c08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d954f23356f0aaf49b1ef0c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 4 21:30:48 2019 +0200 dmime/tests: Break out of loop if we fail to get segment pointer. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 4433846f9b..073625f04b 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -454,6 +454,10 @@ static void test_notification_type(void) hr = IDirectMusicSegmentState8_GetSegment(segmentstate, &segment); ok(hr == S_OK, "Failed: %08x\n", hr); + if (FAILED(hr)) { + IDirectMusicSegmentState8_Release(segmentstate); + break; + } hr = IDirectMusicSegment_QueryInterface(segment, &IID_IDirectMusicSegment8, (void**)&segment8); ok(hr == S_OK, "Failed: %08x\n", hr);

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: 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: 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: 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