Headers diff for wsock32.dll between 5.2.3790.1830-Windows 5.0 and 6.0.6001.18000-Windows 6.0 versions



 winsock.h (5.2.3790.1830-Windows 5.0)   winsock.h (6.0.6001.18000-Windows 6.0) 
//$TAG BIZDEV
// $IPCategory:
// $DealPointID: 118736
// $AgreementName: berkeley software distribution license
// $AgreementType: oss license
// $ExternalOrigin: regents of the university of california
//$ENDTAG
//$TAG ENGR
// $Owner: vadime
// $Module: published_inc
//
//$ENDTAG
/* WINSOCK.H--definitions to be used with the WINSOCK.DLL /* WINSOCK.H--definitions to be used with the WINSOCK.DLL
* Copyright (c) Microsoft Corporation. All rights reserved. * Copyright (c) Microsoft Corporation. All rights reserved.
* *
* This header file corresponds to version 1.1 of the Windows Sockets specificat ion. * This header file corresponds to version 1.1 of the Windows Sockets specificat ion.
* *
* This file includes parts which are Copyright (c) 1982-1986 Regents * This file includes parts which are Copyright (c) 1982-1986 Regents
* of the University of California. All rights reserved. The * of the University of California. All rights reserved. The
* Berkeley Software License Agreement specifies the terms and * Berkeley Software License Agreement specifies the terms and
* conditions for redistribution. * conditions for redistribution.
* *
skipping to change at line 265 skipping to change at line 279
*/ */
#define IPPORT_RESERVED 1024 #define IPPORT_RESERVED 1024
/* /*
* Link numbers * Link numbers
*/ */
#define IMPLINK_IP 155 #define IMPLINK_IP 155
#define IMPLINK_LOWEXPER 156 #define IMPLINK_LOWEXPER 156
#define IMPLINK_HIGHEXPER 158 #define IMPLINK_HIGHEXPER 158
#ifndef s_addr #include <inaddr.h>
/*
* Internet address (old style... should be updated)
*/
struct in_addr {
union {
struct { u_char s_b1,s_b2,s_b3,s_b4; } S_un_b;
struct { u_short s_w1,s_w2; } S_un_w;
u_long S_addr;
} S_un;
#define s_addr S_un.S_addr
/* can be used for most tcp & ip code */
#define s_host S_un.S_un_b.s_b2
/* host on imp */
#define s_net S_un.S_un_b.s_b1
/* network */
#define s_imp S_un.S_un_w.s_w2
/* imp */
#define s_impno S_un.S_un_b.s_b4
/* imp # */
#define s_lh S_un.S_un_b.s_b3
/* logical host */
};
#endif
/* /*
* Definitions of bits in internet address integers. * Definitions of bits in internet address integers.
* On subnets, the decomposition of addresses to host and net parts * On subnets, the decomposition of addresses to host and net parts
* is done according to subnet mask, not the masks here. * is done according to subnet mask, not the masks here.
*/ */
#define IN_CLASSA(i) (((long)(i) & 0x80000000) == 0) #define IN_CLASSA(i) (((long)(i) & 0x80000000) == 0)
#define IN_CLASSA_NET 0xff000000 #define IN_CLASSA_NET 0xff000000
#define IN_CLASSA_NSHIFT 24 #define IN_CLASSA_NSHIFT 24
#define IN_CLASSA_HOST 0x00ffffff #define IN_CLASSA_HOST 0x00ffffff
skipping to change at line 776 skipping to change at line 767
int PASCAL FAR getsockname ( int PASCAL FAR getsockname (
IN SOCKET s, IN SOCKET s,
OUT struct sockaddr FAR *name, OUT struct sockaddr FAR *name,
IN OUT int FAR * namelen); IN OUT 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 char FAR * optval, __out_bcount(*optlen) char FAR * optval,
IN OUT int FAR *optlen); IN OUT 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 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);
int PASCAL FAR recvfrom ( int PASCAL FAR recvfrom (
IN SOCKET s, IN SOCKET s,
OUT 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 struct sockaddr FAR *from, __out_bcount(*fromlen) struct sockaddr FAR * from,
IN OUT int FAR * fromlen); IN OUT int FAR * fromlen);
int PASCAL FAR select ( int PASCAL FAR select (
IN int nfds, IN int nfds,
IN OUT fd_set FAR *readfds, IN OUT fd_set FAR *readfds,
IN OUT fd_set FAR *writefds, IN OUT fd_set FAR *writefds,
IN OUT fd_set FAR *exceptfds, IN OUT fd_set FAR *exceptfds,
IN const struct timeval FAR *timeout); IN const struct timeval FAR *timeout);
int PASCAL FAR send ( int PASCAL FAR send (
skipping to change at line 856 skipping to change at line 847
/* Database function prototypes */ /* Database function prototypes */
struct hostent FAR * PASCAL FAR gethostbyaddr( struct hostent FAR * PASCAL FAR gethostbyaddr(
IN const char FAR * addr, IN const char FAR * addr,
IN int len, IN int len,
IN int type); IN int type);
struct hostent FAR * PASCAL FAR gethostbyname(IN const char FAR * name); struct hostent FAR * PASCAL FAR gethostbyname(IN const char FAR * name);
int PASCAL FAR gethostname ( int PASCAL FAR gethostname (
OUT 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 const char FAR * proto);
struct servent FAR * PASCAL FAR getservbyname( struct servent FAR * PASCAL FAR getservbyname(
IN const char FAR * name, IN const char FAR * name,
IN const char FAR * proto); IN const char FAR * proto);
skipping to change at line 896 skipping to change at line 887
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 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 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 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 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 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 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 char FAR * buf, __out_bcount_part(len, return) __out_data_source(NETWORK) char FAR * buf,
IN int len, IN int len,
IN OUT int FAR *flags); IN OUT 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;
skipping to change at line 1017 skipping to change at line 1008
typedef struct sockaddr FAR *LPSOCKADDR; typedef struct sockaddr FAR *LPSOCKADDR;
typedef struct sockaddr_in SOCKADDR_IN; typedef struct sockaddr_in SOCKADDR_IN;
typedef struct sockaddr_in *PSOCKADDR_IN; typedef struct sockaddr_in *PSOCKADDR_IN;
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;
typedef struct in_addr IN_ADDR;
typedef struct in_addr *PIN_ADDR;
typedef struct in_addr FAR *LPIN_ADDR;
typedef struct fd_set FD_SET; typedef struct fd_set FD_SET;
typedef struct fd_set *PFD_SET; typedef struct fd_set *PFD_SET;
typedef struct fd_set FAR *LPFD_SET; typedef struct fd_set FAR *LPFD_SET;
typedef struct hostent HOSTENT; typedef struct hostent HOSTENT;
typedef struct hostent *PHOSTENT; typedef struct hostent *PHOSTENT;
typedef struct hostent FAR *LPHOSTENT; typedef struct hostent FAR *LPHOSTENT;
typedef struct servent SERVENT; typedef struct servent SERVENT;
typedef struct servent *PSERVENT; typedef struct servent *PSERVENT;
skipping to change at line 1079 skipping to change at line 1066
* to a WSAAsyncSelect(). * to a WSAAsyncSelect().
*/ */
#define WSAGETSELECTEVENT(lParam) LOWORD(lParam) #define WSAGETSELECTEVENT(lParam) LOWORD(lParam)
/* /*
* WSAGETSELECTERROR is intended for use by the Windows Sockets application * WSAGETSELECTERROR is intended for use by the Windows Sockets application
* to extract the error code from the lParam in the response * to extract the error code from the lParam in the response
* to a WSAAsyncSelect(). * to a WSAAsyncSelect().
*/ */
#define WSAGETSELECTERROR(lParam) HIWORD(lParam) #define WSAGETSELECTERROR(lParam) HIWORD(lParam)
#if(_WIN32_WINNT >= 0x0501)
#ifdef IPV6STRICT #ifdef IPV6STRICT
#error WINSOCK2 required. #error WINSOCK2 required.
#endif // IPV6STRICT #endif // IPV6STRICT
#endif //(_WIN32_WINNT >= 0x0501)
#endif /* _WINSOCKAPI_ */ #endif /* _WINSOCKAPI_ */
 End of changes. 17 change blocks. 
40 lines changed or deleted 29 lines changed or added

This html diff was produced by rfcdiff 1.41.