[ros-diffs] [fireball] 32114: - Sync RPC headers with Wine.
fireball at svn.reactos.org
fireball at svn.reactos.org
Mon Feb 4 14:15:02 CET 2008
Author: fireball
Date: Mon Feb 4 16:15:01 2008
New Revision: 32114
URL: http://svn.reactos.org/svn/reactos?rev=32114&view=rev
Log:
- Sync RPC headers with Wine.
Modified:
trunk/reactos/include/psdk/rpc.h
trunk/reactos/include/psdk/rpcasync.h
trunk/reactos/include/psdk/rpcdce.h
trunk/reactos/include/psdk/rpcdcep.h
trunk/reactos/include/psdk/rpcproxy.h
Modified: trunk/reactos/include/psdk/rpc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpc.h?rev=32114&r1=32113&r2=32114&view=diff
==============================================================================
--- trunk/reactos/include/psdk/rpc.h (original)
+++ trunk/reactos/include/psdk/rpc.h Mon Feb 4 16:15:01 2008
@@ -91,10 +91,6 @@
#define RPCNSAPI
#endif
-#ifndef RPC_NO_WINDOWS_H
-#include <rpcasync.h>
-#endif
-
#ifdef __RPC_MAC__
#include <setjmp.h>
#define RPCXCWORD (sizeof(jmp_buf)/sizeof(int))
@@ -167,6 +163,10 @@
#include <poppack.h>
#endif
+#ifndef RPC_NO_WINDOWS_H
+#include <rpcasync.h>
+#endif
+
#ifdef __cplusplus
}
#endif
Modified: trunk/reactos/include/psdk/rpcasync.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcasync.h?rev=32114&r1=32113&r2=32114&view=diff
==============================================================================
--- trunk/reactos/include/psdk/rpcasync.h (original)
+++ trunk/reactos/include/psdk/rpcasync.h Mon Feb 4 16:15:01 2008
@@ -17,6 +17,7 @@
*/
#ifndef __WINE_RPCASYNC_H
#define __WINE_RPCASYNC_H
+
typedef struct tagRPC_ERROR_ENUM_HANDLE
{
@@ -173,12 +174,12 @@
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);
Modified: trunk/reactos/include/psdk/rpcdce.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcdce.h?rev=32114&r1=32113&r2=32114&view=diff
==============================================================================
--- trunk/reactos/include/psdk/rpcdce.h (original)
+++ trunk/reactos/include/psdk/rpcdce.h Mon Feb 4 16:15:01 2008
@@ -32,6 +32,7 @@
#ifndef OPTIONAL
#define OPTIONAL
#endif
+
#ifndef GUID_DEFINED
#include <guiddef.h>
#endif
@@ -288,7 +289,7 @@
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
@@ -365,6 +366,8 @@
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 );
@@ -464,6 +467,8 @@
RpcBindingInqAuthInfoW( RPC_BINDING_HANDLE Binding, RPC_WSTR *ServerPrincName, ULONG *AuthnLevel,
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 );
Modified: trunk/reactos/include/psdk/rpcdcep.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcdcep.h?rev=32114&r1=32113&r2=32114&view=diff
==============================================================================
--- trunk/reactos/include/psdk/rpcdcep.h (original)
+++ trunk/reactos/include/psdk/rpcdcep.h Mon Feb 4 16:15:01 2008
@@ -18,6 +18,10 @@
#ifndef __WINE_RPCDCEP_H
#define __WINE_RPCDCEP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
typedef struct _RPC_VERSION {
unsigned short MajorVersion;
@@ -44,6 +48,9 @@
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 @@
#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
{
@@ -124,6 +130,8 @@
#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
I_RpcGetBufferWithObject( RPC_MESSAGE* Message, UUID* ObjectUuid );
@@ -152,7 +160,7 @@
* 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 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 @@
#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 */
Modified: trunk/reactos/include/psdk/rpcproxy.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcproxy.h?rev=32114&r1=32113&r2=32114&view=diff
==============================================================================
--- trunk/reactos/include/psdk/rpcproxy.h (original)
+++ trunk/reactos/include/psdk/rpcproxy.h Mon Feb 4 16:15:01 2008
@@ -32,6 +32,10 @@
#endif
#include <rpc.h>
#include <rpcndr.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
typedef struct tagCInterfaceStubVtbl *PCInterfaceStubVtblList;
typedef struct tagCInterfaceProxyVtbl *PCInterfaceProxyVtblList;
@@ -357,4 +361,8 @@
#endif
+#ifdef __cplusplus
+}
+#endif
+
#endif /*__WINE_RPCDCE_H */
More information about the Ros-diffs
mailing list