[PATCH v28 2/7] ntdll/unix: Add support for AF_UNIX sockets to multiple functions.

[Ally Sommers]

From: Ally Sommers

---
 dlls/ntdll/unix/socket.c | 33 +++++++++++++++++++++++++++++++++
 dlls/ws2_32/socket.c     | 17 +++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index 4e706323a0a..51a6a6e8f47 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -66,6 +66,8 @@
 # define HAS_IRDA
 #endif

+#include <sys/un.h>
+
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include "windef.h"
@@ -77,6 +79,7 @@
 #include "ws2tcpip.h"
 #include "wsipx.h"
 #include "af_irda.h"
+#include "afunix.h"
 #include "wine/afd.h"

#include "unix_private.h"
@@ -105,6 +108,7 @@ union unix_sockaddr
 #ifdef HAS_IRDA
     struct sockaddr_irda irda;
 #endif
+    struct sockaddr_un un;
 };

struct async_recv_ioctl
@@ -289,6 +293,17 @@ static socklen_t sockaddr_to_unix( const struct WS_sockaddr *wsaddr, int wsaddrl
             return sizeof(uaddr->in6);
         }

+    case WS_AF_UNIX:
+    {
+        struct WS_sockaddr_un win = {0};
+
+        if (wsaddrlen < sizeof(win)) return 0;
+        memcpy( &win, wsaddr, sizeof(win) );
+        uaddr->un.sun_family = AF_UNIX;
+        memcpy( uaddr->un.sun_path, win.sun_path, sizeof(win.sun_path) );
+        return sizeof(uaddr->un);
+    }
+
     default:
         FIXME( "unknown address family %u\n", wsaddr->sa_family );
         return 0;
@@ -361,6 +376,17 @@ static int sockaddr_from_unix( const union unix_sockaddr *uaddr, struct WS_socka
     }
 #endif

+    case AF_UNIX:
+    {
+        struct WS_sockaddr_un win = {0};
+
+        if (wsaddrlen < sizeof(win)) return -1;
+        win.sun_family = WS_AF_UNIX;
+        memcpy( win.sun_path, uaddr->un.sun_path, sizeof(win.sun_path) );
+        memcpy( wsaddr, &win, sizeof(win) );
+        return sizeof(win);
+    }
+
     case AF_UNSPEC:
         return 0;

@@ -1926,6 +1952,13 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
                 break;
             }

+            if (unix_addr.addr.sa_family == AF_UNIX)
+            {
+                FIXME( "getpeername called on AF_UNIX socket\n" );
+                status = STATUS_NOT_SUPPORTED;
+                break;
+            }
+
             len = sockaddr_from_unix( &unix_addr, out_buffer, out_size );
             if (out_size < len)
             {
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 710ec8cbb26..234d68e0b7c 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -167,6 +167,22 @@ static const WSAPROTOCOL_INFOW supported_protocols[] =
         .dwMessageSize = UINT_MAX,
         .szProtocol = L"SPX II",
     },
+<<<<<<< HEAD
+=======
+    {
+        .dwServiceFlags1 = XP1_GUARANTEED_DELIVERY | XP1_GUARANTEED_ORDER | XP1_IFS_HANDLES,
+        .dwProviderFlags = PFL_MATCHES_PROTOCOL_ZERO,
+        .ProviderId = {0xa00943d9, 0x9c2e, 0x4633, {0x9b, 0x59, 0x00, 0x57, 0xa3, 0x16, 0x09, 0x94}},
+        .dwCatalogEntryId = 1007,
+        .ProtocolChain.ChainLen = 1,
+        .iVersion = 2,
+        .iAddressFamily = AF_UNIX,
+        .iMaxSockAddr = sizeof(struct sockaddr_un),
+        .iMinSockAddr = offsetof(struct sockaddr_un, sun_path),
+        .iSocketType = SOCK_STREAM,
+        .szProtocol = L"AF_UNIX",
+    }
+>>>>>>> d592fbd7db8 (add support fix)
 };

DECLARE_CRITICAL_SECTION(cs_socket_list);
@@ -1238,6 +1254,7 @@ int WINAPI connect( SOCKET s, const struct sockaddr *addr, int len )
     status = NtDeviceIoControlFile( (HANDLE)s, sync_event, NULL, NULL, &io, IOCTL_AFD_WINE_CONNECT,
                                     params, sizeof(*params) + len, NULL, 0 );
     free( params );
+    free( unix_path );
     if (status == STATUS_PENDING)
     {
         if (wait_event_alertable( sync_event ) == WAIT_FAILED) return -1;