[1/2] ws2_32: Implement InetNtopW (try 2)
Bruno Jesus
00cpxxx at gmail.com
Fri Jul 22 17:05:19 CDT 2016
From: Philipp Hoppermann <plata at mailbox.org>
Superseeds 124703, 124704, 124714
Fixes https://bugs.winehq.org/show_bug.cgi?id=40999
Signed-off-by: Philipp Hoppermann <plata at mailbox.org>
Signed-off-by: Bruno Jesus <00cpxxx at gmail.com>
-------------- next part --------------
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index b0af3d7..092815e 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -7934,6 +7934,32 @@ INT WINAPI InetPtonW(INT family, PCWSTR addr, PVOID buffer)
}
/***********************************************************************
+ * InetNtopW (WS2_32.@)
+ */
+PCWSTR WINAPI InetNtopW(INT family, PVOID addr, PWSTR buffer, SIZE_T len)
+{
+ char *bufferA;
+ PWSTR ret = NULL;
+
+ TRACE("family %d, addr (%p), buffer (%p), len %ld\n", family, addr, buffer, len);
+
+ if (!(bufferA = HeapAlloc(GetProcessHeap(), 0, len)))
+ {
+ SetLastError(WSA_NOT_ENOUGH_MEMORY);
+ return NULL;
+ }
+
+ if (WS_inet_ntop(family, addr, bufferA, len))
+ {
+ MultiByteToWideChar(CP_ACP, 0, bufferA, -1, buffer, len);
+ ret = buffer;
+ }
+
+ HeapFree(GetProcessHeap(), 0, bufferA);
+ return ret;
+}
+
+/***********************************************************************
* WSAStringToAddressA (WS2_32.80)
*/
INT WINAPI WSAStringToAddressA(LPSTR AddressString,
diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec
index 7625f38..5dd7138 100644
--- a/dlls/ws2_32/ws2_32.spec
+++ b/dlls/ws2_32/ws2_32.spec
@@ -55,6 +55,7 @@
@ stdcall GetAddrInfoW(wstr wstr ptr ptr)
@ stdcall GetNameInfoW(ptr long ptr long ptr long long)
@ stdcall InetPtonW(long wstr ptr)
+@ stdcall InetNtopW(long ptr ptr long)
@ stdcall WSApSetPostRoutine(ptr)
@ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr)
@ stdcall WSAAccept(long ptr ptr ptr long)
More information about the wine-patches
mailing list