marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhttp: Propagate request errors in request_wait. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Hans Leidekker 2019-10-02 16:43:36 +02:00 committed by Alexandre Julliard
parent 310620c072
commit 8de2369dcf
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/winhttp/request.c
View File

@ -3799,7 +3799,9 @@ static void CALLBACK wait_status_callback( HINTERNET handle, DWORD_PTR context,
request->error = result->dwError; request->error = result->dwError;
break; break;
} }
default: break; default:
request->error = ERROR_SUCCESS;
break;
} }
SetEvent( request->wait ); SetEvent( request->wait );
} }
@ -4012,18 +4014,17 @@ static DWORD request_wait( struct winhttp_request *request, DWORD timeout )
switch (err) switch (err)
{ {
case WAIT_OBJECT_0: case WAIT_OBJECT_0:
ret = ERROR_SUCCESS; ret = request->error;
break; break;
case WAIT_TIMEOUT: case WAIT_TIMEOUT:
ret = ERROR_TIMEOUT; ret = ERROR_TIMEOUT;
break; break;
case WAIT_FAILED:
default: default:
ret = GetLastError(); ret = GetLastError();
break; break;
} }
EnterCriticalSection( &request->cs ); EnterCriticalSection( &request->cs );
if (!ret) request->proc_running = FALSE; if (err == WAIT_OBJECT_0) request->proc_running = FALSE;
return ret; return ret;
} }
@ -4547,11 +4548,9 @@ static HRESULT WINAPI winhttp_request_WaitForResponse(
err = ERROR_SUCCESS; err = ERROR_SUCCESS;
break; break;
case ERROR_SUCCESS: default:
if (succeeded) *succeeded = VARIANT_TRUE; if (succeeded) *succeeded = VARIANT_TRUE;
break; break;
default: break;
} }
LeaveCriticalSection( &request->cs ); LeaveCriticalSection( &request->cs );
return HRESULT_FROM_WIN32( err ); return HRESULT_FROM_WIN32( err );