Module: wine Branch: master Commit: 456773fdc067ab8673a330c7ae17aecc2815690a URL: http://source.winehq.org/git/wine.git/?a=commit;h=456773fdc067ab8673a330c7ae...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Mar 6 13:32:49 2013 +0100
wininet: Always pass a ULONG variable to ioctlsocket.
---
dlls/wininet/netconnection.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 0d74adf..3564282 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -607,7 +607,8 @@ static DWORD init_openssl(void)
static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) { - int result, flag; + int result; + ULONG flag;
assert(server->addr_len); result = netconn->socket = socket(server->addr.ss_family, SOCK_STREAM, 0); @@ -633,7 +634,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t { int err; socklen_t len = sizeof(err); - if (!getsockopt(netconn->socket, SOL_SOCKET, SO_ERROR, &err, &len) && !err) + if (!getsockopt(netconn->socket, SOL_SOCKET, SO_ERROR, (void *)&err, &len) && !err) result = 0; } } @@ -1003,7 +1004,7 @@ BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) if(!connection->secure) { #ifdef FIONREAD - int unread; + ULONG unread; int retval = ioctlsocket(connection->socket, FIONREAD, &unread); if (!retval) {