Commit 1c632ffe authored by Alexandre Julliard's avatar Alexandre Julliard

rpcrt4: Fix handling of complex types of return values on the server side.

parent 4b12e9c5
...@@ -1078,10 +1078,6 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, ...@@ -1078,10 +1078,6 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg,
TRACE("\tbase type: 0x%02x\n", *pTypeFormat); TRACE("\tbase type: 0x%02x\n", *pTypeFormat);
/* make a note of the address of the return value parameter for later */
if (pParam->param_attributes.IsReturn)
retval_ptr = (LONG_PTR *)pArg;
switch (phase) switch (phase)
{ {
case STUBLESS_MARSHAL: case STUBLESS_MARSHAL:
...@@ -1222,6 +1218,9 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, ...@@ -1222,6 +1218,9 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg,
current_offset += sizeof(NDR_PARAM_OIF_OTHER); current_offset += sizeof(NDR_PARAM_OIF_OTHER);
} }
TRACE("\tmemory addr (after): %p -> %p\n", pArg, *(unsigned char **)pArg); TRACE("\tmemory addr (after): %p -> %p\n", pArg, *(unsigned char **)pArg);
/* make a note of the address of the return value parameter for later */
if (pParam->param_attributes.IsReturn) retval_ptr = (LONG_PTR *)pArg;
} }
return retval_ptr; return retval_ptr;
......
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