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

[Alexandre Julliard]

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

Author: Zebediah Figura 
Date:   Wed Jul 28 10:17:08 2021 -0500

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

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

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 6a9fcc168a6..2beb4f1778f 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1859,6 +1859,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
         }
 #endif

+#ifdef IPV6_DROP_MEMBERSHIP
+        case IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP:
+            return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, in_buffer, in_size );
+#endif
+
         default:
         {
             if ((code >> 16) == FILE_DEVICE_NETWORK)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index b436079d709..cd8bd63b88c 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3622,9 +3622,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
         case WS_IPV6_DONTFRAG:
             return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DONTFRAG, optval, optlen );

-#ifdef IPV6_DROP_MEMBERSHIP
         case WS_IPV6_DROP_MEMBERSHIP:
-#endif
+            return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP, optval, optlen );
+
         case WS_IPV6_MULTICAST_IF:
         case WS_IPV6_MULTICAST_HOPS:
         case WS_IPV6_MULTICAST_LOOP:
diff --git a/include/wine/afd.h b/include/wine/afd.h
index e1933184da0..ad12c55af12 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -210,6 +210,7 @@ struct afd_get_events_params
 #define IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP          WINE_AFD_IOC(265)
 #define IOCTL_AFD_WINE_GET_IPV6_DONTFRAG                WINE_AFD_IOC(266)
 #define IOCTL_AFD_WINE_SET_IPV6_DONTFRAG                WINE_AFD_IOC(267)
+#define IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP         WINE_AFD_IOC(268)

struct afd_create_params
 {