Skip to content

W
wine-cw
Commit 64828b75 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

rpcrt4: Fix the stack offset for the old format stubless code when an object's…

rpcrt4: Fix the stack offset for the old format stubless code when an object's method is being called.
parent c350e000
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 6 deletions
dlls/rpcrt4/ndr_stubless.c
View file @ 64828b75
......@@ -834,15 +834,19 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma
{
NDR_PARAM_OI_BASETYPE * pParam =
(NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset];
unsigned char * pArg = ARG_FROM_OFFSET(stubMsg, current_stack_offset);
/* note: current_stack_offset starts after the This pointer
* if present, so adjust this */
unsigned short current_stack_offset_adjusted = current_stack_offset +
((pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) ? sizeof(void *) : 0);
unsigned char * pArg = ARG_FROM_OFFSET(stubMsg, current_stack_offset_adjusted);
/* no more parameters; exit loop */
if (current_stack_offset > stack_size)
if (current_stack_offset_adjusted >= stack_size)
break;
TRACE("param[%d]: old format\n", i);
TRACE("\tparam_direction: %x\n", pParam->param_direction);
TRACE("\tstack_offset: 0x%x\n", current_stack_offset);
TRACE("\tstack_offset: 0x%x\n", current_stack_offset_adjusted);
TRACE("\tmemory addr (before): %p\n", pArg);
if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE ||
......@@ -1420,13 +1424,19 @@ long WINAPI NdrStubCall2(
{
NDR_PARAM_OI_BASETYPE *pParam =
(NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset];
unsigned char *pArg = (unsigned char *)(args+current_stack_offset);
/* note: current_stack_offset starts after the This pointer
* if present, so adjust this */
unsigned short current_stack_offset_adjusted = current_stack_offset +
((pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) ? sizeof(void *) : 0);
unsigned char *pArg = (unsigned char *)(args+current_stack_offset_adjusted);
/* no more parameters; exit loop */
if (current_stack_offset > stack_size)
if (current_stack_offset_adjusted >= stack_size)
break;
TRACE("param[%d]: old format\n\tparam_direction: 0x%x\n", i, pParam->param_direction);
TRACE("param[%d]: old format\n", i);
TRACE("\tparam_direction: 0x%x\n", pParam->param_direction);
TRACE("\tstack_offset: %x\n", current_stack_offset_adjusted);
if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE ||
pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment