Jacek Caban : winhttp: Removed no longer used netconn_init argument.

Alexandre Julliard julliard at winehq.org
Thu Feb 21 14:29:36 CST 2013


Module: wine
Branch: master
Commit: 42750e340e9947e2c48e319bc0f61409d2439fba
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=42750e340e9947e2c48e319bc0f61409d2439fba

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Feb 21 18:08:25 2013 +0100

winhttp: Removed no longer used netconn_init argument.

---

 dlls/winhttp/net.c             |    2 +-
 dlls/winhttp/request.c         |    2 +-
 dlls/winhttp/session.c         |    2 +-
 dlls/winhttp/winhttp_private.h |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c
index d2fdb86..fa8cad0 100644
--- a/dlls/winhttp/net.c
+++ b/dlls/winhttp/net.c
@@ -267,7 +267,7 @@ static BOOL ensure_cred_handle(void)
     return ret;
 }
 
-BOOL netconn_init( netconn_t *conn, BOOL secure )
+BOOL netconn_init( netconn_t *conn )
 {
     memset(conn, 0, sizeof(*conn));
     conn->socket = -1;
diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index 584f27d..301478d 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -1636,7 +1636,7 @@ static BOOL handle_redirect( request_t *request, DWORD status )
             if (!(ret = set_server_for_hostname( connect, hostname, port ))) goto end;
 
             netconn_close( &request->netconn );
-            if (!(ret = netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE ))) goto end;
+            if (!(ret = netconn_init( &request->netconn ))) goto end;
         }
         if (!(ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end;
         if (!(ret = open_connection( request ))) goto end;
diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
index d5aa153..41b266a 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -959,7 +959,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o
     request->connect = connect;
     list_add_head( &connect->hdr.children, &request->hdr.entry );
 
-    if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end;
+    if (!netconn_init( &request->netconn )) goto end;
     request->resolve_timeout = connect->session->resolve_timeout;
     request->connect_timeout = connect->session->connect_timeout;
     request->send_timeout = connect->session->send_timeout;
diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h
index 72605af..963abec 100644
--- a/dlls/winhttp/winhttp_private.h
+++ b/dlls/winhttp/winhttp_private.h
@@ -231,7 +231,7 @@ BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int )
 BOOL netconn_connected( netconn_t * ) DECLSPEC_HIDDEN;
 BOOL netconn_create( netconn_t *, int, int, int ) DECLSPEC_HIDDEN;
 BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ) DECLSPEC_HIDDEN;
-BOOL netconn_init( netconn_t *, BOOL ) DECLSPEC_HIDDEN;
+BOOL netconn_init( netconn_t * ) DECLSPEC_HIDDEN;
 void netconn_unload( void ) DECLSPEC_HIDDEN;
 BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN;
 BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN;




More information about the wine-cvs mailing list