[PATCH v3 06/12] winecoreaudio: Use create_stream's channel count in AudioClient's Initialize.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winecoreaudio.drv/coreaudio.c |  4 +++-
 dlls/winecoreaudio.drv/mmdevdrv.c  | 13 ++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c
index f41118e62f5..1e712a624cb 100644
--- a/dlls/winecoreaudio.drv/coreaudio.c
+++ b/dlls/winecoreaudio.drv/coreaudio.c
@@ -776,8 +776,10 @@ end:
         if(stream->unit) AudioComponentInstanceDispose(stream->unit);
         free(stream->fmt);
         free(stream);
-    } else
+    } else {
+        *params->channel_count = params->fmt->nChannels;
         *params->stream = (stream_handle)(UINT_PTR)stream;
+    }

return STATUS_SUCCESS;
 }
diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index fc011021d68..f7f72f43d83 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -545,7 +545,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
     ACImpl *This = impl_from_IAudioClient3(iface);
     struct create_stream_params params;
     stream_handle stream;
-    UINT32 i;
+    UINT32 i, channel_count;
     WCHAR *name;

TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags,
@@ -593,7 +593,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
     params.duration = duration;
     params.period = period;
     params.fmt = fmt;
-    params.channel_count = NULL;
+    params.channel_count = &channel_count;
     params.stream = &stream;

UNIX_CALL(create_stream, &params);
@@ -605,18 +605,16 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
         return params.result;
     }

-    This->channel_count = fmt->nChannels;
-
-    This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float));
+    This->vols = HeapAlloc(GetProcessHeap(), 0, channel_count * sizeof(float));
     if(!This->vols){
         params.result = E_OUTOFMEMORY;
         goto end;
     }

-    for(i = 0; i < This->channel_count; ++i)
+    for(i = 0; i < channel_count; ++i)
         This->vols[i] = 1.f;

-    params.result = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session);
+    params.result = get_audio_session(sessionguid, This->parent, channel_count, &This->session);
     if(FAILED(params.result)) goto end;

list_add_tail(&This->session->clients, &This->entry);
@@ -628,6 +626,7 @@ end:
         This->vols = NULL;
     }else{
         This->stream = stream;
+        This->channel_count = channel_count;
         set_stream_volumes(This);
     }