Changeset 21420


Ignore:
Timestamp:
Aug 16, 2010, 4:19:33 PM (15 years ago)
Author:
dmik
Message:

winsock2.h: Added missing WSASend* and WSARecv* declarations.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/winsock2.h

    r21418 r21420  
    347347                         LPWSAPROTOCOL_INFOA lpProtocolInfo,
    348348                         GROUP g, DWORD dwFlags);
     349INT WINAPI WSASend(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
     350                   LPDWORD lpNumberOfBytesSent, DWORD dwFlags,
     351                   LPWSAOVERLAPPED lpOverlapped,
     352                   LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
     353INT WINAPI WSASendTo(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
     354                     LPDWORD lpNumberOfBytesSent, DWORD dwFlags,
     355                     const struct sockaddr *to, int tolen,
     356                     LPWSAOVERLAPPED lpOverlapped,
     357                     LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
    349358int WINAPI WSASendDisconnect(SOCKET s, LPWSABUF lpOutboundDisconnectData);
    350359int WINAPI WSAIoctl(SOCKET s, DWORD dwIoControlCode, LPVOID lpvInBuffer,
    … …  
    352361                    LPDWORD lpcbBytesReturned, LPWSAOVERLAPPED lpOverlapped,
    353362                    LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
     363int WINAPI WSARecv (SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
     364                    LPDWORD lpNumberOfBytesReceived, LPDWORD lpFlags,
     365                        LPWSAOVERLAPPED lpOverlapped,
     366                    LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
     367INT WINAPI WSARecvFrom(SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
     368                       LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, struct sockaddr *lpFrom,
     369                       LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped,
     370                       LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
    354371
    355372extern INT WINAPI ioctlsocket(SOCKET s, LONG cmd, ULONG *argp);

  • trunk/src/ws2_32/socket.cpp

    r21322 r21420  
    108108 *              WSAAccept                        (WS2_32.26)
    109109 */
    110 SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen,
     110SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, LPINT addrlen,
    111111               LPCONDITIONPROC lpfnCondition, DWORD dwCallbackData)
    112112{
    … …  
    146146               case CF_ACCEPT:
    147147                       if (addr && addrlen)
    148                                addr = (struct WS_sockaddr *)memcpy(addr, &src_addr, (*addrlen > size) ?  size : *addrlen );
     148                               addr = (struct sockaddr *)memcpy(addr, &src_addr, (*addrlen > size) ?  size : *addrlen );
    149149                       return cs;
    150150               case CF_DEFER:
    … …  
    171171INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
    172172                      LPDWORD lpNumberOfBytesSent, DWORD dwFlags,
    173                       const struct WS_sockaddr *to, int tolen,
     173                      const struct sockaddr *to, int tolen,
    174174                      LPWSAOVERLAPPED lpOverlapped,
    175175                      LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine )
    … …  
    225225 */
    226226INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
    227                         LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, struct WS_sockaddr *lpFrom,
     227                        LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, struct sockaddr *lpFrom,
    228228                        LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped,
    229229                        LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine )
Note: See TracChangeset for help on using the changeset viewer.