|  mprapi.h (5.2.3790.3959-Windows 5.0)  |   |  mprapi.h (6.0.6002.18005-Windows 6.0)  | 
 
       |   |  | 
      | skipping to change at line 38 |   | skipping to change at line 38 | 
      |         MprAdminAcceptNewConnection |   |         MprAdminAcceptNewConnection | 
      |         MprAdminAcceptNewLink |   |         MprAdminAcceptNewLink | 
      |         MprAdminConnectionHangupNotification |   |         MprAdminConnectionHangupNotification | 
      |         MprAdminLinkHangupNotification |   |         MprAdminLinkHangupNotification | 
      |         MprAdminGetIpAddressForUser |   |         MprAdminGetIpAddressForUser | 
      |         MprAdminReleaseIpAddress |   |         MprAdminReleaseIpAddress | 
      |         MprAdminInitializeDll |   |         MprAdminInitializeDll | 
      |         MprAdminTerminateDll |   |         MprAdminTerminateDll | 
      |         MprAdminAcceptNewConnection2 |   |         MprAdminAcceptNewConnection2 | 
      |         MprAdminConnectionHangupNotification2 |   |         MprAdminConnectionHangupNotification2 | 
       | 
       |   |         MprAdminAcceptReauthentication | 
       |   |  | 
      |         MprAdminUserGetInfo |   |         MprAdminUserGetInfo | 
      |         MprAdminUserSetInfo |   |         MprAdminUserSetInfo | 
      |         MprAdminSendUserMessage |   |         MprAdminSendUserMessage | 
      |         MprAdminGetPDCServer |   |         MprAdminGetPDCServer | 
       |   |  | 
      |         MprAdminRegisterConnectionNotification |   |         MprAdminRegisterConnectionNotification | 
      |         MprAdminDeregisterConnectionNotification |   |         MprAdminDeregisterConnectionNotification | 
       |   |  | 
      |         MprAdminIsServiceRunning |   |         MprAdminIsServiceRunning | 
       |   |  | 
      | skipping to change at line 114 |   | skipping to change at line 115 | 
      |         MprConfigInterfaceDelete |   |         MprConfigInterfaceDelete | 
      |         MprConfigInterfaceGetHandle |   |         MprConfigInterfaceGetHandle | 
      |         MprConfigInterfaceGetInfo |   |         MprConfigInterfaceGetInfo | 
      |         MprConfigInterfaceEnum |   |         MprConfigInterfaceEnum | 
      |         MprConfigInterfaceTransportAdd |   |         MprConfigInterfaceTransportAdd | 
      |         MprConfigInterfaceTransportRemove |   |         MprConfigInterfaceTransportRemove | 
      |         MprConfigInterfaceTransportGetHandle |   |         MprConfigInterfaceTransportGetHandle | 
      |         MprConfigInterfaceTransportGetInfo |   |         MprConfigInterfaceTransportGetInfo | 
      |         MprConfigInterfaceTransportSetInfo |   |         MprConfigInterfaceTransportSetInfo | 
      |         MprConfigInterfaceTransportEnum |   |         MprConfigInterfaceTransportEnum | 
       | 
       |   |         MprConfigFilterGetInfo | 
       |   |         MprConfigFilterSetInfo | 
       |   |  | 
      |         MprSetupIpInIpInterfaceFriendlyNameEnum |   |         MprSetupIpInIpInterfaceFriendlyNameEnum | 
      |         MprSetupIpInIpInterfaceFriendlyNameFree |   |         MprSetupIpInIpInterfaceFriendlyNameFree | 
      |         MprSetupIpInIpInterfaceFriendlyNameCreate |   |         MprSetupIpInIpInterfaceFriendlyNameCreate | 
      |         MprSetupIpInIpInterfaceFriendlyNameDelete |   |         MprSetupIpInIpInterfaceFriendlyNameDelete | 
       |   |  | 
      | --*/ |   | --*/ | 
       |   |  | 
      | #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 <lmcons.h> |   | #include <lmcons.h> | 
      | #include <ras.h> |   | #include <ras.h> | 
       | 
       |   | #include <in6addr.h> | 
       |   |  | 
      | #ifdef __cplusplus |   | #ifdef __cplusplus | 
      | extern "C" { |   | extern "C" { | 
      | #endif |   | #endif | 
       |   |  | 
      | //#if(WINVER >= 0x0403) |   | //#if(WINVER >= 0x0403) | 
       |   |  | 
      | // |   | // | 
      | // Name of the Routing and RemoteAccess Service |   | // Name of the Routing and RemoteAccess Service | 
      | // |   | // | 
       |   |  | 
      | #define RRAS_SERVICE_NAME       TEXT("RemoteAccess") |   | #define RRAS_SERVICE_NAME       TEXT("RemoteAccess") | 
       |   |  | 
      | // |   | // | 
      | // Protocol IDs |   | // Protocol IDs | 
      | // |   | // | 
       |   |  | 
      | #define PID_IPX                 0x0000002B |   | #define PID_IPX                 0x0000002B | 
      | #define PID_IP                  0x00000021 |   | #define PID_IP                  0x00000021 | 
       | 
       |   | #define PID_IPV6                0x00000057 | 
      | #define PID_NBF                 0x0000003F |   | #define PID_NBF                 0x0000003F | 
      | #define PID_ATALK               0x00000029 |   | #define PID_ATALK               0x00000029 | 
       |   |  | 
      | #define MAX_INTERFACE_NAME_LEN  256 |   | #define MAX_INTERFACE_NAME_LEN  256 | 
      | #define MAX_TRANSPORT_NAME_LEN  40 |   | #define MAX_TRANSPORT_NAME_LEN  40 | 
      | #define MAX_MEDIA_NAME          16 |   | #define MAX_MEDIA_NAME          16 | 
      | #define MAX_PORT_NAME           16 |   | #define MAX_PORT_NAME           16 | 
      | #define MAX_DEVICE_NAME         128 |   | #define MAX_DEVICE_NAME         128 | 
      | #define MAX_PHONE_NUMBER_LEN    128 |   | #define MAX_PHONE_NUMBER_LEN    128 | 
      | #define MAX_DEVICETYPE_NAME     16 |   | #define MAX_DEVICETYPE_NAME     16 | 
       |   |  | 
      | skipping to change at line 463 |   | skipping to change at line 468 | 
      |     GUID        guidId; |   |     GUID        guidId; | 
       |   |  | 
      |     // |   |     // | 
      |     // Vpn Strategy |   |     // Vpn Strategy | 
      |     // |   |     // | 
       |   |  | 
      |     DWORD       dwVpnStrategy; |   |     DWORD       dwVpnStrategy; | 
       |   |  | 
      | } MPR_INTERFACE_2, *PMPR_INTERFACE_2; |   | } MPR_INTERFACE_2, *PMPR_INTERFACE_2; | 
       |   |  | 
       | 
       |   | #if(WINVER >= 0x0600) | 
       |   |  | 
       |   | typedef struct _MPR_INTERFACE_3 | 
       |   | { | 
       |   |     IN OUT  WCHAR                   wszInterfaceName[MAX_INTERFACE_NAME_LEN+1]; | 
       |   |     OUT     HANDLE                  hInterface; | 
       |   |     IN OUT  BOOL                    fEnabled; | 
       |   |     IN OUT  ROUTER_INTERFACE_TYPE   dwIfType; | 
       |   |     OUT     ROUTER_CONNECTION_STATE dwConnectionState; | 
       |   |     OUT     DWORD                   fUnReachabilityReasons; | 
       |   |     OUT     DWORD                   dwLastError; | 
       |   |  | 
       |   |     // | 
       |   |     // Demand dial-specific properties | 
       |   |     // | 
       |   |  | 
       |   |     DWORD       dwfOptions; | 
       |   |  | 
       |   |     // | 
       |   |     // Location/phone number | 
       |   |     // | 
       |   |  | 
       |   |     WCHAR       szLocalPhoneNumber[ RAS_MaxPhoneNumber + 1 ]; | 
       |   |     PWCHAR      szAlternates; | 
       |   |  | 
       |   |     // | 
       |   |     // PPP/Ip | 
       |   |     // | 
       |   |  | 
       |   |     DWORD       ipaddr; | 
       |   |     DWORD       ipaddrDns; | 
       |   |     DWORD       ipaddrDnsAlt; | 
       |   |     DWORD       ipaddrWins; | 
       |   |     DWORD       ipaddrWinsAlt; | 
       |   |  | 
       |   |     // | 
       |   |     // NetProtocols | 
       |   |     // | 
       |   |  | 
       |   |     DWORD       dwfNetProtocols; | 
       |   |  | 
       |   |     // | 
       |   |     // Device | 
       |   |     // | 
       |   |  | 
       |   |     WCHAR       szDeviceType[ MPR_MaxDeviceType + 1 ]; | 
       |   |     WCHAR       szDeviceName[ MPR_MaxDeviceName + 1 ]; | 
       |   |  | 
       |   |     // | 
       |   |     // X.25 | 
       |   |     // | 
       |   |  | 
       |   |     WCHAR       szX25PadType[ MPR_MaxPadType + 1 ]; | 
       |   |     WCHAR       szX25Address[ MPR_MaxX25Address + 1 ]; | 
       |   |     WCHAR       szX25Facilities[ MPR_MaxFacilities + 1 ]; | 
       |   |     WCHAR       szX25UserData[ MPR_MaxUserData + 1 ]; | 
       |   |     DWORD       dwChannels; | 
       |   |  | 
       |   |     // | 
       |   |     // Multilink | 
       |   |     // | 
       |   |  | 
       |   |     DWORD       dwSubEntries; | 
       |   |     DWORD       dwDialMode; | 
       |   |     DWORD       dwDialExtraPercent; | 
       |   |     DWORD       dwDialExtraSampleSeconds; | 
       |   |     DWORD       dwHangUpExtraPercent; | 
       |   |     DWORD       dwHangUpExtraSampleSeconds; | 
       |   |  | 
       |   |     // | 
       |   |     // Idle timeout | 
       |   |     // | 
       |   |  | 
       |   |     DWORD       dwIdleDisconnectSeconds; | 
       |   |  | 
       |   |     // | 
       |   |     // Entry Type | 
       |   |     // | 
       |   |  | 
       |   |     DWORD       dwType; | 
       |   |  | 
       |   |     // | 
       |   |     // EncryptionType | 
       |   |     // | 
       |   |  | 
       |   |     DWORD       dwEncryptionType; | 
       |   |  | 
       |   |     // | 
       |   |     // EAP information | 
       |   |     // | 
       |   |  | 
       |   |     DWORD       dwCustomAuthKey; | 
       |   |     DWORD       dwCustomAuthDataSize; | 
       |   |     LPBYTE      lpbCustomAuthData; | 
       |   |  | 
       |   |     // | 
       |   |     // Guid of the connection | 
       |   |     // | 
       |   |  | 
       |   |     GUID        guidId; | 
       |   |  | 
       |   |     // | 
       |   |     // Vpn Strategy | 
       |   |     // | 
       |   |  | 
       |   |     DWORD       dwVpnStrategy; | 
       |   |  | 
       |   |     ULONG          AddressCount; | 
       |   |     IN6_ADDR      ipv6addrDns; | 
       |   |     IN6_ADDR       ipv6addrDnsAlt; | 
       |   |     IN6_ADDR       *ipv6addr; | 
       |   |  | 
       |   | } MPR_INTERFACE_3, *PMPR_INTERFACE_3; | 
       |   |  | 
       |   | #endif /* WINVER >= 0x0600 */ | 
       |   |                                                                                  | 
      | // |   | // | 
      | // Used to set/get per-link information for multilinked demand |   | // Used to set/get per-link information for multilinked demand | 
      | // dial interfaces. |   | // dial interfaces. | 
      | // |   | // | 
       |   |  | 
      | typedef struct _MPR_DEVICE_0 |   | typedef struct _MPR_DEVICE_0 | 
      | { |   | { | 
      |     // |   |     // | 
      |     // Device |   |     // Device | 
      |     // |   |     // | 
       |   |  | 
      | skipping to change at line 504 |   | skipping to change at line 625 | 
      |     PWCHAR      szAlternates; |   |     PWCHAR      szAlternates; | 
       |   |  | 
      | } |   | } | 
      | MPR_DEVICE_1, *PMPR_DEVICE_1; |   | MPR_DEVICE_1, *PMPR_DEVICE_1; | 
       |   |  | 
      | // |   | // | 
      | // Used to get/set extended credentials information such as |   | // Used to get/set extended credentials information such as | 
      | // eap credentials info. |   | // eap credentials info. | 
      | // |   | // | 
       |   |  | 
       | 
      | typedef struct _MPR_CREDENTIALSEX_0 |   | typedef __struct_bcount(dwSize + sizeof(MPR_CREDENTIALSEX_0)) struct _MPR_CREDEN
TIALSEX_0 | 
      | { |   | { | 
      |     DWORD  dwSize; |   |     DWORD  dwSize; | 
      |     LPBYTE lpbCredentialsInfo; |   |     LPBYTE lpbCredentialsInfo; | 
      | } |   | } | 
      | MPR_CREDENTIALSEX_0, *PMPR_CREDENTIALSEX_0; |   | MPR_CREDENTIALSEX_0, *PMPR_CREDENTIALSEX_0; | 
       |   |  | 
       | 
      | typedef struct _MPR_CREDENTIALSEX_1 |   | typedef __struct_bcount(dwSize + sizeof(MPR_CREDENTIALSEX_1)) struct _MPR_CREDEN
TIALSEX_1 | 
      | { |   | { | 
      |     DWORD  dwSize; |   |     DWORD  dwSize; | 
      |     LPBYTE lpbCredentialsInfo; |   |     LPBYTE lpbCredentialsInfo; | 
      | } |   | } | 
      | MPR_CREDENTIALSEX_1, *PMPR_CREDENTIALSEX_1; |   | MPR_CREDENTIALSEX_1, *PMPR_CREDENTIALSEX_1; | 
       |   |  | 
      | #endif /* WINVER >= 0x0500 */ |   | #endif /* WINVER >= 0x0500 */ | 
       |   |  | 
      | typedef struct _MPR_TRANSPORT_0 |   | typedef struct _MPR_TRANSPORT_0 | 
      | { |   | { | 
       |   |  | 
      | skipping to change at line 642 |   | skipping to change at line 763 | 
      | } |   | } | 
      | RAS_PORT_1, *PRAS_PORT_1; |   | RAS_PORT_1, *PRAS_PORT_1; | 
       |   |  | 
      | // |   | // | 
      | // 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 IPV6ADRESSLEN 64 | 
       |   |  | 
      | typedef struct _PPP_NBFCP_INFO |   | typedef struct _PPP_NBFCP_INFO | 
      | { |   | { | 
      |     OUT DWORD           dwError; |   |     OUT DWORD           dwError; | 
      |     OUT WCHAR           wszWksta[ NETBIOS_NAME_LEN + 1 ]; |   |     OUT WCHAR           wszWksta[ NETBIOS_NAME_LEN + 1 ]; | 
      | } |   | } | 
      | PPP_NBFCP_INFO; |   | PPP_NBFCP_INFO; | 
       |   |  | 
      | typedef struct _PPP_IPCP_INFO |   | typedef struct _PPP_IPCP_INFO | 
      | { |   | { | 
       |   |  | 
      | skipping to change at line 688 |   | skipping to change at line 810 | 
      | } |   | } | 
      | PPP_IPXCP_INFO; |   | PPP_IPXCP_INFO; | 
       |   |  | 
      | typedef struct _PPP_ATCP_INFO |   | typedef struct _PPP_ATCP_INFO | 
      | { |   | { | 
      |     OUT DWORD           dwError; |   |     OUT DWORD           dwError; | 
      |     OUT WCHAR           wszAddress[ ATADDRESSLEN + 1 ]; |   |     OUT WCHAR           wszAddress[ ATADDRESSLEN + 1 ]; | 
      | } |   | } | 
      | PPP_ATCP_INFO; |   | PPP_ATCP_INFO; | 
       |   |  | 
       | 
       |   | #if(WINVER >= 0x0600) | 
       |   |  | 
       |   | typedef struct _PPP_IPV6_CP_INFO | 
       |   | { | 
       |   |     OUT DWORD           dwVersion; | 
       |   |     OUT DWORD           dwSize; | 
       |   |     OUT DWORD           dwError; | 
       |   |     OUT BYTE            bInterfaceIdentifier[8]; | 
       |   |     OUT BYTE            bRemoteInterfaceIdentifier[8]; | 
       |   |     OUT DWORD           dwOptions; | 
       |   |     OUT DWORD           dwRemoteOptions; | 
       |   |     OUT BYTE           bPrefix[8]; | 
       |   |     OUT DWORD          dwPrefixLength; | 
       |   | } | 
       |   | PPP_IPV6_CP_INFO; | 
       |   |  | 
       |   | #endif /* WINVER >= 0x0600 */ | 
       |   |                                                                                  | 
      | typedef struct _PPP_INFO |   | typedef struct _PPP_INFO | 
      | { |   | { | 
      |     OUT PPP_NBFCP_INFO  nbf; |   |     OUT PPP_NBFCP_INFO  nbf; | 
      |     OUT PPP_IPCP_INFO   ip; |   |     OUT PPP_IPCP_INFO   ip; | 
      |     OUT PPP_IPXCP_INFO  ipx; |   |     OUT PPP_IPXCP_INFO  ipx; | 
      |     OUT PPP_ATCP_INFO   at; |   |     OUT PPP_ATCP_INFO   at; | 
       |   |  | 
      | } PPP_INFO; |   | } PPP_INFO; | 
       |   |  | 
      | #if(WINVER >= 0x0500) |   | #if(WINVER >= 0x0500) | 
       |   |  | 
      | skipping to change at line 755 |   | skipping to change at line 895 | 
      | // PPP_LCP dwOption values |   | // PPP_LCP dwOption values | 
      | // |   | // | 
       |   |  | 
      | #define PPP_LCP_MULTILINK_FRAMING   0x00000001 |   | #define PPP_LCP_MULTILINK_FRAMING   0x00000001 | 
      | #define PPP_LCP_PFC                 0x00000002 |   | #define PPP_LCP_PFC                 0x00000002 | 
      | #define PPP_LCP_ACFC                0x00000004 |   | #define PPP_LCP_ACFC                0x00000004 | 
      | #define PPP_LCP_SSHF                0x00000008 |   | #define PPP_LCP_SSHF                0x00000008 | 
      | #define PPP_LCP_DES_56              0x00000010 |   | #define PPP_LCP_DES_56              0x00000010 | 
      | #define PPP_LCP_3_DES               0x00000020 |   | #define PPP_LCP_3_DES               0x00000020 | 
       |   |  | 
       | 
       |   | #if(WINVER >= 0x0600) | 
       |   | #define PPP_LCP_AES_128             0x00000040 | 
       |   | #define PPP_LCP_AES_256             0x00000080 | 
       |   | #endif /* WINVER >= 0x0600 */ | 
       |   |                                                                                  | 
      | typedef struct _PPP_LCP_INFO |   | typedef struct _PPP_LCP_INFO | 
      | { |   | { | 
      |     OUT DWORD dwError; |   |     OUT DWORD dwError; | 
      |     OUT DWORD dwAuthenticationProtocol; |   |     OUT DWORD dwAuthenticationProtocol; | 
      |     OUT DWORD dwAuthenticationData; |   |     OUT DWORD dwAuthenticationData; | 
      |     OUT DWORD dwRemoteAuthenticationProtocol; |   |     OUT DWORD dwRemoteAuthenticationProtocol; | 
      |     OUT DWORD dwRemoteAuthenticationData; |   |     OUT DWORD dwRemoteAuthenticationData; | 
      |     OUT DWORD dwTerminateReason; |   |     OUT DWORD dwTerminateReason; | 
      |     OUT DWORD dwRemoteTerminateReason; |   |     OUT DWORD dwRemoteTerminateReason; | 
      |     OUT DWORD dwOptions; |   |     OUT DWORD dwOptions; | 
       |   |  | 
      | skipping to change at line 781 |   | skipping to change at line 926 | 
      | typedef struct _PPP_INFO_2 |   | typedef struct _PPP_INFO_2 | 
      | { |   | { | 
      |     OUT PPP_NBFCP_INFO  nbf; |   |     OUT PPP_NBFCP_INFO  nbf; | 
      |     OUT PPP_IPCP_INFO2  ip; |   |     OUT PPP_IPCP_INFO2  ip; | 
      |     OUT PPP_IPXCP_INFO  ipx; |   |     OUT PPP_IPXCP_INFO  ipx; | 
      |     OUT PPP_ATCP_INFO   at; |   |     OUT PPP_ATCP_INFO   at; | 
      |     OUT PPP_CCP_INFO    ccp; |   |     OUT PPP_CCP_INFO    ccp; | 
      |     OUT PPP_LCP_INFO    lcp; |   |     OUT PPP_LCP_INFO    lcp; | 
      | } |   | } | 
      | PPP_INFO_2; |   | PPP_INFO_2; | 
       | 
      |                                                                                  |   |  | 
      | #endif /* WINVER >= 0x0500 */ |   | #endif /* WINVER >= 0x0500 */ | 
       |   |  | 
       | 
       |   | #if(WINVER >= 0x0600) | 
       |   | typedef struct _PPP_INFO_3 | 
       |   | { | 
       |   |     OUT PPP_NBFCP_INFO  nbf; | 
       |   |     OUT PPP_IPCP_INFO2  ip; | 
       |   |     OUT PPP_IPV6_CP_INFO  ipv6; | 
       |   |     OUT PPP_CCP_INFO    ccp; | 
       |   |     OUT PPP_LCP_INFO    lcp; | 
       |   | } | 
       |   | PPP_INFO_3; | 
       |   |  | 
       |   | #endif /* WINVER >= 0x0600 */ | 
       |   |                                                                                  | 
      | // |   | // | 
      | // Possible bits set in Connection Flags field |   | // Possible bits set in Connection Flags field | 
      | // |   | // | 
       |   |  | 
      | #define RAS_FLAGS_PPP_CONNECTION        0x00000001 |   | #define RAS_FLAGS_PPP_CONNECTION        0x00000001 | 
      | #define RAS_FLAGS_MESSENGER_PRESENT     0x00000002 |   | #define RAS_FLAGS_MESSENGER_PRESENT     0x00000002 | 
       |   |  | 
      | #if(WINVER < 0x0501) |   | #if(WINVER < 0x0501) | 
      | #define RAS_FLAGS_RAS_CONNECTION        0x00000004 |   | #define RAS_FLAGS_RAS_CONNECTION        0x00000004 | 
      | #endif |   | #endif | 
       |   |  | 
      | skipping to change at line 844 |   | skipping to change at line 1001 | 
      | typedef struct _RAS_CONNECTION_2 |   | typedef struct _RAS_CONNECTION_2 | 
      | { |   | { | 
      |     OUT HANDLE                  hConnection; |   |     OUT HANDLE                  hConnection; | 
      |     OUT WCHAR                   wszUserName[ UNLEN + 1 ]; |   |     OUT WCHAR                   wszUserName[ UNLEN + 1 ]; | 
      |     OUT ROUTER_INTERFACE_TYPE   dwInterfaceType; |   |     OUT ROUTER_INTERFACE_TYPE   dwInterfaceType; | 
      |     OUT GUID                    guid; |   |     OUT GUID                    guid; | 
      |     OUT PPP_INFO_2              PppInfo2; |   |     OUT PPP_INFO_2              PppInfo2; | 
      | } |   | } | 
      | RAS_CONNECTION_2, *PRAS_CONNECTION_2; |   | RAS_CONNECTION_2, *PRAS_CONNECTION_2; | 
       |   |  | 
       | 
       |   | //indicates quarantine state of a client connection | 
       |   | typedef enum _RAS_QUARANTINE_STATE | 
       |   | { | 
       |   |       RAS_QUAR_STATE_NORMAL     = 0, | 
       |   |       RAS_QUAR_STATE_QUARANTINE = 1, | 
       |   |       RAS_QUAR_STATE_PROBATION  = 2, | 
       |   |       RAS_QUAR_STATE_NOT_CAPABLE    = 3 | 
       |   | }RAS_QUARANTINE_STATE; | 
      | #endif /* WINVER >= 0x0500 */ |   | #endif /* WINVER >= 0x0500 */ | 
       |   |  | 
       | 
       |   | #if(WINVER >= 0x0600) | 
       |   | typedef struct _RAS_CONNECTION_3 | 
       |   | { | 
       |   |        OUT DWORD     dwVersion; | 
       |   |        OUT DWORD     dwSize; | 
       |   |        OUT HANDLE     hConnection;   //connection handle | 
       |   |        WCHAR                   wszUserName[ UNLEN + 1 ]; | 
       |   |        ROUTER_INTERFACE_TYPE   dwInterfaceType; | 
       |   |        GUID                    guid; | 
       |   |        PPP_INFO_3           PppInfo3; | 
       |   |        OUT RAS_QUARANTINE_STATE    rasQuarState;  //Quarantine state of the conn | 
       |   | ection | 
       |   |        OUT FILETIME                timer;         //Probation timer in UTC | 
       |   | }RAS_CONNECTION_3, *PRAS_CONNECTION_3; | 
       |   |  | 
       |   | #endif /* WINVER >= 0x0600 */ | 
       |   |                                                                                  | 
      | // |   | // | 
      | // Structures used by the MPRADMIN USER APIs. Use level 0 to get/set this |   | // Structures used by the MPRADMIN USER APIs. Use level 0 to get/set this | 
      | // structure. |   | // structure. | 
      | // |   | // | 
      | // |   | // | 
      | // Bits indicating user's Remote Access privileges and mask to isolate |   | // Bits indicating user's Remote Access privileges and mask to isolate | 
      | // call back privilege. |   | // call back privilege. | 
      | // |   | // | 
      | // Note: Bit 0 MUST represent NoCallback due to a quirk of the "userparms" |   | // Note: Bit 0 MUST represent NoCallback due to a quirk of the "userparms" | 
      | //       storage method.  When a new LAN Manager user is created, bit 0 of the |   | //       storage method.  When a new LAN Manager user is created, bit 0 of the | 
       |   |  | 
      | skipping to change at line 890 |   | skipping to change at line 1071 | 
      | RAS_USER_0, *PRAS_USER_0; |   | RAS_USER_0, *PRAS_USER_0; | 
       |   |  | 
      | typedef struct _RAS_USER_1 |   | typedef struct _RAS_USER_1 | 
      | { |   | { | 
      |     OUT BYTE                    bfPrivilege; |   |     OUT BYTE                    bfPrivilege; | 
      |     OUT WCHAR                   wszPhoneNumber[ MAX_PHONE_NUMBER_LEN + 1]; |   |     OUT WCHAR                   wszPhoneNumber[ MAX_PHONE_NUMBER_LEN + 1]; | 
      |     OUT BYTE                    bfPrivilege2; |   |     OUT BYTE                    bfPrivilege2; | 
      | } |   | } | 
      | RAS_USER_1, *PRAS_USER_1; |   | RAS_USER_1, *PRAS_USER_1; | 
       |   |  | 
       | 
       |   | #if(WINVER >= 0x0600) | 
       |   | typedef struct _MPR_FILTER_0 | 
       |   | { | 
       |   |     IN BOOL fEnable; | 
       |   | } | 
       |   | MPR_FILTER_0, *PMPR_FILTER_0; | 
       |   | #endif /* WINVER >= 0x0600 */ | 
       |   |                                                                                  | 
      | // |   | // | 
      | // Used as RPC binding handle to server |   | // Used as RPC binding handle to server | 
      | // |   | // | 
       |   |  | 
      | typedef HANDLE RAS_SERVER_HANDLE; |   | typedef HANDLE RAS_SERVER_HANDLE; | 
      | typedef HANDLE MPR_SERVER_HANDLE; |   | typedef HANDLE MPR_SERVER_HANDLE; | 
      | typedef HANDLE MIB_SERVER_HANDLE; |   | typedef HANDLE MIB_SERVER_HANDLE; | 
       |   |  | 
      | // |   | // | 
      | //  RAS ADMIN APIs |   | //  RAS ADMIN APIs | 
       |   |  | 
      | skipping to change at line 982 |   | skipping to change at line 1171 | 
       |   |  | 
      | BOOL APIENTRY |   | BOOL APIENTRY | 
      | MprAdminAcceptNewConnection2( |   | MprAdminAcceptNewConnection2( | 
      |     IN      RAS_CONNECTION_0 *      pRasConnection0, |   |     IN      RAS_CONNECTION_0 *      pRasConnection0, | 
      |     IN      RAS_CONNECTION_1 *      pRasConnection1, |   |     IN      RAS_CONNECTION_1 *      pRasConnection1, | 
      |     IN      RAS_CONNECTION_2 *      pRasConnection2 |   |     IN      RAS_CONNECTION_2 *      pRasConnection2 | 
      |     ); |   |     ); | 
       |   |  | 
      | #endif /* WINVER >= 0x0500 */ |   | #endif /* WINVER >= 0x0500 */ | 
       |   |  | 
       | 
       |   | #if(WINVER >= 0x0600) | 
       |   |  | 
       |   | BOOL APIENTRY | 
       |   | MprAdminAcceptNewConnection3( | 
       |   |     IN      RAS_CONNECTION_0 *      pRasConnection0, | 
       |   |     IN      RAS_CONNECTION_1 *      pRasConnection1, | 
       |   |     IN      RAS_CONNECTION_2 *      pRasConnection2, | 
       |   |     IN      RAS_CONNECTION_3 *      pRasConnection3 | 
       |   |     ); | 
       |   |  | 
       |   | BOOL APIENTRY | 
       |   | MprAdminAcceptReauthentication( | 
       |   |     IN      RAS_CONNECTION_0 *      pRasConnection0, | 
       |   |     IN      RAS_CONNECTION_1 *      pRasConnection1, | 
       |   |     IN      RAS_CONNECTION_2 *      pRasConnection2, | 
       |   |     IN      RAS_CONNECTION_3 *      pRasConnection3 | 
       |   |     ); | 
       |   | #endif /* WINVER >= 0x0600 */ | 
       |   |                                                                                  | 
      | BOOL APIENTRY |   | BOOL APIENTRY | 
      | MprAdminAcceptNewLink ( |   | MprAdminAcceptNewLink ( | 
      |     IN      RAS_PORT_0 *            pRasPort0, |   |     IN      RAS_PORT_0 *            pRasPort0, | 
      |     IN      RAS_PORT_1 *            pRasPort1 |   |     IN      RAS_PORT_1 *            pRasPort1 | 
      |     ); |   |     ); | 
       |   |  | 
      | VOID APIENTRY |   | VOID APIENTRY | 
      | MprAdminConnectionHangupNotification( |   | MprAdminConnectionHangupNotification( | 
      |     IN      RAS_CONNECTION_0 *      pRasConnection0, |   |     IN      RAS_CONNECTION_0 *      pRasConnection0, | 
      |     IN      RAS_CONNECTION_1 *      pRasConnection1 |   |     IN      RAS_CONNECTION_1 *      pRasConnection1 | 
       |   |  | 
      | skipping to change at line 1005 |   | skipping to change at line 1213 | 
       |   |  | 
      | VOID APIENTRY |   | VOID APIENTRY | 
      | MprAdminConnectionHangupNotification2( |   | MprAdminConnectionHangupNotification2( | 
      |     IN      RAS_CONNECTION_0 *      pRasConnection0, |   |     IN      RAS_CONNECTION_0 *      pRasConnection0, | 
      |     IN      RAS_CONNECTION_1 *      pRasConnection1, |   |     IN      RAS_CONNECTION_1 *      pRasConnection1, | 
      |     IN      RAS_CONNECTION_2 *      pRasConnection2 |   |     IN      RAS_CONNECTION_2 *      pRasConnection2 | 
      |     ); |   |     ); | 
       |   |  | 
      | #endif /* WINVER >= 0x0500 */ |   | #endif /* WINVER >= 0x0500 */ | 
       |   |  | 
       | 
       |   | #if(WINVER >= 0x0600) | 
       |   |  | 
       |   | VOID APIENTRY | 
       |   | MprAdminConnectionHangupNotification3( | 
       |   |     IN      RAS_CONNECTION_0 *      pRasConnection0, | 
       |   |     IN      RAS_CONNECTION_1 *      pRasConnection1, | 
       |   |     IN      RAS_CONNECTION_2 *      pRasConnection2, | 
       |   |     IN      RAS_CONNECTION_3 *      pRasConnection3 | 
       |   |     ); | 
       |   |  | 
       |   | #endif /* WINVER >= 0x0600 */ | 
       |   |                                                                                  | 
      | #if (WINVER >= 0x501) |   | #if (WINVER >= 0x501) | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminConnectionRemoveQuarantine( |   | MprAdminConnectionRemoveQuarantine( | 
      |     IN      HANDLE          hRasServer, |   |     IN      HANDLE          hRasServer, | 
      |     IN      HANDLE          hRasConnection, |   |     IN      HANDLE          hRasConnection, | 
      |     IN      BOOL            fIsIpAddress |   |     IN      BOOL            fIsIpAddress | 
      |     ); |   |     ); | 
       |   |  | 
      | #endif |   | #endif | 
       |   |  | 
      | skipping to change at line 1037 |   | skipping to change at line 1257 | 
      |     OUT     BOOL *                  bNotifyRelease |   |     OUT     BOOL *                  bNotifyRelease | 
      |     ); |   |     ); | 
       |   |  | 
      | VOID APIENTRY |   | VOID APIENTRY | 
      | MprAdminReleaseIpAddress ( |   | MprAdminReleaseIpAddress ( | 
      |     IN      WCHAR *                 lpszUserName, |   |     IN      WCHAR *                 lpszUserName, | 
      |     IN      WCHAR *                 lpszPortName, |   |     IN      WCHAR *                 lpszPortName, | 
      |     IN      DWORD *                 lpdwIpAddress |   |     IN      DWORD *                 lpdwIpAddress | 
      |     ); |   |     ); | 
       |   |  | 
       | 
       |   | #if(WINVER >= 0x0600) | 
       |   |  | 
       |   | VOID APIENTRY | 
       |   | MprAdminReleaseIpAddress2 ( | 
       |   |     IN      WCHAR *                 lpszUserName, | 
       |   |     IN      WCHAR *                 lpszPortName, | 
       |   |     IN      DWORD *                 lpdwIpAddress, | 
       |   |     IN      IN6_ADDR                lpdwIpv6Address | 
       |   |     ); | 
       |   |  | 
       |   | DWORD APIENTRY | 
       |   | MprAdminGetIpAddressForUser2 ( | 
       |   |     IN      WCHAR *                 lpwszUserName, | 
       |   |     IN      WCHAR *                 lpwszPortName, | 
       |   |     IN OUT  DWORD *             lpdwIpAddress, /* IPv4 address */ | 
       |   |     IN OUT IN6_ADDR             lpdwIpv6Address[], /* IPv6 Address */ | 
       |   |     OUT     BOOL *                  bNotifyRelease | 
       |   |     ); | 
       |   |  | 
       |   | #endif /* WINVER >= 0x0600 */ | 
       |   |                                                                                  | 
      | #if(WINVER >= 0x0500) |   | #if(WINVER >= 0x0500) | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminInitializeDll( |   | MprAdminInitializeDll( | 
      |     VOID |   |     VOID | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminTerminateDll( |   | MprAdminTerminateDll( | 
      |     VOID |   |     VOID | 
       |   |  | 
      | skipping to change at line 1077 |   | skipping to change at line 1318 | 
      |     IN      DWORD                   dwLevel, |   |     IN      DWORD                   dwLevel, | 
      |     IN      const LPBYTE            lpbBuffer |   |     IN      const LPBYTE            lpbBuffer | 
      | ); |   | ); | 
       |   |  | 
      | #if(WINVER >= 0x0500) |   | #if(WINVER >= 0x0500) | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminSendUserMessage( |   | MprAdminSendUserMessage( | 
      |     IN      MPR_SERVER_HANDLE       hMprServer, |   |     IN      MPR_SERVER_HANDLE       hMprServer, | 
      |     IN      HANDLE                  hConnection, |   |     IN      HANDLE                  hConnection, | 
       | 
      |     IN      LPWSTR                  lpwszMessage |   |     __in IN      LPWSTR                  lpwszMessage | 
      | ); |   | ); | 
       |   |  | 
      | #endif /* WINVER >= 0x0500 */ |   | #endif /* WINVER >= 0x0500 */ | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminGetPDCServer( |   | MprAdminGetPDCServer( | 
       | 
      |     IN      const WCHAR *           lpszDomain, |   |     __in IN      const WCHAR *           lpszDomain, | 
      |     IN      const WCHAR *           lpszServer, |   |     __in IN      const WCHAR *           lpszServer, | 
      |     OUT     LPWSTR                  lpszPDCServer |   |     __out_ecount(UNCLEN+1) OUT     LPWSTR                  lpszPDCServer | 
      | ); |   | ); | 
       |   |  | 
      | // |   | // | 
      | // Router APIs |   | // Router APIs | 
      | // |   | // | 
       |   |  | 
      | BOOL APIENTRY |   | BOOL APIENTRY | 
      | MprAdminIsServiceRunning( |   | MprAdminIsServiceRunning( | 
       | 
      |     IN  LPWSTR  lpwsServerName |   |     __in IN  LPWSTR  lpwsServerName | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminServerConnect( |   | MprAdminServerConnect( | 
       | 
      |     IN      LPWSTR                  lpwsServerName      OPTIONAL, |   |     __in IN      LPWSTR                  lpwsServerName      OPTIONAL, | 
      |     OUT     MPR_SERVER_HANDLE *     phMprServer |   |     OUT     MPR_SERVER_HANDLE *     phMprServer | 
      | ); |   | ); | 
       |   |  | 
      | VOID APIENTRY |   | VOID APIENTRY | 
      | MprAdminServerDisconnect( |   | MprAdminServerDisconnect( | 
      |     IN      MPR_SERVER_HANDLE       hMprServer |   |     IN      MPR_SERVER_HANDLE       hMprServer | 
      | ); |   | ); | 
       |   |  | 
      | #if (WINVER >= 0x501) |   | #if (WINVER >= 0x501) | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
       |   |  | 
      | skipping to change at line 1134 |   | skipping to change at line 1375 | 
      | #endif |   | #endif | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminBufferFree( |   | MprAdminBufferFree( | 
      |     IN      LPVOID                  pBuffer |   |     IN      LPVOID                  pBuffer | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminGetErrorString( |   | MprAdminGetErrorString( | 
      |     IN      DWORD                   dwError, |   |     IN      DWORD                   dwError, | 
       | 
      |     OUT     LPWSTR *                lpwsErrorString |   |     __out OUT     LPWSTR *                lpwsErrorString | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminServerGetInfo( |   | MprAdminServerGetInfo( | 
      |     IN      MPR_SERVER_HANDLE       hMprServer, |   |     IN      MPR_SERVER_HANDLE       hMprServer, | 
      |     IN      DWORD                   dwLevel, |   |     IN      DWORD                   dwLevel, | 
      |     OUT     LPBYTE *                lplpbBuffer |   |     OUT     LPBYTE *                lplpbBuffer | 
      | ); |   | ); | 
       |   |  | 
      | #if (WINVER >= 0x501) |   | #if (WINVER >= 0x501) | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminServerSetInfo( |   | MprAdminServerSetInfo( | 
      |     IN      MPR_SERVER_HANDLE       hMprServer, |   |     IN      MPR_SERVER_HANDLE       hMprServer, | 
      |     IN      DWORD                   dwLevel, |   |     IN      DWORD                   dwLevel, | 
      |     IN      LPBYTE                  lpbBuffer |   |     IN      LPBYTE                  lpbBuffer | 
      | ); |   | ); | 
       |   |  | 
      | DWORD  APIENTRY |   | DWORD  APIENTRY | 
      | MprAdminEstablishDomainRasServer ( |   | MprAdminEstablishDomainRasServer ( | 
       | 
      |     IN      PWCHAR                  pszDomain, |   |     __in IN      PWCHAR                  pszDomain, | 
      |     IN      PWCHAR                  pszMachine, |   |     __in IN      PWCHAR                  pszMachine, | 
      |     IN      BOOL                    bEnable |   |     IN      BOOL                    bEnable | 
      | ); |   | ); | 
       |   |  | 
      | DWORD  APIENTRY |   | DWORD  APIENTRY | 
      | MprAdminIsDomainRasServer ( |   | MprAdminIsDomainRasServer ( | 
       | 
      |     IN      PWCHAR                  pszDomain, |   |     __in IN      PWCHAR                  pszDomain, | 
      |     IN      PWCHAR                  pszMachine, |   |     __in IN      PWCHAR                  pszMachine, | 
      |     OUT     PBOOL                   pbIsRasServer |   |     OUT     PBOOL                   pbIsRasServer | 
      | ); |   | ); | 
       |   |  | 
      | #endif |   | #endif | 
       |   |  | 
      | #if(WINVER >= 0x0500) |   | #if(WINVER >= 0x0500) | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminTransportCreate( |   | MprAdminTransportCreate( | 
      |     IN      MPR_SERVER_HANDLE       hMprServer, |   |     IN      MPR_SERVER_HANDLE       hMprServer, | 
      |     IN      DWORD                   dwTransportId, |   |     IN      DWORD                   dwTransportId, | 
       | 
      |     IN      LPWSTR                  lpwsTransportName           OPTIONAL, |   |     __in_opt IN      LPWSTR                  lpwsTransportName           OPTIONA
L, | 
      |     IN      LPBYTE                  pGlobalInfo, |   |     IN      LPBYTE                  pGlobalInfo, | 
      |     IN      DWORD                   dwGlobalInfoSize, |   |     IN      DWORD                   dwGlobalInfoSize, | 
      |     IN      LPBYTE                  pClientInterfaceInfo        OPTIONAL, |   |     IN      LPBYTE                  pClientInterfaceInfo        OPTIONAL, | 
      |     IN      DWORD                   dwClientInterfaceInfoSize   OPTIONAL, |   |     IN      DWORD                   dwClientInterfaceInfoSize   OPTIONAL, | 
       | 
      |     IN      LPWSTR                  lpwsDLLPath |   |     __in IN      LPWSTR                  lpwsDLLPath | 
      | ); |   | ); | 
       |   |  | 
      | #endif /* WINVER >= 0x0500 */ |   | #endif /* WINVER >= 0x0500 */ | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminTransportSetInfo( |   | MprAdminTransportSetInfo( | 
      |     IN      MPR_SERVER_HANDLE       hMprServer, |   |     IN      MPR_SERVER_HANDLE       hMprServer, | 
      |     IN      DWORD                   dwTransportId, |   |     IN      DWORD                   dwTransportId, | 
      |     IN      LPBYTE                  pGlobalInfo                 OPTIONAL, |   |     IN      LPBYTE                  pGlobalInfo                 OPTIONAL, | 
      |     IN      DWORD                   dwGlobalInfoSize, |   |     IN      DWORD                   dwGlobalInfoSize, | 
       |   |  | 
      | skipping to change at line 1218 |   | skipping to change at line 1459 | 
      |     IN      MPR_SERVER_HANDLE       hMprServer, |   |     IN      MPR_SERVER_HANDLE       hMprServer, | 
      |     IN      DWORD                   dwLevel, |   |     IN      DWORD                   dwLevel, | 
      |     OUT     LPBYTE*                 lplpbBuffer, |   |     OUT     LPBYTE*                 lplpbBuffer, | 
      |     OUT     LPDWORD                 lpdwTotalEntries); |   |     OUT     LPDWORD                 lpdwTotalEntries); | 
       |   |  | 
      | #endif /* WINVER >= 0x0500 */ |   | #endif /* WINVER >= 0x0500 */ | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminInterfaceGetHandle( |   | MprAdminInterfaceGetHandle( | 
      |     IN      MPR_SERVER_HANDLE       hMprServer, |   |     IN      MPR_SERVER_HANDLE       hMprServer, | 
       | 
      |     IN      LPWSTR                  lpwsInterfaceName, |   |     __in IN      LPWSTR                  lpwsInterfaceName, | 
      |     OUT     HANDLE *                phInterface, |   |     OUT     HANDLE *                phInterface, | 
      |     IN      BOOL                    fIncludeClientInterfaces |   |     IN      BOOL                    fIncludeClientInterfaces | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminInterfaceCreate( |   | MprAdminInterfaceCreate( | 
      |     IN      MPR_SERVER_HANDLE       hMprServer, |   |     IN      MPR_SERVER_HANDLE       hMprServer, | 
      |     IN      DWORD                   dwLevel, |   |     IN      DWORD                   dwLevel, | 
      |     IN      LPBYTE                  lpbBuffer, |   |     IN      LPBYTE                  lpbBuffer, | 
      |     OUT     HANDLE *                phInterface |   |     OUT     HANDLE *                phInterface | 
       |   |  | 
      | skipping to change at line 1322 |   | skipping to change at line 1563 | 
      |     IN      DWORD                   dwLevel, |   |     IN      DWORD                   dwLevel, | 
      |     OUT     LPBYTE *                lplpbBuffer, |   |     OUT     LPBYTE *                lplpbBuffer, | 
      |     IN      DWORD                   dwPrefMaxLen, |   |     IN      DWORD                   dwPrefMaxLen, | 
      |     OUT     LPDWORD                 lpdwEntriesRead, |   |     OUT     LPDWORD                 lpdwEntriesRead, | 
      |     OUT     LPDWORD                 lpdwTotalEntries, |   |     OUT     LPDWORD                 lpdwTotalEntries, | 
      |     IN      LPDWORD                 lpdwResumeHandle        OPTIONAL |   |     IN      LPDWORD                 lpdwResumeHandle        OPTIONAL | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprSetupIpInIpInterfaceFriendlyNameEnum( |   | MprSetupIpInIpInterfaceFriendlyNameEnum( | 
       | 
      |     IN  PWCHAR  pwszMachineName, |   |     __in PWCHAR  pwszMachineName, | 
      |     OUT LPBYTE* lplpBuffer, |   |     OUT LPBYTE* lplpBuffer, | 
      |     OUT LPDWORD lpdwEntriesRead |   |     OUT LPDWORD lpdwEntriesRead | 
      |     ); |   |     ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprSetupIpInIpInterfaceFriendlyNameFree( |   | MprSetupIpInIpInterfaceFriendlyNameFree( | 
      |     IN  LPVOID  lpBuffer |   |     IN  LPVOID  lpBuffer | 
      |     ); |   |     ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
       |   |  | 
      | skipping to change at line 1346 |   | skipping to change at line 1587 | 
      |     ); |   |     ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprSetupIpInIpInterfaceFriendlyNameDelete( |   | MprSetupIpInIpInterfaceFriendlyNameDelete( | 
      |     IN  PWCHAR  pwszMachineName, |   |     IN  PWCHAR  pwszMachineName, | 
      |     IN  GUID    *pGuid |   |     IN  GUID    *pGuid | 
      |     ); |   |     ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminInterfaceSetCredentials( |   | MprAdminInterfaceSetCredentials( | 
       | 
      |     IN      LPWSTR                  lpwsServer              OPTIONAL, |   |     __in_opt IN      LPWSTR                  lpwsServer              OPTIONAL, | 
      |     IN      LPWSTR                  lpwsInterfaceName, |   |     __in IN      LPWSTR                  lpwsInterfaceName, | 
      |     IN      LPWSTR                  lpwsUserName            OPTIONAL, |   |     __in_opt IN      LPWSTR                  lpwsUserName            OPTIONAL, | 
      |     IN      LPWSTR                  lpwsDomainName          OPTIONAL, |   |     __in_opt IN      LPWSTR                  lpwsDomainName          OPTIONAL, | 
      |     IN      LPWSTR                  lpwsPassword            OPTIONAL |   |     __in_opt IN      LPWSTR                  lpwsPassword            OPTIONAL | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminInterfaceGetCredentials( |   | MprAdminInterfaceGetCredentials( | 
       | 
      |     IN      LPWSTR                  lpwsServer              OPTIONAL, |   |     __in_opt IN      LPWSTR                  lpwsServer              OPTIONAL, | 
      |     IN      LPWSTR                  lpwsInterfaceName, |   |     __in IN      LPWSTR                  lpwsInterfaceName, | 
      |     OUT     LPWSTR                  lpwsUserName            OPTIONAL, |   |     __out_ecount_opt(UNLEN+1) OUT     LPWSTR                  lpwsUserName       | 
      |     OUT     LPWSTR                  lpwsPassword            OPTIONAL, |   |       OPTIONAL, | 
      |     OUT     LPWSTR                  lpwsDomainName          OPTIONAL |   |     __out_ecount_opt(PWLEN+1) OUT     LPWSTR                  lpwsPassword       | 
       |   |       OPTIONAL, | 
       |   |     __out_ecount_opt(DNLEN+1) OUT     LPWSTR                  lpwsDomainName     | 
       |   |       OPTIONAL | 
      | ); |   | ); | 
       |   |  | 
      | #if(WINVER >= 0x0500) |   | #if(WINVER >= 0x0500) | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminInterfaceSetCredentialsEx( |   | MprAdminInterfaceSetCredentialsEx( | 
      |     IN      MPR_SERVER_HANDLE       hMprServer, |   |     IN      MPR_SERVER_HANDLE       hMprServer, | 
      |     IN      HANDLE                  hInterface, |   |     IN      HANDLE                  hInterface, | 
      |     IN      DWORD                   dwLevel, |   |     IN      DWORD                   dwLevel, | 
      |     IN      LPBYTE                  lpbBuffer |   |     IN      LPBYTE                  lpbBuffer | 
       |   |  | 
      | skipping to change at line 1440 |   | skipping to change at line 1681 | 
      | ); |   | ); | 
       |   |  | 
      | #endif /* WINVER >= 0x0500 */ |   | #endif /* WINVER >= 0x0500 */ | 
       |   |  | 
      | // |   | // | 
      | // MIB APIs |   | // MIB APIs | 
      | // |   | // | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminMIBServerConnect( |   | MprAdminMIBServerConnect( | 
       | 
      |     IN      LPWSTR                  lpwsServerName      OPTIONAL, |   |     __in IN      LPWSTR                  lpwsServerName      OPTIONAL, | 
      |     OUT     MIB_SERVER_HANDLE *     phMibServer |   |     OUT     MIB_SERVER_HANDLE *     phMibServer | 
      | ); |   | ); | 
       |   |  | 
      | VOID APIENTRY |   | VOID APIENTRY | 
      | MprAdminMIBServerDisconnect( |   | MprAdminMIBServerDisconnect( | 
      |     IN      MIB_SERVER_HANDLE       hMibServer |   |     IN      MIB_SERVER_HANDLE       hMibServer | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprAdminMIBEntryCreate( |   | MprAdminMIBEntryCreate( | 
       |   |  | 
      | skipping to change at line 1548 |   | skipping to change at line 1789 | 
      | // |   | // | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigServerInstall( |   | MprConfigServerInstall( | 
      |     IN      DWORD                   dwLevel, |   |     IN      DWORD                   dwLevel, | 
      |     IN      PVOID                   pBuffer |   |     IN      PVOID                   pBuffer | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigServerConnect( |   | MprConfigServerConnect( | 
       | 
      |     IN      LPWSTR                  lpwsServerName, |   |     __in IN      LPWSTR                  lpwsServerName, | 
      |     OUT     HANDLE*                 phMprConfig |   |     OUT     HANDLE*                 phMprConfig | 
      | ); |   | ); | 
       |   |  | 
      | VOID APIENTRY |   | VOID APIENTRY | 
      | MprConfigServerDisconnect( |   | MprConfigServerDisconnect( | 
      |     IN      HANDLE                  hMprConfig |   |     IN      HANDLE                  hMprConfig | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigServerRefresh( |   | MprConfigServerRefresh( | 
       |   |  | 
      | skipping to change at line 1586 |   | skipping to change at line 1827 | 
      | MprConfigServerSetInfo( |   | MprConfigServerSetInfo( | 
      |     IN      MPR_SERVER_HANDLE       hMprServer, |   |     IN      MPR_SERVER_HANDLE       hMprServer, | 
      |     IN      DWORD                   dwLevel, |   |     IN      DWORD                   dwLevel, | 
      |     IN      LPBYTE                  lpbBuffer |   |     IN      LPBYTE                  lpbBuffer | 
      | ); |   | ); | 
      | #endif |   | #endif | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigServerBackup( |   | MprConfigServerBackup( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
       | 
      |     IN      LPWSTR                  lpwsPath |   |     __in IN      LPWSTR                  lpwsPath | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigServerRestore( |   | MprConfigServerRestore( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
       | 
      |     IN      LPWSTR                  lpwsPath |   |     __in IN      LPWSTR                  lpwsPath | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigTransportCreate( |   | MprConfigTransportCreate( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
      |     IN      DWORD                   dwTransportId, |   |     IN      DWORD                   dwTransportId, | 
       | 
      |     IN      LPWSTR                  lpwsTransportName           OPTIONAL, |   |     __in_opt IN      LPWSTR                  lpwsTransportName           OPTIONA | 
      |     IN      LPBYTE                  pGlobalInfo, |   | L, | 
       |   |     __in_bcount(dwGlobalInfoSize) IN      LPBYTE                  pGlobalInfo, | 
      |     IN      DWORD                   dwGlobalInfoSize, |   |     IN      DWORD                   dwGlobalInfoSize, | 
       | 
      |     IN      LPBYTE                  pClientInterfaceInfo        OPTIONAL, |   |     __in_bcount_opt(dwClientInterfaceInfoSize) IN      LPBYTE                  p
ClientInterfaceInfo        OPTIONAL, | 
      |     IN      DWORD                   dwClientInterfaceInfoSize   OPTIONAL, |   |     IN      DWORD                   dwClientInterfaceInfoSize   OPTIONAL, | 
       | 
      |     IN      LPWSTR                  lpwsDLLPath, |   |     __in_opt IN      LPWSTR                  lpwsDLLPath, | 
      |     OUT     HANDLE*                 phRouterTransport |   |     OUT     HANDLE*                 phRouterTransport | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigTransportDelete( |   | MprConfigTransportDelete( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
      |     IN      HANDLE                  hRouterTransport |   |     IN      HANDLE                  hRouterTransport | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigTransportGetHandle( |   | MprConfigTransportGetHandle( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
      |     IN      DWORD                   dwTransportId, |   |     IN      DWORD                   dwTransportId, | 
      |     OUT     HANDLE*                 phRouterTransport |   |     OUT     HANDLE*                 phRouterTransport | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigTransportSetInfo( |   | MprConfigTransportSetInfo( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
      |     IN      HANDLE                  hRouterTransport, |   |     IN      HANDLE                  hRouterTransport, | 
       | 
      |     IN      LPBYTE                  pGlobalInfo                 OPTIONAL, |   |     __in_bcount_opt(dwGlobalInfoSize) IN      LPBYTE                  pGlobalInf
o                 OPTIONAL, | 
      |     IN      DWORD                   dwGlobalInfoSize            OPTIONAL, |   |     IN      DWORD                   dwGlobalInfoSize            OPTIONAL, | 
       | 
      |     IN      LPBYTE                  pClientInterfaceInfo        OPTIONAL, |   |     __in_bcount_opt(dwClientInterfaceInfoSize) IN      LPBYTE                  p
ClientInterfaceInfo        OPTIONAL, | 
      |     IN      DWORD                   dwClientInterfaceInfoSize   OPTIONAL, |   |     IN      DWORD                   dwClientInterfaceInfoSize   OPTIONAL, | 
       | 
      |     IN      LPWSTR                  lpwsDLLPath                 OPTIONAL |   |     __in_opt IN      LPWSTR                  lpwsDLLPath                 OPTIONA
L | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigTransportGetInfo( |   | MprConfigTransportGetInfo( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
      |     IN      HANDLE                  hRouterTransport, |   |     IN      HANDLE                  hRouterTransport, | 
      |     IN  OUT LPBYTE*                 ppGlobalInfo                OPTIONAL, |   |     IN  OUT LPBYTE*                 ppGlobalInfo                OPTIONAL, | 
      |     OUT     LPDWORD                 lpdwGlobalInfoSize          OPTIONAL, |   |     OUT     LPDWORD                 lpdwGlobalInfoSize          OPTIONAL, | 
      |     IN  OUT LPBYTE*                 ppClientInterfaceInfo       OPTIONAL, |   |     IN  OUT LPBYTE*                 ppClientInterfaceInfo       OPTIONAL, | 
      |     OUT     LPDWORD                 lpdwClientInterfaceInfoSize OPTIONAL, |   |     OUT     LPDWORD                 lpdwClientInterfaceInfoSize OPTIONAL, | 
       | 
      |     IN  OUT LPWSTR*                 lplpwsDLLPath               OPTIONAL |   |     __deref_opt_out IN  OUT LPWSTR*                 lplpwsDLLPath               
OPTIONAL | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigTransportEnum( |   | MprConfigTransportEnum( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
      |     IN      DWORD                   dwLevel, |   |     IN      DWORD                   dwLevel, | 
      |     IN  OUT LPBYTE*                 lplpBuffer, |   |     IN  OUT LPBYTE*                 lplpBuffer, | 
      |     IN      DWORD                   dwPrefMaxLen, |   |     IN      DWORD                   dwPrefMaxLen, | 
      |     OUT     LPDWORD                 lpdwEntriesRead, |   |     OUT     LPDWORD                 lpdwEntriesRead, | 
      |     OUT     LPDWORD                 lpdwTotalEntries, |   |     OUT     LPDWORD                 lpdwTotalEntries, | 
       |   |  | 
      | skipping to change at line 1671 |   | skipping to change at line 1912 | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigInterfaceDelete( |   | MprConfigInterfaceDelete( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
      |     IN      HANDLE                  hRouterInterface |   |     IN      HANDLE                  hRouterInterface | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigInterfaceGetHandle( |   | MprConfigInterfaceGetHandle( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
       | 
      |     IN      LPWSTR                  lpwsInterfaceName, |   |     __in IN      LPWSTR                  lpwsInterfaceName, | 
      |     OUT     HANDLE*                 phRouterInterface |   |     OUT     HANDLE*                 phRouterInterface | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigInterfaceGetInfo( |   | MprConfigInterfaceGetInfo( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
      |     IN      HANDLE                  hRouterInterface, |   |     IN      HANDLE                  hRouterInterface, | 
      |     IN      DWORD                   dwLevel, |   |     IN      DWORD                   dwLevel, | 
      |     IN  OUT LPBYTE*                 lplpBuffer, |   |     IN  OUT LPBYTE*                 lplpBuffer, | 
      |     OUT     LPDWORD                 lpdwBufferSize |   |     OUT     LPDWORD                 lpdwBufferSize | 
       |   |  | 
      | skipping to change at line 1708 |   | skipping to change at line 1949 | 
      |     OUT     LPDWORD                 lpdwEntriesRead, |   |     OUT     LPDWORD                 lpdwEntriesRead, | 
      |     OUT     LPDWORD                 lpdwTotalEntries, |   |     OUT     LPDWORD                 lpdwTotalEntries, | 
      |     IN  OUT LPDWORD                 lpdwResumeHandle            OPTIONAL |   |     IN  OUT LPDWORD                 lpdwResumeHandle            OPTIONAL | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigInterfaceTransportAdd( |   | MprConfigInterfaceTransportAdd( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
      |     IN      HANDLE                  hRouterInterface, |   |     IN      HANDLE                  hRouterInterface, | 
      |     IN      DWORD                   dwTransportId, |   |     IN      DWORD                   dwTransportId, | 
       | 
      |     IN      LPWSTR                  lpwsTransportName           OPTIONAL, |   |     __in_opt IN      LPWSTR                  lpwsTransportName           OPTIONA
L, | 
      |     IN      LPBYTE                  pInterfaceInfo, |   |     IN      LPBYTE                  pInterfaceInfo, | 
      |     IN      DWORD                   dwInterfaceInfoSize, |   |     IN      DWORD                   dwInterfaceInfoSize, | 
      |     OUT     HANDLE*                 phRouterIfTransport |   |     OUT     HANDLE*                 phRouterIfTransport | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigInterfaceTransportRemove( |   | MprConfigInterfaceTransportRemove( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
      |     IN      HANDLE                  hRouterInterface, |   |     IN      HANDLE                  hRouterInterface, | 
      |     IN      HANDLE                  hRouterIfTransport |   |     IN      HANDLE                  hRouterIfTransport | 
       |   |  | 
      | skipping to change at line 1762 |   | skipping to change at line 2003 | 
      |     IN  OUT LPBYTE*                 lplpBuffer,     // MPR_IFTRANSPORT_0 |   |     IN  OUT LPBYTE*                 lplpBuffer,     // MPR_IFTRANSPORT_0 | 
      |     IN      DWORD                   dwPrefMaxLen, |   |     IN      DWORD                   dwPrefMaxLen, | 
      |     OUT     LPDWORD                 lpdwEntriesRead, |   |     OUT     LPDWORD                 lpdwEntriesRead, | 
      |     OUT     LPDWORD                 lpdwTotalEntries, |   |     OUT     LPDWORD                 lpdwTotalEntries, | 
      |     IN  OUT LPDWORD                 lpdwResumeHandle            OPTIONAL |   |     IN  OUT LPDWORD                 lpdwResumeHandle            OPTIONAL | 
      | ); |   | ); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigGetFriendlyName( |   | MprConfigGetFriendlyName( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
       | 
      |     IN      PWCHAR                  pszGuidName, |   |     __in IN      PWCHAR                  pszGuidName, | 
      |     OUT     PWCHAR                  pszBuffer, |   |     __out_bcount(dwBufferSize) OUT     PWCHAR                  pszBuffer, | 
      |     IN      DWORD                   dwBufferSize); |   |     IN      DWORD                   dwBufferSize); | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprConfigGetGuidName( |   | MprConfigGetGuidName( | 
      |     IN      HANDLE                  hMprConfig, |   |     IN      HANDLE                  hMprConfig, | 
       | 
      |     IN      PWCHAR                  pszFriendlyName, |   |     __in IN      PWCHAR                  pszFriendlyName, | 
      |     OUT     PWCHAR                  pszBuffer, |   |     __out_bcount(dwBufferSize) OUT     PWCHAR                  pszBuffer, | 
      |     IN      DWORD                   dwBufferSize); |   |     IN      DWORD                   dwBufferSize); | 
       |   |  | 
       | 
       |   | #if(WINVER >= 0x0600) | 
       |   | DWORD APIENTRY | 
       |   | MprConfigFilterGetInfo( | 
       |   |     IN      HANDLE                  hMprConfig, | 
       |   |     IN      DWORD                   dwLevel, | 
       |   |     OUT     LPBYTE                  lpBuffer); | 
       |   |  | 
       |   | DWORD APIENTRY | 
       |   | MprConfigFilterSetInfo( | 
       |   |     IN      HANDLE                  hMprConfig, | 
       |   |     IN      DWORD                   dwLevel, | 
       |   |     IN      LPBYTE                  lpBuffer); | 
       |   | #endif /* WINVER >= 0x0600 */ | 
       |   |                                                                                  | 
      | // |   | // | 
      | // Information block APIs |   | // Information block APIs | 
      | // |   | // | 
       |   |  | 
      | DWORD APIENTRY |   | DWORD APIENTRY | 
      | MprInfoCreate( |   | MprInfoCreate( | 
      |     IN      DWORD                   dwVersion, |   |     IN      DWORD                   dwVersion, | 
      |     OUT     LPVOID*                 lplpNewHeader |   |     OUT     LPVOID*                 lplpNewHeader | 
      | ); |   | ); | 
       |   |  | 
      |   |  | 
     |  End of changes. 47 change blocks.  | 
     | 46 lines changed or deleted |   | 306 lines changed or added | 
      |