[ros-diffs] [fireball] 45843: [PSDK] - Update RPC includes to Wine-1.1.39.
fireball at svn.reactos.org
fireball at svn.reactos.org
Thu Mar 4 22:16:09 CET 2010
Author: fireball
Date: Thu Mar 4 22:16:09 2010
New Revision: 45843
URL: http://svn.reactos.org/svn/reactos?rev=45843&view=rev
Log:
[PSDK]
- Update RPC includes to Wine-1.1.39.
Modified:
trunk/reactos/dll/win32/rpcrt4/rpc_transport.c
trunk/reactos/include/psdk/rpcdce.h
trunk/reactos/include/psdk/rpcndr.h
trunk/reactos/include/reactos/wine/rpcfc.h
Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_transport.c?rev=45843&r1=45842&r2=45843&view=diff
==============================================================================
--- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Thu Mar 4 22:16:09 2010
@@ -207,7 +207,7 @@
dwFlags |= SECURITY_DELEGATION;
break;
}
- if (Connection->QOS->qos->IdentityTracking == RPC_C_QOS_IDENTIFY_DYNAMIC)
+ if (Connection->QOS->qos->IdentityTracking == RPC_C_QOS_IDENTITY_DYNAMIC)
dwFlags |= SECURITY_CONTEXT_TRACKING;
}
pipe = CreateFileA(pname, GENERIC_READ|GENERIC_WRITE, 0, NULL,
Modified: trunk/reactos/include/psdk/rpcdce.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcdce.h?rev=45843&r1=45842&r2=45843&view=diff
==============================================================================
--- trunk/reactos/include/psdk/rpcdce.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/rpcdce.h [iso-8859-1] Thu Mar 4 22:16:09 2010
@@ -108,6 +108,11 @@
#define RPC_C_LISTEN_MAX_CALLS_DEFAULT 1234
#define RPC_C_PROTSEQ_MAX_REQS_DEFAULT 10
+#define RPC_PROTSEQ_TCP 0x1
+#define RPC_PROTSEQ_NMP 0x2
+#define RPC_PROTSEQ_LRPC 0x3
+#define RPC_PROTSEQ_HTTP 0x4
+
/* RPC_POLICY EndpointFlags */
#define RPC_C_BIND_TO_ALL_NICS 0x1
#define RPC_C_USE_INTERNET_PORT 0x1
@@ -158,8 +163,8 @@
#define RPC_C_IMP_LEVEL_DELEGATE 4
/* values for RPC_SECURITY_QOS*::IdentityTracking */
-#define RPC_C_QOS_IDENTIFY_STATIC 0
-#define RPC_C_QOS_IDENTIFY_DYNAMIC 1
+#define RPC_C_QOS_IDENTITY_STATIC 0
+#define RPC_C_QOS_IDENTITY_DYNAMIC 1
/* flags for RPC_SECURITY_QOS*::Capabilities */
#define RPC_C_QOS_CAPABILITIES_DEFAULT 0x0
@@ -190,7 +195,7 @@
#define RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE 0x10
typedef RPC_STATUS RPC_ENTRY RPC_IF_CALLBACK_FN( RPC_IF_HANDLE InterfaceUuid, void *Context );
-typedef void (__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)( void *Arg, unsigned char *ServerPrincName, unsigned long KeyVer, void **Key, RPC_STATUS *Status );
+typedef void (__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)(void *, RPC_WSTR, ULONG, void **, RPC_STATUS *);
typedef struct _RPC_POLICY
{
@@ -504,6 +509,28 @@
ULONG *AuthnSvc, RPC_AUTH_IDENTITY_HANDLE *AuthIdentity, ULONG *AuthzSvc );
#define RpcBindingInqAuthInfo WINELIB_NAME_AW(RpcBindingInqAuthInfo)
+RPCRTAPI RPC_STATUS RPC_ENTRY
+ RpcBindingInqAuthClientA( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs,
+ RPC_CSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc,
+ ULONG *AuthzSvc );
+
+RPCRTAPI RPC_STATUS RPC_ENTRY
+ RpcBindingInqAuthClientW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs,
+ RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc,
+ ULONG *AuthzSvc );
+#define RpcBindingInqAuthClient WINELIB_NAME_AW(RpcBindingInqAuthClient)
+
+RPCRTAPI RPC_STATUS RPC_ENTRY
+ RpcBindingInqAuthClientExA( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs,
+ RPC_CSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc,
+ ULONG *AuthzSvc, ULONG Flags );
+
+RPCRTAPI RPC_STATUS RPC_ENTRY
+ RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE *Privs,
+ RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc,
+ ULONG *AuthzSvc, ULONG Flags );
+#define RpcBindingInqAuthClientEx WINELIB_NAME_AW(RpcBindingInqAuthClientEx)
+
RPCRTAPI RPC_STATUS RPC_ENTRY RpcCancelThread(void*);
RPCRTAPI RPC_STATUS RPC_ENTRY RpcCancelThreadEx(void*,LONG);
Modified: trunk/reactos/include/psdk/rpcndr.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=45843&r1=45842&r2=45843&view=diff
==============================================================================
--- trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] Thu Mar 4 22:16:09 2010
@@ -104,8 +104,8 @@
#define small char
typedef unsigned char byte;
-#define hyper __int64
-#define MIDL_uhyper unsigned __int64
+typedef INT64 hyper;
+typedef UINT64 MIDL_uhyper;
typedef unsigned char boolean;
#define __RPC_CALLEE WINAPI
@@ -128,7 +128,7 @@
(RpcExceptionCode() == RPC_X_BAD_STUB_DATA) || \
(RpcExceptionCode() == RPC_S_INVALID_BOUND))
-typedef struct _NDR_SCONTEXT
+typedef struct
{
void *pad[2];
void *userContext;
@@ -211,19 +211,19 @@
struct _FULL_PTR_XLAT_TABLES *FullPtrXlatTables;
ULONG FullPtrRefId;
ULONG PointerLength;
- int fInDontFree:1;
- int fDontCallFreeInst:1;
- int fInOnlyParam:1;
- int fHasReturn:1;
- int fHasExtensions:1;
- int fHasNewCorrDesc:1;
- int fIsIn:1;
- int fIsOut:1;
- int fIsOicf:1;
- int fBufferValid:1;
- int fHasMemoryValidateCallback:1;
- int fInFree:1;
- int fNeedMCCP:1;
+ unsigned int fInDontFree:1;
+ unsigned int fDontCallFreeInst:1;
+ unsigned int fInOnlyParam:1;
+ unsigned int fHasReturn:1;
+ unsigned int fHasExtensions:1;
+ unsigned int fHasNewCorrDesc:1;
+ unsigned int fIsIn:1;
+ unsigned int fIsOut:1;
+ unsigned int fIsOicf:1;
+ unsigned int fBufferValid:1;
+ unsigned int fHasMemoryValidateCallback:1;
+ unsigned int fInFree:1;
+ unsigned int fNeedMCCP:1;
int fUnused:3;
int fUnused2:16;
DWORD dwDestContext;
@@ -390,7 +390,11 @@
typedef void (__RPC_API *STUB_THUNK)( PMIDL_STUB_MESSAGE );
+#ifdef WINE_STRICT_PROTOTYPES
+typedef LONG (__RPC_API *SERVER_ROUTINE)(void);
+#else
typedef LONG (__RPC_API *SERVER_ROUTINE)();
+#endif
typedef struct _MIDL_SERVER_INFO_
{
Modified: trunk/reactos/include/reactos/wine/rpcfc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/rpcfc.h?rev=45843&r1=45842&r2=45843&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/rpcfc.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/wine/rpcfc.h [iso-8859-1] Thu Mar 4 22:16:09 2010
@@ -167,6 +167,7 @@
#define RPC_FC_PROC_OIF_OBJECT 0x04
#define RPC_FC_PROC_OIF_RPCFLAGS 0x08
#define RPC_FC_PROC_OIF_OBJ_V2 0x20
+#define RPC_FC_PROC_OIF_HAS_COMM_OR_FAULT 0x20
#define RPC_FC_PROC_OIF_NEWINIT 0x40
#define RPC_FC_PROC_PF_MUSTSIZE 0x0001
More information about the Ros-diffs
mailing list