[PATCH 0/9] MR2994: wine{alsa,coreaudio,oss,pulse}: Move AudioClient's SetEventHandle, Reset, Stop, Start into mmdevapi.

[PATCH 1/9] winepulse: Move AudioClient's SetEventHandle, Reset, Stop into mmdevapi.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/mmdevapi/client.c        | 55 ++++++++++++++++++++++++++++++++++
 dlls/winepulse.drv/mmdevdrv.c | 56 +++++------------------------------
 2 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c
index d2d4939bc73..e30e459c6c5 100644
--- a/dlls/mmdevapi/client.c
+++ b/dlls/mmdevapi/client.c
@@ -196,6 +196,61 @@ const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =
     capture_GetNextPacketSize
 };

+HRESULT WINAPI client_Stop(IAudioClient3 *iface)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct stop_params params;
+
+    TRACE("(%p)\n", This);
+
+    if (!This->stream)
+        return AUDCLNT_E_NOT_INITIALIZED;
+
+    params.stream = This->stream;
+
+    WINE_UNIX_CALL(stop, &params);
+
+    return params.result;
+}
+
+HRESULT WINAPI client_Reset(IAudioClient3 *iface)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct reset_params params;
+
+    TRACE("(%p)\n", This);
+
+    if (!This->stream)
+        return AUDCLNT_E_NOT_INITIALIZED;
+
+    params.stream = This->stream;
+
+    WINE_UNIX_CALL(reset, &params);
+
+    return params.result;
+}
+
+HRESULT WINAPI client_SetEventHandle(IAudioClient3 *iface, HANDLE event)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct set_event_handle_params params;
+
+    TRACE("(%p)->(%p)\n", This, event);
+
+    if (!event)
+        return E_INVALIDARG;
+
+    if (!This->stream)
+        return AUDCLNT_E_NOT_INITIALIZED;
+
+    params.stream = This->stream;
+    params.event  = event;
+
+    WINE_UNIX_CALL(set_event_handle, &params);
+
+    return params.result;
+}
+
 HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, void **ppv)
 {
     struct audio_client *This = impl_from_IAudioClient3(iface);
diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index 19d4bd41c7a..64b399f2a2b 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -972,54 +972,12 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
     return S_OK;
 }

-static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct stop_params params;
+extern HRESULT WINAPI client_Stop(IAudioClient3 *iface);

-    TRACE("(%p)\n", This);
+extern HRESULT WINAPI client_Reset(IAudioClient3 *iface);

-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    pulse_call(stop, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct reset_params params;
-
-    TRACE("(%p)\n", This);
-
-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    pulse_call(reset, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface,
-        HANDLE event)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct set_event_handle_params params;
-
-    TRACE("(%p)->(%p)\n", This, event);
-
-    if (!event)
-        return E_INVALIDARG;
-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.event  = event;
-    pulse_call(set_event_handle, &params);
-    return params.result;
-}
+extern HRESULT WINAPI client_SetEventHandle(IAudioClient3 *iface,
+        HANDLE event);

extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid,
         void **ppv);
@@ -1058,9 +1016,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
     AudioClient_GetMixFormat,
     AudioClient_GetDevicePeriod,
     AudioClient_Start,
-    AudioClient_Stop,
-    AudioClient_Reset,
-    AudioClient_SetEventHandle,
+    client_Stop,
+    client_Reset,
+    client_SetEventHandle,
     client_GetService,
     client_IsOffloadCapable,
     client_SetClientProperties,

[PATCH 2/9] winealsa: Use mmdevapi's AudioClient's SetEventHandle, Reset, Stop.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winealsa.drv/mmdevdrv.c | 63 ++++--------------------------------
 1 file changed, 7 insertions(+), 56 deletions(-)

diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index b96eba1e0fe..7c2a3d2d9d3 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -839,61 +839,12 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
     return params.result;
 }

-static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct stop_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-
-    ALSA_CALL(stop, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct reset_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-
-    ALSA_CALL(reset, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface,
-        HANDLE event)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct set_event_handle_params params;
+extern HRESULT WINAPI client_Stop(IAudioClient3 *iface);

-    TRACE("(%p)->(%p)\n", This, event);
+extern HRESULT WINAPI client_Reset(IAudioClient3 *iface);

-    if(!event)
-        return E_INVALIDARG;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.event = event;
-
-    ALSA_CALL(set_event_handle, &params);
-
-    return params.result;
-}
+extern HRESULT WINAPI client_SetEventHandle(IAudioClient3 *iface,
+        HANDLE event);

extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid,
         void **ppv);
@@ -932,9 +883,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
     AudioClient_GetMixFormat,
     AudioClient_GetDevicePeriod,
     AudioClient_Start,
-    AudioClient_Stop,
-    AudioClient_Reset,
-    AudioClient_SetEventHandle,
+    client_Stop,
+    client_Reset,
+    client_SetEventHandle,
     client_GetService,
     client_IsOffloadCapable,
     client_SetClientProperties,

[PATCH 3/9] winecoreaudio: Use mmdevapi's AudioClient's SetEventHandle, Reset, Stop.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winecoreaudio.drv/mmdevdrv.c | 57 ++++---------------------------
 1 file changed, 7 insertions(+), 50 deletions(-)

diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index dcd712c7c7a..3c3d9b0b1ac 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -811,55 +811,12 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
     return S_OK;
 }

-static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct stop_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    UNIX_CALL(stop, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct reset_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    UNIX_CALL(reset, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface,
-        HANDLE event)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct set_event_handle_params params;
+extern HRESULT WINAPI client_Stop(IAudioClient3 *iface);

-    TRACE("(%p)->(%p)\n", This, event);
+extern HRESULT WINAPI client_Reset(IAudioClient3 *iface);

-    if(!event)
-        return E_INVALIDARG;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.event = event;
-    UNIX_CALL(set_event_handle, &params);
-    return params.result;
-}
+extern HRESULT WINAPI client_SetEventHandle(IAudioClient3 *iface,
+        HANDLE event);

extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid,
         void **ppv);
@@ -898,9 +855,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
     AudioClient_GetMixFormat,
     AudioClient_GetDevicePeriod,
     AudioClient_Start,
-    AudioClient_Stop,
-    AudioClient_Reset,
-    AudioClient_SetEventHandle,
+    client_Stop,
+    client_Reset,
+    client_SetEventHandle,
     client_GetService,
     client_IsOffloadCapable,
     client_SetClientProperties,

[PATCH 4/9] wineoss: Use mmdevapi's AudioClient's SetEventHandle, Reset, Stop.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/wineoss.drv/mmdevdrv.c | 60 +++++--------------------------------
 1 file changed, 7 insertions(+), 53 deletions(-)

diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 188bf37aac9..4864c9bf86f 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -805,58 +805,12 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
     return params.result;
 }

-static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct stop_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
+extern HRESULT WINAPI client_Stop(IAudioClient3 *iface);

-    params.stream = This->stream;
-    OSS_CALL(stop, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct reset_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
+extern HRESULT WINAPI client_Reset(IAudioClient3 *iface);

-    params.stream = This->stream;
-    OSS_CALL(reset, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface,
-        HANDLE event)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct set_event_handle_params params;
-
-    TRACE("(%p)->(%p)\n", This, event);
-
-    if(!event)
-        return E_INVALIDARG;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.event = event;
-    OSS_CALL(set_event_handle, &params);
-
-    return params.result;
-}
+extern HRESULT WINAPI client_SetEventHandle(IAudioClient3 *iface,
+        HANDLE event);

extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid,
         void **ppv);
@@ -895,9 +849,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
     AudioClient_GetMixFormat,
     AudioClient_GetDevicePeriod,
     AudioClient_Start,
-    AudioClient_Stop,
-    AudioClient_Reset,
-    AudioClient_SetEventHandle,
+    client_Stop,
+    client_Reset,
+    client_SetEventHandle,
     client_GetService,
     client_IsOffloadCapable,
     client_SetClientProperties,

[PATCH 5/9] winepulse: Lock sessions and handle CreateThread failure in AudioClient's Start.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winepulse.drv/mmdevdrv.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index 64b399f2a2b..1a358af660f 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -952,24 +952,32 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
 {
     ACImpl *This = impl_from_IAudioClient3(iface);
     struct start_params params;
-    HRESULT hr;

TRACE("(%p)\n", This);

-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
+    sessions_lock();
+
+    if (!This->stream) {
+        params.result = AUDCLNT_E_NOT_INITIALIZED;
+        goto exit;
+    }

params.stream = This->stream;
-    pulse_call(start, &params);
-    if (FAILED(hr = params.result))
-        return hr;

-    if (!This->timer_thread) {
-        This->timer_thread = CreateThread(NULL, 0, pulse_timer_cb, This, 0, NULL);
+    WINE_UNIX_CALL(start, &params);
+
+    if (SUCCEEDED(params.result) && !This->timer_thread) {
+        if (!(This->timer_thread = CreateThread(NULL, 0, pulse_timer_cb, This, 0, NULL))) {
+            params.result = E_FAIL;
+            goto exit;
+        }
+
         SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
     }
+exit:
+    sessions_unlock();

-    return S_OK;
+    return params.result;
 }

extern HRESULT WINAPI client_Stop(IAudioClient3 *iface);

[PATCH 6/9] winepulse: Move AudioClient's Start into mmdevapi.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/mmdevapi/client.c        | 46 +++++++++++++++++++++++++++++++++++
 dlls/winepulse.drv/mmdevdrv.c | 44 ++-------------------------------
 2 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c
index e30e459c6c5..9e96236bc90 100644
--- a/dlls/mmdevapi/client.c
+++ b/dlls/mmdevapi/client.c
@@ -80,6 +80,20 @@ static inline struct audio_client *impl_from_IAudioStreamVolume(IAudioStreamVolu
     return CONTAINING_RECORD(iface, struct audio_client, IAudioStreamVolume_iface);
 }

+static DWORD CALLBACK timer_loop_func(void *user)
+{
+    struct timer_loop_params params;
+    struct audio_client *This = user;
+
+    SetThreadDescription(GetCurrentThread(), L"audio_client_timer");
+
+    params.stream = This->stream;
+
+    WINE_UNIX_CALL(timer_loop, &params);
+
+    return 0;
+}
+
 static HRESULT WINAPI capture_QueryInterface(IAudioCaptureClient *iface, REFIID riid, void **ppv)
 {
     struct audio_client *This = impl_from_IAudioCaptureClient(iface);
@@ -196,6 +210,38 @@ const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =
     capture_GetNextPacketSize
 };

+HRESULT WINAPI client_Start(IAudioClient3 *iface)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct start_params params;
+
+    TRACE("(%p)\n", This);
+
+    sessions_lock();
+
+    if (!This->stream) {
+        params.result = AUDCLNT_E_NOT_INITIALIZED;
+        goto exit;
+    }
+
+    params.stream = This->stream;
+
+    WINE_UNIX_CALL(start, &params);
+
+    if (SUCCEEDED(params.result) && !This->timer_thread) {
+        if (!(This->timer_thread = CreateThread(NULL, 0, timer_loop_func, This, 0, NULL))) {
+            params.result = E_FAIL;
+            goto exit;
+        }
+
+        SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
+    }
+exit:
+    sessions_unlock();
+
+    return params.result;
+}
+
 HRESULT WINAPI client_Stop(IAudioClient3 *iface)
 {
     struct audio_client *This = impl_from_IAudioClient3(iface);
diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index 1a358af660f..b8b0eff3116 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -275,16 +275,6 @@ static WCHAR *get_application_name(BOOL query_app_name)
     return wcsdup(name);
 }

-static DWORD WINAPI pulse_timer_cb(void *user)
-{
-    struct timer_loop_params params;
-    ACImpl *This = user;
-    params.stream = This->stream;
-    SetThreadDescription(GetCurrentThread(), L"winepulse_timer_loop");
-    pulse_call(timer_loop, &params);
-    return 0;
-}
-
 static void set_stream_volumes(ACImpl *This)
 {
     struct set_volumes_params params;
@@ -948,37 +938,7 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface,
     return params.result;
 }

-static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct start_params params;
-
-    TRACE("(%p)\n", This);
-
-    sessions_lock();
-
-    if (!This->stream) {
-        params.result = AUDCLNT_E_NOT_INITIALIZED;
-        goto exit;
-    }
-
-    params.stream = This->stream;
-
-    WINE_UNIX_CALL(start, &params);
-
-    if (SUCCEEDED(params.result) && !This->timer_thread) {
-        if (!(This->timer_thread = CreateThread(NULL, 0, pulse_timer_cb, This, 0, NULL))) {
-            params.result = E_FAIL;
-            goto exit;
-        }
-
-        SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
-    }
-exit:
-    sessions_unlock();
-
-    return params.result;
-}
+extern HRESULT WINAPI client_Start(IAudioClient3 *iface);

extern HRESULT WINAPI client_Stop(IAudioClient3 *iface);

@@ -1023,7 +983,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
     AudioClient_IsFormatSupported,
     AudioClient_GetMixFormat,
     AudioClient_GetDevicePeriod,
-    AudioClient_Start,
+    client_Start,
     client_Stop,
     client_Reset,
     client_SetEventHandle,

[PATCH 7/9] winealsa: Use mmdevapi's AudioClient's Start.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winealsa.drv/mmdevdrv.c | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index 7c2a3d2d9d3..93f05bffa80 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -811,33 +811,7 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface,
     return params.result;
 }

-static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct start_params params;
-
-    TRACE("(%p)\n", This);
-
-    sessions_lock();
-
-    if(!This->stream){
-        sessions_unlock();
-        return AUDCLNT_E_NOT_INITIALIZED;
-    }
-
-    params.stream = This->stream;
-
-    ALSA_CALL(start, &params);
-
-    if(SUCCEEDED(params.result) && !This->timer_thread){
-        This->timer_thread = CreateThread(NULL, 0, alsa_timer_thread, This, 0, NULL);
-        SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
-    }
-
-    sessions_unlock();
-
-    return params.result;
-}
+extern HRESULT WINAPI client_Start(IAudioClient3 *iface);

extern HRESULT WINAPI client_Stop(IAudioClient3 *iface);

@@ -882,7 +856,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
     AudioClient_IsFormatSupported,
     AudioClient_GetMixFormat,
     AudioClient_GetDevicePeriod,
-    AudioClient_Start,
+    client_Start,
     client_Stop,
     client_Reset,
     client_SetEventHandle,

[PATCH 8/9] winecoreaudio: Use mmdevapi's AudioClient's Start.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winecoreaudio.drv/mmdevdrv.c | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index 3c3d9b0b1ac..5885e65deb5 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -787,29 +787,7 @@ static DWORD WINAPI ca_timer_thread(void *user)
     return 0;
 }

-static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct start_params params;
-    HRESULT hr;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    UNIX_CALL(start, &params);
-    if(FAILED(hr = params.result))
-        return hr;
-
-    if(!This->timer_thread) {
-        This->timer_thread = CreateThread(NULL, 0, ca_timer_thread, This, 0, NULL);
-        SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
-    }
-
-    return S_OK;
-}
+extern HRESULT WINAPI client_Start(IAudioClient3 *iface);

extern HRESULT WINAPI client_Stop(IAudioClient3 *iface);

@@ -854,7 +832,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
     AudioClient_IsFormatSupported,
     AudioClient_GetMixFormat,
     AudioClient_GetDevicePeriod,
-    AudioClient_Start,
+    client_Start,
     client_Stop,
     client_Reset,
     client_SetEventHandle,

[PATCH 9/9] wineoss: Use mmdevapi's AudioClient's Start.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/wineoss.drv/mmdevdrv.c | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 4864c9bf86f..da3b8eaae5e 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -778,32 +778,7 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface,
     return params.result;
 }

-static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct start_params params;
-
-    TRACE("(%p)\n", This);
-
-    sessions_lock();
-
-    if(!This->stream){
-        sessions_unlock();
-        return AUDCLNT_E_NOT_INITIALIZED;
-    }
-
-    params.stream = This->stream;
-    OSS_CALL(start, &params);
-
-    if(SUCCEEDED(params.result) && !This->timer_thread){
-        This->timer_thread = CreateThread(NULL, 0, timer_thread, This, 0, NULL);
-        SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
-    }
-
-    sessions_unlock();
-
-    return params.result;
-}
+extern HRESULT WINAPI client_Start(IAudioClient3 *iface);

extern HRESULT WINAPI client_Stop(IAudioClient3 *iface);

@@ -848,7 +823,7 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
     AudioClient_IsFormatSupported,
     AudioClient_GetMixFormat,
     AudioClient_GetDevicePeriod,
-    AudioClient_Start,
+    client_Start,
     client_Stop,
     client_Reset,
     client_SetEventHandle,