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

urlmon: Allow available_bytes to be set before protocol_continue call.

This commit is contained in:
Jacek Caban 2013-02-14 18:04:53 +01:00 committed by Alexandre Julliard
parent 79b236c2d1
commit 5f14eb564e
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/urlmon/protocol.c
View File

@ -338,32 +338,38 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data)
protocol->flags |= FLAG_FIRST_CONTINUE_COMPLETE; protocol->flags |= FLAG_FIRST_CONTINUE_COMPLETE;
} }
if(data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA) && !protocol->available_bytes) { if(data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA)) {
BOOL res; if(!protocol->available_bytes) {
BOOL res;
/* InternetQueryDataAvailable may immediately fork and perform its asynchronous /* InternetQueryDataAvailable may immediately fork and perform its asynchronous
* read, so clear the flag _before_ calling so it does not incorrectly get cleared * read, so clear the flag _before_ calling so it does not incorrectly get cleared
* after the status callback is called */ * after the status callback is called */
protocol->flags &= ~FLAG_REQUEST_COMPLETE; protocol->flags &= ~FLAG_REQUEST_COMPLETE;
res = InternetQueryDataAvailable(protocol->request, &protocol->available_bytes, 0, 0); res = InternetQueryDataAvailable(protocol->request, &protocol->available_bytes, 0, 0);
if(res) { if(res) {
if(!protocol->available_bytes) { TRACE("available %u bytes\n", protocol->available_bytes);
if(is_start) { if(!protocol->available_bytes) {
TRACE("empty file\n"); if(is_start) {
all_data_read(protocol); TRACE("empty file\n");
}else { all_data_read(protocol);
WARN("unexpected end of file?\n"); }else {
report_result(protocol, INET_E_DOWNLOAD_FAILURE); WARN("unexpected end of file?\n");
report_result(protocol, INET_E_DOWNLOAD_FAILURE);
}
return S_OK;
} }
}else if(GetLastError() != ERROR_IO_PENDING) {
protocol->flags |= FLAG_REQUEST_COMPLETE;
WARN("InternetQueryDataAvailable failed: %d\n", GetLastError());
report_result(protocol, INET_E_DATA_NOT_AVAILABLE);
return S_OK; return S_OK;
} }
protocol->flags |= FLAG_REQUEST_COMPLETE; protocol->flags |= FLAG_REQUEST_COMPLETE;
report_data(protocol);
}else if(GetLastError() != ERROR_IO_PENDING) {
protocol->flags |= FLAG_REQUEST_COMPLETE;
WARN("InternetQueryDataAvailable failed: %d\n", GetLastError());
report_result(protocol, INET_E_DATA_NOT_AVAILABLE);
} }
report_data(protocol);
} }
return S_OK; return S_OK;