Huw Davies : winealsa: Move get_current_padding to the unixlib.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 45f1cbe476b27443d62cb73bb085cb89784b9648
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=45f1cbe476b27443d62cb73bb...

Author: Huw Davies 
Date:   Wed Feb 23 09:08:23 2022 +0000

winealsa: Move get_current_padding to the unixlib.

Signed-off-by: Huw Davies 
Signed-off-by: Andrew Eikum 
Signed-off-by: Alexandre Julliard

---

dlls/winealsa.drv/alsa.c     | 14 ++++++++++++++
 dlls/winealsa.drv/mmdevdrv.c | 12 +++++-------
 dlls/winealsa.drv/unixlib.h  |  8 ++++++++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index c40c87bca31..c73490ebfe6 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -1271,6 +1271,19 @@ static NTSTATUS get_latency(void *args)
     return alsa_unlock_result(stream, &params->result, S_OK);
 }

+static NTSTATUS get_current_padding(void *args)
+{
+    struct get_current_padding_params *params = args;
+    struct alsa_stream *stream = params->stream;
+
+    alsa_lock(stream);
+
+    /* padding is solely updated at callback time in shared mode */
+    *params->padding = stream->held_frames;
+
+    return alsa_unlock_result(stream, &params->result, S_OK);
+}
+
 unixlib_entry_t __wine_unix_call_funcs[] =
 {
     get_endpoint_ids,
@@ -1280,4 +1293,5 @@ unixlib_entry_t __wine_unix_call_funcs[] =
     get_mix_format,
     get_buffer_size,
     get_latency,
+    get_current_padding,
 };
diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index b8fc6802e28..a4ab0e179d1 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -871,7 +871,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface,
         UINT32 *out)
 {
     ACImpl *This = impl_from_IAudioClient3(iface);
-    struct alsa_stream *stream = This->stream;
+    struct get_current_padding_params params;

TRACE("(%p)->(%p)\n", This, out);

@@ -881,16 +881,14 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface,
     if(!This->stream)
         return AUDCLNT_E_NOT_INITIALIZED;

-    alsa_lock(stream);
+    params.stream = This->stream;
+    params.padding = out;

-    /* padding is solely updated at callback time in shared mode */
-    *out = stream->held_frames;
-
-    alsa_unlock(stream);
+    ALSA_CALL(get_current_padding, &params);

TRACE("pad: %u\n", *out);

-    return S_OK;
+    return params.result;
 }

static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface,
diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h
index e51d3d3d510..2484fca8c90 100644
--- a/dlls/winealsa.drv/unixlib.h
+++ b/dlls/winealsa.drv/unixlib.h
@@ -122,6 +122,13 @@ struct get_latency_params
     REFERENCE_TIME *latency;
 };

+struct get_current_padding_params
+{
+    struct alsa_stream *stream;
+    HRESULT result;
+    UINT32 *padding;
+};
+
 enum alsa_funcs
 {
     alsa_get_endpoint_ids,
@@ -131,6 +138,7 @@ enum alsa_funcs
     alsa_get_mix_format,
     alsa_get_buffer_size,
     alsa_get_latency,
+    alsa_get_current_padding,
 };

extern unixlib_handle_t alsa_handle;