Headers diff for mswsock.dll between 6.0.6002.18005-Windows 6.0 and 6.1.7601.18254-Windows 7.0 versions



 mswsock.h (6.0.6002.18005-Windows 6.0)   mswsock.h (6.1.7601.18254-Windows 7.0) 
skipping to change at line 111 skipping to change at line 111
#define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR,15) #define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR,15)
/* /*
* Microsoft extended APIs. * Microsoft extended APIs.
*/ */
#if(_WIN32_WINNT < 0x0600) #if(_WIN32_WINNT < 0x0600)
int int
PASCAL FAR PASCAL FAR
WSARecvEx( WSARecvEx(
SOCKET s, __in SOCKET s,
__out_bcount_part(len, return) char FAR *buf, __out_bcount_part(len, return) char FAR *buf,
int len, __in int len,
int FAR *flags __inout int FAR *flags
); );
#else //(_WIN32_WINNT < 0x0600) #else //(_WIN32_WINNT < 0x0600)
INT INT
PASCAL FAR PASCAL FAR
WSARecvEx( WSARecvEx(
SOCKET s, __in SOCKET s,
__out_bcount_part(len, return) CHAR FAR *buf, __out_bcount_part(len, return) CHAR FAR *buf,
INT len, __in INT len,
INT FAR *flags __inout INT FAR *flags
); );
#endif //(_WIN32_WINNT < 0x0600) #endif //(_WIN32_WINNT < 0x0600)
typedef struct _TRANSMIT_FILE_BUFFERS { typedef struct _TRANSMIT_FILE_BUFFERS {
LPVOID Head; LPVOID Head;
DWORD HeadLength; DWORD HeadLength;
LPVOID Tail; LPVOID Tail;
DWORD TailLength; DWORD TailLength;
} TRANSMIT_FILE_BUFFERS, *PTRANSMIT_FILE_BUFFERS, FAR *LPTRANSMIT_FILE_BUFFERS; } TRANSMIT_FILE_BUFFERS, *PTRANSMIT_FILE_BUFFERS, FAR *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
#define TF_USE_DEFAULT_WORKER 0x00 #define TF_USE_DEFAULT_WORKER 0x00
#define TF_USE_SYSTEM_THREAD 0x10 #define TF_USE_SYSTEM_THREAD 0x10
#define TF_USE_KERNEL_APC 0x20 #define TF_USE_KERNEL_APC 0x20
__control_entrypoint(DllExport)
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
); );
__control_entrypoint(DllExport) __control_entrypoint(DllExport)
BOOL BOOL
PASCAL FAR PASCAL FAR
AcceptEx ( AcceptEx (
IN SOCKET sListenSocket, __in SOCKET sListenSocket,
IN SOCKET sAcceptSocket, __in SOCKET sAcceptSocket,
__out_bcount_part(dwReceiveDataLength+dwLocalAddressLength+dwRemoteAddressLe ngth, __out_bcount_part(dwReceiveDataLength+dwLocalAddressLength+dwRemoteAddressLe ngth,
*lpdwBytesReceived) IN PVOID lpOutputBuffer, *lpdwBytesReceived) PVOID lpOutputBuffer,
IN DWORD dwReceiveDataLength, __in DWORD dwReceiveDataLength,
IN DWORD dwLocalAddressLength, __in DWORD dwLocalAddressLength,
IN DWORD dwRemoteAddressLength, __in DWORD dwRemoteAddressLength,
OUT LPDWORD lpdwBytesReceived, __out LPDWORD lpdwBytesReceived,
IN LPOVERLAPPED lpOverlapped __inout LPOVERLAPPED lpOverlapped
); );
__control_entrypoint(DllExport) __control_entrypoint(DllExport)
VOID VOID
PASCAL FAR PASCAL FAR
GetAcceptExSockaddrs ( GetAcceptExSockaddrs (
__in_bcount(dwReceiveDataLength+dwLocalAddressLength+dwRemoteAddressLength) __in_bcount(dwReceiveDataLength+dwLocalAddressLength+dwRemoteAddressLength)
IN PVOID lpOutputBuffer, PVOID lpOutputBuffer,
IN DWORD dwReceiveDataLength, __in DWORD dwReceiveDataLength,
IN DWORD dwLocalAddressLength, __in DWORD dwLocalAddressLength,
IN DWORD dwRemoteAddressLength, __in DWORD dwRemoteAddressLength,
__deref_out_bcount(*LocalSockaddrLength) OUT struct sockaddr **LocalSockaddr __deref_out_bcount(*LocalSockaddrLength) struct sockaddr **LocalSockaddr,
, __out LPINT LocalSockaddrLength,
OUT LPINT LocalSockaddrLength, __deref_out_bcount(*RemoteSockaddrLength) struct sockaddr **RemoteSockaddr,
__deref_out_bcount(*RemoteSockaddrLength) OUT struct sockaddr **RemoteSockad __out LPINT RemoteSockaddrLength
dr,
OUT LPINT RemoteSockaddrLength
); );
/* /*
* "QueryInterface" versions of the above APIs. * "QueryInterface" versions of the above APIs.
*/ */
typedef typedef
BOOL BOOL
(PASCAL FAR * LPFN_TRANSMITFILE)( (PASCAL FAR * LPFN_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
); );
#define WSAID_TRANSMITFILE \ #define WSAID_TRANSMITFILE \
{0xb5367df0,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}} {0xb5367df0,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}}
typedef typedef
BOOL BOOL
(PASCAL FAR * LPFN_ACCEPTEX)( (PASCAL FAR * LPFN_ACCEPTEX)(
IN SOCKET sListenSocket, __in SOCKET sListenSocket,
IN SOCKET sAcceptSocket, __in SOCKET sAcceptSocket,
IN PVOID lpOutputBuffer, __in PVOID lpOutputBuffer,
IN DWORD dwReceiveDataLength, __in DWORD dwReceiveDataLength,
IN DWORD dwLocalAddressLength, __in DWORD dwLocalAddressLength,
IN DWORD dwRemoteAddressLength, __in DWORD dwRemoteAddressLength,
OUT LPDWORD lpdwBytesReceived, __out LPDWORD lpdwBytesReceived,
IN LPOVERLAPPED lpOverlapped __inout LPOVERLAPPED lpOverlapped
); );
#define WSAID_ACCEPTEX \ #define WSAID_ACCEPTEX \
{0xb5367df1,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}} {0xb5367df1,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}}
typedef typedef
VOID VOID
(PASCAL FAR * LPFN_GETACCEPTEXSOCKADDRS)( (PASCAL FAR * LPFN_GETACCEPTEXSOCKADDRS)(
IN PVOID lpOutputBuffer, __in PVOID lpOutputBuffer,
IN DWORD dwReceiveDataLength, __in DWORD dwReceiveDataLength,
IN DWORD dwLocalAddressLength, __in DWORD dwLocalAddressLength,
IN DWORD dwRemoteAddressLength, __in DWORD dwRemoteAddressLength,
OUT struct sockaddr **LocalSockaddr, __deref_out_bcount(*LocalSockaddrLength) struct sockaddr **LocalSockaddr,
OUT LPINT LocalSockaddrLength, __out LPINT LocalSockaddrLength,
OUT struct sockaddr **RemoteSockaddr, __deref_out_bcount(*RemoteSockaddrLength) struct sockaddr **RemoteSockaddr,
OUT LPINT RemoteSockaddrLength __out LPINT RemoteSockaddrLength
); );
#define WSAID_GETACCEPTEXSOCKADDRS \ #define WSAID_GETACCEPTEXSOCKADDRS \
{0xb5367df2,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}} {0xb5367df2,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}}
#if(_WIN32_WINNT >= 0x0501) #if(_WIN32_WINNT >= 0x0501)
#if _MSC_VER >= 1200 #if _MSC_VER >= 1200
#pragma warning(push) #pragma warning(push)
#endif #endif
skipping to change at line 269 skipping to change at line 270
#endif #endif
#define TP_DISCONNECT TF_DISCONNECT #define TP_DISCONNECT TF_DISCONNECT
#define TP_REUSE_SOCKET TF_REUSE_SOCKET #define TP_REUSE_SOCKET TF_REUSE_SOCKET
#define TP_USE_DEFAULT_WORKER TF_USE_DEFAULT_WORKER #define TP_USE_DEFAULT_WORKER TF_USE_DEFAULT_WORKER
#define TP_USE_SYSTEM_THREAD TF_USE_SYSTEM_THREAD #define TP_USE_SYSTEM_THREAD TF_USE_SYSTEM_THREAD
#define TP_USE_KERNEL_APC TF_USE_KERNEL_APC #define TP_USE_KERNEL_APC TF_USE_KERNEL_APC
typedef typedef
BOOL BOOL
(PASCAL FAR * LPFN_TRANSMITPACKETS) ( (PASCAL FAR * LPFN_TRANSMITPACKETS) (
SOCKET hSocket, __in SOCKET hSocket,
LPTRANSMIT_PACKETS_ELEMENT lpPacketArray, __in_opt LPTRANSMIT_PACKETS_ELEMENT lpPacketArray,
DWORD nElementCount, __in DWORD nElementCount,
DWORD nSendSize, __in DWORD nSendSize,
LPOVERLAPPED lpOverlapped, __inout_opt LPOVERLAPPED lpOverlapped,
DWORD dwFlags __in DWORD dwFlags
); );
#define WSAID_TRANSMITPACKETS \ #define WSAID_TRANSMITPACKETS \
{0xd9689da0,0x1f90,0x11d3,{0x99,0x71,0x00,0xc0,0x4f,0x68,0xc8,0x76}} {0xd9689da0,0x1f90,0x11d3,{0x99,0x71,0x00,0xc0,0x4f,0x68,0xc8,0x76}}
typedef typedef
BOOL BOOL
(PASCAL FAR * LPFN_CONNECTEX) ( (PASCAL FAR * LPFN_CONNECTEX) (
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,
IN PVOID lpSendBuffer OPTIONAL, __in_opt PVOID lpSendBuffer,
IN DWORD dwSendDataLength, __in DWORD dwSendDataLength,
OUT LPDWORD lpdwBytesSent, __out LPDWORD lpdwBytesSent,
IN LPOVERLAPPED lpOverlapped __inout LPOVERLAPPED lpOverlapped
); );
#define WSAID_CONNECTEX \ #define WSAID_CONNECTEX \
{0x25a207b9,0xddf3,0x4660,{0x8e,0xe9,0x76,0xe5,0x8c,0x74,0x06,0x3e}} {0x25a207b9,0xddf3,0x4660,{0x8e,0xe9,0x76,0xe5,0x8c,0x74,0x06,0x3e}}
typedef typedef
BOOL BOOL
(PASCAL FAR * LPFN_DISCONNECTEX) ( (PASCAL FAR * LPFN_DISCONNECTEX) (
IN SOCKET s, __in SOCKET s,
IN LPOVERLAPPED lpOverlapped, __inout_opt LPOVERLAPPED lpOverlapped,
IN DWORD dwFlags, __in DWORD dwFlags,
IN DWORD dwReserved __in DWORD dwReserved
); );
#define WSAID_DISCONNECTEX \ #define WSAID_DISCONNECTEX \
{0x7fda2e11,0x8630,0x436f,{0xa0, 0x31, 0xf5, 0x36, 0xa6, 0xee, 0xc1, 0x57}} {0x7fda2e11,0x8630,0x436f,{0xa0, 0x31, 0xf5, 0x36, 0xa6, 0xee, 0xc1, 0x57}}
#define DE_REUSE_SOCKET TF_REUSE_SOCKET #define DE_REUSE_SOCKET TF_REUSE_SOCKET
/* /*
* Network-location awareness -- Name registration values for use * Network-location awareness -- Name registration values for use
* with WSASetService and other structures. * with WSASetService and other structures.
skipping to change at line 399 skipping to change at line 400
} NLA_BLOB, *PNLA_BLOB, * FAR LPNLA_BLOB; } NLA_BLOB, *PNLA_BLOB, * FAR LPNLA_BLOB;
/* /*
* WSARecvMsg -- support for receiving ancilliary * WSARecvMsg -- support for receiving ancilliary
* data/control information with a message. * data/control information with a message.
*/ */
typedef typedef
INT INT
(PASCAL FAR * LPFN_WSARECVMSG) ( (PASCAL FAR * LPFN_WSARECVMSG) (
IN SOCKET s, __in SOCKET s,
IN OUT LPWSAMSG lpMsg, __inout LPWSAMSG lpMsg,
__out_opt LPDWORD lpdwNumberOfBytesRecvd, __out_opt LPDWORD lpdwNumberOfBytesRecvd,
IN LPWSAOVERLAPPED lpOverlapped, __inout_opt LPWSAOVERLAPPED lpOverlapped,
IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine __in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
); );
#define WSAID_WSARECVMSG \ #define WSAID_WSARECVMSG \
{0xf689d7c8,0x6f1f,0x436b,{0x8a,0x53,0xe5,0x4f,0xe3,0x51,0xc3,0x22}} {0xf689d7c8,0x6f1f,0x436b,{0x8a,0x53,0xe5,0x4f,0xe3,0x51,0xc3,0x22}}
#endif //(_WIN32_WINNT >= 0x0501) #endif //(_WIN32_WINNT >= 0x0501)
#if(_WIN32_WINNT >= 0x0600) #if(_WIN32_WINNT >= 0x0600)
/* /*
skipping to change at line 477 skipping to change at line 478
* MSG_DONTROUTE * MSG_DONTROUTE
* MSG_PARTIAL (a.k.a. MSG_EOR) (only for non-stream sockets) * MSG_PARTIAL (a.k.a. MSG_EOR) (only for non-stream sockets)
* MSG_OOB (only for stream style sockets) (NYI) * MSG_OOB (only for stream style sockets) (NYI)
* *
* Caller must provide either lpOverlapped or lpCompletionRoutine * Caller must provide either lpOverlapped or lpCompletionRoutine
* or neither (both NULL). * or neither (both NULL).
*/ */
typedef typedef
INT INT
(PASCAL FAR * LPFN_WSASENDMSG) ( (PASCAL FAR * LPFN_WSASENDMSG) (
IN SOCKET s, __in SOCKET s,
IN LPWSAMSG lpMsg, __in LPWSAMSG lpMsg,
IN DWORD dwFlags, __in DWORD dwFlags,
__out_opt LPDWORD lpNumberOfBytesSent, __out_opt LPDWORD lpNumberOfBytesSent,
IN LPWSAOVERLAPPED lpOverlapped OPTIONAL, __inout_opt LPWSAOVERLAPPED lpOverlapped OPTIONAL,
IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL __in_opt LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL
); );
#define WSAID_WSASENDMSG /* a441e712-754f-43ca-84a7-0dee44cf606d */ \ #define WSAID_WSASENDMSG /* a441e712-754f-43ca-84a7-0dee44cf606d */ \
{0xa441e712,0x754f,0x43ca,{0x84,0xa7,0x0d,0xee,0x44,0xcf,0x60,0x6d}} {0xa441e712,0x754f,0x43ca,{0x84,0xa7,0x0d,0xee,0x44,0xcf,0x60,0x6d}}
// //
// WSAPoll // WSAPoll
// //
typedef typedef
INT INT
(WSAAPI *LPFN_WSAPOLL)( (WSAAPI *LPFN_WSAPOLL)(
IN OUT LPWSAPOLLFD fdarray, __inout LPWSAPOLLFD fdarray,
IN ULONG nfds, __in ULONG nfds,
IN INT timeout __in INT timeout
); );
#define WSAID_WSAPOLL \ #define WSAID_WSAPOLL \
{0x18C76F85,0xDC66,0x4964,{0x97,0x2E,0x23,0xC2,0x72,0x38,0x31,0x2B}} {0x18C76F85,0xDC66,0x4964,{0x97,0x2E,0x23,0xC2,0x72,0x38,0x31,0x2B}}
#endif //(_WIN32_WINNT >= 0x0600) #endif //(_WIN32_WINNT >= 0x0600)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 20 change blocks. 
84 lines changed or deleted 83 lines changed or added


 nspapi.h (6.0.6002.18005-Windows 6.0)   nspapi.h (6.1.7601.18254-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


 ws2spi.h (6.0.6002.18005-Windows 6.0)   ws2spi.h (6.1.7601.18254-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

This html diff was produced by rfcdiff 1.41.