system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-04 20:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ws2_32: Move the setsockopt(SO_OOBINLINE) implementation to ntdll.

Browse source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-06-24 22:32:50 -05:00 committed by Alexandre Julliard
parent afa71f9a12
commit 061e85a548
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/ntdll/unix/socket.c
View file

@ -1649,6 +1649,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
case IOCTL_AFD_WINE_GET_SO_OOBINLINE: case IOCTL_AFD_WINE_GET_SO_OOBINLINE:
return do_getsockopt( handle, io, SOL_SOCKET, SO_OOBINLINE, out_buffer, out_size ); return do_getsockopt( handle, io, SOL_SOCKET, SO_OOBINLINE, out_buffer, out_size );
case IOCTL_AFD_WINE_SET_SO_OOBINLINE:
return do_setsockopt( handle, io, SOL_SOCKET, SO_OOBINLINE, in_buffer, in_size );
default: default:
{ {
if ((code >> 16) == FILE_DEVICE_NETWORK) if ((code >> 16) == FILE_DEVICE_NETWORK)

4
dlls/ws2_32/socket.c
View file

@ -3556,6 +3556,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
case WS_SO_LINGER: case WS_SO_LINGER:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_LINGER, optval, optlen ); return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_LINGER, optval, optlen );
case WS_SO_OOBINLINE:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_OOBINLINE, optval, optlen );
/* Some options need some conversion before they can be sent to /* Some options need some conversion before they can be sent to
* setsockopt. The conversions are done here, then they will fall through * setsockopt. The conversions are done here, then they will fall through
* to the general case. Special options that are not passed to * to the general case. Special options that are not passed to
@ -3583,7 +3586,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
/* The options listed here don't need any special handling. Thanks to /* The options listed here don't need any special handling. Thanks to
* the conversion happening above, options from there will fall through * the conversion happening above, options from there will fall through
* to this, too.*/ * to this, too.*/
case WS_SO_OOBINLINE:
/* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics. /* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics.
* however, using it the BSD way fixes bug 8513 and seems to be what * however, using it the BSD way fixes bug 8513 and seems to be what
* most programmers assume, anyway */ * most programmers assume, anyway */

1
include/wine/afd.h
View file

@ -168,6 +168,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_GET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 225, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 225, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_SET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 226, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 226, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_GET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 227, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 227, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_SET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 228, METHOD_BUFFERED, FILE_ANY_ACCESS)
struct afd_create_params struct afd_create_params
{ {