From: Paul Gofman pgofman@codeweavers.com
--- dlls/winhttp/net.c | 5 +++++ dlls/winhttp/request.c | 15 +++++++++------ dlls/winhttp/winhttp_private.h | 2 ++ 3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 0652dfcb30a..8c7dcdb7eca 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -278,6 +278,11 @@ DWORD netconn_create( struct hostdata *host, const struct sockaddr_storage *sock return ERROR_SUCCESS; }
+void netconn_addref( struct netconn *conn ) +{ + InterlockedIncrement( &conn->refs ); +} + void netconn_release( struct netconn *conn ) { if (InterlockedDecrement( &conn->refs )) return; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2b7698da65b..d2dfc0967f0 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3158,7 +3158,7 @@ static void socket_handle_closing( struct object_header *hdr ) pending_tasks = cancel_queue( &socket->recv_q ) || pending_tasks;
if (pending_tasks) - netconn_cancel_io( socket->request->netconn ); + netconn_cancel_io( socket->netconn ); }
static BOOL socket_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) @@ -3184,6 +3184,7 @@ static void socket_destroy( struct object_header *hdr ) stop_queue( &socket->send_q ); stop_queue( &socket->recv_q );
+ netconn_release( socket->netconn ); release_object( &socket->request->hdr ); free( socket->send_frame_buffer ); free( socket ); @@ -3206,7 +3207,7 @@ static BOOL socket_set_option( struct object_header *hdr, DWORD option, void *bu return FALSE; } socket->keepalive_interval = interval; - netconn_set_timeout( socket->request->netconn, FALSE, socket->keepalive_interval ); + netconn_set_timeout( socket->netconn, FALSE, socket->keepalive_interval ); SetLastError( ERROR_SUCCESS ); TRACE( "WINHTTP_OPTION_WEB_SOCKET_KEEPALIVE_INTERVAL %lu.\n", interval); return TRUE; @@ -3261,11 +3262,13 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR InitializeSRWLock( &socket->send_lock ); init_queue( &socket->send_q ); init_queue( &socket->recv_q ); + netconn_addref( request->netconn ); + socket->netconn = request->netconn;
addref_object( &request->hdr ); socket->request = request;
- netconn_set_timeout( socket->request->netconn, FALSE, socket->keepalive_interval ); + netconn_set_timeout( socket->netconn, FALSE, socket->keepalive_interval );
if ((hsocket = alloc_handle( &socket->hdr ))) { @@ -3283,7 +3286,7 @@ static DWORD send_bytes( struct socket *socket, char *bytes, int len, int *sent, { int count; DWORD err; - err = netconn_send( socket->request->netconn, bytes, len, &count, ovr ); + err = netconn_send( socket->netconn, bytes, len, &count, ovr ); if (sent) *sent = count; if (err) return err; return (count == len || (ovr && count)) ? ERROR_SUCCESS : ERROR_INTERNAL_ERROR; @@ -3395,7 +3398,7 @@ static DWORD complete_send_frame( struct socket *socket, WSAOVERLAPPED *ovr, con { DWORD ret, len, i;
- if (!netconn_wait_overlapped_result( socket->request->netconn, ovr, &len )) + if (!netconn_wait_overlapped_result( socket->netconn, ovr, &len )) return WSAGetLastError();
if (socket->bytes_in_send_frame_buffer) @@ -3674,7 +3677,7 @@ static DWORD receive_bytes( struct socket *socket, char *buf, DWORD len, DWORD * } while (size != len) { - if ((err = netconn_recv( socket->request->netconn, ptr, needed, 0, &received ))) return err; + if ((err = netconn_recv( socket->netconn, ptr, needed, 0, &received ))) return err; if (!received) break; size += received; if (!read_full_buffer) break; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 2a38d1fb372..996b61ac63e 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -257,6 +257,7 @@ struct socket { struct object_header hdr; struct request *request; + struct netconn *netconn; int keepalive_interval; unsigned int send_buffer_size; enum socket_state state; @@ -371,6 +372,7 @@ void close_connection( struct request * ) DECLSPEC_HIDDEN; void init_queue( struct queue *queue ) DECLSPEC_HIDDEN; void stop_queue( struct queue * ) DECLSPEC_HIDDEN;
+void netconn_addref( struct netconn * ) DECLSPEC_HIDDEN; void netconn_release( struct netconn * ) DECLSPEC_HIDDEN; DWORD netconn_create( struct hostdata *, const struct sockaddr_storage *, int, struct netconn ** ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN;