mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 19:49:50 +00:00
ws2_32: Drop support for getting the IP_HDRINCL socket option.
Windows only supports setting this option, not getting it. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
1f63b16bb2
commit
e001319304
4 changed files with 10 additions and 19 deletions
|
@ -1762,9 +1762,6 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
|
|||
return do_setsockopt( handle, io, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP, in_buffer, in_size );
|
||||
|
||||
#ifdef IP_HDRINCL
|
||||
case IOCTL_AFD_WINE_GET_IP_HDRINCL:
|
||||
return do_getsockopt( handle, io, IPPROTO_IP, IP_HDRINCL, out_buffer, out_size );
|
||||
|
||||
case IOCTL_AFD_WINE_SET_IP_HDRINCL:
|
||||
return do_setsockopt( handle, io, IPPROTO_IP, IP_HDRINCL, in_buffer, in_size );
|
||||
#endif
|
||||
|
|
|
@ -1677,9 +1677,6 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl
|
|||
case IP_DONTFRAGMENT:
|
||||
return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_DONTFRAGMENT, optval, optlen );
|
||||
|
||||
case IP_HDRINCL:
|
||||
return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_HDRINCL, optval, optlen );
|
||||
|
||||
case IP_MULTICAST_IF:
|
||||
return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_MULTICAST_IF, optval, optlen );
|
||||
|
||||
|
@ -1704,6 +1701,10 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl
|
|||
case IP_UNICAST_IF:
|
||||
return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_UNICAST_IF, optval, optlen );
|
||||
|
||||
case IP_HDRINCL:
|
||||
SetLastError( WSAEINVAL );
|
||||
return -1;
|
||||
|
||||
default:
|
||||
FIXME( "unrecognized IP option %u\n", optname );
|
||||
/* fall through */
|
||||
|
|
|
@ -1437,12 +1437,9 @@ todo_wine
|
|||
k = 99;
|
||||
SetLastError(0xdeadbeef);
|
||||
err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size);
|
||||
todo_wine
|
||||
{
|
||||
ok(err == -1, "Expected -1, got %d\n", err);
|
||||
ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError());
|
||||
ok(k == 99, "Expected 99, got %d\n", k);
|
||||
}
|
||||
ok(err == -1, "Expected -1, got %d\n", err);
|
||||
ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError());
|
||||
ok(k == 99, "Expected 99, got %d\n", k);
|
||||
|
||||
size = sizeof(k);
|
||||
k = 0;
|
||||
|
@ -1453,12 +1450,9 @@ todo_wine
|
|||
k = 99;
|
||||
SetLastError(0xdeadbeef);
|
||||
err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size);
|
||||
todo_wine
|
||||
{
|
||||
ok(err == -1, "Expected -1, got %d\n", err);
|
||||
ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError());
|
||||
ok(k == 99, "Expected 99, got %d\n", k);
|
||||
}
|
||||
ok(err == -1, "Expected -1, got %d\n", err);
|
||||
ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError());
|
||||
ok(k == 99, "Expected 99, got %d\n", k);
|
||||
}
|
||||
else /* <= 2003 the tests differ between TCP and UDP, UDP silently accepts */
|
||||
{
|
||||
|
|
|
@ -187,7 +187,6 @@ struct afd_get_events_params
|
|||
#define IOCTL_AFD_WINE_SET_IP_DONTFRAGMENT WINE_AFD_IOC(243)
|
||||
#define IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP WINE_AFD_IOC(244)
|
||||
#define IOCTL_AFD_WINE_SET_IP_DROP_SOURCE_MEMBERSHIP WINE_AFD_IOC(245)
|
||||
#define IOCTL_AFD_WINE_GET_IP_HDRINCL WINE_AFD_IOC(246)
|
||||
#define IOCTL_AFD_WINE_SET_IP_HDRINCL WINE_AFD_IOC(247)
|
||||
#define IOCTL_AFD_WINE_GET_IP_MULTICAST_IF WINE_AFD_IOC(248)
|
||||
#define IOCTL_AFD_WINE_SET_IP_MULTICAST_IF WINE_AFD_IOC(249)
|
||||
|
|
Loading…
Reference in a new issue