Author: jgardou Date: Tue Oct 26 16:01:08 2010 New Revision: 49281
URL: http://svn.reactos.org/svn/reactos?rev=49281&view=rev Log: [PSDK] - Add MIDL_user_allocate and MIDL_user_free definitions - #ifdef a GCC hack
Modified: branches/cmake-bringup/include/psdk/rpcndr.h
Modified: branches/cmake-bringup/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rpcnd... ============================================================================== --- branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] Tue Oct 26 16:01:08 2010 @@ -117,6 +117,9 @@ #define MIDL_memset(d,v,n) memset(d,v,n) #define midl_user_free MIDL_user_free #define midl_user_allocate MIDL_user_allocate + +void * __RPC_USER MIDL_user_allocate(size_t size); +void __RPC_USER MIDL_user_free( void * );
#define NdrFcShort(s) (unsigned char)(s & 0xff), (unsigned char)(s >> 8) #define NdrFcLong(s) (unsigned char)(s & 0xff), (unsigned char)((s & 0x0000ff00) >> 8), \ @@ -649,6 +652,7 @@ RPCRTAPI unsigned char* RPC_ENTRY NdrUserMarshalSimpleTypeConvert( ULONG *pFlags, unsigned char *pBuffer, unsigned char FormatChar );
+#ifdef __GCC__ /* Note: this should return a CLIENT_CALL_RETURN, but calling convention for * returning structures/unions is different between Windows and gcc on i386. */ LONG_PTR RPC_VAR_ENTRY @@ -659,6 +663,13 @@ NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); LONG_PTR RPC_VAR_ENTRY NdrDcomAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); +#else +CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall2( + PMIDL_STUB_DESC pStubDescriptor, + PFORMAT_STRING pFormat, + ... +); +#endif
RPCRTAPI void RPC_ENTRY NdrServerCall2( PRPC_MESSAGE pRpcMsg );