Headers diff for mswsock.dll between 6.3.9600.17415-Windows 8.1 and 10.0.10586.420-Windows 10 1511 10586.494 versions



 mswsock.h (6.3.9600.17415-Windows 8.1)   mswsock.h (10.0.10586.420-Windows 10 1511 10586.494) 
skipping to change at line 40 skipping to change at line 40
#define _WINSOCK_DEPRECATED_BY(replacement) __declspec(deprecated("Use " ## repl acement ## " instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprec ated API warnings")) #define _WINSOCK_DEPRECATED_BY(replacement) __declspec(deprecated("Use " ## repl acement ## " instead or define _WINSOCK_DEPRECATED_NO_WARNINGS to disable deprec ated API warnings"))
#endif #endif
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <mswsockdef.h> #include <mswsockdef.h>
#pragma region Desktop Family #pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
/* /*
* Options for connect and disconnect data and options. Used only by * Options for connect and disconnect data and options. Used only by
* non-TCP/IP transports such as DECNet, OSI TP4, etc. * non-TCP/IP transports such as DECNet, OSI TP4, etc.
*/ */
#define SO_CONNDATA 0x7000 #define SO_CONNDATA 0x7000
#define SO_CONNOPT 0x7001 #define SO_CONNOPT 0x7001
#define SO_DISCDATA 0x7002 #define SO_DISCDATA 0x7002
#define SO_DISCOPT 0x7003 #define SO_DISCOPT 0x7003
#define SO_CONNDATALEN 0x7004 #define SO_CONNDATALEN 0x7004
skipping to change at line 64 skipping to change at line 64
#define SO_DISCOPTLEN 0x7007 #define SO_DISCOPTLEN 0x7007
/* /*
* Option for opening sockets for synchronous access. * Option for opening sockets for synchronous access.
*/ */
#define SO_OPENTYPE 0x7008 #define SO_OPENTYPE 0x7008
#define SO_SYNCHRONOUS_ALERT 0x10 #define SO_SYNCHRONOUS_ALERT 0x10
#define SO_SYNCHRONOUS_NONALERT 0x20 #define SO_SYNCHRONOUS_NONALERT 0x20
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
/* /*
* Other NT-specific options. * Other NT-specific options.
*/ */
#define SO_MAXDG 0x7009 #define SO_MAXDG 0x7009
#define SO_MAXPATHDG 0x700A #define SO_MAXPATHDG 0x700A
#define SO_UPDATE_ACCEPT_CONTEXT 0x700B #define SO_UPDATE_ACCEPT_CONTEXT 0x700B
#define SO_CONNECT_TIME 0x700C #define SO_CONNECT_TIME 0x700C
#if(_WIN32_WINNT >= 0x0501) #if(_WIN32_WINNT >= 0x0501)
skipping to change at line 92 skipping to change at line 92
/* /*
* MS Transport Provider IOCTL to control * MS Transport Provider IOCTL to control
* reporting PORT_UNREACHABLE messages * reporting PORT_UNREACHABLE messages
* on UDP sockets via recv/WSARecv/etc. * on UDP sockets via recv/WSARecv/etc.
* Pass TRUE in input buffer to enable (default if supported), * Pass TRUE in input buffer to enable (default if supported),
* FALSE to disable. * FALSE to disable.
*/ */
#define SIO_UDP_CONNRESET _WSAIOW(IOC_VENDOR,12) #define SIO_UDP_CONNRESET _WSAIOW(IOC_VENDOR,12)
#pragma region Desktop Family #pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
#if((_WIN32_WINNT < 0x0600) && (_WIN32_WINNT >= 0x0501)) #if((_WIN32_WINNT < 0x0600) && (_WIN32_WINNT >= 0x0501))
/* /*
* MS Transport Provider IOCTL to request * MS Transport Provider IOCTL to request
* notification when a given socket is closed. * notification when a given socket is closed.
* Input buffer must be a pointer to the socket handle. * Input buffer must be a pointer to the socket handle.
* Input buffer size must be exactly sizeof(HANDLE). * Input buffer size must be exactly sizeof(HANDLE).
* Output buffer and output buffer length must be * Output buffer and output buffer length must be
* NULL and 0 respectively. This IOCTL must always * NULL and 0 respectively. This IOCTL must always
* be issued with an overlapped structure. * be issued with an overlapped structure.
* *
* This Ioctl code is available only on WinXP SP2 and Win2k3 SP1. * This Ioctl code is available only on WinXP SP2 and Win2k3 SP1.
*/ */
#define SIO_SOCKET_CLOSE_NOTIFY _WSAIOW(IOC_VENDOR,13) #define SIO_SOCKET_CLOSE_NOTIFY _WSAIOW(IOC_VENDOR,13)
#endif //(_WIN32_WINNT < 0x0600 && _WIN32_WINNT >= 0x0501) #endif //(_WIN32_WINNT < 0x0600 && _WIN32_WINNT >= 0x0501)
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
/* /*
* MS Transport Provider IOCTL to control * MS Transport Provider IOCTL to control
* reporting NET_UNREACHABLE (TTL expired) messages * reporting NET_UNREACHABLE (TTL expired) messages
* on UDP sockets via recv/WSARecv/Etc. * on UDP sockets via recv/WSARecv/Etc.
* Pass TRUE in input buffer to enabled (default if supported), * Pass TRUE in input buffer to enabled (default if supported),
* FALSE to disable. * FALSE to disable.
*/ */
#define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR,15) #define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR,15)
/* /*
* Microsoft extended APIs. * Microsoft extended APIs.
*/ */
#pragma region Desktop Family #pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
_WINSOCK_DEPRECATED_BY("WSARecv()") _WINSOCK_DEPRECATED_BY("WSARecv()")
#if(_WIN32_WINNT < 0x0600) #if(_WIN32_WINNT < 0x0600)
int int
PASCAL FAR PASCAL FAR
WSARecvEx( WSARecvEx(
_In_ SOCKET s, _In_ SOCKET s,
_Out_writes_bytes_to_(len, return) char FAR *buf, _Out_writes_bytes_to_(len, return) char FAR *buf,
_In_ int len, _In_ int len,
_Inout_ int FAR *flags _Inout_ int FAR *flags
); );
#else //(_WIN32_WINNT < 0x0600) #else //(_WIN32_WINNT < 0x0600)
INT INT
PASCAL FAR PASCAL FAR
WSARecvEx( WSARecvEx(
_In_ SOCKET s, _In_ SOCKET s,
_Out_writes_bytes_to_(len, return) CHAR FAR *buf, _Out_writes_bytes_to_(len, return) CHAR FAR *buf,
_In_ INT len, _In_ INT len,
_Inout_ INT FAR *flags _Inout_ INT FAR *flags
); );
#endif //(_WIN32_WINNT < 0x0600) #endif //(_WIN32_WINNT < 0x0600)
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
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
skipping to change at line 330 skipping to change at line 330
_Inout_opt_ 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
#pragma region Desktop Family #pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
/* /*
* 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.
*/ */
// {6642243A-3BA8-4aa6-BAA5-2E0BD71FDD83} // {6642243A-3BA8-4aa6-BAA5-2E0BD71FDD83}
#define NLA_NAMESPACE_GUID \ #define NLA_NAMESPACE_GUID \
{0x6642243a,0x3ba8,0x4aa6,{0xba,0xa5,0x2e,0xb,0xd7,0x1f,0xdd,0x83}} {0x6642243a,0x3ba8,0x4aa6,{0xba,0xa5,0x2e,0xb,0xd7,0x1f,0xdd,0x83}}
skipping to change at line 416 skipping to change at line 416
DWORD state; DWORD state;
WCHAR machineName[256]; WCHAR machineName[256];
WCHAR sharedAdapterName[256]; WCHAR sharedAdapterName[256];
} remote; } remote;
} ICS; } ICS;
} data; } data;
} NLA_BLOB, *PNLA_BLOB, * FAR LPNLA_BLOB; } NLA_BLOB, *PNLA_BLOB, * FAR LPNLA_BLOB;
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
/* /*
* 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,
skipping to change at line 440 skipping to change at line 440
_In_opt_ 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)
#pragma region Desktop Family #pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
/* /*
* Ioctl codes for translating socket handles to the base provider handle. * Ioctl codes for translating socket handles to the base provider handle.
* This is performed to prevent breaking non-IFS LSPs when new Winsock extension * This is performed to prevent breaking non-IFS LSPs when new Winsock extension
* funtions are added. * funtions are added.
*/ */
#define SIO_BSP_HANDLE _WSAIOR(IOC_WS2,27) #define SIO_BSP_HANDLE _WSAIOR(IOC_WS2,27)
#define SIO_BSP_HANDLE_SELECT _WSAIOR(IOC_WS2,28) #define SIO_BSP_HANDLE_SELECT _WSAIOR(IOC_WS2,28)
#define SIO_BSP_HANDLE_POLL _WSAIOR(IOC_WS2,29) #define SIO_BSP_HANDLE_POLL _WSAIOR(IOC_WS2,29)
/* /*
* Ioctl code used to translate a socket handle into the base provider's handle. * Ioctl code used to translate a socket handle into the base provider's handle.
* This is not used by any Winsock extension function and should not be intercep ted * This is not used by any Winsock extension function and should not be intercep ted
* by Winsock LSPs. * by Winsock LSPs.
*/ */
#define SIO_BASE_HANDLE _WSAIOR(IOC_WS2,34) #define SIO_BASE_HANDLE _WSAIOR(IOC_WS2,34)
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
/* /*
* Ioctl codes for Winsock extension functions. * Ioctl codes for Winsock extension functions.
*/ */
#define SIO_EXT_SELECT _WSAIORW(IOC_WS2,30) #define SIO_EXT_SELECT _WSAIORW(IOC_WS2,30)
#define SIO_EXT_POLL _WSAIORW(IOC_WS2,31) #define SIO_EXT_POLL _WSAIORW(IOC_WS2,31)
#define SIO_EXT_SENDMSG _WSAIORW(IOC_WS2,32) #define SIO_EXT_SENDMSG _WSAIORW(IOC_WS2,32)
#pragma warning(push) #pragma warning(push)
 End of changes. 10 change blocks. 
15 lines changed or deleted 15 lines changed or added


 nspapi.h (6.3.9600.17415-Windows 8.1)   nspapi.h (10.0.10586.420-Windows 10 1511 10586.494) 
skipping to change at line 32 skipping to change at line 32
use definitions from base files rather than redefine here. use definitions from base files rather than redefine here.
Unfortunately, so such base file exists. Unfortunately, so such base file exists.
--*/ --*/
#ifndef _NSPAPI_INCLUDED #ifndef _NSPAPI_INCLUDED
#define _NSPAPI_INCLUDED #define _NSPAPI_INCLUDED
#include <winapifamily.h> #include <winapifamily.h>
#pragma region Desktop Family #pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#ifndef _tagBLOB_DEFINED #ifndef _tagBLOB_DEFINED
#define _tagBLOB_DEFINED #define _tagBLOB_DEFINED
#define _BLOB_DEFINED #define _BLOB_DEFINED
#define _LPBLOB_DEFINED #define _LPBLOB_DEFINED
typedef struct _BLOB { typedef struct _BLOB {
skipping to change at line 687 skipping to change at line 687
#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 */
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
#endif // _NSPAPI_INCLUDED #endif // _NSPAPI_INCLUDED
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 ws2spi.h (6.3.9600.17415-Windows 8.1)   ws2spi.h (10.0.10586.420-Windows 10 1511 10586.494) 
skipping to change at line 23 skipping to change at line 23
*/ */
#ifndef _WINSOCK2SPI_ #ifndef _WINSOCK2SPI_
#define _WINSOCK2SPI_ #define _WINSOCK2SPI_
#if _MSC_VER > 1000 #if _MSC_VER > 1000
#pragma once #pragma once
#endif #endif
#include <winapifamily.h> #include <winapifamily.h>
#pragma region Desktop Family #pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
/* /*
* Pull in WINSOCK2.H if necessary * Pull in WINSOCK2.H if necessary
*/ */
#ifndef _WINSOCK2API_ #ifndef _WINSOCK2API_
#include <winsock2.h> #include <winsock2.h>
#endif /* _WINSOCK2API_ */ #endif /* _WINSOCK2API_ */
/* /*
skipping to change at line 1468 skipping to change at line 1468
#endif //(_WIN32_WINNT >= 0x0600) #endif //(_WIN32_WINNT >= 0x0600)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#if !defined(_WIN64) #if !defined(_WIN64)
#include <poppack.h> #include <poppack.h>
#endif #endif
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
#endif /* _WINSOCK2SPI_ */ #endif /* _WINSOCK2SPI_ */
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41.