[PATCH v2 1/3] winealsa: Move stream mode and period/duration initialization logic into unixlib.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winealsa.drv/alsa.c     | 36 ++++++++++++++++++++++++++++-
 dlls/winealsa.drv/mmdevdrv.c | 44 ++++--------------------------------
 2 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index 2ac126f411d..6daeead46ec 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -85,6 +85,7 @@ struct alsa_stream
 #define EXTRA_SAFE_RT 40000

static const REFERENCE_TIME def_period = 100000;
+static const REFERENCE_TIME min_period = 50000;

static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\',
     'W','i','n','e','\','D','r','i','v','e','r','s','\',
@@ -789,10 +790,43 @@ static NTSTATUS alsa_create_stream(void *args)
     snd_pcm_sw_params_t *sw_params = NULL;
     snd_pcm_format_t format;
     unsigned int rate, alsa_period_us, i;
-    WAVEFORMATEXTENSIBLE *fmtex;
+    WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE *)params->fmt;
     int err;
     SIZE_T size;

+    /* We don't return early as priority is given to the other errors. */
+    params->result = *params->stream ? AUDCLNT_E_ALREADY_INITIALIZED : S_OK;
+
+    if (params->share == AUDCLNT_SHAREMODE_SHARED) {
+        params->period = def_period;
+        if (params->duration < 3 * params->period)
+            params->duration = 3 * params->period;
+    } else {
+        if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE &&
+           (fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED))
+            params->result = AUDCLNT_E_UNSUPPORTED_FORMAT;
+        else {
+            if (!params->period)
+                params->period = def_period;
+            if (params->period < min_period || params->period > 5000000)
+                params->result = AUDCLNT_E_INVALID_DEVICE_PERIOD;
+            else if (params->duration > 20000000) /* The smaller the period, the lower this limit. */
+                params->result = AUDCLNT_E_BUFFER_SIZE_ERROR;
+            else if (params->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) {
+                if (params->duration != params->period)
+                    params->result = AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL;
+
+                FIXME("EXCLUSIVE mode with EVENTCALLBACK\n");
+
+                params->result = AUDCLNT_E_DEVICE_IN_USE;
+            } else if (params->duration < 8 * params->period)
+                params->duration = 8 * params->period; /* May grow above 2s. */
+        }
+    }
+
+    if (FAILED(params->result))
+        return STATUS_SUCCESS;
+
     stream = calloc(1, sizeof(*stream));
     if(!stream){
         params->result = E_OUTOFMEMORY;
diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index 0126b1357a2..0baf954150e 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -53,9 +53,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(alsa);

#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)

-static const REFERENCE_TIME DefaultPeriod = 100000;
-static const REFERENCE_TIME MinimumPeriod = 50000;
-
 static CRITICAL_SECTION g_sessions_lock;
 static CRITICAL_SECTION_DEBUG g_sessions_lock_debug =
 {
@@ -581,7 +578,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
 {
     ACImpl *This = impl_from_IAudioClient3(iface);
     struct create_stream_params params;
-    stream_handle stream;
     unsigned int i;

TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags,
@@ -607,41 +603,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
         return E_INVALIDARG;
     }

-    if(mode == AUDCLNT_SHAREMODE_SHARED){
-        period = DefaultPeriod;
-        if( duration < 3 * period)
-            duration = 3 * period;
-    }else{
-        if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){
-            if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 ||
-                    ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED)
-                return AUDCLNT_E_UNSUPPORTED_FORMAT;
-        }
-
-        if(!period)
-            period = DefaultPeriod; /* not minimum */
-        if(period < MinimumPeriod || period > 5000000)
-            return AUDCLNT_E_INVALID_DEVICE_PERIOD;
-        if(duration > 20000000) /* the smaller the period, the lower this limit */
-            return AUDCLNT_E_BUFFER_SIZE_ERROR;
-        if(flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK){
-            if(duration != period)
-                return AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL;
-            FIXME("EXCLUSIVE mode with EVENTCALLBACK\n");
-            return AUDCLNT_E_DEVICE_IN_USE;
-        }else{
-            if( duration < 8 * period)
-                duration = 8 * period; /* may grow above 2s */
-        }
-    }
-
     sessions_lock();

-    if(This->stream){
-        sessions_unlock();
-        return AUDCLNT_E_ALREADY_INITIALIZED;
-    }
-
     dump_fmt(fmt);

params.name = NULL;
@@ -653,7 +616,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
     params.period = period;
     params.fmt = fmt;
     params.channel_count = NULL;
-    params.stream = &stream;
+    params.stream = &This->stream;

ALSA_CALL(create_stream, &params);
     if(FAILED(params.result)){
@@ -679,11 +642,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,

exit:
     if(FAILED(params.result)){
-        alsa_stream_release(stream, NULL);
+        alsa_stream_release(This->stream, NULL);
+        This->stream = 0;
+
         HeapFree(GetProcessHeap(), 0, This->vols);
         This->vols = NULL;
     }else{
-        This->stream = stream;
         set_stream_volumes(This);
     }