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

Alexandre Julliard julliard at winehq.org
Fri Jul 2 14:46:38 CDT 2021


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Thu Jul  1 17:10:25 2021 -0500

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

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/unix/socket.c | 3 +++
 dlls/ws2_32/socket.c     | 2 ++
 include/wine/afd.h       | 1 +
 3 files changed, 6 insertions(+)

diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index f65feef763f..e9d275e1b41 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1678,6 +1678,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
         case IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP:
             return do_setsockopt( handle, io, IPPROTO_IP, IP_ADD_MEMBERSHIP, in_buffer, in_size );
 
+        case IOCTL_AFD_WINE_SET_IP_ADD_SOURCE_MEMBERSHIP:
+            return do_setsockopt( handle, io, IPPROTO_IP, IP_ADD_SOURCE_MEMBERSHIP, 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 87966545bb8..2ff18e3cd7d 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3628,6 +3628,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
             return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP, optval, optlen );
 
         case WS_IP_ADD_SOURCE_MEMBERSHIP:
+            return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_ADD_SOURCE_MEMBERSHIP, optval, optlen );
+
         case WS_IP_DROP_SOURCE_MEMBERSHIP:
         case WS_IP_BLOCK_SOURCE:
         case WS_IP_UNBLOCK_SOURCE:
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 5db8fb1f4de..2e4123e3611 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -182,6 +182,7 @@ struct afd_get_events_params
 #define IOCTL_AFD_WINE_GET_SO_SNDTIMEO                  WINE_AFD_IOC(237)
 #define IOCTL_AFD_WINE_SET_SO_SNDTIMEO                  WINE_AFD_IOC(238)
 #define IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP            WINE_AFD_IOC(239)
+#define IOCTL_AFD_WINE_SET_IP_ADD_SOURCE_MEMBERSHIP     WINE_AFD_IOC(240)
 
 struct afd_create_params
 {




More information about the wine-cvs mailing list