From: Claire Girka claire@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 | 10 ++++++- dlls/winepulse.drv/pulse.c | 49 +++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 10 +++++++ 3 files changed, 68 insertions(+), 1 deletion(-)
diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 3cbbc1d8115..0d975dab24e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1135,6 +1135,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, WAVEFORMATEX **pwfx) { + struct get_mix_format_params params; ACImpl *This = impl_from_IAudioClient3(iface);
TRACE("(%p)->(%p)\n", This, pwfx); @@ -1142,7 +1143,14 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, if (!pwfx) return E_POINTER;
- *pwfx = clone_format(&pulse_config.modes[This->dataflow == eCapture].format.Format); + params.flow = This->dataflow; + params.pulse_name = This->pulse_name; + params.config = &pulse_config; + + pulse_call(get_mix_format, ¶ms); + + *pwfx = clone_format(¶ms.fmt.Format); + if (!*pwfx) return E_OUTOFMEMORY; dump_fmt(*pwfx); diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index a22d6717e0c..ecae0e0072f 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -740,6 +740,31 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; }
+static NTSTATUS pulse_get_mix_format(void *args) +{ + struct get_mix_format_params *params = args; + struct pulse_config *config = params->config; + struct list *list = (params->flow == eRender) ? &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->fmt = config->modes[params->flow == eCapture].format; + params->result = S_OK; + + params->result = S_OK; + + 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 @@ -2317,6 +2342,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_test_connect, pulse_is_started, pulse_get_prop_value, + pulse_get_mix_format, };
#ifdef _WIN64 @@ -2671,6 +2697,28 @@ static NTSTATUS pulse_wow64_get_prop_value(void *args) return STATUS_SUCCESS; }
+static NTSTATUS pulse_wow64_get_mix_format(void *args) +{ + struct + { + PTR32 pulse_name; + PTR32 config; + EDataFlow flow; + HRESULT result; + WAVEFORMATEXTENSIBLE fmt; + } *params32 = args; + struct get_mix_format_params params = + { + .pulse_name = ULongToPtr(params32->pulse_name), + .config = ULongToPtr(params32->config), /* struct pulse_config is identical */ + .flow = params32->flow, + }; + pulse_get_mix_format(¶ms); + params32->result = params.result; + params32->fmt = params.fmt; + return STATUS_SUCCESS; +} + const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { pulse_process_attach, @@ -2698,6 +2746,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = pulse_wow64_test_connect, pulse_is_started, pulse_wow64_get_prop_value, + pulse_wow64_get_mix_format, };
#endif /* _WIN64 */ diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index f224f26c909..99e9b228429 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -159,6 +159,15 @@ struct get_current_padding_params UINT32 *padding; };
+struct get_mix_format_params +{ + const char *pulse_name; + struct pulse_config *config; + EDataFlow flow; + HRESULT result; + WAVEFORMATEXTENSIBLE fmt; +}; + struct get_next_packet_size_params { stream_handle stream; @@ -252,4 +261,5 @@ enum unix_funcs test_connect, is_started, get_prop_value, + get_mix_format, };