[PATCH v2 5/5] ws2_32: Move the getsockopt(IP_MULTICAST_LOOP) implementation to ntdll.

Zebediah Figura zfigura at codeweavers.com
Wed Jul 7 20:16:42 CDT 2021


Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 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 c334be246bb..e5abb3828c3 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1756,6 +1756,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
         case IOCTL_AFD_WINE_SET_IP_MULTICAST_IF:
             return do_setsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_IF, in_buffer, in_size );
 
+        case IOCTL_AFD_WINE_GET_IP_MULTICAST_LOOP:
+            return do_getsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_LOOP, out_buffer, out_size );
+
         default:
         {
             if ((code >> 16) == FILE_DEVICE_NETWORK)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 031fad1df3e..cb49fa4107a 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2443,6 +2443,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
             return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_MULTICAST_IF, optval, optlen );
 
         case WS_IP_MULTICAST_LOOP:
+            return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_MULTICAST_LOOP, optval, optlen );
+
         case WS_IP_MULTICAST_TTL:
         case WS_IP_OPTIONS:
 #if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR)
diff --git a/include/wine/afd.h b/include/wine/afd.h
index ce92651274d..218b65986bb 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -192,6 +192,7 @@ struct afd_get_events_params
 #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)
+#define IOCTL_AFD_WINE_GET_IP_MULTICAST_LOOP            WINE_AFD_IOC(250)
 
 struct afd_create_params
 {
-- 
2.30.2




More information about the wine-devel mailing list