rpcrt4: Handle absense of RPC flags in call_stubless_func() thunk.

If Oi_HAS_RPCFLAGS is not set, then the stack size is at offset 4, not 8. Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

rpcrt4: Handle absense of RPC flags in call_stubless_func() thunk.
ccb89fc6 · Zebediah Figura · Alexandre Julliard · fb7a8d92 · ccb89fc6
Commit ccb89fc6 authored Oct 05, 2018 by Zebediah Figura Committed by Alexandre Julliard Oct 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

cproxy.c dlls/rpcrt4/cproxy.c +4 -1

No files found.
--- a/dlls/rpcrt4/cproxy.c
+++ b/dlls/rpcrt4/cproxy.c
@@ -79,7 +79,10 @@ __ASM_GLOBAL_FUNC(call_stubless_func,
                  "movl 8(%ecx),%edx\n\t"         /* info->FormatStringOffset */
                  "movzwl (%edx,%eax,2),%edx\n\t" /* FormatStringOffset[index] */
                  "addl 4(%ecx),%edx\n\t"         /* info->ProcFormatString + offset */
-                  "movzwl 8(%edx),%eax\n\t"       /* arguments size */
+                  "movzbl 1(%edx),%eax\n\t"       /* Oi_flags */
+                  "andl $0x08,%eax\n\t"           /* Oi_HAS_RPCFLAGS */
+                  "shrl $1,%eax\n\t"
+                  "movzwl 4(%edx,%eax),%eax\n\t"  /* arguments size */
                  "pushl %eax\n\t"
                  __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t")
                  "leal 8(%esp),%eax\n\t"         /* &This */