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

[Alexandre Julliard]

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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Fri Oct  5 16:44:08 2018 -0500

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 at gmail.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/rpcrt4/cproxy.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c
index 7513b19..71ae560 100644
--- 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 */