September 2022 - Wine-commits

Ziqing Hui : d3d10/tests: Test NULL device for D3D10CreateEffectFromMemory and D3D10CreateEffectPoolFromMemory.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: 6c4f9ec52791e764fd60fff2c4920d85bd2ebdcb URL: https://gitlab.winehq.org/wine/wine/-/commit/6c4f9ec52791e764fd60fff2c4920d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Sep 1 12:28:35 2022 +0800 d3d10/tests: Test NULL device for D3D10CreateEffectFromMemory and D3D10CreateEffectPoolFromMemory. --- dlls/d3d10/tests/effect.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 3bd6d6d0ecc..bd856bb91d8 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -118,6 +118,12 @@ static void test_effect_constant_buffer_type(void) return; } + if (strcmp(winetest_platform, "wine")) /* Crash on wine. */ + { + hr = create_effect(fx_test_ecbt, 0, NULL, NULL, &effect); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); + } + hr = create_effect(fx_test_ecbt, 0, device, NULL, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -7117,6 +7123,12 @@ static void test_effect_pool(void) todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + if (strcmp(winetest_platform, "wine")) /* Crash on wine. */ + { + hr = create_effect_pool(fx_test_pool, NULL, &pool); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); + } + hr = create_effect_pool(fx_test_pool, device, &pool); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Ziqing Hui : d3d10: Handle invalid arguments for effect creation.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: bd5cdef5dd2888e9b914436b792022a69e28ab4c URL: https://gitlab.winehq.org/wine/wine/-/commit/bd5cdef5dd2888e9b914436b792022… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Sep 1 12:39:06 2022 +0800 d3d10: Handle invalid arguments for effect creation. Passing NULL data to D3D10CreateEffectFromMemory crashes. Passing NULL data to D3D10CreateEffectPoolFromMemory returns E_INVALIDARG. --- dlls/d3d10/effect.c | 6 ++++++ dlls/d3d10/tests/effect.c | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 84ecfdcbbab..a9c8eaed5e8 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -9537,6 +9537,9 @@ static HRESULT d3d10_create_effect(void *data, SIZE_T data_size, ID3D10Device *d struct d3d10_effect *object; HRESULT hr; + if (!device) + return D3DERR_INVALIDCALL; + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -9636,6 +9639,9 @@ HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UIN TRACE("data %p, data_size %Iu, fx_flags %#x, device %p, effect_pool %p.\n", data, data_size, fx_flags, device, effect_pool); + if (!data) + return E_INVALIDARG; + if (FAILED(hr = d3d10_create_effect(data, data_size, device, NULL, D3D10_EFFECT_IS_POOL, &object))) { diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index bd856bb91d8..25ac2d673ce 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -118,11 +118,8 @@ static void test_effect_constant_buffer_type(void) return; } - if (strcmp(winetest_platform, "wine")) /* Crash on wine. */ - { hr = create_effect(fx_test_ecbt, 0, NULL, NULL, &effect); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); - } hr = create_effect(fx_test_ecbt, 0, device, NULL, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -7120,14 +7117,10 @@ static void test_effect_pool(void) ok(!!device2, "Failed to create d3d device.\n"); hr = D3D10CreateEffectPoolFromMemory(NULL, 0, 0, device, &pool); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - if (strcmp(winetest_platform, "wine")) /* Crash on wine. */ - { hr = create_effect_pool(fx_test_pool, NULL, &pool); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#lx.\n", hr); - } hr = create_effect_pool(fx_test_pool, device, &pool); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : prntvpt: Use CRT allocation functions.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: e0ca118f03ce2a999ec34d748a0e13dedafad174 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0ca118f03ce2a999ec34d748a0e13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 2 09:02:00 2022 +0300 prntvpt: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/prntvpt/main.c | 23 ++++++----------------- dlls/prntvpt/ticket.c | 19 +++++++++---------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index e046c6cbaed..90b907f24de 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -26,26 +26,15 @@ #include "winspool.h" #include "objbase.h" #include "prntvpt.h" -#include "wine/heap.h" #include "wine/debug.h" #include "prntvpt_private.h" WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); -static WCHAR *heap_strdupW(const WCHAR *src) -{ - WCHAR *dst; - size_t len; - if (!src) return NULL; - len = (wcslen(src) + 1) * sizeof(WCHAR); - if ((dst = heap_alloc(len))) memcpy(dst, src, len); - return dst; -} - HRESULT WINAPI PTReleaseMemory(PVOID mem) { - heap_free(mem); + free(mem); return S_OK; } @@ -65,9 +54,9 @@ HRESULT WINAPI PTCloseProvider(HPTPROVIDER provider) return E_HANDLE; prov->owner = 0; - heap_free(prov->name); + free(prov->name); ClosePrinter(prov->hprn); - heap_free(prov); + free(prov); return S_OK; } @@ -92,16 +81,16 @@ HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD p if (!max_version || !provider || !used_version) return E_INVALIDARG; - prov = heap_alloc(sizeof(*prov)); + prov = malloc(sizeof(*prov)); if (!prov) return E_OUTOFMEMORY; if (!OpenPrinterW((LPWSTR)printer, &prov->hprn, NULL)) { - heap_free(prov); + free(prov); return HRESULT_FROM_WIN32(GetLastError()); } - prov->name = heap_strdupW(printer); + prov->name = wcsdup(printer); prov->owner = GetCurrentThreadId(); *provider = (HPTPROVIDER)prov; *used_version = 1; diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index e43cda8be6b..a8c5134e1ec 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -30,7 +30,6 @@ #include "prntvpt.h" #include "initguid.h" #include "msxml2.h" -#include "wine/heap.h" #include "wine/debug.h" #include "prntvpt_private.h" @@ -709,7 +708,7 @@ static HRESULT initialize_ticket(struct prn_provider *prov, struct ticket *ticke if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return HRESULT_FROM_WIN32(GetLastError()); - pi2 = heap_alloc(size); + pi2 = malloc(size); if (!pi2) return E_OUTOFMEMORY; if (!GetPrinterW(prov->hprn, 2, (LPBYTE)pi2, size, NULL)) @@ -717,7 +716,7 @@ static HRESULT initialize_ticket(struct prn_provider *prov, struct ticket *ticke else devmode_to_ticket(pi2->pDevMode, ticket); - heap_free(pi2); + free(pi2); return hr; } @@ -739,7 +738,7 @@ HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER provider, IStream *stre hr = parse_ticket(stream, scope, &ticket); if (hr != S_OK) return hr; - *dm = heap_alloc(sizeof(**dm)); + *dm = malloc(sizeof(**dm)); if (!*dm) return E_OUTOFMEMORY; ticket_to_devmode(&ticket, *dm); @@ -1279,7 +1278,7 @@ static HRESULT write_PageMediaSize_caps(const WCHAR *device, IXMLDOMElement *roo if (count <= 0) return HRESULT_FROM_WIN32(GetLastError()); - pt = heap_alloc(count * sizeof(*pt)); + pt = calloc(count, sizeof(*pt)); if (!pt) return E_OUTOFMEMORY; count = DeviceCapabilitiesW(device, NULL, DC_PAPERSIZE, (LPWSTR)pt, NULL); @@ -1298,7 +1297,7 @@ static HRESULT write_PageMediaSize_caps(const WCHAR *device, IXMLDOMElement *roo fail: if (feature) IXMLDOMElement_Release(feature); - heap_free(pt); + free(pt); return hr; } @@ -1353,7 +1352,7 @@ static HRESULT write_PageResolution_caps(const WCHAR *device, IXMLDOMElement *ro if (count <= 0) return HRESULT_FROM_WIN32(GetLastError()); - res = heap_alloc(count * sizeof(*res)); + res = calloc(count, sizeof(*res)); if (!res) return E_OUTOFMEMORY; count = DeviceCapabilitiesW(device, NULL, DC_ENUMRESOLUTIONS, (LPWSTR)res, NULL); @@ -1372,7 +1371,7 @@ static HRESULT write_PageResolution_caps(const WCHAR *device, IXMLDOMElement *ro fail: if (feature) IXMLDOMElement_Release(feature); - heap_free(res); + free(res); return hr; } @@ -1427,7 +1426,7 @@ static HRESULT write_JobInputBin_caps(const WCHAR *device, IXMLDOMElement *root) if (count <= 0) return HRESULT_FROM_WIN32(GetLastError()); - bin = heap_alloc(count * sizeof(*bin)); + bin = calloc(count, sizeof(*bin)); if (!bin) return E_OUTOFMEMORY; count = DeviceCapabilitiesW(device, NULL, DC_BINS, (LPWSTR)bin, NULL); @@ -1446,7 +1445,7 @@ static HRESULT write_JobInputBin_caps(const WCHAR *device, IXMLDOMElement *root) fail: if (feature) IXMLDOMElement_Release(feature); - heap_free(bin); + free(bin); return hr; }

1 0

Nikolay Sivov : wmiutils: Use CRT allocation functions.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: 0e06db39640028ff651559609cae60d759c513b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e06db39640028ff651559609cae60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 2 09:19:20 2022 +0300 wmiutils: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wmiutils/path.c | 142 +++++++++++++++++++-------------------- dlls/wmiutils/statuscode.c | 4 +- dlls/wmiutils/wmiutils_private.h | 10 --- 3 files changed, 73 insertions(+), 83 deletions(-)

1 0

Rémi Bernon : mf: Use a dedicated interface for sample allocator ready callbacks.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: 76f7236b570972b62fe05ebd38ee249d486d9d02 URL: https://gitlab.winehq.org/wine/wine/-/commit/76f7236b570972b62fe05ebd38ee24… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 24 20:04:15 2022 +0200 mf: Use a dedicated interface for sample allocator ready callbacks. --- dlls/mf/session.c | 102 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 73 insertions(+), 29 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 87fe77a730f..2553369fb54 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -50,7 +50,6 @@ enum session_command /* Internally used commands. */ SESSION_CMD_END, SESSION_CMD_QM_NOTIFY_TOPOLOGY, - SESSION_CMD_SA_READY, }; struct session_op @@ -79,10 +78,6 @@ struct session_op { IMFTopology *topology; } notify_topology; - struct - { - TOPOID node_id; - } sa_ready; }; struct list entry; }; @@ -231,6 +226,7 @@ struct media_session IMFRateControl IMFRateControl_iface; IMFTopologyNodeAttributeEditor IMFTopologyNodeAttributeEditor_iface; IMFAsyncCallback commands_callback; + IMFAsyncCallback sa_ready_callback; IMFAsyncCallback events_callback; IMFAsyncCallback sink_finalizer_callback; LONG refcount; @@ -274,6 +270,11 @@ static struct media_session *impl_from_commands_callback_IMFAsyncCallback(IMFAsy return CONTAINING_RECORD(iface, struct media_session, commands_callback); } +static struct media_session *impl_from_sa_ready_callback_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct media_session, sa_ready_callback); +} + static struct media_session *impl_from_events_callback_IMFAsyncCallback(IMFAsyncCallback *iface) { return CONTAINING_RECORD(iface, struct media_session, events_callback); @@ -1537,15 +1538,7 @@ static HRESULT session_request_sample_from_node(struct media_session *session, I static HRESULT WINAPI node_sample_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) { struct topo_node *topo_node = impl_node_from_IMFVideoSampleAllocatorNotify(iface); - struct session_op *op; - - if (SUCCEEDED(create_session_op(SESSION_CMD_SA_READY, &op))) - { - op->sa_ready.node_id = topo_node->node_id; - MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &topo_node->session->commands_callback, &op->IUnknown_iface); - IUnknown_Release(&op->IUnknown_iface); - } - + MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &topo_node->session->sa_ready_callback, (IUnknown *)iface); return S_OK; } @@ -2378,9 +2371,6 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, { struct session_op *op = impl_op_from_IUnknown(IMFAsyncResult_GetStateNoAddRef(result)); struct media_session *session = impl_from_commands_callback_IMFAsyncCallback(iface); - struct topo_node *topo_node; - IMFTopologyNode *upstream_node; - DWORD upstream_output; EnterCriticalSection(&session->cs); @@ -2409,18 +2399,6 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, IMFQualityManager_NotifyTopology(session->quality_manager, op->notify_topology.topology); session_command_complete(session); break; - case SESSION_CMD_SA_READY: - topo_node = session_get_node_by_id(session, op->sa_ready.node_id); - - if (topo_node->u.sink.requests) - { - if (SUCCEEDED(IMFTopologyNode_GetInput(topo_node->node, 0, &upstream_node, &upstream_output))) - { - session_deliver_pending_samples(session, upstream_node); - IMFTopologyNode_Release(upstream_node); - } - } - break; case SESSION_CMD_SET_RATE: session_set_rate(session, op->set_rate.thin, op->set_rate.rate); break; @@ -2442,6 +2420,71 @@ static const IMFAsyncCallbackVtbl session_commands_callback_vtbl = session_commands_callback_Invoke, }; +static HRESULT WINAPI session_sa_ready_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) + || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI session_sa_ready_callback_AddRef(IMFAsyncCallback *iface) +{ + struct media_session *session = impl_from_sa_ready_callback_IMFAsyncCallback(iface); + return IMFMediaSession_AddRef(&session->IMFMediaSession_iface); +} + +static ULONG WINAPI session_sa_ready_callback_Release(IMFAsyncCallback *iface) +{ + struct media_session *session = impl_from_sa_ready_callback_IMFAsyncCallback(iface); + return IMFMediaSession_Release(&session->IMFMediaSession_iface); +} + +static HRESULT WINAPI session_sa_ready_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI session_sa_ready_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + IMFVideoSampleAllocatorNotify *notify = (IMFVideoSampleAllocatorNotify *)IMFAsyncResult_GetStateNoAddRef(result); + struct topo_node *topo_node = impl_node_from_IMFVideoSampleAllocatorNotify(notify); + struct media_session *session = impl_from_sa_ready_callback_IMFAsyncCallback(iface); + IMFTopologyNode *upstream_node; + DWORD upstream_output; + + EnterCriticalSection(&session->cs); + + if (topo_node->u.sink.requests) + { + if (SUCCEEDED(IMFTopologyNode_GetInput(topo_node->node, 0, &upstream_node, &upstream_output))) + { + session_deliver_pending_samples(session, upstream_node); + IMFTopologyNode_Release(upstream_node); + } + } + + LeaveCriticalSection(&session->cs); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl session_sa_ready_callback_vtbl = +{ + session_sa_ready_callback_QueryInterface, + session_sa_ready_callback_AddRef, + session_sa_ready_callback_Release, + session_sa_ready_callback_GetParameters, + session_sa_ready_callback_Invoke, +}; + static HRESULT WINAPI session_events_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFAsyncCallback) || @@ -3926,6 +3969,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses object->IMFRateControl_iface.lpVtbl = &session_rate_control_vtbl; object->IMFTopologyNodeAttributeEditor_iface.lpVtbl = &node_attribute_editor_vtbl; object->commands_callback.lpVtbl = &session_commands_callback_vtbl; + object->sa_ready_callback.lpVtbl = &session_sa_ready_callback_vtbl; object->events_callback.lpVtbl = &session_events_callback_vtbl; object->sink_finalizer_callback.lpVtbl = &session_sink_finalizer_callback_vtbl; object->refcount = 1;

1 0

Rémi Bernon : mf: Delay media session command processing when presentation is ending.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: 156aa87c57a975d44c6feabaf34a18508d76a0e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/156aa87c57a975d44c6feabaf34a18… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 1 23:45:11 2022 +0200 mf: Delay media session command processing when presentation is ending. --- dlls/mf/session.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 2553369fb54..eedeaa540b3 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -216,6 +216,7 @@ enum presentation_flags SESSION_FLAG_NEEDS_PREROLL = 0x8, SESSION_FLAG_END_OF_PRESENTATION = 0x10, SESSION_FLAG_PENDING_RATE_CHANGE = 0x20, + SESSION_FLAG_PENDING_COMMAND = 0x40, }; struct media_session @@ -802,6 +803,8 @@ static void session_command_complete(struct media_session *session) struct session_op *op; struct list *e; + session->presentation.flags &= ~SESSION_FLAG_PENDING_COMMAND; + /* Pop current command, submit next. */ if ((e = list_head(&session->commands))) { @@ -2374,6 +2377,13 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, EnterCriticalSection(&session->cs); + if (session->presentation.flags & SESSION_FLAG_PENDING_COMMAND) + { + WARN("session %p command is in progress, waiting for it to complete.\n", session); + LeaveCriticalSection(&session->cs); + return S_OK; + } + switch (op->command) { case SESSION_CMD_CLEAR_TOPOLOGIES: @@ -3335,7 +3345,7 @@ static void session_raise_end_of_presentation(struct media_session *session) { if (session_nodes_is_mask_set(session, MF_TOPOLOGY_MAX, SOURCE_FLAG_END_OF_PRESENTATION)) { - session->presentation.flags |= SESSION_FLAG_END_OF_PRESENTATION; + session->presentation.flags |= SESSION_FLAG_END_OF_PRESENTATION | SESSION_FLAG_PENDING_COMMAND; session_push_back_command(session, SESSION_CMD_END); IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MEEndOfPresentation, &GUID_NULL, S_OK, NULL); }

1 0

Rémi Bernon : mf: Use the SESSION_FLAG_PENDING_COMMAND to delay further commands.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: 5af9f06e5c8f9f2c06b8285eca52c7ce89c42165 URL: https://gitlab.winehq.org/wine/wine/-/commit/5af9f06e5c8f9f2c06b8285eca52c7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 2 10:16:34 2022 +0200 mf: Use the SESSION_FLAG_PENDING_COMMAND to delay further commands. Instead of keeping the command ahead of the command list, making the SESSION_CMD_END internal command unnecessary. --- dlls/mf/session.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index eedeaa540b3..4d052efc85e 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -48,7 +48,6 @@ enum session_command SESSION_CMD_STOP, SESSION_CMD_SET_RATE, /* Internally used commands. */ - SESSION_CMD_END, SESSION_CMD_QM_NOTIFY_TOPOLOGY, }; @@ -456,22 +455,16 @@ static HRESULT session_is_shut_down(struct media_session *session) return session->state == SESSION_STATE_SHUT_DOWN ? MF_E_SHUTDOWN : S_OK; } -static void session_push_back_command(struct media_session *session, enum session_command command) -{ - struct session_op *op; - - if (SUCCEEDED(create_session_op(command, &op))) - list_add_head(&session->commands, &op->entry); -} - static HRESULT session_submit_command(struct media_session *session, struct session_op *op) { HRESULT hr; + TRACE("session %p, op %p, command %u.\n", session, op, op->command); + EnterCriticalSection(&session->cs); if (SUCCEEDED(hr = session_is_shut_down(session))) { - if (list_empty(&session->commands)) + if (list_empty(&session->commands) && !(session->presentation.flags & SESSION_FLAG_PENDING_COMMAND)) hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &session->commands_callback, &op->IUnknown_iface); list_add_tail(&session->commands, &op->entry); IUnknown_AddRef(&op->IUnknown_iface); @@ -805,14 +798,7 @@ static void session_command_complete(struct media_session *session) session->presentation.flags &= ~SESSION_FLAG_PENDING_COMMAND; - /* Pop current command, submit next. */ - if ((e = list_head(&session->commands))) - { - op = LIST_ENTRY(e, struct session_op, entry); - list_remove(&op->entry); - IUnknown_Release(&op->IUnknown_iface); - } - + /* Submit next command. */ if ((e = list_head(&session->commands))) { op = LIST_ENTRY(e, struct session_op, entry); @@ -2375,6 +2361,8 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, struct session_op *op = impl_op_from_IUnknown(IMFAsyncResult_GetStateNoAddRef(result)); struct media_session *session = impl_from_commands_callback_IMFAsyncCallback(iface); + TRACE("session %p, op %p, command %u.\n", session, op, op->command); + EnterCriticalSection(&session->cs); if (session->presentation.flags & SESSION_FLAG_PENDING_COMMAND) @@ -2384,6 +2372,9 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, return S_OK; } + list_remove(&op->entry); + session->presentation.flags |= SESSION_FLAG_PENDING_COMMAND; + switch (op->command) { case SESSION_CMD_CLEAR_TOPOLOGIES: @@ -2418,6 +2409,8 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, LeaveCriticalSection(&session->cs); + IUnknown_Release(&op->IUnknown_iface); + return S_OK; } @@ -3346,7 +3339,6 @@ static void session_raise_end_of_presentation(struct media_session *session) if (session_nodes_is_mask_set(session, MF_TOPOLOGY_MAX, SOURCE_FLAG_END_OF_PRESENTATION)) { session->presentation.flags |= SESSION_FLAG_END_OF_PRESENTATION | SESSION_FLAG_PENDING_COMMAND; - session_push_back_command(session, SESSION_CMD_END); IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MEEndOfPresentation, &GUID_NULL, S_OK, NULL); } }

1 0

Rémi Bernon : mf: Notify quality manager of topology change in session_set_topology.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: e741f49aa3e34c462bf28d4c9d511ac31b74dc9a URL: https://gitlab.winehq.org/wine/wine/-/commit/e741f49aa3e34c462bf28d4c9d511a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 2 00:37:08 2022 +0200 mf: Notify quality manager of topology change in session_set_topology. --- dlls/mf/session.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 4d052efc85e..8be3ffcd7f3 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -47,8 +47,6 @@ enum session_command SESSION_CMD_PAUSE, SESSION_CMD_STOP, SESSION_CMD_SET_RATE, - /* Internally used commands. */ - SESSION_CMD_QM_NOTIFY_TOPOLOGY, }; struct session_op @@ -414,10 +412,6 @@ static ULONG WINAPI session_op_Release(IUnknown *iface) case SESSION_CMD_START: PropVariantClear(&op->start.start_position); break; - case SESSION_CMD_QM_NOTIFY_TOPOLOGY: - if (op->notify_topology.topology) - IMFTopology_Release(op->notify_topology.topology); - break; default: ; } @@ -1680,21 +1674,9 @@ static HRESULT session_set_current_topology(struct media_session *session, IMFTo DWORD caps, object_flags; struct media_sink *sink; struct topo_node *node; - struct session_op *op; IMFMediaEvent *event; HRESULT hr; - if (session->quality_manager) - { - if (SUCCEEDED(create_session_op(SESSION_CMD_QM_NOTIFY_TOPOLOGY, &op))) - { - op->notify_topology.topology = topology; - IMFTopology_AddRef(op->notify_topology.topology); - session_submit_command(session, op); - IUnknown_Release(&op->IUnknown_iface); - } - } - if (FAILED(hr = IMFTopology_CloneFrom(session->presentation.current_topology, topology))) { WARN("Failed to clone topology, hr %#lx.\n", hr); @@ -1826,6 +1808,8 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF { hr = session_set_current_topology(session, topology); session_set_topo_status(session, hr, MF_TOPOSTATUS_READY); + if (session->quality_manager) + IMFQualityManager_NotifyTopology(session->quality_manager, topology); } } @@ -2396,10 +2380,6 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, case SESSION_CMD_CLOSE: session_close(session); break; - case SESSION_CMD_QM_NOTIFY_TOPOLOGY: - IMFQualityManager_NotifyTopology(session->quality_manager, op->notify_topology.topology); - session_command_complete(session); - break; case SESSION_CMD_SET_RATE: session_set_rate(session, op->set_rate.thin, op->set_rate.rate); break;

1 0

Rémi Bernon : win32u: Sort adapter display modes after reading from the registry.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: 25272711b41e9b9cf489ca7cc537bb73cefd5060 URL: https://gitlab.winehq.org/wine/wine/-/commit/25272711b41e9b9cf489ca7cc537bb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 17 10:29:52 2022 +0200 win32u: Sort adapter display modes after reading from the registry. --- dlls/win32u/sysparams.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/display.c | 3 --- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 848b14dbcb3..865f5bbfc69 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -546,6 +546,53 @@ static BOOL write_registry_settings( const WCHAR *adapter_path, const DEVMODEW * return ret; } +static int mode_compare(const void *p1, const void *p2) +{ + DWORD a_width, a_height, b_width, b_height; + const DEVMODEW *a = p1, *b = p2; + int ret; + + /* Depth in descending order */ + if ((ret = b->dmBitsPerPel - a->dmBitsPerPel)) return ret; + + /* Use the width and height in landscape mode for comparison */ + if (a->dmDisplayOrientation == DMDO_DEFAULT || a->dmDisplayOrientation == DMDO_180) + { + a_width = a->dmPelsWidth; + a_height = a->dmPelsHeight; + } + else + { + a_width = a->dmPelsHeight; + a_height = a->dmPelsWidth; + } + + if (b->dmDisplayOrientation == DMDO_DEFAULT || b->dmDisplayOrientation == DMDO_180) + { + b_width = b->dmPelsWidth; + b_height = b->dmPelsHeight; + } + else + { + b_width = b->dmPelsHeight; + b_height = b->dmPelsWidth; + } + + /* Width in ascending order */ + if ((ret = a_width - b_width)) return ret; + + /* Height in ascending order */ + if ((ret = a_height - b_height)) return ret; + + /* Frequency in descending order */ + if ((ret = b->dmDisplayFrequency - a->dmDisplayFrequency)) return ret; + + /* Orientation in ascending order */ + if ((ret = a->dmDisplayOrientation - b->dmDisplayOrientation)) return ret; + + return 0; +} + static BOOL read_display_adapter_settings( unsigned int index, struct adapter *info ) { char buffer[4096]; @@ -606,6 +653,8 @@ static BOOL read_display_adapter_settings( unsigned int index, struct adapter *i mode = NEXT_DEVMODEW(mode); } info->mode_count = i; + + qsort(info->modes, info->mode_count, sizeof(*info->modes) + info->modes->dmDriverExtra, mode_compare); } /* DeviceID */ diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index c9f2da7e163..508401b77cf 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -403,7 +403,6 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) if (!settings_handler.get_modes(id, EDS_ROTATEDMODE, &modes, &mode_count)) return NULL; - qsort(modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare); for (mode_idx = 0; mode_idx < mode_count; ++mode_idx) { found_mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * mode_idx); @@ -1062,8 +1061,6 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage if (!settings_handler.get_modes( adapters[adapter].id, EDS_ROTATEDMODE, &modes, &mode_count )) continue; - qsort( modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare ); - for (mode = modes; mode_count; mode_count--) { TRACE( "mode: %p\n", mode );

1 0

Rémi Bernon : win32u: Support interlaced and stretched display modes.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: 1c6722c41a8d2a56b1af002a1d79f71e31ad37e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c6722c41a8d2a56b1af002a1d79f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 17 10:32:25 2022 +0200 win32u: Support interlaced and stretched display modes. --- dlls/win32u/sysparams.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 865f5bbfc69..b903d6a2756 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -548,6 +548,7 @@ static BOOL write_registry_settings( const WCHAR *adapter_path, const DEVMODEW * static int mode_compare(const void *p1, const void *p2) { + BOOL a_interlaced, b_interlaced, a_stretched, b_stretched; DWORD a_width, a_height, b_width, b_height; const DEVMODEW *a = p1, *b = p2; int ret; @@ -590,6 +591,22 @@ static int mode_compare(const void *p1, const void *p2) /* Orientation in ascending order */ if ((ret = a->dmDisplayOrientation - b->dmDisplayOrientation)) return ret; + if (!(a->dmFields & DM_DISPLAYFLAGS)) a_interlaced = FALSE; + else a_interlaced = !!(a->dmDisplayFlags & DM_INTERLACED); + if (!(b->dmFields & DM_DISPLAYFLAGS)) b_interlaced = FALSE; + else b_interlaced = !!(b->dmDisplayFlags & DM_INTERLACED); + + /* Interlaced in ascending order */ + if ((ret = a_interlaced - b_interlaced)) return ret; + + if (!(a->dmFields & DM_DISPLAYFIXEDOUTPUT)) a_stretched = FALSE; + else a_stretched = a->dmDisplayFixedOutput == DMDFO_STRETCH; + if (!(b->dmFields & DM_DISPLAYFIXEDOUTPUT)) b_stretched = FALSE; + else b_stretched = b->dmDisplayFixedOutput == DMDFO_STRETCH; + + /* Stretched in ascending order */ + if ((ret = a_stretched - b_stretched)) return ret; + return 0; }

1 0