winhttp: Don't wait for the task thread to exit.

Instead, have the task thread call the destructor before it exits. Previously, if the task thread held the final reference, it would call request_destroy which would then wait for itself to finish.

winhttp: Don't wait for the task thread to exit.
50d9d187 · Huw Davies · Alexandre Julliard · 65319e81 · 50d9d187 · 50d9d187
Commit 50d9d187 authored Jul 21, 2015 by Huw Davies Committed by Alexandre Julliard Jul 21, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 6 deletions

request.c dlls/winhttp/request.c +5 -0

session.c dlls/winhttp/session.c +6 -6

No files found.
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -217,6 +217,11 @@ static DWORD CALLBACK task_proc( LPVOID param )
        }
        case WAIT_OBJECT_0 + 1:
            TRACE("exiting\n");
+            CloseHandle( request->task_cancel );
+            CloseHandle( request->task_wait );
+            request->task_cs.DebugInfo->Spare[0] = 0;
+            DeleteCriticalSection( &request->task_cs );
+            request->hdr.vtbl->destroy( &request->hdr );
            return 0;
        default:

--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -561,13 +561,13 @@ static void request_destroy( object_header_t *hdr )
    if (request->task_thread)
    {
+        /* Signal to the task proc to quit.  It will call
+           this again when it does. */
+        HANDLE thread = request->task_thread;
+        request->task_thread = 0;
        SetEvent( request->task_cancel );
-        WaitForSingleObject( request->task_thread, INFINITE );
+        CloseHandle( thread );
-        CloseHandle( request->task_thread );
+        return;
-        CloseHandle( request->task_cancel );
-        CloseHandle( request->task_wait );
-        request->task_cs.DebugInfo->Spare[0] = 0;
-        DeleteCriticalSection( &request->task_cs );
    }
    release_object( &request->connect->hdr );