Headers diff for mprapi.dll between 6.3.9600.17415-Windows 8.1 and 10.0.10586.0-Windows 10 1511 10586.494 versions

mprapi.h (6.3.9600.17415-Windows 8.1)		mprapi.h (10.0.10586.0-Windows 10 1511 10586.494)

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

#ifndef __ROUTING_MPRADMIN_H__		#ifndef __ROUTING_MPRADMIN_H__
#define __ROUTING_MPRADMIN_H__		#define __ROUTING_MPRADMIN_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 CmdLineTools Package
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_PKG_CMDT
		OOLS)

#include <lmcons.h>		#include <lmcons.h>
#include <ras.h>		#include <ras.h>
#include <in6addr.h>		#include <in6addr.h>
#include <wincrypt.h>		#include <wincrypt.h>

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


skipping to change at line 782		skipping to change at line 782
OUT DWORD dwTimeoutErr;		OUT DWORD dwTimeoutErr;
OUT DWORD dwAlignmentErr;		OUT DWORD dwAlignmentErr;
OUT DWORD dwHardwareOverrunErr;		OUT DWORD dwHardwareOverrunErr;
OUT DWORD dwFramingErr;		OUT DWORD dwFramingErr;
OUT DWORD dwBufferOverrunErr;		OUT DWORD dwBufferOverrunErr;
OUT DWORD dwCompressionRatioIn;		OUT DWORD dwCompressionRatioIn;
OUT DWORD dwCompressionRatioOut;		OUT DWORD dwCompressionRatioOut;
}		}
RAS_PORT_1, *PRAS_PORT_1;		RAS_PORT_1, *PRAS_PORT_1;


		typedef struct _RAS_PORT_2
		{

		OUT HANDLE hPort;
		OUT HANDLE hConnection;
		OUT DWORD dwConn_State;
		OUT WCHAR wszPortName[ MAX_PORT_NAME + 1 ];
		OUT WCHAR wszMediaName[ MAX_MEDIA_NAME + 1 ];
		OUT WCHAR wszDeviceName[ MAX_DEVICE_NAME + 1 ];
		OUT WCHAR wszDeviceType[ MAX_DEVICETYPE_NAME + 1 ];
		OUT RAS_HARDWARE_CONDITION dwHardwareCondition;
		OUT DWORD dwLineSpeed; // in bits/second
		OUT DWORD dwCrcErr;
		OUT DWORD dwSerialOverRunErrs;
		OUT DWORD dwTimeoutErr;
		OUT DWORD dwAlignmentErr;
		OUT DWORD dwHardwareOverrunErr;
		OUT DWORD dwFramingErr;
		OUT DWORD dwBufferOverrunErr;
		OUT DWORD dwCompressionRatioIn;
		OUT DWORD dwCompressionRatioOut;
		OUT DWORD dwTotalErrors;
		OUT ULONGLONG ullBytesXmited;
		OUT ULONGLONG ullBytesRcved;
		OUT ULONGLONG ullFramesXmited; // Making 64 bit for fut
		ure
		OUT ULONGLONG ullFramesRcved; // Currently using 32 bi
		ts only
		OUT ULONGLONG ullBytesTxUncompressed;
		OUT ULONGLONG ullBytesTxCompressed;
		OUT ULONGLONG ullBytesRcvUncompressed;
		OUT ULONGLONG ullBytesRcvCompressed;
		}
		RAS_PORT_2, *PRAS_PORT_2;

//		//
// Maximum length of address string, e.g. "255.255.255.255" for IP.		// Maximum length of address string, e.g. "255.255.255.255" for IP.
//		//

#define IPADDRESSLEN 15		#define IPADDRESSLEN 15
#define IPXADDRESSLEN 22		#define IPXADDRESSLEN 22
#define ATADDRESSLEN 32		#define ATADDRESSLEN 32
#define MAXIPADRESSLEN 64		#define MAXIPADRESSLEN 64

typedef struct _PPP_NBFCP_INFO		typedef struct _PPP_NBFCP_INFO

skipping to change at line 1437		skipping to change at line 1470

typedef struct _MPR_IF_CUSTOMINFOEX0 {		typedef struct _MPR_IF_CUSTOMINFOEX0 {
MPRAPI_OBJECT_HEADER Header;		MPRAPI_OBJECT_HEADER Header;
DWORD dwFlags;		DWORD dwFlags;
ROUTER_IKEv2_IF_CUSTOM_CONFIG0 customIkev2Config;		ROUTER_IKEv2_IF_CUSTOM_CONFIG0 customIkev2Config;
}MPR_IF_CUSTOMINFOEX0, *PMPR_IF_CUSTOMINFOEX0;		}MPR_IF_CUSTOMINFOEX0, *PMPR_IF_CUSTOMINFOEX0;

#endif // NTDDI_VERSION >= NTDDI_WIN8		#endif // NTDDI_VERSION >= NTDDI_WIN8

#if (NTDDI_VERSION >= NTDDI_WINBLUE)		#if (NTDDI_VERSION >= NTDDI_WINBLUE)

		typedef struct _MPR_CERT_EKU
		{
		DWORD dwSize;
		BOOL IsEKUOID;
		WCHAR *pwszEKU;

		}MPR_CERT_EKU,*PMPR_CERT_EKU;
		#endif

		typedef struct _VPN_TS_IP_ADDRESS
		{
		USHORT Type;
		union
		{
		IN_ADDR v4; // The v4 address, if the Type == AF_INET .
		IN6_ADDR v6; // The v6 address, if the Type == AF_INET6.
		};
		}VPN_TS_IP_ADDRESS, *PVPN_TS_IP_ADDRESS;

		typedef enum _MPR_VPN_TS_TYPE
		{
		MPR_VPN_TS_IPv4_ADDR_RANGE = 7,
		MPR_VPN_TS_IPv6_ADDR_RANGE = 8
		}MPR_VPN_TS_TYPE;

		typedef struct _MPR_VPN_SELECTOR
		{
		MPR_VPN_TS_TYPE type;
		UINT8 protocolId;
		UINT16 portStart;
		UINT16 portEnd;
		UINT16 tsPayloadId;
		VPN_TS_IP_ADDRESS addrStart;
		VPN_TS_IP_ADDRESS addrEnd;
		}MPR_VPN_TRAFFIC_SELECTOR, *PMPR_VPN_TRAFFIC_SELECTOR;

		typedef struct _MPR_VPN_TRAFFIC_SELECTORS
		{
		DWORD num
		Tsi;
		DWORD num
		Tsr;
		PMPR_VPN_TRAFFIC_SELECTOR tsI
		;
		PMPR_VPN_TRAFFIC_SELECTOR tsR
		;
		}MPR_VPN_TRAFFIC_SELECTORS, *PMPR_VPN_TRAFFIC_SELECTORS;

		#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
		typedef struct _ROUTER_IKEv2_IF_CUSTOM_CONFIG2
		{
		// Lifetime of a security association (SA) in seconds,
		// after which the SA is no longer valid [RFC 4306].
		DWORD dwSaLifeTime;

		// Number of Kilobytes that are allowed to transfer using a SA.
		// After that the SA will be renegotiated [RFC 4306].
		DWORD dwSaDataSize;

		// SubjecName of the certificate to be used in default store
		// for machine certificate authentication.
		CERT_NAME_BLOB certificateName;

		// Custom IKEv2 Policy
		ROUTER_CUSTOM_IKEv2_POLICY0* customPolicy;

		// Thumbprint of the certificate to be used in default store
		// for machine certificate authentication.
		CRYPT_HASH_BLOB certificateHash;

		// Lifetime of main mode security association (SA) in seconds,
		// after which the MM SA is no longer valid.
		DWORD dwMmSaLifeTime;

		// Traffic Selectors For IPSec SA Negotiation
		// TrafficSelector Negotitated Traffic is allowed to go through and recei
		ved
		MPR_VPN_TRAFFIC_SELECTORS vpnTrafficSelectors;
		}ROUTER_IKEv2_IF_CUSTOM_CONFIG2, *PROUTER_IKEv2_IF_CUSTOM_CONFIG2;

		#define MPRAPI_MPR_IF_CUSTOM_CONFIG_OBJECT_REVISION_3 0x3

		typedef struct _MPR_IF_CUSTOMINFOEX2 {
		MPRAPI_OBJECT_HEADER Header;
		DWORD dwFlags;
		ROUTER_IKEv2_IF_CUSTOM_CONFIG2 customIkev2Config;
		}MPR_IF_CUSTOMINFOEX2, *PMPR_IF_CUSTOMINFOEX2;

		typedef struct _IKEV2_TUNNEL_CONFIG_PARAMS4 {
		DWORD dwIdleTimeout;
		DWORD dwNetworkBlackoutTime;
		DWORD dwSaLifeTime;
		DWORD dwSaDataSizeForRenegotiation;
		DWORD dwConfigOptions;
		DWORD dwTotalCertificates;
		CERT_NAME_BLOB* certificateNames;

		// SubjecName of the certificate to be used in default store
		// for machine certificate authentication.
		CERT_NAME_BLOB machineCertificateName;

		// encryption type to be used for IKEv2
		DWORD dwEncryptionType;

		PROUTER_CUSTOM_IKEv2_POLICY0 customPolicy;

		// Number of Ekus specified
		DWORD dwTotalEkus;
		PMPR_CERT_EKU certificateEKUs;

		// Thumbprint of the certificate to be used in default store
		// for machine certificate authentication.
		CRYPT_HASH_BLOB machineCertificateHash;

		DWORD dwMmSaLifeTime;

		}IKEV2_TUNNEL_CONFIG_PARAMS4, *PIKEV2_TUNNEL_CONFIG_PARAMS4;
		#endif

		#if (NTDDI_VERSION >= NTDDI_WINBLUE)
typedef struct _ROUTER_IKEv2_IF_CUSTOM_CONFIG1		typedef struct _ROUTER_IKEv2_IF_CUSTOM_CONFIG1
{		{
// Lifetime of a security association (SA) in seconds,		// Lifetime of a security association (SA) in seconds,
// after which the SA is no longer valid [RFC 4306].		// after which the SA is no longer valid [RFC 4306].
DWORD dwSaLifeTime;		DWORD dwSaLifeTime;

// Number of Kilobytes that are allowed to transfer using a SA.		// Number of Kilobytes that are allowed to transfer using a SA.
// After that the SA will be renegotiated [RFC 4306].		// After that the SA will be renegotiated [RFC 4306].
DWORD dwSaDataSize;		DWORD dwSaDataSize;


skipping to change at line 1467		skipping to change at line 1615
}ROUTER_IKEv2_IF_CUSTOM_CONFIG1, *PROUTER_IKEv2_IF_CUSTOM_CONFIG1;		}ROUTER_IKEv2_IF_CUSTOM_CONFIG1, *PROUTER_IKEv2_IF_CUSTOM_CONFIG1;

#define MPRAPI_MPR_IF_CUSTOM_CONFIG_OBJECT_REVISION_2 0x2		#define MPRAPI_MPR_IF_CUSTOM_CONFIG_OBJECT_REVISION_2 0x2

typedef struct _MPR_IF_CUSTOMINFOEX1 {		typedef struct _MPR_IF_CUSTOMINFOEX1 {
MPRAPI_OBJECT_HEADER Header;		MPRAPI_OBJECT_HEADER Header;
DWORD dwFlags;		DWORD dwFlags;
ROUTER_IKEv2_IF_CUSTOM_CONFIG1 customIkev2Config;		ROUTER_IKEv2_IF_CUSTOM_CONFIG1 customIkev2Config;
}MPR_IF_CUSTOMINFOEX1, *PMPR_IF_CUSTOMINFOEX1;		}MPR_IF_CUSTOMINFOEX1, *PMPR_IF_CUSTOMINFOEX1;


typedef struct _MPR_CERT_EKU
{
DWORD dwSize;
BOOL IsEKUOID;
WCHAR *pwszEKU;

}MPR_CERT_EKU,*PMPR_CERT_EKU;

typedef struct _IKEV2_TUNNEL_CONFIG_PARAMS3 {		typedef struct _IKEV2_TUNNEL_CONFIG_PARAMS3 {
DWORD dwIdleTimeout;		DWORD dwIdleTimeout;
DWORD dwNetworkBlackoutTime;		DWORD dwNetworkBlackoutTime;
DWORD dwSaLifeTime;		DWORD dwSaLifeTime;
DWORD dwSaDataSizeForRenegotiation;		DWORD dwSaDataSizeForRenegotiation;
DWORD dwConfigOptions;		DWORD dwConfigOptions;
DWORD dwTotalCertificates;		DWORD dwTotalCertificates;
CERT_NAME_BLOB* certificateNames;		CERT_NAME_BLOB* certificateNames;

// SubjecName of the certificate to be used in default store		// SubjecName of the certificate to be used in default store

skipping to change at line 1535		skipping to change at line 1675
DWORD dwIdleTimeout;		DWORD dwIdleTimeout;
DWORD dwNetworkBlackoutTime;		DWORD dwNetworkBlackoutTime;
DWORD dwSaLifeTime;		DWORD dwSaLifeTime;
DWORD dwSaDataSizeForRenegotiation;		DWORD dwSaDataSizeForRenegotiation;
DWORD dwConfigOptions;		DWORD dwConfigOptions;
DWORD dwTotalCertificates;		DWORD dwTotalCertificates;
CERT_NAME_BLOB * certificateNames;		CERT_NAME_BLOB * certificateNames;
}IKEV2_TUNNEL_CONFIG_PARAMS1, *PIKEV2_TUNNEL_CONFIG_PARAMS1;		}IKEV2_TUNNEL_CONFIG_PARAMS1, *PIKEV2_TUNNEL_CONFIG_PARAMS1;
#endif // NTDDI_VERSION >= NTDDI_WIN8		#endif // NTDDI_VERSION >= NTDDI_WIN8


		#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
		typedef struct _L2TP_TUNNEL_CONFIG_PARAMS2 {

		DWORD dwIdleTimeout;
		// encryption type to be used for L2TP
		DWORD dwEncryptionType;
		DWORD dwSaLifeTime;
		DWORD dwSaDataSizeForRenegotiation;

		PROUTER_CUSTOM_L2TP_POLICY0 customPolicy;
		DWORD dwMmSaLifeTime;
		}L2TP_TUNNEL_CONFIG_PARAMS2, *PL2TP_TUNNEL_CONFIG_PARAMS2;
		#endif

#if (NTDDI_VERSION >= NTDDI_WINBLUE)		#if (NTDDI_VERSION >= NTDDI_WINBLUE)

typedef struct _L2TP_TUNNEL_CONFIG_PARAMS1 {		typedef struct _L2TP_TUNNEL_CONFIG_PARAMS1 {

DWORD dwIdleTimeout;		DWORD dwIdleTimeout;
// encryption type to be used for L2TP		// encryption type to be used for L2TP
DWORD dwEncryptionType;		DWORD dwEncryptionType;
DWORD dwSaLifeTime;		DWORD dwSaLifeTime;
DWORD dwSaDataSizeForRenegotiation;		DWORD dwSaDataSizeForRenegotiation;


skipping to change at line 1557		skipping to change at line 1711

#endif		#endif

#if (NTDDI_VERSION >= NTDDI_WIN8)		#if (NTDDI_VERSION >= NTDDI_WIN8)

#define ROUTER_CUSTOM_IKEv2_POLICY ROUTER_CUSTOM_IKEv2_POLICY0		#define ROUTER_CUSTOM_IKEv2_POLICY ROUTER_CUSTOM_IKEv2_POLICY0
#define PROUTER_CUSTOM_IKEv2_POLICY PROUTER_CUSTOM_IKEv2_POLICY0		#define PROUTER_CUSTOM_IKEv2_POLICY PROUTER_CUSTOM_IKEv2_POLICY0

#endif // NTDDI_VERSION >= NTDDI_WIN8		#endif // NTDDI_VERSION >= NTDDI_WIN8


#if (NTDDI_VERSION >= NTDDI_WINBLUE)		#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)

		#define IKEV2_TUNNEL_CONFIG_PARAMS IKEV2_TUNNEL_CONFIG_PARAMS4
		#define PIKEV2_TUNNEL_CONFIG_PARAMS PIKEV2_TUNNEL_CONFIG_PARAMS4
		#define L2TP_TUNNEL_CONFIG_PARAMS L2TP_TUNNEL_CONFIG_PARAMS2
		#define PL2TP_TUNNEL_CONFIG_PARAMS PL2TP_TUNNEL_CONFIG_PARAMS2
		#define ROUTER_IKEv2_IF_CUSTOM_CONFIG ROUTER_IKEv2_IF_CUSTOM_CONFIG2
		#define PROUTER_IKEv2_IF_CUSTOM_CONFIG PROUTER_IKEv2_IF_CUSTOM_CONFIG2
		#define MPR_IF_CUSTOMINFOEX MPR_IF_CUSTOMINFOEX2
		#define PMPR_IF_CUSTOMINFOEX PMPR_IF_CUSTOMINFOEX2

		#elif (NTDDI_VERSION >= NTDDI_WINBLUE)

#define IKEV2_TUNNEL_CONFIG_PARAMS IKEV2_TUNNEL_CONFIG_PARAMS3		#define IKEV2_TUNNEL_CONFIG_PARAMS IKEV2_TUNNEL_CONFIG_PARAMS3
#define PIKEV2_TUNNEL_CONFIG_PARAMS PIKEV2_TUNNEL_CONFIG_PARAMS3		#define PIKEV2_TUNNEL_CONFIG_PARAMS PIKEV2_TUNNEL_CONFIG_PARAMS3
#define L2TP_TUNNEL_CONFIG_PARAMS L2TP_TUNNEL_CONFIG_PARAMS1		#define L2TP_TUNNEL_CONFIG_PARAMS L2TP_TUNNEL_CONFIG_PARAMS1
#define PL2TP_TUNNEL_CONFIG_PARAMS PL2TP_TUNNEL_CONFIG_PARAMS1		#define PL2TP_TUNNEL_CONFIG_PARAMS PL2TP_TUNNEL_CONFIG_PARAMS1
#define ROUTER_IKEv2_IF_CUSTOM_CONFIG ROUTER_IKEv2_IF_CUSTOM_CONFIG1		#define ROUTER_IKEv2_IF_CUSTOM_CONFIG ROUTER_IKEv2_IF_CUSTOM_CONFIG1
#define PROUTER_IKEv2_IF_CUSTOM_CONFIG PROUTER_IKEv2_IF_CUSTOM_CONFIG1		#define PROUTER_IKEv2_IF_CUSTOM_CONFIG PROUTER_IKEv2_IF_CUSTOM_CONFIG1
#define MPR_IF_CUSTOMINFOEX MPR_IF_CUSTOMINFOEX1		#define MPR_IF_CUSTOMINFOEX MPR_IF_CUSTOMINFOEX1
#define PMPR_IF_CUSTOMINFOEX PMPR_IF_CUSTOMINFOEX1		#define PMPR_IF_CUSTOMINFOEX PMPR_IF_CUSTOMINFOEX1


skipping to change at line 1691		skipping to change at line 1856

L2TP_CONFIG_PARAMS L2tpConfigParams;		L2TP_CONFIG_PARAMS L2tpConfigParams;

SSTP_CONFIG_PARAMS SstpConfigParams;		SSTP_CONFIG_PARAMS SstpConfigParams;

GRE_CONFIG_PARAMS GREConfigParams;		GRE_CONFIG_PARAMS GREConfigParams;

}MPRAPI_TUNNEL_CONFIG_PARAMS1, *PMPRAPI_TUNNEL_CONFIG_PARAMS1;		}MPRAPI_TUNNEL_CONFIG_PARAMS1, *PMPRAPI_TUNNEL_CONFIG_PARAMS1;
#endif		#endif


		#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
		#define MPRAPI_TUNNEL_CONFIG_PARAMS MPRAPI_TUNNEL_CONFIG_PARAMS1
		#define PMPRAPI_TUNNEL_CONFIG_PARAMS PMPRAPI_TUNNEL_CONFIG_PARAMS1
		#else
#define MPRAPI_TUNNEL_CONFIG_PARAMS MPRAPI_TUNNEL_CONFIG_PARAMS0		#define MPRAPI_TUNNEL_CONFIG_PARAMS MPRAPI_TUNNEL_CONFIG_PARAMS0
#define PMPRAPI_TUNNEL_CONFIG_PARAMS PMPRAPI_TUNNEL_CONFIG_PARAMS0		#define PMPRAPI_TUNNEL_CONFIG_PARAMS PMPRAPI_TUNNEL_CONFIG_PARAMS0

		#endif

#define MPRAPI_MPR_SERVER_OBJECT_REVISION_1 0x1		#define MPRAPI_MPR_SERVER_OBJECT_REVISION_1 0x1
#define MPRAPI_MPR_SERVER_OBJECT_REVISION_2 0x2		#define MPRAPI_MPR_SERVER_OBJECT_REVISION_2 0x2
#if (NTDDI_VERSION >= NTDDI_WINBLUE)		#if (NTDDI_VERSION >= NTDDI_WINBLUE)
#define MPRAPI_MPR_SERVER_OBJECT_REVISION_3 0x3		#define MPRAPI_MPR_SERVER_OBJECT_REVISION_3 0x3
#define MPRAPI_MPR_SERVER_OBJECT_REVISION_4 0x4		#define MPRAPI_MPR_SERVER_OBJECT_REVISION_4 0x4
#endif		#endif

		#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
		#define MPRAPI_MPR_SERVER_OBJECT_REVISION_5 0x5
		#endif

typedef struct _MPR_SERVER_EX0 {		typedef struct _MPR_SERVER_EX0 {
MPRAPI_OBJECT_HEADER Header;		MPRAPI_OBJECT_HEADER Header;
DWORD fLanOnlyMode;		DWORD fLanOnlyMode;
DWORD dwUpTime;		DWORD dwUpTime;
DWORD dwTotalPorts;		DWORD dwTotalPorts;
DWORD dwPortsInUse;		DWORD dwPortsInUse;
DWORD Reserved; // Added so that the structure is 8 by te aligned		DWORD Reserved; // Added so that the structure is 8 by te aligned
MPRAPI_TUNNEL_CONFIG_PARAMS0 ConfigParams;		MPRAPI_TUNNEL_CONFIG_PARAMS0 ConfigParams;
}MPR_SERVER_EX0, *PMPR_SERVER_EX0;		}MPR_SERVER_EX0, *PMPR_SERVER_EX0;

skipping to change at line 1723		skipping to change at line 1896
MPRAPI_OBJECT_HEADER Header;		MPRAPI_OBJECT_HEADER Header;
DWORD fLanOnlyMode;		DWORD fLanOnlyMode;
DWORD dwUpTime;		DWORD dwUpTime;
DWORD dwTotalPorts;		DWORD dwTotalPorts;
DWORD dwPortsInUse;		DWORD dwPortsInUse;
DWORD Reserved; // Added so that the structure is 8 by te aligned		DWORD Reserved; // Added so that the structure is 8 by te aligned
MPRAPI_TUNNEL_CONFIG_PARAMS1 ConfigParams;		MPRAPI_TUNNEL_CONFIG_PARAMS1 ConfigParams;
}MPR_SERVER_EX1, *PMPR_SERVER_EX1;		}MPR_SERVER_EX1, *PMPR_SERVER_EX1;
#endif		#endif


		#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
		#define MPR_SERVER_EX MPR_SERVER_EX1
		#define PMPR_SERVER_EX PMPR_SERVER_EX1
		#else
#define MPR_SERVER_EX MPR_SERVER_EX0		#define MPR_SERVER_EX MPR_SERVER_EX0
#define PMPR_SERVER_EX PMPR_SERVER_EX0		#define PMPR_SERVER_EX PMPR_SERVER_EX0

		#endif

#define MPRAPI_MPR_SERVER_SET_CONFIG_OBJECT_REVISION_1 0x1		#define MPRAPI_MPR_SERVER_SET_CONFIG_OBJECT_REVISION_1 0x1

#if (NTDDI_VERSION >= NTDDI_WIN8)		#if (NTDDI_VERSION >= NTDDI_WIN8)
#define MPRAPI_MPR_SERVER_SET_CONFIG_OBJECT_REVISION_2 0x2		#define MPRAPI_MPR_SERVER_SET_CONFIG_OBJECT_REVISION_2 0x2
#endif		#endif

#if (NTDDI_VERSION >= NTDDI_WINBLUE)		#if (NTDDI_VERSION >= NTDDI_WINBLUE)
#define MPRAPI_MPR_SERVER_SET_CONFIG_OBJECT_REVISION_3 0x3		#define MPRAPI_MPR_SERVER_SET_CONFIG_OBJECT_REVISION_3 0x3
#define MPRAPI_MPR_SERVER_SET_CONFIG_OBJECT_REVISION_4 0x4		#define MPRAPI_MPR_SERVER_SET_CONFIG_OBJECT_REVISION_4 0x4
#endif		#endif


		#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
		#define MPRAPI_MPR_SERVER_SET_CONFIG_OBJECT_REVISION_5 0x5
		#endif

#define MPRAPI_SET_CONFIG_PROTOCOL_FOR_PPTP 0x1		#define MPRAPI_SET_CONFIG_PROTOCOL_FOR_PPTP 0x1
#define MPRAPI_SET_CONFIG_PROTOCOL_FOR_L2TP 0x2		#define MPRAPI_SET_CONFIG_PROTOCOL_FOR_L2TP 0x2
#define MPRAPI_SET_CONFIG_PROTOCOL_FOR_SSTP 0x4		#define MPRAPI_SET_CONFIG_PROTOCOL_FOR_SSTP 0x4
#define MPRAPI_SET_CONFIG_PROTOCOL_FOR_IKEV2 0x8		#define MPRAPI_SET_CONFIG_PROTOCOL_FOR_IKEV2 0x8
#define MPRAPI_SET_CONFIG_PROTOCOL_FOR_GRE 0x10		#define MPRAPI_SET_CONFIG_PROTOCOL_FOR_GRE 0x10

typedef struct _MPR_SERVER_SET_CONFIG_EX0 {		typedef struct _MPR_SERVER_SET_CONFIG_EX0 {
MPRAPI_OBJECT_HEADER Header;		MPRAPI_OBJECT_HEADER Header;
DWORD setConfigForProtocols;		DWORD setConfigForProtocols;
MPRAPI_TUNNEL_CONFIG_PARAMS0 ConfigParams;		MPRAPI_TUNNEL_CONFIG_PARAMS0 ConfigParams;
}MPR_SERVER_SET_CONFIG_EX0, *PMPR_SERVER_SET_CONFIG_EX0;		}MPR_SERVER_SET_CONFIG_EX0, *PMPR_SERVER_SET_CONFIG_EX0;

#if (NTDDI_VERSION >= NTDDI_WINBLUE)		#if (NTDDI_VERSION >= NTDDI_WINBLUE)
typedef struct _MPR_SERVER_SET_CONFIG_EX1 {		typedef struct _MPR_SERVER_SET_CONFIG_EX1 {
MPRAPI_OBJECT_HEADER Header;		MPRAPI_OBJECT_HEADER Header;
DWORD setConfigForProtocols;		DWORD setConfigForProtocols;
MPRAPI_TUNNEL_CONFIG_PARAMS1 ConfigParams;		MPRAPI_TUNNEL_CONFIG_PARAMS1 ConfigParams;
}MPR_SERVER_SET_CONFIG_EX1, *PMPR_SERVER_SET_CONFIG_EX1;		}MPR_SERVER_SET_CONFIG_EX1, *PMPR_SERVER_SET_CONFIG_EX1;
#endif		#endif


		#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD)
		#define MPR_SERVER_SET_CONFIG_EX MPR_SERVER_SET_CONFIG_EX1
		#define PMPR_SERVER_SET_CONFIG_EX PMPR_SERVER_SET_CONFIG_EX1
		#else
#define MPR_SERVER_SET_CONFIG_EX MPR_SERVER_SET_CONFIG_EX0		#define MPR_SERVER_SET_CONFIG_EX MPR_SERVER_SET_CONFIG_EX0
#define PMPR_SERVER_SET_CONFIG_EX PMPR_SERVER_SET_CONFIG_EX0		#define PMPR_SERVER_SET_CONFIG_EX PMPR_SERVER_SET_CONFIG_EX0

		#endif

#define ALLOW_NO_AUTH 1		#define ALLOW_NO_AUTH 1
#define DO_NOT_ALLOW_NO_AUTH 0		#define DO_NOT_ALLOW_NO_AUTH 0

typedef struct _AUTH_VALIDATION_EX {		typedef struct _AUTH_VALIDATION_EX {
MPRAPI_OBJECT_HEADER Header;		MPRAPI_OBJECT_HEADER Header;
HANDLE hRasConnection;		HANDLE hRasConnection;
WCHAR wszUserName[UNLEN + 1 ];		WCHAR wszUserName[UNLEN + 1 ];
WCHAR wszLogonDomain[DNLEN + 1 ];		WCHAR wszLogonDomain[DNLEN + 1 ];
DWORD AuthInfoSize;		DWORD AuthInfoSize;

skipping to change at line 2979		skipping to change at line 3167
// );		// );
//		//

#define MprInfoBlockExists(h,t) \		#define MprInfoBlockExists(h,t) \
(MprInfoBlockFind((h),(t),NULL,NULL,NULL) == NO_ERROR)		(MprInfoBlockFind((h),(t),NULL,NULL,NULL) == NO_ERROR)

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


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_PK G_CMDTOOLS) */
#pragma endregion		#pragma endregion

#endif // __ROUTING_MPRADMIN_H__		#endif // __ROUTING_MPRADMIN_H__

End of changes. 15 change blocks.
12 lines changed or deleted		208 lines changed or added

This html diff was produced by rfcdiff 1.41.