Skip to content

W
wine-winehq
Commit 686b8455 authored by Greg Turner's avatar Greg Turner Committed by Alexandre Julliard
Browse files
Options

Use the msvc way to return a struct, fixing wierd problems.

parent b5960a17
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
dlls/rpcrt4/ndr_stubless.c
View file @ 686b8455
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
LONG_PTR RPCRT4_NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, va_list args) LONG_PTR /* CLIENT_CALL_RETURN */ RPCRT4_NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, va_list args)
{ {
FIXME("(%p,%p,...)\n", pStubDesc, pFormat); FIXME("(%p,%p,...)\n", pStubDesc, pFormat);
return 0; return 0;
...@@ -48,17 +48,16 @@ LONG_PTR RPCRT4_NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat ...@@ -48,17 +48,16 @@ LONG_PTR RPCRT4_NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat
/*********************************************************************** /***********************************************************************
* NdrClientCall2 [RPCRT4.@] * NdrClientCall2 [RPCRT4.@]
*/ */
CLIENT_CALL_RETURN WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, LONG_PTR /* CLIENT_CALL_RETURN */ WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc,
PFORMAT_STRING pFormat, PFORMAT_STRING pFormat, ...)
...)
{ {
CLIENT_CALL_RETURN ret; LONG_PTR ret;
va_list args; va_list args;
TRACE("(%p,%p,...)\n", pStubDesc, pFormat); TRACE("(%p,%p,...)\n", pStubDesc, pFormat);
va_start(args, pFormat); va_start(args, pFormat);
ret = (CLIENT_CALL_RETURN)RPCRT4_NdrClientCall2(pStubDesc, pFormat, args); ret = RPCRT4_NdrClientCall2(pStubDesc, pFormat, args);
va_end(args); va_end(args);
return ret; return ret;
} }
include/rpcndr.h
View file @ 686b8455
...@@ -276,9 +276,9 @@ RPCRTAPI void RPC_ENTRY ...@@ -276,9 +276,9 @@ RPCRTAPI void RPC_ENTRY
RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY
NdrConvert( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ); NdrConvert( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat );
CLIENT_CALL_RETURN RPC_VAR_ENTRY LONG_PTR /* CLIENT_CALL_RETURN */ RPC_VAR_ENTRY
NdrClientCall2( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); NdrClientCall2( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... );
CLIENT_CALL_RETURN RPC_VAR_ENTRY LONG_PTR /* CLIENT_CALL_RETURN */ RPC_VAR_ENTRY
NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... );
RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY
......
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