Module: wine Branch: master Commit: 52ef52e08502567c3c2f0f28f2d9b8d1f620b97f URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ef52e08502567c3c2f0f28f2...
Author: Hans Leidekker hans@codeweavers.com Date: Wed May 1 12:12:45 2013 +0200
winhttp: Get rid of the flags parameter to netconn_send.
---
dlls/winhttp/net.c | 6 ++---- dlls/winhttp/request.c | 8 ++++---- dlls/winhttp/winhttp_private.h | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 415511e..6d9b82a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -531,7 +531,7 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) return TRUE; }
-BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int *sent ) +BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int *sent ) { if (!netconn_connected( conn )) return FALSE; if (conn->secure) @@ -539,8 +539,6 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int const BYTE *ptr = msg; size_t chunk_size;
- if (flags) FIXME("flags %08x not supported in SSL\n", flags); - *sent = 0;
while(len) { @@ -555,7 +553,7 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int
return TRUE; } - if ((*sent = send( conn->socket, msg, len, flags )) == -1) + if ((*sent = send( conn->socket, msg, len, 0 )) == -1) { set_last_error( sock_get_error( errno ) ); return FALSE; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 861ddef..3238aa5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -900,7 +900,7 @@ static BOOL secure_proxy_connect( request_t *request ) { int len = strlen( req_ascii ), bytes_sent;
- ret = netconn_send( &request->netconn, req_ascii, len, 0, &bytes_sent ); + ret = netconn_send( &request->netconn, req_ascii, len, &bytes_sent ); heap_free( req_ascii ); if (ret) ret = read_reply( request ); @@ -1120,13 +1120,13 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len
send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, NULL, 0 );
- ret = netconn_send( &request->netconn, req_ascii, len, 0, &bytes_sent ); + ret = netconn_send( &request->netconn, req_ascii, len, &bytes_sent ); heap_free( req_ascii ); if (!ret) goto end;
if (optional_len) { - if (!netconn_send( &request->netconn, optional, optional_len, 0, &bytes_sent )) goto end; + if (!netconn_send( &request->netconn, optional, optional_len, &bytes_sent )) goto end; request->optional = optional; request->optional_len = optional_len; len += optional_len; @@ -2494,7 +2494,7 @@ static BOOL write_data( request_t *request, LPCVOID buffer, DWORD to_write, LPDW BOOL ret; int num_bytes;
- ret = netconn_send( &request->netconn, buffer, to_write, 0, &num_bytes ); + ret = netconn_send( &request->netconn, buffer, to_write, &num_bytes );
if (async) { diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index f3e9496..bd50108 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -268,7 +268,7 @@ BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t *, int ) DECLSPEC_HIDDEN; BOOL netconn_secure_connect( netconn_t *, WCHAR * ) DECLSPEC_HIDDEN; -BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ) DECLSPEC_HIDDEN; +BOOL netconn_send( netconn_t *, const void *, size_t, int * ) DECLSPEC_HIDDEN; DWORD netconn_set_timeout( netconn_t *, BOOL, int ) DECLSPEC_HIDDEN; const void *netconn_get_certificate( netconn_t * ) DECLSPEC_HIDDEN; int netconn_get_cipher_strength( netconn_t * ) DECLSPEC_HIDDEN;