Zebediah Figura : ws2_32: Move the getsockopt(IP_HDRINCL) implementation to ntdll.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 342795edb3e75b10e7e3b34f378b2f976ae5e356
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=342795edb3e75b10e7e3b34f3...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Wed Jul  7 20:16:38 2021 -0500

ws2_32: Move the getsockopt(IP_HDRINCL) implementation to ntdll.

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ntdll/unix/socket.c | 5 +++++
 dlls/ws2_32/socket.c     | 4 ++--
 include/wine/afd.h       | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index 46ed673b81e..1fbe1c8b663 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1742,6 +1742,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
         case IOCTL_AFD_WINE_SET_IP_DROP_SOURCE_MEMBERSHIP:
             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 );
+#endif
+
         default:
         {
             if ((code >> 16) == FILE_DEVICE_NETWORK)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 09f04fff60f..e38ca770ce5 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2436,9 +2436,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
         case WS_IP_DONTFRAGMENT:
             return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_DONTFRAGMENT, optval, optlen );
 
-#ifdef IP_HDRINCL
         case WS_IP_HDRINCL:
-#endif
+            return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_HDRINCL, optval, optlen );
+
         case WS_IP_MULTICAST_IF:
         case WS_IP_MULTICAST_LOOP:
         case WS_IP_MULTICAST_TTL:
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 93c1744c031..3b293cc49f2 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -188,6 +188,7 @@ 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)
 
 struct afd_create_params
 {