Davide Beatrici : wineoss: Adapt "get_position_params" struct to mmdevapi's.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 65796159a62cc0821e04dcf9b4461b304df75fdf
URL:    https://gitlab.winehq.org/wine/wine/-/commit/65796159a62cc0821e04dcf9b4461b3...

Author: Davide Beatrici 
Date:   Wed Sep  7 05:41:57 2022 +0200

wineoss: Adapt "get_position_params" struct to mmdevapi's.

---

dlls/wineoss.drv/mmdevdrv.c | 3 ++-
 dlls/wineoss.drv/oss.c      | 8 +++++---
 dlls/wineoss.drv/unixlib.h  | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 7185be958fe..1b081e171b3 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -1432,7 +1432,8 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos,
         return E_POINTER;

params.stream = This->stream;
-    params.position = pos;
+    params.device = FALSE;
+    params.pos = pos;
     params.qpctime = qpctime;
     OSS_CALL(get_position, &params);

diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c
index 36597e3da84..62016f8fe58 100644
--- a/dlls/wineoss.drv/oss.c
+++ b/dlls/wineoss.drv/oss.c
@@ -1311,7 +1311,7 @@ static NTSTATUS oss_get_position(void *args)
 {
     struct get_position_params *params = args;
     struct oss_stream *stream = handle_get_stream(params->stream);
-    UINT64 *pos = params->position, *qpctime = params->qpctime;
+    UINT64 *pos = params->pos, *qpctime = params->qpctime;

oss_lock(stream);

@@ -1928,14 +1928,16 @@ static NTSTATUS oss_wow64_get_position(void *args)
     struct
     {
         stream_handle stream;
+        BOOL device;
         HRESULT result;
-        PTR32 position;
+        PTR32 pos;
         PTR32 qpctime;
     } *params32 = args;
     struct get_position_params params =
     {
         .stream = params32->stream,
-        .position = ULongToPtr(params32->position),
+        .device = params32->device,
+        .pos = ULongToPtr(params32->pos),
         .qpctime = ULongToPtr(params32->qpctime)
     };
     oss_get_position(&params);
diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h
index ef72bfe71c8..2bd6e182d82 100644
--- a/dlls/wineoss.drv/unixlib.h
+++ b/dlls/wineoss.drv/unixlib.h
@@ -186,8 +186,9 @@ struct get_frequency_params
 struct get_position_params
 {
     stream_handle stream;
+    BOOL device;
     HRESULT result;
-    UINT64 *position;
+    UINT64 *pos;
     UINT64 *qpctime;
 };