[PATCH 0/1] MR6479: winemac: Marshal user-mode callback pointers in macdrv_init wow64 thunk.

[Brendan Shanks (＠bshanks)]

Fixes regression from 138d1991253eed9784d8a65f3b407c81981ec191.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6479

[PATCH 1/1] winemac: Marshal user-mode callback pointers in macdrv_init wow64 thunk.

[Brendan Shanks]

From: Brendan Shanks <bshanks(a)codeweavers.com>

Fixes regression from 138d1991253eed9784d8a65f3b407c81981ec191.
---
 dlls/winemac.drv/macdrv_main.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c
index ea556aef68d..d26ac73b6b5 100644
--- a/dlls/winemac.drv/macdrv_main.c
+++ b/dlls/winemac.drv/macdrv_main.c
@@ -651,10 +651,20 @@ static NTSTATUS wow64_init(void *arg)
     struct
     {
         ULONG strings;
+        UINT64 app_icon_callback;
+        UINT64 app_quit_request_callback;
+        UINT64 dnd_query_drag_callback;
+        UINT64 dnd_query_drop_callback;
+        UINT64 dnd_query_exited_callback;
     } *params32 = arg;
     struct init_params params;
 
     params.strings = UlongToPtr(params32->strings);
+    params.app_icon_callback = params32->app_icon_callback;
+    params.app_quit_request_callback = params32->app_quit_request_callback;
+    params.dnd_query_drag_callback = params32->dnd_query_drag_callback;
+    params.dnd_query_drop_callback = params32->dnd_query_drop_callback;
+    params.dnd_query_exited_callback = params32->dnd_query_exited_callback;
     return macdrv_init(¶ms);
 }
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6479