Huw Davies : rpcrt4: Move the full pointer table init to after a potential call to NdrServerInitializeNew ().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: da86e727bd9e5bb3be00445afa51aca765d4f845
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=da86e727bd9e5bb3be00445afa...

Author: Huw Davies 
Date:   Mon Oct 26 11:33:39 2009 +0000

rpcrt4: Move the full pointer table init to after a potential call to NdrServerInitializeNew().

---

dlls/rpcrt4/ndr_stubless.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index 8cb5f2b..8150238 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -1299,10 +1299,6 @@ LONG WINAPI NdrStubCall2(

TRACE("NDR Version: 0x%x\n", pStubDesc->Version);

-    /* create the full pointer translation tables, if requested */
-    if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR)
-        stubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,XLAT_SERVER);
-
     if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS)
     {
         const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0];
@@ -1377,6 +1373,10 @@ LONG WINAPI NdrStubCall2(
     else
         NdrServerInitializeNew(pRpcMsg, &stubMsg, pStubDesc);

+    /* create the full pointer translation tables, if requested */
+    if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR)
+        stubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,XLAT_SERVER);
+
     /* store the RPC flags away */
     if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS)
         pRpcMsg->RpcFlags = ((const NDR_PROC_HEADER_RPC *)pProcHeader)->rpc_flags;