Headers diff for rpcrt4.dll between 6.0.6002.18005-Windows 6.0 and 6.1.7601.23418-Windows 7.0 versions

midles.h (6.0.6002.18005-Windows 6.0)		midles.h (6.1.7601.23418-Windows 7.0)

skipping to change at line 119		skipping to change at line 119
__bcount(BufferSize) char *pBuffer,		__bcount(BufferSize) char *pBuffer,
__out unsigned long BufferSize,		__out unsigned long BufferSize,
__out handle_t *pHandle		__out handle_t *pHandle
);		);

RPC_STATUS RPC_ENTRY		RPC_STATUS RPC_ENTRY
MesBufferHandleReset(		MesBufferHandleReset(
__in handle_t Handle,		__in handle_t Handle,
__in unsigned long HandleStyle,		__in unsigned long HandleStyle,
__in MIDL_ES_CODE Operation,		__in MIDL_ES_CODE Operation,

__deref_bcount(BufferSize) char **pBuffer,		__deref_in_bcount_opt(BufferSize) char **pBuffer,
__in unsigned long BufferSize,		__in unsigned long BufferSize,
__out unsigned long *pEncodedSize		__out unsigned long *pEncodedSize
);		);

RPC_STATUS RPC_ENTRY		RPC_STATUS RPC_ENTRY
MesHandleFree( handle_t Handle );		MesHandleFree( handle_t Handle );

RPC_STATUS RPC_ENTRY		RPC_STATUS RPC_ENTRY
MesInqProcEncodingId(		MesInqProcEncodingId(
handle_t Handle,		handle_t Handle,

End of changes. 1 change blocks.
1 lines changed or deleted		1 lines changed or added

rpcasync.h (6.0.6002.18005-Windows 6.0)		rpcasync.h (6.1.7601.23418-Windows 7.0)

skipping to change at line 34		skipping to change at line 34
#include <pshpack8.h>		#include <pshpack8.h>
#endif		#endif

#ifdef __cplusplus		#ifdef __cplusplus
extern "C" {		extern "C" {
#endif		#endif

#if defined(_KRPCENV_)		#if defined(_KRPCENV_)

#include <ntddk.h>		#include <ntddk.h>

#include <windef.h>

#endif // _KRPCENV_		#endif // _KRPCENV_


		#if defined(RPC_NO_WINDOWS_H) \|\| defined(_KRPCENV_)

		// We've gotta have windef.h--can't live without it.

		#include <windef.h>

		#endif // RPC_NO_WINDOWS_H \|\| _KRPCENV_

#define RPC_ASYNC_VERSION_1_0 sizeof(RPC_ASYNC_STATE)		#define RPC_ASYNC_VERSION_1_0 sizeof(RPC_ASYNC_STATE)

typedef		typedef
enum _RPC_NOTIFICATION_TYPES		enum _RPC_NOTIFICATION_TYPES
{		{
RpcNotificationTypeNone,		RpcNotificationTypeNone,
RpcNotificationTypeEvent,		RpcNotificationTypeEvent,
#if !defined(_KRPCENV_)		#if !defined(_KRPCENV_)
RpcNotificationTypeApc,		RpcNotificationTypeApc,
RpcNotificationTypeIoc,		RpcNotificationTypeIoc,
RpcNotificationTypeHwnd,		RpcNotificationTypeHwnd,
#endif		#endif
RpcNotificationTypeCallback		RpcNotificationTypeCallback
} RPC_NOTIFICATION_TYPES;		} RPC_NOTIFICATION_TYPES;


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
typedef		typedef
enum _RPC_ASYNC_EVENT {		enum _RPC_ASYNC_EVENT {
RpcCallComplete,		RpcCallComplete,
RpcSendComplete,		RpcSendComplete,
RpcReceiveComplete,		RpcReceiveComplete,
RpcClientDisconnect,		RpcClientDisconnect,
RpcClientCancel		RpcClientCancel
} RPC_ASYNC_EVENT;		} RPC_ASYNC_EVENT;


#else // (NTDDI_VERSION >= NTDDI_LONGHORN)		#else // (NTDDI_VERSION >= NTDDI_VISTA)

typedef		typedef
enum _RPC_ASYNC_EVENT {		enum _RPC_ASYNC_EVENT {
RpcCallComplete,		RpcCallComplete,
RpcSendComplete,		RpcSendComplete,
RpcReceiveComplete,		RpcReceiveComplete,
RpcClientDisconnect		RpcClientDisconnect
} RPC_ASYNC_EVENT;		} RPC_ASYNC_EVENT;

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

struct _RPC_ASYNC_STATE;		struct _RPC_ASYNC_STATE;

typedef void RPC_ENTRY		typedef void RPC_ENTRY
RPCNOTIFICATION_ROUTINE (		RPCNOTIFICATION_ROUTINE (
struct _RPC_ASYNC_STATE *pAsync,		struct _RPC_ASYNC_STATE *pAsync,
void *Context,		void *Context,
RPC_ASYNC_EVENT Event);		RPC_ASYNC_EVENT Event);
typedef RPCNOTIFICATION_ROUTINE *PFN_RPCNOTIFICATION_ROUTINE;		typedef RPCNOTIFICATION_ROUTINE *PFN_RPCNOTIFICATION_ROUTINE;

typedef union _RPC_ASYNC_NOTIFICATION_INFO {		typedef union _RPC_ASYNC_NOTIFICATION_INFO {
#if !defined(_KRPCENV_)		#if !defined(_KRPCENV_)
//		//
// Notification by APC		// Notification by APC
//		//
struct {		struct {
PFN_RPCNOTIFICATION_ROUTINE NotificationRoutine;		PFN_RPCNOTIFICATION_ROUTINE NotificationRoutine;
HANDLE hThread;		HANDLE hThread;
} APC;		} APC;


		#if !defined(RPC_NO_WINDOWS_H) \|\| defined (_WINBASE_)

//		//
// Notification by IO completion port		// Notification by IO completion port
//		//
struct {		struct {
HANDLE hIOPort;		HANDLE hIOPort;
DWORD dwNumberOfBytesTransferred;		DWORD dwNumberOfBytesTransferred;
DWORD_PTR dwCompletionKey;		DWORD_PTR dwCompletionKey;
LPOVERLAPPED lpOverlapped;		LPOVERLAPPED lpOverlapped;
} IOC;		} IOC;


		#endif // !RPC_NO_WINDOWS_H \|\| _WINBASE_
		#if !defined(RPC_NO_WINDOWS_H)
//		//
// Notification by window message		// Notification by window message
//		//
struct {		struct {
HWND hWnd;		HWND hWnd;
UINT Msg;		UINT Msg;
} HWND;		} HWND;

#endif // _KRPCENV_
		#endif // RPC_NO_WINDOWS_H
		#endif // _KRPCENV_

#if !defined(_KRPCENV_)		#if !defined(_KRPCENV_)
//		//
// Notification by event		// Notification by event
//		//
HANDLE hEvent;		HANDLE hEvent;
#else // _KRPCENV_		#else // _KRPCENV_
//		//
// Notification by event		// Notification by event
//		//

skipping to change at line 203		skipping to change at line 216

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcAsyncCancelCall (		RpcAsyncCancelCall (
__inout PRPC_ASYNC_STATE pAsync,		__inout PRPC_ASYNC_STATE pAsync,
__in BOOL fAbort		__in BOOL fAbort
) ;		) ;

#if (NTDDI_VERSION >= NTDDI_WINXP)		#if (NTDDI_VERSION >= NTDDI_WINXP)


		// EEINFO needs k-mode or needs winbase.h
		#if !defined(RPC_NO_WINDOWS_H) \|\| defined(_KRPCENV_) \|\| defined(_WINBASE_)

typedef enum tagExtendedErrorParamTypes		typedef enum tagExtendedErrorParamTypes
{		{
eeptAnsiString = 1,		eeptAnsiString = 1,
eeptUnicodeString,		eeptUnicodeString,
eeptLongVal,		eeptLongVal,
eeptShortVal,		eeptShortVal,
eeptPointerVal,		eeptPointerVal,
eeptNone,		eeptNone,
eeptBinary		eeptBinary
} ExtendedErrorParamTypes;		} ExtendedErrorParamTypes;

skipping to change at line 279		skipping to change at line 296
{		{
ULONG Signature;		ULONG Signature;
void *CurrentPos;		void *CurrentPos;
void *Head;		void *Head;
} RPC_ERROR_ENUM_HANDLE;		} RPC_ERROR_ENUM_HANDLE;

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcErrorStartEnumeration (		RpcErrorStartEnumeration (

__inout RPC_ERROR_ENUM_HANDLE *EnumHandle		__out RPC_ERROR_ENUM_HANDLE *EnumHandle
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcErrorGetNextRecord (		RpcErrorGetNextRecord (
__in RPC_ERROR_ENUM_HANDLE *EnumHandle,		__in RPC_ERROR_ENUM_HANDLE *EnumHandle,
__in BOOL CopyStrings,		__in BOOL CopyStrings,
__out RPC_EXTENDED_ERROR_INFO *ErrorInfo		__out RPC_EXTENDED_ERROR_INFO *ErrorInfo
);		);

skipping to change at line 318		skipping to change at line 335
RpcErrorGetNumberOfRecords (		RpcErrorGetNumberOfRecords (
__in RPC_ERROR_ENUM_HANDLE *EnumHandle,		__in RPC_ERROR_ENUM_HANDLE *EnumHandle,
__out int *Records		__out int *Records
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcErrorSaveErrorInfo (		RpcErrorSaveErrorInfo (
__in RPC_ERROR_ENUM_HANDLE *EnumHandle,		__in RPC_ERROR_ENUM_HANDLE *EnumHandle,

__out_bcount(BlobSize) PVOID ErrorBlob,		__deref_out_bcount(BlobSize) PVOID ErrorBlob,
__out size_t *BlobSize		__out size_t *BlobSize
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcErrorLoadErrorInfo (		RpcErrorLoadErrorInfo (
__in_bcount(BlobSize) PVOID ErrorBlob,		__in_bcount(BlobSize) PVOID ErrorBlob,
__in size_t BlobSize,		__in size_t BlobSize,
__out RPC_ERROR_ENUM_HANDLE *EnumHandle		__out RPC_ERROR_ENUM_HANDLE *EnumHandle

skipping to change at line 345		skipping to change at line 362
__in RPC_EXTENDED_ERROR_INFO *ErrorInfo		__in RPC_EXTENDED_ERROR_INFO *ErrorInfo
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
RpcErrorClearInformation (		RpcErrorClearInformation (
void		void
);		);


		#endif // !RPC_NO_WINDOWS_H \|\| _KRPCENV_ \|\| _WINBASE_

#if !defined(_KRPCENV_)		#if !defined(_KRPCENV_)

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcAsyncCleanupThread (		RpcAsyncCleanupThread (
__in DWORD dwTimeout		__in DWORD dwTimeout
);		);

RPCRTAPI		RPCRTAPI

skipping to change at line 391		skipping to change at line 410
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcSsContextLockShared (		RpcSsContextLockShared (
__in RPC_BINDING_HANDLE ServerBindingHandle,		__in RPC_BINDING_HANDLE ServerBindingHandle,
__in PVOID UserContext		__in PVOID UserContext
);		);


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
typedef enum tagRpcLocalAddressFormat		typedef enum tagRpcLocalAddressFormat
{		{
rlafInvalid = 0,		rlafInvalid = 0,
rlafIPv4,		rlafIPv4,
rlafIPv6		rlafIPv6
} RpcLocalAddressFormat;		} RpcLocalAddressFormat;

typedef struct _RPC_CALL_LOCAL_ADDRESS_V1		typedef struct _RPC_CALL_LOCAL_ADDRESS_V1
{		{
unsigned int Version;		unsigned int Version;

skipping to change at line 415		skipping to change at line 434
} RPC_CALL_LOCAL_ADDRESS_V1, *PRPC_CALL_LOCAL_ADDRESS_V1;		} RPC_CALL_LOCAL_ADDRESS_V1, *PRPC_CALL_LOCAL_ADDRESS_V1;

#define RPC_CALL_ATTRIBUTES_VERSION (2)		#define RPC_CALL_ATTRIBUTES_VERSION (2)

#define RPC_QUERY_SERVER_PRINCIPAL_NAME (0x02)		#define RPC_QUERY_SERVER_PRINCIPAL_NAME (0x02)
#define RPC_QUERY_CLIENT_PRINCIPAL_NAME (0x04)		#define RPC_QUERY_CLIENT_PRINCIPAL_NAME (0x04)
#define RPC_QUERY_CALL_LOCAL_ADDRESS (0x08)		#define RPC_QUERY_CALL_LOCAL_ADDRESS (0x08)
#define RPC_QUERY_CLIENT_PID (0x10)		#define RPC_QUERY_CLIENT_PID (0x10)
#define RPC_QUERY_IS_CLIENT_LOCAL (0x20)		#define RPC_QUERY_IS_CLIENT_LOCAL (0x20)
#define RPC_QUERY_NO_AUTH_REQUIRED (0x40)		#define RPC_QUERY_NO_AUTH_REQUIRED (0x40)

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)


#if ( (NTDDI_VERSION >= NTDDI_WINXP) && (NTDDI_VERSION < NTDDI_LONGHORN) )		#if ( (NTDDI_VERSION >= NTDDI_WINXP) && (NTDDI_VERSION < NTDDI_VISTA) )
#define RPC_CALL_ATTRIBUTES_VERSION (1)		#define RPC_CALL_ATTRIBUTES_VERSION (1)
#define RPC_QUERY_SERVER_PRINCIPAL_NAME (2)		#define RPC_QUERY_SERVER_PRINCIPAL_NAME (2)
#define RPC_QUERY_CLIENT_PRINCIPAL_NAME (4)		#define RPC_QUERY_CLIENT_PRINCIPAL_NAME (4)

#endif // ( (NTDDI_VERSION >= NTDDI_WINXP) && (NTDDI_VERSION < NTDDI_LONGHORN) )		#endif // ( (NTDDI_VERSION >= NTDDI_WINXP) && (NTDDI_VERSION < NTDDI_VISTA) )

typedef struct tagRPC_CALL_ATTRIBUTES_V1_W		typedef struct tagRPC_CALL_ATTRIBUTES_V1_W
{		{
unsigned int Version;		unsigned int Version;
unsigned long Flags;		unsigned long Flags;
unsigned long ServerPrincipalNameBufferLength;		unsigned long ServerPrincipalNameBufferLength;
unsigned short *ServerPrincipalName;		unsigned short *ServerPrincipalName;
unsigned long ClientPrincipalNameBufferLength;		unsigned long ClientPrincipalNameBufferLength;
unsigned short *ClientPrincipalName;		unsigned short *ClientPrincipalName;
unsigned long AuthenticationLevel;		unsigned long AuthenticationLevel;

skipping to change at line 449		skipping to change at line 468
unsigned long Flags;		unsigned long Flags;
unsigned long ServerPrincipalNameBufferLength;		unsigned long ServerPrincipalNameBufferLength;
unsigned char *ServerPrincipalName;		unsigned char *ServerPrincipalName;
unsigned long ClientPrincipalNameBufferLength;		unsigned long ClientPrincipalNameBufferLength;
unsigned char *ClientPrincipalName;		unsigned char *ClientPrincipalName;
unsigned long AuthenticationLevel;		unsigned long AuthenticationLevel;
unsigned long AuthenticationService;		unsigned long AuthenticationService;
BOOL NullSession;		BOOL NullSession;
} RPC_CALL_ATTRIBUTES_V1_A;		} RPC_CALL_ATTRIBUTES_V1_A;


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
// CallStatus bit fields		// CallStatus bit fields
#define RPC_CALL_STATUS_CANCELLED 0x01		#define RPC_CALL_STATUS_CANCELLED 0x01
#define RPC_CALL_STATUS_DISCONNECTED 0x02		#define RPC_CALL_STATUS_DISCONNECTED 0x02

typedef enum tagRpcCallType		typedef enum tagRpcCallType
{		{
rctInvalid = 0,		rctInvalid = 0,
rctNormal,		rctNormal,
rctTraining,		rctTraining,
rctGuaranteed		rctGuaranteed

skipping to change at line 513		skipping to change at line 532
BOOL KernelModeCaller;		BOOL KernelModeCaller;
unsigned long ProtocolSequence;		unsigned long ProtocolSequence;
unsigned long IsClientLocal;		unsigned long IsClientLocal;
HANDLE ClientPID;		HANDLE ClientPID;
unsigned long CallStatus;		unsigned long CallStatus;
RpcCallType CallType;		RpcCallType CallType;
RPC_CALL_LOCAL_ADDRESS_V1 *CallLocalAddress; // one of the CallLocalAd dress flavors		RPC_CALL_LOCAL_ADDRESS_V1 *CallLocalAddress; // one of the CallLocalAd dress flavors
unsigned short OpNum;		unsigned short OpNum;
UUID InterfaceUuid;		UUID InterfaceUuid;
} RPC_CALL_ATTRIBUTES_V2_A;		} RPC_CALL_ATTRIBUTES_V2_A;

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcServerInqCallAttributesW (		RpcServerInqCallAttributesW (
__in_opt RPC_BINDING_HANDLE ClientBinding,		__in_opt RPC_BINDING_HANDLE ClientBinding,
__inout void *RpcCallAttributes		__inout void *RpcCallAttributes
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcServerInqCallAttributesA (		RpcServerInqCallAttributesA (
__in_opt RPC_BINDING_HANDLE ClientBinding,		__in_opt RPC_BINDING_HANDLE ClientBinding,
__inout void *RpcCallAttributes		__inout void *RpcCallAttributes
);		);

#ifdef UNICODE		#ifdef UNICODE
# define RPC_CALL_ATTRIBUTES_V1 RPC_CALL_ATTRIBUTES_V1_W		# define RPC_CALL_ATTRIBUTES_V1 RPC_CALL_ATTRIBUTES_V1_W

#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
# define RPC_CALL_ATTRIBUTES_V2 RPC_CALL_ATTRIBUTES_V2_W		# define RPC_CALL_ATTRIBUTES_V2 RPC_CALL_ATTRIBUTES_V2_W

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)
# define RpcServerInqCallAttributes RpcServerInqCallAttributesW		# define RpcServerInqCallAttributes RpcServerInqCallAttributesW
#else		#else
# define RPC_CALL_ATTRIBUTES_V1 RPC_CALL_ATTRIBUTES_V1_A		# define RPC_CALL_ATTRIBUTES_V1 RPC_CALL_ATTRIBUTES_V1_A

#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
# define RPC_CALL_ATTRIBUTES_V2 RPC_CALL_ATTRIBUTES_V2_A		# define RPC_CALL_ATTRIBUTES_V2 RPC_CALL_ATTRIBUTES_V2_A

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)
# define RpcServerInqCallAttributes RpcServerInqCallAttributesA		# define RpcServerInqCallAttributes RpcServerInqCallAttributesA
#endif // !UNICODE		#endif // !UNICODE


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
typedef RPC_CALL_ATTRIBUTES_V2 RPC_CALL_ATTRIBUTES;		typedef RPC_CALL_ATTRIBUTES_V2 RPC_CALL_ATTRIBUTES;
#else		#else
typedef RPC_CALL_ATTRIBUTES_V1 RPC_CALL_ATTRIBUTES;		typedef RPC_CALL_ATTRIBUTES_V1 RPC_CALL_ATTRIBUTES;

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
// can be used as flags in a bitmask too		// can be used as flags in a bitmask too
typedef enum _RPC_NOTIFICATIONS		typedef enum _RPC_NOTIFICATIONS
{		{
RpcNotificationCallNone = 0,		RpcNotificationCallNone = 0,
RpcNotificationClientDisconnect = 1,		RpcNotificationClientDisconnect = 1,
RpcNotificationCallCancel = 2 // internal for Windows		RpcNotificationCallCancel = 2 // internal for Windows
} RPC_NOTIFICATIONS;		} RPC_NOTIFICATIONS;

#define RpcNotificationCallStatusChange RpcNotificationClientDisconnect		#define RpcNotificationCallStatusChange RpcNotificationClientDisconnect


skipping to change at line 581		skipping to change at line 600

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcServerUnsubscribeForNotification (		RpcServerUnsubscribeForNotification (
__in_opt RPC_BINDING_HANDLE Binding,		__in_opt RPC_BINDING_HANDLE Binding,
__in RPC_NOTIFICATIONS Notification,		__in RPC_NOTIFICATIONS Notification,
__out unsigned long *NotificationsQueued		__out unsigned long *NotificationsQueued
);		);


#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)
#endif // _KRPCENV_		#endif // _KRPCENV_


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcBindingBind (		RpcBindingBind (
__in_opt PRPC_ASYNC_STATE pAsync,		__in_opt PRPC_ASYNC_STATE pAsync,
__in RPC_BINDING_HANDLE Binding,		__in RPC_BINDING_HANDLE Binding,
__in RPC_IF_HANDLE IfSpec		__in RPC_IF_HANDLE IfSpec
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcBindingUnbind (		RpcBindingUnbind (
__in RPC_BINDING_HANDLE Binding		__in RPC_BINDING_HANDLE Binding
);		);


		#if !defined(RPC_NO_WINDOWS_H) \|\| defined(_KRPCENV_) \|\| defined(_WINBASE_)

#define RPC_DE_USE_CURRENT_EEINFO (1)		#define RPC_DE_USE_CURRENT_EEINFO (1)

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcDiagnoseError (		RpcDiagnoseError (
__in RPC_BINDING_HANDLE BindingHandle,		__in RPC_BINDING_HANDLE BindingHandle,
__in RPC_IF_HANDLE IfSpec,		__in RPC_IF_HANDLE IfSpec,
__in RPC_STATUS RpcStatus,		__in RPC_STATUS RpcStatus,
__in_opt RPC_ERROR_ENUM_HANDLE *EnumHandle,		__in_opt RPC_ERROR_ENUM_HANDLE *EnumHandle,
__in ULONG Options,		__in ULONG Options,
__in_opt HWND ParentWindow		__in_opt HWND ParentWindow
);		);


#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // !RPC_NO_WINDOWS_H \|\| _KRPCENV_ \|\| _WINBASE_

		#endif // (NTDDI_VERSION >= NTDDI_VISTA)
#endif // (NTDDI_VERSION >= NTDDI_WINXP)		#endif // (NTDDI_VERSION >= NTDDI_WINXP)
//		//
// Internal APIs		// Internal APIs
//		//
RPC_STATUS RPC_ENTRY		RPC_STATUS RPC_ENTRY
I_RpcAsyncSetHandle (		I_RpcAsyncSetHandle (
__in PRPC_MESSAGE Message,		__in PRPC_MESSAGE Message,
__in PRPC_ASYNC_STATE pAsync		__in PRPC_ASYNC_STATE pAsync
);		);


End of changes. 29 change blocks.
23 lines changed or deleted		46 lines changed or added

rpcdce.h (6.0.6002.18005-Windows 6.0)		rpcdce.h (6.1.7601.23418-Windows 7.0)

skipping to change at line 53		skipping to change at line 53
#endif		#endif
#endif		#endif

/typedef char small;/		/typedef char small;/
/typedef unsigned char byte;/		/typedef unsigned char byte;/
/typedef unsigned char boolean;/		/typedef unsigned char boolean;/

#include <specstrings.h>		#include <specstrings.h>

typedef __nullterminated unsigned char __RPC_FAR * RPC_CSTR;		typedef __nullterminated unsigned char __RPC_FAR * RPC_CSTR;


#if defined(RPC_USE_NATIVE_WCHAR) && defined(_NATIVE_WCHAR_T_DEFINED)		#if defined(RPC_USE_NATIVE_WCHAR) && defined(_NATIVE_WCHAR_T_DEFINED)
typedef __nullterminated wchar_t __RPC_FAR * RPC_WSTR;		typedef __nullterminated wchar_t __RPC_FAR * RPC_WSTR;

		typedef __nullterminated const wchar_t * RPC_CWSTR;
#else		#else
typedef __nullterminated unsigned short __RPC_FAR * RPC_WSTR;		typedef __nullterminated unsigned short __RPC_FAR * RPC_WSTR;

		typedef __nullterminated const unsigned short * RPC_CWSTR;
#endif		#endif

typedef I_RPC_HANDLE RPC_BINDING_HANDLE;		typedef I_RPC_HANDLE RPC_BINDING_HANDLE;
typedef RPC_BINDING_HANDLE handle_t;		typedef RPC_BINDING_HANDLE handle_t;
#define rpc_binding_handle_t RPC_BINDING_HANDLE		#define rpc_binding_handle_t RPC_BINDING_HANDLE

#ifndef GUID_DEFINED		#ifndef GUID_DEFINED
#include <guiddef.h>		#include <guiddef.h>
#endif /* GUID_DEFINED */		#endif /* GUID_DEFINED */


skipping to change at line 122		skipping to change at line 125
#define RPC_C_LISTEN_MAX_CALLS_DEFAULT 1234		#define RPC_C_LISTEN_MAX_CALLS_DEFAULT 1234
#define RPC_C_PROTSEQ_MAX_REQS_DEFAULT 10		#define RPC_C_PROTSEQ_MAX_REQS_DEFAULT 10

// RPC_POLICY EndpointFlags.		// RPC_POLICY EndpointFlags.
#define RPC_C_BIND_TO_ALL_NICS 1		#define RPC_C_BIND_TO_ALL_NICS 1
#define RPC_C_USE_INTERNET_PORT 0x1		#define RPC_C_USE_INTERNET_PORT 0x1
#define RPC_C_USE_INTRANET_PORT 0x2		#define RPC_C_USE_INTRANET_PORT 0x2
#define RPC_C_DONT_FAIL 0x4		#define RPC_C_DONT_FAIL 0x4
#define RPC_C_RPCHTTP_USE_LOAD_BALANCE 0x8		#define RPC_C_RPCHTTP_USE_LOAD_BALANCE 0x8


#if (NTDDI_VERSION < NTDDI_LONGHORN)		#if (NTDDI_VERSION < NTDDI_VISTA)
// RPC_POLICY EndpointFlags specific to the Falcon/RPC transport (deprecated for		// RPC_POLICY EndpointFlags specific to the Falcon/RPC transport (deprecated for
LONGHORN)		Vista)
#define RPC_C_MQ_TEMPORARY 0x0000		#define RPC_C_MQ_TEMPORARY 0x0000
#define RPC_C_MQ_PERMANENT 0x0001		#define RPC_C_MQ_PERMANENT 0x0001
#define RPC_C_MQ_CLEAR_ON_OPEN 0x0002		#define RPC_C_MQ_CLEAR_ON_OPEN 0x0002
#define RPC_C_MQ_USE_EXISTING_SECURITY 0x0004		#define RPC_C_MQ_USE_EXISTING_SECURITY 0x0004
#define RPC_C_MQ_AUTHN_LEVEL_NONE 0x0000		#define RPC_C_MQ_AUTHN_LEVEL_NONE 0x0000
#define RPC_C_MQ_AUTHN_LEVEL_PKT_INTEGRITY 0x0008		#define RPC_C_MQ_AUTHN_LEVEL_PKT_INTEGRITY 0x0008
#define RPC_C_MQ_AUTHN_LEVEL_PKT_PRIVACY 0x0010		#define RPC_C_MQ_AUTHN_LEVEL_PKT_PRIVACY 0x0010


// Falcon/Rpc options are deprecated from LONGHORN		// Falcon/Rpc options are deprecated from Vista
#define RPC_C_MQ_EXPRESS 0 // Client: RPC_C_MQ_DELIVERY.		#define RPC_C_MQ_EXPRESS 0 // Client: RPC_C_MQ_DELIVERY.
#define RPC_C_MQ_RECOVERABLE 1		#define RPC_C_MQ_RECOVERABLE 1

#define RPC_C_MQ_JOURNAL_NONE 0 // Client: RPC_C_MQ_JOURNAL.		#define RPC_C_MQ_JOURNAL_NONE 0 // Client: RPC_C_MQ_JOURNAL.
#define RPC_C_MQ_JOURNAL_DEADLETTER 1		#define RPC_C_MQ_JOURNAL_DEADLETTER 1
#define RPC_C_MQ_JOURNAL_ALWAYS 2		#define RPC_C_MQ_JOURNAL_ALWAYS 2


// Client: RpcBindingSetOption() values for the Falcon/RPC transport (some are d eprecated from LONGHORN)		// Client: RpcBindingSetOption() values for the Falcon/RPC transport (some are d eprecated from Vista)

#define RPC_C_OPT_MQ_DELIVERY 1		#define RPC_C_OPT_MQ_DELIVERY 1
#define RPC_C_OPT_MQ_PRIORITY 2		#define RPC_C_OPT_MQ_PRIORITY 2
#define RPC_C_OPT_MQ_JOURNAL 3		#define RPC_C_OPT_MQ_JOURNAL 3
#define RPC_C_OPT_MQ_ACKNOWLEDGE 4		#define RPC_C_OPT_MQ_ACKNOWLEDGE 4
#define RPC_C_OPT_MQ_AUTHN_SERVICE 5		#define RPC_C_OPT_MQ_AUTHN_SERVICE 5
#define RPC_C_OPT_MQ_AUTHN_LEVEL 6		#define RPC_C_OPT_MQ_AUTHN_LEVEL 6
#define RPC_C_OPT_MQ_TIME_TO_REACH_QUEUE 7		#define RPC_C_OPT_MQ_TIME_TO_REACH_QUEUE 7
#define RPC_C_OPT_MQ_TIME_TO_BE_RECEIVED 8		#define RPC_C_OPT_MQ_TIME_TO_BE_RECEIVED 8

#endif // (NTDDI_VERSION < NTDDI_LONGHORN)		#endif // (NTDDI_VERSION < NTDDI_VISTA)

#define RPC_C_OPT_BINDING_NONCAUSAL 9		#define RPC_C_OPT_BINDING_NONCAUSAL 9
#define RPC_C_OPT_SECURITY_CALLBACK 10		#define RPC_C_OPT_SECURITY_CALLBACK 10
#define RPC_C_OPT_UNIQUE_BINDING 11		#define RPC_C_OPT_UNIQUE_BINDING 11

#if (NTDDI_VERSION <= NTDDI_WIN2K)		#if (NTDDI_VERSION <= NTDDI_WIN2K)
#define RPC_C_OPT_MAX_OPTIONS 12		#define RPC_C_OPT_MAX_OPTIONS 12

#elif (NTDDI_VERSION <= NTDDI_WS03)		#elif (NTDDI_VERSION <= NTDDI_WS03)
#define RPC_C_OPT_CALL_TIMEOUT 12		#define RPC_C_OPT_CALL_TIMEOUT 12
#define RPC_C_OPT_DONT_LINGER 13		#define RPC_C_OPT_DONT_LINGER 13
#define RPC_C_OPT_MAX_OPTIONS 14		#define RPC_C_OPT_MAX_OPTIONS 14


#elif (NTDDI_VERSION <= NTDDI_LONGHORN)		#else
		#define RPC_C_OPT_TRANS_SEND_BUFFER_SIZE 5
#define RPC_C_OPT_CALL_TIMEOUT 12		#define RPC_C_OPT_CALL_TIMEOUT 12
#define RPC_C_OPT_DONT_LINGER 13		#define RPC_C_OPT_DONT_LINGER 13
#define RPC_C_OPT_TRUST_PEER 14		#define RPC_C_OPT_TRUST_PEER 14
#define RPC_C_OPT_ASYNC_BLOCK 15		#define RPC_C_OPT_ASYNC_BLOCK 15
#define RPC_C_OPT_OPTIMIZE_TIME 16		#define RPC_C_OPT_OPTIMIZE_TIME 16
#define RPC_C_OPT_MAX_OPTIONS 17		#define RPC_C_OPT_MAX_OPTIONS 17

#endif // (NTDDI_VERSION <= NTDDI_WIN2K)		#endif // (NTDDI_VERSION <= NTDDI_WIN2K)

// flags for RpcServerInqAuthClientEx		// flags for RpcServerInqAuthClientEx

skipping to change at line 264		skipping to change at line 268
RpcBindingCopy (		RpcBindingCopy (
__in RPC_BINDING_HANDLE SourceBinding,		__in RPC_BINDING_HANDLE SourceBinding,
__out RPC_BINDING_HANDLE __RPC_FAR * DestinationBinding		__out RPC_BINDING_HANDLE __RPC_FAR * DestinationBinding
);		);

/* client */		/* client */
RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcBindingFree (		RpcBindingFree (

__in OUT RPC_BINDING_HANDLE __RPC_FAR * Binding		__inout RPC_BINDING_HANDLE __RPC_FAR * Binding
);		);

/* client */		/* client */
RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcBindingSetOption (		RpcBindingSetOption (
__in RPC_BINDING_HANDLE hBinding,		__in RPC_BINDING_HANDLE hBinding,
__in unsigned long option,		__in unsigned long option,
__in ULONG_PTR optionValue		__in ULONG_PTR optionValue

skipping to change at line 1327		skipping to change at line 1331
#define RPC_C_QOS_CAPABILITIES_DEFAULT 0x0		#define RPC_C_QOS_CAPABILITIES_DEFAULT 0x0
#define RPC_C_QOS_CAPABILITIES_MUTUAL_AUTH 0x1		#define RPC_C_QOS_CAPABILITIES_MUTUAL_AUTH 0x1
#define RPC_C_QOS_CAPABILITIES_MAKE_FULLSIC 0x2		#define RPC_C_QOS_CAPABILITIES_MAKE_FULLSIC 0x2
#define RPC_C_QOS_CAPABILITIES_ANY_AUTHORITY 0x4		#define RPC_C_QOS_CAPABILITIES_ANY_AUTHORITY 0x4

#if (NTDDI_VERSION >= NTDDI_WS03)		#if (NTDDI_VERSION >= NTDDI_WS03)
#define RPC_C_QOS_CAPABILITIES_IGNORE_DELEGATE_FAILURE 0x8		#define RPC_C_QOS_CAPABILITIES_IGNORE_DELEGATE_FAILURE 0x8
#define RPC_C_QOS_CAPABILITIES_LOCAL_MA_HINT 0x10		#define RPC_C_QOS_CAPABILITIES_LOCAL_MA_HINT 0x10
#endif // (NTDDI_VERSION >= NTDDI_WS03)		#endif // (NTDDI_VERSION >= NTDDI_WS03)


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
#define RPC_C_QOS_CAPABILITIES_SCHANNEL_FULL_AUTH_IDENTITY 0x20		#define RPC_C_QOS_CAPABILITIES_SCHANNEL_FULL_AUTH_IDENTITY 0x20

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

#define RPC_C_PROTECT_LEVEL_DEFAULT (RPC_C_AUTHN_LEVEL_DEFAULT)		#define RPC_C_PROTECT_LEVEL_DEFAULT (RPC_C_AUTHN_LEVEL_DEFAULT)
#define RPC_C_PROTECT_LEVEL_NONE (RPC_C_AUTHN_LEVEL_NONE)		#define RPC_C_PROTECT_LEVEL_NONE (RPC_C_AUTHN_LEVEL_NONE)
#define RPC_C_PROTECT_LEVEL_CONNECT (RPC_C_AUTHN_LEVEL_CONNECT)		#define RPC_C_PROTECT_LEVEL_CONNECT (RPC_C_AUTHN_LEVEL_CONNECT)
#define RPC_C_PROTECT_LEVEL_CALL (RPC_C_AUTHN_LEVEL_CALL)		#define RPC_C_PROTECT_LEVEL_CALL (RPC_C_AUTHN_LEVEL_CALL)
#define RPC_C_PROTECT_LEVEL_PKT (RPC_C_AUTHN_LEVEL_PKT)		#define RPC_C_PROTECT_LEVEL_PKT (RPC_C_AUTHN_LEVEL_PKT)
#define RPC_C_PROTECT_LEVEL_PKT_INTEGRITY (RPC_C_AUTHN_LEVEL_PKT_INTEGRITY)		#define RPC_C_PROTECT_LEVEL_PKT_INTEGRITY (RPC_C_AUTHN_LEVEL_PKT_INTEGRITY)
#define RPC_C_PROTECT_LEVEL_PKT_PRIVACY (RPC_C_AUTHN_LEVEL_PKT_PRIVACY)		#define RPC_C_PROTECT_LEVEL_PKT_PRIVACY (RPC_C_AUTHN_LEVEL_PKT_PRIVACY)

#define RPC_C_AUTHN_NONE 0		#define RPC_C_AUTHN_NONE 0

skipping to change at line 1352		skipping to change at line 1356
#define RPC_C_AUTHN_DEC_PUBLIC 4		#define RPC_C_AUTHN_DEC_PUBLIC 4
#define RPC_C_AUTHN_GSS_NEGOTIATE 9		#define RPC_C_AUTHN_GSS_NEGOTIATE 9
#define RPC_C_AUTHN_WINNT 10		#define RPC_C_AUTHN_WINNT 10
#define RPC_C_AUTHN_GSS_SCHANNEL 14		#define RPC_C_AUTHN_GSS_SCHANNEL 14
#define RPC_C_AUTHN_GSS_KERBEROS 16		#define RPC_C_AUTHN_GSS_KERBEROS 16
#define RPC_C_AUTHN_DPA 17		#define RPC_C_AUTHN_DPA 17
#define RPC_C_AUTHN_MSN 18		#define RPC_C_AUTHN_MSN 18
#if (NTDDI_VERSION >= WINXP)		#if (NTDDI_VERSION >= WINXP)
#define RPC_C_AUTHN_DIGEST 21		#define RPC_C_AUTHN_DIGEST 21
#endif // (NTDDI_VERSION >= WINXP)		#endif // (NTDDI_VERSION >= WINXP)

		#if (NTDDI_VERSION >= NTDDI_WIN7)
		#define RPC_C_AUTHN_KERNEL 20
		#endif // (NTDDI_VERSION >= NTDDI_WIN7)

		#define RPC_C_AUTHN_NEGO_EXTENDER 30
		#define RPC_C_AUTHN_PKU2U 31

#define RPC_C_AUTHN_MQ 100		#define RPC_C_AUTHN_MQ 100
#define RPC_C_AUTHN_DEFAULT 0xFFFFFFFFL		#define RPC_C_AUTHN_DEFAULT 0xFFFFFFFFL

#define RPC_C_NO_CREDENTIALS ((RPC_AUTH_IDENTITY_HANDLE) MAXUINT_PTR)		#define RPC_C_NO_CREDENTIALS ((RPC_AUTH_IDENTITY_HANDLE) MAXUINT_PTR)

#define RPC_C_SECURITY_QOS_VERSION 1L		#define RPC_C_SECURITY_QOS_VERSION 1L
#define RPC_C_SECURITY_QOS_VERSION_1 1L		#define RPC_C_SECURITY_QOS_VERSION_1 1L

typedef struct _RPC_SECURITY_QOS {		typedef struct _RPC_SECURITY_QOS {
unsigned long Version;		unsigned long Version;

skipping to change at line 1383		skipping to change at line 1394
typedef struct _SEC_WINNT_AUTH_IDENTITY_W {		typedef struct _SEC_WINNT_AUTH_IDENTITY_W {
__field_bcount((UserLength+1)sizeof(WCHAR)) unsigned short __RPC_FAR User;		__field_bcount((UserLength+1)sizeof(WCHAR)) unsigned short __RPC_FAR User;
unsigned long UserLength;		unsigned long UserLength;
__field_bcount((DomainLength+1)sizeof(WCHAR)) unsigned short __RPC_FAR Domai n;		__field_bcount((DomainLength+1)sizeof(WCHAR)) unsigned short __RPC_FAR Domai n;
unsigned long DomainLength;		unsigned long DomainLength;
__field_bcount((PasswordLength+1)sizeof(WCHAR)) unsigned short __RPC_FAR Pas sword;		__field_bcount((PasswordLength+1)sizeof(WCHAR)) unsigned short __RPC_FAR Pas sword;
unsigned long PasswordLength;		unsigned long PasswordLength;
unsigned long Flags;		unsigned long Flags;
} SEC_WINNT_AUTH_IDENTITY_W, *PSEC_WINNT_AUTH_IDENTITY_W;		} SEC_WINNT_AUTH_IDENTITY_W, *PSEC_WINNT_AUTH_IDENTITY_W;


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
#define _AUTH_IDENTITY_A_DEFINED		#define _AUTH_IDENTITY_A_DEFINED

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

typedef struct _SEC_WINNT_AUTH_IDENTITY_A {		typedef struct _SEC_WINNT_AUTH_IDENTITY_A {
__field_ecount(UserLength+1) unsigned char __RPC_FAR *User;		__field_ecount(UserLength+1) unsigned char __RPC_FAR *User;
unsigned long UserLength;		unsigned long UserLength;
__field_ecount(DomainLength+1) unsigned char __RPC_FAR *Domain;		__field_ecount(DomainLength+1) unsigned char __RPC_FAR *Domain;
unsigned long DomainLength;		unsigned long DomainLength;
__field_ecount(PasswordLength+1) unsigned char __RPC_FAR *Password;		__field_ecount(PasswordLength+1) unsigned char __RPC_FAR *Password;
unsigned long PasswordLength;		unsigned long PasswordLength;
unsigned long Flags;		unsigned long Flags;
} SEC_WINNT_AUTH_IDENTITY_A, *PSEC_WINNT_AUTH_IDENTITY_A;		} SEC_WINNT_AUTH_IDENTITY_A, *PSEC_WINNT_AUTH_IDENTITY_A;

skipping to change at line 1414		skipping to change at line 1425
#define _SEC_WINNT_AUTH_IDENTITY _SEC_WINNT_AUTH_IDENTITY_A		#define _SEC_WINNT_AUTH_IDENTITY _SEC_WINNT_AUTH_IDENTITY_A
#endif // UNICODE		#endif // UNICODE

#if (NTDDI_VERSION >= NTDDI_WINXP)		#if (NTDDI_VERSION >= NTDDI_WINXP)

#define RPC_C_SECURITY_QOS_VERSION_2 2L		#define RPC_C_SECURITY_QOS_VERSION_2 2L

#define RPC_C_AUTHN_INFO_TYPE_HTTP 1		#define RPC_C_AUTHN_INFO_TYPE_HTTP 1

#define RPC_C_HTTP_AUTHN_TARGET_SERVER 1		#define RPC_C_HTTP_AUTHN_TARGET_SERVER 1

#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
#define RPC_C_HTTP_AUTHN_TARGET_PROXY 2		#define RPC_C_HTTP_AUTHN_TARGET_PROXY 2

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

#define RPC_C_HTTP_AUTHN_SCHEME_BASIC 0x00000001		#define RPC_C_HTTP_AUTHN_SCHEME_BASIC 0x00000001
#define RPC_C_HTTP_AUTHN_SCHEME_NTLM 0x00000002		#define RPC_C_HTTP_AUTHN_SCHEME_NTLM 0x00000002
#define RPC_C_HTTP_AUTHN_SCHEME_PASSPORT 0x00000004		#define RPC_C_HTTP_AUTHN_SCHEME_PASSPORT 0x00000004
#define RPC_C_HTTP_AUTHN_SCHEME_DIGEST 0x00000008		#define RPC_C_HTTP_AUTHN_SCHEME_DIGEST 0x00000008
#define RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE 0x00000010		#define RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE 0x00000010
#if (NTDDI_VERSION >= NTDDI_WS03)		#if (NTDDI_VERSION >= NTDDI_WS03)
#define RPC_C_HTTP_AUTHN_SCHEME_CERT 0x00010000		#define RPC_C_HTTP_AUTHN_SCHEME_CERT 0x00010000
// 0x00020000 & 0x00040000 are reserved		// 0x00020000 & 0x00040000 are reserved
#endif // (NTDDI_VERSION >= NTDDI_WS03)		#endif // (NTDDI_VERSION >= NTDDI_WS03)

#define RPC_C_HTTP_FLAG_USE_SSL 1		#define RPC_C_HTTP_FLAG_USE_SSL 1
#define RPC_C_HTTP_FLAG_USE_FIRST_AUTH_SCHEME 2		#define RPC_C_HTTP_FLAG_USE_FIRST_AUTH_SCHEME 2
#if (NTDDI_VERSION >= NTDDI_WS03)		#if (NTDDI_VERSION >= NTDDI_WS03)
#define RPC_C_HTTP_FLAG_IGNORE_CERT_CN_INVALID 8		#define RPC_C_HTTP_FLAG_IGNORE_CERT_CN_INVALID 8
#endif // (NTDDI_VERSION >= NTDDI_WS03)		#endif // (NTDDI_VERSION >= NTDDI_WS03)

		#if (NTDDI_VERSION >= NTDDI_VISTASP1)
		#define RPC_C_HTTP_FLAG_ENABLE_CERT_REVOCATION_CHECK 16
		#endif // (NTDDI_VERSION >= NTDDI_VISTASP1)

typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_W		typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_W
{		{
SEC_WINNT_AUTH_IDENTITY_W *TransportCredentials;		SEC_WINNT_AUTH_IDENTITY_W *TransportCredentials;
unsigned long Flags;		unsigned long Flags;
unsigned long AuthenticationTarget;		unsigned long AuthenticationTarget;
unsigned long NumberOfAuthnSchemes;		unsigned long NumberOfAuthnSchemes;
unsigned long *AuthnSchemes;		unsigned long *AuthnSchemes;
unsigned short __RPC_FAR *ServerCertificateSubject;		unsigned short __RPC_FAR *ServerCertificateSubject;
} RPC_HTTP_TRANSPORT_CREDENTIALS_W, *PRPC_HTTP_TRANSPORT_CREDENTIALS_W;		} RPC_HTTP_TRANSPORT_CREDENTIALS_W, *PRPC_HTTP_TRANSPORT_CREDENTIALS_W;

skipping to change at line 1454		skipping to change at line 1468
typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_A		typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_A
{		{
SEC_WINNT_AUTH_IDENTITY_A *TransportCredentials;		SEC_WINNT_AUTH_IDENTITY_A *TransportCredentials;
unsigned long Flags;		unsigned long Flags;
unsigned long AuthenticationTarget;		unsigned long AuthenticationTarget;
unsigned long NumberOfAuthnSchemes;		unsigned long NumberOfAuthnSchemes;
unsigned long *AuthnSchemes;		unsigned long *AuthnSchemes;
unsigned char __RPC_FAR *ServerCertificateSubject;		unsigned char __RPC_FAR *ServerCertificateSubject;
} RPC_HTTP_TRANSPORT_CREDENTIALS_A, *PRPC_HTTP_TRANSPORT_CREDENTIALS_A;		} RPC_HTTP_TRANSPORT_CREDENTIALS_A, *PRPC_HTTP_TRANSPORT_CREDENTIALS_A;


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)

typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_V2_W		typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_V2_W
{		{
SEC_WINNT_AUTH_IDENTITY_W *TransportCredentials;		SEC_WINNT_AUTH_IDENTITY_W *TransportCredentials;
unsigned long Flags;		unsigned long Flags;
unsigned long AuthenticationTarget;		unsigned long AuthenticationTarget;
unsigned long NumberOfAuthnSchemes;		unsigned long NumberOfAuthnSchemes;
__field_ecount(NumberOfAuthnSchemes) unsigned long *AuthnSchemes;		__field_ecount(NumberOfAuthnSchemes) unsigned long *AuthnSchemes;
unsigned short __RPC_FAR *ServerCertificateSubject;		unsigned short __RPC_FAR *ServerCertificateSubject;
SEC_WINNT_AUTH_IDENTITY_W *ProxyCredentials;		SEC_WINNT_AUTH_IDENTITY_W *ProxyCredentials;

skipping to change at line 1482		skipping to change at line 1496
unsigned long Flags;		unsigned long Flags;
unsigned long AuthenticationTarget;		unsigned long AuthenticationTarget;
unsigned long NumberOfAuthnSchemes;		unsigned long NumberOfAuthnSchemes;
unsigned long *AuthnSchemes;		unsigned long *AuthnSchemes;
unsigned char __RPC_FAR *ServerCertificateSubject;		unsigned char __RPC_FAR *ServerCertificateSubject;
SEC_WINNT_AUTH_IDENTITY_A *ProxyCredentials;		SEC_WINNT_AUTH_IDENTITY_A *ProxyCredentials;
unsigned long NumberOfProxyAuthnSchemes;		unsigned long NumberOfProxyAuthnSchemes;
unsigned long *ProxyAuthnSchemes;		unsigned long *ProxyAuthnSchemes;
} RPC_HTTP_TRANSPORT_CREDENTIALS_V2_A, *PRPC_HTTP_TRANSPORT_CREDENTIALS_V2_A;		} RPC_HTTP_TRANSPORT_CREDENTIALS_V2_A, *PRPC_HTTP_TRANSPORT_CREDENTIALS_V2_A;


#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

		#if (NTDDI_VERSION >= NTDDI_WIN7)

		typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_V3_W
		{
		RPC_AUTH_IDENTITY_HANDLE TransportCredentials;
		unsigned long Flags;
		unsigned long AuthenticationTarget;
		unsigned long NumberOfAuthnSchemes;
		__field_ecount(NumberOfAuthnSchemes) unsigned long *AuthnSchemes;
		unsigned short __RPC_FAR *ServerCertificateSubject;
		RPC_AUTH_IDENTITY_HANDLE ProxyCredentials;
		unsigned long NumberOfProxyAuthnSchemes;
		__field_ecount(NumberOfProxyAuthnSchemes) unsigned long *ProxyAuthnSchemes;
		} RPC_HTTP_TRANSPORT_CREDENTIALS_V3_W, *PRPC_HTTP_TRANSPORT_CREDENTIALS_V3_W;

		typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_V3_A
		{
		RPC_AUTH_IDENTITY_HANDLE TransportCredentials;
		unsigned long Flags;
		unsigned long AuthenticationTarget;
		unsigned long NumberOfAuthnSchemes;
		__field_ecount(NumberOfAuthnSchemes) unsigned long *AuthnSchemes;
		unsigned char __RPC_FAR *ServerCertificateSubject;
		RPC_AUTH_IDENTITY_HANDLE ProxyCredentials;
		unsigned long NumberOfProxyAuthnSchemes;
		__field_ecount(NumberOfProxyAuthnSchemes) unsigned long *ProxyAuthnSchemes;
		} RPC_HTTP_TRANSPORT_CREDENTIALS_V3_A, *PRPC_HTTP_TRANSPORT_CREDENTIALS_V3_A;

		#endif // (NTDDI_VERSION >= NTDDI_WIN7)

typedef struct _RPC_SECURITY_QOS_V2_W {		typedef struct _RPC_SECURITY_QOS_V2_W {
unsigned long Version;		unsigned long Version;
unsigned long Capabilities;		unsigned long Capabilities;
unsigned long IdentityTracking;		unsigned long IdentityTracking;
unsigned long ImpersonationType;		unsigned long ImpersonationType;
unsigned long AdditionalSecurityInfoType;		unsigned long AdditionalSecurityInfoType;
union		union
{		{
RPC_HTTP_TRANSPORT_CREDENTIALS_W *HttpCredentials;		RPC_HTTP_TRANSPORT_CREDENTIALS_W *HttpCredentials;

skipping to change at line 1538		skipping to change at line 1582
unsigned long ImpersonationType;		unsigned long ImpersonationType;
unsigned long AdditionalSecurityInfoType;		unsigned long AdditionalSecurityInfoType;
union		union
{		{
RPC_HTTP_TRANSPORT_CREDENTIALS_A *HttpCredentials;		RPC_HTTP_TRANSPORT_CREDENTIALS_A *HttpCredentials;
} u;		} u;
void *Sid;		void *Sid;
} RPC_SECURITY_QOS_V3_A, *PRPC_SECURITY_QOS_V3_A;		} RPC_SECURITY_QOS_V3_A, *PRPC_SECURITY_QOS_V3_A;
#endif // (NTDDI_VERSION >= NTDDI_WS03)		#endif // (NTDDI_VERSION >= NTDDI_WS03)


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)

#define RPC_C_SECURITY_QOS_VERSION_4 4L		#define RPC_C_SECURITY_QOS_VERSION_4 4L

typedef struct _RPC_SECURITY_QOS_V4_W {		typedef struct _RPC_SECURITY_QOS_V4_W {
unsigned long Version;		unsigned long Version;
unsigned long Capabilities;		unsigned long Capabilities;
unsigned long IdentityTracking;		unsigned long IdentityTracking;
unsigned long ImpersonationType;		unsigned long ImpersonationType;
unsigned long AdditionalSecurityInfoType;		unsigned long AdditionalSecurityInfoType;
union		union

skipping to change at line 1572		skipping to change at line 1616
union		union
{		{
RPC_HTTP_TRANSPORT_CREDENTIALS_A *HttpCredentials;		RPC_HTTP_TRANSPORT_CREDENTIALS_A *HttpCredentials;
} u;		} u;
void *Sid;		void *Sid;
unsigned int EffectiveOnly;		unsigned int EffectiveOnly;
} RPC_SECURITY_QOS_V4_A, *PRPC_SECURITY_QOS_V4_A;		} RPC_SECURITY_QOS_V4_A, *PRPC_SECURITY_QOS_V4_A;

#endif // NTDDI_WINXP		#endif // NTDDI_WINXP
#endif // _AUTH_IDENTITY_DEFINED		#endif // _AUTH_IDENTITY_DEFINED

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

#if (NTDDI_VERSION >= WINXP)		#if (NTDDI_VERSION >= WINXP)


#ifdef UNICODE		#ifdef UNICODE

#define RPC_SECURITY_QOS_V2 RPC_SECURITY_QOS_V2_W		#define RPC_SECURITY_QOS_V2 RPC_SECURITY_QOS_V2_W
#define PRPC_SECURITY_QOS_V2 PRPC_SECURITY_QOS_V2_W		#define PRPC_SECURITY_QOS_V2 PRPC_SECURITY_QOS_V2_W
#define _RPC_SECURITY_QOS_V2 _RPC_SECURITY_QOS_V2_W		#define _RPC_SECURITY_QOS_V2 _RPC_SECURITY_QOS_V2_W

#define RPC_HTTP_TRANSPORT_CREDENTIALS RPC_HTTP_TRANSPORT_CREDENTIALS_W		#define RPC_HTTP_TRANSPORT_CREDENTIALS RPC_HTTP_TRANSPORT_CREDENTIALS_W
#define PRPC_HTTP_TRANSPORT_CREDENTIALS PRPC_HTTP_TRANSPORT_CREDENTIALS_W		#define PRPC_HTTP_TRANSPORT_CREDENTIALS PRPC_HTTP_TRANSPORT_CREDENTIALS_W
#define _RPC_HTTP_TRANSPORT_CREDENTIALS _RPC_HTTP_TRANSPORT_CREDENTIALS_W		#define _RPC_HTTP_TRANSPORT_CREDENTIALS _RPC_HTTP_TRANSPORT_CREDENTIALS_W


skipping to change at line 1585		skipping to change at line 1630
#ifdef UNICODE		#ifdef UNICODE

#define RPC_SECURITY_QOS_V2 RPC_SECURITY_QOS_V2_W		#define RPC_SECURITY_QOS_V2 RPC_SECURITY_QOS_V2_W
#define PRPC_SECURITY_QOS_V2 PRPC_SECURITY_QOS_V2_W		#define PRPC_SECURITY_QOS_V2 PRPC_SECURITY_QOS_V2_W
#define _RPC_SECURITY_QOS_V2 _RPC_SECURITY_QOS_V2_W		#define _RPC_SECURITY_QOS_V2 _RPC_SECURITY_QOS_V2_W

#define RPC_HTTP_TRANSPORT_CREDENTIALS RPC_HTTP_TRANSPORT_CREDENTIALS_W		#define RPC_HTTP_TRANSPORT_CREDENTIALS RPC_HTTP_TRANSPORT_CREDENTIALS_W
#define PRPC_HTTP_TRANSPORT_CREDENTIALS PRPC_HTTP_TRANSPORT_CREDENTIALS_W		#define PRPC_HTTP_TRANSPORT_CREDENTIALS PRPC_HTTP_TRANSPORT_CREDENTIALS_W
#define _RPC_HTTP_TRANSPORT_CREDENTIALS _RPC_HTTP_TRANSPORT_CREDENTIALS_W		#define _RPC_HTTP_TRANSPORT_CREDENTIALS _RPC_HTTP_TRANSPORT_CREDENTIALS_W


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
#define RPC_HTTP_TRANSPORT_CREDENTIALS_V2 RPC_HTTP_TRANSPORT_CREDENTIALS_V2_W		#define RPC_HTTP_TRANSPORT_CREDENTIALS_V2 RPC_HTTP_TRANSPORT_CREDENTIALS_V2_W
#define PRPC_HTTP_TRANSPORT_CREDENTIALS_V2 PRPC_HTTP_TRANSPORT_CREDENTIALS_V2_W		#define PRPC_HTTP_TRANSPORT_CREDENTIALS_V2 PRPC_HTTP_TRANSPORT_CREDENTIALS_V2_W
#define _RPC_HTTP_TRANSPORT_CREDENTIALS_V2 _RPC_HTTP_TRANSPORT_CREDENTIALS_V2_W		#define _RPC_HTTP_TRANSPORT_CREDENTIALS_V2 _RPC_HTTP_TRANSPORT_CREDENTIALS_V2_W

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

		#if (NTDDI_VERSION >= NTDDI_WIN7)
		#define RPC_HTTP_TRANSPORT_CREDENTIALS_V3 RPC_HTTP_TRANSPORT_CREDENTIALS_V3_W
		#define PRPC_HTTP_TRANSPORT_CREDENTIALS_V3 PRPC_HTTP_TRANSPORT_CREDENTIALS_V3_W
		#define _RPC_HTTP_TRANSPORT_CREDENTIALS_V3 _RPC_HTTP_TRANSPORT_CREDENTIALS_V3_W
		#endif // (NTDDI_VERSION >= NTDDI_WIN7)

#if (NTDDI_VERSION >= NTDDI_WS03)		#if (NTDDI_VERSION >= NTDDI_WS03)
#define RPC_SECURITY_QOS_V3 RPC_SECURITY_QOS_V3_W		#define RPC_SECURITY_QOS_V3 RPC_SECURITY_QOS_V3_W
#define PRPC_SECURITY_QOS_V3 PRPC_SECURITY_QOS_V3_W		#define PRPC_SECURITY_QOS_V3 PRPC_SECURITY_QOS_V3_W
#define _RPC_SECURITY_QOS_V3 _RPC_SECURITY_QOS_V3_W		#define _RPC_SECURITY_QOS_V3 _RPC_SECURITY_QOS_V3_W
#endif // (NTDDI_VERSION >= NTDDI_WS03)		#endif // (NTDDI_VERSION >= NTDDI_WS03)


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
#define RPC_SECURITY_QOS_V4 RPC_SECURITY_QOS_V4_W		#define RPC_SECURITY_QOS_V4 RPC_SECURITY_QOS_V4_W
#define PRPC_SECURITY_QOS_V4 PRPC_SECURITY_QOS_V4_W		#define PRPC_SECURITY_QOS_V4 PRPC_SECURITY_QOS_V4_W
#define _RPC_SECURITY_QOS_V4 _RPC_SECURITY_QOS_V4_W		#define _RPC_SECURITY_QOS_V4 _RPC_SECURITY_QOS_V4_W

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

#else // UNICODE		#else // UNICODE

#define RPC_SECURITY_QOS_V2 RPC_SECURITY_QOS_V2_A		#define RPC_SECURITY_QOS_V2 RPC_SECURITY_QOS_V2_A
#define PRPC_SECURITY_QOS_V2 PRPC_SECURITY_QOS_V2_A		#define PRPC_SECURITY_QOS_V2 PRPC_SECURITY_QOS_V2_A
#define _RPC_SECURITY_QOS_V2 _RPC_SECURITY_QOS_V2_A		#define _RPC_SECURITY_QOS_V2 _RPC_SECURITY_QOS_V2_A

#define RPC_HTTP_TRANSPORT_CREDENTIALS RPC_HTTP_TRANSPORT_CREDENTIALS_A		#define RPC_HTTP_TRANSPORT_CREDENTIALS RPC_HTTP_TRANSPORT_CREDENTIALS_A
#define PRPC_HTTP_TRANSPORT_CREDENTIALS PRPC_HTTP_TRANSPORT_CREDENTIALS_A		#define PRPC_HTTP_TRANSPORT_CREDENTIALS PRPC_HTTP_TRANSPORT_CREDENTIALS_A
#define _RPC_HTTP_TRANSPORT_CREDENTIALS _RPC_HTTP_TRANSPORT_CREDENTIALS_A		#define _RPC_HTTP_TRANSPORT_CREDENTIALS _RPC_HTTP_TRANSPORT_CREDENTIALS_A


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
#define RPC_HTTP_TRANSPORT_CREDENTIALS_V2 RPC_HTTP_TRANSPORT_CREDENTIALS_V2_A		#define RPC_HTTP_TRANSPORT_CREDENTIALS_V2 RPC_HTTP_TRANSPORT_CREDENTIALS_V2_A
#define PRPC_HTTP_TRANSPORT_CREDENTIALS_V2 PRPC_HTTP_TRANSPORT_CREDENTIALS_V2_A		#define PRPC_HTTP_TRANSPORT_CREDENTIALS_V2 PRPC_HTTP_TRANSPORT_CREDENTIALS_V2_A
#define _RPC_HTTP_TRANSPORT_CREDENTIALS_V2 _RPC_HTTP_TRANSPORT_CREDENTIALS_V2_A		#define _RPC_HTTP_TRANSPORT_CREDENTIALS_V2 _RPC_HTTP_TRANSPORT_CREDENTIALS_V2_A

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

		#if (NTDDI_VERSION >= NTDDI_WIN7)
		#define RPC_HTTP_TRANSPORT_CREDENTIALS_V3 RPC_HTTP_TRANSPORT_CREDENTIALS_V3_A
		#define PRPC_HTTP_TRANSPORT_CREDENTIALS_V3 PRPC_HTTP_TRANSPORT_CREDENTIALS_V3_A
		#define _RPC_HTTP_TRANSPORT_CREDENTIALS_V3 _RPC_HTTP_TRANSPORT_CREDENTIALS_V3_A
		#endif // (NTDDI_VERSION >= NTDDI_WIN7)

#if (NTDDI_VERSION >= NTDDI_WS03)		#if (NTDDI_VERSION >= NTDDI_WS03)
#define RPC_SECURITY_QOS_V3 RPC_SECURITY_QOS_V3_A		#define RPC_SECURITY_QOS_V3 RPC_SECURITY_QOS_V3_A
#define PRPC_SECURITY_QOS_V3 PRPC_SECURITY_QOS_V3_A		#define PRPC_SECURITY_QOS_V3 PRPC_SECURITY_QOS_V3_A
#define _RPC_SECURITY_QOS_V3 _RPC_SECURITY_QOS_V3_A		#define _RPC_SECURITY_QOS_V3 _RPC_SECURITY_QOS_V3_A
#endif // (NTDDI_VERSION >= NTDDI_WS03)		#endif // (NTDDI_VERSION >= NTDDI_WS03)


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
#define RPC_SECURITY_QOS_V4 RPC_SECURITY_QOS_V4_A		#define RPC_SECURITY_QOS_V4 RPC_SECURITY_QOS_V4_A
#define PRPC_SECURITY_QOS_V4 PRPC_SECURITY_QOS_V4_A		#define PRPC_SECURITY_QOS_V4 PRPC_SECURITY_QOS_V4_A
#define _RPC_SECURITY_QOS_V4 _RPC_SECURITY_QOS_V4_A		#define _RPC_SECURITY_QOS_V4 _RPC_SECURITY_QOS_V4_A

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

#endif // UNICODE		#endif // UNICODE


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)

#define RPC_PROTSEQ_TCP (0x1)		#define RPC_PROTSEQ_TCP (0x1)
#define RPC_PROTSEQ_NMP (0x2)		#define RPC_PROTSEQ_NMP (0x2)
#define RPC_PROTSEQ_LRPC (0x3)		#define RPC_PROTSEQ_LRPC (0x3)
#define RPC_PROTSEQ_HTTP (0x4)		#define RPC_PROTSEQ_HTTP (0x4)

#define RPC_BHT_OBJECT_UUID_VALID (0x1)		#define RPC_BHT_OBJECT_UUID_VALID (0x1)

#define RPC_BHO_NONCAUSAL (0x1)		#define RPC_BHO_NONCAUSAL (0x1)
#define RPC_BHO_DONTLINGER (0x2)		#define RPC_BHO_DONTLINGER (0x2)

skipping to change at line 1767		skipping to change at line 1824
__in RPC_BINDING_HANDLE Binding,		__in RPC_BINDING_HANDLE Binding,
__deref_out void ** ContextHandle		__deref_out void ** ContextHandle
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcServerInqBindingHandle (		RpcServerInqBindingHandle (
__out RPC_BINDING_HANDLE * Binding		__out RPC_BINDING_HANDLE * Binding
);		);

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

#if (NTDDI_VERSION >= NTDDI_WS03)		#if (NTDDI_VERSION >= NTDDI_WS03)
typedef enum _RPC_HTTP_REDIRECTOR_STAGE		typedef enum _RPC_HTTP_REDIRECTOR_STAGE
{		{
RPCHTTP_RS_REDIRECT = 1,		RPCHTTP_RS_REDIRECT = 1,
RPCHTTP_RS_ACCESS_1,		RPCHTTP_RS_ACCESS_1,
RPCHTTP_RS_SESSION,		RPCHTTP_RS_SESSION,
RPCHTTP_RS_ACCESS_2,		RPCHTTP_RS_ACCESS_2,
RPCHTTP_RS_INTERFACE		RPCHTTP_RS_INTERFACE
} RPC_HTTP_REDIRECTOR_STAGE;		} RPC_HTTP_REDIRECTOR_STAGE;
#endif // (NTDDI_VERSION >= NTDDI_WS03)		#endif // (NTDDI_VERSION >= NTDDI_WS03)

#if (NTDDI_VERSION >= NTDDI_WS03)		#if (NTDDI_VERSION >= NTDDI_WS03)
typedef RPC_STATUS		typedef RPC_STATUS
(__RPC_USER * RPC_NEW_HTTP_PROXY_CHANNEL) (		(__RPC_USER * RPC_NEW_HTTP_PROXY_CHANNEL) (
__in RPC_HTTP_REDIRECTOR_STAGE RedirectorStage,		__in RPC_HTTP_REDIRECTOR_STAGE RedirectorStage,
__in RPC_WSTR ServerName,		__in RPC_WSTR ServerName,
__in RPC_WSTR ServerPort,		__in RPC_WSTR ServerPort,
__in_opt RPC_WSTR RemoteUser,		__in_opt RPC_WSTR RemoteUser,
__in_opt RPC_WSTR AuthType,		__in_opt RPC_WSTR AuthType,

__in_opt void __RPC_FAR * ResourceUuid,		__inout void __RPC_FAR * ResourceUuid,
__in_opt void __RPC_FAR * Metadata,		__inout void __RPC_FAR * SessionId,
__in_opt void __RPC_FAR * SessionId,
__in_opt void __RPC_FAR * Interface,		__in_opt void __RPC_FAR * Interface,
__in_opt void __RPC_FAR * Reserved,		__in_opt void __RPC_FAR * Reserved,
__in unsigned long Flags,		__in unsigned long Flags,
__deref_opt_out RPC_WSTR __RPC_FAR * NewServerName,		__deref_opt_out RPC_WSTR __RPC_FAR * NewServerName,
__deref_opt_out RPC_WSTR __RPC_FAR * NewServerPort		__deref_opt_out RPC_WSTR __RPC_FAR * NewServerPort
);		);

#else		#else

typedef RPC_STATUS		typedef RPC_STATUS
(__RPC_USER * RPC_NEW_HTTP_PROXY_CHANNEL) (		(__RPC_USER * RPC_NEW_HTTP_PROXY_CHANNEL) (

IN unsigned short __RPC_FAR *ServerName,		__in unsigned short __RPC_FAR *ServerName,
IN unsigned short __RPC_FAR *ServerPort,		__in unsigned short __RPC_FAR *ServerPort,
IN unsigned char __RPC_FAR *RemoteUser,		__in unsigned char __RPC_FAR *RemoteUser,
OUT unsigned short __RPC_FAR **NewServerName		__out unsigned short __RPC_FAR **NewServerName
);		);
#endif // (NTDDI_VERSION >= NTDDI_WS03)		#endif // (NTDDI_VERSION >= NTDDI_WS03)

typedef void		typedef void
(__RPC_USER * RPC_HTTP_PROXY_FREE_STRING) (		(__RPC_USER * RPC_HTTP_PROXY_FREE_STRING) (
__in RPC_WSTR String		__in RPC_WSTR String
);		);
#endif // (NTDDI_VERSION >= NTDDI_WINXP)		#endif // (NTDDI_VERSION >= NTDDI_WINXP)

#define RPC_C_AUTHZ_NONE 0		#define RPC_C_AUTHZ_NONE 0

skipping to change at line 2530		skipping to change at line 2586
#define RPC_C_MGMT_IS_SERVER_LISTEN 3		#define RPC_C_MGMT_IS_SERVER_LISTEN 3
#define RPC_C_MGMT_STOP_SERVER_LISTEN 4		#define RPC_C_MGMT_STOP_SERVER_LISTEN 4

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcMgmtSetAuthorizationFn (		RpcMgmtSetAuthorizationFn (
__in RPC_MGMT_AUTHORIZATION_FN AuthorizationFn		__in RPC_MGMT_AUTHORIZATION_FN AuthorizationFn
);		);


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
RPCRTAPI		RPCRTAPI
int		int
RPC_ENTRY		RPC_ENTRY
RpcExceptionFilter (		RpcExceptionFilter (
__in unsigned long ExceptionCode		__in unsigned long ExceptionCode
);		);

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

#define RPC_C_PARM_MAX_PACKET_LENGTH 1		#define RPC_C_PARM_MAX_PACKET_LENGTH 1
#define RPC_C_PARM_BUFFER_LENGTH 2		#define RPC_C_PARM_BUFFER_LENGTH 2

#define RPC_IF_AUTOLISTEN 0x0001		#define RPC_IF_AUTOLISTEN 0x0001
#define RPC_IF_OLE 0x0002		#define RPC_IF_OLE 0x0002
#define RPC_IF_ALLOW_UNKNOWN_AUTHORITY 0x0004		#define RPC_IF_ALLOW_UNKNOWN_AUTHORITY 0x0004
#define RPC_IF_ALLOW_SECURE_ONLY 0x0008		#define RPC_IF_ALLOW_SECURE_ONLY 0x0008
#define RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH 0x0010		#define RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH 0x0010
#define RPC_IF_ALLOW_LOCAL_ONLY 0x0020		#define RPC_IF_ALLOW_LOCAL_ONLY 0x0020
#define RPC_IF_SEC_NO_CACHE 0x0040		#define RPC_IF_SEC_NO_CACHE 0x0040

#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
#define RPC_IF_SEC_CACHE_PER_PROC 0x0080		#define RPC_IF_SEC_CACHE_PER_PROC 0x0080
#define RPC_IF_ASYNC_CALLBACK 0x0100		#define RPC_IF_ASYNC_CALLBACK 0x0100

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
#define RPC_FW_IF_FLAG_DCOM 0x0001		#define RPC_FW_IF_FLAG_DCOM 0x0001

#endif // (NTDDI_VERSION >= NTDDI_LONGHORN)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)

#include <rpcdcep.h>		#include <rpcdcep.h>

#ifdef __cplusplus		#ifdef __cplusplus
}		}
#endif		#endif

#endif /* __RPCDCE_H__ */		#endif /* __RPCDCE_H__ */

End of changes. 40 change blocks.
41 lines changed or deleted		97 lines changed or added

rpcndr.h (6.0.6002.18005-Windows 6.0)		rpcndr.h (6.1.7601.23418-Windows 7.0)

skipping to change at line 115		skipping to change at line 115
#define NDR_LOCAL_ENDIAN NDR_BIG_ENDIAN		#define NDR_LOCAL_ENDIAN NDR_BIG_ENDIAN
#else		#else
#define NDR_LOCAL_DATA_REPRESENTATION (unsigned long)0X00000010L		#define NDR_LOCAL_DATA_REPRESENTATION (unsigned long)0X00000010L
#define NDR_LOCAL_ENDIAN NDR_LITTLE_ENDIAN		#define NDR_LOCAL_ENDIAN NDR_LITTLE_ENDIAN
#endif		#endif

/****************************************************************************		/****************************************************************************
* Macros for targeted platforms		* Macros for targeted platforms
****************************************************************************/		****************************************************************************/


		#if (0x601 <= _WIN32_WINNT)
		#define TARGET_IS_NT61_OR_LATER 1
		#else
		#define TARGET_IS_NT61_OR_LATER 0
		#endif

#if (0x600 <= _WIN32_WINNT)		#if (0x600 <= _WIN32_WINNT)
#define TARGET_IS_NT60_OR_LATER 1		#define TARGET_IS_NT60_OR_LATER 1
#else		#else
#define TARGET_IS_NT60_OR_LATER 0		#define TARGET_IS_NT60_OR_LATER 0
#endif		#endif

#if (0x501 <= _WIN32_WINNT)		#if (0x501 <= _WIN32_WINNT)
#define TARGET_IS_NT51_OR_LATER 1		#define TARGET_IS_NT51_OR_LATER 1
#else		#else
#define TARGET_IS_NT51_OR_LATER 0		#define TARGET_IS_NT51_OR_LATER 0

skipping to change at line 195		skipping to change at line 201
#define __RPC_CALLEE		#define __RPC_CALLEE
#endif		#endif
#endif		#endif

#ifndef __MIDL_USER_DEFINED		#ifndef __MIDL_USER_DEFINED
#define midl_user_allocate MIDL_user_allocate		#define midl_user_allocate MIDL_user_allocate
#define midl_user_free MIDL_user_free		#define midl_user_free MIDL_user_free
#define __MIDL_USER_DEFINED		#define __MIDL_USER_DEFINED
#endif		#endif


__post __maybenull		__bcount_opt(size)
__post __writableTo(byteCount(size))
void * __RPC_USER MIDL_user_allocate(size_t size);		void * __RPC_USER MIDL_user_allocate(size_t size);
void __RPC_USER MIDL_user_free( __inout void * );		void __RPC_USER MIDL_user_free( __inout void * );


__post __maybenull		__bcount_opt(size)
__post __writableTo(pre byteCount(size))
void * __RPC_USER I_RpcDefaultAllocate(		void * __RPC_USER I_RpcDefaultAllocate(
handle_t bh, size_t size, void * (* RealAlloc)(size_t) );		handle_t bh, size_t size, void * (* RealAlloc)(size_t) );

void __RPC_USER I_RpcDefaultFree(		void __RPC_USER I_RpcDefaultFree(
handle_t bh, void , void (RealFree)(void *) );		handle_t bh, void , void (RealFree)(void *) );

#define RPC_VAR_ENTRY __cdecl		#define RPC_VAR_ENTRY __cdecl

/* winnt only */		/* winnt only */
#if defined(_M_IX86) \|\| defined(_M_AMD64) \|\| defined(_M_IA64)		#if defined(_M_IX86) \|\| defined(_M_AMD64) \|\| defined(_M_IA64)

skipping to change at line 252		skipping to change at line 256

typedef struct _SCONTEXT_QUEUE {		typedef struct _SCONTEXT_QUEUE {
unsigned long NumberOfObjects;		unsigned long NumberOfObjects;
NDR_SCONTEXT * ArrayOfObjects;		NDR_SCONTEXT * ArrayOfObjects;
} SCONTEXT_QUEUE, * PSCONTEXT_QUEUE;		} SCONTEXT_QUEUE, * PSCONTEXT_QUEUE;

RPCRTAPI		RPCRTAPI
RPC_BINDING_HANDLE		RPC_BINDING_HANDLE
RPC_ENTRY		RPC_ENTRY
NDRCContextBinding (		NDRCContextBinding (

IN NDR_CCONTEXT CContext		__in NDR_CCONTEXT CContext
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NDRCContextMarshall (		NDRCContextMarshall (

IN NDR_CCONTEXT CContext,		__in NDR_CCONTEXT CContext,
OUT void *pBuff		__out void *pBuff
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NDRCContextUnmarshall (		NDRCContextUnmarshall (
__inout NDR_CCONTEXT * pCContext,		__inout NDR_CCONTEXT * pCContext,
__in RPC_BINDING_HANDLE hBinding,		__in RPC_BINDING_HANDLE hBinding,
__in void * pBuff,		__in void * pBuff,
__in unsigned long DataRepresentation		__in unsigned long DataRepresentation

skipping to change at line 287		skipping to change at line 291
__inout NDR_CCONTEXT * pCContext,		__inout NDR_CCONTEXT * pCContext,
__in RPC_BINDING_HANDLE hBinding,		__in RPC_BINDING_HANDLE hBinding,
__in void * pBuff,		__in void * pBuff,
__in unsigned long DataRepresentation		__in unsigned long DataRepresentation
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NDRSContextMarshall (		NDRSContextMarshall (

IN NDR_SCONTEXT CContext,		__in NDR_SCONTEXT CContext,
OUT void * pBuff,		__out void * pBuff,
IN NDR_RUNDOWN userRunDownIn		__in NDR_RUNDOWN userRunDownIn
);		);

RPCRTAPI		RPCRTAPI
NDR_SCONTEXT		NDR_SCONTEXT
RPC_ENTRY		RPC_ENTRY
NDRSContextUnmarshall (		NDRSContextUnmarshall (

IN void * pBuff,		__in void * pBuff,
IN unsigned long DataRepresentation		__in unsigned long DataRepresentation
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NDRSContextMarshallEx (		NDRSContextMarshallEx (

IN RPC_BINDING_HANDLE BindingHandle,		__in RPC_BINDING_HANDLE BindingHandle,
IN NDR_SCONTEXT CContext,		__in NDR_SCONTEXT CContext,
OUT void * pBuff,		__out void * pBuff,
IN NDR_RUNDOWN userRunDownIn		__in NDR_RUNDOWN userRunDownIn
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NDRSContextMarshall2 (		NDRSContextMarshall2 (

IN RPC_BINDING_HANDLE BindingHandle,		__in RPC_BINDING_HANDLE BindingHandle,
IN NDR_SCONTEXT CContext,		__in NDR_SCONTEXT CContext,
OUT void * pBuff,		__out void * pBuff,
IN NDR_RUNDOWN userRunDownIn,		__in NDR_RUNDOWN userRunDownIn,
IN void * CtxGuard,		__in void * CtxGuard,
IN unsigned long Flags		__in unsigned long Flags
);		);

RPCRTAPI		RPCRTAPI
NDR_SCONTEXT		NDR_SCONTEXT
RPC_ENTRY		RPC_ENTRY
NDRSContextUnmarshallEx (		NDRSContextUnmarshallEx (

IN RPC_BINDING_HANDLE BindingHandle,		__in RPC_BINDING_HANDLE BindingHandle,
IN void * pBuff,		__in void * pBuff,
IN unsigned long DataRepresentation		__in unsigned long DataRepresentation
);		);

RPCRTAPI		RPCRTAPI
NDR_SCONTEXT		NDR_SCONTEXT
RPC_ENTRY		RPC_ENTRY
NDRSContextUnmarshall2(		NDRSContextUnmarshall2(

IN RPC_BINDING_HANDLE BindingHandle,		__in RPC_BINDING_HANDLE BindingHandle,
IN void * pBuff,		__in void * pBuff,
IN unsigned long DataRepresentation,		__in unsigned long DataRepresentation,
IN void * CtxGuard,		__in void * CtxGuard,
IN unsigned long Flags		__in unsigned long Flags
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
RpcSsDestroyClientContext (		RpcSsDestroyClientContext (

IN void * * ContextHandle		__in void * * ContextHandle
);		);

/****************************************************************************		/****************************************************************************
NDR conversion related definitions.		NDR conversion related definitions.
****************************************************************************/		****************************************************************************/

#define byte_from_ndr(source, target) \		#define byte_from_ndr(source, target) \
{ \		{ \
(target) = ((char *)&(source)->Buffer)++; \		(target) = ((char *)&(source)->Buffer)++; \
}		}

skipping to change at line 1029		skipping to change at line 1033

} MIDL_STUB_DESC;		} MIDL_STUB_DESC;

typedef const MIDL_STUB_DESC * PMIDL_STUB_DESC;		typedef const MIDL_STUB_DESC * PMIDL_STUB_DESC;

typedef void * PMIDL_XMIT_TYPE;		typedef void * PMIDL_XMIT_TYPE;

/*		/*
* MIDL Stub Format String. This is a const in the stub.		* MIDL Stub Format String. This is a const in the stub.
*/		*/

		#if defined(_MSC_EXTENSIONS)
#if !defined( RC_INVOKED )		#if !defined( RC_INVOKED )
#if _MSC_VER >= 1200		#if _MSC_VER >= 1200
#pragma warning(push)		#pragma warning(push)
#endif		#endif
#pragma warning( disable:4200 )		#pragma warning( disable:4200 )
#endif		#endif
typedef struct _MIDL_FORMAT_STRING		typedef struct _MIDL_FORMAT_STRING
{		{
short Pad;		short Pad;
unsigned char Format[];		unsigned char Format[];
} MIDL_FORMAT_STRING;		} MIDL_FORMAT_STRING;
#if !defined( RC_INVOKED )		#if !defined( RC_INVOKED )
#if _MSC_VER >= 1200		#if _MSC_VER >= 1200
#pragma warning(pop)		#pragma warning(pop)
#else		#else
#pragma warning( default:4200 )		#pragma warning( default:4200 )
#endif		#endif
#endif		#endif

		#endif /* _MSC_EXTENSIONS */

/*		/*
* Stub thunk used for some interpreted server stubs.		* Stub thunk used for some interpreted server stubs.
*/		*/
typedef void ( __RPC_API * STUB_THUNK)( PMIDL_STUB_MESSAGE );		typedef void ( __RPC_API * STUB_THUNK)( PMIDL_STUB_MESSAGE );

#ifndef _MANAGED		#ifndef _MANAGED
typedef long ( __RPC_API * SERVER_ROUTINE)();		typedef long ( __RPC_API * SERVER_ROUTINE)();
#else		#else
typedef long ( __RPC_API * SERVER_ROUTINE)(void);		typedef long ( __RPC_API * SERVER_ROUTINE)(void);

skipping to change at line 1138		skipping to change at line 1144
unsigned long NextRefId;		unsigned long NextRefId;
XLAT_SIDE XlatSide;		XLAT_SIDE XlatSide;
} FULL_PTR_XLAT_TABLES, *PFULL_PTR_XLAT_TABLES;		} FULL_PTR_XLAT_TABLES, *PFULL_PTR_XLAT_TABLES;

/***************************************************************************		/***************************************************************************
** New MIDL 2.0 Ndr routine templates		** New MIDL 2.0 Ndr routine templates
***************************************************************************/		***************************************************************************/

RPC_STATUS RPC_ENTRY		RPC_STATUS RPC_ENTRY
NdrClientGetSupportedSyntaxes(		NdrClientGetSupportedSyntaxes(

IN RPC_CLIENT_INTERFACE * pInf,		__in RPC_CLIENT_INTERFACE * pInf,
OUT unsigned long * pCount,		__out unsigned long * pCount,
OUT MIDL_SYNTAX_INFO ** pArr );		__out MIDL_SYNTAX_INFO ** pArr );

RPC_STATUS RPC_ENTRY		RPC_STATUS RPC_ENTRY
NdrServerGetSupportedSyntaxes(		NdrServerGetSupportedSyntaxes(

IN RPC_SERVER_INTERFACE * pInf,		__in RPC_SERVER_INTERFACE * pInf,
OUT unsigned long * pCount,		__out unsigned long * pCount,
OUT MIDL_SYNTAX_INFO ** pArr,		__out MIDL_SYNTAX_INFO ** pArr,
OUT unsigned long * pPreferSyntaxIndex);		__out unsigned long * pPreferSyntaxIndex);

/*		/*
* Marshall routines		* Marshall routines
*/		*/

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrSimpleTypeMarshall(		NdrSimpleTypeMarshall(
PMIDL_STUB_MESSAGE pStubMsg,		PMIDL_STUB_MESSAGE pStubMsg,

skipping to change at line 1674		skipping to change at line 1680
NdrServerContextUnmarshall(		NdrServerContextUnmarshall(
PMIDL_STUB_MESSAGE pStubMsg		PMIDL_STUB_MESSAGE pStubMsg
);		);

/* New context handle flavors */		/* New context handle flavors */

RPCRTAPI		RPCRTAPI
NDR_SCONTEXT		NDR_SCONTEXT
RPC_ENTRY		RPC_ENTRY
NdrContextHandleInitialize(		NdrContextHandleInitialize(

IN PMIDL_STUB_MESSAGE pStubMsg,		__in PMIDL_STUB_MESSAGE pStubMsg,
IN PFORMAT_STRING pFormat		__in PFORMAT_STRING pFormat
);		);

RPCRTAPI		RPCRTAPI
NDR_SCONTEXT		NDR_SCONTEXT
RPC_ENTRY		RPC_ENTRY
NdrServerContextNewUnmarshall(		NdrServerContextNewUnmarshall(

IN PMIDL_STUB_MESSAGE pStubMsg,		__in PMIDL_STUB_MESSAGE pStubMsg,
IN PFORMAT_STRING pFormat		__in PFORMAT_STRING pFormat
);		);

/*		/*
* Buffer sizing routines		* Buffer sizing routines
*/		*/

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrPointerBufferSize(		NdrPointerBufferSize(

skipping to change at line 2495		skipping to change at line 2501
struct IRpcStubBuffer * pThis,		struct IRpcStubBuffer * pThis,
struct IRpcChannelBuffer * pChannel,		struct IRpcChannelBuffer * pChannel,
PRPC_MESSAGE pRpcMsg,		PRPC_MESSAGE pRpcMsg,
unsigned long * pdwStubPhase		unsigned long * pdwStubPhase
);		);

RPCRTAPI		RPCRTAPI
long		long
RPC_ENTRY		RPC_ENTRY
NdrStubCall2(		NdrStubCall2(

struct IRpcStubBuffer * pThis,		void * pThis, // struct IRpcStubBuffer
struct IRpcChannelBuffer * pChannel,		void * pChannel, // struct IRpcChannelBuffer
PRPC_MESSAGE pRpcMsg,		PRPC_MESSAGE pRpcMsg,
unsigned long * pdwStubPhase		unsigned long * pdwStubPhase
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrServerCall2(		NdrServerCall2(
PRPC_MESSAGE pRpcMsg		PRPC_MESSAGE pRpcMsg
);		);

RPCRTAPI		RPCRTAPI
long		long
RPC_ENTRY		RPC_ENTRY
NdrStubCall (		NdrStubCall (

struct IRpcStubBuffer * pThis,		void * pThis, // struct IRpcStubBuffer
struct IRpcChannelBuffer * pChannel,		void * pChannel, // struct IRpcChannelBuffer
PRPC_MESSAGE pRpcMsg,		PRPC_MESSAGE pRpcMsg,
unsigned long * pdwStubPhase		unsigned long * pdwStubPhase
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrServerCall(		NdrServerCall(
PRPC_MESSAGE pRpcMsg		PRPC_MESSAGE pRpcMsg
);		);

RPCRTAPI		RPCRTAPI
int		int
RPC_ENTRY		RPC_ENTRY
NdrServerUnmarshall(		NdrServerUnmarshall(

struct IRpcChannelBuffer * pChannel,		void * pChannel, // Converted to struct IRpcChannelBuffer
PRPC_MESSAGE pRpcMsg,		PRPC_MESSAGE pRpcMsg,
PMIDL_STUB_MESSAGE pStubMsg,		PMIDL_STUB_MESSAGE pStubMsg,
PMIDL_STUB_DESC pStubDescriptor,		PMIDL_STUB_DESC pStubDescriptor,
PFORMAT_STRING pFormat,		PFORMAT_STRING pFormat,
void * pParamList		void * pParamList
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrServerMarshall(		NdrServerMarshall(

struct IRpcStubBuffer * pThis,		void * pThis, //Converted to struct IRpcStubBuffer
struct IRpcChannelBuffer * pChannel,		void * pChannel, // Converted to struct IRpcChannelBuffer
PMIDL_STUB_MESSAGE pStubMsg,		PMIDL_STUB_MESSAGE pStubMsg,
PFORMAT_STRING pFormat		PFORMAT_STRING pFormat
);		);

/* Comm and Fault status */		/* Comm and Fault status */

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
NdrMapCommAndFaultStatus(		NdrMapCommAndFaultStatus(

skipping to change at line 2567		skipping to change at line 2573
);		);

/****************************************************************************		/****************************************************************************
MIDL 2.0 memory package: rpc_ss_* rpc_sm_*		MIDL 2.0 memory package: rpc_ss_* rpc_sm_*
****************************************************************************/		****************************************************************************/

typedef void * RPC_SS_THREAD_HANDLE;		typedef void * RPC_SS_THREAD_HANDLE;

typedef void * __RPC_API		typedef void * __RPC_API
RPC_CLIENT_ALLOC (		RPC_CLIENT_ALLOC (

IN size_t Size		__in size_t Size
);		);

typedef void __RPC_API		typedef void __RPC_API
RPC_CLIENT_FREE (		RPC_CLIENT_FREE (

IN void * Ptr		__in void * Ptr
);		);

/*++		/*++
RpcSs* package		RpcSs* package
--*/		--*/

RPCRTAPI		RPCRTAPI
void *		void *
RPC_ENTRY		RPC_ENTRY
RpcSsAllocate (		RpcSsAllocate (

IN size_t Size		__in size_t Size
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
RpcSsDisableAllocate (		RpcSsDisableAllocate (
void		void
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
RpcSsEnableAllocate (		RpcSsEnableAllocate (
void		void
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
RpcSsFree (		RpcSsFree (

IN void * NodeToFree		__in void * NodeToFree
);		);

RPCRTAPI		RPCRTAPI
RPC_SS_THREAD_HANDLE		RPC_SS_THREAD_HANDLE
RPC_ENTRY		RPC_ENTRY
RpcSsGetThreadHandle (		RpcSsGetThreadHandle (
void		void
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
RpcSsSetClientAllocFree (		RpcSsSetClientAllocFree (

IN RPC_CLIENT_ALLOC * ClientAlloc,		__in RPC_CLIENT_ALLOC * ClientAlloc,
IN RPC_CLIENT_FREE * ClientFree		__in RPC_CLIENT_FREE * ClientFree
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
RpcSsSetThreadHandle (		RpcSsSetThreadHandle (

IN RPC_SS_THREAD_HANDLE Id		__in RPC_SS_THREAD_HANDLE Id
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
RpcSsSwapClientAllocFree (		RpcSsSwapClientAllocFree (

IN RPC_CLIENT_ALLOC * ClientAlloc,		__in RPC_CLIENT_ALLOC * ClientAlloc,
IN RPC_CLIENT_FREE * ClientFree,		__in RPC_CLIENT_FREE * ClientFree,
OUT RPC_CLIENT_ALLOC * * OldClientAlloc,		__out RPC_CLIENT_ALLOC * * OldClientAlloc,
OUT RPC_CLIENT_FREE * * OldClientFree		__out RPC_CLIENT_FREE * * OldClientFree
);		);

/*++		/*++
RpcSm* package		RpcSm* package
--*/		--*/

RPCRTAPI		RPCRTAPI
void *		void *
RPC_ENTRY		RPC_ENTRY
RpcSmAllocate (		RpcSmAllocate (

IN size_t Size,		__in size_t Size,
OUT RPC_STATUS * pStatus		__out RPC_STATUS * pStatus
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcSmClientFree (		RpcSmClientFree (

IN void * pNodeToFree		__in void * pNodeToFree
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcSmDestroyClientContext (		RpcSmDestroyClientContext (

IN void * * ContextHandle		__in void * * ContextHandle
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcSmDisableAllocate (		RpcSmDisableAllocate (
void		void
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcSmEnableAllocate (		RpcSmEnableAllocate (
void		void
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcSmFree (		RpcSmFree (

IN void * NodeToFree		__in void * NodeToFree
);		);

RPCRTAPI		RPCRTAPI
RPC_SS_THREAD_HANDLE		RPC_SS_THREAD_HANDLE
RPC_ENTRY		RPC_ENTRY
RpcSmGetThreadHandle (		RpcSmGetThreadHandle (

OUT RPC_STATUS * pStatus		__out RPC_STATUS * pStatus
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcSmSetClientAllocFree (		RpcSmSetClientAllocFree (

IN RPC_CLIENT_ALLOC * ClientAlloc,		__in RPC_CLIENT_ALLOC * ClientAlloc,
IN RPC_CLIENT_FREE * ClientFree		__in RPC_CLIENT_FREE * ClientFree
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcSmSetThreadHandle (		RpcSmSetThreadHandle (

IN RPC_SS_THREAD_HANDLE Id		__in RPC_SS_THREAD_HANDLE Id
);		);

RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcSmSwapClientAllocFree (		RpcSmSwapClientAllocFree (

IN RPC_CLIENT_ALLOC * ClientAlloc,		__in RPC_CLIENT_ALLOC * ClientAlloc,
IN RPC_CLIENT_FREE * ClientFree,		__in RPC_CLIENT_FREE * ClientFree,
OUT RPC_CLIENT_ALLOC * * OldClientAlloc,		__out RPC_CLIENT_ALLOC * * OldClientAlloc,
OUT RPC_CLIENT_FREE * * OldClientFree		__out RPC_CLIENT_FREE * * OldClientFree
);		);

/*++		/*++
Ndr stub entry points		Ndr stub entry points
--*/		--*/

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrRpcSsEnableAllocate(		NdrRpcSsEnableAllocate(

skipping to change at line 2744		skipping to change at line 2750
RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrRpcSmSetClientToOsf(		NdrRpcSmSetClientToOsf(
PMIDL_STUB_MESSAGE pMessage );		PMIDL_STUB_MESSAGE pMessage );

RPCRTAPI		RPCRTAPI
void *		void *
RPC_ENTRY		RPC_ENTRY
NdrRpcSmClientAllocate (		NdrRpcSmClientAllocate (

IN size_t Size		__in size_t Size
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrRpcSmClientFree (		NdrRpcSmClientFree (

IN void * NodeToFree		__in void * NodeToFree
);		);

RPCRTAPI		RPCRTAPI
void *		void *
RPC_ENTRY		RPC_ENTRY
NdrRpcSsDefaultAllocate (		NdrRpcSsDefaultAllocate (

IN size_t Size		__in size_t Size
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrRpcSsDefaultFree (		NdrRpcSsDefaultFree (

IN void * NodeToFree		__in void * NodeToFree
);		);

/****************************************************************************		/****************************************************************************
end of memory package: rpc_ss_* rpc_sm_*		end of memory package: rpc_ss_* rpc_sm_*
****************************************************************************/		****************************************************************************/

/****************************************************************************		/****************************************************************************
* Full Pointer APIs		* Full Pointer APIs
****************************************************************************/		****************************************************************************/


skipping to change at line 2816		skipping to change at line 2822
);		);

/****************************************************************************		/****************************************************************************
* Proxy APIs		* Proxy APIs
****************************************************************************/		****************************************************************************/

RPCRTAPI		RPCRTAPI
void *		void *
RPC_ENTRY		RPC_ENTRY
NdrOleAllocate (		NdrOleAllocate (

IN size_t Size		__in size_t Size
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrOleFree (		NdrOleFree (

IN void * NodeToFree		__in void * NodeToFree
);		);

#ifdef CONST_VTABLE		#ifdef CONST_VTABLE
#define CONST_VTBL const		#define CONST_VTBL const
#else		#else
#define CONST_VTBL		#define CONST_VTBL
#endif		#endif

/****************************************************************************		/****************************************************************************
* VC COM support		* VC COM support

skipping to change at line 2895		skipping to change at line 2901
#pragma warning(push)		#pragma warning(push)
#endif		#endif
#pragma warning(disable:4201)		#pragma warning(disable:4201)
#endif		#endif

typedef struct _NDR_USER_MARSHAL_INFO		typedef struct _NDR_USER_MARSHAL_INFO
{		{
unsigned long InformationLevel;		unsigned long InformationLevel;
union {		union {
NDR_USER_MARSHAL_INFO_LEVEL1 Level1;		NDR_USER_MARSHAL_INFO_LEVEL1 Level1;

};		} DUMMYUNIONNAME;
} NDR_USER_MARSHAL_INFO;		} NDR_USER_MARSHAL_INFO;

#if !defined( RC_INVOKED )		#if !defined( RC_INVOKED )
#if _MSC_VER >= 1200		#if _MSC_VER >= 1200
#pragma warning(pop)		#pragma warning(pop)
#else		#else
#pragma warning(default:4201)		#pragma warning(default:4201)
#endif		#endif
#endif		#endif

RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
NdrGetUserMarshalInfo (		NdrGetUserMarshalInfo (

IN unsigned long * pFlags,		__in unsigned long * pFlags,
IN unsigned long InformationLevel,		__in unsigned long InformationLevel,
OUT NDR_USER_MARSHAL_INFO * pMarshalInfo		__out NDR_USER_MARSHAL_INFO * pMarshalInfo
);		);

/****************************************************************************		/****************************************************************************
* 64bit APIs		* 64bit APIs
****************************************************************************/		****************************************************************************/
RPC_STATUS RPC_ENTRY		RPC_STATUS RPC_ENTRY
NdrCreateServerInterfaceFromStub(		NdrCreateServerInterfaceFromStub(

IN struct IRpcStubBuffer* pStub,		__in struct IRpcStubBuffer* pStub,
IN OUT RPC_SERVER_INTERFACE *pServerIf );		__inout RPC_SERVER_INTERFACE *pServerIf );

/*		/*
* Interpreter calls		* Interpreter calls
*/		*/
CLIENT_CALL_RETURN RPC_VAR_ENTRY		CLIENT_CALL_RETURN RPC_VAR_ENTRY
NdrClientCall3(		NdrClientCall3(
MIDL_STUBLESS_PROXY_INFO *pProxyInfo,		MIDL_STUBLESS_PROXY_INFO *pProxyInfo,
unsigned long nProcNum,		unsigned long nProcNum,
void * pReturnValue,		void * pReturnValue,
...		...

skipping to change at line 2997		skipping to change at line 3003
struct IRpcStubBuffer * pThis,		struct IRpcStubBuffer * pThis,
struct IRpcChannelBuffer * pChannel,		struct IRpcChannelBuffer * pChannel,
PRPC_MESSAGE pRpcMsg,		PRPC_MESSAGE pRpcMsg,
unsigned long * pdwStubPhase		unsigned long * pdwStubPhase
);		);

RPCRTAPI		RPCRTAPI
long		long
RPC_ENTRY		RPC_ENTRY
NdrStubCall3 (		NdrStubCall3 (

struct IRpcStubBuffer * pThis,		void * pThis, // struct IRpcStubBuffer
struct IRpcChannelBuffer * pChannel,		void * pChannel, // struct IRpcChannelBuffer
PRPC_MESSAGE pRpcMsg,		PRPC_MESSAGE pRpcMsg,
unsigned long * pdwStubPhase		unsigned long * pdwStubPhase
);		);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrServerCallAll(		NdrServerCallAll(
PRPC_MESSAGE pRpcMsg		PRPC_MESSAGE pRpcMsg
);		);

End of changes. 47 change blocks.
87 lines changed or deleted		93 lines changed or added

rpcproxy.h (6.0.6002.18005-Windows 6.0)		rpcproxy.h (6.1.7601.23418-Windows 7.0)

skipping to change at line 339		skipping to change at line 339
HRESULT STDMETHODCALLTYPE		HRESULT STDMETHODCALLTYPE
CStdStubBuffer_DebugServerQueryInterface(		CStdStubBuffer_DebugServerQueryInterface(
IRpcStubBuffer * This,		IRpcStubBuffer * This,
void **ppv);		void **ppv);

void STDMETHODCALLTYPE		void STDMETHODCALLTYPE
CStdStubBuffer_DebugServerRelease(		CStdStubBuffer_DebugServerRelease(
IRpcStubBuffer * This,		IRpcStubBuffer * This,
void *pv);		void *pv);


		void ObjectStublessClient3(void);
		void ObjectStublessClient4(void);
		void ObjectStublessClient5(void);
		void ObjectStublessClient6(void);
		void ObjectStublessClient7(void);
		void ObjectStublessClient8(void);
		void ObjectStublessClient9(void);
		void ObjectStublessClient10(void);
		void ObjectStublessClient11(void);
		void ObjectStublessClient12(void);
		void ObjectStublessClient13(void);
		void ObjectStublessClient14(void);
		void ObjectStublessClient15(void);
		void ObjectStublessClient16(void);
		void ObjectStublessClient17(void);
		void ObjectStublessClient18(void);
		void ObjectStublessClient19(void);
		void ObjectStublessClient20(void);
		void ObjectStublessClient21(void);
		void ObjectStublessClient22(void);
		void ObjectStublessClient23(void);
		void ObjectStublessClient24(void);
		void ObjectStublessClient25(void);
		void ObjectStublessClient26(void);
		void ObjectStublessClient27(void);
		void ObjectStublessClient28(void);
		void ObjectStublessClient29(void);
		void ObjectStublessClient30(void);
		void ObjectStublessClient31(void);
		void ObjectStublessClient32(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction3(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction4(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction5(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction6(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction7(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction8(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction9(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction10(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction11(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction12(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction13(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction14(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction15(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction16(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction17(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction18(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction19(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction20(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction21(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction22(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction23(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction24(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction25(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction26(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction27(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction28(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction29(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction30(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction31(void);

		void STDMETHODCALLTYPE
		NdrProxyForwardingFunction32(void);

#define CStdStubBuffer_METHODS \		#define CStdStubBuffer_METHODS \
CStdStubBuffer_QueryInterface,\		CStdStubBuffer_QueryInterface,\
CStdStubBuffer_AddRef, \		CStdStubBuffer_AddRef, \
CStdStubBuffer_Release, \		CStdStubBuffer_Release, \
CStdStubBuffer_Connect, \		CStdStubBuffer_Connect, \
CStdStubBuffer_Disconnect, \		CStdStubBuffer_Disconnect, \
CStdStubBuffer_Invoke, \		CStdStubBuffer_Invoke, \
CStdStubBuffer_IsIIDSupported, \		CStdStubBuffer_IsIIDSupported, \
CStdStubBuffer_CountRefs, \		CStdStubBuffer_CountRefs, \
CStdStubBuffer_DebugServerQueryInterface, \		CStdStubBuffer_DebugServerQueryInterface, \

skipping to change at line 565		skipping to change at line 686
#define DLLDATA_GETPROXYDLLINFO(pPFList,pClsid) \		#define DLLDATA_GETPROXYDLLINFO(pPFList,pClsid) \
void RPC_ENTRY GetProxyDllInfo( const ProxyFileInfo* pInfo, const CLSID pId ) \		void RPC_ENTRY GetProxyDllInfo( const ProxyFileInfo* pInfo, const CLSID pId ) \
{ \		{ \
*pInfo = pPFList; \		*pInfo = pPFList; \
*pId = pClsid; \		*pId = pClsid; \
};		};

// ole entry points:		// ole entry points:
#define DLLGETCLASSOBJECTROUTINE(pPFlist, pClsid,pFactory) \		#define DLLGETCLASSOBJECTROUTINE(pPFlist, pClsid,pFactory) \
HRESULT STDAPICALLTYPE DLLGETCLASSOBJECT_ENTRY ( \		HRESULT STDAPICALLTYPE DLLGETCLASSOBJECT_ENTRY ( \

REFCLSID rclsid, \		__in REFCLSID rclsid, \
REFIID riid, \		__in REFIID riid, \
void ** ppv ) \		__deref_out void ** ppv ) \
{ \		{ \
return \		return \
NdrDllGetClassObject(rclsid,riid,ppv,pPFlist,pClsid,pFactory ); \		NdrDllGetClassObject(rclsid,riid,ppv,pPFlist,pClsid,pFactory ); \
}		}

#define DLLCANUNLOADNOW(pFactory) \		#define DLLCANUNLOADNOW(pFactory) \
HRESULT STDAPICALLTYPE DLLCANUNLOADNOW_ENTRY() \		HRESULT STDAPICALLTYPE DLLCANUNLOADNOW_ENTRY() \
{ \		{ \
return NdrDllCanUnloadNow( pFactory ); \		return NdrDllCanUnloadNow( pFactory ); \
}		}

End of changes. 2 change blocks.
3 lines changed or deleted		124 lines changed or added

This html diff was produced by rfcdiff 1.41.