windows.winsock: use the windows api types instead of int and void*

where applicable
db4
Björn Lindqvist 2014-03-27 18:31:20 +01:00 committed by Doug Coleman
parent f8387a08ae
commit a5397756fe
1 changed files with 26 additions and 21 deletions

View File

@ -169,8 +169,8 @@ FUNCTION: int setsockopt ( SOCKET s, int level, int optname, c-string optval, in
FUNCTION: ushort htons ( ushort n ) ; FUNCTION: ushort htons ( ushort n ) ;
FUNCTION: ushort ntohs ( ushort n ) ; FUNCTION: ushort ntohs ( ushort n ) ;
FUNCTION: int bind ( void* socket, sockaddr-in* sockaddr, int len ) ; FUNCTION: int bind ( SOCKET socket, sockaddr-in* sockaddr, int len ) ;
FUNCTION: int listen ( void* socket, int backlog ) ; FUNCTION: int listen ( SOCKET socket, int backlog ) ;
FUNCTION: c-string inet_ntoa ( int in-addr ) ; FUNCTION: c-string inet_ntoa ( int in-addr ) ;
FUNCTION: int getaddrinfo ( c-string nodename, FUNCTION: int getaddrinfo ( c-string nodename,
c-string servername, c-string servername,
@ -182,8 +182,8 @@ FUNCTION: void freeaddrinfo ( addrinfo* ai ) ;
FUNCTION: hostent* gethostbyname ( c-string name ) ; FUNCTION: hostent* gethostbyname ( c-string name ) ;
FUNCTION: int gethostname ( c-string name, int len ) ; FUNCTION: int gethostname ( c-string name, int len ) ;
FUNCTION: void* socket ( int domain, int type, int protocol ) ; FUNCTION: SOCKET socket ( int domain, int type, int protocol ) ;
FUNCTION: int connect ( void* socket, sockaddr-in* sockaddr, int addrlen ) ; FUNCTION: int connect ( SOCKET socket, sockaddr-in* sockaddr, int addrlen ) ;
FUNCTION: int select ( int nfds, fd_set* readfds, fd_set* writefds, fd_set* exceptfds, timeval* timeout ) ; FUNCTION: int select ( int nfds, fd_set* readfds, fd_set* writefds, fd_set* exceptfds, timeval* timeout ) ;
FUNCTION: int closesocket ( SOCKET s ) ; FUNCTION: int closesocket ( SOCKET s ) ;
FUNCTION: int shutdown ( SOCKET s, int how ) ; FUNCTION: int shutdown ( SOCKET s, int how ) ;
@ -199,6 +199,7 @@ FUNCTION: servent* getservbyname ( c-string name, c-string prot ) ;
FUNCTION: servent* getservbyport ( int port, c-string prot ) ; FUNCTION: servent* getservbyport ( int port, c-string prot ) ;
TYPEDEF: uint SERVICETYPE TYPEDEF: uint SERVICETYPE
TYPEDEF: void* LPWSADATA
TYPEDEF: OVERLAPPED WSAOVERLAPPED TYPEDEF: OVERLAPPED WSAOVERLAPPED
TYPEDEF: WSAOVERLAPPED* LPWSAOVERLAPPED TYPEDEF: WSAOVERLAPPED* LPWSAOVERLAPPED
TYPEDEF: uint GROUP TYPEDEF: uint GROUP
@ -333,6 +334,7 @@ FUNCTION: BOOL WSAGetOverlappedResult ( SOCKET s,
BOOL fWait, BOOL fWait,
LPDWORD lpdwFlags ) ; LPDWORD lpdwFlags ) ;
TYPEDEF: void* LPWSAOVERLAPPED_COMPLETION_ROUTINE
FUNCTION: int WSAIoctl ( SOCKET s, FUNCTION: int WSAIoctl ( SOCKET s,
DWORD dwIoControlCode, DWORD dwIoControlCode,
LPVOID lpvInBuffer, LPVOID lpvInBuffer,
@ -340,27 +342,26 @@ FUNCTION: int WSAIoctl ( SOCKET s,
LPVOID lpvOutBuffer, LPVOID lpvOutBuffer,
DWORD cbOutBuffer, DWORD cbOutBuffer,
LPDWORD lpcbBytesReturned, LPDWORD lpcbBytesReturned,
void* lpOverlapped, LPWSAOVERLAPPED lpOverlapped,
void* lpCompletionRoutine ) ; LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) ;
TYPEDEF: void* LPWSAOVERLAPPED_COMPLETION_ROUTINE
FUNCTION: int WSARecv ( SOCKET s, FUNCTION: int WSARecv ( SOCKET s,
LPWSABUF lpBuffers, LPWSABUF lpBuffers,
DWORD dwBufferCount, DWORD dwBufferCount,
LPDWORD lpNumberOfBytesRecvd, LPDWORD lpNumberOfBytesRecvd,
LPDWORD lpFlags, LPDWORD lpFlags,
LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED lpOverlapped,
LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) ; LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) ;
FUNCTION: int WSARecvFrom ( SOCKET s, FUNCTION: int WSARecvFrom ( SOCKET s,
LPWSABUF lpBuffers, LPWSABUF lpBuffers,
DWORD dwBufferCount, DWORD dwBufferCount,
LPDWORD lpNumberOfBytesRecvd, LPDWORD lpNumberOfBytesRecvd,
LPDWORD lpFlags, LPDWORD lpFlags,
sockaddr* lpFrom, sockaddr* lpFrom,
LPINT lpFromlen, LPINT lpFromlen,
LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED lpOverlapped,
LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) ; LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) ;
FUNCTION: BOOL WSAResetEvent ( WSAEVENT hEvent ) ; FUNCTION: BOOL WSAResetEvent ( WSAEVENT hEvent ) ;
FUNCTION: int WSASend ( SOCKET s, FUNCTION: int WSASend ( SOCKET s,
@ -381,10 +382,7 @@ FUNCTION: int WSASendTo ( SOCKET s,
LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED lpOverlapped,
LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) ; LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) ;
FUNCTION: int WSAStartup ( WORD version, LPWSADATA out-data ) ;
FUNCTION: int WSAStartup ( short version, void* out-data ) ;
FUNCTION: SOCKET WSASocketW ( int af, FUNCTION: SOCKET WSASocketW ( int af,
int type, int type,
@ -403,7 +401,14 @@ FUNCTION: DWORD WSAWaitForMultipleEvents ( DWORD cEvents,
LIBRARY: mswsock LIBRARY: mswsock
FUNCTION: int AcceptEx ( void* listen, void* accept, void* out-buf, int recv-len, int addr-len, int remote-len, void* out-len, void* overlapped ) ; FUNCTION: int AcceptEx ( SOCKET listen,
SOCKET accept,
PVOID out-buf,
DWORD recv-len,
DWORD addr-len,
DWORD remote-len,
LPDWORD out-len,
LPOVERLAPPED overlapped ) ;
FUNCTION: void GetAcceptExSockaddrs ( FUNCTION: void GetAcceptExSockaddrs (
PVOID lpOutputBuffer, PVOID lpOutputBuffer,