Headers diff for rasapi32.dll between 6.1.7600.16385-Windows_7.0 and 6.3.9600.17415-Windows_8.1 versions

ras.h (6.1.7600.16385-Windows_7.0)		ras.h (6.3.9600.17415-Windows_8.1)

skipping to change at line 27		skipping to change at line 27
WINVER = 0x500 = Windows 2000		WINVER = 0x500 = Windows 2000

--*/		--*/

#ifndef _RAS_H_		#ifndef _RAS_H_
#define _RAS_H_		#define _RAS_H_

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

		#include <winapifamily.h>

		#pragma region Desktop Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

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

#pragma warning(push)		#pragma warning(push)
#pragma warning(disable:4201)//nameless struct/union		#pragma warning(disable:4201)//nameless struct/union

#ifndef UNLEN		#ifndef UNLEN
#include <lmcons.h>		#include <lmcons.h>

skipping to change at line 352		skipping to change at line 356
WCHAR szUserName[ UNLEN + 1 ];		WCHAR szUserName[ UNLEN + 1 ];
WCHAR szPassword[ PWLEN + 1 ];		WCHAR szPassword[ PWLEN + 1 ];
WCHAR szDomain[ DNLEN + 1 ];		WCHAR szDomain[ DNLEN + 1 ];
#if (WINVER >= 0x401)		#if (WINVER >= 0x401)
DWORD dwSubEntry;		DWORD dwSubEntry;
ULONG_PTR dwCallbackId;		ULONG_PTR dwCallbackId;
#endif		#endif
#if (WINVER >= 0x601)		#if (WINVER >= 0x601)
DWORD dwIfIndex;		DWORD dwIfIndex;
#endif		#endif

		#if (WINVER >= 0x602)
		LPWSTR szEncPassword;
		#endif
};		};

#define RASDIALPARAMSA struct tagRASDIALPARAMSA		#define RASDIALPARAMSA struct tagRASDIALPARAMSA
RASDIALPARAMSA		RASDIALPARAMSA
{		{
DWORD dwSize;		DWORD dwSize;
CHAR szEntryName[ RAS_MaxEntryName + 1 ];		CHAR szEntryName[ RAS_MaxEntryName + 1 ];
CHAR szPhoneNumber[ RAS_MaxPhoneNumber + 1 ];		CHAR szPhoneNumber[ RAS_MaxPhoneNumber + 1 ];
CHAR szCallbackNumber[ RAS_MaxCallbackNumber + 1 ];		CHAR szCallbackNumber[ RAS_MaxCallbackNumber + 1 ];
CHAR szUserName[ UNLEN + 1 ];		CHAR szUserName[ UNLEN + 1 ];
CHAR szPassword[ PWLEN + 1 ];		CHAR szPassword[ PWLEN + 1 ];
CHAR szDomain[ DNLEN + 1 ];		CHAR szDomain[ DNLEN + 1 ];
#if (WINVER >= 0x401)		#if (WINVER >= 0x401)
DWORD dwSubEntry;		DWORD dwSubEntry;
ULONG_PTR dwCallbackId;		ULONG_PTR dwCallbackId;
#endif		#endif
#if (WINVER >= 0x601)		#if (WINVER >= 0x601)
DWORD dwIfIndex;		DWORD dwIfIndex;
#endif		#endif

		#if (WINVER >= 0x602)
		LPSTR szEncPassword;
		#endif
};		};

#ifdef UNICODE		#ifdef UNICODE
#define RASDIALPARAMS RASDIALPARAMSW		#define RASDIALPARAMS RASDIALPARAMSW
#else		#else
#define RASDIALPARAMS RASDIALPARAMSA		#define RASDIALPARAMS RASDIALPARAMSA
#endif		#endif

#define LPRASDIALPARAMSW RASDIALPARAMSW*		#define LPRASDIALPARAMSW RASDIALPARAMSW*
#define LPRASDIALPARAMSA RASDIALPARAMSA*		#define LPRASDIALPARAMSA RASDIALPARAMSA*

skipping to change at line 447		skipping to change at line 457
#define RDEOPT_Router 0x00000800		#define RDEOPT_Router 0x00000800

#if (WINVER >= 0x500)		#if (WINVER >= 0x500)
#define RDEOPT_CustomDial 0x00001000		#define RDEOPT_CustomDial 0x00001000
#endif		#endif

#if (WINVER >= 0x501)		#if (WINVER >= 0x501)
#define RDEOPT_UseCustomScripting 0x00002000		#define RDEOPT_UseCustomScripting 0x00002000
#endif		#endif


		#if (WINVER >= 0x603)
		#define RDEOPT_InvokeAutoTriggerCredentialUI 0x00004000
		#define RDEOPT_EapInfoCryptInCapable 0x00008000
		#endif

//		//
// This flag when set in the RASENTRYNAME structure		// This flag when set in the RASENTRYNAME structure
// indicates that the phonebook to which this entry		// indicates that the phonebook to which this entry
// belongs is a system phonebook.		// belongs is a system phonebook.
//		//
#define REN_User 0x00000000		#define REN_User 0x00000000
#define REN_AllUsers 0x00000001		#define REN_AllUsers 0x00000001

/* Describes an enumerated RAS phone book entry name. (See RasEntryEnum)		/* Describes an enumerated RAS phone book entry name. (See RasEntryEnum)
*/		*/

skipping to change at line 731		skipping to change at line 746
#define RASLCPO_ACFC 0x00000002		#define RASLCPO_ACFC 0x00000002
#define RASLCPO_SSHF 0x00000004		#define RASLCPO_SSHF 0x00000004
#define RASLCPO_DES_56 0x00000008		#define RASLCPO_DES_56 0x00000008
#define RASLCPO_3_DES 0x00000010		#define RASLCPO_3_DES 0x00000010

#if (WINVER >= 0x600)		#if (WINVER >= 0x600)
#define RASLCPO_AES_128 0x00000020		#define RASLCPO_AES_128 0x00000020
#define RASLCPO_AES_256 0x00000040		#define RASLCPO_AES_256 0x00000040
#endif /* WINVER >= 0x0600 */		#endif /* WINVER >= 0x0600 */


		#if (WINVER >= 0x603)
		#define RASLCPO_AES_192 0x00000080
		#define RASLCPO_GCM_AES_128 0x00000100
		#define RASLCPO_GCM_AES_192 0x00000200
		#define RASLCPO_GCM_AES_256 0x00000400
		#endif /* WINVER >= 0x0603 */

#endif		#endif

#define RASPPPLCPW struct tagRASPPPLCPW		#define RASPPPLCPW struct tagRASPPPLCPW
RASPPPLCPW		RASPPPLCPW
{		{
DWORD dwSize;		DWORD dwSize;
BOOL fBundled;		BOOL fBundled;

#if (WINVER >= 0x500)		#if (WINVER >= 0x500)
DWORD dwError;		DWORD dwError;

skipping to change at line 908		skipping to change at line 930
/* RASIKEV2_PROJECTION_INFO 'dwFlags' values.		/* RASIKEV2_PROJECTION_INFO 'dwFlags' values.
*/		*/
#define RASIKEv2_FLAGS_MOBIKESUPPORTED 0x00000001		#define RASIKEv2_FLAGS_MOBIKESUPPORTED 0x00000001
#define RASIKEv2_FLAGS_BEHIND_NAT 0x00000002		#define RASIKEv2_FLAGS_BEHIND_NAT 0x00000002
#define RASIKEv2_FLAGS_SERVERBEHIND_NAT 0x00000004		#define RASIKEv2_FLAGS_SERVERBEHIND_NAT 0x00000004

/* RASIKEV2_PROJECTION_INFO 'dwAuthenticatonProtocol' values.		/* RASIKEV2_PROJECTION_INFO 'dwAuthenticatonProtocol' values.
*/		*/
#define RASIKEv2_AUTH_MACHINECERTIFICATES 1		#define RASIKEv2_AUTH_MACHINECERTIFICATES 1
#define RASIKEv2_AUTH_EAP 2		#define RASIKEv2_AUTH_EAP 2

		#define RASIKEv2_AUTH_PSK 3

typedef struct _RASIKEV2_PROJECTION_INFO {		typedef struct _RASIKEV2_PROJECTION_INFO {

// IPv4 Projection Parameters		// IPv4 Projection Parameters
DWORD dwIPv4NegotiationError;		DWORD dwIPv4NegotiationError;
RASIPV4ADDR ipv4Address;		RASIPV4ADDR ipv4Address;
RASIPV4ADDR ipv4ServerAddress;		RASIPV4ADDR ipv4ServerAddress;

// IPv6 Projection Parameters		// IPv6 Projection Parameters
DWORD dwIPv6NegotiationError;		DWORD dwIPv6NegotiationError;

skipping to change at line 1053		skipping to change at line 1076
#if (WINVER >= 0x600)		#if (WINVER >= 0x600)
#define VS_SstpOnly 5 // Only SSTP is attempted		#define VS_SstpOnly 5 // Only SSTP is attempted
#define VS_SstpFirst 6 // SSTP is attempted first		#define VS_SstpFirst 6 // SSTP is attempted first
#endif		#endif

#if (WINVER >= 0x601)		#if (WINVER >= 0x601)
#define VS_Ikev2Only 7 // Only VPN Ikev2 is attempted		#define VS_Ikev2Only 7 // Only VPN Ikev2 is attempted
#define VS_Ikev2First 8 // VPN Ikev2 is attempted first		#define VS_Ikev2First 8 // VPN Ikev2 is attempted first
#endif		#endif


		#if (WINVER >= 0x603)
		#define VS_GREOnly 9
		#endif

#if (WINVER >= 0x601)		#if (WINVER >= 0x601)
#define VS_PptpSstp 12 // PPTP is attempted followed only by SSTP		#define VS_PptpSstp 12 // PPTP is attempted followed only by SSTP
#define VS_L2tpSstp 13 // L2TP is attempted followed only by SSTP		#define VS_L2tpSstp 13 // L2TP is attempted followed only by SSTP
#define VS_Ikev2Sstp 14 // IKEv2 is attempted followed only by SSTP		#define VS_Ikev2Sstp 14 // IKEv2 is attempted followed only by SSTP
#endif		#endif

/* A RAS phone book entry.		/* A RAS phone book entry.
*/		*/
#define RASENTRYA struct tagRASENTRYA		#define RASENTRYA struct tagRASENTRYA
RASENTRYA		RASENTRYA

skipping to change at line 1444		skipping to change at line 1471
#define RASEO2_DisableIKENameEkuCheck 0x00040000		#define RASEO2_DisableIKENameEkuCheck 0x00040000
#endif		#endif

#if (WINVER >= 0x601)		#if (WINVER >= 0x601)
#define RASEO2_DisableClassBasedStaticRoute 0x00080000		#define RASEO2_DisableClassBasedStaticRoute 0x00080000
#define RASEO2_SpecificIPv6Addr 0x00100000		#define RASEO2_SpecificIPv6Addr 0x00100000
#define RASEO2_DisableMobility 0x00200000		#define RASEO2_DisableMobility 0x00200000
#define RASEO2_RequireMachineCertificates 0x00400000		#define RASEO2_RequireMachineCertificates 0x00400000
#endif		#endif


		#if (WINVER >= 0x602)
		#define RASEO2_UsePreSharedKeyForIkev2Initiator 0x00800000
		#define RASEO2_UsePreSharedKeyForIkev2Responder 0x01000000
		#define RASEO2_CacheCredentials 0x02000000
		#endif

		#if (WINVER >= 0x603)
		#define RASEO2_AutoTriggerCapable 0x04000000
		#define RASEO2_IsThirdPartyProfile 0x08000000
		#define RASEO2_AuthTypeIsOtp 0x10000000
		#endif

/* RASENTRY 'dwProtocols' bit flags.		/* RASENTRY 'dwProtocols' bit flags.
*/		*/
#define RASNP_NetBEUI 0x00000001		#define RASNP_NetBEUI 0x00000001
#define RASNP_Ipx 0x00000002		#define RASNP_Ipx 0x00000002
#define RASNP_Ip 0x00000004		#define RASNP_Ip 0x00000004
#if (WINVER >= 0x600)		#if (WINVER >= 0x600)
#define RASNP_Ipv6 0x00000008		#define RASNP_Ipv6 0x00000008
#endif		#endif

/* RASENTRY 'dwFramingProtocols' bit flags.		/* RASENTRY 'dwFramingProtocols' bit flags.

skipping to change at line 1799		skipping to change at line 1838
RASCUSTOMSCRIPTEXTENSIONS		RASCUSTOMSCRIPTEXTENSIONS
{		{
DWORD dwSize;		DWORD dwSize;
PFNRASSETCOMMSETTINGS pfnRasSetCommSettings;		PFNRASSETCOMMSETTINGS pfnRasSetCommSettings;
};		};

#endif		#endif

/* External RAS API function prototypes.		/* External RAS API function prototypes.
*/		*/

DWORD APIENTRY RasDialA( __in_opt LPRASDIALEXTENSIONS, __in_opt LPCSTR, __in LPR		DWORD APIENTRY RasDialA( _In_opt_ LPRASDIALEXTENSIONS, _In_opt_ LPCSTR, _In_ LPR
ASDIALPARAMSA, __in DWORD,		ASDIALPARAMSA, _In_ DWORD,
__in_opt LPVOID, __out LPHRASCONN );		_In_opt_ LPVOID, _Out_ LPHRASCONN );


DWORD APIENTRY RasDialW( __in_opt LPRASDIALEXTENSIONS, __in_opt LPCWSTR, __in LP		DWORD APIENTRY RasDialW( _In_opt_ LPRASDIALEXTENSIONS, _In_opt_ LPCWSTR, _In_ LP
RASDIALPARAMSW, __in DWORD,		RASDIALPARAMSW, _In_ DWORD,
__in_opt LPVOID, __out LPHRASCONN );		_In_opt_ LPVOID, _Out_ LPHRASCONN );


DWORD APIENTRY RasEnumConnectionsA( __inout_opt LPRASCONNA, __inout LPDWORD, __o ut LPDWORD );		DWORD APIENTRY RasEnumConnectionsA( _Inout_opt_ LPRASCONNA, _Inout_ LPDWORD, _Ou t_ LPDWORD );


DWORD APIENTRY RasEnumConnectionsW( __inout_opt LPRASCONNW, __inout LPDWORD, __o ut LPDWORD );		DWORD APIENTRY RasEnumConnectionsW( _Inout_opt_ LPRASCONNW, _Inout_ LPDWORD, _Ou t_ LPDWORD );


DWORD APIENTRY RasEnumEntriesA( __in_opt LPCSTR, __in_opt LPCSTR, __inout_opt LP		DWORD APIENTRY RasEnumEntriesA( _In_opt_ LPCSTR, _In_opt_ LPCSTR, _Inout_opt_ LP
RASENTRYNAMEA, __inout LPDWORD,		RASENTRYNAMEA, _Inout_ LPDWORD,
__out LPDWORD );		_Out_ LPDWORD );


DWORD APIENTRY RasEnumEntriesW( __in_opt LPCWSTR, __in_opt LPCWSTR, __inout_opt		DWORD APIENTRY RasEnumEntriesW( _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _Inout_opt_
LPRASENTRYNAMEW, __inout LPDWORD,		LPRASENTRYNAMEW, _Inout_ LPDWORD,
__out LPDWORD );		_Out_ LPDWORD );


DWORD APIENTRY RasGetConnectStatusA( __in HRASCONN, __inout LPRASCONNSTATUSA );		DWORD APIENTRY RasGetConnectStatusA( _In_ HRASCONN, _Inout_ LPRASCONNSTATUSA );


DWORD APIENTRY RasGetConnectStatusW( __in HRASCONN, __inout LPRASCONNSTATUSW );		DWORD APIENTRY RasGetConnectStatusW( _In_ HRASCONN, _Inout_ LPRASCONNSTATUSW );


DWORD APIENTRY RasGetErrorStringA( __in UINT ResourceId, __out_bcount(InBufSize) LPSTR lpszString, __in DWORD InBufSize);		DWORD APIENTRY RasGetErrorStringA( _In_ UINT ResourceId, _Out_writes_(InBufSize) LPSTR lpszString, _In_ DWORD InBufSize);


DWORD APIENTRY RasGetErrorStringW( __in UINT ResourceId, __out_bcount(InBufSize) LPWSTR lpszString, __in DWORD InBufSize);		DWORD APIENTRY RasGetErrorStringW( _In_ UINT ResourceId, _Out_writes_(InBufSize) LPWSTR lpszString, _In_ DWORD InBufSize);


DWORD APIENTRY RasHangUpA( __in HRASCONN );		DWORD APIENTRY RasHangUpA( _In_ HRASCONN );


DWORD APIENTRY RasHangUpW( __in HRASCONN );		DWORD APIENTRY RasHangUpW( _In_ HRASCONN );


DWORD APIENTRY RasGetProjectionInfoA( __in HRASCONN, __in RASPROJECTION, __out L PVOID, __inout LPDWORD );		DWORD APIENTRY RasGetProjectionInfoA( _In_ HRASCONN, _In_ RASPROJECTION, _Out_ L PVOID, _Inout_ LPDWORD );


DWORD APIENTRY RasGetProjectionInfoW( __in HRASCONN, __in RASPROJECTION, __out L PVOID, __inout LPDWORD );		DWORD APIENTRY RasGetProjectionInfoW( _In_ HRASCONN, _In_ RASPROJECTION, _Out_ L PVOID, _Inout_ LPDWORD );


DWORD APIENTRY RasCreatePhonebookEntryA( __in HWND, __in_opt LPCSTR );		DWORD APIENTRY RasCreatePhonebookEntryA( _In_ HWND, _In_opt_ LPCSTR );


DWORD APIENTRY RasCreatePhonebookEntryW( __in HWND, __in_opt LPCWSTR );		DWORD APIENTRY RasCreatePhonebookEntryW( _In_ HWND, _In_opt_ LPCWSTR );


DWORD APIENTRY RasEditPhonebookEntryA( __in HWND, __in_opt LPCSTR, __in LPCSTR ) ;		DWORD APIENTRY RasEditPhonebookEntryA( _In_ HWND, _In_opt_ LPCSTR, _In_ LPCSTR ) ;


DWORD APIENTRY RasEditPhonebookEntryW( __in HWND, __in_opt LPCWSTR, __in LPCWSTR );		DWORD APIENTRY RasEditPhonebookEntryW( _In_ HWND, _In_opt_ LPCWSTR, _In_ LPCWSTR );


DWORD APIENTRY RasSetEntryDialParamsA( __in_opt LPCSTR, __in LPRASDIALPARAMSA, _ _in BOOL );		DWORD APIENTRY RasSetEntryDialParamsA( _In_opt_ LPCSTR, _In_ LPRASDIALPARAMSA, _ In_ BOOL );


DWORD APIENTRY RasSetEntryDialParamsW( __in_opt LPCWSTR, __in LPRASDIALPARAMSW, __in BOOL );		DWORD APIENTRY RasSetEntryDialParamsW( _In_opt_ LPCWSTR, _In_ LPRASDIALPARAMSW, _In_ BOOL );


DWORD APIENTRY RasGetEntryDialParamsA( __in_opt LPCSTR, __inout LPRASDIALPARAMSA , __out LPBOOL );		DWORD APIENTRY RasGetEntryDialParamsA( _In_opt_ LPCSTR, _Inout_ LPRASDIALPARAMSA , _Out_ LPBOOL );


DWORD APIENTRY RasGetEntryDialParamsW( __in_opt LPCWSTR, __inout LPRASDIALPARAMS W, __out LPBOOL );		DWORD APIENTRY RasGetEntryDialParamsW( _In_opt_ LPCWSTR, _Inout_ LPRASDIALPARAMS W, _Out_ LPBOOL );


DWORD APIENTRY RasEnumDevicesA( __inout_opt LPRASDEVINFOA, __inout LPDWORD, __ou t LPDWORD );		DWORD APIENTRY RasEnumDevicesA( _Inout_opt_ LPRASDEVINFOA, _Inout_ LPDWORD, _Out _ LPDWORD );


DWORD APIENTRY RasEnumDevicesW( __inout_opt LPRASDEVINFOW, __inout LPDWORD, __ou t LPDWORD );		DWORD APIENTRY RasEnumDevicesW( _Inout_opt_ LPRASDEVINFOW, _Inout_ LPDWORD, _Out _ LPDWORD );


DWORD APIENTRY RasGetCountryInfoA( __inout_opt LPRASCTRYINFOA, __inout LPDWORD ) ;		DWORD APIENTRY RasGetCountryInfoA( _Inout_opt_ LPRASCTRYINFOA, _Inout_ LPDWORD ) ;


DWORD APIENTRY RasGetCountryInfoW( __inout_opt LPRASCTRYINFOW, __inout LPDWORD ) ;		DWORD APIENTRY RasGetCountryInfoW( _Inout_opt_ LPRASCTRYINFOW, _Inout_ LPDWORD ) ;


DWORD APIENTRY RasGetEntryPropertiesA( __in_opt LPCSTR, __in LPCSTR, __inout_opt LPRASENTRYA, __inout LPDWORD, __out_opt LPBYTE, __inout_opt LPDWORD );		DWORD APIENTRY RasGetEntryPropertiesA( _In_opt_ LPCSTR, _In_ LPCSTR, _Inout_opt_ LPRASENTRYA, _Inout_ LPDWORD, _Out_opt_ LPBYTE, _Inout_opt_ LPDWORD );


DWORD APIENTRY RasGetEntryPropertiesW( __in_opt LPCWSTR, __in LPCWSTR, __inout_o pt LPRASENTRYW, __inout LPDWORD, __out_opt LPBYTE, __inout_opt LPDWORD );		DWORD APIENTRY RasGetEntryPropertiesW( _In_opt_ LPCWSTR, _In_ LPCWSTR, _Inout_op t_ LPRASENTRYW, _Inout_ LPDWORD, _Out_opt_ LPBYTE, _Inout_opt_ LPDWORD );


DWORD APIENTRY RasSetEntryPropertiesA( __in_opt LPCSTR, __in LPCSTR, __in LPRASE NTRYA, __in DWORD, __in_opt LPBYTE, __in DWORD );		DWORD APIENTRY RasSetEntryPropertiesA( _In_opt_ LPCSTR, _In_ LPCSTR, _In_ LPRASE NTRYA, _In_ DWORD, _In_opt_ LPBYTE, _In_ DWORD );


DWORD APIENTRY RasSetEntryPropertiesW( __in_opt LPCWSTR, __in LPCWSTR, __in LPRA SENTRYW, __in DWORD, __in_opt LPBYTE, __in DWORD );		DWORD APIENTRY RasSetEntryPropertiesW( _In_opt_ LPCWSTR, _In_ LPCWSTR, _In_ LPRA SENTRYW, _In_ DWORD, _In_opt_ LPBYTE, _In_ DWORD );


DWORD APIENTRY RasRenameEntryA( __in_opt LPCSTR, __in LPCSTR, __in LPCSTR );		DWORD APIENTRY RasRenameEntryA( _In_opt_ LPCSTR, _In_ LPCSTR, _In_ LPCSTR );


DWORD APIENTRY RasRenameEntryW( __in_opt LPCWSTR, __in LPCWSTR, __in LPCWSTR );		DWORD APIENTRY RasRenameEntryW( _In_opt_ LPCWSTR, _In_ LPCWSTR, _In_ LPCWSTR );


DWORD APIENTRY RasDeleteEntryA( __in_opt LPCSTR, __in LPCSTR );		DWORD APIENTRY RasDeleteEntryA( _In_opt_ LPCSTR, _In_ LPCSTR );


DWORD APIENTRY RasDeleteEntryW( __in_opt LPCWSTR, __in LPCWSTR );		DWORD APIENTRY RasDeleteEntryW( _In_opt_ LPCWSTR, _In_ LPCWSTR );


DWORD APIENTRY RasValidateEntryNameA( __in_opt LPCSTR, __in LPCSTR );		DWORD APIENTRY RasValidateEntryNameA( _In_opt_ LPCSTR, _In_ LPCSTR );


DWORD APIENTRY RasValidateEntryNameW( __in_opt LPCWSTR, __in LPCWSTR );		DWORD APIENTRY RasValidateEntryNameW( _In_opt_ LPCWSTR, _In_ LPCWSTR );


DWORD APIENTRY RasConnectionNotificationA( __in HRASCONN, __in HANDLE, __in DWOR D );		DWORD APIENTRY RasConnectionNotificationA( _In_ HRASCONN, _In_ HANDLE, _In_ DWOR D );


DWORD APIENTRY RasConnectionNotificationW( __in HRASCONN, __in HANDLE, __in DWOR D );		DWORD APIENTRY RasConnectionNotificationW( _In_ HRASCONN, _In_ HANDLE, _In_ DWOR D );

#if (WINVER >= 0x401)		#if (WINVER >= 0x401)

DWORD APIENTRY RasGetSubEntryHandleA( __in HRASCONN, __in DWORD, __out LPHRASCON N );		DWORD APIENTRY RasGetSubEntryHandleA( _In_ HRASCONN, _In_ DWORD, _Out_ LPHRASCON N );


DWORD APIENTRY RasGetSubEntryHandleW( __in HRASCONN, __in DWORD, __out LPHRASCON N );		DWORD APIENTRY RasGetSubEntryHandleW( _In_ HRASCONN, _In_ DWORD, _Out_ LPHRASCON N );


DWORD APIENTRY RasGetCredentialsA( __in_opt LPCSTR, __in LPCSTR, __inout LPRASCR EDENTIALSA );		DWORD APIENTRY RasGetCredentialsA( _In_opt_ LPCSTR, _In_ LPCSTR, _Inout_ LPRASCR EDENTIALSA );


DWORD APIENTRY RasGetCredentialsW( __in_opt LPCWSTR, __in LPCWSTR, __inout LPRAS CREDENTIALSW );		DWORD APIENTRY RasGetCredentialsW( _In_opt_ LPCWSTR, _In_ LPCWSTR, _Inout_ LPRAS CREDENTIALSW );


DWORD APIENTRY RasSetCredentialsA( __in_opt LPCSTR, __in LPCSTR, __in LPRASCREDE NTIALSA, __in BOOL );		DWORD APIENTRY RasSetCredentialsA( _In_opt_ LPCSTR, _In_ LPCSTR, _In_ LPRASCREDE NTIALSA, _In_ BOOL );


DWORD APIENTRY RasSetCredentialsW( __in_opt LPCWSTR, __in LPCWSTR, __in LPRASCRE DENTIALSW, __in BOOL );		DWORD APIENTRY RasSetCredentialsW( _In_opt_ LPCWSTR, _In_ LPCWSTR, _In_ LPRASCRE DENTIALSW, _In_ BOOL );


DWORD APIENTRY RasGetSubEntryPropertiesA( __in_opt LPCSTR, __in LPCSTR, __in DWO		DWORD APIENTRY RasGetSubEntryPropertiesA( _In_opt_ LPCSTR, _In_ LPCSTR, _In_ DWO
RD,		RD,
__inout_opt LPRASSUBENTRYA, __inout_opt LPDWORD, __out_opt		_Inout_opt_ LPRASSUBENTRYA, _Inout_opt_ LPDWORD, _Out_opt_
LPBYTE, __inout_opt LPDWORD );		LPBYTE, _Inout_opt_ LPDWORD );


DWORD APIENTRY RasGetSubEntryPropertiesW( __in_opt LPCWSTR, __in LPCWSTR, __in D		DWORD APIENTRY RasGetSubEntryPropertiesW( _In_opt_ LPCWSTR, _In_ LPCWSTR, _In_ D
WORD,		WORD,
__inout_opt LPRASSUBENTRYW, __inout_opt LPDWORD, __out_opt L		_Inout_opt_ LPRASSUBENTRYW, _Inout_opt_ LPDWORD, _Out_opt_ L
PBYTE, __inout_opt LPDWORD );		PBYTE, _Inout_opt_ LPDWORD );


DWORD APIENTRY RasSetSubEntryPropertiesA( __in_opt LPCSTR, __in LPCSTR, __in DWO		DWORD APIENTRY RasSetSubEntryPropertiesA( _In_opt_ LPCSTR, _In_ LPCSTR, _In_ DWO
RD,		RD,
__in LPRASSUBENTRYA, __in DWORD, __in_opt LPBYTE, __in DWOR		_In_ LPRASSUBENTRYA, _In_ DWORD, _In_opt_ LPBYTE, _In_ DWOR
D );		D );


DWORD APIENTRY RasSetSubEntryPropertiesW( __in_opt LPCWSTR, __in LPCWSTR, __in D		DWORD APIENTRY RasSetSubEntryPropertiesW( _In_opt_ LPCWSTR, _In_ LPCWSTR, _In_ D
WORD,		WORD,
__in LPRASSUBENTRYW, __in DWORD, __in_opt LPBYTE, __in DWOR		_In_ LPRASSUBENTRYW, _In_ DWORD, _In_opt_ LPBYTE, _In_ DWOR
D );		D );


DWORD APIENTRY RasGetAutodialAddressA( __in_opt LPCSTR, __in_opt LPDWORD, __inou		DWORD APIENTRY RasGetAutodialAddressA( _In_opt_ LPCSTR, _In_opt_ LPDWORD, _Inout
t_opt LPRASAUTODIALENTRYA,		_opt_ LPRASAUTODIALENTRYA,
__inout LPDWORD, __out LPDWORD );		_Inout_ LPDWORD, _Out_ LPDWORD );


DWORD APIENTRY RasGetAutodialAddressW( __in_opt LPCWSTR, __in_opt LPDWORD, __ino		DWORD APIENTRY RasGetAutodialAddressW( _In_opt_ LPCWSTR, _In_opt_ LPDWORD, _Inou
ut_opt LPRASAUTODIALENTRYW,		t_opt_ LPRASAUTODIALENTRYW,
__inout LPDWORD, __out LPDWORD );		_Inout_ LPDWORD, _Out_ LPDWORD );


DWORD APIENTRY RasSetAutodialAddressA( __in_opt LPCSTR, __in DWORD, __in_opt		DWORD APIENTRY RasSetAutodialAddressA( _In_opt_ LPCSTR, _In_ DWORD, _In_opt_
LPRASAUTODIALENTRYA,		LPRASAUTODIALENTRYA,
__in DWORD, __in DWORD );		_In_ DWORD, _In_ DWORD );


DWORD APIENTRY RasSetAutodialAddressW( __in_opt LPCWSTR, __in DWORD, __in_opt		DWORD APIENTRY RasSetAutodialAddressW( _In_opt_ LPCWSTR, _In_ DWORD, _In_opt_
LPRASAUTODIALENTRYW,		LPRASAUTODIALENTRYW,
__in DWORD, __in DWORD );		_In_ DWORD, _In_ DWORD );

DWORD APIENTRY RasEnumAutodialAddressesA(		DWORD APIENTRY RasEnumAutodialAddressesA(

__inout_bcount_opt(lpdwcbRasAutodialAddresses) LPSTR lppRasAutodialAddress		_Inout_updates_bytes_opt_(lpdwcbRasAutodialAddresses) LPSTR lppRasAutodial
es,		Addresses,
__inout LPDWORD lpdwcbRasAutodialAddresses,		_Inout_ LPDWORD lpdwcbRasAutodialAddresses,
__out LPDWORD lpdwcRasAutodialAddresses);		_Out_ LPDWORD lpdwcRasAutodialAddresses);

DWORD APIENTRY RasEnumAutodialAddressesW(		DWORD APIENTRY RasEnumAutodialAddressesW(

__inout_bcount_opt(lpdwcbRasAutodialAddresses) LPWSTR lppRasAutodialAddres		_Inout_updates_bytes_opt_(lpdwcbRasAutodialAddresses) LPWSTR lppRasAutodia
ses,		lAddresses,
__inout LPDWORD lpdwcbRasAutodialAddresses,		_Inout_ LPDWORD lpdwcbRasAutodialAddresses,
__out LPDWORD lpdwcRasAutodialAddresses);		_Out_ LPDWORD lpdwcRasAutodialAddresses);


DWORD APIENTRY RasGetAutodialEnableA( __in DWORD, __out LPBOOL );		DWORD APIENTRY RasGetAutodialEnableA( _In_ DWORD, _Out_ LPBOOL );


DWORD APIENTRY RasGetAutodialEnableW( __in DWORD, __out LPBOOL );		DWORD APIENTRY RasGetAutodialEnableW( _In_ DWORD, _Out_ LPBOOL );


DWORD APIENTRY RasSetAutodialEnableA( __in DWORD, __in BOOL );		DWORD APIENTRY RasSetAutodialEnableA( _In_ DWORD, _In_ BOOL );


DWORD APIENTRY RasSetAutodialEnableW( __in DWORD, __in BOOL );		DWORD APIENTRY RasSetAutodialEnableW( _In_ DWORD, _In_ BOOL );


DWORD APIENTRY RasGetAutodialParamA( __in DWORD, __out LPVOID, __inout LPDWORD ) ;		DWORD APIENTRY RasGetAutodialParamA( _In_ DWORD, _Out_ LPVOID, _Inout_ LPDWORD ) ;


DWORD APIENTRY RasGetAutodialParamW( __in DWORD, __out LPVOID, __inout LPDWORD ) ;		DWORD APIENTRY RasGetAutodialParamW( _In_ DWORD, _Out_ LPVOID, _Inout_ LPDWORD ) ;


DWORD APIENTRY RasSetAutodialParamA( __in DWORD, __in LPVOID, __in DWORD );		DWORD APIENTRY RasSetAutodialParamA( _In_ DWORD, _In_ LPVOID, _In_ DWORD );


DWORD APIENTRY RasSetAutodialParamW( __in DWORD, __in LPVOID, __in DWORD );		DWORD APIENTRY RasSetAutodialParamW( _In_ DWORD, _In_ LPVOID, _In_ DWORD );

#endif		#endif

#if (WINVER >= 0x500)		#if (WINVER >= 0x500)

typedef struct _RAS_STATS		typedef struct _RAS_STATS
{		{
DWORD dwSize;		DWORD dwSize;
DWORD dwBytesXmited;		DWORD dwBytesXmited;
DWORD dwBytesRcved;		DWORD dwBytesRcved;

skipping to change at line 1991		skipping to change at line 2030
typedef DWORD (WINAPI *RasCustomDeleteEntryNotifyFn) (		typedef DWORD (WINAPI *RasCustomDeleteEntryNotifyFn) (
LPCWSTR lpszPhonebook,		LPCWSTR lpszPhonebook,
LPCWSTR lpszEntry,		LPCWSTR lpszEntry,
DWORD dwFlags );		DWORD dwFlags );

#define RCD_SingleUser 0		#define RCD_SingleUser 0
#define RCD_AllUsers 0x00000001		#define RCD_AllUsers 0x00000001
#define RCD_Eap 0x00000002		#define RCD_Eap 0x00000002
#define RCD_Logon 0x00000004		#define RCD_Logon 0x00000004


DWORD APIENTRY RasInvokeEapUI( __in HRASCONN, __in DWORD, __in LPRASDIALEXTENSIO NS, __in HWND);		DWORD APIENTRY RasInvokeEapUI( _In_ HRASCONN, _In_ DWORD, _In_ LPRASDIALEXTENSIO NS, _In_ HWND);


DWORD APIENTRY RasGetLinkStatistics(__in HRASCONN hRasConn,		DWORD APIENTRY RasGetLinkStatistics(_In_ HRASCONN hRasConn,
__in DWORD dwSubEntry,		_In_ DWORD dwSubEntry,
__inout RAS_STATS *lpStatistics );		_Inout_ RAS_STATS *lpStatistics );


DWORD APIENTRY RasGetConnectionStatistics( __in HRASCONN hRasConn,		DWORD APIENTRY RasGetConnectionStatistics( _In_ HRASCONN hRasConn,
__inout RAS_STATS *lpStatistics );		_Inout_ RAS_STATS *lpStatistics );


DWORD APIENTRY RasClearLinkStatistics(__in HRASCONN hRasConn,		DWORD APIENTRY RasClearLinkStatistics(_In_ HRASCONN hRasConn,
__in DWORD dwSubEntry);		_In_ DWORD dwSubEntry);


DWORD APIENTRY RasClearConnectionStatistics( __in HRASCONN hRasConn );		DWORD APIENTRY RasClearConnectionStatistics( _In_ HRASCONN hRasConn );

DWORD APIENTRY RasGetEapUserDataA(		DWORD APIENTRY RasGetEapUserDataA(

__in_opt HANDLE hToken,		_In_opt_ HANDLE hToken,
__in_opt LPCSTR pszPhonebook,		_In_opt_ LPCSTR pszPhonebook,
__in LPCSTR pszEntry,		_In_ LPCSTR pszEntry,
__out_opt BYTE *pbEapData,		_Out_opt_ BYTE *pbEapData,
__inout DWORD *pdwSizeofEapData );		_Inout_ DWORD *pdwSizeofEapData );

DWORD APIENTRY RasGetEapUserDataW(		DWORD APIENTRY RasGetEapUserDataW(

__in_opt HANDLE hToken,		_In_opt_ HANDLE hToken,
__in_opt LPCWSTR pszPhonebook,		_In_opt_ LPCWSTR pszPhonebook,
__in LPCWSTR pszEntry,		_In_ LPCWSTR pszEntry,
__out_opt BYTE *pbEapData,		_Out_opt_ BYTE *pbEapData,
__inout DWORD *pdwSizeofEapData );		_Inout_ DWORD *pdwSizeofEapData );

DWORD APIENTRY RasSetEapUserDataA(		DWORD APIENTRY RasSetEapUserDataA(

__in_opt HANDLE hToken,		_In_opt_ HANDLE hToken,
__in_opt LPCSTR pszPhonebook,		_In_opt_ LPCSTR pszPhonebook,
__in LPCSTR pszEntry,		_In_ LPCSTR pszEntry,
__in BYTE *pbEapData,		_In_ BYTE *pbEapData,
__in DWORD dwSizeofEapData );		_In_ DWORD dwSizeofEapData );

DWORD APIENTRY RasSetEapUserDataW(		DWORD APIENTRY RasSetEapUserDataW(

__in_opt HANDLE hToken,		_In_opt_ HANDLE hToken,
__in_opt LPCWSTR pszPhonebook,		_In_opt_ LPCWSTR pszPhonebook,
__in LPCWSTR pszEntry,		_In_ LPCWSTR pszEntry,
__in BYTE *pbEapData,		_In_ BYTE *pbEapData,
__in DWORD dwSizeofEapData );		_In_ DWORD dwSizeofEapData );

DWORD APIENTRY RasGetCustomAuthDataA(		DWORD APIENTRY RasGetCustomAuthDataA(

__in_opt LPCSTR pszPhonebook,		_In_opt_ LPCSTR pszPhonebook,
__in LPCSTR pszEntry,		_In_ LPCSTR pszEntry,
__out_opt BYTE *pbCustomAuthData,		_Out_writes_bytes_opt_(pdwSizeofCustomAuthData) BYTE pbCu
__inout DWORD *pdwSizeofCustomAuthData );		stomAuthData,
		_Inout_ DWORD *pdwSizeofCustomAuthData );

DWORD APIENTRY RasGetCustomAuthDataW(		DWORD APIENTRY RasGetCustomAuthDataW(

__in_opt LPCWSTR pszPhonebook,		_In_opt_ LPCWSTR pszPhonebook,
__in LPCWSTR pszEntry,		_In_ LPCWSTR pszEntry,
__out_opt BYTE *pbCustomAuthData,		_Out_writes_bytes_opt_(pdwSizeofCustomAuthData) BYTE pbC
__inout DWORD *pdwSizeofCustomAuthData );		ustomAuthData,
		_Inout_ DWORD *pdwSizeofCustomAuthData );

DWORD APIENTRY RasSetCustomAuthDataA(		DWORD APIENTRY RasSetCustomAuthDataA(

__in_opt LPCSTR pszPhonebook,		_In_opt_ LPCSTR pszPhonebook,
__in LPCSTR pszEntry,		_In_ LPCSTR pszEntry,
__in BYTE *pbCustomAuthData,		_In_reads_bytes_(dwSizeofCustomAuthData) BYTE *pbCustomAuth
__in DWORD dwSizeofCustomAuthData		Data,
		_In_ DWORD dwSizeofCustomAuthData
);		);

DWORD APIENTRY RasSetCustomAuthDataW(		DWORD APIENTRY RasSetCustomAuthDataW(

__in_opt LPCWSTR pszPhonebook,		_In_opt_ LPCWSTR pszPhonebook,
__in LPCWSTR pszEntry,		_In_ LPCWSTR pszEntry,
__in BYTE *pbCustomAuthData,		_In_reads_bytes_(dwSizeofCustomAuthData) BYTE *pbCustomAut
__in DWORD dwSizeofCustomAuthData		hData,
		_In_ DWORD dwSizeofCustomAuthData
);		);
DWORD APIENTRY RasGetEapUserIdentityW(		DWORD APIENTRY RasGetEapUserIdentityW(

__in_opt LPCWSTR pszPhonebook,		_In_opt_ LPCWSTR pszPhonebook,
__in LPCWSTR pszEntry,		_In_ LPCWSTR pszEntry,
__in DWORD dwFlags,		_In_ DWORD dwFlags,
__in HWND hwnd,		_In_ HWND hwnd,
__out LPRASEAPUSERIDENTITYW* ppRasEapUserIdentity		_Out_ LPRASEAPUSERIDENTITYW* ppRasEapUserIdentity
);		);
DWORD APIENTRY RasGetEapUserIdentityA(		DWORD APIENTRY RasGetEapUserIdentityA(

__in_opt LPCSTR pszPhonebook,		_In_opt_ LPCSTR pszPhonebook,
__in LPCSTR pszEntry,		_In_ LPCSTR pszEntry,
__in DWORD dwFlags,		_In_ DWORD dwFlags,
__in HWND hwnd,		_In_ HWND hwnd,
__out LPRASEAPUSERIDENTITYA* ppRasEapUserIdentity		_Out_ LPRASEAPUSERIDENTITYA* ppRasEapUserIdentity
);		);
VOID APIENTRY RasFreeEapUserIdentityW(		VOID APIENTRY RasFreeEapUserIdentityW(

__in LPRASEAPUSERIDENTITYW pRasEapUserIdentity		_In_ LPRASEAPUSERIDENTITYW pRasEapUserIdentity
);		);
VOID APIENTRY RasFreeEapUserIdentityA(		VOID APIENTRY RasFreeEapUserIdentityA(

__in LPRASEAPUSERIDENTITYA pRasEapUserIdentity		_In_ LPRASEAPUSERIDENTITYA pRasEapUserIdentity
);		);
#endif		#endif

#if (WINVER >= 0x501)		#if (WINVER >= 0x501)

DWORD APIENTRY RasDeleteSubEntryA(		DWORD APIENTRY RasDeleteSubEntryA(

__in_opt LPCSTR pszPhonebook,		_In_opt_ LPCSTR pszPhonebook,
__in LPCSTR pszEntry,		_In_ LPCSTR pszEntry,
__in DWORD dwSubentryId );		_In_ DWORD dwSubentryId );

DWORD APIENTRY RasDeleteSubEntryW(		DWORD APIENTRY RasDeleteSubEntryW(

__in_opt LPCWSTR pszPhonebook,		_In_opt_ LPCWSTR pszPhonebook,
__in LPCWSTR pszEntry,		_In_ LPCWSTR pszEntry,
__in DWORD dwSubEntryId );		_In_ DWORD dwSubEntryId );

// To use Quarantine APIs, applications should explicitly		// To use Quarantine APIs, applications should explicitly
// define USES_RAS_QUARANTINE_APIS.		// define USES_RAS_QUARANTINE_APIS.

#ifdef USES_RAS_QUARANTINE_APIS		#ifdef USES_RAS_QUARANTINE_APIS

DWORD APIENTRY		DWORD APIENTRY
RasGetNapStatus(		RasGetNapStatus(

__in HRASCONN hRasconn,		_In_ HRASCONN hRasconn,
__out LPRASNAPSTATE pRasNapState);		_Out_ LPRASNAPSTATE pRasNapState);

#endif //USES_RAS_QUARANTINE_APIS		#endif //USES_RAS_QUARANTINE_APIS

#endif		#endif

#if (WINVER >= 0x601)		#if (WINVER >= 0x601)

/* Update an active RAS connection.Localendpoint if specified is used for perfor ming		/* Update an active RAS connection.Localendpoint if specified is used for perfor ming
/ mobike update.If not specified then dwIfIndex value is used for performing mo bike.		/ mobike update.If not specified then dwIfIndex value is used for performing mo bike.
/ (See RasUpdateConnection)		/ (See RasUpdateConnection)

skipping to change at line 2127		skipping to change at line 2166
DWORD dwFlags;		DWORD dwFlags;
DWORD dwIfIndex;		DWORD dwIfIndex;
RASTUNNELENDPOINT localEndPoint;		RASTUNNELENDPOINT localEndPoint;
RASTUNNELENDPOINT remoteEndPoint;		RASTUNNELENDPOINT remoteEndPoint;
};		};

#define LPRASUPDATECONN RASUPDATECONN*		#define LPRASUPDATECONN RASUPDATECONN*

DWORD APIENTRY		DWORD APIENTRY
RasUpdateConnection(		RasUpdateConnection(

__in HRASCONN hrasconn,		_In_ HRASCONN hrasconn,
__in LPRASUPDATECONN lprasupdateconn);		_In_ LPRASUPDATECONN lprasupdateconn);

/* Ras Projection information for PPP or IKEv2		/* Ras Projection information for PPP or IKEv2
*/		*/
DWORD APIENTRY		DWORD APIENTRY
RasGetProjectionInfoEx(		RasGetProjectionInfoEx(

__in HRASCONN hrasconn,		_In_ HRASCONN hrasconn,
__inout_opt PRAS_PROJECTION_INFO pRasProjection,		_Inout_opt_ PRAS_PROJECTION_INFO pRasProjection,
__inout LPDWORD lpdwSize);		_Inout_ LPDWORD lpdwSize);

#endif		#endif

#ifdef UNICODE		#ifdef UNICODE
#define RasDial RasDialW		#define RasDial RasDialW
#define RasEnumConnections RasEnumConnectionsW		#define RasEnumConnections RasEnumConnectionsW
#define RasEnumEntries RasEnumEntriesW		#define RasEnumEntries RasEnumEntriesW
#define RasGetConnectStatus RasGetConnectStatusW		#define RasGetConnectStatus RasGetConnectStatusW
#define RasGetErrorString RasGetErrorStringW		#define RasGetErrorString RasGetErrorStringW
#define RasHangUp RasHangUpW		#define RasHangUp RasHangUpW

skipping to change at line 2240		skipping to change at line 2279
#endif		#endif

#pragma warning(pop)		#pragma warning(pop)

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

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


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

#endif // _RAS_H_		#endif // _RAS_H_

End of changes. 93 change blocks.
166 lines changed or deleted		212 lines changed or added

This html diff was produced by rfcdiff 1.41.