Headers diff for wsock32.dll between 6.0.6001.18000-Windows 6.0 and 6.1.7600.16385-Windows 7.0 versions

nspapi.h (6.0.6001.18000-Windows 6.0)		nspapi.h (6.1.7600.16385-Windows 7.0)

skipping to change at line 516		skipping to change at line 516
#endif // UNICODE		#endif // UNICODE

typedef DWORD (* LPFN_NSPAPI) (VOID ) ;		typedef DWORD (* LPFN_NSPAPI) (VOID ) ;

//		//
// Structures for using the service routines asynchronously.		// Structures for using the service routines asynchronously.
//		//
typedef		typedef
VOID		VOID
(*LPSERVICE_CALLBACK_PROC) (		(*LPSERVICE_CALLBACK_PROC) (

IN LPARAM lParam,		__in LPARAM lParam,
IN HANDLE hAsyncTaskHandle		__in HANDLE hAsyncTaskHandle
);		);

typedef struct _SERVICE_ASYNC_INFO {		typedef struct _SERVICE_ASYNC_INFO {
LPSERVICE_CALLBACK_PROC lpServiceCallbackProc;		LPSERVICE_CALLBACK_PROC lpServiceCallbackProc;
LPARAM lParam;		LPARAM lParam;
HANDLE hAsyncTaskHandle;		HANDLE hAsyncTaskHandle;
} SERVICE_ASYNC_INFO, PSERVICE_ASYNC_INFO, FAR LPSERVICE_ASYNC_INFO;		} SERVICE_ASYNC_INFO, PSERVICE_ASYNC_INFO, FAR LPSERVICE_ASYNC_INFO;

//		//
// Public NSP API prototypes.		// Public NSP API prototypes.
//		//
INT		INT
APIENTRY		APIENTRY
EnumProtocolsA (		EnumProtocolsA (

IN LPINT lpiProtocols,		__in_opt LPINT lpiProtocols,
IN OUT LPVOID lpProtocolBuffer,		__out_bcount(*lpdwBufferLength) LPVOID lpProtocolBuffer,
IN OUT LPDWORD lpdwBufferLength		__inout LPDWORD lpdwBufferLength
);		);
//		//
// Public NSP API prototypes.		// Public NSP API prototypes.
//		//
INT		INT
APIENTRY		APIENTRY
EnumProtocolsW (		EnumProtocolsW (

IN LPINT lpiProtocols,		__in_opt LPINT lpiProtocols,
IN OUT LPVOID lpProtocolBuffer,		__out_bcount(*lpdwBufferLength) LPVOID lpProtocolBuffer,
IN OUT LPDWORD lpdwBufferLength		__inout LPDWORD lpdwBufferLength
);		);
#ifdef UNICODE		#ifdef UNICODE
#define EnumProtocols EnumProtocolsW		#define EnumProtocols EnumProtocolsW
#else		#else
#define EnumProtocols EnumProtocolsA		#define EnumProtocols EnumProtocolsA
#endif // !UNICODE		#endif // !UNICODE

INT		INT
APIENTRY		APIENTRY
GetAddressByNameA (		GetAddressByNameA (

IN DWORD dwNameSpace,		__in DWORD dwNameSpace,
IN LPGUID lpServiceType,		__in LPGUID lpServiceType,
IN LPSTR lpServiceName OPTIONAL,		__in_opt LPSTR lpServiceName,
IN LPINT lpiProtocols OPTIONAL,		__in_opt LPINT lpiProtocols,
IN DWORD dwResolution,		__in DWORD dwResolution,
IN LPSERVICE_ASYNC_INFO lpServiceAsyncInfo OPTIONAL,		__in_opt LPSERVICE_ASYNC_INFO lpServiceAsyncInfo,
IN OUT LPVOID lpCsaddrBuffer,		__out_bcount(*lpdwBufferLength) LPVOID lpCsaddrBuffer,
IN OUT LPDWORD lpdwBufferLength,		__inout LPDWORD lpdwBufferLength,
IN OUT LPSTR lpAliasBuffer OPTIONAL,		__inout_bcount_opt(*lpdwAliasBufferLength) LPSTR lpAliasBuffer,
IN OUT LPDWORD lpdwAliasBufferLength OPTIONAL		__inout LPDWORD lpdwAliasBufferLength
);		);
INT		INT
APIENTRY		APIENTRY
GetAddressByNameW (		GetAddressByNameW (

IN DWORD dwNameSpace,		__in DWORD dwNameSpace,
IN LPGUID lpServiceType,		__in LPGUID lpServiceType,
IN LPWSTR lpServiceName OPTIONAL,		__in_opt LPWSTR lpServiceName,
IN LPINT lpiProtocols OPTIONAL,		__in_opt LPINT lpiProtocols,
IN DWORD dwResolution,		__in DWORD dwResolution,
IN LPSERVICE_ASYNC_INFO lpServiceAsyncInfo OPTIONAL,		__in_opt LPSERVICE_ASYNC_INFO lpServiceAsyncInfo,
IN OUT LPVOID lpCsaddrBuffer,		__out_bcount(*lpdwBufferLength) LPVOID lpCsaddrBuffer,
IN OUT LPDWORD lpdwBufferLength,		__inout LPDWORD lpdwBufferLength,
IN OUT LPWSTR lpAliasBuffer OPTIONAL,		__inout_ecount_opt(*lpdwAliasBufferLength) LPWSTR lpAliasBuffer,
IN OUT LPDWORD lpdwAliasBufferLength OPTIONAL		__inout LPDWORD lpdwAliasBufferLength
);		);
#ifdef UNICODE		#ifdef UNICODE
#define GetAddressByName GetAddressByNameW		#define GetAddressByName GetAddressByNameW
#else		#else
#define GetAddressByName GetAddressByNameA		#define GetAddressByName GetAddressByNameA
#endif // !UNICODE		#endif // !UNICODE

INT		INT
APIENTRY		APIENTRY
GetTypeByNameA (		GetTypeByNameA (

IN LPSTR lpServiceName,		__in LPSTR lpServiceName,
IN OUT LPGUID lpServiceType		__inout LPGUID lpServiceType
);		);
INT		INT
APIENTRY		APIENTRY
GetTypeByNameW (		GetTypeByNameW (

IN LPWSTR lpServiceName,		__in LPWSTR lpServiceName,
IN OUT LPGUID lpServiceType		__inout LPGUID lpServiceType
);		);
#ifdef UNICODE		#ifdef UNICODE
#define GetTypeByName GetTypeByNameW		#define GetTypeByName GetTypeByNameW
#else		#else
#define GetTypeByName GetTypeByNameA		#define GetTypeByName GetTypeByNameA
#endif // !UNICODE		#endif // !UNICODE

INT		INT
APIENTRY		APIENTRY
GetNameByTypeA (		GetNameByTypeA (

IN LPGUID lpServiceType,		__in LPGUID lpServiceType,
IN OUT LPSTR lpServiceName,		__out_bcount(dwNameLength) LPSTR lpServiceName,
IN DWORD dwNameLength		__in DWORD dwNameLength
);		);
INT		INT
APIENTRY		APIENTRY
GetNameByTypeW (		GetNameByTypeW (

IN LPGUID lpServiceType,		__in LPGUID lpServiceType,
IN OUT LPWSTR lpServiceName,		__out_bcount(dwNameLength) LPWSTR lpServiceName,
IN DWORD dwNameLength		__in DWORD dwNameLength
);		);
#ifdef UNICODE		#ifdef UNICODE
#define GetNameByType GetNameByTypeW		#define GetNameByType GetNameByTypeW
#else		#else
#define GetNameByType GetNameByTypeA		#define GetNameByType GetNameByTypeA
#endif // !UNICODE		#endif // !UNICODE

INT		INT
APIENTRY		APIENTRY
SetServiceA (		SetServiceA (

IN DWORD dwNameSpace,		__in DWORD dwNameSpace,
IN DWORD dwOperation,		__in DWORD dwOperation,
IN DWORD dwFlags,		__in DWORD dwFlags,
IN LPSERVICE_INFOA lpServiceInfo,		__in LPSERVICE_INFOA lpServiceInfo,
IN LPSERVICE_ASYNC_INFO lpServiceAsyncInfo,		__in_opt LPSERVICE_ASYNC_INFO lpServiceAsyncInfo,
IN OUT LPDWORD lpdwStatusFlags		__out LPDWORD lpdwStatusFlags
);		);
INT		INT
APIENTRY		APIENTRY
SetServiceW (		SetServiceW (

IN DWORD dwNameSpace,		__in DWORD dwNameSpace,
IN DWORD dwOperation,		__in DWORD dwOperation,
IN DWORD dwFlags,		__in DWORD dwFlags,
IN LPSERVICE_INFOW lpServiceInfo,		__in LPSERVICE_INFOW lpServiceInfo,
IN LPSERVICE_ASYNC_INFO lpServiceAsyncInfo,		__in_opt LPSERVICE_ASYNC_INFO lpServiceAsyncInfo,
IN OUT LPDWORD lpdwStatusFlags		__out LPDWORD lpdwStatusFlags
);		);
#ifdef UNICODE		#ifdef UNICODE
#define SetService SetServiceW		#define SetService SetServiceW
#else		#else
#define SetService SetServiceA		#define SetService SetServiceA
#endif // !UNICODE		#endif // !UNICODE

INT		INT
APIENTRY		APIENTRY
GetServiceA (		GetServiceA (

IN DWORD dwNameSpace,		__in DWORD dwNameSpace,
IN LPGUID lpGuid,		__in LPGUID lpGuid,
IN LPSTR lpServiceName,		__in LPSTR lpServiceName,
IN DWORD dwProperties,		__in DWORD dwProperties,
IN OUT LPVOID lpBuffer,		__out_bcount(*lpdwBufferSize) LPVOID lpBuffer,
IN OUT LPDWORD lpdwBufferSize,		__inout LPDWORD lpdwBufferSize,
IN LPSERVICE_ASYNC_INFO lpServiceAsyncInfo		__in_opt LPSERVICE_ASYNC_INFO lpServiceAsyncInfo
);		);
INT		INT
APIENTRY		APIENTRY
GetServiceW (		GetServiceW (

IN DWORD dwNameSpace,		__in DWORD dwNameSpace,
IN LPGUID lpGuid,		__in LPGUID lpGuid,
IN LPWSTR lpServiceName,		__in LPWSTR lpServiceName,
IN DWORD dwProperties,		__in DWORD dwProperties,
IN OUT LPVOID lpBuffer,		__out_bcount(*lpdwBufferSize) LPVOID lpBuffer,
IN OUT LPDWORD lpdwBufferSize,		__inout LPDWORD lpdwBufferSize,
IN LPSERVICE_ASYNC_INFO lpServiceAsyncInfo		__in_opt LPSERVICE_ASYNC_INFO lpServiceAsyncInfo
);		);
#ifdef UNICODE		#ifdef UNICODE
#define GetService GetServiceW		#define GetService GetServiceW
#else		#else
#define GetService GetServiceA		#define GetService GetServiceA
#endif // !UNICODE		#endif // !UNICODE

#ifdef __cplusplus		#ifdef __cplusplus
}		}
#endif /* __cplusplus */		#endif /* __cplusplus */

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

winsock.h (6.0.6001.18000-Windows 6.0)		winsock.h (6.1.7600.16385-Windows 7.0)

skipping to change at line 661		skipping to change at line 661

/* Non-Authoritative: Host not found, or SERVERFAIL */		/* Non-Authoritative: Host not found, or SERVERFAIL */
#define WSATRY_AGAIN (WSABASEERR+1002)		#define WSATRY_AGAIN (WSABASEERR+1002)

/* Non recoverable errors, FORMERR, REFUSED, NOTIMP */		/* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
#define WSANO_RECOVERY (WSABASEERR+1003)		#define WSANO_RECOVERY (WSABASEERR+1003)

/* Valid name, no data record of requested type */		/* Valid name, no data record of requested type */
#define WSANO_DATA (WSABASEERR+1004)		#define WSANO_DATA (WSABASEERR+1004)


		/* Authoritative Answer: Host not found Securely */
		#define WSA_SECURE_HOST_NOT_FOUND (WSABASEERR+1032)

		/* Name based IPSEC policy could not be added*/
		#define WSA_IPSEC_NAME_POLICY_ERROR (WSABASEERR+1033)

/*		/*
* WinSock error codes are also defined in winerror.h		* WinSock error codes are also defined in winerror.h
* Hence the IFDEF.		* Hence the IFDEF.
*/		*/
#endif /* ifdef WSABASEERR */		#endif /* ifdef WSABASEERR */

/*		/*
* Compatibility macros.		* Compatibility macros.
*/		*/


skipping to change at line 732		skipping to change at line 738
#define EREMOTE WSAEREMOTE		#define EREMOTE WSAEREMOTE
#endif		#endif

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

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

SOCKET PASCAL FAR accept (		SOCKET PASCAL FAR accept (

IN SOCKET s,		__in SOCKET s,
OUT struct sockaddr FAR *addr,		__out_bcount_opt(addrlen) struct sockaddr FAR addr,
IN OUT int FAR *addrlen);		__inout_opt int FAR *addrlen);

int PASCAL FAR bind (		int PASCAL FAR bind (

IN SOCKET s,		__in SOCKET s,
IN const struct sockaddr FAR *addr,		__in_bcount(namelen) const struct sockaddr FAR *addr,
IN int namelen);		__in int namelen);

int PASCAL FAR closesocket ( IN SOCKET s);		int PASCAL FAR closesocket ( IN SOCKET s);

int PASCAL FAR connect (		int PASCAL FAR connect (

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

int PASCAL FAR ioctlsocket (		int PASCAL FAR ioctlsocket (

IN SOCKET s,		__in SOCKET s,
IN long cmd,		__in long cmd,
IN OUT u_long FAR *argp);		__inout u_long FAR *argp);

int PASCAL FAR getpeername (		int PASCAL FAR getpeername (

IN SOCKET s,		__in SOCKET s,
OUT struct sockaddr FAR *name,		__out_bcount_part(namelen, namelen) struct sockadd
IN OUT int FAR * namelen);		r FAR *name,
		__inout int FAR * namelen);

int PASCAL FAR getsockname (		int PASCAL FAR getsockname (

IN SOCKET s,		__in SOCKET s,
OUT struct sockaddr FAR *name,		__out_bcount_part(namelen, namelen) struct sockadd
IN OUT int FAR * namelen);		r FAR *name,
		__inout int FAR * namelen);

int PASCAL FAR getsockopt (		int PASCAL FAR 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,
IN OUT int FAR *optlen);		__inout int FAR *optlen);


u_long PASCAL FAR htonl ( IN u_long hostlong);		u_long PASCAL FAR htonl ( __in u_long hostlong);


u_short PASCAL FAR htons (IN u_short hostshort);		u_short PASCAL FAR htons (__in u_short hostshort);


unsigned long PASCAL FAR inet_addr (IN const char FAR * cp);		unsigned long PASCAL FAR inet_addr (__in const char FAR * cp);


char FAR * PASCAL FAR inet_ntoa (IN struct in_addr in);		char FAR * PASCAL FAR inet_ntoa (__in struct in_addr in);

int PASCAL FAR listen (		int PASCAL FAR listen (

IN SOCKET s,		__in SOCKET s,
IN int backlog);		__in int backlog);


u_long PASCAL FAR ntohl (IN u_long netlong);		u_long PASCAL FAR ntohl (__in u_long netlong);


u_short PASCAL FAR ntohs (IN u_short netshort);		u_short PASCAL FAR ntohs (__in u_short netshort);

int PASCAL FAR recv (		int PASCAL FAR 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) c
IN int len,		har FAR * buf,
IN int flags);		__in int len,
		__in int flags);

int PASCAL FAR recvfrom (		int PASCAL FAR 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(NETWOR
IN int len,		K) char FAR * buf,
IN int flags,		__in int len,
__out_bcount(fromlen) struct sockaddr FAR from,		__in int flags,
IN OUT int FAR * fromlen);		__out_bcount_opt(fromlen) struct sockaddr FAR from,
		__inout_opt int FAR * fromlen);

int PASCAL FAR select (		int PASCAL FAR select (

IN int nfds,		__in int nfds,
IN OUT fd_set FAR *readfds,		__inout_opt fd_set FAR *readfds,
IN OUT fd_set FAR *writefds,		__inout_opt fd_set FAR *writefds,
IN OUT fd_set FAR *exceptfds,		__inout_opt fd_set FAR *exceptfds,
IN const struct timeval FAR *timeout);		__in_opt const struct timeval FAR *timeout);

int PASCAL FAR send (		int PASCAL FAR send (

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

int PASCAL FAR sendto (		int PASCAL FAR sendto (

IN SOCKET s,		__in SOCKET s,
IN const char FAR * buf,		__in_bcount(len) const char FAR * buf,
IN int len,		__in int len,
IN int flags,		__in int flags,
IN const struct sockaddr FAR *to,		__in_bcount_opt(tolen) const struct sockaddr FAR *to,
IN int tolen);		__in int tolen);

int PASCAL FAR setsockopt (		int PASCAL FAR setsockopt (

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

int PASCAL FAR shutdown (		int PASCAL FAR shutdown (

IN SOCKET s,		__in SOCKET s,
IN int how);		__in int how);

SOCKET PASCAL FAR socket (		SOCKET PASCAL FAR socket (

IN int af,		__in int af,
IN int type,		__in int type,
IN int protocol);		__in int protocol);

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

struct hostent FAR * PASCAL FAR gethostbyaddr(		struct hostent FAR * PASCAL FAR gethostbyaddr(

IN const char FAR * addr,		__in_bcount(len) const char FAR *
IN int len,		addr,
IN int type);		__in int len,
		__in int type);


struct hostent FAR * PASCAL FAR gethostbyname(IN const char FAR * name);		struct hostent FAR * PASCAL FAR gethostbyname(__in_z const char FAR * name);

int PASCAL FAR gethostname (		int PASCAL FAR gethostname (

__out_bcount_part(namelen, return) char FAR * name,		__out_bcount_part(namelen, return) char FAR * name,
IN int namelen);		__in int namelen);

struct servent FAR * PASCAL FAR getservbyport(		struct servent FAR * PASCAL FAR getservbyport(

IN int port,		__in int port,
IN const char FAR * proto);		__in_z const char FAR * proto);

struct servent FAR * PASCAL FAR getservbyname(		struct servent FAR * PASCAL FAR getservbyname(

IN const char FAR * name,		__in_z const char FAR * name,
IN const char FAR * proto);		__in_z const char FAR * proto);


struct protoent FAR * PASCAL FAR getprotobynumber(IN int proto);		struct protoent FAR * PASCAL FAR getprotobynumber(__in int proto);


struct protoent FAR * PASCAL FAR getprotobyname(IN const char FAR * name);		struct protoent FAR * PASCAL FAR getprotobyname(__in_z const char FAR * name);

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

int PASCAL FAR WSAStartup(		int PASCAL FAR WSAStartup(

IN WORD wVersionRequired,		__in WORD wVersionRequired,
OUT LPWSADATA lpWSAData);		__out LPWSADATA lpWSAData);

int PASCAL FAR WSACleanup(void);		int PASCAL FAR WSACleanup(void);


void PASCAL FAR WSASetLastError(IN int iError);		void PASCAL FAR WSASetLastError(__in int iError);

int PASCAL FAR WSAGetLastError(void);		int PASCAL FAR WSAGetLastError(void);

BOOL PASCAL FAR WSAIsBlocking(void);		BOOL PASCAL FAR WSAIsBlocking(void);

int PASCAL FAR WSAUnhookBlockingHook(void);		int PASCAL FAR WSAUnhookBlockingHook(void);


FARPROC PASCAL FAR WSASetBlockingHook(IN FARPROC lpBlockFunc);		FARPROC PASCAL FAR WSASetBlockingHook(__in FARPROC lpBlockFunc);

int PASCAL FAR WSACancelBlockingCall(void);		int PASCAL FAR WSACancelBlockingCall(void);

HANDLE PASCAL FAR WSAAsyncGetServByName(		HANDLE PASCAL FAR 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);

HANDLE PASCAL FAR WSAAsyncGetServByPort(		HANDLE PASCAL FAR 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);

HANDLE PASCAL FAR WSAAsyncGetProtoByName(		HANDLE PASCAL FAR 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);

HANDLE PASCAL FAR WSAAsyncGetProtoByNumber(		HANDLE PASCAL FAR 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);

HANDLE PASCAL FAR WSAAsyncGetHostByName(		HANDLE PASCAL FAR 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);

HANDLE PASCAL FAR WSAAsyncGetHostByAddr(		HANDLE PASCAL FAR WSAAsyncGetHostByAddr(

IN HWND hWnd,		__in HWND hWnd,
IN u_int wMsg,		__in u_int wMsg,
IN const char FAR * addr,		__in 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);


int PASCAL FAR WSACancelAsyncRequest(IN HANDLE hAsyncTaskHandle);		int PASCAL FAR WSACancelAsyncRequest(__in HANDLE hAsyncTaskHandle);

int PASCAL FAR WSAAsyncSelect(		int PASCAL FAR 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);

int PASCAL FAR WSARecvEx (		int PASCAL FAR WSARecvEx (

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(NETWO
IN int len,		RK) char FAR * buf,
IN OUT int FAR *flags);		__in int len,
		__inout int FAR *flags);

typedef struct _TRANSMIT_FILE_BUFFERS {		typedef struct _TRANSMIT_FILE_BUFFERS {
PVOID Head;		PVOID Head;
DWORD HeadLength;		DWORD HeadLength;
PVOID Tail;		PVOID Tail;
DWORD TailLength;		DWORD TailLength;
} TRANSMIT_FILE_BUFFERS, PTRANSMIT_FILE_BUFFERS, LPTRANSMIT_FILE_BUFFERS;		} TRANSMIT_FILE_BUFFERS, PTRANSMIT_FILE_BUFFERS, LPTRANSMIT_FILE_BUFFERS;

#define TF_DISCONNECT 0x01		#define TF_DISCONNECT 0x01
#define TF_REUSE_SOCKET 0x02		#define TF_REUSE_SOCKET 0x02
#define TF_WRITE_BEHIND 0x04		#define TF_WRITE_BEHIND 0x04

BOOL		BOOL
PASCAL FAR		PASCAL FAR
TransmitFile (		TransmitFile (

IN SOCKET hSocket,		__in SOCKET hSocket,
IN HANDLE hFile,		__in HANDLE hFile,
IN DWORD nNumberOfBytesToWrite,		__in DWORD nNumberOfBytesToWrite,
IN DWORD nNumberOfBytesPerSend,		__in DWORD nNumberOfBytesPerSend,
IN LPOVERLAPPED lpOverlapped,		__inout_opt LPOVERLAPPED lpOverlapped,
IN LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers,		__in_opt LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers,
IN DWORD dwReserved		__in DWORD dwReserved
);		);

BOOL		BOOL
PASCAL FAR		PASCAL FAR
AcceptEx (		AcceptEx (

IN SOCKET sListenSocket,		__in SOCKET sListenSocket,
IN SOCKET sAcceptSocket,		__in SOCKET sAcceptSocket,
IN PVOID lpOutputBuffer,		__out_bcount_part(dwReceiveDatalength+dwLocalAddressLength+dwRemoteAddressLe
IN DWORD dwReceiveDataLength,		ngth,
IN DWORD dwLocalAddressLength,		*lpdwBytesReceived) PVOID lpOutputBuffer,
IN DWORD dwRemoteAddressLength,		__in DWORD dwReceiveDataLength,
OUT LPDWORD lpdwBytesReceived,		__in DWORD dwLocalAddressLength,
IN LPOVERLAPPED lpOverlapped		__in DWORD dwRemoteAddressLength,
		__out LPDWORD lpdwBytesReceived,
		__inout LPOVERLAPPED lpOverlapped
);		);

VOID		VOID
PASCAL FAR		PASCAL FAR
GetAcceptExSockaddrs (		GetAcceptExSockaddrs (

IN PVOID lpOutputBuffer,		__in_bcount(dwReceiveDataLength+dwLocalAddressLength+dwRemoteAddressLength)
IN DWORD dwReceiveDataLength,		PVOID lpOutputBuffer,
IN DWORD dwLocalAddressLength,		__in DWORD dwReceiveDataLength,
IN DWORD dwRemoteAddressLength,		__in DWORD dwLocalAddressLength,
OUT struct sockaddr **LocalSockaddr,		__in DWORD dwRemoteAddressLength,
OUT LPINT LocalSockaddrLength,		__deref_out_bcount(LocalSockaddrLength) struct sockaddr *LocalSockaddr,
OUT struct sockaddr **RemoteSockaddr,		__out LPINT LocalSockaddrLength,
OUT LPINT RemoteSockaddrLength		__deref_out_bcount(RemoteSockaddrLength) struct sockaddr *RemoteSockaddr,
		__out LPINT RemoteSockaddrLength
);		);

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

/* Microsoft Windows Extended data types */		/* Microsoft Windows Extended data types */
typedef struct sockaddr SOCKADDR;		typedef struct sockaddr SOCKADDR;
typedef struct sockaddr *PSOCKADDR;		typedef struct sockaddr *PSOCKADDR;
typedef struct sockaddr FAR *LPSOCKADDR;		typedef struct sockaddr FAR *LPSOCKADDR;

End of changes. 45 change blocks.
148 lines changed or deleted		163 lines changed or added

This html diff was produced by rfcdiff 1.41.