← Back to branch summary

~ubuntu-branches/ubuntu/saucy/wine1.2/saucy

« back to all changes in this revision

Viewing changes to dlls/ws2_32/socket.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott Ritchie
  • Date: 2010-12-06 00:21:37 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20101206002137-ywazcomhqf97iw3c
Tags: 1.2.2-0ubuntu1
https://launchpad.net/bugs/685474
https://launchpad.net/bugs/665270
* New upstream release (LP: #685474)
  - Support for animated cursors. 
  - Translation updates.
  - Various bug fixes. (LP: #665270)
* Add Japanese font aliases to workaround lack of fontconfig substitution
* Recommend requisite umefont as a default (same as Crossover)
* Conflict with "wine" << 1.2.1 to prevent upgrade failures from very old
  ppa packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dlls/ws2_32/socket.c
2975
2975
    if (writefds) count += writefds->fd_count;
2976
2976
    if (exceptfds) count += exceptfds->fd_count;
2977
2977
    *count_ptr = count;
2978
 
    if (!count) return NULL;
 
2978
    if (!count)
 
2979
    {
 
2980
        SetLastError(WSAEINVAL);
 
2981
        return NULL;
 
2982
    }
2979
2983
    if (!(fds = HeapAlloc( GetProcessHeap(), 0, count * sizeof(fds[0]))))
2980
2984
    {
2981
2985
        SetLastError( ERROR_NOT_ENOUGH_MEMORY );
3098
3102
    TRACE("read %p, write %p, excp %p timeout %p\n",
3099
3103
          ws_readfds, ws_writefds, ws_exceptfds, ws_timeout);
3100
3104
 
3101
 
    if (!(pollfds = fd_sets_to_poll( ws_readfds, ws_writefds, ws_exceptfds, &count )) && count)
 
3105
    if (!(pollfds = fd_sets_to_poll( ws_readfds, ws_writefds, ws_exceptfds, &count )))
3102
3106
        return SOCKET_ERROR;
3103
3107
 
3104
3108
    if (ws_timeout)
5798
5802
INT WINAPI WSALookupServiceNextA( HANDLE lookup, DWORD flags, LPDWORD len, LPWSAQUERYSETA results )
5799
5803
{
5800
5804
    FIXME( "(%p 0x%08x %p %p) Stub!\n", lookup, flags, len, results );
5801
 
    return 0;
 
5805
    WSASetLastError(WSA_E_NO_MORE);
 
5806
    return SOCKET_ERROR;
5802
5807
}
5803
5808
 
5804
5809
/***********************************************************************
5807
5812
INT WINAPI WSALookupServiceNextW( HANDLE lookup, DWORD flags, LPDWORD len, LPWSAQUERYSETW results )
5808
5813
{
5809
5814
    FIXME( "(%p 0x%08x %p %p) Stub!\n", lookup, flags, len, results );
5810
 
    return 0;
 
5815
    WSASetLastError(WSA_E_NO_MORE);
 
5816
    return SOCKET_ERROR;
5811
5817
}
5812
5818
 
5813
5819
/***********************************************************************