From 32f296b6d587cc376f1de7924c15767beb2d0f8d Mon Sep 17 00:00:00 2001
From: Kirill Smelkov <kirr@landau.phys.spbu.ru>
Date: Thu, 11 Dec 2003 05:16:48 +0000
Subject: [PATCH] Added stub and prototype for WSAJoinLeaf.

---
 dlls/winsock/socket.c    | 35 +++++++++++++++++++++++++++++++++++
 dlls/winsock/ws2_32.spec |  6 +++---
 include/winsock2.h       |  9 +++++++--
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index 502c57d4229..6eae78693ad 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -1582,6 +1582,24 @@ u_short WINAPI WS_htons(u_short hostshort)
     return htons(hostshort);
 }
 
+/***********************************************************************
+ *		WSAHtonl		(WS2_32.46)
+ */
+int WINAPI WSAHtonl(SOCKET s, u_long hostlong, ulong *lpnetlong)
+{
+    FIXME("stub.\n");
+    return INVALID_SOCKET;
+}
+
+/***********************************************************************
+ *		WSAHtons		(WS2_32.47)
+ */
+int WINAPI WSAHtons(SOCKET s, u_short hostshort, ushort *lpnetshort)
+{
+    FIXME("stub.\n");
+    return INVALID_SOCKET;
+}
+
 
 /***********************************************************************
  *		inet_addr		(WINSOCK.10)
@@ -2833,6 +2851,23 @@ SOCKET WINAPI WSASocketA(int af, int type, int protocol,
     return INVALID_SOCKET;
 }
 
+/***********************************************************************
+ *      WSAJoinLeaf          (WS2_32.58)
+ *
+ */
+SOCKET WINAPI WSAJoinLeaf(
+        SOCKET s,
+        const struct WS_sockaddr *addr,
+        int addrlen,
+        LPWSABUF lpCallerData,
+        LPWSABUF lpCalleeData,
+        LPQOS lpSQOS,
+        LPQOS lpGQOS,
+        DWORD dwFlags)
+{
+    FIXME("stub.\n");
+    return INVALID_SOCKET;
+}
 
 /***********************************************************************
  *      __WSAFDIsSet			(WS2_32.151)
diff --git a/dlls/winsock/ws2_32.spec b/dlls/winsock/ws2_32.spec
index 9612b1c0c10..43f5937594c 100644
--- a/dlls/winsock/ws2_32.spec
+++ b/dlls/winsock/ws2_32.spec
@@ -47,8 +47,8 @@
 43  stub     WSAGetServiceClassInfoW
 44  stub     WSAGetServiceClassNameByClassIdA
 45  stub     WSAGetServiceClassNameByClassIdW
-46  stub     WSAHtonl
-47  stub     WSAHtons
+46  stdcall  WSAHtonl(long long ptr)
+47  stdcall  WSAHtons(long long ptr)
 48  stdcall  WSAInstallServiceClassA(ptr)
 49  stdcall  WSAInstallServiceClassW(ptr)
 50  stdcall  WSAIoctl(long long ptr long ptr long ptr ptr ptr)
@@ -59,7 +59,7 @@
 55  stdcall  getservbyname(str str) WS_getservbyname
 56  stdcall  getservbyport(long str) WS_getservbyport
 57  stdcall  gethostname(ptr long) WS_gethostname
-58  stub     WSAJoinLeaf
+58  stdcall  WSAJoinLeaf(long ptr long ptr ptr ptr ptr long)
 59  stub     WSALookupServiceBeginA
 60  stub     WSALookupServiceBeginW
 61  stub     WSALookupServiceEnd
diff --git a/include/winsock2.h b/include/winsock2.h
index f2488d2e0a9..566263b9b9a 100644
--- a/include/winsock2.h
+++ b/include/winsock2.h
@@ -137,6 +137,11 @@ extern "C" {
 #define WSA_FLAG_MULTIPOINT_D_ROOT 0x08
 #define WSA_FLAG_MULTIPOINT_D_LEAF 0x10
 
+/* Constants for WSAJoinLeaf() */
+#define JL_SENDER_ONLY    0x01
+#define JL_RECEIVER_ONLY  0x02
+#define JL_BOTH           0x04
+
 
 #ifndef GUID_DEFINED
 #include <guiddef.h>
@@ -426,7 +431,7 @@ int WINAPI WSAInstallServiceClassA(LPWSASERVICECLASSINFOA);
 int WINAPI WSAInstallServiceClassW(LPWSASERVICECLASSINFOW);
 #define WSAInstallServiceClass     WINELIB_NAME_AW(WSAInstallServiceClass)
 int WINAPI WSAIoctl(SOCKET,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-/* WSAJoinLeaf */
+SOCKET WINAPI WSAJoinLeaf(SOCKET,const struct WS(sockaddr)*,int,LPWSABUF,LPWSABUF,LPQOS,LPQOS,DWORD);
 /* WSALookupServiceBeginA */
 /* WSALookupServiceBeginW */
 /* WSALookupServiceEnd */
@@ -491,7 +496,7 @@ typedef int (WINAPI *LPFN_WSAHTONS)(SOCKET,u_short,u_short*);
 typedef int (WINAPI LPFN_WSAINSTALLSERVICECLASSA)(LPWSASERVICECLASSINFOA);
 typedef int (WINAPI LPFN_WSAINSTALLSERVICECLASSW)(LPWSASERVICECLASSINFOW);
 typedef int (WINAPI *LPFN_WSAIOCTL)(SOCKET,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-/* WSAJoinLeaf */
+typedef int (WINAPI *LPFN_WSAJOINLEAF)(SOCKET,const struct WS(sockaddr)*,int,LPWSABUF,LPWSABUF,LPQOS,LPQOS,DWORD);
 /* WSALookupServiceBeginA */
 /* WSALookupServiceBeginW */
 /* WSALookupServiceEnd */