diff --git a/reactos/include/psdk/rpc.h b/reactos/include/psdk/rpc.h index 9ffc414cb4b..1b6ef112a7d 100644 --- a/reactos/include/psdk/rpc.h +++ b/reactos/include/psdk/rpc.h @@ -91,10 +91,6 @@ typedef long RPC_STATUS; #define RPCNSAPI #endif -#ifndef RPC_NO_WINDOWS_H -#include -#endif - #ifdef __RPC_MAC__ #include #define RPCXCWORD (sizeof(jmp_buf)/sizeof(int)) @@ -167,6 +163,10 @@ typedef long RPC_STATUS; #include #endif +#ifndef RPC_NO_WINDOWS_H +#include +#endif + #ifdef __cplusplus } #endif diff --git a/reactos/include/psdk/rpcasync.h b/reactos/include/psdk/rpcasync.h index 6b5f77bdc2a..d4bf4f8225c 100644 --- a/reactos/include/psdk/rpcasync.h +++ b/reactos/include/psdk/rpcasync.h @@ -18,6 +18,7 @@ #ifndef __WINE_RPCASYNC_H #define __WINE_RPCASYNC_H + typedef struct tagRPC_ERROR_ENUM_HANDLE { ULONG Signature; @@ -173,12 +174,12 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorSaveErrorInfo(RPC_ERROR_ENUM_HANDLE*,PVOID RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorLoadErrorInfo(PVOID,SIZE_T,RPC_ERROR_ENUM_HANDLE*); RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorAddRecord(RPC_EXTENDED_ERROR_INFO*); RPCRTAPI RPC_STATUS RPC_ENTRY RpcErrorClearInformation(void); -//RPCRTAPI RPC_STATUS RPC_ENTRY RpcGetAuthorizationContextForClient(RPC_BINDING_HANDLE,BOOL,LPVOID,PLARGE_INTEGER,LUID,DWORD,PVOID,PVOID*); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcGetAuthorizationContextForClient(RPC_BINDING_HANDLE,BOOL,LPVOID,PLARGE_INTEGER,LUID,DWORD,PVOID,PVOID*); RPCRTAPI RPC_STATUS RPC_ENTRY RpcFreeAuthorizationContext(PVOID*); -//RPCRTAPI RPC_STATUS RPC_ENTRY RpcSsContextLockExclusive(RPC_BINDING_HANDLE,PVOID); -//RPCRTAPI RPC_STATUS RPC_ENTRY RpcSsContextLockShared(RPC_BINDING_HANDLE,PVOID); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcSsContextLockExclusive(RPC_BINDING_HANDLE,PVOID); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcSsContextLockShared(RPC_BINDING_HANDLE,PVOID); -//RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcAsyncSetHandle(PRPC_MESSAGE,PRPC_ASYNC_STATE); +RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcAsyncSetHandle(PRPC_MESSAGE,PRPC_ASYNC_STATE); RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcAsyncAbortCall(PRPC_ASYNC_STATE,ULONG); RPCRTAPI int RPC_ENTRY I_RpcExceptionFilter(ULONG); diff --git a/reactos/include/psdk/rpcdce.h b/reactos/include/psdk/rpcdce.h index 4b13b10eb19..473a799cc14 100644 --- a/reactos/include/psdk/rpcdce.h +++ b/reactos/include/psdk/rpcdce.h @@ -32,6 +32,7 @@ extern "C" { #ifndef OPTIONAL #define OPTIONAL #endif + #ifndef GUID_DEFINED #include #endif @@ -288,7 +289,7 @@ RPC_STATUS RPC_ENTRY DceErrorInqTextA(RPC_STATUS e, RPC_CSTR buffer); RPC_STATUS RPC_ENTRY DceErrorInqTextW(RPC_STATUS e, RPC_WSTR buffer); #define DceErrorInqText WINELIB_NAME_AW(DceErrorInqText) -RPCRTAPI void RPC_ENTRY +RPCRTAPI DECLSPEC_NORETURN void RPC_ENTRY RpcRaiseException( RPC_STATUS exception ); RPCRTAPI RPC_STATUS RPC_ENTRY @@ -366,6 +367,8 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerListen( unsigned int MinimumCallThreads, unsigned int MaxCalls, unsigned int DontWait ); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtSetCancelTimeout(LONG); + RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtWaitServerListen( void ); @@ -465,6 +468,8 @@ RPCRTAPI RPC_STATUS RPC_ENTRY ULONG *AuthnSvc, RPC_AUTH_IDENTITY_HANDLE *AuthIdentity, ULONG *AuthzSvc ); #define RpcBindingInqAuthInfo WINELIB_NAME_AW(RpcBindingInqAuthInfo) +RPCRTAPI RPC_STATUS RPC_ENTRY RpcCancelThread(void*); + RPCRTAPI RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidA( RPC_CSTR protseq ); RPCRTAPI RPC_STATUS RPC_ENTRY diff --git a/reactos/include/psdk/rpcdcep.h b/reactos/include/psdk/rpcdcep.h index 9a8d3e67943..f511bb04306 100644 --- a/reactos/include/psdk/rpcdcep.h +++ b/reactos/include/psdk/rpcdcep.h @@ -19,6 +19,10 @@ #ifndef __WINE_RPCDCEP_H #define __WINE_RPCDCEP_H +#ifdef __cplusplus +extern "C" { +#endif + typedef struct _RPC_VERSION { unsigned short MajorVersion; unsigned short MinorVersion; @@ -44,6 +48,9 @@ typedef struct _RPC_MESSAGE unsigned long RpcFlags; } RPC_MESSAGE, *PRPC_MESSAGE; +/* or'd with ProcNum */ +#define RPC_FLAGS_VALID_BIT 0x00008000 + #define RPC_CONTEXT_HANDLE_DEFAULT_GUARD ((void *)0xfffff00d) #define RPC_CONTEXT_HANDLE_DEFAULT_FLAGS 0x00000000 @@ -72,9 +79,8 @@ typedef struct _RPC_MESSAGE #define RPCFLG_ASYNCHRONOUS 0x40000000 #define RPCFLG_NON_NDR 0x80000000 -#define RPC_FLAGS_VALID_BIT 0x00008000 - typedef void (__RPC_STUB *RPC_DISPATCH_FUNCTION)(PRPC_MESSAGE Message); +typedef RPC_STATUS (RPC_ENTRY *RPC_FORWARD_FUNCTION)(UUID *InterfaceId, RPC_VERSION *InterfaceVersion, UUID *ObjectId, unsigned char *Rpcpro, void **ppDestEndpoint); typedef struct { @@ -123,6 +129,8 @@ typedef struct _RPC_CLIENT_INTERFACE #define TRANSPORT_TYPE_LPC 0x04 #define TRANSPORT_TYPE_WMSG 0x08 +RPCRTAPI RPC_STATUS RPC_ENTRY + I_RpcNegotiateTransferSyntax( RPC_MESSAGE* Message ); RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcGetBuffer( RPC_MESSAGE* Message ); RPCRTAPI RPC_STATUS RPC_ENTRY @@ -152,7 +160,7 @@ RPCRTAPI RPC_BINDING_HANDLE RPC_ENTRY * Note that the prototypes for I_RpcBindingSetAsync are different for each case. * * Wine defaults to the WinNT case and only defines these function is MSWMSG is - * defined. Defining the NT functions by default causes MIDL generated proxys + * defined. Defining the NT functions by default causes MIDL generated proxies * to not compile. */ @@ -180,9 +188,6 @@ RPCRTAPI UINT RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcSetWMsgEndpoint( WCHAR* Endpoint ); -RPCRTAPI RPC_STATUS RPC_ENTRY - I_RpcBindingInqTransportType( RPC_BINDING_HANDLE Binding, unsigned int* Type ); - #endif #else @@ -207,4 +212,13 @@ RPCRTAPI UINT RPC_ENTRY #endif +RPCRTAPI RPC_STATUS RPC_ENTRY + I_RpcBindingInqTransportType( RPC_BINDING_HANDLE Binding, unsigned int* Type ); + +RPCRTAPI LONG RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS); + +#ifdef __cplusplus +} +#endif + #endif /*__WINE_RPCDCEP_H */ diff --git a/reactos/include/psdk/rpcproxy.h b/reactos/include/psdk/rpcproxy.h index 1ebc5d82dc0..eaf2a6a6508 100644 --- a/reactos/include/psdk/rpcproxy.h +++ b/reactos/include/psdk/rpcproxy.h @@ -33,6 +33,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + typedef struct tagCInterfaceStubVtbl *PCInterfaceStubVtblList; typedef struct tagCInterfaceProxyVtbl *PCInterfaceProxyVtblList; typedef const char *PCInterfaceName; @@ -357,4 +361,8 @@ RPCRTAPI HRESULT RPC_ENTRY #endif +#ifdef __cplusplus +} +#endif + #endif /*__WINE_RPCDCE_H */