From 686b845593172a1c6decbb26f36c7969783f1590 Mon Sep 17 00:00:00 2001 From: Greg Turner Date: Wed, 16 Oct 2002 18:51:11 +0000 Subject: [PATCH] Use the msvc way to return a struct, fixing wierd problems. --- dlls/rpcrt4/ndr_stubless.c | 11 +++++------ include/rpcndr.h | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 5f10bc42ca1..8152a1cee28 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -39,7 +39,7 @@ 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); return 0; @@ -48,17 +48,16 @@ LONG_PTR RPCRT4_NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat /*********************************************************************** * NdrClientCall2 [RPCRT4.@] */ -CLIENT_CALL_RETURN WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, - PFORMAT_STRING pFormat, - ...) +LONG_PTR /* CLIENT_CALL_RETURN */ WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, + PFORMAT_STRING pFormat, ...) { - CLIENT_CALL_RETURN ret; + LONG_PTR ret; va_list args; TRACE("(%p,%p,...)\n", pStubDesc, pFormat); va_start(args, pFormat); - ret = (CLIENT_CALL_RETURN)RPCRT4_NdrClientCall2(pStubDesc, pFormat, args); + ret = RPCRT4_NdrClientCall2(pStubDesc, pFormat, args); va_end(args); return ret; } diff --git a/include/rpcndr.h b/include/rpcndr.h index cf58a82f6f5..f28479238e4 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -276,9 +276,9 @@ RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY 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, ... ); -CLIENT_CALL_RETURN RPC_VAR_ENTRY +LONG_PTR /* CLIENT_CALL_RETURN */ RPC_VAR_ENTRY NdrClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); RPCRTAPI void RPC_ENTRY -- 2.11.4.GIT