From 8397e3da735c87295d1ae71e3e1650be0c52d28c Mon Sep 17 00:00:00 2001 From: Philipp Hoppermann Date: Sat, 23 Jul 2016 01:21:23 -0300 Subject: [PATCH] ws2_32: Implement InetNtopW. Signed-off-by: Philipp Hoppermann Signed-off-by: Bruno Jesus <00cpxxx@gmail.com> Signed-off-by: Alexandre Julliard --- dlls/ws2_32/socket.c | 20 ++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + 2 files changed, 21 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b0af3d701c8..79ccfc283c4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7933,6 +7933,26 @@ INT WINAPI InetPtonW(INT family, PCWSTR addr, PVOID buffer) return ret; } +/*********************************************************************** + * InetNtopW (WS2_32.@) + */ +PCWSTR WINAPI InetNtopW(INT family, PVOID addr, PWSTR buffer, SIZE_T len) +{ + char bufferA[WS_INET6_ADDRSTRLEN]; + PWSTR ret = NULL; + + TRACE("family %d, addr (%p), buffer (%p), len %ld\n", family, addr, buffer, len); + + if (WS_inet_ntop(family, addr, bufferA, sizeof(bufferA))) + { + if (MultiByteToWideChar(CP_ACP, 0, bufferA, -1, buffer, len)) + ret = buffer; + else + SetLastError(ERROR_INVALID_PARAMETER); + } + return ret; +} + /*********************************************************************** * WSAStringToAddressA (WS2_32.80) */ diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 7625f38a0c3..0482b7d05ea 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -54,6 +54,7 @@ @ stdcall GetAddrInfoExW(wstr wstr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall GetNameInfoW(ptr long ptr long ptr long long) +@ stdcall InetNtopW(long ptr ptr long) @ stdcall InetPtonW(long wstr ptr) @ stdcall WSApSetPostRoutine(ptr) @ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr)