Zebediah Figura : ws2_32: Move the setsockopt(IPV6_MULTICAST_HOPS) implementation to ntdll.

[Alexandre Julliard]

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

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Wed Jul 28 16:18:09 2021 -0500

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

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

---

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

diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index 85763d032ed..12a6ef418ba 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1867,6 +1867,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
         case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS:
             return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, out_buffer, out_size );
 
+        case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS:
+            return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, in_buffer, in_size );
+
         default:
         {
             if ((code >> 16) == FILE_DEVICE_NETWORK)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 9c2d58827ba..902f9e07b48 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3627,8 +3627,10 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
         case WS_IPV6_DROP_MEMBERSHIP:
             return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP, optval, optlen );
 
-        case WS_IPV6_MULTICAST_IF:
         case WS_IPV6_MULTICAST_HOPS:
+            return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, optval, optlen );
+
+        case WS_IPV6_MULTICAST_IF:
         case WS_IPV6_MULTICAST_LOOP:
         case WS_IPV6_UNICAST_HOPS:
 #ifdef IPV6_UNICAST_IF
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 0f04cc824a8..2c0f1a1e23c 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -212,6 +212,7 @@ struct afd_get_events_params
 #define IOCTL_AFD_WINE_SET_IPV6_DONTFRAG                WINE_AFD_IOC(267)
 #define IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP         WINE_AFD_IOC(268)
 #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS          WINE_AFD_IOC(269)
+#define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS          WINE_AFD_IOC(270)
 
 struct afd_create_params
 {