Alexandre Julliard : ntdll: Pass an extra context arguments to APC functions on 64-bit.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 72ace07c6ff61c6fd3443acefe82f51ec711f193
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=72ace07c6ff61c6fd3443acef...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Tue May 25 14:08:54 2021 +0200

ntdll: Pass an extra context arguments to APC functions on 64-bit.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ntdll/signal_arm64.c  | 6 +++---
 dlls/ntdll/signal_x86_64.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c
index dc6b072fa6c..1e2d51b9630 100644
--- a/dlls/ntdll/signal_arm64.c
+++ b/dlls/ntdll/signal_arm64.c
@@ -552,10 +552,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte
 /*******************************************************************
  *		KiUserApcDispatcher (NTDLL.@)
  */
-void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1, ULONG_PTR arg2,
-                                 PNTAPCFUNC func )
+void WINAPI KiUserApcDispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3,
+                                 void (CALLBACK *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*) )
 {
-    func( ctx, arg1, arg2 );
+    func( arg1, arg2, arg3, context );
     NtContinue( context, TRUE );
 }
 
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 55975093174..19146aea40b 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -597,10 +597,10 @@ __ASM_GLOBAL_FUNC( KiUserExceptionDispatcher,
 /*******************************************************************
  *		KiUserApcDispatcher (NTDLL.@)
  */
-void WINAPI dispatch_apc( CONTEXT *context, ULONG_PTR ctx, ULONG_PTR arg1, ULONG_PTR arg2,
-                          PNTAPCFUNC func )
+void WINAPI dispatch_apc( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3,
+                          void (CALLBACK *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*) )
 {
-    func( ctx, arg1, arg2 );
+    func( arg1, arg2, arg3, context );
     NtContinue( context, TRUE );
 }