Headers diff for ws2_32.dll between 6.0.6002.18005-Windows 6.0 and 6.1.7601.17514-Windows 7.0 versions

winsock2.h (6.0.6002.18005-Windows 6.0)		winsock2.h (6.1.7601.17514-Windows 7.0)

skipping to change at line 982		skipping to change at line 982
#else		#else
typedef WSAPROTOCOL_INFOA WSAPROTOCOL_INFO;		typedef WSAPROTOCOL_INFOA WSAPROTOCOL_INFO;
typedef LPWSAPROTOCOL_INFOA LPWSAPROTOCOL_INFO;		typedef LPWSAPROTOCOL_INFOA LPWSAPROTOCOL_INFO;
#endif /* UNICODE */		#endif /* UNICODE */

/* Flag bit definitions for dwProviderFlags */		/* Flag bit definitions for dwProviderFlags */
#define PFL_MULTIPLE_PROTO_ENTRIES 0x00000001		#define PFL_MULTIPLE_PROTO_ENTRIES 0x00000001
#define PFL_RECOMMENDED_PROTO_ENTRY 0x00000002		#define PFL_RECOMMENDED_PROTO_ENTRY 0x00000002
#define PFL_HIDDEN 0x00000004		#define PFL_HIDDEN 0x00000004
#define PFL_MATCHES_PROTOCOL_ZERO 0x00000008		#define PFL_MATCHES_PROTOCOL_ZERO 0x00000008

		#define PFL_NETWORKDIRECT_PROVIDER 0x00000010

/* Flag bit definitions for dwServiceFlags1 */		/* Flag bit definitions for dwServiceFlags1 */
#define XP1_CONNECTIONLESS 0x00000001		#define XP1_CONNECTIONLESS 0x00000001
#define XP1_GUARANTEED_DELIVERY 0x00000002		#define XP1_GUARANTEED_DELIVERY 0x00000002
#define XP1_GUARANTEED_ORDER 0x00000004		#define XP1_GUARANTEED_ORDER 0x00000004
#define XP1_MESSAGE_ORIENTED 0x00000008		#define XP1_MESSAGE_ORIENTED 0x00000008
#define XP1_PSEUDO_STREAM 0x00000010		#define XP1_PSEUDO_STREAM 0x00000010
#define XP1_GRACEFUL_CLOSE 0x00000020		#define XP1_GRACEFUL_CLOSE 0x00000020
#define XP1_EXPEDITED_DATA 0x00000040		#define XP1_EXPEDITED_DATA 0x00000040
#define XP1_CONNECT_DATA 0x00000080		#define XP1_CONNECT_DATA 0x00000080

skipping to change at line 1172		skipping to change at line 1173

#define NS_X500 (40)		#define NS_X500 (40)
#define NS_NIS (41)		#define NS_NIS (41)
#define NS_NISPLUS (42)		#define NS_NISPLUS (42)

#define NS_WRQ (50)		#define NS_WRQ (50)

#define NS_NETDES (60) /* Network Designers Limited */		#define NS_NETDES (60) /* Network Designers Limited */

/*		/*

		*& Name Spaces
		*/

		#define NS_ALL (0)

		#define NS_SAP (1)
		#define NS_NDS (2)
		#define NS_PEER_BROWSE (3)
		#define NS_SLP (5)
		#define NS_DHCP (6)

		#define NS_TCPIP_LOCAL (10)
		#define NS_TCPIP_HOSTS (11)
		#define NS_DNS (12)
		#define NS_NETBT (13)
		#define NS_WINS (14)

		#if(_WIN32_WINNT >= 0x0501)
		#define NS_NLA (15) /* Network Location Awareness */
		#endif //(_WIN32_WINNT >= 0x0501)

		#if(_WIN32_WINNT >= 0x0600)
		#define NS_BTH (16) /* Bluetooth SDP Namespace */
		#endif //(_WIN32_WINNT >= 0x0600)

		#define NS_LOCALNAME (19) /* Windows Live */

		#define NS_NBP (20)

		#define NS_MS (30)
		#define NS_STDA (31)
		#define NS_NTDS (32)

		#if(_WIN32_WINNT >= 0x0600)
		#define NS_EMAIL (37)
		#define NS_PNRPNAME (38)
		#define NS_PNRPCLOUD (39)
		#endif //(_WIN32_WINNT >= 0x0600)

		#define NS_X500 (40)
		#define NS_NIS (41)
		#define NS_NISPLUS (42)

		#define NS_WRQ (50)

		#define NS_NETDES (60) /* Network Designers Limited */

		/*
* Resolution flags for WSAGetAddressByName().		* Resolution flags for WSAGetAddressByName().
* Note these are also used by the 1.1 API GetAddressByName, so		* Note these are also used by the 1.1 API GetAddressByName, so
* leave them around.		* leave them around.
*/		*/
#define RES_UNUSED_1 (0x00000001)		#define RES_UNUSED_1 (0x00000001)
#define RES_FLUSH_CACHE (0x00000002)		#define RES_FLUSH_CACHE (0x00000002)
#ifndef RES_SERVICE		#ifndef RES_SERVICE
#define RES_SERVICE (0x00000004)		#define RES_SERVICE (0x00000004)
#endif /* RES_SERVICE */		#endif /* RES_SERVICE */


skipping to change at line 1355		skipping to change at line 1404

#define LUP_FLUSHCACHE 0x1000		#define LUP_FLUSHCACHE 0x1000
#define LUP_FLUSHPREVIOUS 0x2000		#define LUP_FLUSHPREVIOUS 0x2000

#define LUP_NON_AUTHORITATIVE 0x4000		#define LUP_NON_AUTHORITATIVE 0x4000
#define LUP_SECURE 0x8000		#define LUP_SECURE 0x8000
#define LUP_RETURN_PREFERRED_NAMES 0x10000		#define LUP_RETURN_PREFERRED_NAMES 0x10000

#define LUP_ADDRCONFIG 0x00100000		#define LUP_ADDRCONFIG 0x00100000
#define LUP_DUAL_ADDR 0x00200000		#define LUP_DUAL_ADDR 0x00200000

		#define LUP_FILESERVER 0x00400000

/*		/*
* Return flags		* Return flags
*/		*/

#define RESULT_IS_ALIAS 0x0001		#define RESULT_IS_ALIAS 0x0001
#if(_WIN32_WINNT >= 0x0501)		#if(_WIN32_WINNT >= 0x0501)
#define RESULT_IS_ADDED 0x0010		#define RESULT_IS_ADDED 0x0010
#define RESULT_IS_CHANGED 0x0020		#define RESULT_IS_CHANGED 0x0020
#define RESULT_IS_DELETED 0x0040		#define RESULT_IS_DELETED 0x0040

skipping to change at line 1513		skipping to change at line 1563
SHORT revents;		SHORT revents;

} WSAPOLLFD, PWSAPOLLFD, FAR LPWSAPOLLFD;		} WSAPOLLFD, PWSAPOLLFD, FAR LPWSAPOLLFD;

#endif // (_WIN32_WINNT >= 0x0600)		#endif // (_WIN32_WINNT >= 0x0600)

/* Socket function prototypes */		/* Socket function prototypes */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE

		__checkReturn
SOCKET		SOCKET
WSAAPI		WSAAPI
accept(		accept(

IN SOCKET s,		__in SOCKET s,
__out_bcount_opt(addrlen) struct sockaddr FAR addr,		__out_bcount_opt(addrlen) struct sockaddr FAR addr,
__inout_opt int FAR * addrlen		__inout_opt int FAR * addrlen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef

		__checkReturn
SOCKET		SOCKET
(WSAAPI * LPFN_ACCEPT)(		(WSAAPI * LPFN_ACCEPT)(

IN SOCKET s,		__in SOCKET s,
__out_bcount_opt(addrlen) struct sockaddr FAR addr,		__out_bcount_opt(addrlen) struct sockaddr FAR addr,
__inout_opt int FAR * addrlen		__inout_opt int FAR * addrlen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
bind(		bind(

IN SOCKET s,		__in SOCKET s,
__in_bcount(namelen) const struct sockaddr FAR * name,		__in_bcount(namelen) const struct sockaddr FAR * name,

IN int namelen		__in int namelen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_BIND)(		(WSAAPI * LPFN_BIND)(

IN SOCKET s,		__in SOCKET s,
__in_bcount(namelen) const struct sockaddr FAR * name,		__in_bcount(namelen) const struct sockaddr FAR * name,

IN int namelen		__in int namelen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
closesocket(		closesocket(

IN SOCKET s		__in SOCKET s
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_CLOSESOCKET)(		(WSAAPI * LPFN_CLOSESOCKET)(

IN SOCKET s		__in SOCKET s
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
connect(		connect(

IN SOCKET s,		__in SOCKET s,
__in_bcount(namelen) const struct sockaddr FAR * name,		__in_bcount(namelen) const struct sockaddr FAR * name,

IN int namelen		__in int namelen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_CONNECT)(		(WSAAPI * LPFN_CONNECT)(

IN SOCKET s,		__in SOCKET s,
__in_bcount(namelen) const struct sockaddr FAR * name,		__in_bcount(namelen) const struct sockaddr FAR * name,

IN int namelen		__in int namelen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
ioctlsocket(		ioctlsocket(

IN SOCKET s,		__in SOCKET s,
IN long cmd,		__in long cmd,
__inout u_long FAR * argp		__inout u_long FAR * argp
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_IOCTLSOCKET)(		(WSAAPI * LPFN_IOCTLSOCKET)(

IN SOCKET s,		__in SOCKET s,
IN long cmd,		__in long cmd,
__inout u_long FAR * argp		__inout u_long FAR * argp
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
getpeername(		getpeername(

IN SOCKET s,		__in SOCKET s,
__out_bcount_part(namelen,namelen) struct sockaddr FAR * name,		__out_bcount_part(namelen,namelen) struct sockaddr FAR * name,
__inout int FAR * namelen		__inout int FAR * namelen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_GETPEERNAME)(		(WSAAPI * LPFN_GETPEERNAME)(

IN SOCKET s,		__in SOCKET s,
__out_bcount_part(namelen,namelen) struct sockaddr FAR * name,		__out_bcount_part(namelen,namelen) struct sockaddr FAR * name,
__inout int FAR * namelen		__inout int FAR * namelen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
getsockname(		getsockname(

IN SOCKET s,		__in SOCKET s,
__out_bcount_part(namelen,namelen) struct sockaddr FAR * name,		__out_bcount_part(namelen,namelen) struct sockaddr FAR * name,
__inout int FAR * namelen		__inout int FAR * namelen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_GETSOCKNAME)(		(WSAAPI * LPFN_GETSOCKNAME)(

IN SOCKET s,		__in SOCKET s,
__out_bcount_part(namelen,namelen) struct sockaddr FAR * name,		__out_bcount_part(namelen,namelen) struct sockaddr FAR * name,
__inout int FAR * namelen		__inout int FAR * namelen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
getsockopt(		getsockopt(

IN SOCKET s,		__in SOCKET s,
IN int level,		__in int level,
IN int optname,		__in int optname,
__out_bcount(optlen) char FAR optval,		__out_bcount(optlen) char FAR optval,
__inout int FAR * optlen		__inout int FAR * optlen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_GETSOCKOPT)(		(WSAAPI * LPFN_GETSOCKOPT)(

IN SOCKET s,		__in SOCKET s,
IN int level,		__in int level,
IN int optname,		__in int optname,
__out_bcount(optlen) char FAR optval,		__out_bcount(optlen) char FAR optval,
__inout int FAR * optlen		__inout int FAR * optlen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
u_long		u_long
WSAAPI		WSAAPI
htonl(		htonl(

IN u_long hostlong		__in u_long hostlong
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
u_long		u_long
(WSAAPI * LPFN_HTONL)(		(WSAAPI * LPFN_HTONL)(

IN u_long hostlong		__in u_long hostlong
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
u_short		u_short
WSAAPI		WSAAPI
htons(		htons(

IN u_short hostshort		__in u_short hostshort
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
u_short		u_short
(WSAAPI * LPFN_HTONS)(		(WSAAPI * LPFN_HTONS)(

IN u_short hostshort		__in u_short hostshort
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
unsigned long		unsigned long
WSAAPI		WSAAPI
inet_addr(		inet_addr(
__in IN const char FAR * cp		__in IN const char FAR * cp
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
unsigned long		unsigned long
(WSAAPI * LPFN_INET_ADDR)(		(WSAAPI * LPFN_INET_ADDR)(

IN const char FAR * cp		__in const char FAR * cp
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
char FAR *		char FAR *
WSAAPI		WSAAPI
inet_ntoa(		inet_ntoa(

IN struct in_addr in		__in struct in_addr in
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
char FAR *		char FAR *
(WSAAPI * LPFN_INET_NTOA)(		(WSAAPI * LPFN_INET_NTOA)(

IN struct in_addr in		__in struct in_addr in
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
listen(		listen(

IN SOCKET s,		__in SOCKET s,
IN int backlog		__in int backlog
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_LISTEN)(		(WSAAPI * LPFN_LISTEN)(

IN SOCKET s,		__in SOCKET s,
IN int backlog		__in int backlog
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
u_long		u_long
WSAAPI		WSAAPI
ntohl(		ntohl(

IN u_long netlong		__in u_long netlong
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
u_long		u_long
(WSAAPI * LPFN_NTOHL)(		(WSAAPI * LPFN_NTOHL)(

IN u_long netlong		__in u_long netlong
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
u_short		u_short
WSAAPI		WSAAPI
ntohs(		ntohs(

IN u_short netshort		__in u_short netshort
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
u_short		u_short
(WSAAPI * LPFN_NTOHS)(		(WSAAPI * LPFN_NTOHS)(

IN u_short netshort		__in u_short netshort
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
recv(		recv(

IN SOCKET s,		__in SOCKET s,
__out_bcount_part(len, return) __out_data_source(NETWORK) char FAR * buf,		__out_bcount_part(len, return) __out_data_source(NETWORK) char FAR * buf,

IN int len,		__in int len,
IN int flags		__in int flags
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_RECV)(		(WSAAPI * LPFN_RECV)(

IN SOCKET s,		__in SOCKET s,
__out_bcount_part(len, return) char FAR * buf,		__out_bcount_part(len, return) char FAR * buf,

IN int len,		__in int len,
IN int flags		__in int flags
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport) WINSOCK_API_LINKAGE		__control_entrypoint(DllExport) WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
recvfrom(		recvfrom(

IN SOCKET s,		__in SOCKET s,
__out_bcount_part(len, return) __out_data_source(NETWORK) char FAR * buf,		__out_bcount_part(len, return) __out_data_source(NETWORK) char FAR * buf,

IN int len,		__in int len,
IN int flags,		__in int flags,
__out_bcount_opt(fromlen) struct sockaddr FAR from,		__out_bcount_part_opt(fromlen, fromlen) struct sockaddr FAR * from,
__inout_opt int FAR * fromlen		__inout_opt int FAR * fromlen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_RECVFROM)(		(WSAAPI * LPFN_RECVFROM)(

IN SOCKET s,		__in SOCKET s,
__out_bcount_part(len, return) char FAR * buf,		__out_bcount_part(len, return) char FAR * buf,

IN int len,		__in int len,
IN int flags,		__in int flags,
__out_bcount_opt(fromlen) struct sockaddr FAR from,		__out_bcount_part_opt(fromlen, fromlen) struct sockaddr FAR * from,
__inout_opt int FAR * fromlen		__inout_opt int FAR * fromlen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
select(		select(

IN int nfds,		__in int nfds,
__inout_opt fd_set FAR * readfds,		__inout_opt fd_set FAR * readfds,
__inout_opt fd_set FAR * writefds,		__inout_opt fd_set FAR * writefds,
__inout_opt fd_set FAR * exceptfds,		__inout_opt fd_set FAR * exceptfds,

IN const struct timeval FAR * timeout		__in_opt const struct timeval FAR * timeout
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_SELECT)(		(WSAAPI * LPFN_SELECT)(

IN int nfds,		__in int nfds,
__inout_opt fd_set FAR * readfds,		__inout_opt fd_set FAR * readfds,
__inout_opt fd_set FAR * writefds,		__inout_opt fd_set FAR * writefds,
__inout_opt fd_set FAR *exceptfds,		__inout_opt fd_set FAR *exceptfds,

IN const struct timeval FAR * timeout		__in_opt const struct timeval FAR * timeout
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
send(		send(

IN SOCKET s,		__in SOCKET s,
__in_bcount(len) const char FAR * buf,		__in_bcount(len) const char FAR * buf,

IN int len,		__in int len,
IN int flags		__in int flags
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_SEND)(		(WSAAPI * LPFN_SEND)(

IN SOCKET s,		__in SOCKET s,
__in_bcount(len) const char FAR * buf,		__in_bcount(len) const char FAR * buf,

IN int len,		__in int len,
IN int flags		__in int flags
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
sendto(		sendto(

IN SOCKET s,		__in SOCKET s,
__in_bcount(len) const char FAR * buf,		__in_bcount(len) const char FAR * buf,

IN int len,		__in int len,
IN int flags,		__in int flags,
__in_bcount(tolen) const struct sockaddr FAR * to,		__in_bcount(tolen) const struct sockaddr FAR * to,

IN int tolen		__in int tolen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_SENDTO)(		(WSAAPI * LPFN_SENDTO)(

IN SOCKET s,		__in SOCKET s,
__in_bcount(len) const char FAR * buf,		__in_bcount(len) const char FAR * buf,

IN int len,		__in int len,
IN int flags,		__in int flags,
__in_bcount(tolen) const struct sockaddr FAR * to,		__in_bcount(tolen) const struct sockaddr FAR * to,

IN int tolen		__in int tolen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
setsockopt(		setsockopt(

IN SOCKET s,		__in SOCKET s,
IN int level,		__in int level,
IN int optname,		__in int optname,
__in_bcount_opt(optlen) const char FAR * optval,		__in_bcount_opt(optlen) const char FAR * optval,

IN int optlen		__in int optlen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_SETSOCKOPT)(		(WSAAPI * LPFN_SETSOCKOPT)(

IN SOCKET s,		__in SOCKET s,
IN int level,		__in int level,
IN int optname,		__in int optname,
__in_bcount(optlen) const char FAR * optval,		__in_bcount(optlen) const char FAR * optval,

IN int optlen		__in int optlen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
shutdown(		shutdown(

IN SOCKET s,		__in SOCKET s,
IN int how		__in int how
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_SHUTDOWN)(		(WSAAPI * LPFN_SHUTDOWN)(

IN SOCKET s,		__in SOCKET s,
IN int how		__in int how
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE

		__checkReturn
SOCKET		SOCKET
WSAAPI		WSAAPI
socket(		socket(

IN int af,		__in int af,
IN int type,		__in int type,
IN int protocol		__in int protocol
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef

		__checkReturn
SOCKET		SOCKET
(WSAAPI * LPFN_SOCKET)(		(WSAAPI * LPFN_SOCKET)(

IN int af,		__in int af,
IN int type,		__in int type,
IN int protocol		__in int protocol
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

/* Database function prototypes */		/* Database function prototypes */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
struct hostent FAR *		struct hostent FAR *
WSAAPI		WSAAPI
gethostbyaddr(		gethostbyaddr(
__in_bcount(len) const char FAR * addr,		__in_bcount(len) const char FAR * addr,

IN int len,		__in int len,
IN int type		__in int type
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
struct hostent FAR *		struct hostent FAR *
(WSAAPI * LPFN_GETHOSTBYADDR)(		(WSAAPI * LPFN_GETHOSTBYADDR)(
__in_bcount(len) const char FAR * addr,		__in_bcount(len) const char FAR * addr,

IN int len,		__in int len,
IN int type		__in int type
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
struct hostent FAR *		struct hostent FAR *
WSAAPI		WSAAPI
gethostbyname(		gethostbyname(
__in const char FAR * name		__in const char FAR * name

skipping to change at line 2038		skipping to change at line 2092
__in const char FAR * name		__in const char FAR * name
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
gethostname(		gethostname(
__out_bcount(namelen) char FAR * name,		__out_bcount(namelen) char FAR * name,

IN int namelen		__in int namelen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_GETHOSTNAME)(		(WSAAPI * LPFN_GETHOSTNAME)(
__out_bcount(namelen) char FAR * name,		__out_bcount(namelen) char FAR * name,

IN int namelen		__in int namelen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
struct servent FAR *		struct servent FAR *
WSAAPI		WSAAPI
getservbyport(		getservbyport(
__in int port,		__in int port,

__in const char FAR * proto		__in_z const char FAR * proto
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
struct servent FAR *		struct servent FAR *
(WSAAPI * LPFN_GETSERVBYPORT)(		(WSAAPI * LPFN_GETSERVBYPORT)(

IN int port,		__in int port,
__in const char FAR * proto		__in_z const char FAR * proto
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
struct servent FAR *		struct servent FAR *
WSAAPI		WSAAPI
getservbyname(		getservbyname(

__in const char FAR * name,		__in_z const char FAR * name,
__in const char FAR * proto		__in_z const char FAR * proto
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
struct servent FAR *		struct servent FAR *
(WSAAPI * LPFN_GETSERVBYNAME)(		(WSAAPI * LPFN_GETSERVBYNAME)(

__in const char FAR * name,		__in_z const char FAR * name,
__in const char FAR * proto		__in_z const char FAR * proto
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
struct protoent FAR *		struct protoent FAR *
WSAAPI		WSAAPI
getprotobynumber(		getprotobynumber(

IN int number		__in int number
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
struct protoent FAR *		struct protoent FAR *
(WSAAPI * LPFN_GETPROTOBYNUMBER)(		(WSAAPI * LPFN_GETPROTOBYNUMBER)(

IN int number		__in int number
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
struct protoent FAR *		struct protoent FAR *
WSAAPI		WSAAPI
getprotobyname(		getprotobyname(

IN const char FAR * name		__in_z const char FAR * name
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
struct protoent FAR *		struct protoent FAR *
(WSAAPI * LPFN_GETPROTOBYNAME)(		(WSAAPI * LPFN_GETPROTOBYNAME)(

__in const char FAR * name		__in_z const char FAR * name
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

/* Microsoft Windows Extension function prototypes */		/* Microsoft Windows Extension function prototypes */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE

		__checkReturn
int		int
WSAAPI		WSAAPI
WSAStartup(		WSAStartup(

IN WORD wVersionRequested,		__in WORD wVersionRequested,
OUT LPWSADATA lpWSAData		__out LPWSADATA lpWSAData
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef

		__checkReturn
int		int
(WSAAPI * LPFN_WSASTARTUP)(		(WSAAPI * LPFN_WSASTARTUP)(

IN WORD wVersionRequested,		__in WORD wVersionRequested,
OUT LPWSADATA lpWSAData		__out LPWSADATA lpWSAData
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSACleanup(		WSACleanup(
void		void
);		);

skipping to change at line 2171		skipping to change at line 2227
(WSAAPI * LPFN_WSACLEANUP)(		(WSAAPI * LPFN_WSACLEANUP)(
void		void
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
void		void
WSAAPI		WSAAPI
WSASetLastError(		WSASetLastError(

IN int iError		__in int iError
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
void		void
(WSAAPI * LPFN_WSASETLASTERROR)(		(WSAAPI * LPFN_WSASETLASTERROR)(

IN int iError		int iError
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSAGetLastError(		WSAGetLastError(
void		void
);		);

skipping to change at line 2239		skipping to change at line 2295
(WSAAPI * LPFN_WSAUNHOOKBLOCKINGHOOK)(		(WSAAPI * LPFN_WSAUNHOOKBLOCKINGHOOK)(
void		void
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
FARPROC		FARPROC
WSAAPI		WSAAPI
WSASetBlockingHook(		WSASetBlockingHook(

IN FARPROC lpBlockFunc		__in FARPROC lpBlockFunc
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
FARPROC		FARPROC
(WSAAPI * LPFN_WSASETBLOCKINGHOOK)(		(WSAAPI * LPFN_WSASETBLOCKINGHOOK)(

IN FARPROC lpBlockFunc		__in FARPROC lpBlockFunc
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSACancelBlockingCall(		WSACancelBlockingCall(
void		void
);		);

skipping to change at line 2286		skipping to change at line 2342
__in const char FAR * proto,		__in const char FAR * proto,
__out_bcount(buflen) char FAR * buf,		__out_bcount(buflen) char FAR * buf,
__in int buflen		__in int buflen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
HANDLE		HANDLE
(WSAAPI * LPFN_WSAASYNCGETSERVBYNAME)(		(WSAAPI * LPFN_WSAASYNCGETSERVBYNAME)(

IN HWND hWnd,		__in HWND hWnd,
IN u_int wMsg,		__in u_int wMsg,
__in const char FAR * name,		__in const char FAR * name,
__in const char FAR * proto,		__in const char FAR * proto,
__out_bcount(buflen) char FAR * buf,		__out_bcount(buflen) char FAR * buf,

IN int buflen		__in int buflen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport) WINSOCK_API_LINKAGE		__control_entrypoint(DllExport) WINSOCK_API_LINKAGE
HANDLE		HANDLE
WSAAPI		WSAAPI
WSAAsyncGetServByPort(		WSAAsyncGetServByPort(
__in HWND hWnd,		__in HWND hWnd,
__in u_int wMsg,		__in u_int wMsg,

skipping to change at line 2313		skipping to change at line 2369
__in const char FAR * proto,		__in const char FAR * proto,
__out_bcount(buflen) char FAR * buf,		__out_bcount(buflen) char FAR * buf,
__in int buflen		__in int buflen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
HANDLE		HANDLE
(WSAAPI * LPFN_WSAASYNCGETSERVBYPORT)(		(WSAAPI * LPFN_WSAASYNCGETSERVBYPORT)(

IN HWND hWnd,		__in HWND hWnd,
IN u_int wMsg,		__in u_int wMsg,
IN int port,		__in int port,
__in const char FAR * proto,		__in const char FAR * proto,
__out_bcount(buflen) char FAR * buf,		__out_bcount(buflen) char FAR * buf,

IN int buflen		__in int buflen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport) WINSOCK_API_LINKAGE		__control_entrypoint(DllExport) WINSOCK_API_LINKAGE
HANDLE		HANDLE
WSAAPI		WSAAPI
WSAAsyncGetProtoByName(		WSAAsyncGetProtoByName(
__in HWND hWnd,		__in HWND hWnd,
__in u_int wMsg,		__in u_int wMsg,
__in const char FAR * name,		__in const char FAR * name,
__out_bcount(buflen) char FAR * buf,		__out_bcount(buflen) char FAR * buf,
__in int buflen		__in int buflen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
HANDLE		HANDLE
(WSAAPI * LPFN_WSAASYNCGETPROTOBYNAME)(		(WSAAPI * LPFN_WSAASYNCGETPROTOBYNAME)(

IN HWND hWnd,		__in HWND hWnd,
IN u_int wMsg,		__in u_int wMsg,
__in const char FAR * name,		__in const char FAR * name,
__out_bcount(buflen) char FAR * buf,		__out_bcount(buflen) char FAR * buf,

IN int buflen		__in int buflen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport) WINSOCK_API_LINKAGE		__control_entrypoint(DllExport) WINSOCK_API_LINKAGE
HANDLE		HANDLE
WSAAPI		WSAAPI
WSAAsyncGetProtoByNumber(		WSAAsyncGetProtoByNumber(
__in HWND hWnd,		__in HWND hWnd,
__in u_int wMsg,		__in u_int wMsg,
__in int number,		__in int number,
__out_bcount(buflen) char FAR * buf,		__out_bcount(buflen) char FAR * buf,
__in int buflen		__in int buflen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
HANDLE		HANDLE
(WSAAPI * LPFN_WSAASYNCGETPROTOBYNUMBER)(		(WSAAPI * LPFN_WSAASYNCGETPROTOBYNUMBER)(

IN HWND hWnd,		__in HWND hWnd,
IN u_int wMsg,		__in u_int wMsg,
IN int number,		__in int number,
__out_bcount(buflen) char FAR * buf,		__out_bcount(buflen) char FAR * buf,

IN int buflen		__in int buflen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport) WINSOCK_API_LINKAGE		__control_entrypoint(DllExport) WINSOCK_API_LINKAGE
HANDLE		HANDLE
WSAAPI		WSAAPI
WSAAsyncGetHostByName(		WSAAsyncGetHostByName(
__in HWND hWnd,		__in HWND hWnd,
__in u_int wMsg,		__in u_int wMsg,
__in const char FAR * name,		__in const char FAR * name,
__out_bcount(buflen) char FAR * buf,		__out_bcount(buflen) char FAR * buf,
__in int buflen		__in int buflen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
HANDLE		HANDLE
(WSAAPI * LPFN_WSAASYNCGETHOSTBYNAME)(		(WSAAPI * LPFN_WSAASYNCGETHOSTBYNAME)(

IN HWND hWnd,		__in HWND hWnd,
IN u_int wMsg,		__in u_int wMsg,
__in const char FAR * name,		__in const char FAR * name,
__out_bcount(buflen) char FAR * buf,		__out_bcount(buflen) char FAR * buf,

IN int buflen		__in int buflen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport) WINSOCK_API_LINKAGE		__control_entrypoint(DllExport) WINSOCK_API_LINKAGE
HANDLE		HANDLE
WSAAPI		WSAAPI
WSAAsyncGetHostByAddr(		WSAAsyncGetHostByAddr(
__in HWND hWnd,		__in HWND hWnd,
__in u_int wMsg,		__in u_int wMsg,

skipping to change at line 2416		skipping to change at line 2472
__in int type,		__in int type,
__out_bcount(buflen) char FAR * buf,		__out_bcount(buflen) char FAR * buf,
__in int buflen		__in int buflen
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
HANDLE		HANDLE
(WSAAPI * LPFN_WSAASYNCGETHOSTBYADDR)(		(WSAAPI * LPFN_WSAASYNCGETHOSTBYADDR)(

IN HWND hWnd,		__in HWND hWnd,
IN u_int wMsg,		__in u_int wMsg,
__in_bcount(len) const char FAR * addr,		__in_bcount(len) const char FAR * addr,

IN int len,		__in int len,
IN int type,		__in int type,
__out_bcount(buflen) char FAR * buf,		__out_bcount(buflen) char FAR * buf,

IN int buflen		__in int buflen
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport) WINSOCK_API_LINKAGE		__control_entrypoint(DllExport) WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSACancelAsyncRequest(		WSACancelAsyncRequest(
__in HANDLE hAsyncTaskHandle		__in HANDLE hAsyncTaskHandle
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSACANCELASYNCREQUEST)(		(WSAAPI * LPFN_WSACANCELASYNCREQUEST)(

IN HANDLE hAsyncTaskHandle		__in HANDLE hAsyncTaskHandle
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSAAsyncSelect(		WSAAsyncSelect(

IN SOCKET s,		__in SOCKET s,
IN HWND hWnd,		__in HWND hWnd,
IN u_int wMsg,		__in u_int wMsg,
IN long lEvent		__in long lEvent
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSAASYNCSELECT)(		(WSAAPI * LPFN_WSAASYNCSELECT)(

IN SOCKET s,		__in SOCKET s,
IN HWND hWnd,		__in HWND hWnd,
IN u_int wMsg,		__in u_int wMsg,
IN long lEvent		__in long lEvent
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

/* WinSock 2 API new function prototypes */		/* WinSock 2 API new function prototypes */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE

		__checkReturn
SOCKET		SOCKET
WSAAPI		WSAAPI
WSAAccept(		WSAAccept(

IN SOCKET s,		__in SOCKET s,
__out_bcount_part_opt(addrlen,addrlen) struct sockaddr FAR * addr,		__out_bcount_part_opt(addrlen,addrlen) struct sockaddr FAR * addr,
__inout_opt LPINT addrlen,		__inout_opt LPINT addrlen,
__in_opt LPCONDITIONPROC lpfnCondition,		__in_opt LPCONDITIONPROC lpfnCondition,
__in_opt DWORD_PTR dwCallbackData		__in_opt DWORD_PTR dwCallbackData
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef

		__checkReturn
SOCKET		SOCKET
(WSAAPI * LPFN_WSAACCEPT)(		(WSAAPI * LPFN_WSAACCEPT)(

IN SOCKET s,		__in SOCKET s,
__out_bcount_part_opt(addrlen,addrlen) struct sockaddr FAR * addr,		__out_bcount_part_opt(addrlen,addrlen) struct sockaddr FAR * addr,
__inout_opt LPINT addrlen,		__inout_opt LPINT addrlen,
__in_opt LPCONDITIONPROC lpfnCondition,		__in_opt LPCONDITIONPROC lpfnCondition,
__in_opt DWORD_PTR dwCallbackData		__in_opt DWORD_PTR dwCallbackData
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
BOOL		BOOL
WSAAPI		WSAAPI
WSACloseEvent(		WSACloseEvent(

IN WSAEVENT hEvent		__in WSAEVENT hEvent
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
BOOL		BOOL
(WSAAPI * LPFN_WSACLOSEEVENT)(		(WSAAPI * LPFN_WSACLOSEEVENT)(

IN WSAEVENT hEvent		__in WSAEVENT hEvent
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSAConnect(		WSAConnect(

IN SOCKET s,		__in SOCKET s,
__in_bcount(namelen) const struct sockaddr FAR * name,		__in_bcount(namelen) const struct sockaddr FAR * name,

IN int namelen,		__in int namelen,
__in_opt LPWSABUF lpCallerData,		__in_opt LPWSABUF lpCallerData,
__out_opt LPWSABUF lpCalleeData,		__out_opt LPWSABUF lpCalleeData,
__in_opt LPQOS lpSQOS,		__in_opt LPQOS lpSQOS,
__in_opt LPQOS lpGQOS		__in_opt LPQOS lpGQOS
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES

#ifdef UNICODE		#ifdef UNICODE

skipping to change at line 2583		skipping to change at line 2641
__inout LPDWORD RemoteAddressLength,		__inout LPDWORD RemoteAddressLength,
__out_bcount_part(RemoteAddressLength,RemoteAddressLength) LPSOCKADDR Remo teAddress,		__out_bcount_part(RemoteAddressLength,RemoteAddressLength) LPSOCKADDR Remo teAddress,
__in const struct timeval * timeout,		__in const struct timeval * timeout,
__in_opt LPWSAOVERLAPPED Reserved);		__in_opt LPWSAOVERLAPPED Reserved);
#endif		#endif

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSACONNECT)(		(WSAAPI * LPFN_WSACONNECT)(

IN SOCKET s,		__in SOCKET s,
__in_bcount(namelen) const struct sockaddr FAR * name,		__in_bcount(namelen) const struct sockaddr FAR * name,

IN int namelen,		__in int namelen,
__in_opt LPWSABUF lpCallerData,		__in_opt LPWSABUF lpCallerData,
__out_opt LPWSABUF lpCalleeData,		__out_opt LPWSABUF lpCalleeData,
__in_opt LPQOS lpSQOS,		__in_opt LPQOS lpSQOS,
__in_opt LPQOS lpGQOS		__in_opt LPQOS lpGQOS
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
WSAEVENT		WSAEVENT

skipping to change at line 2616		skipping to change at line 2674
void		void
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSADuplicateSocketA(		WSADuplicateSocketA(

IN SOCKET s,		__in SOCKET s,
IN DWORD dwProcessId,		__in DWORD dwProcessId,
OUT LPWSAPROTOCOL_INFOA lpProtocolInfo		__out LPWSAPROTOCOL_INFOA lpProtocolInfo
);		);
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSADuplicateSocketW(		WSADuplicateSocketW(

IN SOCKET s,		__in SOCKET s,
IN DWORD dwProcessId,		__in DWORD dwProcessId,
OUT LPWSAPROTOCOL_INFOW lpProtocolInfo		__out LPWSAPROTOCOL_INFOW lpProtocolInfo
);		);
#ifdef UNICODE		#ifdef UNICODE
#define WSADuplicateSocket WSADuplicateSocketW		#define WSADuplicateSocket WSADuplicateSocketW
#else		#else
#define WSADuplicateSocket WSADuplicateSocketA		#define WSADuplicateSocket WSADuplicateSocketA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSADUPLICATESOCKETA)(		(WSAAPI * LPFN_WSADUPLICATESOCKETA)(

IN SOCKET s,		__in SOCKET s,
IN DWORD dwProcessId,		__in DWORD dwProcessId,
OUT LPWSAPROTOCOL_INFOA lpProtocolInfo		__out LPWSAPROTOCOL_INFOA lpProtocolInfo
);		);
typedef		typedef
int		int
(WSAAPI * LPFN_WSADUPLICATESOCKETW)(		(WSAAPI * LPFN_WSADUPLICATESOCKETW)(

IN SOCKET s,		__in SOCKET s,
IN DWORD dwProcessId,		__in DWORD dwProcessId,
OUT LPWSAPROTOCOL_INFOW lpProtocolInfo		__out LPWSAPROTOCOL_INFOW lpProtocolInfo
);		);
#ifdef UNICODE		#ifdef UNICODE
#define LPFN_WSADUPLICATESOCKET LPFN_WSADUPLICATESOCKETW		#define LPFN_WSADUPLICATESOCKET LPFN_WSADUPLICATESOCKETW
#else		#else
#define LPFN_WSADUPLICATESOCKET LPFN_WSADUPLICATESOCKETA		#define LPFN_WSADUPLICATESOCKET LPFN_WSADUPLICATESOCKETA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSAEnumNetworkEvents(		WSAEnumNetworkEvents(

IN SOCKET s,		__in SOCKET s,
IN WSAEVENT hEventObject,		__in WSAEVENT hEventObject,
OUT LPWSANETWORKEVENTS lpNetworkEvents		__out LPWSANETWORKEVENTS lpNetworkEvents
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSAENUMNETWORKEVENTS)(		(WSAAPI * LPFN_WSAENUMNETWORKEVENTS)(

IN SOCKET s,		__in SOCKET s,
IN WSAEVENT hEventObject,		__in WSAEVENT hEventObject,
OUT LPWSANETWORKEVENTS lpNetworkEvents		__out LPWSANETWORKEVENTS lpNetworkEvents
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSAEnumProtocolsA(		WSAEnumProtocolsA(
__in_opt LPINT lpiProtocols,		__in_opt LPINT lpiProtocols,
__out_bcount_part_opt(lpdwBufferLength,lpdwBufferLength) LPWSAPROTOCOL_INF OA lpProtocolBuffer,		__out_bcount_part_opt(lpdwBufferLength,lpdwBufferLength) LPWSAPROTOCOL_INF OA lpProtocolBuffer,

skipping to change at line 2709		skipping to change at line 2767
#else		#else
#define WSAEnumProtocols WSAEnumProtocolsA		#define WSAEnumProtocols WSAEnumProtocolsA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSAENUMPROTOCOLSA)(		(WSAAPI * LPFN_WSAENUMPROTOCOLSA)(
__in_opt LPINT lpiProtocols,		__in_opt LPINT lpiProtocols,

__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPWSAPROTOCOL_INFOA l pProtocolBuffer,		__out_bcount_part_opt(lpdwBufferLength,lpdwBufferLength) LPWSAPROTOCOL_INF OA lpProtocolBuffer,
__inout LPDWORD lpdwBufferLength		__inout LPDWORD lpdwBufferLength
);		);
typedef		typedef
int		int
(WSAAPI * LPFN_WSAENUMPROTOCOLSW)(		(WSAAPI * LPFN_WSAENUMPROTOCOLSW)(
__in_opt LPINT lpiProtocols,		__in_opt LPINT lpiProtocols,

__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPWSAPROTOCOL_INFOW l pProtocolBuffer,		__out_bcount_part_opt(lpdwBufferLength,lpdwBufferLength) LPWSAPROTOCOL_INF OW lpProtocolBuffer,
__inout LPDWORD lpdwBufferLength		__inout LPDWORD lpdwBufferLength
);		);
#ifdef UNICODE		#ifdef UNICODE
#define LPFN_WSAENUMPROTOCOLS LPFN_WSAENUMPROTOCOLSW		#define LPFN_WSAENUMPROTOCOLS LPFN_WSAENUMPROTOCOLSW
#else		#else
#define LPFN_WSAENUMPROTOCOLS LPFN_WSAENUMPROTOCOLSA		#define LPFN_WSAENUMPROTOCOLS LPFN_WSAENUMPROTOCOLSA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSAEventSelect(		WSAEventSelect(

IN SOCKET s,		__in SOCKET s,
IN WSAEVENT hEventObject,		__in WSAEVENT hEventObject,
IN long lNetworkEvents		__in long lNetworkEvents
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSAEVENTSELECT)(		(WSAAPI * LPFN_WSAEVENTSELECT)(

IN SOCKET s,		__in SOCKET s,
IN WSAEVENT hEventObject,		__in WSAEVENT hEventObject,
IN long lNetworkEvents		__in long lNetworkEvents
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
BOOL		BOOL
WSAAPI		WSAAPI
WSAGetOverlappedResult(		WSAGetOverlappedResult(

IN SOCKET s,		__in SOCKET s,
IN LPWSAOVERLAPPED lpOverlapped,		__in LPWSAOVERLAPPED lpOverlapped,
OUT LPDWORD lpcbTransfer,		__out LPDWORD lpcbTransfer,
IN BOOL fWait,		__in BOOL fWait,
OUT LPDWORD lpdwFlags		__out LPDWORD lpdwFlags
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
BOOL		BOOL
(WSAAPI * LPFN_WSAGETOVERLAPPEDRESULT)(		(WSAAPI * LPFN_WSAGETOVERLAPPEDRESULT)(

IN SOCKET s,		__in SOCKET s,
IN LPWSAOVERLAPPED lpOverlapped,		__in LPWSAOVERLAPPED lpOverlapped,
OUT LPDWORD lpcbTransfer,		__out LPDWORD lpcbTransfer,
IN BOOL fWait,		__in BOOL fWait,
OUT LPDWORD lpdwFlags		__out LPDWORD lpdwFlags
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
BOOL		BOOL
WSAAPI		WSAAPI
WSAGetQOSByName(		WSAGetQOSByName(

IN SOCKET s,		__in SOCKET s,
IN LPWSABUF lpQOSName,		__in LPWSABUF lpQOSName,
OUT LPQOS lpQOS		__out LPQOS lpQOS
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
BOOL		BOOL
(WSAAPI * LPFN_WSAGETQOSBYNAME)(		(WSAAPI * LPFN_WSAGETQOSBYNAME)(

IN SOCKET s,		__in SOCKET s,
IN LPWSABUF lpQOSName,		__in LPWSABUF lpQOSName,
OUT LPQOS lpQOS		__out LPQOS lpQOS
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSAHtonl(		WSAHtonl(
__in IN SOCKET s,		__in IN SOCKET s,
__in IN u_long hostlong,		__in IN u_long hostlong,
__out OUT u_long FAR * lpnetlong		__out OUT u_long FAR * lpnetlong
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSAHTONL)(		(WSAAPI * LPFN_WSAHTONL)(

IN SOCKET s,		__in SOCKET s,
IN u_long hostlong,		__in u_long hostlong,
OUT u_long FAR * lpnetlong		__out u_long FAR * lpnetlong
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSAHtons(		WSAHtons(
__in IN SOCKET s,		__in IN SOCKET s,
__in IN u_short hostshort,		__in IN u_short hostshort,
__out OUT u_short FAR * lpnetshort		__out OUT u_short FAR * lpnetshort
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSAHTONS)(		(WSAAPI * LPFN_WSAHTONS)(

IN SOCKET s,		__in SOCKET s,
IN u_short hostshort,		__in u_short hostshort,
OUT u_short FAR * lpnetshort		__out u_short FAR * lpnetshort
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport) WINSOCK_API_LINKAGE		__control_entrypoint(DllExport) WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSAIoctl(		WSAIoctl(

IN SOCKET s,		__in SOCKET s,
IN DWORD dwIoControlCode,		__in DWORD dwIoControlCode,
__in_bcount_opt(cbInBuffer) LPVOID lpvInBuffer,		__in_bcount_opt(cbInBuffer) LPVOID lpvInBuffer,

IN DWORD cbInBuffer,		__in DWORD cbInBuffer,
__out_bcount_part_opt(cbOutBuffer, *lpcbBytesReturned) LPVOID lpvOutBuffer,		__out_bcount_part_opt(cbOutBuffer, *lpcbBytesReturned) LPVOID lpvOutBuffer,

IN DWORD cbOutBuffer,		__in DWORD cbOutBuffer,
__out LPDWORD lpcbBytesReturned,		__out LPDWORD lpcbBytesReturned,

__in_opt LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSAIOCTL)(		(WSAAPI * LPFN_WSAIOCTL)(

IN SOCKET s,		__in SOCKET s,
IN DWORD dwIoControlCode,		__in DWORD dwIoControlCode,
__in_bcount_opt(cbInBuffer) LPVOID lpvInBuffer,		__in_bcount_opt(cbInBuffer) LPVOID lpvInBuffer,

IN DWORD cbInBuffer,		__in DWORD cbInBuffer,
__out_bcount_part_opt(cbOutBuffer, *lpcbBytesReturned) LPVOID lpvOutBuffer,		__out_bcount_part_opt(cbOutBuffer, *lpcbBytesReturned) LPVOID lpvOutBuffer,

IN DWORD cbOutBuffer,		__in DWORD cbOutBuffer,
__out LPDWORD lpcbBytesReturned,		__out LPDWORD lpcbBytesReturned,

__in_opt LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport) WINSOCK_API_LINKAGE		__control_entrypoint(DllExport) WINSOCK_API_LINKAGE
SOCKET		SOCKET
WSAAPI		WSAAPI
WSAJoinLeaf(		WSAJoinLeaf(

IN SOCKET s,		__in SOCKET s,
__in_bcount(namelen) const struct sockaddr FAR * name,		__in_bcount(namelen) const struct sockaddr FAR * name,

IN int namelen,		__in int namelen,
__in_opt LPWSABUF lpCallerData,		__in_opt LPWSABUF lpCallerData,
__out_opt LPWSABUF lpCalleeData,		__out_opt LPWSABUF lpCalleeData,
__in_opt LPQOS lpSQOS,		__in_opt LPQOS lpSQOS,
__in_opt LPQOS lpGQOS,		__in_opt LPQOS lpGQOS,

IN DWORD dwFlags		__in DWORD dwFlags
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
SOCKET		SOCKET
(WSAAPI * LPFN_WSAJOINLEAF)(		(WSAAPI * LPFN_WSAJOINLEAF)(

IN SOCKET s,		__in SOCKET s,
__in_bcount(namelen) const struct sockaddr FAR * name,		__in_bcount(namelen) const struct sockaddr FAR * name,

IN int namelen,		__in int namelen,
__in_opt LPWSABUF lpCallerData,		__in_opt LPWSABUF lpCallerData,
__out_opt LPWSABUF lpCalleeData,		__out_opt LPWSABUF lpCalleeData,
__in_opt LPQOS lpSQOS,		__in_opt LPQOS lpSQOS,
__in_opt LPQOS lpGQOS,		__in_opt LPQOS lpGQOS,

IN DWORD dwFlags		__in DWORD dwFlags
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSANtohl(		WSANtohl(

__in IN SOCKET s,		__in SOCKET s,
__in IN u_long netlong,		__in u_long netlong,
__out OUT u_long FAR * lphostlong		__out u_long FAR * lphostlong
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSANTOHL)(		(WSAAPI * LPFN_WSANTOHL)(

IN SOCKET s,		__in SOCKET s,
IN u_long netlong,		__in u_long netlong,
OUT u_long FAR * lphostlong		__out u_long FAR * lphostlong
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSANtohs(		WSANtohs(

__in IN SOCKET s,		__in SOCKET s,
__in IN u_short netshort,		__in u_short netshort,
__out OUT u_short FAR * lphostshort		__out u_short FAR * lphostshort
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSANTOHS)(		(WSAAPI * LPFN_WSANTOHS)(

IN SOCKET s,		__in SOCKET s,
IN u_short netshort,		__in u_short netshort,
OUT u_short FAR * lphostshort		__out u_short FAR * lphostshort
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSARecv(		WSARecv(

IN SOCKET s,		__in SOCKET s,
__in_ecount(dwBufferCount) __out_data_source(NETWORK) LPWSABUF lpBuffers,		__in_ecount(dwBufferCount) __out_data_source(NETWORK) LPWSABUF lpBuffers,

IN DWORD dwBufferCount,		__in DWORD dwBufferCount,
__out_opt LPDWORD lpNumberOfBytesRecvd,		__out_opt LPDWORD lpNumberOfBytesRecvd,

IN OUT LPDWORD lpFlags,		__inout LPDWORD lpFlags,
__in_opt LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSARECV)(		(WSAAPI * LPFN_WSARECV)(

IN SOCKET s,		__in SOCKET s,
__in_ecount(dwBufferCount) LPWSABUF lpBuffers,		__in_ecount(dwBufferCount) LPWSABUF lpBuffers,

IN DWORD dwBufferCount,		__in DWORD dwBufferCount,
__out_opt LPDWORD lpNumberOfBytesRecvd,		__out_opt LPDWORD lpNumberOfBytesRecvd,

IN OUT LPDWORD lpFlags,		__inout LPDWORD lpFlags,
__in_opt LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSARecvDisconnect(		WSARecvDisconnect(

IN SOCKET s,		__in SOCKET s,
OUT __out_data_source(NETWORK) LPWSABUF lpInboundDisconnectData		__in_opt __out_data_source(NETWORK) LPWSABUF lpInboundDisconnectData
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSARECVDISCONNECT)(		(WSAAPI * LPFN_WSARECVDISCONNECT)(

IN SOCKET s,		__in SOCKET s,
OUT LPWSABUF lpInboundDisconnectData		__out_data_source(NETWORK) LPWSABUF lpInboundDisconnectData
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSARecvFrom(		WSARecvFrom(

IN SOCKET s,		__in SOCKET s,
__in_ecount(dwBufferCount) __out_data_source(NETWORK) LPWSABUF lpBuffers,		__in_ecount(dwBufferCount) __out_data_source(NETWORK) LPWSABUF lpBuffers,

IN DWORD dwBufferCount,		__in DWORD dwBufferCount,
__out_opt LPDWORD lpNumberOfBytesRecvd,		__out_opt LPDWORD lpNumberOfBytesRecvd,

IN OUT LPDWORD lpFlags,		__inout LPDWORD lpFlags,
__out_bcount_part_opt(lpFromlen,lpFromLen) struct sockaddr FAR * lpFrom,		__out_bcount_part_opt(lpFromlen,lpFromlen) struct sockaddr FAR * lpFrom,
__inout_opt LPINT lpFromlen,		__inout_opt LPINT lpFromlen,

__in_opt LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSARECVFROM)(		(WSAAPI * LPFN_WSARECVFROM)(

IN SOCKET s,		__in SOCKET s,
__in_ecount(dwBufferCount) LPWSABUF lpBuffers,		__in_ecount(dwBufferCount) LPWSABUF lpBuffers,

IN DWORD dwBufferCount,		__in DWORD dwBufferCount,
__out_opt LPDWORD lpNumberOfBytesRecvd,		__out_opt LPDWORD lpNumberOfBytesRecvd,

IN OUT LPDWORD lpFlags,		__inout LPDWORD lpFlags,
__out_bcount_part_opt(lpFromlen,lpFromLen) struct sockaddr FAR * lpFrom,		__out_bcount_part_opt(lpFromlen,lpFromLen) struct sockaddr FAR * lpFrom,
__inout_opt LPINT lpFromlen,		__inout_opt LPINT lpFromlen,

__in_opt LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
BOOL		BOOL
WSAAPI		WSAAPI
WSAResetEvent(		WSAResetEvent(

IN WSAEVENT hEvent		__in WSAEVENT hEvent
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
BOOL		BOOL
(WSAAPI * LPFN_WSARESETEVENT)(		(WSAAPI * LPFN_WSARESETEVENT)(

IN WSAEVENT hEvent		__in WSAEVENT hEvent
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSASend(		WSASend(

IN SOCKET s,		__in SOCKET s,
__in_ecount(dwBufferCount) LPWSABUF lpBuffers,		__in_ecount(dwBufferCount) LPWSABUF lpBuffers,

IN DWORD dwBufferCount,		__in DWORD dwBufferCount,
__out_opt LPDWORD lpNumberOfBytesSent,		__out_opt LPDWORD lpNumberOfBytesSent,

IN DWORD dwFlags,		__in DWORD dwFlags,
__in_opt LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSASEND)(		(WSAAPI * LPFN_WSASEND)(

IN SOCKET s,		__in SOCKET s,
__in_ecount(dwBufferCount) LPWSABUF lpBuffers,		__in_ecount(dwBufferCount) LPWSABUF lpBuffers,

IN DWORD dwBufferCount,		__in DWORD dwBufferCount,
__out_opt LPDWORD lpNumberOfBytesSent,		__out_opt LPDWORD lpNumberOfBytesSent,

IN DWORD dwFlags,		__in DWORD dwFlags,
__in_opt LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if(_WIN32_WINNT >= 0x0600)		#if(_WIN32_WINNT >= 0x0600)
#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSASendMsg(		WSASendMsg(

IN SOCKET Handle,		__in SOCKET Handle,
IN LPWSAMSG lpMsg,		__in LPWSAMSG lpMsg,
IN DWORD dwFlags,		__in DWORD dwFlags,
__out_opt LPDWORD lpNumberOfBytesSent,		__out_opt LPDWORD lpNumberOfBytesSent,

__in_opt LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */
#endif // (_WIN32_WINNT >= 0x0600)		#endif // (_WIN32_WINNT >= 0x0600)

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSASendDisconnect(		WSASendDisconnect(

IN SOCKET s,		__in SOCKET s,
IN LPWSABUF lpOutboundDisconnectData		__in_opt LPWSABUF lpOutboundDisconnectData
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSASENDDISCONNECT)(		(WSAAPI * LPFN_WSASENDDISCONNECT)(

IN SOCKET s,		__in SOCKET s,
IN LPWSABUF lpOutboundDisconnectData		__in_opt LPWSABUF lpOutboundDisconnectData
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSASendTo(		WSASendTo(

IN SOCKET s,		__in SOCKET s,
__in_ecount(dwBufferCount) LPWSABUF lpBuffers,		__in_ecount(dwBufferCount) LPWSABUF lpBuffers,

IN DWORD dwBufferCount,		__in DWORD dwBufferCount,
__out_opt LPDWORD lpNumberOfBytesSent,		__out_opt LPDWORD lpNumberOfBytesSent,

IN DWORD dwFlags,		__in DWORD dwFlags,
__in_bcount(iTolen) const struct sockaddr FAR * lpTo,		__in_bcount_opt(iTolen) const struct sockaddr FAR * lpTo,
IN int iTolen,		__in int iTolen,
__in_opt LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
int		int
(WSAAPI * LPFN_WSASENDTO)(		(WSAAPI * LPFN_WSASENDTO)(

IN SOCKET s,		__in SOCKET s,
__in_ecount(dwBufferCount) LPWSABUF lpBuffers,		__in_ecount(dwBufferCount) LPWSABUF lpBuffers,

IN DWORD dwBufferCount,		__in DWORD dwBufferCount,
__out_opt LPDWORD lpNumberOfBytesSent,		__out_opt LPDWORD lpNumberOfBytesSent,

IN DWORD dwFlags,		__in DWORD dwFlags,
__in_bcount(iTolen) const struct sockaddr FAR * lpTo,		__in_bcount_opt(iTolen) const struct sockaddr FAR * lpTo,
IN int iTolen,		__in int iTolen,
__in_opt LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
BOOL		BOOL
WSAAPI		WSAAPI
WSASetEvent(		WSASetEvent(

IN WSAEVENT hEvent		__in WSAEVENT hEvent
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
BOOL		BOOL
(WSAAPI * LPFN_WSASETEVENT)(		(WSAAPI * LPFN_WSASETEVENT)(

IN WSAEVENT hEvent		__in WSAEVENT hEvent
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE

		__checkReturn
SOCKET		SOCKET
WSAAPI		WSAAPI
WSASocketA(		WSASocketA(

IN int af,		__in int af,
IN int type,		__in int type,
IN int protocol,		__in int protocol,
IN LPWSAPROTOCOL_INFOA lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOA lpProtocolInfo,
IN GROUP g,		__in GROUP g,
IN DWORD dwFlags		__in DWORD dwFlags
);		);


__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE

		__checkReturn
SOCKET		SOCKET
WSAAPI		WSAAPI
WSASocketW(		WSASocketW(

IN int af,		__in int af,
IN int type,		__in int type,
IN int protocol,		__in int protocol,
IN LPWSAPROTOCOL_INFOW lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOW lpProtocolInfo,
IN GROUP g,		__in GROUP g,
IN DWORD dwFlags		__in DWORD dwFlags
);		);
#ifdef UNICODE		#ifdef UNICODE
#define WSASocket WSASocketW		#define WSASocket WSASocketW
#else		#else
#define WSASocket WSASocketA		#define WSASocket WSASocketA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef

		__checkReturn
SOCKET		SOCKET
(WSAAPI * LPFN_WSASOCKETA)(		(WSAAPI * LPFN_WSASOCKETA)(

IN int af,		__in int af,
IN int type,		__in int type,
IN int protocol,		__in int protocol,
IN LPWSAPROTOCOL_INFOA lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOA lpProtocolInfo,
IN GROUP g,		__in GROUP g,
IN DWORD dwFlags		__in DWORD dwFlags
);		);


typedef		typedef

		__checkReturn
SOCKET		SOCKET
(WSAAPI * LPFN_WSASOCKETW)(		(WSAAPI * LPFN_WSASOCKETW)(

IN int af,		__in int af,
IN int type,		__in int type,
IN int protocol,		__in int protocol,
IN LPWSAPROTOCOL_INFOW lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOW lpProtocolInfo,
IN GROUP g,		__in GROUP g,
IN DWORD dwFlags		__in DWORD dwFlags
);		);
#ifdef UNICODE		#ifdef UNICODE
#define LPFN_WSASOCKET LPFN_WSASOCKETW		#define LPFN_WSASOCKET LPFN_WSASOCKETW
#else		#else
#define LPFN_WSASOCKET LPFN_WSASOCKETA		#define LPFN_WSASOCKET LPFN_WSASOCKETA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
DWORD		DWORD
WSAAPI		WSAAPI
WSAWaitForMultipleEvents(		WSAWaitForMultipleEvents(

IN DWORD cEvents,		__in DWORD cEvents,
IN const WSAEVENT FAR * lphEvents,		__in_ecount(cEvents) const WSAEVENT FAR * lphEvents,
IN BOOL fWaitAll,		__in BOOL fWaitAll,
IN DWORD dwTimeout,		__in DWORD dwTimeout,
IN BOOL fAlertable		__in BOOL fAlertable
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
DWORD		DWORD
(WSAAPI * LPFN_WSAWAITFORMULTIPLEEVENTS)(		(WSAAPI * LPFN_WSAWAITFORMULTIPLEEVENTS)(

IN DWORD cEvents,		__in DWORD cEvents,
IN const WSAEVENT FAR * lphEvents,		__in_ecount(cEvents) const WSAEVENT FAR * lphEvents,
IN BOOL fWaitAll,		__in BOOL fWaitAll,
IN DWORD dwTimeout,		__in DWORD dwTimeout,
IN BOOL fAlertable		__in BOOL fAlertable
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSAAddressToStringA(		WSAAddressToStringA(
__in_bcount(dwAddressLength) LPSOCKADDR lpsaAddress,		__in_bcount(dwAddressLength) LPSOCKADDR lpsaAddress,

IN DWORD dwAddressLength,		__in DWORD dwAddressLength,
__in_opt LPWSAPROTOCOL_INFOA lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOA lpProtocolInfo,
__out_ecount_part(lpdwAddressStringLength,lpdwAddressStringLength) LPSTR l pszAddressString,		__out_ecount_part(lpdwAddressStringLength,lpdwAddressStringLength) LPSTR l pszAddressString,

__inout LPDWORD lpdwAddressStringLength		__inout LPDWORD lpdwAddressStringLength
);		);
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSAAddressToStringW(		WSAAddressToStringW(
__in_bcount(dwAddressLength) LPSOCKADDR lpsaAddress,		__in_bcount(dwAddressLength) LPSOCKADDR lpsaAddress,

IN DWORD dwAddressLength,		__in DWORD dwAddressLength,
__in_opt LPWSAPROTOCOL_INFOW lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOW lpProtocolInfo,
__out_ecount_part(lpdwAddressStringLength,lpdwAddressStringLength) LPWSTR lpszAddressString,		__out_ecount_part(lpdwAddressStringLength,lpdwAddressStringLength) LPWSTR lpszAddressString,

__inout LPDWORD lpdwAddressStringLength		__inout LPDWORD lpdwAddressStringLength
);		);
#ifdef UNICODE		#ifdef UNICODE
#define WSAAddressToString WSAAddressToStringW		#define WSAAddressToString WSAAddressToStringW
#else		#else
#define WSAAddressToString WSAAddressToStringA		#define WSAAddressToString WSAAddressToStringA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSAADDRESSTOSTRINGA)(		(WSAAPI * LPFN_WSAADDRESSTOSTRINGA)(
__in_bcount(dwAddressLength) LPSOCKADDR lpsaAddress,		__in_bcount(dwAddressLength) LPSOCKADDR lpsaAddress,

IN DWORD dwAddressLength,		__in DWORD dwAddressLength,
__in_opt LPWSAPROTOCOL_INFOA lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOA lpProtocolInfo,
__out_ecount_part(lpdwAddressStringLength,lpdwAddressStringLength) LPSTR l pszAddressString,		__out_ecount_part(lpdwAddressStringLength,lpdwAddressStringLength) LPSTR l pszAddressString,

__inout LPDWORD lpdwAddressStringLength		__inout LPDWORD lpdwAddressStringLength
);		);
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSAADDRESSTOSTRINGW)(		(WSAAPI * LPFN_WSAADDRESSTOSTRINGW)(
__in_bcount(dwAddressLength) LPSOCKADDR lpsaAddress,		__in_bcount(dwAddressLength) LPSOCKADDR lpsaAddress,

IN DWORD dwAddressLength,		__in DWORD dwAddressLength,
__in_opt LPWSAPROTOCOL_INFOW lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOW lpProtocolInfo,
__out_ecount_part(lpdwAddressStringLength,lpdwAddressStringLength) LPWSTR lpszAddressString,		__out_ecount_part(lpdwAddressStringLength,lpdwAddressStringLength) LPWSTR lpszAddressString,

__inout LPDWORD lpdwAddressStringLength		__inout LPDWORD lpdwAddressStringLength
);		);
#ifdef UNICODE		#ifdef UNICODE
#define LPFN_WSAADDRESSTOSTRING LPFN_WSAADDRESSTOSTRINGW		#define LPFN_WSAADDRESSTOSTRING LPFN_WSAADDRESSTOSTRINGW
#else		#else
#define LPFN_WSAADDRESSTOSTRING LPFN_WSAADDRESSTOSTRINGA		#define LPFN_WSAADDRESSTOSTRING LPFN_WSAADDRESSTOSTRINGA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport) WINSOCK_API_LINKAGE		__control_entrypoint(DllExport) WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSAStringToAddressA(		WSAStringToAddressA(

__in LPSTR AddressString,		__in LPSTR AddressString,
IN INT AddressFamily,		__in INT AddressFamily,
__in_opt LPWSAPROTOCOL_INFOA lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOA lpProtocolInfo,
__out_bcount_part(lpAddressLength,lpAddressLength) LPSOCKADDR lpAddress,		__out_bcount_part(lpAddressLength,lpAddressLength) LPSOCKADDR lpAddress,

__inout LPINT lpAddressLength		__inout LPINT lpAddressLength
);		);
__control_entrypoint(DllExport) WINSOCK_API_LINKAGE		__control_entrypoint(DllExport) WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSAStringToAddressW(		WSAStringToAddressW(

__in LPWSTR AddressString,		__in LPWSTR AddressString,
IN INT AddressFamily,		__in INT AddressFamily,
__in_opt LPWSAPROTOCOL_INFOW lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOW lpProtocolInfo,
__out_bcount_part(lpAddressLength,lpAddressLength) LPSOCKADDR lpAddress,		__out_bcount_part(lpAddressLength,lpAddressLength) LPSOCKADDR lpAddress,
__inout LPINT lpAddressLength		__inout LPINT lpAddressLength
);		);
#ifdef UNICODE		#ifdef UNICODE
#define WSAStringToAddress WSAStringToAddressW		#define WSAStringToAddress WSAStringToAddressW
#else		#else
#define WSAStringToAddress WSAStringToAddressA		#define WSAStringToAddress WSAStringToAddressA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSASTRINGTOADDRESSA)(		(WSAAPI * LPFN_WSASTRINGTOADDRESSA)(

__in LPSTR AddressString,		__in LPSTR AddressString,
IN INT AddressFamily,		__in INT AddressFamily,
__in_opt LPWSAPROTOCOL_INFOA lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOA lpProtocolInfo,
__out_bcount_part(lpAddressLength,lpAddressLength) LPSOCKADDR lpAddress,		__out_bcount_part(lpAddressLength,lpAddressLength) LPSOCKADDR lpAddress,
__inout LPINT lpAddressLength		__inout LPINT lpAddressLength
);		);
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSASTRINGTOADDRESSW)(		(WSAAPI * LPFN_WSASTRINGTOADDRESSW)(

__in LPWSTR AddressString,		__in LPWSTR AddressString,
IN INT AddressFamily,		__in INT AddressFamily,
__in_opt LPWSAPROTOCOL_INFOW lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOW lpProtocolInfo,
__out_bcount_part(lpAddressLength,lpAddressLength) LPSOCKADDR lpAddress,		__out_bcount_part(lpAddressLength,lpAddressLength) LPSOCKADDR lpAddress,
__inout LPINT lpAddressLength		__inout LPINT lpAddressLength
);		);
#ifdef UNICODE		#ifdef UNICODE
#define LPFN_WSASTRINGTOADDRESS LPFN_WSASTRINGTOADDRESSW		#define LPFN_WSASTRINGTOADDRESS LPFN_WSASTRINGTOADDRESSW
#else		#else
#define LPFN_WSASTRINGTOADDRESS LPFN_WSASTRINGTOADDRESSA		#define LPFN_WSASTRINGTOADDRESS LPFN_WSASTRINGTOADDRESSA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

skipping to change at line 3385		skipping to change at line 3449
#define WSALookupServiceBegin WSALookupServiceBeginW		#define WSALookupServiceBegin WSALookupServiceBeginW
#else		#else
#define WSALookupServiceBegin WSALookupServiceBeginA		#define WSALookupServiceBegin WSALookupServiceBeginA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSALOOKUPSERVICEBEGINA)(		(WSAAPI * LPFN_WSALOOKUPSERVICEBEGINA)(

IN LPWSAQUERYSETA lpqsRestrictions,		__in LPWSAQUERYSETA lpqsRestrictions,
IN DWORD dwControlFlags,		__in DWORD dwControlFlags,
OUT LPHANDLE lphLookup		__out LPHANDLE lphLookup
);		);
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSALOOKUPSERVICEBEGINW)(		(WSAAPI * LPFN_WSALOOKUPSERVICEBEGINW)(

IN LPWSAQUERYSETW lpqsRestrictions,		__in LPWSAQUERYSETW lpqsRestrictions,
IN DWORD dwControlFlags,		__in DWORD dwControlFlags,
OUT LPHANDLE lphLookup		__out LPHANDLE lphLookup
);		);
#ifdef UNICODE		#ifdef UNICODE
#define LPFN_WSALOOKUPSERVICEBEGIN LPFN_WSALOOKUPSERVICEBEGINW		#define LPFN_WSALOOKUPSERVICEBEGIN LPFN_WSALOOKUPSERVICEBEGINW
#else		#else
#define LPFN_WSALOOKUPSERVICEBEGIN LPFN_WSALOOKUPSERVICEBEGINA		#define LPFN_WSALOOKUPSERVICEBEGIN LPFN_WSALOOKUPSERVICEBEGINA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport) WINSOCK_API_LINKAGE		__control_entrypoint(DllExport) WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSALookupServiceNextA(		WSALookupServiceNextA(
__in HANDLE hLookup,		__in HANDLE hLookup,
__in DWORD dwControlFlags,		__in DWORD dwControlFlags,

__inout LPDWORD lpdwBufferLength,		__inout LPDWORD lpdwBufferLength,
__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPWSAQUERYSETA lpqsRe sults		__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPWSAQUERYSETA lpqsRe sults
);		);
__control_entrypoint(DllExport) WINSOCK_API_LINKAGE		__control_entrypoint(DllExport) WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSALookupServiceNextW(		WSALookupServiceNextW(
__in HANDLE hLookup,		__in HANDLE hLookup,
__in DWORD dwControlFlags,		__in DWORD dwControlFlags,

__inout LPDWORD lpdwBufferLength,		__inout LPDWORD lpdwBufferLength,
__out_bcount_part_opt(lpdwBufferLength,lpdwBufferLength) LPWSAQUERYSETW lp qsResults		__out_bcount_part_opt(lpdwBufferLength,lpdwBufferLength) LPWSAQUERYSETW lp qsResults
);		);
#ifdef UNICODE		#ifdef UNICODE
#define WSALookupServiceNext WSALookupServiceNextW		#define WSALookupServiceNext WSALookupServiceNextW
#else		#else
#define WSALookupServiceNext WSALookupServiceNextA		#define WSALookupServiceNext WSALookupServiceNextA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSALOOKUPSERVICENEXTA)(		(WSAAPI * LPFN_WSALOOKUPSERVICENEXTA)(

IN HANDLE hLookup,		__in HANDLE hLookup,
IN DWORD dwControlFlags,		__in DWORD dwControlFlags,
__inout LPDWORD lpdwBufferLength,		__inout LPDWORD lpdwBufferLength,
__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPWSAQUERYSETA lpqs Results		__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPWSAQUERYSETA lpqs Results
);		);
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSALOOKUPSERVICENEXTW)(		(WSAAPI * LPFN_WSALOOKUPSERVICENEXTW)(

IN HANDLE hLookup,		__in HANDLE hLookup,
IN DWORD dwControlFlags,		__in DWORD dwControlFlags,
__inout LPDWORD lpdwBufferLength,		__inout LPDWORD lpdwBufferLength,
__out_bcount_part_opt(lpdwBufferLength,lpdwBufferLength) LPWSAQUERYSETW lpqsResults		__out_bcount_part_opt(lpdwBufferLength,lpdwBufferLength) LPWSAQUERYSETW lpqsResults
);		);
#ifdef UNICODE		#ifdef UNICODE
#define LPFN_WSALOOKUPSERVICENEXT LPFN_WSALOOKUPSERVICENEXTW		#define LPFN_WSALOOKUPSERVICENEXT LPFN_WSALOOKUPSERVICENEXTW
#else		#else
#define LPFN_WSALOOKUPSERVICENEXT LPFN_WSALOOKUPSERVICENEXTA		#define LPFN_WSALOOKUPSERVICENEXT LPFN_WSALOOKUPSERVICENEXTA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */


skipping to change at line 3500		skipping to change at line 3564
WSAAPI		WSAAPI
WSALookupServiceEnd(		WSALookupServiceEnd(
__in HANDLE hLookup		__in HANDLE hLookup
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSALOOKUPSERVICEEND)(		(WSAAPI * LPFN_WSALOOKUPSERVICEEND)(

IN HANDLE hLookup		__in HANDLE hLookup
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSAInstallServiceClassA(		WSAInstallServiceClassA(

IN LPWSASERVICECLASSINFOA lpServiceClassInfo		__in LPWSASERVICECLASSINFOA lpServiceClassInfo
);		);
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSAInstallServiceClassW(		WSAInstallServiceClassW(

IN LPWSASERVICECLASSINFOW lpServiceClassInfo		__in LPWSASERVICECLASSINFOW lpServiceClassInfo
);		);
#ifdef UNICODE		#ifdef UNICODE
#define WSAInstallServiceClass WSAInstallServiceClassW		#define WSAInstallServiceClass WSAInstallServiceClassW
#else		#else
#define WSAInstallServiceClass WSAInstallServiceClassA		#define WSAInstallServiceClass WSAInstallServiceClassA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSAINSTALLSERVICECLASSA)(		(WSAAPI * LPFN_WSAINSTALLSERVICECLASSA)(

IN LPWSASERVICECLASSINFOA lpServiceClassInfo		__in LPWSASERVICECLASSINFOA lpServiceClassInfo
);		);
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSAINSTALLSERVICECLASSW)(		(WSAAPI * LPFN_WSAINSTALLSERVICECLASSW)(

IN LPWSASERVICECLASSINFOW lpServiceClassInfo		__in LPWSASERVICECLASSINFOW lpServiceClassInfo
);		);
#ifdef UNICODE		#ifdef UNICODE
#define LPFN_WSAINSTALLSERVICECLASS LPFN_WSAINSTALLSERVICECLASSW		#define LPFN_WSAINSTALLSERVICECLASS LPFN_WSAINSTALLSERVICECLASSW
#else		#else
#define LPFN_WSAINSTALLSERVICECLASS LPFN_WSAINSTALLSERVICECLASSA		#define LPFN_WSAINSTALLSERVICECLASS LPFN_WSAINSTALLSERVICECLASSA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSARemoveServiceClass(		WSARemoveServiceClass(

IN LPGUID lpServiceClassId		__in LPGUID lpServiceClassId
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSAREMOVESERVICECLASS)(		(WSAAPI * LPFN_WSAREMOVESERVICECLASS)(

IN LPGUID lpServiceClassId		__in LPGUID lpServiceClassId
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSAGetServiceClassInfoA(		WSAGetServiceClassInfoA(

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
IN LPGUID lpServiceClassId,		__in LPGUID lpServiceClassId,
__inout LPDWORD lpdwBufSize,		__inout LPDWORD lpdwBufSize,
__out_bcount_part(lpdwBufSize,lpdwBufSize) LPWSASERVICECLASSINFOA lpServic eClassInfo		__out_bcount_part(lpdwBufSize,lpdwBufSize) LPWSASERVICECLASSINFOA lpServic eClassInfo
);		);
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSAGetServiceClassInfoW(		WSAGetServiceClassInfoW(

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
IN LPGUID lpServiceClassId,		__in LPGUID lpServiceClassId,
__inout LPDWORD lpdwBufSize,		__inout LPDWORD lpdwBufSize,
__out_bcount_part(lpdwBufSize,lpdwBufSize) LPWSASERVICECLASSINFOW lpServic eClassInfo		__out_bcount_part(lpdwBufSize,lpdwBufSize) LPWSASERVICECLASSINFOW lpServic eClassInfo
);		);
#ifdef UNICODE		#ifdef UNICODE
#define WSAGetServiceClassInfo WSAGetServiceClassInfoW		#define WSAGetServiceClassInfo WSAGetServiceClassInfoW
#else		#else
#define WSAGetServiceClassInfo WSAGetServiceClassInfoA		#define WSAGetServiceClassInfo WSAGetServiceClassInfoA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSAGETSERVICECLASSINFOA)(		(WSAAPI * LPFN_WSAGETSERVICECLASSINFOA)(

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
IN LPGUID lpServiceClassId,		__in LPGUID lpServiceClassId,
__inout LPDWORD lpdwBufSize,		__inout LPDWORD lpdwBufSize,
__out_bcount_part(lpdwBufSize,lpdwBufSize) LPWSASERVICECLASSINFOA lpServic eClassInfo		__out_bcount_part(lpdwBufSize,lpdwBufSize) LPWSASERVICECLASSINFOA lpServic eClassInfo
);		);
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSAGETSERVICECLASSINFOW)(		(WSAAPI * LPFN_WSAGETSERVICECLASSINFOW)(

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
IN LPGUID lpServiceClassId,		__in LPGUID lpServiceClassId,
__inout LPDWORD lpdwBufSize,		__inout LPDWORD lpdwBufSize,
__out_bcount_part(lpdwBufSize,lpdwBufSize) LPWSASERVICECLASSINFOW lpServic eClassInfo		__out_bcount_part(lpdwBufSize,lpdwBufSize) LPWSASERVICECLASSINFOW lpServic eClassInfo
);		);
#ifdef UNICODE		#ifdef UNICODE
#define LPFN_WSAGETSERVICECLASSINFO LPFN_WSAGETSERVICECLASSINFOW		#define LPFN_WSAGETSERVICECLASSINFO LPFN_WSAGETSERVICECLASSINFOW
#else		#else
#define LPFN_WSAGETSERVICECLASSINFO LPFN_WSAGETSERVICECLASSINFOA		#define LPFN_WSAGETSERVICECLASSINFO LPFN_WSAGETSERVICECLASSINFOA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */


skipping to change at line 3704		skipping to change at line 3768
#else		#else
#define LPFN_WSAENUMNAMESPACEPROVIDERSEX LPFN_WSAENUMNAMESPACEPROVIDERSEXA		#define LPFN_WSAENUMNAMESPACEPROVIDERSEX LPFN_WSAENUMNAMESPACEPROVIDERSEXA
#endif /* !UNICODE */		#endif /* !UNICODE */

#endif //(_WIN32_WINNT >= 0x600)		#endif //(_WIN32_WINNT >= 0x600)

#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE

INT		__success(return == 0) INT
WSAAPI		WSAAPI
WSAGetServiceClassNameByClassIdA(		WSAGetServiceClassNameByClassIdA(

__in IN LPGUID lpServiceClassId,		__in LPGUID lpServiceClassId,
__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPSTR lpszServiceClas sName,		__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPSTR lpszServiceClas sName,
__inout LPDWORD lpdwBufferLength		__inout LPDWORD lpdwBufferLength
);		);
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE

INT		__success(return == 0) INT
WSAAPI		WSAAPI
WSAGetServiceClassNameByClassIdW(		WSAGetServiceClassNameByClassIdW(

__in IN LPGUID lpServiceClassId,		__in LPGUID lpServiceClassId,
__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPWSTR lpszServiceCla ssName,		__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPWSTR lpszServiceCla ssName,
__inout LPDWORD lpdwBufferLength		__inout LPDWORD lpdwBufferLength
);		);
#ifdef UNICODE		#ifdef UNICODE
#define WSAGetServiceClassNameByClassId WSAGetServiceClassNameByClassIdW		#define WSAGetServiceClassNameByClassId WSAGetServiceClassNameByClassIdW
#else		#else
#define WSAGetServiceClassNameByClassId WSAGetServiceClassNameByClassIdA		#define WSAGetServiceClassNameByClassId WSAGetServiceClassNameByClassIdA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDA)(		(WSAAPI * LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDA)(

IN LPGUID lpServiceClassId,		__in LPGUID lpServiceClassId,
__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPSTR lpszServiceClas sName,		__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPSTR lpszServiceClas sName,
__inout LPDWORD lpdwBufferLength		__inout LPDWORD lpdwBufferLength
);		);
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDW)(		(WSAAPI * LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDW)(

IN LPGUID lpServiceClassId,		__in LPGUID lpServiceClassId,
__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPWSTR lpszServiceCla ssName,		__out_bcount_part(lpdwBufferLength,lpdwBufferLength) LPWSTR lpszServiceCla ssName,
__inout LPDWORD lpdwBufferLength		__inout LPDWORD lpdwBufferLength
);		);
#ifdef UNICODE		#ifdef UNICODE
#define LPFN_WSAGETSERVICECLASSNAMEBYCLASSID LPFN_WSAGETSERVICECLASSNAMEBYCLASS IDW		#define LPFN_WSAGETSERVICECLASSNAMEBYCLASSID LPFN_WSAGETSERVICECLASSNAMEBYCLASS IDW
#else		#else
#define LPFN_WSAGETSERVICECLASSNAMEBYCLASSID LPFN_WSAGETSERVICECLASSNAMEBYCLASS IDA		#define LPFN_WSAGETSERVICECLASSNAMEBYCLASSID LPFN_WSAGETSERVICECLASSNAMEBYCLASS IDA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSASetServiceA(		WSASetServiceA(

IN LPWSAQUERYSETA lpqsRegInfo,		__in LPWSAQUERYSETA lpqsRegInfo,
IN WSAESETSERVICEOP essoperation,		__in WSAESETSERVICEOP essoperation,
IN DWORD dwControlFlags		__in DWORD dwControlFlags
);		);
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSASetServiceW(		WSASetServiceW(

IN LPWSAQUERYSETW lpqsRegInfo,		__in LPWSAQUERYSETW lpqsRegInfo,
IN WSAESETSERVICEOP essoperation,		__in WSAESETSERVICEOP essoperation,
IN DWORD dwControlFlags		__in DWORD dwControlFlags
);		);
#ifdef UNICODE		#ifdef UNICODE
#define WSASetService WSASetServiceW		#define WSASetService WSASetServiceW
#else		#else
#define WSASetService WSASetServiceA		#define WSASetService WSASetServiceA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSASETSERVICEA)(		(WSAAPI * LPFN_WSASETSERVICEA)(

IN LPWSAQUERYSETA lpqsRegInfo,		__in LPWSAQUERYSETA lpqsRegInfo,
IN WSAESETSERVICEOP essoperation,		__in WSAESETSERVICEOP essoperation,
IN DWORD dwControlFlags		__in DWORD dwControlFlags
);		);
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSASETSERVICEW)(		(WSAAPI * LPFN_WSASETSERVICEW)(

IN LPWSAQUERYSETW lpqsRegInfo,		__in LPWSAQUERYSETW lpqsRegInfo,
IN WSAESETSERVICEOP essoperation,		__in WSAESETSERVICEOP essoperation,
IN DWORD dwControlFlags		__in DWORD dwControlFlags
);		);
#ifdef UNICODE		#ifdef UNICODE
#define LPFN_WSASETSERVICE LPFN_WSASETSERVICEW		#define LPFN_WSASETSERVICE LPFN_WSASETSERVICEW
#else		#else
#define LPFN_WSASETSERVICE LPFN_WSASETSERVICEA		#define LPFN_WSASETSERVICE LPFN_WSASETSERVICEA
#endif /* !UNICODE */		#endif /* !UNICODE */
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
WSAProviderConfigChange(		WSAProviderConfigChange(
__deref_inout_opt LPHANDLE lpNotificationHandle,		__deref_inout_opt LPHANDLE lpNotificationHandle,

__in_opt LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */

#if INCL_WINSOCK_API_TYPEDEFS		#if INCL_WINSOCK_API_TYPEDEFS
typedef		typedef
INT		INT
(WSAAPI * LPFN_WSAPROVIDERCONFIGCHANGE)(		(WSAAPI * LPFN_WSAPROVIDERCONFIGCHANGE)(
__deref_inout_opt LPHANDLE lpNotificationHandle,		__deref_inout_opt LPHANDLE lpNotificationHandle,

__in_opt LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);		);
#endif /* INCL_WINSOCK_API_TYPEDEFS */		#endif /* INCL_WINSOCK_API_TYPEDEFS */

#if(_WIN32_WINNT >= 0x0600)		#if(_WIN32_WINNT >= 0x0600)
#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
int		int
WSAAPI		WSAAPI
WSAPoll(		WSAPoll(

IN OUT LPWSAPOLLFD fdArray,		__inout LPWSAPOLLFD fdArray,
IN ULONG fds,		__in ULONG fds,
IN INT timeout		__in INT timeout
);		);
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */
#endif // (_WIN32_WINNT >= 0x0600)		#endif // (_WIN32_WINNT >= 0x0600)

/* Microsoft Windows Extended data types */		/* Microsoft Windows Extended data types */
typedef struct sockaddr_in FAR *LPSOCKADDR_IN;		typedef struct sockaddr_in FAR *LPSOCKADDR_IN;

typedef struct linger LINGER;		typedef struct linger LINGER;
typedef struct linger *PLINGER;		typedef struct linger *PLINGER;
typedef struct linger FAR *LPLINGER;		typedef struct linger FAR *LPLINGER;

End of changes. 241 change blocks.
385 lines changed or deleted		449 lines changed or added

ws2spi.h (6.0.6002.18005-Windows 6.0)		ws2spi.h (6.1.7601.17514-Windows 7.0)

skipping to change at line 106		skipping to change at line 106
VOID		VOID
(CALLBACK FAR * LPWSAUSERAPC)(		(CALLBACK FAR * LPWSAUSERAPC)(
DWORD_PTR dwContext		DWORD_PTR dwContext
);		);

/*		/*
* Pointers to the individual entries in a service provider's proc table.		* Pointers to the individual entries in a service provider's proc table.
*/		*/

typedef		typedef

		__checkReturn
SOCKET		SOCKET
(WSPAPI * LPWSPACCEPT)(		(WSPAPI * LPWSPACCEPT)(

SOCKET s,		__in SOCKET s,
struct sockaddr FAR * addr,		__out_bcount_part_opt(addrlen, addrlen) struct sockaddr FAR * addr,
LPINT addrlen,		__inout_opt LPINT addrlen,
LPCONDITIONPROC lpfnCondition,		__in_opt LPCONDITIONPROC lpfnCondition,
DWORD_PTR dwCallbackData,		__in_opt DWORD_PTR dwCallbackData,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
INT		INT
(WSPAPI * LPWSPADDRESSTOSTRING)(		(WSPAPI * LPWSPADDRESSTOSTRING)(

LPSOCKADDR lpsaAddress,		__in_bcount(dwAddressLength) LPSOCKADDR lpsaAddress,
DWORD dwAddressLength,		__in DWORD dwAddressLength,
LPWSAPROTOCOL_INFOW lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOW lpProtocolInfo,
LPWSTR lpszAddressString,		__out_ecount_part(lpdwAddressStringLength, lpdwAddressStringLength) LPWSTR
LPDWORD lpdwAddressStringLength,		lpszAddressString,
LPINT lpErrno		__inout LPDWORD lpdwAddressStringLength,
		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPASYNCSELECT)(		(WSPAPI * LPWSPASYNCSELECT)(

SOCKET s,		__in SOCKET s,
HWND hWnd,		__in HWND hWnd,
unsigned int wMsg,		__in unsigned int wMsg,
long lEvent,		__in long lEvent,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPBIND)(		(WSPAPI * LPWSPBIND)(

SOCKET s,		__in SOCKET s,
const struct sockaddr FAR * name,		__in_bcount(namelen) const struct sockaddr FAR * name,
int namelen,		__in int namelen,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPCANCELBLOCKINGCALL)(		(WSPAPI * LPWSPCANCELBLOCKINGCALL)(

LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPCLEANUP)(		(WSPAPI * LPWSPCLEANUP)(

LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPCLOSESOCKET)(		(WSPAPI * LPWSPCLOSESOCKET)(

SOCKET s,		__in SOCKET s,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPCONNECT)(		(WSPAPI * LPWSPCONNECT)(

SOCKET s,		__in SOCKET s,
const struct sockaddr FAR * name,		__in_bcount(namelen) const struct sockaddr FAR * name,
int namelen,		__in int namelen,
LPWSABUF lpCallerData,		__in_opt LPWSABUF lpCallerData,
LPWSABUF lpCalleeData,		__out_opt LPWSABUF lpCalleeData,
LPQOS lpSQOS,		__in_opt LPQOS lpSQOS,
LPQOS lpGQOS,		__in_opt LPQOS lpGQOS,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPDUPLICATESOCKET)(		(WSPAPI * LPWSPDUPLICATESOCKET)(

SOCKET s,		__in SOCKET s,
DWORD dwProcessId,		__in DWORD dwProcessId,
LPWSAPROTOCOL_INFOW lpProtocolInfo,		__out LPWSAPROTOCOL_INFOW lpProtocolInfo,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPENUMNETWORKEVENTS)(		(WSPAPI * LPWSPENUMNETWORKEVENTS)(

SOCKET s,		__in SOCKET s,
WSAEVENT hEventObject,		__in WSAEVENT hEventObject,
LPWSANETWORKEVENTS lpNetworkEvents,		__out LPWSANETWORKEVENTS lpNetworkEvents,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPEVENTSELECT)(		(WSPAPI * LPWSPEVENTSELECT)(

SOCKET s,		__in SOCKET s,
WSAEVENT hEventObject,		__in WSAEVENT hEventObject,
long lNetworkEvents,		__in long lNetworkEvents,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
BOOL		BOOL
(WSPAPI * LPWSPGETOVERLAPPEDRESULT)(		(WSPAPI * LPWSPGETOVERLAPPEDRESULT)(

SOCKET s,		__in SOCKET s,
LPWSAOVERLAPPED lpOverlapped,		__in LPWSAOVERLAPPED lpOverlapped,
LPDWORD lpcbTransfer,		__out LPDWORD lpcbTransfer,
BOOL fWait,		__in BOOL fWait,
LPDWORD lpdwFlags,		__out LPDWORD lpdwFlags,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPGETPEERNAME)(		(WSPAPI * LPWSPGETPEERNAME)(

SOCKET s,		__in SOCKET s,
struct sockaddr FAR * name,		__out_bcount_part(namelen, namelen) struct sockaddr FAR * name,
LPINT namelen,		__inout LPINT namelen,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPGETSOCKNAME)(		(WSPAPI * LPWSPGETSOCKNAME)(

SOCKET s,		__in SOCKET s,
struct sockaddr FAR * name,		__out_bcount_part(namelen, namelen) struct sockaddr FAR * name,
LPINT namelen,		__inout LPINT namelen,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPGETSOCKOPT)(		(WSPAPI * LPWSPGETSOCKOPT)(

SOCKET s,		__in SOCKET s,
int level,		__in int level,
int optname,		__in int optname,
char FAR * optval,		__out_bcount(optlen) char FAR optval,
LPINT optlen,		__inout LPINT optlen,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
BOOL		BOOL
(WSPAPI * LPWSPGETQOSBYNAME)(		(WSPAPI * LPWSPGETQOSBYNAME)(

SOCKET s,		__in SOCKET s,
LPWSABUF lpQOSName,		__in LPWSABUF lpQOSName,
LPQOS lpQOS,		__out LPQOS lpQOS,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPIOCTL)(		(WSPAPI * LPWSPIOCTL)(

SOCKET s,		__in SOCKET s,
DWORD dwIoControlCode,		__in DWORD dwIoControlCode,
LPVOID lpvInBuffer,		__in_bcount_opt(cbInBuffer) LPVOID lpvInBuffer,
DWORD cbInBuffer,		__in DWORD cbInBuffer,
LPVOID lpvOutBuffer,		__out_bcount_part_opt(cbOutBuffer, *lpcbBytesReturned) LPVOID lpvOutBuffer,
DWORD cbOutBuffer,		__in DWORD cbOutBuffer,
LPDWORD lpcbBytesReturned,		__out LPDWORD lpcbBytesReturned,
LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
LPWSATHREADID lpThreadId,		__in_opt LPWSATHREADID lpThreadId,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
SOCKET		SOCKET
(WSPAPI * LPWSPJOINLEAF)(		(WSPAPI * LPWSPJOINLEAF)(

SOCKET s,		__in SOCKET s,
const struct sockaddr FAR * name,		__in_bcount(namelen) const struct sockaddr FAR * name,
int namelen,		__in int namelen,
LPWSABUF lpCallerData,		__in_opt LPWSABUF lpCallerData,
LPWSABUF lpCalleeData,		__out_opt LPWSABUF lpCalleeData,
LPQOS lpSQOS,		__in_opt LPQOS lpSQOS,
LPQOS lpGQOS,		__in_opt LPQOS lpGQOS,
DWORD dwFlags,		__in DWORD dwFlags,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPLISTEN)(		(WSPAPI * LPWSPLISTEN)(

SOCKET s,		__in SOCKET s,
int backlog,		__in int backlog,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPRECV)(		(WSPAPI * LPWSPRECV)(

SOCKET s,		__in SOCKET s,
LPWSABUF lpBuffers,		__in_ecount(dwBufferCount) LPWSABUF lpBuffers,
DWORD dwBufferCount,		__in DWORD dwBufferCount,
LPDWORD lpNumberOfBytesRecvd,		__out_opt LPDWORD lpNumberOfBytesRecvd,
LPDWORD lpFlags,		__inout LPDWORD lpFlags,
LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
LPWSATHREADID lpThreadId,		__in_opt LPWSATHREADID lpThreadId,
LPINT lpErrno		__in LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPRECVDISCONNECT)(		(WSPAPI * LPWSPRECVDISCONNECT)(

SOCKET s,		__in SOCKET s,
LPWSABUF lpInboundDisconnectData,		__in_opt LPWSABUF lpInboundDisconnectData,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPRECVFROM)(		(WSPAPI * LPWSPRECVFROM)(

SOCKET s,		__in SOCKET s,
LPWSABUF lpBuffers,		__in_ecount(dwBufferCount) LPWSABUF lpBuffers,
DWORD dwBufferCount,		__in DWORD dwBufferCount,
LPDWORD lpNumberOfBytesRecvd,		__out_opt LPDWORD lpNumberOfBytesRecvd,
LPDWORD lpFlags,		__inout LPDWORD lpFlags,
struct sockaddr FAR * lpFrom,		__out_bcount_part_opt(lpFromLen, lpFromLen) struct sockaddr FAR * lpFrom,
LPINT lpFromlen,		__inout_opt LPINT lpFromlen,
LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
LPWSATHREADID lpThreadId,		__in_opt LPWSATHREADID lpThreadId,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPSELECT)(		(WSPAPI * LPWSPSELECT)(

int nfds,		__in int nfds,
fd_set FAR * readfds,		__inout_opt fd_set FAR * readfds,
fd_set FAR * writefds,		__inout_opt fd_set FAR * writefds,
fd_set FAR * exceptfds,		__inout_opt fd_set FAR * exceptfds,
const struct timeval FAR * timeout,		__in_opt const struct timeval FAR * timeout,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPSEND)(		(WSPAPI * LPWSPSEND)(

SOCKET s,		__in SOCKET s,
LPWSABUF lpBuffers,		__in_ecount(dwBufferCount) LPWSABUF lpBuffers,
DWORD dwBufferCount,		__in DWORD dwBufferCount,
LPDWORD lpNumberOfBytesSent,		__out_opt LPDWORD lpNumberOfBytesSent,
DWORD dwFlags,		__in DWORD dwFlags,
LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
LPWSATHREADID lpThreadId,		__in_opt LPWSATHREADID lpThreadId,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPSENDDISCONNECT)(		(WSPAPI * LPWSPSENDDISCONNECT)(

SOCKET s,		__in SOCKET s,
LPWSABUF lpOutboundDisconnectData,		__in_opt LPWSABUF lpOutboundDisconnectData,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPSENDTO)(		(WSPAPI * LPWSPSENDTO)(

SOCKET s,		__in SOCKET s,
LPWSABUF lpBuffers,		__in_ecount(dwBufferCount) LPWSABUF lpBuffers,
DWORD dwBufferCount,		__in DWORD dwBufferCount,
LPDWORD lpNumberOfBytesSent,		__out_opt LPDWORD lpNumberOfBytesSent,
DWORD dwFlags,		__in DWORD dwFlags,
const struct sockaddr FAR * lpTo,		__in_bcount_opt(iToLen) const struct sockaddr FAR * lpTo,
int iTolen,		__in int iTolen,
LPWSAOVERLAPPED lpOverlapped,		__inout_opt LPWSAOVERLAPPED lpOverlapped,
LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
LPWSATHREADID lpThreadId,		__in_opt LPWSATHREADID lpThreadId,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPSETSOCKOPT)(		(WSPAPI * LPWSPSETSOCKOPT)(

SOCKET s,		__in SOCKET s,
int level,		__in int level,
int optname,		__in int optname,
const char FAR * optval,		__in_bcount_opt(optlen) const char FAR * optval,
int optlen,		__in int optlen,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSPSHUTDOWN)(		(WSPAPI * LPWSPSHUTDOWN)(

SOCKET s,		__in SOCKET s,
int how,		__in int how,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef

		__checkReturn
SOCKET		SOCKET
(WSPAPI * LPWSPSOCKET)(		(WSPAPI * LPWSPSOCKET)(

int af,		__in int af,
int type,		__in int type,
int protocol,		__in int protocol,
LPWSAPROTOCOL_INFOW lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOW lpProtocolInfo,
GROUP g,		__in GROUP g,
DWORD dwFlags,		__in DWORD dwFlags,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
INT		INT
(WSPAPI * LPWSPSTRINGTOADDRESS)(		(WSPAPI * LPWSPSTRINGTOADDRESS)(

LPWSTR AddressString,		__in LPWSTR AddressString,
INT AddressFamily,		__in INT AddressFamily,
LPWSAPROTOCOL_INFOW lpProtocolInfo,		__in_opt LPWSAPROTOCOL_INFOW lpProtocolInfo,
LPSOCKADDR lpAddress,		__out_bcount_part(lpAddressLength, lpAddressLength) LPSOCKADDR lpAddress,
LPINT lpAddressLength,		__inout LPINT lpAddressLength,
LPINT lpErrno		__out LPINT lpErrno
);		);

/*		/*
* A service provider proc table. This structure is returned by value		* A service provider proc table. This structure is returned by value
* from the service provider's WSPStartup() entrypoint.		* from the service provider's WSPStartup() entrypoint.
*/		*/

typedef struct _WSPPROC_TABLE {		typedef struct _WSPPROC_TABLE {

LPWSPACCEPT lpWSPAccept;		LPWSPACCEPT lpWSPAccept;

skipping to change at line 468		skipping to change at line 470

} WSPPROC_TABLE, FAR * LPWSPPROC_TABLE;		} WSPPROC_TABLE, FAR * LPWSPPROC_TABLE;

/*		/*
* Pointers to the individual entries in the upcall table.		* Pointers to the individual entries in the upcall table.
*/		*/

typedef		typedef
BOOL		BOOL
(WSPAPI * LPWPUCLOSEEVENT)(		(WSPAPI * LPWPUCLOSEEVENT)(

WSAEVENT hEvent,		__in WSAEVENT hEvent,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWPUCLOSESOCKETHANDLE)(		(WSPAPI * LPWPUCLOSESOCKETHANDLE)(

SOCKET s,		__in SOCKET s,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
WSAEVENT		WSAEVENT
(WSPAPI * LPWPUCREATEEVENT)(		(WSPAPI * LPWPUCREATEEVENT)(

LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef

		__checkReturn
SOCKET		SOCKET
(WSPAPI * LPWPUCREATESOCKETHANDLE)(		(WSPAPI * LPWPUCREATESOCKETHANDLE)(

DWORD dwCatalogEntryId,		__in DWORD dwCatalogEntryId,
DWORD_PTR dwContext,		__in DWORD_PTR dwContext,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWPUFDISSET)(		(WSPAPI * LPWPUFDISSET)(

SOCKET s,		__in SOCKET s,
fd_set FAR * fdset		__in fd_set FAR * fdset
);		);

typedef		typedef
int		int
(WSPAPI * LPWPUGETPROVIDERPATH)(		(WSPAPI * LPWPUGETPROVIDERPATH)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
WCHAR FAR * lpszProviderDllPath,		__out_ecount(lpProviderDllPathLen) WCHAR FAR lpszProviderDllPath,
LPINT lpProviderDllPathLen,		__inout LPINT lpProviderDllPathLen,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
SOCKET		SOCKET
(WSPAPI * LPWPUMODIFYIFSHANDLE)(		(WSPAPI * LPWPUMODIFYIFSHANDLE)(

DWORD dwCatalogEntryId,		__in DWORD dwCatalogEntryId,
SOCKET ProposedHandle,		__in SOCKET ProposedHandle,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
BOOL		BOOL
(WSPAPI * LPWPUPOSTMESSAGE)(		(WSPAPI * LPWPUPOSTMESSAGE)(

HWND hWnd,		__in HWND hWnd,
UINT Msg,		__in UINT Msg,
WPARAM wParam,		__in WPARAM wParam,
LPARAM lParam		__in LPARAM lParam
);		);

typedef		typedef
int		int
(WSPAPI * LPWPUQUERYBLOCKINGCALLBACK)(		(WSPAPI * LPWPUQUERYBLOCKINGCALLBACK)(

DWORD dwCatalogEntryId,		__in DWORD dwCatalogEntryId,
LPBLOCKINGCALLBACK FAR * lplpfnCallback,		__out LPBLOCKINGCALLBACK FAR * lplpfnCallback,
PDWORD_PTR lpdwContext,		__out PDWORD_PTR lpdwContext,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWPUQUERYSOCKETHANDLECONTEXT)(		(WSPAPI * LPWPUQUERYSOCKETHANDLECONTEXT)(

SOCKET s,		__in SOCKET s,
PDWORD_PTR lpContext,		__out PDWORD_PTR lpContext,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWPUQUEUEAPC)(		(WSPAPI * LPWPUQUEUEAPC)(

LPWSATHREADID lpThreadId,		__in LPWSATHREADID lpThreadId,
LPWSAUSERAPC lpfnUserApc,		__in LPWSAUSERAPC lpfnUserApc,
DWORD_PTR dwContext,		__in DWORD_PTR dwContext,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
BOOL		BOOL
(WSPAPI * LPWPURESETEVENT)(		(WSPAPI * LPWPURESETEVENT)(

WSAEVENT hEvent,		__in WSAEVENT hEvent,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
BOOL		BOOL
(WSPAPI * LPWPUSETEVENT)(		(WSPAPI * LPWPUSETEVENT)(

WSAEVENT hEvent,		__in WSAEVENT hEvent,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWPUOPENCURRENTTHREAD)(		(WSPAPI * LPWPUOPENCURRENTTHREAD)(

LPWSATHREADID lpThreadId,		__out LPWSATHREADID lpThreadId,
LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWPUCLOSETHREAD)(		(WSPAPI * LPWPUCLOSETHREAD)(

LPWSATHREADID lpThreadId,		__in LPWSATHREADID lpThreadId,
LPINT lpErrno		__out LPINT lpErrno
);		);

// Available only directly from ws2_32.dll		// Available only directly from ws2_32.dll
typedef		typedef
int		int
(WSPAPI * LPWPUCOMPLETEOVERLAPPEDREQUEST) (		(WSPAPI * LPWPUCOMPLETEOVERLAPPEDREQUEST) (

SOCKET s,		__in SOCKET s,
LPWSAOVERLAPPED lpOverlapped,		__inout LPWSAOVERLAPPED lpOverlapped,
DWORD dwError,		__in DWORD dwError,
DWORD cbTransferred,		__in DWORD cbTransferred,
LPINT lpErrno		__out LPINT lpErrno
);		);

/*		/*
* The upcall table. This structure is passed by value to the service		* The upcall table. This structure is passed by value to the service
* provider's WSPStartup() entrypoint.		* provider's WSPStartup() entrypoint.
*/		*/

typedef struct _WSPUPCALLTABLE {		typedef struct _WSPUPCALLTABLE {

LPWPUCLOSEEVENT lpWPUCloseEvent;		LPWPUCLOSEEVENT lpWPUCloseEvent;

skipping to change at line 621		skipping to change at line 624
LPWPUOPENCURRENTTHREAD lpWPUOpenCurrentThread;		LPWPUOPENCURRENTTHREAD lpWPUOpenCurrentThread;
LPWPUCLOSETHREAD lpWPUCloseThread;		LPWPUCLOSETHREAD lpWPUCloseThread;

} WSPUPCALLTABLE, FAR * LPWSPUPCALLTABLE;		} WSPUPCALLTABLE, FAR * LPWSPUPCALLTABLE;

/*		/*
* WinSock 2 SPI socket function prototypes		* WinSock 2 SPI socket function prototypes
*/		*/

__control_entrypoint(DllExport)		__control_entrypoint(DllExport)

		__checkReturn
int		int
WSPAPI		WSPAPI
WSPStartup(		WSPStartup(

IN WORD wVersionRequested,		__in WORD wVersionRequested,
__in OUT LPWSPDATA lpWSPData,		__in LPWSPDATA lpWSPData,
__in IN LPWSAPROTOCOL_INFOW lpProtocolInfo,		__in LPWSAPROTOCOL_INFOW lpProtocolInfo,
__in IN WSPUPCALLTABLE UpcallTable,		__in WSPUPCALLTABLE UpcallTable,
__inout OUT LPWSPPROC_TABLE lpProcTable		__out LPWSPPROC_TABLE lpProcTable
);		);

typedef		typedef

		__checkReturn
int		int
(WSPAPI * LPWSPSTARTUP)(		(WSPAPI * LPWSPSTARTUP)(

WORD wVersionRequested,		__in WORD wVersionRequested,
LPWSPDATA lpWSPData,		__in LPWSPDATA lpWSPData,
LPWSAPROTOCOL_INFOW lpProtocolInfo,		__in LPWSAPROTOCOL_INFOW lpProtocolInfo,
WSPUPCALLTABLE UpcallTable,		__in WSPUPCALLTABLE UpcallTable,
LPWSPPROC_TABLE lpProcTable		__out LPWSPPROC_TABLE lpProcTable
);		);

/*		/*
* Installation and configuration entrypoints.		* Installation and configuration entrypoints.
*/		*/

__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
int		int
WSPAPI		WSPAPI
WSCEnumProtocols(		WSCEnumProtocols(

IN LPINT lpiProtocols,		__in_opt LPINT lpiProtocols,
__out_bcount_opt(*lpdwBufferLength) LPWSAPROTOCOL_INFOW lpProtocolBuffer,		__out_bcount_part_opt(lpdwBufferLength, lpdwBufferLength) LPWSAPROTOCOL_IN
IN OUT LPDWORD lpdwBufferLength,		FOW lpProtocolBuffer,
OUT LPINT lpErrno		__inout LPDWORD lpdwBufferLength,
		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSCENUMPROTOCOLS)(		(WSPAPI * LPWSCENUMPROTOCOLS)(

LPINT lpiProtocols,		__in_opt LPINT lpiProtocols,
LPWSAPROTOCOL_INFOW lpProtocolBuffer,		__out_bcount_part_opt(lpdwBufferLength, lpdwBufferlength) LPWSAPROTOCOL_IN
LPDWORD lpdwBufferLength,		FOW lpProtocolBuffer,
LPINT lpErrno		__inout LPDWORD lpdwBufferLength,
		__out LPINT lpErrno
);		);

#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))		#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))

/*		/*
* 64-bit architectures capable of running 32-bit code have		* 64-bit architectures capable of running 32-bit code have
* separate 64-bit and 32-bit catalogs. API with '32' prefix		* separate 64-bit and 32-bit catalogs. API with '32' prefix
* allow 32 bit catalog manipulations by 64 bit process.		* allow 32 bit catalog manipulations by 64 bit process.
*/		*/
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
int		int
WSPAPI		WSPAPI
WSCEnumProtocols32(		WSCEnumProtocols32(

IN LPINT lpiProtocols,		__in_opt LPINT lpiProtocols,
__out_bcount(*lpdwBufferLength) LPWSAPROTOCOL_INFOW lpProtocolBuffer,		__out_bcount(*lpdwBufferLength) LPWSAPROTOCOL_INFOW lpProtocolBuffer,

IN OUT LPDWORD lpdwBufferLength,		__inout LPDWORD lpdwBufferLength,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);
#endif //(defined(_WIN64) && _WIN32_WINNT >= 0x0501)		#endif //(defined(_WIN64) && _WIN32_WINNT >= 0x0501)

__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
int		int
WSPAPI		WSPAPI
WSCDeinstallProvider(		WSCDeinstallProvider(

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSCDEINSTALLPROVIDER)(		(WSPAPI * LPWSCDEINSTALLPROVIDER)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
LPINT lpErrno		__out LPINT lpErrno
);		);

#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))		#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))

__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
int		int
WSPAPI		WSPAPI
WSCDeinstallProvider32(		WSCDeinstallProvider32(

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);
#endif //(defined(_WIN64) && _WIN32_WINNT >= 0x0501)		#endif //(defined(_WIN64) && _WIN32_WINNT >= 0x0501)

__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
int		int
WSPAPI		WSPAPI
WSCInstallProvider(		WSCInstallProvider(

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
IN const WCHAR FAR * lpszProviderDllPath,		__in_z const WCHAR FAR * lpszProviderDllPath,
__in_ecount(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList,		__in_ecount(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList,

IN DWORD dwNumberOfEntries,		__in DWORD dwNumberOfEntries,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSCINSTALLPROVIDER)(		(WSPAPI * LPWSCINSTALLPROVIDER)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
const WCHAR FAR * lpszProviderDllPath,		__in_z const WCHAR FAR * lpszProviderDllPath,
const LPWSAPROTOCOL_INFOW lpProtocolInfoList,		__in_ecount(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList,
DWORD dwNumberOfEntries,		__in DWORD dwNumberOfEntries,
LPINT lpErrno		__out LPINT lpErrno
);		);

#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))		#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))

/*		/*
* This API manipulates 64-bit and 32-bit catalogs simulteneously.		* This API manipulates 64-bit and 32-bit catalogs simulteneously.
* It is needed to guarantee the same catalog IDs for provider catalog		* It is needed to guarantee the same catalog IDs for provider catalog
* entries in both 64-bit and 32-bit catalogs.		* entries in both 64-bit and 32-bit catalogs.
*/		*/
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
int		int
WSPAPI		WSPAPI
WSCInstallProvider64_32(		WSCInstallProvider64_32(

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
IN const WCHAR FAR * lpszProviderDllPath,		__in_z const WCHAR FAR * lpszProviderDllPath,
__in_ecount(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList,		__in_ecount(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList,

IN DWORD dwNumberOfEntries,		__in DWORD dwNumberOfEntries,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);
#endif //(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))		#endif //(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))

__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
int		int
WSPAPI		WSPAPI
WSCGetProviderPath(		WSCGetProviderPath(

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
__out_ecount(lpProviderDllPathLen) WCHAR FAR lpszProviderDllPath,		__out_ecount_part(lpProviderDllPathLen, lpProviderDllPathLen) WCHAR FAR *
IN OUT LPINT lpProviderDllPathLen,		lpszProviderDllPath,
OUT LPINT lpErrno		__inout LPINT lpProviderDllPathLen,
		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSCGETPROVIDERPATH)(		(WSPAPI * LPWSCGETPROVIDERPATH)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
WCHAR FAR * lpszProviderDllPath,		__out_ecount_part(lpProviderDllPathLen, lpProviderDllPathLen) WCHAR FAR *
LPINT lpProviderDllPathLen,		lpszProviderDllPath,
LPINT lpErrno		__inout LPINT lpProviderDllPathLen,
		__out LPINT lpErrno
);		);

#if(_WIN32_WINNT >= 0x0501)		#if(_WIN32_WINNT >= 0x0501)
#if defined(_WIN64)		#if defined(_WIN64)
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
int		int
WSPAPI		WSPAPI
WSCGetProviderPath32(		WSCGetProviderPath32(

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
__out_ecount(lpProviderDllPathLen) WCHAR FAR lpszProviderDllPath,		__out_ecount_part(lpProviderDllPathLen, lpProviderDllPathLen) WCHAR FAR *
IN OUT LPINT lpProviderDllPathLen,		lpszProviderDllPath,
OUT LPINT lpErrno		__inout LPINT lpProviderDllPathLen,
		__out LPINT lpErrno
);		);
#endif		#endif

__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
int		int
WSPAPI		WSPAPI
WSCUpdateProvider(		WSCUpdateProvider(

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
IN const WCHAR FAR * lpszProviderDllPath,		__in_z const WCHAR FAR * lpszProviderDllPath,
__in_ecount(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList,		__in_ecount(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList,

IN DWORD dwNumberOfEntries,		__in DWORD dwNumberOfEntries,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);

typedef		typedef
int		int
(WSPAPI * LPWSCUPDATEPROVIDER)(		(WSPAPI * LPWSCUPDATEPROVIDER)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
const WCHAR FAR * lpszProviderDllPath,		__in_z const WCHAR FAR * lpszProviderDllPath,
const LPWSAPROTOCOL_INFOW lpProtocolInfoList,		__in_ecount(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList,
DWORD dwNumberOfEntries,		__in DWORD dwNumberOfEntries,
LPINT lpErrno		__out LPINT lpErrno
);		);

#if defined(_WIN64)		#if defined(_WIN64)
__control_entrypoint(DllExport)		__control_entrypoint(DllExport)
int		int
WSPAPI		WSPAPI
WSCUpdateProvider32(		WSCUpdateProvider32(

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
IN const WCHAR FAR * lpszProviderDllPath,		__in_z const WCHAR FAR * lpszProviderDllPath,
__in_ecount(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList,		__in_ecount(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList,

IN DWORD dwNumberOfEntries,		__in DWORD dwNumberOfEntries,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);
#endif		#endif
#endif //(_WIN32_WINNT >= 0x0501)		#endif //(_WIN32_WINNT >= 0x0501)

#if (_WIN32_WINNT < 0x0600)		#if (_WIN32_WINNT < 0x0600)
int		int
WSPAPI		WSPAPI
WSCInstallQOSTemplate (		WSCInstallQOSTemplate (

IN const LPGUID Guid,		__in const LPGUID Guid,
IN LPWSABUF QosName,		__in LPWSABUF QosName,
IN LPQOS Qos		__in LPQOS Qos
);		);

typedef		typedef
int		int
(WSPAPI * LPWSCINSTALLQOSTEMPLATE)(		(WSPAPI * LPWSCINSTALLQOSTEMPLATE)(

const LPGUID Guid,		__in const LPGUID Guid,
LPWSABUF QosName,		__in LPWSABUF QosName,
LPQOS Qos		__in LPQOS Qos
);		);

int		int
WSPAPI		WSPAPI
WSCRemoveQOSTemplate (		WSCRemoveQOSTemplate (

IN const LPGUID Guid,		__in const LPGUID Guid,
IN LPWSABUF QosName		__in LPWSABUF QosName
);		);

typedef		typedef
int		int
(WSPAPI * LPWSCREMOVEQOSTEMPLATE)(		(WSPAPI * LPWSCREMOVEQOSTEMPLATE)(

const LPGUID Guid,		__in const LPGUID Guid,
LPWSABUF QosName		__in LPWSABUF QosName
);		);

#endif //(_WIN32_WINNT < 0x0600)		#endif //(_WIN32_WINNT < 0x0600)

#if(_WIN32_WINNT >= 0x0600)		#if(_WIN32_WINNT >= 0x0600)

//		//
// LSP Categorization		// LSP Categorization
//		//


skipping to change at line 974		skipping to change at line 979
#endif //(_WIN32_WINNT >= 0x0600)		#endif //(_WIN32_WINNT >= 0x0600)

/*		/*
* The following upcall function prototypes are only used by WinSock 2 DLL and		* The following upcall function prototypes are only used by WinSock 2 DLL and
* should not be used by any service providers.		* should not be used by any service providers.
*/		*/

BOOL		BOOL
WSPAPI		WSPAPI
WPUCloseEvent(		WPUCloseEvent(

IN WSAEVENT hEvent,		__in WSAEVENT hEvent,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);

int		int
WSPAPI		WSPAPI
WPUCloseSocketHandle(		WPUCloseSocketHandle(

IN SOCKET s,		__in SOCKET s,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);

WSAEVENT		WSAEVENT
WSPAPI		WSPAPI
WPUCreateEvent(		WPUCreateEvent(

OUT LPINT lpErrno		__out LPINT lpErrno
);		);

SOCKET		SOCKET
WSPAPI		WSPAPI
WPUCreateSocketHandle(		WPUCreateSocketHandle(

IN DWORD dwCatalogEntryId,		__in DWORD dwCatalogEntryId,
IN DWORD_PTR dwContext,		__in DWORD_PTR dwContext,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);

__control_entrypoint(DispatchTable)		__control_entrypoint(DispatchTable)
int		int
WSPAPI		WSPAPI
WPUFDIsSet(		WPUFDIsSet(

IN SOCKET s,		__in SOCKET s,
IN fd_set FAR * fdset		__in fd_set FAR * fdset
);		);

int		int
WSPAPI		WSPAPI
WPUGetProviderPath(		WPUGetProviderPath(

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
__out_ecount(lpProviderDllPathLen) WCHAR FAR lpszProviderDllPath,		__out_ecount(lpProviderDllPathLen) WCHAR FAR lpszProviderDllPath,
__inout LPINT lpProviderDllPathLen,		__inout LPINT lpProviderDllPathLen,

OUT LPINT lpErrno		__out LPINT lpErrno
);		);

SOCKET		SOCKET
WSPAPI		WSPAPI
WPUModifyIFSHandle(		WPUModifyIFSHandle(

IN DWORD dwCatalogEntryId,		__in DWORD dwCatalogEntryId,
IN SOCKET ProposedHandle,		__in SOCKET ProposedHandle,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);

__control_entrypoint(DispatchTable)		__control_entrypoint(DispatchTable)
BOOL		BOOL
WSPAPI		WSPAPI
WPUPostMessage(		WPUPostMessage(

IN HWND hWnd,		__in HWND hWnd,
IN UINT Msg,		__in UINT Msg,
IN WPARAM wParam,		__in WPARAM wParam,
IN LPARAM lParam		__in LPARAM lParam
);		);

int		int
WSPAPI		WSPAPI
WPUQueryBlockingCallback(		WPUQueryBlockingCallback(

IN DWORD dwCatalogEntryId,		__in DWORD dwCatalogEntryId,
OUT LPBLOCKINGCALLBACK FAR * lplpfnCallback,		__out LPBLOCKINGCALLBACK FAR * lplpfnCallback,
OUT PDWORD_PTR lpdwContext,		__out PDWORD_PTR lpdwContext,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);

int		int
WSPAPI		WSPAPI
WPUQuerySocketHandleContext(		WPUQuerySocketHandleContext(

IN SOCKET s,		__in SOCKET s,
OUT PDWORD_PTR lpContext,		__out PDWORD_PTR lpContext,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);

__control_entrypoint(DispatchTable)		__control_entrypoint(DispatchTable)
int		int
WSPAPI		WSPAPI
WPUQueueApc(		WPUQueueApc(

IN LPWSATHREADID lpThreadId,		__in LPWSATHREADID lpThreadId,
IN LPWSAUSERAPC lpfnUserApc,		__in LPWSAUSERAPC lpfnUserApc,
IN DWORD_PTR dwContext,		__in DWORD_PTR dwContext,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);

BOOL		BOOL
WSPAPI		WSPAPI
WPUResetEvent(		WPUResetEvent(

IN WSAEVENT hEvent,		__in WSAEVENT hEvent,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);

BOOL		BOOL
WSPAPI		WSPAPI
WPUSetEvent(		WPUSetEvent(

IN WSAEVENT hEvent,		__in WSAEVENT hEvent,
OUT LPINT lpErrno		__out LPINT lpErrno
);		);

__control_entrypoint(DispatchTable)		__control_entrypoint(DispatchTable)
int		int
WSPAPI		WSPAPI
WPUCompleteOverlappedRequest (		WPUCompleteOverlappedRequest (

SOCKET s,		__in SOCKET s,
LPWSAOVERLAPPED lpOverlapped,		__inout LPWSAOVERLAPPED lpOverlapped,
DWORD dwError,		__in DWORD dwError,
DWORD cbTransferred,		__in DWORD cbTransferred,
LPINT lpErrno		__out LPINT lpErrno
);		);

#if(_WIN32_WINNT >= 0x0501)		#if(_WIN32_WINNT >= 0x0501)
__control_entrypoint(DispatchTable)		__control_entrypoint(DispatchTable)
int		int
WSPAPI		WSPAPI
WPUOpenCurrentThread(		WPUOpenCurrentThread(

LPWSATHREADID lpThreadId,		__out LPWSATHREADID lpThreadId,
LPINT lpErrno		__out LPINT lpErrno
);		);

__control_entrypoint(DispatchTable)		__control_entrypoint(DispatchTable)
int		int
WSPAPI		WSPAPI
WPUCloseThread(		WPUCloseThread(

LPWSATHREADID lpThreadId,		__in LPWSATHREADID lpThreadId,
LPINT lpErrno		__out LPINT lpErrno
);		);
#endif //(_WIN32_WINNT >= 0x0501)		#endif //(_WIN32_WINNT >= 0x0501)

/*		/*
* Installing and uninstalling name space providers.		* Installing and uninstalling name space providers.
*/		*/

#if(_WIN32_WINNT >= 0x0501)		#if(_WIN32_WINNT >= 0x0501)
/*		/*
* SPI and API for enumerating name space providers are		* SPI and API for enumerating name space providers are

skipping to change at line 1146		skipping to change at line 1151
__out_bcount(*lpdwBufferLength) LPWSANAMESPACE_INFOEXW lpnspBuffer		__out_bcount(*lpdwBufferLength) LPWSANAMESPACE_INFOEXW lpnspBuffer
);		);
#endif //(_WIN64)		#endif //(_WIN64)
#endif //(_WIN32_WINNT >= 0x0600)		#endif //(_WIN32_WINNT >= 0x0600)

INT		INT
WSPAPI		WSPAPI
WSCInstallNameSpace (		WSCInstallNameSpace (
__in LPWSTR lpszIdentifier,		__in LPWSTR lpszIdentifier,
__in LPWSTR lpszPathName,		__in LPWSTR lpszPathName,

IN DWORD dwNameSpace,		__in DWORD dwNameSpace,
IN DWORD dwVersion,		__in DWORD dwVersion,
__in IN LPGUID lpProviderId		__in LPGUID lpProviderId
);		);

typedef		typedef
INT		INT
(WSPAPI * LPWSCINSTALLNAMESPACE)(		(WSPAPI * LPWSCINSTALLNAMESPACE)(

LPWSTR lpszIdentifier,		__in LPWSTR lpszIdentifier,
LPWSTR lpszPathName,		__in LPWSTR lpszPathName,
DWORD dwNameSpace,		__in DWORD dwNameSpace,
DWORD dwVersion,		__in DWORD dwVersion,
LPGUID lpProviderId		__in LPGUID lpProviderId
);		);

#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))		#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))
INT		INT
WSPAPI		WSPAPI
WSCInstallNameSpace32 (		WSCInstallNameSpace32 (
__in LPWSTR lpszIdentifier,		__in LPWSTR lpszIdentifier,
__in LPWSTR lpszPathName,		__in LPWSTR lpszPathName,

IN DWORD dwNameSpace,		__in DWORD dwNameSpace,
IN DWORD dwVersion,		__in DWORD dwVersion,
IN LPGUID lpProviderId		__in LPGUID lpProviderId
);		);
#endif //(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))		#endif //(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))

INT		INT
WSPAPI		WSPAPI
WSCUnInstallNameSpace (		WSCUnInstallNameSpace (

IN LPGUID lpProviderId		__in LPGUID lpProviderId
);		);

typedef		typedef
INT		INT
(WSPAPI * LPWSCUNINSTALLNAMESPACE)(		(WSPAPI * LPWSCUNINSTALLNAMESPACE)(

LPGUID lpProviderId		__in LPGUID lpProviderId
);		);

#if (_WIN32_WINNT >= 0x0600 )		#if (_WIN32_WINNT >= 0x0600 )
INT		INT
WSPAPI		WSPAPI
WSCInstallNameSpaceEx(		WSCInstallNameSpaceEx(
__in LPWSTR lpszIdentifier,		__in LPWSTR lpszIdentifier,
__in LPWSTR lpszPathName,		__in LPWSTR lpszPathName,

IN DWORD dwNameSpace,		__in DWORD dwNameSpace,
IN DWORD dwVersion,		__in DWORD dwVersion,
__in LPGUID lpProviderId,		__in LPGUID lpProviderId,
__in LPBLOB lpProviderSpecific		__in LPBLOB lpProviderSpecific
);		);
#endif //(defined(_WIN32_WINNT >= 0x0600)		#endif //(defined(_WIN32_WINNT >= 0x0600)

#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0600))		#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0600))
INT		INT
WSPAPI		WSPAPI
WSCInstallNameSpaceEx32(		WSCInstallNameSpaceEx32(
__in LPWSTR lpszIdentifier,		__in LPWSTR lpszIdentifier,
__in LPWSTR lpszPathName,		__in LPWSTR lpszPathName,

IN DWORD dwNameSpace,		__in DWORD dwNameSpace,
IN DWORD dwVersion,		__in DWORD dwVersion,
IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
IN LPBLOB lpProviderSpecific		__in LPBLOB lpProviderSpecific
);		);
#endif //(defined(_WIN64) && (_WIN32_WINNT >= 0x0600))		#endif //(defined(_WIN64) && (_WIN32_WINNT >= 0x0600))

#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))		#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))
INT		INT
WSPAPI		WSPAPI
WSCUnInstallNameSpace32 (		WSCUnInstallNameSpace32 (

IN LPGUID lpProviderId		__in LPGUID lpProviderId
);		);
#endif //(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))		#endif //(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))

INT		INT
WSPAPI		WSPAPI
WSCEnableNSProvider (		WSCEnableNSProvider (

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
IN BOOL fEnable		__in BOOL fEnable
);		);

typedef		typedef
INT		INT
(WSPAPI * LPWSCENABLENSPROVIDER)(		(WSPAPI * LPWSCENABLENSPROVIDER)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
BOOL fEnable		__in BOOL fEnable
);		);

#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))		#if(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))
INT		INT
WSPAPI		WSPAPI
WSCEnableNSProvider32 (		WSCEnableNSProvider32 (

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
IN BOOL fEnable		__in BOOL fEnable
);		);
#endif //(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))		#endif //(defined(_WIN64) && (_WIN32_WINNT >= 0x0501))

#if (_WIN32_WINNT >= 0x0600)		#if (_WIN32_WINNT >= 0x0600)

#if defined(_WIN64)		#if defined(_WIN64)
int WSPAPI WSCInstallProviderAndChains64_32(		int WSPAPI WSCInstallProviderAndChains64_32(
#else		#else
int WSPAPI WSCInstallProviderAndChains(		int WSPAPI WSCInstallProviderAndChains(
#endif		#endif

IN LPGUID lpProviderId,		__in LPGUID lpProviderId,
__in const LPWSTR lpszProviderDllPath,		__in const LPWSTR lpszProviderDllPath,
#if defined(_WIN64)		#if defined(_WIN64)
__in const LPWSTR lpszProviderDllPath32,		__in const LPWSTR lpszProviderDllPath32,
#endif		#endif
__in const LPWSTR lpszLspName,		__in const LPWSTR lpszLspName,

IN DWORD dwServiceFlags,		__in DWORD dwServiceFlags,
__inout_ecount(dwNumberOfEntries) LPWSAPROTOCOL_INFOW lpProtocolInfoList,		__inout_ecount(dwNumberOfEntries) LPWSAPROTOCOL_INFOW lpProtocolInfoList,

IN DWORD dwNumberOfEntries,		__in DWORD dwNumberOfEntries,
OUT LPDWORD lpdwCatalogEntryId OPTIONAL,		__out_opt LPDWORD lpdwCatalogEntryId,
OUT LPINT lpErrno);		__out LPINT lpErrno);

#endif //(_WIN32_WINNT >= 0x0600)		#endif //(_WIN32_WINNT >= 0x0600)

/*		/*
* Pointers to the individual entries in the namespace proc table.		* Pointers to the individual entries in the namespace proc table.
*/		*/

typedef		typedef
INT		INT
(WSAAPI * LPNSPCLEANUP)(		(WSAAPI * LPNSPCLEANUP)(

LPGUID lpProviderId		__in LPGUID lpProviderId
);		);

typedef		typedef
INT		INT
(WSAAPI * LPNSPLOOKUPSERVICEBEGIN)(		(WSAAPI * LPNSPLOOKUPSERVICEBEGIN)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
LPWSAQUERYSETW lpqsRestrictions,		__in LPWSAQUERYSETW lpqsRestrictions,
LPWSASERVICECLASSINFOW lpServiceClassInfo,		__in LPWSASERVICECLASSINFOW lpServiceClassInfo,
DWORD dwControlFlags,		__in DWORD dwControlFlags,
LPHANDLE lphLookup		__out LPHANDLE lphLookup
);		);

typedef		typedef
INT		INT
(WSAAPI * LPNSPLOOKUPSERVICENEXT)(		(WSAAPI * LPNSPLOOKUPSERVICENEXT)(

HANDLE hLookup,		__in HANDLE hLookup,
DWORD dwControlFlags,		__in DWORD dwControlFlags,
LPDWORD lpdwBufferLength,		__inout LPDWORD lpdwBufferLength,
LPWSAQUERYSETW lpqsResults		__out_bcount_part(lpdwBufferLength, lpdwBufferlength) LPWSAQUERYSETW lpqsR
		esults
);		);

#if(_WIN32_WINNT >= 0x0501)		#if(_WIN32_WINNT >= 0x0501)
typedef		typedef
INT		INT
(WSAAPI * LPNSPIOCTL)(		(WSAAPI * LPNSPIOCTL)(

HANDLE hLookup,		__in HANDLE hLookup,
DWORD dwControlCode,		__in DWORD dwControlCode,
LPVOID lpvInBuffer,		__in_bcount(cbInBuffer) LPVOID lpvInBuffer,
DWORD cbInBuffer,		__in DWORD cbInBuffer,
LPVOID lpvOutBuffer,		__out_bcount_part(cbOutBuffer, *lpcbBytesreturned) LPVOID lpvOutBuf
DWORD cbOutBuffer,		fer,
LPDWORD lpcbBytesReturned,		__in DWORD cbOutBuffer,
LPWSACOMPLETION lpCompletion,		__out LPDWORD lpcbBytesReturned,
LPWSATHREADID lpThreadId		__in_opt LPWSACOMPLETION lpCompletion,
		__in LPWSATHREADID lpThreadId
);		);
#endif //(_WIN32_WINNT >= 0x0501)		#endif //(_WIN32_WINNT >= 0x0501)

typedef		typedef
INT		INT
(WSAAPI * LPNSPLOOKUPSERVICEEND)(		(WSAAPI * LPNSPLOOKUPSERVICEEND)(

HANDLE hLookup		__in HANDLE hLookup
);		);

typedef		typedef
INT		INT
(WSAAPI * LPNSPSETSERVICE)(		(WSAAPI * LPNSPSETSERVICE)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
LPWSASERVICECLASSINFOW lpServiceClassInfo,		__in LPWSASERVICECLASSINFOW lpServiceClassInfo,
LPWSAQUERYSETW lpqsRegInfo,		__in LPWSAQUERYSETW lpqsRegInfo,
WSAESETSERVICEOP essOperation,		__in WSAESETSERVICEOP essOperation,
DWORD dwControlFlags		__in DWORD dwControlFlags
);		);

typedef		typedef
INT		INT
(WSAAPI * LPNSPINSTALLSERVICECLASS)(		(WSAAPI * LPNSPINSTALLSERVICECLASS)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
LPWSASERVICECLASSINFOW lpServiceClassInfo		__in LPWSASERVICECLASSINFOW lpServiceClassInfo
);		);

typedef		typedef
INT		INT
(WSAAPI * LPNSPREMOVESERVICECLASS)(		(WSAAPI * LPNSPREMOVESERVICECLASS)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
LPGUID lpServiceClassId		__in LPGUID lpServiceClassId
);		);

typedef		typedef
INT		INT
(WSAAPI * LPNSPGETSERVICECLASSINFO)(		(WSAAPI * LPNSPGETSERVICECLASSINFO)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
LPDWORD lpdwBufSize,		__in LPDWORD lpdwBufSize,
LPWSASERVICECLASSINFOW lpServiceClassInfo		__in LPWSASERVICECLASSINFOW lpServiceClassInfo
);		);

/*		/*
* The name space service provider procedure table.		* The name space service provider procedure table.
*/		*/

typedef struct _NSP_ROUTINE {		typedef struct _NSP_ROUTINE {

/* Structure version information: */		/* Structure version information: */
DWORD cbSize;		DWORD cbSize;

skipping to change at line 1382		skipping to change at line 1387
// to match the size of FIELD_OFFSET(NSP_ROUTINE, NSPIoctl).		// to match the size of FIELD_OFFSET(NSP_ROUTINE, NSPIoctl).
LPNSPIOCTL NSPIoctl;		LPNSPIOCTL NSPIoctl;
#endif //(_WIN32_WINNT >= 0x0501)		#endif //(_WIN32_WINNT >= 0x0501)

} NSP_ROUTINE, FAR * LPNSP_ROUTINE;		} NSP_ROUTINE, FAR * LPNSP_ROUTINE;

/*		/*
* Startup procedures.		* Startup procedures.
*/		*/


		__checkReturn
INT		INT
WSAAPI		WSAAPI
NSPStartup(		NSPStartup(
__in LPGUID lpProviderId,		__in LPGUID lpProviderId,
__inout LPNSP_ROUTINE lpnspRoutines		__inout LPNSP_ROUTINE lpnspRoutines
);		);

typedef		typedef

		__checkReturn
INT		INT
(WSAAPI * LPNSPSTARTUP)(		(WSAAPI * LPNSPSTARTUP)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
LPNSP_ROUTINE lpnspRoutines		__inout LPNSP_ROUTINE lpnspRoutines
);		);

typedef		typedef

		__checkReturn
INT		INT
(WSAAPI * LPNSPV2STARTUP)(		(WSAAPI * LPNSPV2STARTUP)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
LPVOID * ppvClientSessionArg		__deref_out LPVOID * ppvClientSessionArg
);		);

typedef		typedef
INT		INT
(WSAAPI * LPNSPV2CLEANUP)(		(WSAAPI * LPNSPV2CLEANUP)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
LPVOID pvClientSessionArg		__in LPVOID pvClientSessionArg
);		);

typedef		typedef
INT		INT
(WSAAPI * LPNSPV2LOOKUPSERVICEBEGIN)(		(WSAAPI * LPNSPV2LOOKUPSERVICEBEGIN)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
LPWSAQUERYSET2W lpqsRestrictions,		__in LPWSAQUERYSET2W lpqsRestrictions,
DWORD dwControlFlags,		__in DWORD dwControlFlags,
LPVOID lpvClientSessionArg,		__in LPVOID lpvClientSessionArg,
LPHANDLE lphLookup		__out LPHANDLE lphLookup
);		);

typedef		typedef
VOID		VOID
(WSAAPI * LPNSPV2LOOKUPSERVICENEXTEX)(		(WSAAPI * LPNSPV2LOOKUPSERVICENEXTEX)(

HANDLE hAsyncCall,		__in HANDLE hAsyncCall,
HANDLE hLookup,		__in HANDLE hLookup,
DWORD dwControlFlags,		__in DWORD dwControlFlags,
LPDWORD lpdwBufferLength,		__in LPDWORD lpdwBufferLength,
LPWSAQUERYSET2W lpqsResults		__out LPWSAQUERYSET2W lpqsResults
);		);

typedef		typedef
INT		INT
(WSAAPI * LPNSPV2LOOKUPSERVICEEND)(		(WSAAPI * LPNSPV2LOOKUPSERVICEEND)(

HANDLE hLookup		__in HANDLE hLookup
);		);

typedef		typedef
VOID		VOID
(WSAAPI * LPNSPV2SETSERVICEEX)(		(WSAAPI * LPNSPV2SETSERVICEEX)(

HANDLE hAsyncCall,		__in HANDLE hAsyncCall,
LPGUID lpProviderId,		__in LPGUID lpProviderId,
LPWSAQUERYSET2W lpqsRegInfo,		__in LPWSAQUERYSET2W lpqsRegInfo,
WSAESETSERVICEOP essOperation,		__in WSAESETSERVICEOP essOperation,
DWORD dwControlFlags,		__in DWORD dwControlFlags,
LPVOID lpvClientSessionArg		__in LPVOID lpvClientSessionArg
);		);

typedef		typedef
VOID		VOID
(WSAAPI * LPNSPV2CLIENTSESSIONRUNDOWN)(		(WSAAPI * LPNSPV2CLIENTSESSIONRUNDOWN)(

LPGUID lpProviderId,		__in LPGUID lpProviderId,
LPVOID pvClientSessionArg		__in LPVOID pvClientSessionArg
);		);

typedef struct _NSPV2_ROUTINE {		typedef struct _NSPV2_ROUTINE {
DWORD cbSize;		DWORD cbSize;
DWORD dwMajorVersion;		DWORD dwMajorVersion;
DWORD dwMinorVersion;		DWORD dwMinorVersion;
LPNSPV2STARTUP NSPv2Startup;		LPNSPV2STARTUP NSPv2Startup;
LPNSPV2CLEANUP NSPv2Cleanup;		LPNSPV2CLEANUP NSPv2Cleanup;
LPNSPV2LOOKUPSERVICEBEGIN NSPv2LookupServiceBegin;		LPNSPV2LOOKUPSERVICEBEGIN NSPv2LookupServiceBegin;
LPNSPV2LOOKUPSERVICENEXTEX NSPv2LookupServiceNextEx;		LPNSPV2LOOKUPSERVICENEXTEX NSPv2LookupServiceNextEx;

End of changes. 128 change blocks.
417 lines changed or deleted		433 lines changed or added

ws2tcpip.h (6.0.6002.18005-Windows 6.0)		ws2tcpip.h (6.1.7601.17514-Windows 7.0)

skipping to change at line 43		skipping to change at line 43
#define UDP_CHECKSUM_COVERAGE 20 /* Set/get UDP-Lite checksum coverage */		#define UDP_CHECKSUM_COVERAGE 20 /* Set/get UDP-Lite checksum coverage */

#ifdef _MSC_VER		#ifdef _MSC_VER
#define WS2TCPIP_INLINE __inline		#define WS2TCPIP_INLINE __inline
#else		#else
#define WS2TCPIP_INLINE extern inline /* GNU style */		#define WS2TCPIP_INLINE extern inline /* GNU style */
#endif		#endif

/* Error codes from getaddrinfo() */		/* Error codes from getaddrinfo() */


#define EAI_AGAIN WSATRY_AGAIN		#define EAI_AGAIN WSATRY_AGAIN
#define EAI_BADFLAGS WSAEINVAL		#define EAI_BADFLAGS WSAEINVAL
#define EAI_FAIL WSANO_RECOVERY		#define EAI_FAIL WSANO_RECOVERY
#define EAI_FAMILY WSAEAFNOSUPPORT		#define EAI_FAMILY WSAEAFNOSUPPORT
#define EAI_MEMORY WSA_NOT_ENOUGH_MEMORY		#define EAI_MEMORY WSA_NOT_ENOUGH_MEMORY
//#define EAI_NODATA WSANO_DATA		#define EAI_NOSECURENAME WSA_SECURE_HOST_NOT_FOUND
#define EAI_NONAME WSAHOST_NOT_FOUND		//#define EAI_NODATA WSANO_DATA
#define EAI_SERVICE WSATYPE_NOT_FOUND		#define EAI_NONAME WSAHOST_NOT_FOUND
#define EAI_SOCKTYPE WSAESOCKTNOSUPPORT		#define EAI_SERVICE WSATYPE_NOT_FOUND
		#define EAI_SOCKTYPE WSAESOCKTNOSUPPORT
		#define EAI_IPSECPOLICY WSA_IPSEC_NAME_POLICY_ERROR
//		//
// DCR_FIX: EAI_NODATA remove or fix		// DCR_FIX: EAI_NODATA remove or fix
//		//
// EAI_NODATA was removed from rfc2553bis		// EAI_NODATA was removed from rfc2553bis
// need to find out from the authors why and		// need to find out from the authors why and
// determine the error for "no records of this type"		// determine the error for "no records of this type"
// temporarily, we'll keep #define to avoid changing		// temporarily, we'll keep #define to avoid changing
// code that could change back; use NONAME		// code that could change back; use NONAME
//		//

#define EAI_NODATA EAI_NONAME		#define EAI_NODATA EAI_NONAME


/* Structure used in getaddrinfo() call */

typedef struct addrinfo
{
int ai_flags; // AI_PASSIVE, AI_CANONNAME, AI_NUMERICH
OST
int ai_family; // PF_xxx
int ai_socktype; // SOCK_xxx
int ai_protocol; // 0 or IPPROTO_xxx for IPv4 and IPv6
size_t ai_addrlen; // Length of ai_addr
char * ai_canonname; // Canonical name for nodename
__field_bcount(ai_addrlen) struct sockaddr * ai_addr; // Binary add
ress
struct addrinfo * ai_next; // Next structure in linked list
}
ADDRINFOA, *PADDRINFOA;

typedef struct addrinfoW
{
int ai_flags; // AI_PASSIVE, AI_CANONNAME, AI_NUMERICH
OST
int ai_family; // PF_xxx
int ai_socktype; // SOCK_xxx
int ai_protocol; // 0 or IPPROTO_xxx for IPv4 and IPv6
size_t ai_addrlen; // Length of ai_addr
PWSTR ai_canonname; // Canonical name for nodename
__field_bcount(ai_addrlen) struct sockaddr * ai_addr; // Binary add
ress
struct addrinfoW * ai_next; // Next structure in linked list
}
ADDRINFOW, *PADDRINFOW;

// Switchable definition for GetAddrInfo()		// Switchable definition for GetAddrInfo()

#ifdef UNICODE		#ifdef UNICODE
typedef ADDRINFOW ADDRINFOT, *PADDRINFOT;		typedef ADDRINFOW ADDRINFOT, *PADDRINFOT;
#else		#else
typedef ADDRINFOA ADDRINFOT, *PADDRINFOT;		typedef ADDRINFOA ADDRINFOT, *PADDRINFOT;
#endif		#endif

// RFC standard definition for getaddrinfo()		// RFC standard definition for getaddrinfo()

typedef ADDRINFOA ADDRINFO, FAR * LPADDRINFO;		typedef ADDRINFOA ADDRINFO, FAR * LPADDRINFO;

#if (_WIN32_WINNT >= 0x0600)		#if (_WIN32_WINNT >= 0x0600)


typedef struct addrinfoexA
{
int ai_flags; // AI_PASSIVE, AI_CANONNAME, AI_NUMERICH
OST
int ai_family; // PF_xxx
int ai_socktype; // SOCK_xxx
int ai_protocol; // 0 or IPPROTO_xxx for IPv4 and IPv6
size_t ai_addrlen; // Length of ai_addr
char *ai_canonname; // Canonical name for nodename
struct sockaddr *ai_addr; // Binary address
void *ai_blob;
size_t ai_bloblen;
LPGUID ai_provider;
struct addrinfoexA *ai_next; // Next structure in linked list
} ADDRINFOEXA, PADDRINFOEXA, LPADDRINFOEXA;

typedef struct addrinfoexW
{
int ai_flags; // AI_PASSIVE, AI_CANONNAME, AI_NUMERICH
OST
int ai_family; // PF_xxx
int ai_socktype; // SOCK_xxx
int ai_protocol; // 0 or IPPROTO_xxx for IPv4 and IPv6
size_t ai_addrlen; // Length of ai_addr
PWSTR ai_canonname; // Canonical name for nodename
__field_bcount(ai_addrlen) struct sockaddr *ai_addr; // Binary add
ress
__field_ecount(ai_bloblen) void *ai_blob;
size_t ai_bloblen;
LPGUID ai_provider;
struct addrinfoexW *ai_next; // Next structure in linked list
} ADDRINFOEXW, PADDRINFOEXW, LPADDRINFOEXW;

#ifdef UNICODE		#ifdef UNICODE
typedef ADDRINFOEXW ADDRINFOEX, *PADDRINFOEX;		typedef ADDRINFOEXW ADDRINFOEX, *PADDRINFOEX;
#else		#else
typedef ADDRINFOEXA ADDRINFOEX, *PADDRINFOEX;		typedef ADDRINFOEXA ADDRINFOEX, *PADDRINFOEX;
#endif		#endif

#endif		#endif


//
// Flags used in "hints" argument to getaddrinfo()
// - AI_ADDRCONFIG is supported starting with Vista
// - default is AI_ADDRCONFIG ON whether the flag is set or not
// because the performance penalty in not having ADDRCONFIG in
// the multi-protocol stack environment is severe;
// this defaulting may be disabled by specifying the AI_ALL flag,
// in that case AI_ADDRCONFIG must be EXPLICITLY specified to
// enable ADDRCONFIG behavior
//

#define AI_PASSIVE 0x00000001 // Socket address will be used in bind() cal
l
#define AI_CANONNAME 0x00000002 // Return canonical name in first ai_canonna
me
#define AI_NUMERICHOST 0x00000004 // Nodename must be a numeric address string
#define AI_NUMERICSERV 0x00000008 // Servicename must be a numeric port number

#define AI_ALL 0x00000100 // Query both IP6 and IP4 with AI_V4MAPPED
#define AI_ADDRCONFIG 0x00000400 // Resolution only if global address configu
red
#define AI_V4MAPPED 0x00000800 // On v6 failure, query v4 and convert to V4
MAPPED format

#define AI_NON_AUTHORITATIVE LUP_NON_AUTHORITATIVE // 0x4000
#define AI_SECURE LUP_SECURE // 0x8000
#define AI_RETURN_PREFERRED_NAMES LUP_RETURN_PREFERRED_NAMES // 0x10000

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

WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
getaddrinfo(		getaddrinfo(
__in_opt PCSTR pNodeName,		__in_opt PCSTR pNodeName,
__in_opt PCSTR pServiceName,		__in_opt PCSTR pServiceName,
__in_opt const ADDRINFOA * pHints,		__in_opt const ADDRINFOA * pHints,
__deref_out PADDRINFOA * ppResult		__deref_out PADDRINFOA * ppResult
);		);


#if (_WIN32_WINNT >= 0x0502)		#if (NTDDI_VERSION >= NTDDI_WINXPSP2) \|\| (_WIN32_WINNT >= 0x0502)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
GetAddrInfoW(		GetAddrInfoW(
__in_opt PCWSTR pNodeName,		__in_opt PCWSTR pNodeName,
__in_opt PCWSTR pServiceName,		__in_opt PCWSTR pServiceName,
__in_opt const ADDRINFOW * pHints,		__in_opt const ADDRINFOW * pHints,
__deref_out PADDRINFOW * ppResult		__deref_out PADDRINFOW * ppResult
);		);


skipping to change at line 236		skipping to change at line 155
#else		#else
#define LPFN_GETADDRINFOT LPFN_GETADDRINFOA		#define LPFN_GETADDRINFOT LPFN_GETADDRINFOA
#endif		#endif
#endif		#endif

#if (_WIN32_WINNT >= 0x0600)		#if (_WIN32_WINNT >= 0x0600)

typedef		typedef
void		void
(CALLBACK * LPLOOKUPSERVICE_COMPLETION_ROUTINE)(		(CALLBACK * LPLOOKUPSERVICE_COMPLETION_ROUTINE)(

IN DWORD dwError,		__in DWORD dwError,
IN DWORD dwBytes,		__in DWORD dwBytes,
__in LPWSAOVERLAPPED lpOverlapped		__in LPWSAOVERLAPPED lpOverlapped
);		);

WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
GetAddrInfoExA(		GetAddrInfoExA(
__in_opt PCSTR pName,		__in_opt PCSTR pName,
__in_opt PCSTR pServiceName,		__in_opt PCSTR pServiceName,
__in DWORD dwNameSpace,		__in DWORD dwNameSpace,
__in_opt LPGUID lpNspId,		__in_opt LPGUID lpNspId,

skipping to change at line 415		skipping to change at line 334

#endif		#endif

WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
VOID		VOID
WSAAPI		WSAAPI
freeaddrinfo(		freeaddrinfo(
__in_opt PADDRINFOA pAddrInfo		__in_opt PADDRINFOA pAddrInfo
);		);


#if (_WIN32_WINNT >= 0x0502)		#if (NTDDI_VERSION >= NTDDI_WINXPSP2) \|\| (_WIN32_WINNT >= 0x0502)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
VOID		VOID
WSAAPI		WSAAPI
FreeAddrInfoW(		FreeAddrInfoW(
__in_opt PADDRINFOW pAddrInfo		__in_opt PADDRINFOW pAddrInfo
);		);

#define FreeAddrInfoA freeaddrinfo		#define FreeAddrInfoA freeaddrinfo

#ifdef UNICODE		#ifdef UNICODE

skipping to change at line 512		skipping to change at line 431
getnameinfo(		getnameinfo(
__in_bcount(SockaddrLength) const SOCKADDR * pSockaddr,		__in_bcount(SockaddrLength) const SOCKADDR * pSockaddr,
__in socklen_t SockaddrLength,		__in socklen_t SockaddrLength,
__out_ecount_opt(NodeBufferSize) PCHAR pNodeBuffer,		__out_ecount_opt(NodeBufferSize) PCHAR pNodeBuffer,
__in DWORD NodeBufferSize,		__in DWORD NodeBufferSize,
__out_ecount_opt(ServiceBufferSize) PCHAR pServiceBuffer,		__out_ecount_opt(ServiceBufferSize) PCHAR pServiceBuffer,
__in DWORD ServiceBufferSize,		__in DWORD ServiceBufferSize,
__in INT Flags		__in INT Flags
);		);


#if (_WIN32_WINNT >= 0x0502)		#if (NTDDI_VERSION >= NTDDI_WINXPSP2) \|\| (_WIN32_WINNT >= 0x0502)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
GetNameInfoW(		GetNameInfoW(
__in_bcount(SockaddrLength) const SOCKADDR * pSockaddr,		__in_bcount(SockaddrLength) const SOCKADDR * pSockaddr,
__in socklen_t SockaddrLength,		__in socklen_t SockaddrLength,
__out_ecount_opt(NodeBufferSize) PWCHAR pNodeBuffer,		__out_ecount_opt(NodeBufferSize) PWCHAR pNodeBuffer,
__in DWORD NodeBufferSize,		__in DWORD NodeBufferSize,
__out_ecount_opt(ServiceBufferSize) PWCHAR pServiceBuffer,		__out_ecount_opt(ServiceBufferSize) PWCHAR pServiceBuffer,
__in DWORD ServiceBufferSize,		__in DWORD ServiceBufferSize,

skipping to change at line 569		skipping to change at line 488

#define LPFN_GETNAMEINFOA LPFN_GETNAMEINFO		#define LPFN_GETNAMEINFOA LPFN_GETNAMEINFO

#ifdef UNICODE		#ifdef UNICODE
#define LPFN_GETNAMEINFOT LPFN_GETNAMEINFOW		#define LPFN_GETNAMEINFOT LPFN_GETNAMEINFOW
#else		#else
#define LPFN_GETNAMEINFOT LPFN_GETNAMEINFOA		#define LPFN_GETNAMEINFOT LPFN_GETNAMEINFOA
#endif		#endif
#endif		#endif


#if (NTDDI_VERSION >= NTDDI_LONGHORN)		#if (NTDDI_VERSION >= NTDDI_VISTA)
WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI
inet_pton(		inet_pton(
__in INT Family,		__in INT Family,
__in PCSTR pszAddrString,		__in PCSTR pszAddrString,
__out_bcount(sizeof(IN6_ADDR)) PVOID pAddrBuf		__out_bcount(sizeof(IN6_ADDR)) PVOID pAddrBuf
);		);

INT		INT

skipping to change at line 660		skipping to change at line 579

#ifdef UNICODE		#ifdef UNICODE
#define LPFN_INET_PTON LPFN_INET_PTONW		#define LPFN_INET_PTON LPFN_INET_PTONW
#define LPFN_INET_NTOP LPFN_INET_NTOPW		#define LPFN_INET_NTOP LPFN_INET_NTOPW
#else		#else
#define LPFN_INET_PTON LPFN_INET_PTONA		#define LPFN_INET_PTON LPFN_INET_PTONA
#define LPFN_INET_NTOP LPFN_INET_NTOPA		#define LPFN_INET_NTOP LPFN_INET_NTOPA
#endif		#endif

#endif // TYPEDEFS		#endif // TYPEDEFS

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

#if INCL_WINSOCK_API_PROTOTYPES		#if INCL_WINSOCK_API_PROTOTYPES
#ifdef UNICODE		#ifdef UNICODE
#define gai_strerror gai_strerrorW		#define gai_strerror gai_strerrorW
#else		#else
#define gai_strerror gai_strerrorA		#define gai_strerror gai_strerrorA
#endif /* UNICODE */		#endif /* UNICODE */

// WARNING: The gai_strerror inline functions below use static buffers,		// WARNING: The gai_strerror inline functions below use static buffers,
// and hence are not thread-safe. We'll use buffers long enough to hold		// and hence are not thread-safe. We'll use buffers long enough to hold
// 1k characters. Any system error messages longer than this will be		// 1k characters. Any system error messages longer than this will be
// returned as empty strings. However 1k should work for the error codes		// returned as empty strings. However 1k should work for the error codes
// used by getaddrinfo().		// used by getaddrinfo().
#define GAI_STRERROR_BUFFER_SIZE 1024		#define GAI_STRERROR_BUFFER_SIZE 1024

WS2TCPIP_INLINE		WS2TCPIP_INLINE
char *		char *
gai_strerrorA(		gai_strerrorA(

IN int ecode)		__in int ecode)
{		{
DWORD dwMsgLen;		DWORD dwMsgLen;
static char buff[GAI_STRERROR_BUFFER_SIZE + 1];		static char buff[GAI_STRERROR_BUFFER_SIZE + 1];

dwMsgLen = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM		dwMsgLen = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM
\|FORMAT_MESSAGE_IGNORE_INSERTS		\|FORMAT_MESSAGE_IGNORE_INSERTS
\|FORMAT_MESSAGE_MAX_WIDTH_MASK,		\|FORMAT_MESSAGE_MAX_WIDTH_MASK,
NULL,		NULL,
ecode,		ecode,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPSTR)buff,		(LPSTR)buff,
GAI_STRERROR_BUFFER_SIZE,		GAI_STRERROR_BUFFER_SIZE,
NULL);		NULL);

return buff;		return buff;
}		}

WS2TCPIP_INLINE		WS2TCPIP_INLINE
WCHAR *		WCHAR *
gai_strerrorW(		gai_strerrorW(

IN int ecode		__in int ecode
)		)
{		{
DWORD dwMsgLen;		DWORD dwMsgLen;
static WCHAR buff[GAI_STRERROR_BUFFER_SIZE + 1];		static WCHAR buff[GAI_STRERROR_BUFFER_SIZE + 1];

dwMsgLen = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM		dwMsgLen = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM
\|FORMAT_MESSAGE_IGNORE_INSERTS		\|FORMAT_MESSAGE_IGNORE_INSERTS
\|FORMAT_MESSAGE_MAX_WIDTH_MASK,		\|FORMAT_MESSAGE_MAX_WIDTH_MASK,
NULL,		NULL,
ecode,		ecode,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPWSTR)buff,		(LPWSTR)buff,
GAI_STRERROR_BUFFER_SIZE,		GAI_STRERROR_BUFFER_SIZE,
NULL);		NULL);

return buff;		return buff;
}		}
#endif /* INCL_WINSOCK_API_PROTOTYPES */		#endif /* INCL_WINSOCK_API_PROTOTYPES */


#define NI_MAXHOST 1025 /* Max size of a fully-qualified domain name */
#define NI_MAXSERV 32 /* Max size of a service name */

/* Flags for getnameinfo() */

#define NI_NOFQDN 0x01 /* Only return nodename portion for local hosts */
#define NI_NUMERICHOST 0x02 /* Return numeric form of the host's address */
#define NI_NAMEREQD 0x04 /* Error if the host's name not in DNS */
#define NI_NUMERICSERV 0x08 /* Return numeric form of the service (port #) */
#define NI_DGRAM 0x10 /* Service is a datagram service */

/* Multicast source filter APIs from RFC 3678. */		/* Multicast source filter APIs from RFC 3678. */

WS2TCPIP_INLINE		WS2TCPIP_INLINE
int		int
setipv4sourcefilter(		setipv4sourcefilter(

IN SOCKET Socket,		__in SOCKET Socket,
IN IN_ADDR Interface,		__in IN_ADDR Interface,
IN IN_ADDR Group,		__in IN_ADDR Group,
IN MULTICAST_MODE_TYPE FilterMode,		__in MULTICAST_MODE_TYPE FilterMode,
IN ULONG SourceCount,		__in ULONG SourceCount,
IN CONST IN_ADDR *SourceList		__in CONST IN_ADDR *SourceList
)		)
{		{
int Error;		int Error;
DWORD Size, Returned;		DWORD Size, Returned;
PIP_MSFILTER Filter;		PIP_MSFILTER Filter;

if (SourceCount >		if (SourceCount >
(((ULONG) (ULONG_MAX - sizeof(Filter))) / sizeof(SourceList))) {		(((ULONG) (ULONG_MAX - sizeof(Filter))) / sizeof(SourceList))) {
WSASetLastError(WSAENOBUFS);		WSASetLastError(WSAENOBUFS);
return SOCKET_ERROR;		return SOCKET_ERROR;

skipping to change at line 781		skipping to change at line 689
&Returned, NULL, NULL);		&Returned, NULL, NULL);

HeapFree(GetProcessHeap(), 0, Filter);		HeapFree(GetProcessHeap(), 0, Filter);

return Error;		return Error;
}		}

WS2TCPIP_INLINE		WS2TCPIP_INLINE
int		int
getipv4sourcefilter(		getipv4sourcefilter(

IN SOCKET Socket,		__in SOCKET Socket,
IN IN_ADDR Interface,		__in IN_ADDR Interface,
IN IN_ADDR Group,		__in IN_ADDR Group,
OUT MULTICAST_MODE_TYPE *FilterMode,		__out MULTICAST_MODE_TYPE *FilterMode,
IN OUT ULONG *SourceCount,		__inout ULONG *SourceCount,
OUT IN_ADDR *SourceList		__out IN_ADDR *SourceList
)		)
{		{
int Error;		int Error;
DWORD Size, Returned;		DWORD Size, Returned;
PIP_MSFILTER Filter;		PIP_MSFILTER Filter;

if (*SourceCount >		if (*SourceCount >
(((ULONG) (ULONG_MAX - sizeof(Filter))) / sizeof(SourceList))) {		(((ULONG) (ULONG_MAX - sizeof(Filter))) / sizeof(SourceList))) {
WSASetLastError(WSAENOBUFS);		WSASetLastError(WSAENOBUFS);
return SOCKET_ERROR;		return SOCKET_ERROR;

skipping to change at line 831		skipping to change at line 739

HeapFree(GetProcessHeap(), 0, Filter);		HeapFree(GetProcessHeap(), 0, Filter);

return Error;		return Error;
}		}

#if (NTDDI_VERSION >= NTDDI_WINXP)		#if (NTDDI_VERSION >= NTDDI_WINXP)
WS2TCPIP_INLINE		WS2TCPIP_INLINE
int		int
setsourcefilter(		setsourcefilter(

IN SOCKET Socket,		__in SOCKET Socket,
IN ULONG Interface,		__in ULONG Interface,
IN CONST SOCKADDR *Group,		__in CONST SOCKADDR *Group,
IN int GroupLength,		__in int GroupLength,
IN MULTICAST_MODE_TYPE FilterMode,		__in MULTICAST_MODE_TYPE FilterMode,
IN ULONG SourceCount,		__in ULONG SourceCount,
IN CONST SOCKADDR_STORAGE *SourceList		__in CONST SOCKADDR_STORAGE *SourceList
)		)
{		{
int Error;		int Error;
DWORD Size, Returned;		DWORD Size, Returned;
PGROUP_FILTER Filter;		PGROUP_FILTER Filter;

if (SourceCount >=		if (SourceCount >=
(((ULONG) (ULONG_MAX - sizeof(Filter))) / sizeof(SourceList))) {		(((ULONG) (ULONG_MAX - sizeof(Filter))) / sizeof(SourceList))) {
WSASetLastError(WSAENOBUFS);		WSASetLastError(WSAENOBUFS);
return SOCKET_ERROR;		return SOCKET_ERROR;

skipping to change at line 878		skipping to change at line 786
&Returned, NULL, NULL);		&Returned, NULL, NULL);

HeapFree(GetProcessHeap(), 0, Filter);		HeapFree(GetProcessHeap(), 0, Filter);

return Error;		return Error;
}		}

WS2TCPIP_INLINE		WS2TCPIP_INLINE
int		int
getsourcefilter(		getsourcefilter(

IN SOCKET Socket,		__in SOCKET Socket,
IN ULONG Interface,		__in ULONG Interface,
IN CONST SOCKADDR *Group,		__in CONST SOCKADDR *Group,
IN int GroupLength,		__in int GroupLength,
OUT MULTICAST_MODE_TYPE *FilterMode,		__out MULTICAST_MODE_TYPE *FilterMode,
IN OUT ULONG *SourceCount,		__inout ULONG *SourceCount,
OUT SOCKADDR_STORAGE *SourceList		__out SOCKADDR_STORAGE *SourceList
)		)
{		{
int Error;		int Error;
DWORD Size, Returned;		DWORD Size, Returned;
PGROUP_FILTER Filter;		PGROUP_FILTER Filter;

if (*SourceCount >		if (*SourceCount >
(((ULONG) (ULONG_MAX - sizeof(Filter))) / sizeof(SourceList))) {		(((ULONG) (ULONG_MAX - sizeof(Filter))) / sizeof(SourceList))) {
WSASetLastError(WSAENOBUFS);		WSASetLastError(WSAENOBUFS);
return SOCKET_ERROR;		return SOCKET_ERROR;

skipping to change at line 927		skipping to change at line 835
}		}
*FilterMode = Filter->gf_fmode;		*FilterMode = Filter->gf_fmode;
}		}

HeapFree(GetProcessHeap(), 0, Filter);		HeapFree(GetProcessHeap(), 0, Filter);

return Error;		return Error;
}		}
#endif		#endif


		#ifdef IDEAL_SEND_BACKLOG_IOCTLS

		//
		// Wrapper functions for the ideal send backlog query and change notification
		// ioctls
		//

		WS2TCPIP_INLINE
		int
		idealsendbacklogquery(
		__in SOCKET s,
		__out ULONG *pISB
		)
		{
		DWORD bytes;

		return WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY,
		NULL, 0, pISB, sizeof(*pISB), &bytes, NULL, NULL);
		}

		WS2TCPIP_INLINE
		int
		idealsendbacklognotify(
		__in SOCKET s,
		__in_opt LPWSAOVERLAPPED lpOverlapped,
		__in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
		)
		{
		DWORD bytes;

		return WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_CHANGE,
		NULL, 0, NULL, 0, &bytes,
		lpOverlapped, lpCompletionRoutine);
		}

		#endif

#if (_WIN32_WINNT >= 0x0600)		#if (_WIN32_WINNT >= 0x0600)
#ifdef _SECURE_SOCKET_TYPES_DEFINED_		#ifdef _SECURE_SOCKET_TYPES_DEFINED_

//		//
// Secure socket API definitions		// Secure socket API definitions
//		//

WINSOCK_API_LINKAGE		WINSOCK_API_LINKAGE
INT		INT
WSAAPI		WSAAPI

End of changes. 18 change blocks.
150 lines changed or deleted		84 lines changed or added

This html diff was produced by rfcdiff 1.41.