Skip to content

W
wine-winehq
Commit f45cb125 authored by Mike Hearn's avatar Mike Hearn Committed by Alexandre Julliard
Browse files
Options

Initialize DataRepresentation in NdrClientInitializeNew, not

NdrSendReceive.
parent 599f3e87
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
dlls/rpcrt4/ndr_midl.c
View file @ f45cb125
...@@ -185,6 +185,7 @@ void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE ...@@ -185,6 +185,7 @@ void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE
assert( pRpcMessage && pStubMsg && pStubDesc ); assert( pRpcMessage && pStubMsg && pStubDesc );
memset(pRpcMessage, 0, sizeof(RPC_MESSAGE)); memset(pRpcMessage, 0, sizeof(RPC_MESSAGE));
pRpcMessage->DataRepresentation = NDR_LOCAL_DATA_REPRESENTATION;
/* not everyone allocates stack space for w2kReserved */ /* not everyone allocates stack space for w2kReserved */
memset(pStubMsg, 0, FIELD_OFFSET(MIDL_STUB_MESSAGE,pCSInfo)); memset(pStubMsg, 0, FIELD_OFFSET(MIDL_STUB_MESSAGE,pCSInfo));
...@@ -276,9 +277,6 @@ unsigned char *WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char ...@@ -276,9 +277,6 @@ unsigned char *WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char
return NULL; return NULL;
} }
/* FIXME: Seems wrong. Where should this really come from, and when? */
stubmsg->RpcMsg->DataRepresentation = NDR_LOCAL_DATA_REPRESENTATION;
if (I_RpcSendReceive(stubmsg->RpcMsg) != RPC_S_OK) { if (I_RpcSendReceive(stubmsg->RpcMsg) != RPC_S_OK) {
WARN("I_RpcSendReceive did not return success.\n"); WARN("I_RpcSendReceive did not return success.\n");
/* FIXME: raise exception? */ /* FIXME: raise exception? */
......
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