ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wininet: Pass blocking mode to HTTPREQ_Read.

Browse Source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2017-03-09 18:18:21 +01:00 committed by Alexandre Julliard
parent 67b56774c5
commit f42a2ccad1
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/wininet/http.c
View File

@ -3028,14 +3028,11 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD
} }
/* read data from the http connection (the read section must be held) */ /* read data from the http connection (the read section must be held) */
static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *read) static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *read, blocking_mode_t blocking_mode)
{ {
DWORD current_read = 0, ret_read = 0; DWORD current_read = 0, ret_read = 0;
blocking_mode_t blocking_mode;
DWORD res = ERROR_SUCCESS; DWORD res = ERROR_SUCCESS;
blocking_mode = req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC ? BLOCKING_ALLOW : BLOCKING_WAITALL;
EnterCriticalSection( &req->read_section ); EnterCriticalSection( &req->read_section );
if(req->read_size) { if(req->read_size) {
@ -3082,7 +3079,7 @@ static BOOL drain_content(http_request_t *req, BOOL blocking)
DWORD bytes_read, res; DWORD bytes_read, res;
BYTE buf[4096]; BYTE buf[4096];
res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read); res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read, BLOCKING_ALLOW);
if(res != ERROR_SUCCESS) { if(res != ERROR_SUCCESS) {
ret = FALSE; ret = FALSE;
break; break;
@ -3113,7 +3110,7 @@ static void AsyncReadFileExProc(task_header_t *hdr)
TRACE("%p\n", req); TRACE("%p\n", req);
if(task->ret_read) if(task->ret_read)
res = HTTPREQ_Read(req, task->buf, task->size, &read); res = HTTPREQ_Read(req, task->buf, task->size, &read, BLOCKING_ALLOW);
if(res == ERROR_SUCCESS) if(res == ERROR_SUCCESS)
res = refill_read_buffer(req, task->ret_read ? BLOCKING_DISALLOW : BLOCKING_ALLOW, &buffered); res = refill_read_buffer(req, task->ret_read ? BLOCKING_DISALLOW : BLOCKING_ALLOW, &buffered);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
@ -3150,7 +3147,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO
{ {
if (get_avail_data(req) || end_of_read_data(req)) if (get_avail_data(req) || end_of_read_data(req))
{ {
res = HTTPREQ_Read(req, buf, size, &read); res = HTTPREQ_Read(req, buf, size, &read, BLOCKING_DISALLOW);
LeaveCriticalSection( &req->read_section ); LeaveCriticalSection( &req->read_section );
goto done; goto done;
} }
@ -3176,7 +3173,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO
hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR;
while(1) { while(1) {
res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread); res = HTTPREQ_Read(req, (char*)buf+read, size-read, &cread, BLOCKING_ALLOW);
if(res != ERROR_SUCCESS) if(res != ERROR_SUCCESS)
break; break;
@ -3240,7 +3237,7 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW
{ {
if (get_avail_data(req) || end_of_read_data(req)) if (get_avail_data(req) || end_of_read_data(req))
{ {
res = HTTPREQ_Read(req, buffer, size, read); res = HTTPREQ_Read(req, buffer, size, read, BLOCKING_DISALLOW);
LeaveCriticalSection( &req->read_section ); LeaveCriticalSection( &req->read_section );
return res; return res;
} }
@ -3262,7 +3259,7 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW
if(hdr->dwError == INTERNET_HANDLE_IN_USE) if(hdr->dwError == INTERNET_HANDLE_IN_USE)
hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR; hdr->dwError = ERROR_INTERNET_INTERNAL_ERROR;
res = HTTPREQ_Read(req, buffer, size, read); res = HTTPREQ_Read(req, buffer, size, read, BLOCKING_WAITALL);
if(res == ERROR_SUCCESS) if(res == ERROR_SUCCESS)
res = hdr->dwError; res = hdr->dwError;
LeaveCriticalSection( &req->read_section ); LeaveCriticalSection( &req->read_section );