Francois Gouget : winsock: Tweak getnameinfo() prototype.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Feb 24 14:29:54 CST 2006
Module: wine
Branch: refs/heads/master
Commit: dcb90635f8b4acad25685a21167105967281ab2a
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dcb90635f8b4acad25685a21167105967281ab2a
Author: Francois Gouget <fgouget at free.fr>
Date: Fri Feb 24 15:58:09 2006 +0100
winsock: Tweak getnameinfo() prototype.
Tweak the getnameinfo() prototype to better match the Windows PSDK and
the GetNameInfoW() prototype.
Update win32.api.
---
dlls/winsock/socket.c | 4 ++--
include/ws2tcpip.h | 2 +-
tools/winapi/win32.api | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index a07c5b4..8ca3a3e 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -3235,8 +3235,8 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename
return EAI_FAIL;
}
-int WINAPI WS_getnameinfo(const struct WS_sockaddr *sa, socklen_t salen, char *host,
- DWORD hostlen, char *serv, DWORD servlen, int flags)
+int WINAPI WS_getnameinfo(const SOCKADDR *sa, socklen_t salen, PCHAR host,
+ DWORD hostlen, PCHAR serv, DWORD servlen, INT flags)
{
#if HAVE_GETNAMEINFO
int ret;
diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h
index 16efab6..9847dab 100644
--- a/include/ws2tcpip.h
+++ b/include/ws2tcpip.h
@@ -215,7 +215,7 @@ int WINAPI WS(getaddrinfo)(const char*,
#define GetAddrInfoA WS(getaddrinfo)
int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*);
#define GetAddrInfo WINELIB_NAME_AW(GetAddrInfo)
-int WINAPI WS(getnameinfo)(const struct WS(sockaddr)*,socklen_t,char*,DWORD,char*,DWORD,int);
+int WINAPI WS(getnameinfo)(const SOCKADDR*,socklen_t,PCHAR,DWORD,PCHAR,DWORD,INT);
#define GetNameInfoA WS(getnameinfo)
INT WINAPI GetNameInfoW(const SOCKADDR*,socklen_t,PWCHAR,DWORD,PWCHAR,DWORD,INT);
#define GetNameInfo WINELIB_NAME_AW(GetNameInfo)
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index aa19883..8911a2d 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -5347,6 +5347,7 @@ WSAESETSERVICEOP
WSAEVENT
int
long
+socklen_t
u_long
u_short
@@ -5378,6 +5379,7 @@ LPWSAQUERYSETW
LPWSASERVICECLASSINFOA
LPWSASERVICECLASSINFOW
PADDRINFOW *
+SOCKADDR *
WS_fd_set *
int *
struct WS_addrinfo *
@@ -5394,6 +5396,7 @@ u_short *
LPCSTR
LPSTR
+PCHAR
char *
%unknown
More information about the wine-cvs
mailing list