>From 9d181bfee27524033e9e19d288cdc42f2a7dfec6 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thfabba@gmx.de>
Date: Sat, 22 Sep 2012 12:38:11 +0200
Subject: rpcrt4: Match MSVC version of call_server_func with GCC.

---
 dlls/rpcrt4/ndr_stubless.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index db41a1a..d7a81bd 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -990,11 +990,12 @@ __declspec(naked) LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigne
     __asm
     {
         push ebp
+        mov ebp, esp
         push edi            ; Save registers
         push esi
-        mov ebp, esp
         mov eax, [ebp+16]   ; Get stack size
         sub esp, eax        ; Make room in stack for arguments
+        and esp, 0xFFFFFFF0
         mov edi, esp
         mov ecx, eax
         mov esi, [ebp+12]
-- 
1.7.11.msysgit.1

