[PATCH v2 3/3] wininet: Support large downloads.
Daniel Lehman
dlehman25 at gmail.com
Tue Aug 27 23:17:09 CDT 2019
Signed-off-by: Daniel Lehman <dlehman25 at gmail.com>
---
dlls/wininet/http.c | 24 ++++++++++++++----------
dlls/wininet/internet.h | 6 +++---
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index f771356760..da1d21fe39 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -2440,7 +2440,7 @@ static void create_cache_entry(http_request_t *req)
return;
}
- b = CreateUrlCacheEntryW(url, req->contentLength == ~0u ? 0 : req->contentLength, NULL, file_name, 0);
+ b = CreateUrlCacheEntryW(url, req->contentLength == ~0 ? 0 : req->contentLength, NULL, file_name, 0);
if(!b) {
WARN("Could not create cache entry: %08x\n", GetLastError());
return;
@@ -2644,7 +2644,7 @@ static DWORD netconn_drain_content(data_stream_t *stream, http_request_t *req, B
int len, res;
size_t size;
- if(netconn_stream->content_length == ~0u)
+ if(netconn_stream->content_length == ~0)
return WSAEISCONN;
while(netconn_stream->content_read < netconn_stream->content_length) {
@@ -2750,7 +2750,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf,
TRACE("reading %u byte chunk\n", chunked_stream->chunk_size);
chunked_stream->buf_size++;
chunked_stream->buf_pos--;
- if(req->contentLength == ~0u) req->contentLength = chunked_stream->chunk_size;
+ if(req->contentLength == ~0) req->contentLength = chunked_stream->chunk_size;
else req->contentLength += chunked_stream->chunk_size;
chunked_stream->state = CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_SIZE;
}
@@ -2872,6 +2872,7 @@ static DWORD set_content_length(http_request_t *request)
{
static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0};
static const WCHAR headW[] = {'H','E','A','D',0};
+ WCHAR contentLength[32];
WCHAR encoding[20];
DWORD size;
@@ -2880,10 +2881,13 @@ static DWORD set_content_length(http_request_t *request)
return ERROR_SUCCESS;
}
- size = sizeof(request->contentLength);
- if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH,
- &request->contentLength, &size, NULL) != ERROR_SUCCESS)
- request->contentLength = ~0u;
+ size = sizeof(contentLength);
+ if (HTTP_HttpQueryInfoW(request, HTTP_QUERY_CONTENT_LENGTH,
+ contentLength, &size, NULL) == ERROR_SUCCESS)
+ request->contentLength = strtoullW(contentLength, NULL, 10);
+ else
+ request->contentLength = ~0;
+
request->netconn_stream.content_length = request->contentLength;
request->netconn_stream.content_read = request->read_size;
@@ -2909,7 +2913,7 @@ static DWORD set_content_length(http_request_t *request)
}
request->data_stream = &chunked_stream->data_stream;
- request->contentLength = ~0u;
+ request->contentLength = ~0;
}
if(request->hdr.decoding) {
@@ -3299,7 +3303,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session,
request->hdr.dwFlags = dwFlags;
request->hdr.dwContext = dwContext;
request->hdr.decoding = session->hdr.decoding;
- request->contentLength = ~0u;
+ request->contentLength = ~0;
request->netconn_stream.data_stream.vtbl = &netconn_stream_vtbl;
request->data_stream = &request->netconn_stream.data_stream;
@@ -4922,7 +4926,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders,
loop_next = FALSE;
if(redirected) {
- request->contentLength = ~0u;
+ request->contentLength = ~0;
request->bytesToWrite = 0;
}
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index f712fb6b64..40e51bec32 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -335,8 +335,8 @@ typedef struct {
typedef struct {
data_stream_t data_stream;
- DWORD content_length;
- DWORD content_read;
+ ULONGLONG content_length;
+ ULONGLONG content_read;
} netconn_stream_t;
#define READ_BUFFER_SIZE 8192
@@ -372,7 +372,7 @@ typedef struct
struct HttpAuthInfo *proxyAuthInfo;
CRITICAL_SECTION read_section; /* section to protect the following fields */
- DWORD contentLength; /* total number of bytes to be read */
+ ULONGLONG contentLength; /* total number of bytes to be read */
BOOL read_gzip; /* are we reading in gzip mode? */
DWORD read_pos; /* current read position in read_buf */
DWORD read_size; /* valid data size in read_buf */
--
2.17.1
More information about the wine-devel
mailing list