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

[Alexandre Julliard]

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

Author: Zebediah Figura 
Date:   Wed Jul  7 20:16:41 2021 -0500

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

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

---

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 63f9bab36de..c334be246bb 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1753,6 +1753,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
         case IOCTL_AFD_WINE_GET_IP_MULTICAST_IF:
             return do_getsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_IF, out_buffer, out_size );

+        case IOCTL_AFD_WINE_SET_IP_MULTICAST_IF:
+            return do_setsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_IF, 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 f8784b094ae..031fad1df3e 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3648,6 +3648,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
         case WS_IP_HDRINCL:
             return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_HDRINCL, optval, optlen );

+        case WS_IP_MULTICAST_IF:
+            return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_IF, optval, optlen );
+
         case WS_IP_UNBLOCK_SOURCE:
         {
             WS_IP_MREQ_SOURCE* val = (void*)optval;
@@ -3661,7 +3664,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
             convert_sockopt(&level, &optname);
             break;
         }
-        case WS_IP_MULTICAST_IF:
         case WS_IP_MULTICAST_LOOP:
         case WS_IP_MULTICAST_TTL:
         case WS_IP_OPTIONS:
diff --git a/include/wine/afd.h b/include/wine/afd.h
index ad597b9814b..ce92651274d 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -191,6 +191,7 @@ struct afd_get_events_params
 #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)

struct afd_create_params
 {