Alexandre Julliard : rpcrt4: Implement NdrClientCall3 in assembly on all platforms.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 19548ad5124593daaa43ca351b5c9f02ee2e2bd2
URL:    https://gitlab.winehq.org/wine/wine/-/commit/19548ad5124593daaa43ca351b5c9f0...

Author: Alexandre Julliard 
Date:   Wed Apr 17 13:04:13 2024 +0200

rpcrt4: Implement NdrClientCall3 in assembly on all platforms.

---

dlls/rpcrt4/ndr_stubless.c | 54 +++++++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index f87817f7fd1..0642cf77751 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -2291,37 +2291,47 @@ LONG_PTR CDECL ndr64_client_call( MIDL_STUBLESS_PROXY_INFO *info,
     return 0;
 }

-#ifdef __x86_64__
-
+#ifdef __aarch64__
+__ASM_GLOBAL_FUNC( NdrClientCall3,
+                   "stp x29, x30, [sp, #-0x40]!\n\t"
+                   ".seh_save_fplr_x 0x40\n\t"
+                   ".seh_endprologue\n\t"
+                   "str x3, [sp, #0x18]\n\t"
+                   "stp x4, x5, [sp, #0x20]\n\t"
+                   "stp x6, x7, [sp, #0x30]\n\t"
+                   "add x3, sp, #0x18\n\t"   /* stack */
+                   "mov x4, #0\n\t"          /* fpu_stack */
+                   "bl ndr64_client_call\n\t"
+                   "ldp x29, x30, [sp], #0x40\n\t"
+                   "ret" )
+#elif defined(__arm64ec__)
+CLIENT_CALL_RETURN __attribute__((naked)) NdrClientCall3( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... )
+{
+    asm( ".seh_proc "#NdrClientCall3"\n\t"
+         "stp x29, x30, [sp, #-0x10]!\n\t"
+         ".seh_save_fplr_x 0x10\n\t"
+         ".seh_endprologue\n\t"
+         "str x3, [x4, #-0x8]!\n\t"
+         "mov x3, x4\n\t"          /* stack */
+         "mov x4, #0\n\t"          /* fpu_stack */
+         "bl "#ndr64_client_call"\n\t"
+         "ldp x29, x30, [sp], #0x10\n\t"
+         "ret\n\t"
+         ".seh_endproc" );
+}
+#elif defined(__x86_64__)
 __ASM_GLOBAL_FUNC( NdrClientCall3,
                    "subq $0x28,%rsp\n\t"
                    __ASM_SEH(".seh_stackalloc 0x28\n\t")
                    __ASM_SEH(".seh_endprologue\n\t")
                    __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t")
                    "movq %r9,0x48(%rsp)\n\t"
-                   "leaq 0x48(%rsp),%r9\n\t"
-                   "movq $0,0x20(%rsp)\n\t"
+                   "leaq 0x48(%rsp),%r9\n\t" /* stack */
+                   "movq $0,0x20(%rsp)\n\t"  /* fpu_stack */
                    "call " __ASM_NAME("ndr64_client_call") "\n\t"
                    "addq $0x28,%rsp\n\t"
                    __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t")
-                   "ret" );
-
-#elif defined(_WIN64)
-
-/***********************************************************************
- *            NdrClientCall3 [RPCRT4.@]
- */
-CLIENT_CALL_RETURN WINAPIV NdrClientCall3( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... )
-{
-    va_list args;
-    LONG_PTR ret;
-
-    va_start( args, retval );
-    ret = ndr64_client_call( info, proc, retval, va_arg( args, void ** ), NULL );
-    va_end( args );
-    return *(CLIENT_CALL_RETURN *)&ret;
-}
-
+                   "ret" )
 #endif

LONG_PTR CDECL ndr64_async_client_call( MIDL_STUBLESS_PROXY_INFO *info,