[PATCH 5/8] winegstreamer: Make the wg_parser_stream_get_event_params structure WoW64-compatible.

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


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

diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 10f71e6c303..ae186e967c4 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -212,10 +212,12 @@ bool wg_parser_stream_get_event(wg_parser_stream_t stream, struct wg_parser_even
     struct wg_parser_stream_get_event_params params =
     {
         .stream = stream,
-        .event = event,
     };
 
-    return !__wine_unix_call(unix_handle, unix_wg_parser_stream_get_event, &params);
+    if (__wine_unix_call(unix_handle, unix_wg_parser_stream_get_event, &params) != S_OK)
+        return false;
+    *event = params.event;
+    return true;
 }
 
 bool wg_parser_stream_copy_buffer(wg_parser_stream_t stream,
diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index 01004aaffc7..4547ece2337 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -210,7 +210,7 @@ struct wg_parser_stream_disable_params
 struct wg_parser_stream_get_event_params
 {
     wg_parser_stream_t stream;
-    struct wg_parser_event *event;
+    struct wg_parser_event event;
 };
 
 struct wg_parser_stream_copy_buffer_params
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index e661ea9bee9..1d287c76da2 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -679,7 +679,7 @@ static NTSTATUS wg_parser_stream_disable(void *args)
 
 static NTSTATUS wg_parser_stream_get_event(void *args)
 {
-    const struct wg_parser_stream_get_event_params *params = args;
+    struct wg_parser_stream_get_event_params *params = args;
     struct wg_parser_stream *stream = get_wg_parser_stream(params->stream);
     struct wg_parser *parser = stream->parser;
 
@@ -695,7 +695,7 @@ static NTSTATUS wg_parser_stream_get_event(void *args)
         return VFW_E_WRONG_STATE;
     }
 
-    *params->event = stream->event;
+    params->event = stream->event;
 
     if (stream->event.type != WG_PARSER_EVENT_BUFFER)
     {
-- 
2.34.1




More information about the wine-devel mailing list