rpcrt4: Move the full pointer table init to after a potential call to NdrServerInitializeNew().
This commit is contained in:
parent
31a5f31127
commit
da86e727bd
|
@ -1299,10 +1299,6 @@ LONG WINAPI NdrStubCall2(
|
||||||
|
|
||||||
TRACE("NDR Version: 0x%x\n", pStubDesc->Version);
|
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)
|
if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS)
|
||||||
{
|
{
|
||||||
const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0];
|
const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0];
|
||||||
|
@ -1377,6 +1373,10 @@ LONG WINAPI NdrStubCall2(
|
||||||
else
|
else
|
||||||
NdrServerInitializeNew(pRpcMsg, &stubMsg, pStubDesc);
|
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 */
|
/* store the RPC flags away */
|
||||||
if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS)
|
if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS)
|
||||||
pRpcMsg->RpcFlags = ((const NDR_PROC_HEADER_RPC *)pProcHeader)->rpc_flags;
|
pRpcMsg->RpcFlags = ((const NDR_PROC_HEADER_RPC *)pProcHeader)->rpc_flags;
|
||||||
|
|
Loading…
Reference in New Issue