November 2022 - Wine-commits

Rémi Bernon : mf: Add some topology source node checks in IMFMediaSession_SetTopology.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 49d87a5c928b9717d25417334a12c14a20176cfa URL: https://gitlab.winehq.org/wine/wine/-/commit/49d87a5c928b9717d25417334a12c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 2 17:34:48 2022 +0200 mf: Add some topology source node checks in IMFMediaSession_SetTopology. --- dlls/mf/session.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++--- dlls/mf/tests/mf.c | 17 -------- 2 files changed, 120 insertions(+), 23 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index d5ff3384299..a20d411f17a 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1939,20 +1939,134 @@ static HRESULT WINAPI mfsession_QueueEvent(IMFMediaSession *iface, MediaEventTyp return IMFMediaEventQueue_QueueEventParamVar(session->event_queue, event_type, ext_type, hr, value); } +static HRESULT session_check_stream_descriptor(IMFPresentationDescriptor *pd, IMFStreamDescriptor *sd) +{ + IMFStreamDescriptor *selected_sd; + DWORD i, count; + BOOL selected; + HRESULT hr; + + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorCount(pd, &count))) + { + WARN("Failed to get stream descriptor count, hr %#lx.\n", hr); + return MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED; + } + + for (i = 0; i < count; ++i) + { + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, i, + &selected, &selected_sd))) + { + WARN("Failed to get stream descriptor %lu, hr %#lx.\n", i, hr); + return MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED; + } + IMFStreamDescriptor_Release(selected_sd); + + if (selected_sd == sd) + { + if (selected) + return S_OK; + + WARN("Presentation descriptor %p stream %p is not selected.\n", pd, sd); + return MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED; + } + } + + WARN("Failed to find stream descriptor %lu, hr %#lx.\n", i, hr); + return MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED; +} + +static HRESULT session_check_topology(IMFTopology *topology) +{ + MF_TOPOLOGY_TYPE node_type; + IMFTopologyNode *node; + WORD node_count, i; + HRESULT hr; + + if (!topology) + return S_OK; + + if (FAILED(IMFTopology_GetNodeCount(topology, &node_count)) + || node_count == 0) + return E_INVALIDARG; + + for (i = 0; i < node_count; ++i) + { + if (FAILED(hr = IMFTopology_GetNode(topology, i, &node))) + break; + + if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) + { + IMFTopologyNode_Release(node); + break; + } + + switch (node_type) + { + case MF_TOPOLOGY_SOURCESTREAM_NODE: + { + IMFPresentationDescriptor *pd; + IMFStreamDescriptor *sd; + IMFMediaSource *source; + + if (FAILED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_SOURCE, &IID_IMFMediaSource, + (void **)&source))) + { + WARN("Missing MF_TOPONODE_SOURCE, hr %#lx.\n", hr); + IMFTopologyNode_Release(node); + return MF_E_TOPO_MISSING_SOURCE; + } + IMFMediaSource_Release(source); + + if (FAILED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, + &IID_IMFPresentationDescriptor, (void **)&pd))) + { + WARN("Missing MF_TOPONODE_PRESENTATION_DESCRIPTOR, hr %#lx.\n", hr); + IMFTopologyNode_Release(node); + return MF_E_TOPO_MISSING_PRESENTATION_DESCRIPTOR; + } + + if (FAILED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, + &IID_IMFStreamDescriptor, (void **)&sd))) + { + WARN("Missing MF_TOPONODE_STREAM_DESCRIPTOR, hr %#lx.\n", hr); + IMFPresentationDescriptor_Release(pd); + IMFTopologyNode_Release(node); + return MF_E_TOPO_MISSING_STREAM_DESCRIPTOR; + } + + hr = session_check_stream_descriptor(pd, sd); + IMFPresentationDescriptor_Release(pd); + IMFStreamDescriptor_Release(sd); + if (FAILED(hr)) + { + IMFTopologyNode_Release(node); + return hr; + } + + break; + } + + default: + break; + } + + IMFTopologyNode_Release(node); + } + + return hr; +} + static HRESULT WINAPI mfsession_SetTopology(IMFMediaSession *iface, DWORD flags, IMFTopology *topology) { struct media_session *session = impl_from_IMFMediaSession(iface); struct session_op *op; - WORD node_count = 0; HRESULT hr; TRACE("%p, %#lx, %p.\n", iface, flags, topology); - if (topology) - { - if (FAILED(IMFTopology_GetNodeCount(topology, &node_count)) || node_count == 0) - return E_INVALIDARG; - } + if (FAILED(hr = session_check_topology(topology))) + return hr; if (FAILED(hr = create_session_op(SESSION_CMD_SET_TOPOLOGY, &op))) return hr; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 004f7b50f59..ba4afddc7d2 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2145,29 +2145,13 @@ static void test_media_session_events(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSession_SetTopology(session, 0, topology); - todo_wine ok(hr == MF_E_TOPO_MISSING_SOURCE, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) - { - hr = wait_media_event(session, callback, MESessionTopologySet, 1000, &propvar); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - PropVariantClear(&propvar); - handler.enum_count = handler.set_current_count = 0; - } source = create_test_source(pd); init_source_node(source, -1, src_node, pd, sd); hr = IMFMediaSession_SetTopology(session, 0, topology); - todo_wine ok(hr == MF_E_TOPO_STREAM_DESCRIPTOR_NOT_SELECTED, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) - { - hr = wait_media_event(session, callback, MESessionTopologySet, 1000, &propvar); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - PropVariantClear(&propvar); - handler.enum_count = handler.set_current_count = 0; - } hr = IMFMediaSession_ClearTopologies(session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -2177,7 +2161,6 @@ static void test_media_session_events(void) hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!media_sink.shutdown, "media sink is shutdown.\n"); media_sink.shutdown = FALSE;

1 0

Bernhard Kölbl : mf/tests: Test for copier node in topology using evr.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: b843ec9f686bcd820ad336695728218ce335025f URL: https://gitlab.winehq.org/wine/wine/-/commit/b843ec9f686bcd820ad33669572821… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Nov 2 20:41:11 2022 +0100 mf/tests: Test for copier node in topology using evr. --- dlls/mf/tests/mf.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ba4afddc7d2..ce9a2db55a9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3581,19 +3581,51 @@ static void test_topology_loader_evr(void) hr = IMFTopologyNode_GetNodeType(node, &node_type); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (node_type == MF_TOPOLOGY_OUTPUT_NODE) + switch (node_type) + { + case MF_TOPOLOGY_OUTPUT_NODE: { value = 1; hr = IMFTopologyNode_GetUINT32(node, &MF_TOPONODE_STREAMID, &value); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!value, "Unexpected stream id %u.\n", value); + break; } - else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) + case MF_TOPOLOGY_TRANSFORM_NODE: + { + IMFAttributes *attrs; + IMFTransform *copier; + IUnknown *obj; + + hr = IMFTopologyNode_GetObject(node, (IUnknown **)&obj); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IUnknown_QueryInterface(obj, &IID_IMFTransform, (void **)&copier); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFTransform_GetAttributes(copier, &attrs); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attrs, &MFT_SUPPORT_DYNAMIC_FORMAT_CHANGE, &value); + ok(value == 1, "Unexpected dynamic state support state %u.\n", value); + + IMFAttributes_Release(attrs); + IMFTransform_Release(copier); + IUnknown_Release(obj); + break; + } + case MF_TOPOLOGY_SOURCESTREAM_NODE: { value64 = 1; hr = IMFTopologyNode_GetUINT64(node, &MF_TOPONODE_MEDIASTART, &value64); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!value64, "Unexpected value.\n"); + break; + } + default: + ok(0, "Got unexpected node type %u.\n", node_type); + break; } IMFTopologyNode_Release(node);

1 0

Bernhard Kölbl : mf: Assume same up and downstream media type for copier creation.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: f1b9c9a4c7731a954188f0efc4c5973fbb66e775 URL: https://gitlab.winehq.org/wine/wine/-/commit/f1b9c9a4c7731a954188f0efc4c597… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Nov 7 12:27:03 2022 +0100 mf: Assume same up and downstream media type for copier creation. The copier creation is only called, when the topo resolve code was successful, thus it should always be given, that up and down media types in the copier branch are compatible/the same at this point. --- dlls/mf/topology_loader.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index 0c42a93511b..273d96a81ba 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -533,23 +533,21 @@ static BOOL topology_loader_is_node_d3d_aware(IMFTopologyNode *node) static HRESULT topology_loader_create_copier(IMFTopologyNode *upstream_node, DWORD upstream_output, IMFTopologyNode *downstream_node, unsigned int downstream_input, IMFTransform **copier) { - IMFMediaType *input_type = NULL, *output_type = NULL; + IMFMediaType *up_type = NULL; IMFTransform *transform; HRESULT hr; if (FAILED(hr = MFCreateSampleCopierMFT(&transform))) return hr; - if (FAILED(hr = MFGetTopoNodeCurrentType(upstream_node, upstream_output, TRUE, &input_type))) + if (FAILED(hr = MFGetTopoNodeCurrentType(upstream_node, upstream_output, TRUE, &up_type))) WARN("Failed to get upstream media type hr %#lx.\n", hr); - if (SUCCEEDED(hr) && FAILED(hr = MFGetTopoNodeCurrentType(downstream_node, downstream_input, FALSE, &output_type))) - WARN("Failed to get downstream media type hr %#lx.\n", hr); - - if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0))) + if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetInputType(transform, 0, up_type, 0))) WARN("Input type wasn't accepted, hr %#lx.\n", hr); - if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetOutputType(transform, 0, output_type, 0))) + /* We assume, that up_type is set to a value compatible with the down node by the branch resolver. */ + if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetOutputType(transform, 0, up_type, 0))) WARN("Output type wasn't accepted, hr %#lx.\n", hr); if (SUCCEEDED(hr)) @@ -558,10 +556,8 @@ static HRESULT topology_loader_create_copier(IMFTopologyNode *upstream_node, DWO IMFTransform_AddRef(*copier); } - if (input_type) - IMFMediaType_Release(input_type); - if (output_type) - IMFMediaType_Release(output_type); + if (up_type) + IMFMediaType_Release(up_type); IMFTransform_Release(transform);

1 0

Bernhard Kölbl : mf: Set media types for output nodes in the media session.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: ae3c9e327224e15908acde673b17d650d7a4160d URL: https://gitlab.winehq.org/wine/wine/-/commit/ae3c9e327224e15908acde673b17d6… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Nov 7 12:29:18 2022 +0100 mf: Set media types for output nodes in the media session. Instead of the topology loader. --- dlls/mf/mf_private.h | 1 + dlls/mf/session.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 4 ---- dlls/mf/topology_loader.c | 29 ++++++++++++++++++++---- 4 files changed, 82 insertions(+), 8 deletions(-) diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index bd1d6c7537b..69923154b79 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -117,3 +117,4 @@ extern BOOL mf_is_sample_copier_transform(IMFTransform *transform) DECLSPEC_HIDD extern BOOL mf_is_sar_sink(IMFMediaSink *sink) DECLSPEC_HIDDEN; extern HRESULT topology_node_get_object(IMFTopologyNode *node, REFIID riid, void **obj) DECLSPEC_HIDDEN; extern HRESULT topology_node_get_type_handler(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaTypeHandler **handler) DECLSPEC_HIDDEN; +extern HRESULT topology_node_init_media_type(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type) DECLSPEC_HIDDEN; diff --git a/dlls/mf/session.c b/dlls/mf/session.c index a20d411f17a..b2371763150 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -596,6 +596,60 @@ static HRESULT session_bind_output_nodes(IMFTopology *topology) return hr; } +static HRESULT session_init_media_types(IMFTopology *topology) +{ + MF_TOPOLOGY_TYPE node_type; + WORD node_count, i, j; + IMFTopologyNode *node; + IMFMediaType *type; + DWORD input_count; + HRESULT hr; + + if (FAILED(hr = IMFTopology_GetNodeCount(topology, &node_count))) + return hr; + + for (i = 0; i < node_count; ++i) + { + if (FAILED(hr = IMFTopology_GetNode(topology, i, &node))) + break; + + if (FAILED(hr = IMFTopologyNode_GetInputCount(node, &input_count)) + || FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type)) + || node_type != MF_TOPOLOGY_OUTPUT_NODE) + { + IMFTopologyNode_Release(node); + continue; + } + + for (j = 0; j < input_count; ++j) + { + IMFMediaTypeHandler *handler; + IMFTopologyNode *up_node; + DWORD up_output; + + if (SUCCEEDED(hr = IMFTopologyNode_GetInput(node, j, &up_node, &up_output))) + { + hr = topology_node_init_media_type(up_node, up_output, TRUE, &type); + IMFTopologyNode_Release(up_node); + } + if (FAILED(hr)) + break; + + if (SUCCEEDED(hr = topology_node_get_type_handler(node, j, FALSE, &handler))) + { + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, type); + IMFMediaTypeHandler_Release(handler); + } + + IMFMediaType_Release(type); + } + + IMFTopologyNode_Release(node); + } + + return hr; +} + static void session_set_caps(struct media_session *session, DWORD caps) { DWORD delta = session->caps ^ caps; @@ -1768,6 +1822,8 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF if (SUCCEEDED(hr)) hr = IMFTopoLoader_Load(session->topo_loader, topology, &resolved_topology, NULL /* FIXME? */); + if (SUCCEEDED(hr)) + hr = session_init_media_types(resolved_topology); if (SUCCEEDED(hr)) { diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ce9a2db55a9..8dd3b35251d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2263,7 +2263,6 @@ static void test_media_session_events(void) PropVariantClear(&propvar); ok(handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); - todo_wine ok(handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count); handler.enum_count = handler.set_current_count = 0; @@ -2342,7 +2341,6 @@ static void test_media_session_events(void) PropVariantClear(&propvar); ok(!handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); - todo_wine ok(handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count); handler.enum_count = handler.set_current_count = 0; @@ -3431,8 +3429,6 @@ todo_wine { ok(handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); else ok(!handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); - - todo_wine_if(test->flags & LOADER_NO_CURRENT_OUTPUT) ok(!handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count); if (handler.current_type) diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index 273d96a81ba..6b6d39d76d1 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -335,7 +335,7 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC return hr; } -static HRESULT topology_branch_get_current_type(IMFMediaTypeHandler *handler, IMFMediaType **type) +static HRESULT get_first_supported_media_type(IMFMediaTypeHandler *handler, IMFMediaType **type) { IMFMediaType *media_type; HRESULT hr; @@ -359,12 +359,28 @@ static HRESULT topology_branch_get_current_type(IMFMediaTypeHandler *handler, IM return hr; } +HRESULT topology_node_init_media_type(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type) +{ + IMFMediaTypeHandler *handler; + HRESULT hr; + + if (SUCCEEDED(hr = topology_node_get_type_handler(node, stream, output, &handler))) + { + if (SUCCEEDED(hr = get_first_supported_media_type(handler, type))) + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, *type); + IMFMediaTypeHandler_Release(handler); + } + + return hr; +} + static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_METHOD method_mask, struct topology_branch *branch, IMFMediaType *up_type) { IMFMediaTypeHandler *down_handler; IMFMediaType *down_type = NULL; MF_CONNECT_METHOD method; + MF_TOPOLOGY_TYPE type; DWORD flags; HRESULT hr; @@ -377,7 +393,7 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME if (FAILED(hr = topology_node_get_type_handler(branch->down.node, branch->down.stream, FALSE, &down_handler))) return hr; - if (SUCCEEDED(hr = topology_branch_get_current_type(down_handler, &down_type)) + if (SUCCEEDED(hr = get_first_supported_media_type(down_handler, &down_type)) && IMFMediaType_IsEqual(up_type, down_type, &flags) == S_OK) { TRACE("Connecting branch %s with current type %p.\n", debugstr_topology_branch(branch), up_type); @@ -385,11 +401,16 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME goto done; } - if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(down_handler, up_type, NULL)) - && SUCCEEDED(hr = IMFMediaTypeHandler_SetCurrentMediaType(down_handler, up_type))) + if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(down_handler, up_type, NULL))) { TRACE("Connected branch %s with upstream type %p.\n", debugstr_topology_branch(branch), up_type); + + if (SUCCEEDED(IMFTopologyNode_GetNodeType(branch->down.node, &type)) && type == MF_TOPOLOGY_TRANSFORM_NODE + && FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(down_handler, up_type))) + WARN("Failed to set transform node media type, hr %#lx\n", hr); + hr = IMFTopologyNode_ConnectOutput(branch->up.node, branch->up.stream, branch->down.node, branch->down.stream); + goto done; }

1 0

Brendan Shanks : dsound: Set name of internal threads.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 28b6acd155fbf4fb24a601d9c9adb8addd4c4b79 URL: https://gitlab.winehq.org/wine/wine/-/commit/28b6acd155fbf4fb24a601d9c9adb8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Nov 2 14:23:35 2022 -0700 dsound: Set name of internal threads. --- dlls/dsound/capture.c | 2 ++ dlls/dsound/mixer.c | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 2c3dd83e86d..6ddae8286cd 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -951,6 +951,8 @@ static DWORD WINAPI DSOUND_capture_thread(void *user) DWORD ret, wait_ms; REFERENCE_TIME period; + SetThreadDescription(GetCurrentThread(), L"wine_dsound_capture"); + hr = IAudioClient_GetDevicePeriod(buffer->device->client, &period, NULL); if(FAILED(hr)){ WARN("GetDevicePeriod failed: %08lx\n", hr); diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 05b2bfbf8c3..5d5c4981fa2 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -783,6 +783,7 @@ DWORD CALLBACK DSOUND_mixthread(void *p) { DirectSoundDevice *dev = p; TRACE("(%p)\n", dev); + SetThreadDescription(GetCurrentThread(), L"wine_dsound_mixer"); while (dev->ref) { DWORD ret;

1 0

Brendan Shanks : winepulse: Set name of internal threads.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: de2483e255081adbc1e9a33c34f0e168e78b4563 URL: https://gitlab.winehq.org/wine/wine/-/commit/de2483e255081adbc1e9a33c34f0e1… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 18 12:02:04 2022 -0700 winepulse: Set name of internal threads. --- dlls/winepulse.drv/mmdevdrv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index d1d9eee068b..d8bfdc80cd8 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -234,6 +234,7 @@ static DWORD CALLBACK pulse_mainloop_thread(void *event) { struct main_loop_params params; params.event = event; + SetThreadDescription(GetCurrentThread(), L"winepulse_mainloop"); pulse_call(main_loop, &params); return 0; } @@ -359,6 +360,7 @@ static DWORD WINAPI pulse_timer_cb(void *user) struct timer_loop_params params; ACImpl *This = user; params.stream = This->pulse_stream; + SetThreadDescription(GetCurrentThread(), L"winepulse_timer_loop"); pulse_call(timer_loop, &params); return 0; }

1 0

Brendan Shanks : winealsa: Set name of internal threads.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: cf978c9a94866fda4de77fb9458213e760b5bc4c URL: https://gitlab.winehq.org/wine/wine/-/commit/cf978c9a94866fda4de77fb9458213… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Nov 2 14:52:10 2022 -0700 winealsa: Set name of internal threads. --- dlls/winealsa.drv/midi.c | 2 ++ dlls/winealsa.drv/mmdevdrv.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 81d8312d237..1c441161d7e 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -114,6 +114,8 @@ static DWORD WINAPI notify_thread(void *p) struct notify_context notify; BOOL quit; + SetThreadDescription(GetCurrentThread(), L"winealsa_midi_notify"); + params.notify = &notify; params.quit = &quit; diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 03499a3e40e..99dd45c7638 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -238,6 +238,8 @@ static DWORD WINAPI alsa_timer_thread(void *user) struct timer_loop_params params; struct ACImpl *This = user; + SetThreadDescription(GetCurrentThread(), L"winealsa_timer"); + params.stream = This->stream; ALSA_CALL(timer_loop, &params);

1 0

Alexandre Julliard : faudio: Import upstream release 22.11.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 927f0530f4b87ad1e1c0363b1a3d7438588d6fad URL: https://gitlab.winehq.org/wine/wine/-/commit/927f0530f4b87ad1e1c0363b1a3d74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 09:44:18 2022 +0100 faudio: Import upstream release 22.11. --- libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/FACT.c | 1 - libs/faudio/src/FAudio.c | 27 +++++++++++++++++---------- libs/faudio/src/FAudioFX_reverb.c | 2 ++ 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h index 88d5e996cbf..565e0b14067 100644 --- a/libs/faudio/include/FAudio.h +++ b/libs/faudio/include/FAudio.h @@ -485,7 +485,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT; #define FAUDIO_ABI_VERSION 0 #define FAUDIO_MAJOR_VERSION 22 -#define FAUDIO_MINOR_VERSION 8 +#define FAUDIO_MINOR_VERSION 11 #define FAUDIO_PATCH_VERSION 0 #define FAUDIO_COMPILED_VERSION ( \ diff --git a/libs/faudio/src/FACT.c b/libs/faudio/src/FACT.c index f7b3a64bb8e..649abf2111c 100644 --- a/libs/faudio/src/FACT.c +++ b/libs/faudio/src/FACT.c @@ -2409,7 +2409,6 @@ uint32_t FACTCue_Destroy(FACTCue *pCue) { FACTCue *cue, *prev; FAudioMutex mutex; - FACTNotification note; if (pCue == NULL) { return 1; diff --git a/libs/faudio/src/FAudio.c b/libs/faudio/src/FAudio.c index be3b038185f..559837c410b 100644 --- a/libs/faudio/src/FAudio.c +++ b/libs/faudio/src/FAudio.c @@ -678,16 +678,27 @@ uint32_t FAudio_CreateMasteringVoice( uint32_t DeviceIndex, const FAudioEffectChain *pEffectChain ) { - FAudioDeviceDetails details; - LOG_API_ENTER(audio) /* For now we only support one allocated master voice at a time */ FAudio_assert(audio->master == NULL); - if (FAudio_GetDeviceDetails(audio, DeviceIndex, &details) != 0) + if ( InputChannels == FAUDIO_DEFAULT_CHANNELS || + InputSampleRate == FAUDIO_DEFAULT_SAMPLERATE ) { - return FAUDIO_E_INVALID_CALL; + FAudioDeviceDetails details; + if (FAudio_GetDeviceDetails(audio, DeviceIndex, &details) != 0) + { + return FAUDIO_E_INVALID_CALL; + } + if (InputChannels == FAUDIO_DEFAULT_CHANNELS) + { + InputChannels = details.OutputFormat.Format.nChannels; + } + if (InputSampleRate == FAUDIO_DEFAULT_SAMPLERATE) + { + InputSampleRate = details.OutputFormat.Format.nSamplesPerSec; + } } *ppMasteringVoice = (FAudioMasteringVoice*) audio->pMalloc(sizeof(FAudioVoice)); @@ -704,12 +715,8 @@ uint32_t FAudio_CreateMasteringVoice( (*ppMasteringVoice)->volume = 1.0f; /* Master Properties */ - (*ppMasteringVoice)->master.inputChannels = (InputChannels == FAUDIO_DEFAULT_CHANNELS) ? - details.OutputFormat.Format.nChannels : - InputChannels; - (*ppMasteringVoice)->master.inputSampleRate = (InputSampleRate == FAUDIO_DEFAULT_SAMPLERATE) ? - details.OutputFormat.Format.nSamplesPerSec : - InputSampleRate; + (*ppMasteringVoice)->master.inputChannels = InputChannels; + (*ppMasteringVoice)->master.inputSampleRate = InputSampleRate; /* Sends/Effects */ FAudio_zero(&(*ppMasteringVoice)->sends, sizeof(FAudioVoiceSends)); diff --git a/libs/faudio/src/FAudioFX_reverb.c b/libs/faudio/src/FAudioFX_reverb.c index b357b772ec6..48f55f49fba 100644 --- a/libs/faudio/src/FAudioFX_reverb.c +++ b/libs/faudio/src/FAudioFX_reverb.c @@ -130,11 +130,13 @@ static inline float DspDelay_Process(DspDelay *filter, float sample_in) return delay_out; } +/* FIXME: This is currently unused! What was it for...? -flibit static inline float DspDelay_Tap(DspDelay *filter, uint32_t delay) { FAudio_assert(delay <= filter->delay); return filter->buffer[(filter->write_idx - delay + filter->capacity) % filter->capacity]; } +*/ static inline void DspDelay_Reset(DspDelay *filter) {

1 0

Alexandre Julliard : png: Import upstream release 1.6.38.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: d4ce1fd764be3bf03ce3f6332b0d0327725b3ffc URL: https://gitlab.winehq.org/wine/wine/-/commit/d4ce1fd764be3bf03ce3f6332b0d03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 10:46:59 2022 +0100 png: Import upstream release 1.6.38. --- libs/png/AUTHORS | 8 +++++-- libs/png/LICENSE | 4 ++-- libs/png/png.c | 14 +++++------ libs/png/png.h | 26 ++++++++++----------- libs/png/pngconf.h | 8 +++---- libs/png/pngget.c | 14 +++++------ libs/png/pngpriv.h | 65 ++++++++++++++++++++++------------------------------ libs/png/pngread.c | 3 --- libs/png/pngrtran.c | 2 +- libs/png/pngrutil.c | 36 ++++++++++++++--------------- libs/png/pngset.c | 13 +++++++---- libs/png/pngstruct.h | 12 +--------- libs/png/pngwrite.c | 12 +++++++++- 13 files changed, 106 insertions(+), 111 deletions(-)

1 0

Alexandre Julliard : zlib: Import upstream release 1.2.13.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: cfe8ee571dcd4c04737240ac985717c9f376b488 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfe8ee571dcd4c04737240ac985717… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 10:50:33 2022 +0100 zlib: Import upstream release 1.2.13. --- libs/zlib/LICENSE | 9 +-- libs/zlib/crc32.c | 33 +++++--- libs/zlib/deflate.c | 218 ++++++++++++++++++++++++++------------------------- libs/zlib/deflate.h | 4 +- libs/zlib/inflate.c | 7 +- libs/zlib/inftrees.c | 4 +- libs/zlib/inftrees.h | 2 +- libs/zlib/trees.c | 123 ++++++++++++++--------------- libs/zlib/zconf.h | 19 ++++- libs/zlib/zlib.h | 20 ++--- libs/zlib/zutil.c | 16 ++-- libs/zlib/zutil.h | 1 + 12 files changed, 241 insertions(+), 215 deletions(-)

1 0