Headers diff for rpcrt4.dll between 6.3.9600.17415-Windows 8.1 and 10.0.10586.306-Windows 10 1511 10586.494 versions

midles.h (6.3.9600.17415-Windows 8.1)		midles.h (10.0.10586.306-Windows 10 1511 10586.494)

skipping to change at line 24		skipping to change at line 24
--*/		--*/

#ifndef __MIDLES_H__		#ifndef __MIDLES_H__
#define __MIDLES_H__		#define __MIDLES_H__

#if _MSC_VER > 1000		#if _MSC_VER > 1000
#pragma once		#pragma once
#endif		#endif
#include <winapifamily.h>		#include <winapifamily.h>


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

#include <rpcndr.h>		#include <rpcndr.h>

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

/*		/*
* Pickling support		* Pickling support
*/		*/

skipping to change at line 288		skipping to change at line 288
short Size );		short Size );

size_t RPC_ENTRY		size_t RPC_ENTRY
NdrMesSimpleTypeAlignSizeAll ( handle_t Handle,		NdrMesSimpleTypeAlignSizeAll ( handle_t Handle,
const MIDL_STUBLESS_PROXY_INFO* pProxyInfo );		const MIDL_STUBLESS_PROXY_INFO* pProxyInfo );

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


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion

#endif /* __MIDLES_H__ */		#endif /* __MIDLES_H__ */

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

rpcasync.h (6.3.9600.17415-Windows 8.1)		rpcasync.h (10.0.10586.306-Windows 10 1511 10586.494)

skipping to change at line 33		skipping to change at line 33
#endif		#endif

#if defined(__RPC_WIN64__)		#if defined(__RPC_WIN64__)
#include <pshpack8.h>		#include <pshpack8.h>
#endif		#endif

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


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

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

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

#endif // _KRPCENV_		#endif // _KRPCENV_

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

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

#include <windef.h>		#include <windef.h>

#endif // RPC_NO_WINDOWS_H \|\| _KRPCENV_		#endif // RPC_NO_WINDOWS_H \|\| _KRPCENV_


		#if _MSC_VER >= 1200
		#pragma warning(push)
		#pragma warning(disable:4820) // padding added after data member
		#endif

#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,

skipping to change at line 738		skipping to change at line 743
RPC_ENTRY		RPC_ENTRY
I_RpcBindingInqClientTokenAttributes (		I_RpcBindingInqClientTokenAttributes (
_In_ RPC_BINDING_HANDLE Binding,		_In_ RPC_BINDING_HANDLE Binding,
_Out_opt_ LUID * TokenId,		_Out_opt_ LUID * TokenId,
_Out_opt_ LUID * AuthenticationId,		_Out_opt_ LUID * AuthenticationId,
_Out_opt_ LUID * ModifiedId		_Out_opt_ LUID * ModifiedId
);		);

#endif // (NTDDI_VERSION >= NTDDI_WIN7)		#endif // (NTDDI_VERSION >= NTDDI_WIN7)


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#if _MSC_VER >= 1200
		#pragma warning(pop)
		#endif

		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY
		STEM) */
#pragma endregion		#pragma endregion

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

#if defined(__RPC_WIN64__)		#if defined(__RPC_WIN64__)
#include <poppack.h>		#include <poppack.h>
#endif		#endif


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

rpcdce.h (6.3.9600.17415-Windows 8.1)		rpcdce.h (10.0.10586.306-Windows 10 1511 10586.494)

skipping to change at line 28		skipping to change at line 28
#define __RPCDCE_H__		#define __RPCDCE_H__

#if _MSC_VER > 1000		#if _MSC_VER > 1000
#pragma once		#pragma once
#endif		#endif

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


#pragma region Application Family		#if _MSC_VER >= 1200
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#pragma warning(push)
		#pragma warning(disable:4668) // #if not_defined treated as #if 0
		#pragma warning(disable:4820) // padding added after data member
		#endif

		#pragma region Application Family or OneCore Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

#ifndef IN		#ifndef IN
#define IN		#define IN
#endif		#endif

#ifndef OUT		#ifndef OUT
#define OUT		#define OUT
#endif		#endif

#ifndef OPTIONAL		#ifndef OPTIONAL

skipping to change at line 83		skipping to change at line 89
#endif /* GUID_DEFINED */		#endif /* GUID_DEFINED */

#ifndef UUID_DEFINED		#ifndef UUID_DEFINED
#define UUID_DEFINED		#define UUID_DEFINED
typedef GUID UUID;		typedef GUID UUID;
#ifndef uuid_t		#ifndef uuid_t
#define uuid_t UUID		#define uuid_t UUID
#endif		#endif
#endif		#endif


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

typedef struct _RPC_BINDING_VECTOR		typedef struct _RPC_BINDING_VECTOR
{		{
unsigned long Count;		unsigned long Count;
_Field_size_(Count) RPC_BINDING_HANDLE BindingH[1];		_Field_size_(Count) RPC_BINDING_HANDLE BindingH[1];
} RPC_BINDING_VECTOR;		} RPC_BINDING_VECTOR;
#ifndef rpc_binding_vector_t		#ifndef rpc_binding_vector_t
#define rpc_binding_vector_t RPC_BINDING_VECTOR		#define rpc_binding_vector_t RPC_BINDING_VECTOR
#endif		#endif

typedef struct _UUID_VECTOR		typedef struct _UUID_VECTOR
{		{
unsigned long Count;		unsigned long Count;
_Field_size_(Count) UUID *Uuid[1];		_Field_size_(Count) UUID *Uuid[1];
} UUID_VECTOR;		} UUID_VECTOR;
#ifndef uuid_vector_t		#ifndef uuid_vector_t
#define uuid_vector_t UUID_VECTOR		#define uuid_vector_t UUID_VECTOR
#endif		#endif


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion


#pragma region Application Family		#pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

typedef void __RPC_FAR * RPC_IF_HANDLE;		typedef void __RPC_FAR * RPC_IF_HANDLE;


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

#ifndef IFID_DEFINED		#ifndef IFID_DEFINED
#define IFID_DEFINED		#define IFID_DEFINED
typedef struct _RPC_IF_ID		typedef struct _RPC_IF_ID
{		{
UUID Uuid;		UUID Uuid;
unsigned short VersMajor;		unsigned short VersMajor;
unsigned short VersMinor;		unsigned short VersMinor;
} RPC_IF_ID;		} RPC_IF_ID;
#endif		#endif

skipping to change at line 258		skipping to change at line 264
RPC_IF_CALLBACK_FN (		RPC_IF_CALLBACK_FN (
_In_ RPC_IF_HANDLE InterfaceUuid,		_In_ RPC_IF_HANDLE InterfaceUuid,
_In_ void *Context		_In_ void *Context
) ;		) ;

typedef void RPC_ENTRY		typedef void RPC_ENTRY
RPC_SECURITY_CALLBACK_FN (		RPC_SECURITY_CALLBACK_FN (
_In_ void *Context		_In_ void *Context
) ;		) ;


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion


#pragma region Application Family		#pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

#define RPC_MGR_EPV void		#define RPC_MGR_EPV void


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

typedef struct		typedef struct
{		{
unsigned int Count;		unsigned int Count;
unsigned long Stats[1];		unsigned long Stats[1];
} RPC_STATS_VECTOR;		} RPC_STATS_VECTOR;

#define RPC_C_STATS_CALLS_IN 0		#define RPC_C_STATS_CALLS_IN 0
#define RPC_C_STATS_CALLS_OUT 1		#define RPC_C_STATS_CALLS_OUT 1
#define RPC_C_STATS_PKTS_IN 2		#define RPC_C_STATS_PKTS_IN 2

skipping to change at line 1416		skipping to change at line 1422
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcNsBindingInqEntryName (		RpcNsBindingInqEntryName (
_In_ RPC_BINDING_HANDLE Binding,		_In_ RPC_BINDING_HANDLE Binding,
_In_ unsigned long EntryNameSyntax,		_In_ unsigned long EntryNameSyntax,
_Outptr_ RPC_CSTR __RPC_FAR * EntryName		_Outptr_ RPC_CSTR __RPC_FAR * EntryName
);		);

#endif /* RPC_UNICODE_SUPPORTED */		#endif /* RPC_UNICODE_SUPPORTED */


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion


#pragma region Application Family		#pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

typedef void __RPC_FAR * RPC_AUTH_IDENTITY_HANDLE;		typedef void __RPC_FAR * RPC_AUTH_IDENTITY_HANDLE;
typedef void __RPC_FAR * RPC_AUTHZ_HANDLE;		typedef void __RPC_FAR * RPC_AUTHZ_HANDLE;

#define RPC_C_AUTHN_LEVEL_DEFAULT 0		#define RPC_C_AUTHN_LEVEL_DEFAULT 0
#define RPC_C_AUTHN_LEVEL_NONE 1		#define RPC_C_AUTHN_LEVEL_NONE 1
#define RPC_C_AUTHN_LEVEL_CONNECT 2		#define RPC_C_AUTHN_LEVEL_CONNECT 2
#define RPC_C_AUTHN_LEVEL_CALL 3		#define RPC_C_AUTHN_LEVEL_CALL 3
#define RPC_C_AUTHN_LEVEL_PKT 4		#define RPC_C_AUTHN_LEVEL_PKT 4
#define RPC_C_AUTHN_LEVEL_PKT_INTEGRITY 5		#define RPC_C_AUTHN_LEVEL_PKT_INTEGRITY 5

skipping to change at line 1486		skipping to change at line 1492
#endif // (NTDDI_VERSION >= WINXP)		#endif // (NTDDI_VERSION >= WINXP)
#if (NTDDI_VERSION >= NTDDI_WIN7)		#if (NTDDI_VERSION >= NTDDI_WIN7)
#define RPC_C_AUTHN_KERNEL 20		#define RPC_C_AUTHN_KERNEL 20
#endif // (NTDDI_VERSION >= NTDDI_WIN7)		#endif // (NTDDI_VERSION >= NTDDI_WIN7)

#define RPC_C_AUTHN_NEGO_EXTENDER 30		#define RPC_C_AUTHN_NEGO_EXTENDER 30
#define RPC_C_AUTHN_PKU2U 31		#define RPC_C_AUTHN_PKU2U 31

#define RPC_C_AUTHN_LIVE_SSP 32		#define RPC_C_AUTHN_LIVE_SSP 32
#define RPC_C_AUTHN_LIVEXP_SSP 35		#define RPC_C_AUTHN_LIVEXP_SSP 35

		#define RPC_C_AUTHN_CLOUD_AP 36
#define RPC_C_AUTHN_MSONLINE 82		#define RPC_C_AUTHN_MSONLINE 82

#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


skipping to change at line 1779		skipping to change at line 1786
void *Sid;		void *Sid;
unsigned int EffectiveOnly;		unsigned int EffectiveOnly;
void *ServerSecurityDescriptor;		void *ServerSecurityDescriptor;
} RPC_SECURITY_QOS_V5_A, *PRPC_SECURITY_QOS_V5_A;		} RPC_SECURITY_QOS_V5_A, *PRPC_SECURITY_QOS_V5_A;

#endif // (NTDDI_VERSION >= NTDDI_WIN8)		#endif // (NTDDI_VERSION >= NTDDI_WIN8)

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


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion

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


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

#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 2005		skipping to change at line 2012
);		);

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_VISTA)		#endif // (NTDDI_VERSION >= NTDDI_VISTA)


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion

#if (NTDDI_VERSION >= NTDDI_WS03)		#if (NTDDI_VERSION >= NTDDI_WS03)


#pragma region Application Family		#pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

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 /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion

#endif // (NTDDI_VERSION >= NTDDI_WS03)		#endif // (NTDDI_VERSION >= NTDDI_WS03)


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

#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,
_Inout_ void __RPC_FAR * ResourceUuid,		_Inout_ void __RPC_FAR * ResourceUuid,

skipping to change at line 2063		skipping to change at line 2070
_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 /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion

#endif // (NTDDI_VERSION >= NTDDI_WINXP)		#endif // (NTDDI_VERSION >= NTDDI_WINXP)


#pragma region Application Family		#pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

#define RPC_C_AUTHZ_NONE 0		#define RPC_C_AUTHZ_NONE 0
#define RPC_C_AUTHZ_NAME 1		#define RPC_C_AUTHZ_NAME 1
#define RPC_C_AUTHZ_DCE 2		#define RPC_C_AUTHZ_DCE 2
#define RPC_C_AUTHZ_DEFAULT 0xffffffff		#define RPC_C_AUTHZ_DEFAULT 0xffffffff


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

RPCRTAPI		RPCRTAPI
_Must_inspect_result_		_Must_inspect_result_
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcImpersonateClient (		RpcImpersonateClient (
_In_opt_ RPC_BINDING_HANDLE BindingHandle		_In_opt_ RPC_BINDING_HANDLE BindingHandle
);		);

RPCRTAPI		RPCRTAPI

skipping to change at line 2113		skipping to change at line 2120
);		);

RPCRTAPI		RPCRTAPI
_Must_inspect_result_		_Must_inspect_result_
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcRevertToSelf (		RpcRevertToSelf (
void		void
);		);


		RPCRTAPI
		_Must_inspect_result_
		RPC_STATUS
		RPC_ENTRY
		RpcImpersonateClientContainer (
		_In_opt_ RPC_BINDING_HANDLE BindingHandle
		);

		RPCRTAPI
		_Must_inspect_result_
		RPC_STATUS
		RPC_ENTRY
		RpcRevertContainerImpersonation (
		void
		);

#ifdef RPC_UNICODE_SUPPORTED		#ifdef RPC_UNICODE_SUPPORTED

RPCRTAPI		RPCRTAPI
_Must_inspect_result_		_Must_inspect_result_
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcBindingInqAuthClientA (		RpcBindingInqAuthClientA (
_In_opt_ RPC_BINDING_HANDLE ClientBinding,		_In_opt_ RPC_BINDING_HANDLE ClientBinding,
_Out_ RPC_AUTHZ_HANDLE __RPC_FAR * Privs,		_Out_ RPC_AUTHZ_HANDLE __RPC_FAR * Privs,
_Outptr_opt_ RPC_CSTR __RPC_FAR * ServerPrincName,		_Outptr_opt_ RPC_CSTR __RPC_FAR * ServerPrincName,

skipping to change at line 3060		skipping to change at line 3083
RPCRTAPI		RPCRTAPI
RPC_STATUS		RPC_STATUS
RPC_ENTRY		RPC_ENTRY
RpcServerInterfaceGroupInqBindings (		RpcServerInterfaceGroupInqBindings (
_In_ RPC_INTERFACE_GROUP IfGroup,		_In_ RPC_INTERFACE_GROUP IfGroup,
_Outptr_ RPC_BINDING_VECTOR __RPC_FAR * __RPC_FAR * BindingVector		_Outptr_ RPC_BINDING_VECTOR __RPC_FAR * __RPC_FAR * BindingVector
);		);

#endif // (NTDDI_VERSION >= NTDDI_WIN8)		#endif // (NTDDI_VERSION >= NTDDI_WIN8)


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion


		#if _MSC_VER >= 1200
		#pragma warning(pop)
		#endif

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

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

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

End of changes. 27 change blocks.
36 lines changed or deleted		63 lines changed or added

rpcndr.h (6.3.9600.17415-Windows 8.1)		rpcndr.h (10.0.10586.306-Windows 10 1511 10586.494)

skipping to change at line 15		skipping to change at line 15
Module Name:		Module Name:

rpcndr.h		rpcndr.h

Abstract:		Abstract:

Definitions for stub data structures and prototypes of helper functions.		Definitions for stub data structures and prototypes of helper functions.

--*/		--*/


		#if _MSC_VER >= 1200
		#pragma warning(push)
		#pragma warning(disable:4001) /* nonstandard extension : single line comment */
		#pragma warning(disable:4255) // () treated as (void)
		#pragma warning(disable:4668) // #if not_defined treated as #if 0
		#pragma warning(disable:4820) // padding added after data member
		#endif

// This version of the rpcndr.h file corresponds to MIDL version 5.0.+		// This version of the rpcndr.h file corresponds to MIDL version 5.0.+
// used with Windows 2000/XP build 1700+		// used with Windows 2000/XP build 1700+

#ifndef __RPCNDR_H_VERSION__		#ifndef __RPCNDR_H_VERSION__
#define __RPCNDR_H_VERSION__ ( 500 )		#define __RPCNDR_H_VERSION__ ( 500 )
#endif // __RPCNDR_H_VERSION__		#endif // __RPCNDR_H_VERSION__

#ifndef __RPCNDR_H__		#ifndef __RPCNDR_H__
#define __RPCNDR_H__		#define __RPCNDR_H__


skipping to change at line 49		skipping to change at line 57
#if !defined(_KRPCENV_)		#if !defined(_KRPCENV_)
#include <rpcnsip.h>		#include <rpcnsip.h>
#endif		#endif

#include <rpcsal.h>		#include <rpcsal.h>

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


#pragma region Application Family		#pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

/****************************************************************************		/****************************************************************************

Network Computing Architecture (NCA) definition:		Network Computing Architecture (NCA) definition:

Network Data Representation: (NDR) Label format:		Network Data Representation: (NDR) Label format:
An unsigned long (32 bits) with the following layout:		An unsigned long (32 bits) with the following layout:

3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1		3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0		1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0

skipping to change at line 120		skipping to change at line 128
#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 (0x0A00 <= _WIN32_WINNT)
		#define TARGET_IS_NT100_OR_LATER 1
		#else
		#define TARGET_IS_NT100_OR_LATER 0
		#endif

#if (0x603 <= _WIN32_WINNT)		#if (0x603 <= _WIN32_WINNT)
#define TARGET_IS_NT63_OR_LATER 1		#define TARGET_IS_NT63_OR_LATER 1
#else		#else
#define TARGET_IS_NT63_OR_LATER 0		#define TARGET_IS_NT63_OR_LATER 0
#endif		#endif

#if (0x602 <= _WIN32_WINNT)		#if (0x602 <= _WIN32_WINNT)
#define TARGET_IS_NT62_OR_LATER 1		#define TARGET_IS_NT62_OR_LATER 1
#else		#else
#define TARGET_IS_NT62_OR_LATER 0		#define TARGET_IS_NT62_OR_LATER 0

skipping to change at line 196		skipping to change at line 210
#endif		#endif

#endif // _HYPER_DEFINED		#endif // _HYPER_DEFINED

#ifndef _WCHAR_T_DEFINED		#ifndef _WCHAR_T_DEFINED
typedef unsigned short wchar_t;		typedef unsigned short wchar_t;
#define _WCHAR_T_DEFINED		#define _WCHAR_T_DEFINED
#endif		#endif

#ifndef _SIZE_T_DEFINED		#ifndef _SIZE_T_DEFINED

#ifdef __RPC_WIN64__		#if defined(__RPC_WIN64__) \|\| defined(__RPC_ARM64__)
typedef unsigned __int64 size_t;		typedef unsigned __int64 size_t;
#else		#else
typedef unsigned int size_t;		typedef unsigned int size_t;
#endif		#endif
#define _SIZE_T_DEFINED		#define _SIZE_T_DEFINED
#endif		#endif

#ifdef __RPC_WIN32__		#ifdef __RPC_WIN32__
#if (_MSC_VER >= 800) \|\| defined(_STDCALL_SUPPORTED)		#if (_MSC_VER >= 800) \|\| defined(_STDCALL_SUPPORTED)
#define __RPC_CALLEE __stdcall		#define __RPC_CALLEE __stdcall

skipping to change at line 220		skipping to change at line 234
#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

_Must_inspect_result_		_Must_inspect_result_
_Ret_maybenull_ _Post_writable_byte_size_(size)		_Ret_maybenull_ _Post_writable_byte_size_(size)

void * __RPC_USER MIDL_user_allocate(size_t size);		void * __RPC_USER MIDL_user_allocate(_In_ size_t size);
void __RPC_USER MIDL_user_free( _Pre_maybenull_ _Post_invalid_ void * );		void __RPC_USER MIDL_user_free( _Pre_maybenull_ _Post_invalid_ void * );

_Ret_maybenull_ _Post_writable_byte_size_(size)		_Ret_maybenull_ _Post_writable_byte_size_(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

skipping to change at line 427		skipping to change at line 441
(((char *)(Target))+(LowerIndex)), \		(((char *)(Target))+(LowerIndex)), \
(Source)->Buffer, \		(Source)->Buffer, \
(unsigned int)((UpperIndex)-(LowerIndex))); \		(unsigned int)((UpperIndex)-(LowerIndex))); \
(unsigned long )&(Source)->Buffer += ((UpperIndex)-(LowerIndex)); \		(unsigned long )&(Source)->Buffer += ((UpperIndex)-(LowerIndex)); \
}		}

/****************************************************************************		/****************************************************************************
Platform specific mapping of c-runtime functions.		Platform specific mapping of c-runtime functions.
****************************************************************************/		****************************************************************************/


#if defined(__RPC_WIN32__) \|\| defined(__RPC_WIN64__) \|\| defined(__RPC_ARM32__)		#if defined(__RPC_WIN32__) \|\| defined(__RPC_WIN64__) \|\| defined(__RPC_ARM32__) \| \| defined(__RPC_ARM64__)
#define MIDL_ascii_strlen(string) \		#define MIDL_ascii_strlen(string) \
strlen(string)		strlen(string)
#define MIDL_ascii_strcpy(target,source) \		#define MIDL_ascii_strcpy(target,source) \
strcpy(target,source)		strcpy(target,source)
#define MIDL_memset(s,c,n) \		#define MIDL_memset(s,c,n) \
memset(s,c,n)		memset(s,c,n)
#endif		#endif

/****************************************************************************		/****************************************************************************
MIDL 2.0 ndr definitions.		MIDL 2.0 ndr definitions.

skipping to change at line 691		skipping to change at line 705
/*		/*
* Full pointer stuff.		* Full pointer stuff.
*/		*/
struct _FULL_PTR_XLAT_TABLES * FullPtrXlatTables;		struct _FULL_PTR_XLAT_TABLES * FullPtrXlatTables;
unsigned long FullPtrRefId;		unsigned long FullPtrRefId;

unsigned long PointerLength;		unsigned long PointerLength;

int fInDontFree :1;		int fInDontFree :1;
int fDontCallFreeInst :1;		int fDontCallFreeInst :1;

int fInOnlyParam :1;		int fUnused1 :1;
int fHasReturn :1;		int fHasReturn :1;
int fHasExtensions :1;		int fHasExtensions :1;
int fHasNewCorrDesc :1;		int fHasNewCorrDesc :1;
int fIsIn :1;		int fIsIn :1;
int fIsOut :1;		int fIsOut :1;
int fIsOicf :1;		int fIsOicf :1;
int fBufferValid :1;		int fBufferValid :1;
int fHasMemoryValidateCallback: 1;		int fHasMemoryValidateCallback: 1;
int fInFree :1;		int fInFree :1;
int fNeedMCCP :1;		int fNeedMCCP :1;

int fUnused :3;		int fUnused2 :3;
int fUnused2 :16;		int fUnused3 :16;

unsigned long dwDestContext;		unsigned long dwDestContext;
void * pvDestContext;		void * pvDestContext;

NDR_SCONTEXT * SavedContextHandles;		NDR_SCONTEXT * SavedContextHandles;

long ParamNumber;		long ParamNumber;

struct IRpcChannelBuffer * pRpcChannelBuffer;		struct IRpcChannelBuffer * pRpcChannelBuffer;


skipping to change at line 746		skipping to change at line 760

/*		/*
* Reserved fields up to this point present since the 3.50 release.		* Reserved fields up to this point present since the 3.50 release.
* Reserved fields below were introduced for Windows 2000 release.		* Reserved fields below were introduced for Windows 2000 release.
* (but not used).		* (but not used).
*/		*/

/*		/*
* International character support information - NT 5.1 feature.		* International character support information - NT 5.1 feature.
*/		*/

#if (NTDDI_VERSION >= NTDDI_WIN2K )

INT_PTR pCSInfo;		INT_PTR pCSInfo;

unsigned char * ConformanceMark;		unsigned char * ConformanceMark;
unsigned char * VarianceMark;		unsigned char * VarianceMark;


#if defined(IA64)
void * BackingStoreLowMark;
#else
INT_PTR Unused;		INT_PTR Unused;

#endif

struct _NDR_PROC_CONTEXT * pContext;		struct _NDR_PROC_CONTEXT * pContext;

/*		/*
* Reserved fields up to this point present since Windows 2000 release.		* Reserved fields up to this point present since Windows 2000 release.
* Fields added for NT5.1		* Fields added for NT5.1
*		*
* pUserMarshalList is used to keep a linked list of nodes pointing to		* pUserMarshalList is used to keep a linked list of nodes pointing to
* marshalled data to be freed. This list can contain (as the name		* marshalled data to be freed. This list can contain (as the name
* implies) User Marshalled data, but also can contain Interface Pointer		* implies) User Marshalled data, but also can contain Interface Pointer

skipping to change at line 780		skipping to change at line 788

void * ContextHandleHash;		void * ContextHandleHash;
void * pUserMarshalList;		void * pUserMarshalList;
INT_PTR Reserved51_3;		INT_PTR Reserved51_3;
INT_PTR Reserved51_4;		INT_PTR Reserved51_4;
INT_PTR Reserved51_5;		INT_PTR Reserved51_5;

/*		/*
* Reserved fields up to this point present since NT5.1 release.		* Reserved fields up to this point present since NT5.1 release.
*/		*/

#endif // (NTDDI_VERSION >= NTDDI_WIN2K )
} MIDL_STUB_MESSAGE, *PMIDL_STUB_MESSAGE;		} MIDL_STUB_MESSAGE, *PMIDL_STUB_MESSAGE;

typedef struct _MIDL_STUB_MESSAGE MIDL_STUB_MESSAGE, *PMIDL_STUB_MESSAGE;		typedef struct _MIDL_STUB_MESSAGE MIDL_STUB_MESSAGE, *PMIDL_STUB_MESSAGE;

/*		/*
* Generic handle bind/unbind routine pair.		* Generic handle bind/unbind routine pair.
*/		*/
typedef void *		typedef void *
( __RPC_API * GENERIC_BINDING_ROUTINE)		( __RPC_API * GENERIC_BINDING_ROUTINE)
(void *);		(void *);

skipping to change at line 1085		skipping to change at line 1092
*/		*/
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);
#endif		#endif

/*		/*

		* Method property structures
		*/
		typedef struct _MIDL_METHOD_PROPERTY
		{
		unsigned long Id;
		ULONG_PTR Value;
		} MIDL_METHOD_PROPERTY, *PMIDL_METHOD_PROPERTY;

		typedef struct _MIDL_METHOD_PROPERTY_MAP
		{
		unsigned long Count;
		const MIDL_METHOD_PROPERTY *Properties;
		} MIDL_METHOD_PROPERTY_MAP, *PMIDL_METHOD_PROPERTY_MAP;

		typedef struct _MIDL_INTERFACE_METHOD_PROPERTIES
		{
		unsigned short MethodCount;
		const MIDL_METHOD_PROPERTY_MAP* const *MethodProperties;
		} MIDL_INTERFACE_METHOD_PROPERTIES;

		/*
* Server Interpreter's information strucuture.		* Server Interpreter's information strucuture.
*/		*/
typedef struct _MIDL_SERVER_INFO_		typedef struct _MIDL_SERVER_INFO_
{		{
PMIDL_STUB_DESC pStubDesc;		PMIDL_STUB_DESC pStubDesc;
const SERVER_ROUTINE * DispatchTable;		const SERVER_ROUTINE * DispatchTable;
PFORMAT_STRING ProcString;		PFORMAT_STRING ProcString;
const unsigned short * FmtStringOffset;		const unsigned short * FmtStringOffset;
const STUB_THUNK * ThunkTable;		const STUB_THUNK * ThunkTable;
PRPC_SYNTAX_IDENTIFIER pTransferSyntax;		PRPC_SYNTAX_IDENTIFIER pTransferSyntax;

skipping to change at line 1127		skipping to change at line 1155
* Multiple transfer syntax information.		* Multiple transfer syntax information.
*/		*/
typedef struct _MIDL_SYNTAX_INFO		typedef struct _MIDL_SYNTAX_INFO
{		{
RPC_SYNTAX_IDENTIFIER TransferSyntax;		RPC_SYNTAX_IDENTIFIER TransferSyntax;
RPC_DISPATCH_TABLE * DispatchTable;		RPC_DISPATCH_TABLE * DispatchTable;
PFORMAT_STRING ProcString;		PFORMAT_STRING ProcString;
const unsigned short * FmtStringOffset;		const unsigned short * FmtStringOffset;
PFORMAT_STRING TypeString;		PFORMAT_STRING TypeString;
const void * aUserMarshalQuadruple;		const void * aUserMarshalQuadruple;

ULONG_PTR pReserved1;		const MIDL_INTERFACE_METHOD_PROPERTIES *pMethodProperties;
ULONG_PTR pReserved2;		ULONG_PTR pReserved2;
} MIDL_SYNTAX_INFO, *PMIDL_SYNTAX_INFO;		} MIDL_SYNTAX_INFO, *PMIDL_SYNTAX_INFO;

typedef unsigned short * PARAM_OFFSETTABLE, *PPARAM_OFFSETTABLE;		typedef unsigned short * PARAM_OFFSETTABLE, *PPARAM_OFFSETTABLE;

/*		/*
* This is the return value from NdrClientCall.		* This is the return value from NdrClientCall.
*/		*/
typedef union _CLIENT_CALL_RETURN		typedef union _CLIENT_CALL_RETURN
{		{

skipping to change at line 1163		skipping to change at line 1191
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;

/*		/*
* Different types of System Handles		* Different types of System Handles
*/		*/

typedef enum _system_handle_t		typedef enum _system_handle_t
{		{

SYSTEM_HANDLE_FILE = 0		SYSTEM_HANDLE_FILE = 0,
,SYSTEM_HANDLE_SEMAPHORE = 1		SYSTEM_HANDLE_SEMAPHORE = 1,
,SYSTEM_HANDLE_EVENT = 2		SYSTEM_HANDLE_EVENT = 2,
,SYSTEM_HANDLE_MUTEX = 3		SYSTEM_HANDLE_MUTEX = 3,
,SYSTEM_HANDLE_PROCESS = 4		SYSTEM_HANDLE_PROCESS = 4,
,SYSTEM_HANDLE_TOKEN = 5		SYSTEM_HANDLE_TOKEN = 5,
,SYSTEM_HANDLE_INVALID = 0xFF		SYSTEM_HANDLE_SECTION = 6,
		SYSTEM_HANDLE_REG_KEY = 7,
		SYSTEM_HANDLE_THREAD = 8,
		SYSTEM_HANDLE_COMPOSITION_OBJECT = 9,
		SYSTEM_HANDLE_SOCKET = 10,
		SYSTEM_HANDLE_JOB = 11,
		SYSTEM_HANDLE_INVALID = 0xFF,
} system_handle_t;		} system_handle_t;


		/*
		* Interception info.
		*/

		enum {
		MidlInterceptionInfoVersionOne = 1
		};

		enum {
		MidlWinrtTypeSerializationInfoVersionOne = 1
		};

		#define MIDL_WINRT_TYPE_SERIALIZATION_INFO_CURRENT_VERSION MidlWinrtTypeSerializ
		ationInfoVersionOne

		typedef struct _MIDL_INTERCEPTION_INFO
		{
		unsigned long Version;
		PFORMAT_STRING ProcString;
		const unsigned short *ProcFormatOffsetTable;
		unsigned long ProcCount;
		PFORMAT_STRING TypeString;
		} MIDL_INTERCEPTION_INFO, *PMIDL_INTERCEPTION_INFO;

		typedef struct _MIDL_WINRT_TYPE_SERIALIZATION_INFO
		{
		unsigned long Version;
		PFORMAT_STRING TypeFormatString;
		unsigned short FormatStringSize;
		unsigned short TypeOffset;
		PMIDL_STUB_DESC StubDesc;
		} MIDL_WINRT_TYPE_SERIALIZATION_INFO, *PMIDL_WINRT_TYPE_SERIALIZATION_INFO;

/***************************************************************************		/***************************************************************************
** 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 );


skipping to change at line 2482		skipping to change at line 2548
...		...
);		);

CLIENT_CALL_RETURN RPC_VAR_ENTRY		CLIENT_CALL_RETURN RPC_VAR_ENTRY
NdrAsyncClientCall(		NdrAsyncClientCall(
PMIDL_STUB_DESC pStubDescriptor,		PMIDL_STUB_DESC pStubDescriptor,
PFORMAT_STRING pFormat,		PFORMAT_STRING pFormat,
...		...
);		);


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#if ( !defined(_WIN64) && !defined(_ARM_) )

		CLIENT_CALL_RETURN RPC_VAR_ENTRY
		NdrClientCall4(
		PMIDL_STUB_DESC pStubDescriptor,
		PFORMAT_STRING pFormat,
		...
		);

		CLIENT_CALL_RETURN RPC_VAR_ENTRY
		NdrAsyncClientCall2(
		PMIDL_STUB_DESC pStubDescriptor,
		PFORMAT_STRING pFormat,
		...
		);

		CLIENT_CALL_RETURN RPC_VAR_ENTRY
		NdrMesProcEncodeDecode4(
		handle_t Handle,
		const MIDL_STUB_DESC * pStubDescriptor,
		PFORMAT_STRING pFormat,
		...
		);

		#endif

		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM
		) */
#pragma endregion		#pragma endregion


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

CLIENT_CALL_RETURN RPC_VAR_ENTRY		CLIENT_CALL_RETURN RPC_VAR_ENTRY
NdrDcomAsyncClientCall(		NdrDcomAsyncClientCall(
PMIDL_STUB_DESC pStubDescriptor,		PMIDL_STUB_DESC pStubDescriptor,
PFORMAT_STRING pFormat,		PFORMAT_STRING pFormat,
...		...
);		);


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#if ( !defined(_WIN64) && !defined(_ARM_) )

		CLIENT_CALL_RETURN RPC_VAR_ENTRY
		NdrDcomAsyncClientCall2(
		PMIDL_STUB_DESC pStubDescriptor,
		PFORMAT_STRING pFormat,
		...
		);

		#endif

		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY
		STEM) */
#pragma endregion		#pragma endregion


#pragma region Application Family		#pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

/* server */		/* server */
typedef enum {		typedef enum {
STUB_UNMARSHAL,		STUB_UNMARSHAL,
STUB_CALL_SERVER,		STUB_CALL_SERVER,
STUB_MARSHAL,		STUB_MARSHAL,
STUB_CALL_SERVER_NO_HRESULT		STUB_CALL_SERVER_NO_HRESULT
}STUB_PHASE;		}STUB_PHASE;

typedef enum {		typedef enum {

skipping to change at line 2538		skipping to change at line 2641
RPCRTAPI		RPCRTAPI
long		long
RPC_ENTRY		RPC_ENTRY
NdrAsyncStubCall(		NdrAsyncStubCall(
struct IRpcStubBuffer * pThis,		struct IRpcStubBuffer * pThis,
struct IRpcChannelBuffer * pChannel,		struct IRpcChannelBuffer * pChannel,
PRPC_MESSAGE pRpcMsg,		PRPC_MESSAGE pRpcMsg,
unsigned long * pdwStubPhase		unsigned long * pdwStubPhase
);		);


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

// async uuid		// async uuid
RPCRTAPI		RPCRTAPI
long		long
RPC_ENTRY		RPC_ENTRY
NdrDcomAsyncStubCall(		NdrDcomAsyncStubCall(
struct IRpcStubBuffer * pThis,		struct IRpcStubBuffer * pThis,
struct IRpcChannelBuffer * pChannel,		struct IRpcChannelBuffer * pChannel,
PRPC_MESSAGE pRpcMsg,		PRPC_MESSAGE pRpcMsg,
unsigned long * pdwStubPhase		unsigned long * pdwStubPhase
);		);


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion


#pragma region Application Family		#pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

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

skipping to change at line 3011		skipping to change at line 3114
);		);

CLIENT_CALL_RETURN RPC_VAR_ENTRY		CLIENT_CALL_RETURN RPC_VAR_ENTRY
Ndr64AsyncClientCall(		Ndr64AsyncClientCall(
MIDL_STUBLESS_PROXY_INFO *pProxyInfo,		MIDL_STUBLESS_PROXY_INFO *pProxyInfo,
unsigned long nProcNum,		unsigned long nProcNum,
void * pReturnValue,		void * pReturnValue,
...		...
);		);


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

CLIENT_CALL_RETURN RPC_VAR_ENTRY		CLIENT_CALL_RETURN RPC_VAR_ENTRY
Ndr64DcomAsyncClientCall(		Ndr64DcomAsyncClientCall(
MIDL_STUBLESS_PROXY_INFO *pProxyInfo,		MIDL_STUBLESS_PROXY_INFO *pProxyInfo,
unsigned long nProcNum,		unsigned long nProcNum,
void * pReturnValue,		void * pReturnValue,
...		...
);		);


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
#pragma endregion

#pragma region Application Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)

struct IRpcStubBuffer; // Forward declaration

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


		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY
		STEM) */
		#pragma endregion

		#pragma region Application Family or OneCore Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

		struct IRpcStubBuffer; // Forward declaration

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

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY

skipping to change at line 3064		skipping to change at line 3167
RPCRTAPI		RPCRTAPI
long		long
RPC_ENTRY		RPC_ENTRY
Ndr64AsyncStubCall(		Ndr64AsyncStubCall(
struct IRpcStubBuffer * pThis,		struct IRpcStubBuffer * pThis,
struct IRpcChannelBuffer * pChannel,		struct IRpcChannelBuffer * pChannel,
PRPC_MESSAGE pRpcMsg,		PRPC_MESSAGE pRpcMsg,
unsigned long * pdwStubPhase		unsigned long * pdwStubPhase
);		);


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

/* async uuid */		/* async uuid */
RPCRTAPI		RPCRTAPI
long		long
RPC_ENTRY		RPC_ENTRY
Ndr64DcomAsyncStubCall(		Ndr64DcomAsyncStubCall(
struct IRpcStubBuffer * pThis,		struct IRpcStubBuffer * pThis,
struct IRpcChannelBuffer * pChannel,		struct IRpcChannelBuffer * pChannel,
PRPC_MESSAGE pRpcMsg,		PRPC_MESSAGE pRpcMsg,
unsigned long * pdwStubPhase		unsigned long * pdwStubPhase
);		);


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion


#pragma region Application Family		#pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

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

skipping to change at line 3155		skipping to change at line 3258
RPC_ENTRY		RPC_ENTRY
NdrPartialIgnoreServerInitialize(		NdrPartialIgnoreServerInitialize(
PMIDL_STUB_MESSAGE pStubMsg,		PMIDL_STUB_MESSAGE pStubMsg,
void ** ppMemory,		void ** ppMemory,
PFORMAT_STRING pFormat		PFORMAT_STRING pFormat
);		);

void RPC_ENTRY		void RPC_ENTRY
RpcUserFree( handle_t AsyncHandle, void * pBuffer );		RpcUserFree( handle_t AsyncHandle, void * pBuffer );


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion

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

#include <poppack.h>		#include <poppack.h>

#endif /* __RPCNDR_H__ */		#endif /* __RPCNDR_H__ */


		#if _MSC_VER >= 1200
		#pragma warning(pop)
		#endif

End of changes. 34 change blocks.
53 lines changed or deleted		160 lines changed or added

rpcproxy.h (6.3.9600.17415-Windows 8.1)		rpcproxy.h (10.0.10586.306-Windows 10 1511 10586.494)

skipping to change at line 85		skipping to change at line 85
//proxy code won't get the const GUID *const definition.		//proxy code won't get the const GUID *const definition.
#ifndef GUID_DEFINED		#ifndef GUID_DEFINED
#include <guiddef.h>		#include <guiddef.h>
#endif /* GUID_DEFINED */		#endif /* GUID_DEFINED */

#if defined(__cplusplus)		#if defined(__cplusplus)
extern "C"		extern "C"
{		{
#endif		#endif


#pragma region Application Family		#pragma region Application or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

// forward declarations		// forward declarations
struct tagCInterfaceStubVtbl;		struct tagCInterfaceStubVtbl;
struct tagCInterfaceProxyVtbl;		struct tagCInterfaceProxyVtbl;

typedef struct tagCInterfaceStubVtbl * PCInterfaceStubVtblList;		typedef struct tagCInterfaceStubVtbl * PCInterfaceStubVtblList;
typedef struct tagCInterfaceProxyVtbl * PCInterfaceProxyVtblList;		typedef struct tagCInterfaceProxyVtbl * PCInterfaceProxyVtblList;
typedef const char * PCInterfaceName;		typedef const char * PCInterfaceName;
typedef int __stdcall IIDLookupRtn( const IID * pIID, int * pIndex );		typedef int __stdcall IIDLookupRtn( const IID * pIID, int * pIndex );
typedef IIDLookupRtn * PIIDLookup;		typedef IIDLookupRtn * PIIDLookup;

skipping to change at line 215		skipping to change at line 215
} CStdStubBuffer;		} CStdStubBuffer;

typedef struct tagCStdPSFactoryBuffer		typedef struct tagCStdPSFactoryBuffer
{		{
const IPSFactoryBufferVtbl * lpVtbl;		const IPSFactoryBufferVtbl * lpVtbl;
LONG RefCount;		LONG RefCount;
const ProxyFileInfo ** pProxyFileList;		const ProxyFileInfo ** pProxyFileList;
LONG Filler1; //Reserved for future use.		LONG Filler1; //Reserved for future use.
} CStdPSFactoryBuffer;		} CStdPSFactoryBuffer;


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion


#pragma region Desktop Family		#pragma region Desktop or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrProxyInitialize(		NdrProxyInitialize(
void * This,		void * This,
PRPC_MESSAGE pRpcMsg,		PRPC_MESSAGE pRpcMsg,
PMIDL_STUB_MESSAGE pStubMsg,		PMIDL_STUB_MESSAGE pStubMsg,
PMIDL_STUB_DESC pStubDescriptor,		PMIDL_STUB_DESC pStubDescriptor,
unsigned int ProcNum );		unsigned int ProcNum );

skipping to change at line 252		skipping to change at line 252
void *This,		void *This,
MIDL_STUB_MESSAGE *pStubMsg);		MIDL_STUB_MESSAGE *pStubMsg);

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrProxyFreeBuffer(		NdrProxyFreeBuffer(
void *This,		void *This,
MIDL_STUB_MESSAGE *pStubMsg);		MIDL_STUB_MESSAGE *pStubMsg);


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion


#pragma region Application Family		#pragma region Application or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

RPCRTAPI		RPCRTAPI
HRESULT		HRESULT
RPC_ENTRY		RPC_ENTRY
NdrProxyErrorHandler(		NdrProxyErrorHandler(
DWORD dwExceptionCode);		DWORD dwExceptionCode);


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion


#pragma region Desktop Family		#pragma region Desktop or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrStubInitialize(		NdrStubInitialize(
PRPC_MESSAGE pRpcMsg,		PRPC_MESSAGE pRpcMsg,
PMIDL_STUB_MESSAGE pStubMsg,		PMIDL_STUB_MESSAGE pStubMsg,
PMIDL_STUB_DESC pStubDescriptor,		PMIDL_STUB_DESC pStubDescriptor,
IRpcChannelBuffer * pRpcChannelBuffer);		IRpcChannelBuffer * pRpcChannelBuffer);


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion


#pragma region Application Family		#pragma region Application or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrStubInitializePartial(		NdrStubInitializePartial(
PRPC_MESSAGE pRpcMsg,		PRPC_MESSAGE pRpcMsg,
PMIDL_STUB_MESSAGE pStubMsg,		PMIDL_STUB_MESSAGE pStubMsg,
PMIDL_STUB_DESC pStubDescriptor,		PMIDL_STUB_DESC pStubDescriptor,
IRpcChannelBuffer * pRpcChannelBuffer,		IRpcChannelBuffer * pRpcChannelBuffer,
ULONG RequestedBufferSize);		ULONG RequestedBufferSize);

void __RPC_STUB NdrStubForwardingFunction(		void __RPC_STUB NdrStubForwardingFunction(
IN IRpcStubBuffer * This,		IN IRpcStubBuffer * This,
IN IRpcChannelBuffer * pChannel,		IN IRpcChannelBuffer * pChannel,
IN PRPC_MESSAGE pmsg,		IN PRPC_MESSAGE pmsg,
OUT DWORD * pdwStubPhase);		OUT DWORD * pdwStubPhase);


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion


#pragma region Desktop Family		#pragma region Desktop or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

RPCRTAPI		RPCRTAPI
void		void
RPC_ENTRY		RPC_ENTRY
NdrStubGetBuffer(		NdrStubGetBuffer(
IRpcStubBuffer * This,		IRpcStubBuffer * This,
IRpcChannelBuffer * pRpcChannelBuffer,		IRpcChannelBuffer * pRpcChannelBuffer,
PMIDL_STUB_MESSAGE pStubMsg);		PMIDL_STUB_MESSAGE pStubMsg);


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion


#pragma region Application Family		#pragma region Application or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM)

RPCRTAPI		RPCRTAPI
HRESULT		HRESULT
RPC_ENTRY		RPC_ENTRY
NdrStubErrorHandler(		NdrStubErrorHandler(
DWORD dwExceptionCode);		DWORD dwExceptionCode);

HRESULT STDMETHODCALLTYPE		HRESULT STDMETHODCALLTYPE
CStdStubBuffer_QueryInterface(		CStdStubBuffer_QueryInterface(
IRpcStubBuffer * This,		IRpcStubBuffer * This,

skipping to change at line 380		skipping to change at line 380
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);


		HRESULT STDMETHODCALLTYPE
		CStdStubBuffer2_QueryInterface(
		IRpcStubBuffer * This,
		REFIID riid,
		void ** ppvObject);

		ULONG STDMETHODCALLTYPE
		CStdStubBuffer2_Release(
		IRpcStubBuffer *This);

		HRESULT STDMETHODCALLTYPE
		CStdStubBuffer2_Connect(
		IRpcStubBuffer *pthis,
		IUnknown *pUnkServer);

		void STDMETHODCALLTYPE
		CStdStubBuffer2_Disconnect(
		IRpcStubBuffer *pthis);

		ULONG STDMETHODCALLTYPE
		CStdStubBuffer2_CountRefs(
		IRpcStubBuffer *pthis);

		ULONG STDMETHODCALLTYPE
		NdrCStdStubBuffer2_Release(
		IRpcStubBuffer *This,
		IPSFactoryBuffer * pPSF);

		HRESULT STDMETHODCALLTYPE
		CStdAsyncStubBuffer_QueryInterface(
		IRpcStubBuffer *pthis,
		REFIID riid,
		void **ppvObject);

		ULONG STDMETHODCALLTYPE
		CStdAsyncStubBuffer_AddRef(
		IRpcStubBuffer *pthis);

		ULONG STDMETHODCALLTYPE
		CStdAsyncStubBuffer_Release(
		IRpcStubBuffer *pthis);

		HRESULT STDMETHODCALLTYPE
		CStdAsyncStubBuffer_Connect(
		IRpcStubBuffer *pthis,
		IUnknown *pUnkServer);

		void STDMETHODCALLTYPE
		CStdAsyncStubBuffer_Disconnect(
		IRpcStubBuffer *pthis);

		HRESULT STDMETHODCALLTYPE
		CStdAsyncStubBuffer_Invoke(
		IRpcStubBuffer *pthis,
		RPCOLEMESSAGE *_prpcmsg,
		IRpcChannelBuffer *_pRpcChannelBuffer);

		ULONG STDMETHODCALLTYPE
		CStdAsyncStubBuffer2_Release(
		IRpcStubBuffer *pthis);

		HRESULT STDMETHODCALLTYPE
		CStdAsyncStubBuffer2_Connect(
		IRpcStubBuffer *pthis,
		IUnknown *pUnkServer);

		void STDMETHODCALLTYPE
		CStdAsyncStubBuffer2_Disconnect(
		IRpcStubBuffer *pthis);

void ObjectStublessClient3(void);		void ObjectStublessClient3(void);
void ObjectStublessClient4(void);		void ObjectStublessClient4(void);
void ObjectStublessClient5(void);		void ObjectStublessClient5(void);
void ObjectStublessClient6(void);		void ObjectStublessClient6(void);
void ObjectStublessClient7(void);		void ObjectStublessClient7(void);
void ObjectStublessClient8(void);		void ObjectStublessClient8(void);
void ObjectStublessClient9(void);		void ObjectStublessClient9(void);
void ObjectStublessClient10(void);		void ObjectStublessClient10(void);
void ObjectStublessClient11(void);		void ObjectStublessClient11(void);
void ObjectStublessClient12(void);		void ObjectStublessClient12(void);

skipping to change at line 502		skipping to change at line 572
void STDMETHODCALLTYPE		void STDMETHODCALLTYPE
NdrProxyForwardingFunction30(void);		NdrProxyForwardingFunction30(void);

void STDMETHODCALLTYPE		void STDMETHODCALLTYPE
NdrProxyForwardingFunction31(void);		NdrProxyForwardingFunction31(void);

void STDMETHODCALLTYPE		void STDMETHODCALLTYPE
NdrProxyForwardingFunction32(void);		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, \
CStdStubBuffer_DebugServerRelease		CStdStubBuffer_DebugServerRelease


#define CStdAsyncStubBuffer_METHODS 0,0,0,0,0,0,0,0,0,0		#define CStdStubBuffer_DELEGATING_METHODS 0,0,CStdStubBuffer2_Release,0,0,0,0,0,
#define CStdAsyncStubBuffer_DELEGATING_METHODS 0,0,0,0,0,0,0,0,0,0		0,0
		#define CStdAsyncStubBuffer_METHODS 0,0,0,0,0,0,0,0,0,0
		#define CStdAsyncStubBuffer_DELEGATING_METHODS 0,0,0,0,0,0,0,0,0,0

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

		#define CStdStubBuffer_DELEGATING_METHODS_OPT \
		CStdStubBuffer2_QueryInterface, \
		CStdStubBuffer_AddRef, \
		CStdStubBuffer2_Release, \
		CStdStubBuffer2_Connect, \
		CStdStubBuffer2_Disconnect, \
		CStdStubBuffer_Invoke, \
		CStdStubBuffer_IsIIDSupported, \
		CStdStubBuffer2_CountRefs, \
		CStdStubBuffer_DebugServerQueryInterface, \
		CStdStubBuffer_DebugServerRelease

		#define CStdAsyncStubBuffer_METHODS_OPT \
		CStdAsyncStubBuffer_QueryInterface, \
		CStdAsyncStubBuffer_AddRef, \
		CStdAsyncStubBuffer_Release, \
		CStdAsyncStubBuffer_Connect, \
		CStdAsyncStubBuffer_Disconnect, \
		CStdAsyncStubBuffer_Invoke, \
		CStdStubBuffer_IsIIDSupported, \
		CStdStubBuffer_CountRefs, \
		CStdStubBuffer_DebugServerQueryInterface, \
		CStdStubBuffer_DebugServerRelease

		#define CStdAsyncStubBuffer_DELEGATING_METHODS_OPT \
		CStdAsyncStubBuffer_QueryInterface, \
		CStdAsyncStubBuffer_AddRef, \
		CStdAsyncStubBuffer2_Release, \
		CStdAsyncStubBuffer2_Connect, \
		CStdAsyncStubBuffer2_Disconnect, \
		CStdAsyncStubBuffer_Invoke, \
		CStdStubBuffer_IsIIDSupported, \
		CStdStubBuffer2_CountRefs, \
		CStdStubBuffer_DebugServerQueryInterface, \
		CStdStubBuffer_DebugServerRelease

//+-------------------------------------------------------------------------		//+-------------------------------------------------------------------------
//		//
// Macro definitions for the proxy file		// Macro definitions for the proxy file
//		//
//--------------------------------------------------------------------------		//--------------------------------------------------------------------------

#define IID_GENERIC_CHECK_IID(name,pIID,index) memcmp( pIID, name##_ProxyVtblLis t[ index ]->header.piid, 16 )		#define IID_GENERIC_CHECK_IID(name,pIID,index) memcmp( pIID, name##_ProxyVtblLis t[ index ]->header.piid, 16 )

#define IID_BS_LOOKUP_SETUP int result, low=-1;		#define IID_BS_LOOKUP_SETUP int result, low=-1;

skipping to change at line 653		skipping to change at line 772
{ \		{ \
hProxyDll = hinstDLL; \		hProxyDll = hinstDLL; \
DISABLE_THREAD_LIBRARY_CALLS(hinstDLL); \		DISABLE_THREAD_LIBRARY_CALLS(hinstDLL); \
} \		} \
return TRUE; \		return TRUE; \
} \		} \
\		\
/* DllRegisterServer registers the interfaces contained in the proxy DLL. */ \		/* DllRegisterServer registers the interfaces contained in the proxy DLL. */ \
HRESULT STDAPICALLTYPE DLLREGISTERSERVER_ENTRY() \		HRESULT STDAPICALLTYPE DLLREGISTERSERVER_ENTRY() \
{ \		{ \

return NdrDllRegisterProxy(hProxyDll, pProxyFileList, pClsID); \		return NdrDllRegisterProxy(hProxyDll, (const ProxyFileInfo **)pProxyFile List, pClsID); \
} \		} \
\		\
/* DllUnregisterServer unregisters the interfaces contained in the proxy DLL . */ \		/* DllUnregisterServer unregisters the interfaces contained in the proxy DLL . */ \
HRESULT STDAPICALLTYPE DLLUNREGISTERSERVER_ENTRY() \		HRESULT STDAPICALLTYPE DLLUNREGISTERSERVER_ENTRY() \
{ \		{ \

return NdrDllUnregisterProxy(hProxyDll, pProxyFileList, pClsID); \		return NdrDllUnregisterProxy(hProxyDll, (const ProxyFileInfo **)pProxyFi leList, pClsID); \
}		}

//Delegation support.		//Delegation support.
#define STUB_FORWARDING_FUNCTION NdrStubForwardingFunction		#define STUB_FORWARDING_FUNCTION NdrStubForwardingFunction


ULONG STDMETHODCALLTYPE
CStdStubBuffer2_Release(IRpcStubBuffer *This);

ULONG STDMETHODCALLTYPE
NdrCStdStubBuffer2_Release(IRpcStubBuffer This,IPSFactoryBuffer pPSF);

#define CStdStubBuffer_DELEGATING_METHODS 0, 0, CStdStubBuffer2_Release, 0, 0, 0
, 0, 0, 0, 0

/*************************************************************************		/*************************************************************************
End of new functions.		End of new functions.
*************************************************************************/		*************************************************************************/

// PROXY_CLSID has precedence over PROXY_CLSID_IS		// PROXY_CLSID has precedence over PROXY_CLSID_IS

#ifdef PROXY_CLSID		#ifdef PROXY_CLSID

#define CLSID_PSFACTORYBUFFER extern CLSID PROXY_CLSID;		#define CLSID_PSFACTORYBUFFER extern CLSID PROXY_CLSID;


skipping to change at line 709		skipping to change at line 820
( aProxyFileList[0]->pStubVtblList[0] != 0 ? \		( aProxyFileList[0]->pStubVtblList[0] != 0 ? \
aProxyFileList[0]->pStubVtblList[0]->header.piid : 0)		aProxyFileList[0]->pStubVtblList[0]->header.piid : 0)
#else //PROXY_CLSID		#else //PROXY_CLSID
#define GET_DLL_CLSID &PROXY_CLSID		#define GET_DLL_CLSID &PROXY_CLSID
#endif //PROXY_CLSID		#endif //PROXY_CLSID

#define EXTERN_PROXY_FILE(name) \		#define EXTERN_PROXY_FILE(name) \
EXTERN_C const ProxyFileInfo name##_ProxyFileInfo;		EXTERN_C const ProxyFileInfo name##_ProxyFileInfo;

#define PROXYFILE_LIST_START \		#define PROXYFILE_LIST_START \

const ProxyFileInfo * aProxyFileList[] = {		extern const ProxyFileInfo* const aProxyFileList[] = {

#define REFERENCE_PROXY_FILE(name) \		#define REFERENCE_PROXY_FILE(name) \
& name##_ProxyFileInfo		& name##_ProxyFileInfo

#define PROXYFILE_LIST_END \		#define PROXYFILE_LIST_END \
0 };		0 };

// return pointers to the class information		// return pointers to the class information

#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 = (const ProxyFileInfo*)pPFList; \
*pId = pClsid; \		*pId = pClsid; \
};		};

// ole entry points:		// ole entry points:
#define DLLGETCLASSOBJECTROUTINE(pPFlist, pClsid,pFactory) \		#define DLLGETCLASSOBJECTROUTINE(pPFlist, pClsid,pFactory) \
_Check_return_ HRESULT STDAPICALLTYPE DLLGETCLASSOBJECT_ENTRY ( \		_Check_return_ HRESULT STDAPICALLTYPE DLLGETCLASSOBJECT_ENTRY ( \
_In_ REFCLSID rclsid, \		_In_ REFCLSID rclsid, \
_In_ REFIID riid, \		_In_ REFIID riid, \
_Outptr_ void ** ppv ) \		_Outptr_ void ** ppv ) \
{ \		{ \
return \		return \

NdrDllGetClassObject(rclsid,riid,ppv,pPFlist,pClsid,pFactory ); \		NdrDllGetClassObject(rclsid,riid,ppv,(const ProxyFileInfo**)pPFlist, pClsid,pFactory ); \
}		}

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

#define DLLRPCDUMMYCALL \		#define DLLRPCDUMMYCALL \
void __cdecl DLLRPCDUMMYCALL_ENTRY(void) \		void __cdecl DLLRPCDUMMYCALL_ENTRY(void) \

skipping to change at line 798		skipping to change at line 909
DLLRPCDUMMYCALL \		DLLRPCDUMMYCALL \
\		\
DLLREGISTRY_ROUTINES(pProxyFileList, pClsID) \		DLLREGISTRY_ROUTINES(pProxyFileList, pClsID) \
\		\

// more code goes here...		// more code goes here...

#define DLLDATA_STANDARD_ROUTINES \		#define DLLDATA_STANDARD_ROUTINES \
DLLDATA_ROUTINES( (const ProxyFileInfo**) pProxyFileList, &CLSID_PSFactoryBu ffer ) \		DLLDATA_ROUTINES( (const ProxyFileInfo**) pProxyFileList, &CLSID_PSFactoryBu ffer ) \


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP \| WINAPI_PARTITION_SYSTEM ) */
#pragma endregion		#pragma endregion

#if defined(__cplusplus)		#if defined(__cplusplus)
} // extern "C"		} // extern "C"
#endif		#endif

#endif // WIN32 or _WIN64_		#endif // WIN32 or _WIN64_

#if defined(_M_IA64) \|\| defined(_M_AMD64)		#if defined(_M_IA64) \|\| defined(_M_AMD64)
#include <poppack.h>		#include <poppack.h>

End of changes. 23 change blocks.
38 lines changed or deleted		149 lines changed or added

rpcssl.h (6.3.9600.17415-Windows 8.1)		rpcssl.h (10.0.10586.306-Windows 10 1511 10586.494)

skipping to change at line 18		skipping to change at line 18
// Contents: prototypes for RemoteProcedure Call API functions		// Contents: prototypes for RemoteProcedure Call API functions
// that use types from wincrypt.h		// that use types from wincrypt.h
//		//
//----------------------------------------------------------------------------		//----------------------------------------------------------------------------

#if _MSC_VER > 1000		#if _MSC_VER > 1000
#pragma once		#pragma once
#endif		#endif
#include <winapifamily.h>		#include <winapifamily.h>


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

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

#ifdef RPC_UNICODE_SUPPORTED		#ifdef RPC_UNICODE_SUPPORTED

#ifdef UNICODE		#ifdef UNICODE
#define RpcCertGeneratePrincipalName RpcCertGeneratePrincipalNameW		#define RpcCertGeneratePrincipalName RpcCertGeneratePrincipalNameW
#else /* UNICODE */		#else /* UNICODE */

skipping to change at line 68		skipping to change at line 68
_In_ DWORD Flags,		_In_ DWORD Flags,
_Outptr_ RPC_CSTR *pBuffer		_Outptr_ RPC_CSTR *pBuffer
);		);

#endif /* RPC_UNICODE_SUPPORTED */		#endif /* RPC_UNICODE_SUPPORTED */

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


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion

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

This html diff was produced by rfcdiff 1.41.