[PATCH 08/10] winecoreaudio: Adapt "is_format_supported_params" struct to mmdevapi's.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winecoreaudio.drv/coreaudio.c | 9 +++++----
 dlls/winecoreaudio.drv/mmdevdrv.c  | 2 +-
 dlls/winecoreaudio.drv/unixlib.h   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c
index bba3a805f33..b582e0eabcf 100644
--- a/dlls/winecoreaudio.drv/coreaudio.c
+++ b/dlls/winecoreaudio.drv/coreaudio.c
@@ -1002,6 +1002,7 @@ static NTSTATUS unix_is_format_supported(void *args)
     AudioStreamBasicDescription dev_desc;
     AudioConverterRef converter;
     AudioComponentInstance unit;
+    const AudioDeviceID dev_id = strtoul(params->device, NULL, 10);

params->result = S_OK;

@@ -1031,7 +1032,7 @@ static NTSTATUS unix_is_format_supported(void *args)
         params->result = AUDCLNT_E_UNSUPPORTED_FORMAT;
         return STATUS_SUCCESS;
     }
-    unit = get_audiounit(params->flow, params->dev_id);
+    unit = get_audiounit(params->flow, dev_id);

converter = NULL;
     params->result = ca_setup_audiounit(params->flow, unit, params->fmt_in, &dev_desc, &converter);
@@ -1047,7 +1048,7 @@ unsupported:
         struct get_mix_format_params get_mix_params =
         {
             .flow = params->flow,
-            .dev_id = params->dev_id,
+            .dev_id = dev_id,
             .fmt = params->fmt_out,
         };

@@ -1797,8 +1798,8 @@ static NTSTATUS unix_wow64_is_format_supported(void *args)
 {
     struct
     {
+        PTR32 device;
         EDataFlow flow;
-        DWORD dev_id;
         AUDCLNT_SHAREMODE share;
         PTR32 fmt_in;
         PTR32 fmt_out;
@@ -1806,8 +1807,8 @@ static NTSTATUS unix_wow64_is_format_supported(void *args)
     } *params32 = args;
     struct is_format_supported_params params =
     {
+        .device = ULongToPtr(params32->device),
         .flow = params32->flow,
-        .dev_id = params32->dev_id,
         .share = params32->share,
         .fmt_in = ULongToPtr(params32->fmt_in),
         .fmt_out = ULongToPtr(params32->fmt_out)
diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index 76502e2f177..790665842b1 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -857,7 +857,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface,
     TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx);
     if(pwfx) dump_fmt(pwfx);

-    params.dev_id = This->dev_id;
+    params.device = This->dev_name;
     params.flow = This->dataflow;
     params.share = mode;
     params.fmt_in = pwfx;
diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h
index 4e4a334c39d..d11ac670e5f 100644
--- a/dlls/winecoreaudio.drv/unixlib.h
+++ b/dlls/winecoreaudio.drv/unixlib.h
@@ -121,8 +121,8 @@ struct get_mix_format_params

struct is_format_supported_params
 {
+    const char *device;
     EDataFlow flow;
-    DWORD dev_id;
     AUDCLNT_SHAREMODE share;
     const WAVEFORMATEX *fmt_in;
     WAVEFORMATEXTENSIBLE *fmt_out;