June 2022 - Wine-Devel - list.winehq.org

Re: [PATCH 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Claire (＠ClearlyClaire)

On Wed Jun 29 13:40:34 2022 +0000, Andrew Eikum wrote: > Why not just assign to `name` here and remove the if-NULL check later in > the function? Because I was re-using `pv` so it would have been overridden. But I'll just use a second `PROPVARIANT` as is already done a few lines below. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_2956

June 29, 2022

[PATCH v2 3/3] winepulse: Return device-specific values for GetDevicePeriod

by Claire Girka

From: Claire Girka <claire(a)sitedethib.com> When GetDevicePeriod is used, return values specific to the selected device instead of those of the default one. --- dlls/winepulse.drv/mmdevdrv.c | 17 +++++++++++++++++ dlls/winepulse.drv/pulse.c | 21 +++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 10 ++++++++++ 3 files changed, 48 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index fca36b22d90..4ebc508735c 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1173,6 +1173,23 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, if (!defperiod && !minperiod) return E_POINTER; + if (This->pulse_name[0]) { + struct get_device_period_params params; + params.render = This->dataflow == eRender; + params.pulse_name = This->pulse_name; + pulse_call(get_device_period, &params); + + if (FAILED(params.result)) + return params.result; + + if (defperiod) + *defperiod = params.def_period; + if (minperiod) + *minperiod = params.min_period; + + return S_OK; + } + if (defperiod) *defperiod = pulse_config.modes[This->dataflow == eCapture].def_period; if (minperiod) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 1855ffe11f4..4f1c0e2af26 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -759,6 +759,26 @@ static NTSTATUS pulse_get_device_mix_format(void *args) return STATUS_SUCCESS; } +static NTSTATUS pulse_get_device_period(void *args) { + struct get_device_period_params *params = args; + struct list *list = params->render ? &g_phys_speakers : &g_phys_sources; + PhysDevice *dev; + + LIST_FOR_EACH_ENTRY(dev, list, PhysDevice, entry) { + if (strcmp(params->pulse_name, dev->pulse_name)) + continue; + + params->def_period = dev->def_period; + params->min_period = dev->min_period; + params->result = S_OK; + + return STATUS_SUCCESS; + } + + params->result = E_FAIL; + return STATUS_SUCCESS; +} + /* some poorly-behaved applications call audio functions during DllMain, so we * have to do as much as possible without creating a new thread. this function * sets up a synchronous connection to verify the server is running and query @@ -2337,6 +2357,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_is_started, pulse_get_prop_value, pulse_get_device_mix_format, + pulse_get_device_period, }; #ifdef _WIN64 diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 6f8e3cf3211..68137c5a59a 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -167,6 +167,15 @@ struct get_device_mix_format_params WAVEFORMATEXTENSIBLE fmt; }; +struct get_device_period_params +{ + const char *pulse_name; + HRESULT result; + BOOL render; + REFERENCE_TIME def_period; + REFERENCE_TIME min_period; +}; + struct get_next_packet_size_params { stream_handle stream; @@ -261,4 +270,5 @@ enum unix_funcs is_started, get_prop_value, get_device_mix_format, + get_device_period, }; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/337

June 29, 2022

[PATCH v2 2/3] winepulse: Return device-specific values for GetMixFormat

by Claire Girka

From: Claire Girka <claire(a)sitedethib.com> When GetMixFormat is used, return values specific to the selected device instead of those of the default one. This is especially useful when the default audio device features less channels than one specifically selected by the application. --- dlls/winepulse.drv/mmdevdrv.c | 16 +++++++++++++++- dlls/winepulse.drv/pulse.c | 21 +++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 9 +++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 3cbbc1d8115..fca36b22d90 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1136,13 +1136,27 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, WAVEFORMATEX **pwfx) { ACImpl *This = impl_from_IAudioClient3(iface); + const WAVEFORMATEX *fmt; TRACE("(%p)->(%p)\n", This, pwfx); if (!pwfx) return E_POINTER; - *pwfx = clone_format(&pulse_config.modes[This->dataflow == eCapture].format.Format); + fmt = &pulse_config.modes[This->dataflow == eCapture].format.Format; + + if (This->pulse_name[0]) { + struct get_device_mix_format_params params; + params.render = This->dataflow == eRender; + params.pulse_name = This->pulse_name; + pulse_call(get_device_mix_format, &params); + + if (SUCCEEDED(params.result)) + fmt = &params.fmt.Format; + } + + *pwfx = clone_format(fmt); + if (!*pwfx) return E_OUTOFMEMORY; dump_fmt(*pwfx); diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 1701b9c281c..1855ffe11f4 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -739,6 +739,26 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt, REFERENC fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; } +static NTSTATUS pulse_get_device_mix_format(void *args) +{ + struct get_device_mix_format_params *params = args; + struct list *list = params->render ? &g_phys_speakers : &g_phys_sources; + PhysDevice *dev; + + LIST_FOR_EACH_ENTRY(dev, list, PhysDevice, entry) { + if (strcmp(params->pulse_name, dev->pulse_name)) + continue; + + params->fmt = dev->fmt; + params->result = S_OK; + + return STATUS_SUCCESS; + } + + params->result = E_FAIL; + return STATUS_SUCCESS; +} + /* some poorly-behaved applications call audio functions during DllMain, so we * have to do as much as possible without creating a new thread. this function * sets up a synchronous connection to verify the server is running and query @@ -2316,6 +2336,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_test_connect, pulse_is_started, pulse_get_prop_value, + pulse_get_device_mix_format, }; #ifdef _WIN64 diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index f224f26c909..6f8e3cf3211 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -159,6 +159,14 @@ struct get_current_padding_params UINT32 *padding; }; +struct get_device_mix_format_params +{ + const char *pulse_name; + HRESULT result; + BOOL render; + WAVEFORMATEXTENSIBLE fmt; +}; + struct get_next_packet_size_params { stream_handle stream; @@ -252,4 +260,5 @@ enum unix_funcs test_connect, is_started, get_prop_value, + get_device_mix_format, }; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/337

June 29, 2022

[PATCH v2 1/3] winepulse: Store device-specific format and periods

by Claire Girka

From: Claire Girka <claire(a)sitedethib.com> In addition to those of the default device, also store device-specific format and periods so that they can be returned on GetMixFormat and GetPeriod calls. --- dlls/winepulse.drv/pulse.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 42d73db45f9..1701b9c281c 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -89,6 +89,8 @@ typedef struct _PhysDevice { EndpointFormFactor form; UINT channel_mask; UINT index; + REFERENCE_TIME min_period, def_period; + WAVEFORMATEXTENSIBLE fmt; char pulse_name[0]; } PhysDevice; @@ -659,7 +661,7 @@ static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIB fmt->dwChannelMask = pa_mask; } -static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { +static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt, REFERENCE_TIME *def_period, REFERENCE_TIME *min_period, CHAR *pulse_name) { WAVEFORMATEX *wfx = &fmt->Format; pa_stream *stream; pa_channel_map map; @@ -684,10 +686,10 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { if (!stream) ret = -1; else if (render) - ret = pa_stream_connect_playback(stream, NULL, &attr, + ret = pa_stream_connect_playback(stream, pulse_name, &attr, PA_STREAM_START_CORKED|PA_STREAM_FIX_RATE|PA_STREAM_FIX_CHANNELS|PA_STREAM_EARLY_REQUESTS, NULL, NULL); else - ret = pa_stream_connect_record(stream, NULL, &attr, PA_STREAM_START_CORKED|PA_STREAM_FIX_RATE|PA_STREAM_FIX_CHANNELS|PA_STREAM_EARLY_REQUESTS); + ret = pa_stream_connect_record(stream, pulse_name, &attr, PA_STREAM_START_CORKED|PA_STREAM_FIX_RATE|PA_STREAM_FIX_CHANNELS|PA_STREAM_EARLY_REQUESTS); if (ret >= 0) { while (pa_mainloop_iterate(pulse_ml, 1, &ret) >= 0 && pa_stream_get_state(stream) == PA_STREAM_CREATING) @@ -710,13 +712,13 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) { pa_stream_unref(stream); if (length) - pulse_def_period[!render] = pulse_min_period[!render] = pa_bytes_to_usec(10 * length, &ss); + *def_period = *min_period = pa_bytes_to_usec(10 * length, &ss); - if (pulse_min_period[!render] < MinimumPeriod) - pulse_min_period[!render] = MinimumPeriod; + if (*min_period < MinimumPeriod) + *min_period = MinimumPeriod; - if (pulse_def_period[!render] < DefaultPeriod) - pulse_def_period[!render] = DefaultPeriod; + if (*def_period < DefaultPeriod) + *def_period = DefaultPeriod; wfx->wFormatTag = WAVE_FORMAT_EXTENSIBLE; wfx->cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); @@ -745,6 +747,7 @@ static NTSTATUS pulse_test_connect(void *args) { struct test_connect_params *params = args; struct pulse_config *config = params->config; + PhysDevice *dev; pa_operation *o; int ret; @@ -787,8 +790,8 @@ static NTSTATUS pulse_test_connect(void *args) pa_context_get_server(pulse_ctx), pa_context_get_server_protocol_version(pulse_ctx)); - pulse_probe_settings(1, &pulse_fmt[0]); - pulse_probe_settings(0, &pulse_fmt[1]); + pulse_probe_settings(1, &pulse_fmt[0], &pulse_def_period[0], &pulse_min_period[0], NULL); + pulse_probe_settings(0, &pulse_fmt[1], &pulse_def_period[1], &pulse_min_period[1], NULL); free_phys_device_lists(); list_init(&g_phys_speakers); @@ -813,6 +816,14 @@ static NTSTATUS pulse_test_connect(void *args) pa_operation_unref(o); } + LIST_FOR_EACH_ENTRY(dev, &g_phys_speakers, PhysDevice, entry) { + pulse_probe_settings(1, &dev->fmt, &dev->def_period, &dev->min_period, dev->pulse_name); + } + + LIST_FOR_EACH_ENTRY(dev, &g_phys_sources, PhysDevice, entry) { + pulse_probe_settings(0, &dev->fmt, &dev->def_period, &dev->min_period, dev->pulse_name); + } + pa_context_unref(pulse_ctx); pulse_ctx = NULL; pa_mainloop_free(pulse_ml); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/337

June 29, 2022

[PATCH v2 0/3] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod

by Claire (＠ClearlyClaire)

When `GetMixFormat` or `GetDevicePeriod` are used, return values specific to the selected device instead of those of the default one. This is especially useful when the audio devices features less channels than one specifically selected by the application. This patch is part of an attempt to get Sony's DualSense controllers to work with Windows games through Wine. This is not enough by itself, but getting the proper mix format is required for most of those games to correctly use the haptic feedback features of the DualSense (which go through an audio output with 4 audio devices). -- v2: winepulse: Return device-specific values for GetDevicePeriod winepulse: Return device-specific values for GetMixFormat winepulse: Store device-specific format and periods https://gitlab.winehq.org/wine/wine/-/merge_requests/337

June 29, 2022

Re: [PATCH 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Andrew Eikum (＠aeikum)

Andrew Eikum (@aeikum) commented about dlls/mmdevapi/devenum.c: > if (!RegCreateKeyExW(key, L"Properties", 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &keyprop, NULL)) > { > PROPVARIANT pv; > + pv.pwszVal = NULL; Why not just assign to `name` here and remove the if-NULL check later in the function? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_2954

June 29, 2022

Re: [PATCH 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Andrew Eikum (＠aeikum)

Andrew Eikum (@aeikum) commented about dlls/mmdevapi/devenum.c: > if (!RegCreateKeyExW(key, L"Properties", 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &keyprop, NULL)) > { > PROPVARIANT pv; > + pv.pwszVal = NULL; > + > + if (SUCCEEDED(drvs.pGetPropValue(id, &devicepath_key, &pv))) { Not all drivers implement GetPropValue, so you can't unconditionally call it. `set_driver_prop_value` could maybe use a refactor so this doesn't get messy. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_2953

June 29, 2022

Re: [PATCH 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Andrew Eikum (＠aeikum)

Andrew Eikum (@aeikum) commented about dlls/mmdevapi/devenum.c: > if (!RegCreateKeyExW(key, L"Properties", 0, NULL, 0, KEY_WRITE|KEY_READ|KEY_WOW64_64KEY, NULL, &keyprop, NULL)) > { > PROPVARIANT pv; > + pv.pwszVal = NULL; > + > + if (SUCCEEDED(drvs.pGetPropValue(id, &devicepath_key, &pv))) { > + MMDevice_SetPropValue(id, flow, &devicepath_key, &pv); > + > + /* Some applications expect a specific name for the DualSense audio device */ > + pv.pwszVal = find_device_string(pv.pwszVal); This comment shouldn't be specific to DualSense controllers, and I think you could even remove the comment entirely if you rename the function. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_2952

June 29, 2022

Re: [PATCH 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Andrew Eikum (＠aeikum)

Andrew Eikum (@aeikum) commented about dlls/mmdevapi/devenum.c: > return hr; > } > > +struct device_strings > +{ > + const WCHAR *id; > + const WCHAR *product; > +}; > + > +static const struct device_strings device_strings[] = > +{ > + /* Sony controllers */ > + { .id = L"VID_054C&PID_0CE6", .product = L"Wireless Controller" }, > +}; > + > +static const WCHAR *find_device_string(const WCHAR *device_id) I know this function came from `hidclass`, but I think I'd call it something more descriptive like `product_name_override`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_2951

June 29, 2022

Re: [PATCH 0/1] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod

by Claire (＠ClearlyClaire)

Oops, sorry about the styling issues, I will address them. With regards to handling failure, I think it might be more accurate to fail if the device does not exist (maybe with something like `AUDCLNT_E_DEVICE_INVALIDATED`, cf. https://docs.microsoft.com/en-us/windows/win32/api/audioclient/nf-audioclie…) but I don't think it matters much, and I can definitely fall back to the default format if you're more confident with avoiding a potential behavior change. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/337#note_2950

June 29, 2022