[PATCH 7/8] winegstreamer: Make the wg_parser_stream_get_preferred_format_params structure WoW64-compatible.

Zebediah Figura zfigura at codeweavers.com
Fri Dec 10 14:52:17 CST 2021


Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 dlls/winegstreamer/main.c      | 2 +-
 dlls/winegstreamer/unixlib.h   | 2 +-
 dlls/winegstreamer/wg_parser.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index b989b980ebb..b5c1f8c121a 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -180,10 +180,10 @@ void wg_parser_stream_get_preferred_format(wg_parser_stream_t stream, struct wg_
     struct wg_parser_stream_get_preferred_format_params params =
     {
         .stream = stream,
-        .format = format,
     };
 
     __wine_unix_call(unix_handle, unix_wg_parser_stream_get_preferred_format, &params);
+    *format = params.format;
 }
 
 void wg_parser_stream_enable(wg_parser_stream_t stream, const struct wg_format *format)
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index fc3bd857b18..453cb3a1e20 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -193,7 +193,7 @@ struct wg_parser_get_stream_params
 struct wg_parser_stream_get_preferred_format_params
 {
     wg_parser_stream_t stream;
-    struct wg_format *format;
+    struct wg_format format;
 };
 
 struct wg_parser_stream_enable_params
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 7e93b6e1275..df6586a493c 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -622,10 +622,10 @@ static NTSTATUS wg_parser_push_data(void *args)
 
 static NTSTATUS wg_parser_stream_get_preferred_format(void *args)
 {
-    const struct wg_parser_stream_get_preferred_format_params *params = args;
+    struct wg_parser_stream_get_preferred_format_params *params = args;
     struct wg_parser_stream *stream = get_wg_parser_stream(params->stream);
 
-    *params->format = stream->preferred_format;
+    params->format = stream->preferred_format;
     return S_OK;
 }
 
-- 
2.34.1




More information about the wine-devel mailing list