Jacek Caban : winhttp: Moved netconn_query_data_available calls to query_data_available.
Alexandre Julliard
julliard at winehq.org
Fri Nov 15 13:14:29 CST 2013
Module: wine
Branch: master
Commit: e894c897d52c3e5852498164e246b473e0c6a786
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e894c897d52c3e5852498164e246b473e0c6a786
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Nov 15 11:47:38 2013 +0100
winhttp: Moved netconn_query_data_available calls to query_data_available.
---
dlls/winhttp/request.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index db69082..12f7722 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -1955,7 +1955,7 @@ static BOOL start_next_chunk( request_t *request, BOOL notify )
static DWORD get_available_data( request_t *request )
{
if (request->read_chunked) return min( request->read_chunked_size, request->read_size );
- return request->read_size + netconn_query_data_available( &request->netconn );
+ return request->read_size;
}
/* check if we have reached the end of the data to read */
@@ -2391,10 +2391,14 @@ static BOOL query_data_available( request_t *request, DWORD *available, BOOL asy
{
DWORD count = get_available_data( request );
+ if (!request->read_chunked)
+ count += netconn_query_data_available( &request->netconn );
if (!count)
{
refill_buffer( request, async );
count = get_available_data( request );
+ if (!request->read_chunked)
+ count += netconn_query_data_available( &request->netconn );
}
if (async) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &count, sizeof(count) );
More information about the wine-cvs
mailing list