Skip to content

W
wine-winehq
Commit e26bcb7f authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

rpcrt4: Complex types should be dereferenced an extra time in the old format stubless code.

parent 64828b75
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
dlls/rpcrt4/ndr_stubless.c
View file @ e26bcb7f
...@@ -898,17 +898,17 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma ...@@ -898,17 +898,17 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma
case PROXY_CALCSIZE: case PROXY_CALCSIZE:
if (pParam->param_direction == RPC_FC_IN_PARAM || if (pParam->param_direction == RPC_FC_IN_PARAM ||
pParam->param_direction & RPC_FC_IN_OUT_PARAM) pParam->param_direction & RPC_FC_IN_OUT_PARAM)
call_buffer_sizer(&stubMsg, pArg, pTypeFormat); call_buffer_sizer(&stubMsg, *(unsigned char **)pArg, pTypeFormat);
break; break;
case PROXY_MARSHAL: case PROXY_MARSHAL:
if (pParam->param_direction == RPC_FC_IN_PARAM || if (pParam->param_direction == RPC_FC_IN_PARAM ||
pParam->param_direction & RPC_FC_IN_OUT_PARAM) pParam->param_direction & RPC_FC_IN_OUT_PARAM)
call_marshaller(&stubMsg, pArg, pTypeFormat); call_marshaller(&stubMsg, *(unsigned char **)pArg, pTypeFormat);
break; break;
case PROXY_UNMARSHAL: case PROXY_UNMARSHAL:
if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || if (pParam->param_direction == RPC_FC_IN_OUT_PARAM ||
pParam->param_direction == RPC_FC_OUT_PARAM) pParam->param_direction == RPC_FC_OUT_PARAM)
call_unmarshaller(&stubMsg, &pArg, pTypeFormat, 0); call_unmarshaller(&stubMsg, (unsigned char **)pArg, pTypeFormat, 0);
else if (pParam->param_direction == RPC_FC_RETURN_PARAM) else if (pParam->param_direction == RPC_FC_RETURN_PARAM)
call_unmarshaller(&stubMsg, (unsigned char **)&RetVal, pTypeFormat, 0); call_unmarshaller(&stubMsg, (unsigned char **)&RetVal, pTypeFormat, 0);
break; break;
...@@ -1483,18 +1483,18 @@ long WINAPI NdrStubCall2( ...@@ -1483,18 +1483,18 @@ long WINAPI NdrStubCall2(
if (pParam->param_direction == RPC_FC_OUT_PARAM || if (pParam->param_direction == RPC_FC_OUT_PARAM ||
pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM ||
pParam->param_direction == RPC_FC_RETURN_PARAM) pParam->param_direction == RPC_FC_RETURN_PARAM)
call_marshaller(&stubMsg, pArg, pTypeFormat); call_marshaller(&stubMsg, *(unsigned char **)pArg, pTypeFormat);
break; break;
case STUBLESS_UNMARSHAL: case STUBLESS_UNMARSHAL:
if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || if (pParam->param_direction == RPC_FC_IN_OUT_PARAM ||
pParam->param_direction == RPC_FC_IN_PARAM) pParam->param_direction == RPC_FC_IN_PARAM)
call_unmarshaller(&stubMsg, &pArg, pTypeFormat, 0); call_unmarshaller(&stubMsg, (unsigned char **)pArg, pTypeFormat, 0);
break; break;
case STUBLESS_CALCSIZE: case STUBLESS_CALCSIZE:
if (pParam->param_direction == RPC_FC_OUT_PARAM || if (pParam->param_direction == RPC_FC_OUT_PARAM ||
pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM ||
pParam->param_direction == RPC_FC_RETURN_PARAM) pParam->param_direction == RPC_FC_RETURN_PARAM)
call_buffer_sizer(&stubMsg, pArg, pTypeFormat); call_buffer_sizer(&stubMsg, *(unsigned char **)pArg, pTypeFormat);
break; break;
default: default:
RpcRaiseException(RPC_S_INTERNAL_ERROR); RpcRaiseException(RPC_S_INTERNAL_ERROR);
......
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