[RPCRT4] Call WSAStartup in rpcrt4_ip_tcp_get_top_of_tower

This fixes the crash in the rpc winetest.

diff --git a/dll/win32/rpcrt4/rpc_transport.c b/dll/win32/rpcrt4/rpc_transport.c
index be0d052..9edc2ee 100644 (file)
--- a/dll/win32/rpcrt4/rpc_transport.c
+++ b/dll/win32/rpcrt4/rpc_transport.c
@@ -1257,6 +1257,18 @@ static size_t rpcrt4_ip_tcp_get_top_of_tower(unsigned char *tower_data,
     hints.ai_canonname      = NULL;
     hints.ai_next           = NULL;
 
+#ifdef __REACTOS__
+    static BOOL wsa_inited;
+    if (!wsa_inited)
+    {
+        WSADATA wsadata;
+        WSAStartup(MAKEWORD(2, 2), &wsadata);
+        /* Note: WSAStartup can be called more than once so we don't bother with
+         * making accesses to wsa_inited thread-safe */
+        wsa_inited = TRUE;
+    }
+#endif
+
     ret = getaddrinfo(networkaddr, endpoint, &hints, &ai);
     if (ret)
     {

diff --git a/dll/win32/rpcrt4/rpcrt4_ros.diff b/dll/win32/rpcrt4/rpcrt4_ros.diff
index 83aaa1e..ff46dad 100644 (file)
--- a/dll/win32/rpcrt4/rpcrt4_ros.diff
+++ b/dll/win32/rpcrt4/rpcrt4_ros.diff
@@ -257,3 +257,22 @@ diff -pudN e:\wine\dlls\rpcrt4/rpc_transport.c e:\reactos\dll\win32\rpcrt4/rpc_t
                  break;
              }
          }
+@@ -1257,6 +1257,18 @@ static size_t rpcrt4_ip_tcp_get_top_of_tower(unsigned char *tower_data,
+     hints.ai_canonname      = NULL;
+     hints.ai_next           = NULL;
+ 
++#ifdef __REACTOS__
++    static BOOL wsa_inited;
++    if (!wsa_inited)
++    {
++        WSADATA wsadata;
++        WSAStartup(MAKEWORD(2, 2), &wsadata);
++        /* Note: WSAStartup can be called more than once so we don't bother with
++         * making accesses to wsa_inited thread-safe */
++        wsa_inited = TRUE;
++    }
++#endif
++
+     ret = getaddrinfo(networkaddr, endpoint, &hints, &ai);
+     if (ret)
+     {