From: Jason Kuo j20001970@gmail.com
The function is implemented by setting the newly added contentPos that keep track of current read position in the content, when InternetReadFile related function is called, data will be read from req_file->file_handle before continuing reading from http stream.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26570 --- dlls/wininet/ftp.c | 3 ++ dlls/wininet/http.c | 92 +++++++++++++++++++++++++++++++- dlls/wininet/internet.c | 30 +++++++++-- dlls/wininet/internet.h | 2 + dlls/wininet/tests/http.c | 108 ++++++++++++++++++++++++-------------- 5 files changed, 191 insertions(+), 44 deletions(-)
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index cf6555c63e2..f3f586cd6e1 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1293,6 +1293,7 @@ static const object_vtbl_t FTPFILEVtbl = { NULL, FTPFILE_QueryOption, INET_SetOption, + NULL, FTPFILE_ReadFile, FTPFILE_WriteFile, FTPFILE_QueryDataAvailable, @@ -2397,6 +2398,7 @@ static const object_vtbl_t FTPSESSIONVtbl = { NULL, NULL, NULL, + NULL, NULL };
@@ -3525,6 +3527,7 @@ static const object_vtbl_t FTPFINDNEXTVtbl = { NULL, NULL, NULL, + NULL, FTPFINDNEXT_FindNextFileW };
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b42f823208c..babb0d8189a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -329,6 +329,7 @@ static void reset_data_stream(http_request_t *req) destroy_data_stream(req->data_stream); req->data_stream = &req->netconn_stream.data_stream; req->read_pos = req->read_size = req->netconn_stream.content_read = 0; + req->contentPos = 0; req->read_gzip = FALSE; }
@@ -2499,6 +2500,7 @@ static void create_cache_entry(http_request_t *req)
create_req_file(file_name, &req->req_file); req->req_file->url = url; + req->contentPos = 0;
req->hCacheFile = CreateFileW(file_name, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -3033,6 +3035,37 @@ static void HTTP_ReceiveRequestData(http_request_t *req) send_request_complete(req, req->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)req->hdr.hInternet : 1, 0); }
+static DWORD read_req_file(http_request_t *req, BYTE *buffer, DWORD size, DWORD *read, BOOL allow_blocking) +{ + DWORD file_size, ret_read, res; + BYTE buf[1024]; + + file_size = GetFileSize(req->req_file->file_handle, NULL); + if(file_size == INVALID_FILE_SIZE) + return GetLastError(); + + if(!allow_blocking && req->contentPos > file_size) + return WSAEWOULDBLOCK; + + while (req->contentPos > file_size) { + res = read_http_stream(req, (BYTE*)buf, min(1024, req->contentPos-file_size), &ret_read, TRUE); + if(res != ERROR_SUCCESS || !ret_read) + break; + file_size = GetFileSize(req->req_file->file_handle, NULL); + } + + res = SetFilePointer(req->req_file->file_handle, req->contentPos, NULL, FILE_BEGIN); + if(res == INVALID_SET_FILE_POINTER) + return GetLastError(); + if(ReadFile(req->req_file->file_handle, buffer, size, &ret_read, NULL)) { + *read = ret_read; + req->contentPos += ret_read; + return ERROR_SUCCESS; + } + else + return GetLastError(); +} + /* 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, BOOL allow_blocking) { @@ -3046,13 +3079,22 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * memcpy(buffer, req->read_buf+req->read_pos, ret_read); req->read_size -= ret_read; req->read_pos += ret_read; + req->contentPos += ret_read; allow_blocking = FALSE; }
+ if(ret_read < size && req->req_file && req->req_file->file_handle) { + res = read_req_file(req, (BYTE*)buffer+ret_read, size-ret_read, ¤t_read, allow_blocking); + if(res == ERROR_SUCCESS) + ret_read += current_read; + } + if(ret_read < size) { res = read_http_stream(req, (BYTE*)buffer+ret_read, size-ret_read, ¤t_read, allow_blocking); - if(res == ERROR_SUCCESS) + if(res == ERROR_SUCCESS) { ret_read += current_read; + req->contentPos += current_read; + } else if(res == WSAEWOULDBLOCK && ret_read) res = ERROR_SUCCESS; } @@ -3155,6 +3197,45 @@ static DWORD async_read(http_request_t *req, void *buf, DWORD size, DWORD read_p return ERROR_IO_PENDING; }
+static DWORD HTTPREQ_SetFilePointer(object_header_t *hdr, LONG lDistanceToMove, DWORD dwMoveContext) +{ + http_request_t *req = (http_request_t*)hdr; + DWORD err = ERROR_INTERNET_INVALID_OPERATION, res = INVALID_SET_FILE_POINTER; + + if(req->hdr.dwFlags & (INTERNET_FLAG_DONT_CACHE|INTERNET_FLAG_NO_CACHE_WRITE)) + goto lend; + + switch (dwMoveContext) { + case FILE_BEGIN: + res = lDistanceToMove; + break; + case FILE_CURRENT: + if(req->contentPos && lDistanceToMove < 0) { + err = ERROR_NEGATIVE_SEEK; + goto lend; + } + res = req->contentPos + lDistanceToMove; + break; + case FILE_END: + FIXME("dwMoveContext FILE_END not implemented\n"); + goto lend; + default: + goto lend; + } + + EnterCriticalSection(&req->read_section); + req->contentPos = res; + req->read_pos = req->read_size = 0; + LeaveCriticalSection(&req->read_section); + + err = NO_ERROR; + +lend: + if(res == INVALID_SET_FILE_POINTER) + SetLastError(err); + return res; +} + static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buf, DWORD size, DWORD *ret_read, DWORD flags, DWORD_PTR context) { @@ -3182,6 +3263,13 @@ static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buf, DWORD size, DWORD memcpy(buf, req->read_buf + req->read_pos, read); req->read_size -= read; req->read_pos += read; + req->contentPos += read; + } + + if(read < size && req->req_file && req->req_file->file_handle) { + res = read_req_file(req, (BYTE*)buf+read, size-read, &cread, allow_blocking); + if(res == ERROR_SUCCESS) + read += cread; }
if(read < size && (!read || !(flags & IRF_NO_WAIT)) && !end_of_read_data(req)) { @@ -3318,6 +3406,7 @@ static const object_vtbl_t HTTPREQVtbl = { HTTPREQ_CloseConnection, HTTPREQ_QueryOption, HTTPREQ_SetOption, + HTTPREQ_SetFilePointer, HTTPREQ_ReadFile, HTTPREQ_WriteFile, HTTPREQ_QueryDataAvailable, @@ -5807,6 +5896,7 @@ static const object_vtbl_t HTTPSESSIONVtbl = { NULL, NULL, NULL, + NULL, NULL };
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 26d262b9665..b47e8bb1751 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -957,6 +957,7 @@ static const object_vtbl_t APPINFOVtbl = { APPINFO_SetOption, NULL, NULL, + NULL, NULL };
@@ -2155,14 +2156,37 @@ INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackW(
/*********************************************************************** * InternetSetFilePointer (WININET.@) + * Sets read position for an open internet file. + * + * RETURNS + * Current position of the file on success + * INVALID_SET_FILE_POINTER on failure */ DWORD WINAPI InternetSetFilePointer(HINTERNET hFile, LONG lDistanceToMove, PVOID pReserved, DWORD dwMoveContext, DWORD_PTR dwContext) { - FIXME("(%p %ld %p %ld %Ix): stub\n", hFile, lDistanceToMove, pReserved, dwMoveContext, dwContext); + DWORD err = ERROR_INVALID_HANDLE, res = INVALID_SET_FILE_POINTER; + object_header_t *hdr;
- SetLastError(ERROR_INTERNET_INVALID_OPERATION); - return INVALID_SET_FILE_POINTER; + TRACE("(%p %ld %p %ld %Ix)\n", hFile, lDistanceToMove, pReserved, dwMoveContext, dwContext); + + hdr = get_handle_object(hFile); + if(!hdr) { + SetLastError(err); + return res; + } + + if(hdr->vtbl->SetFilePointer) { + res = hdr->vtbl->SetFilePointer(hdr, lDistanceToMove, dwMoveContext); + if(res == INVALID_SET_FILE_POINTER) + err = GetLastError(); + } + + WININET_Release(hdr); + + if(res == INVALID_SET_FILE_POINTER) + SetLastError(err); + return res; }
/*********************************************************************** diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 6756488d5a5..a1ad1e0153e 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -225,6 +225,7 @@ typedef struct { void (*CloseConnection)(object_header_t*); DWORD (*QueryOption)(object_header_t*,DWORD,void*,DWORD*,BOOL); DWORD (*SetOption)(object_header_t*,DWORD,void*,DWORD); + DWORD (*SetFilePointer)(object_header_t*,LONG,DWORD); DWORD (*ReadFile)(object_header_t*,void*,DWORD,DWORD*,DWORD,DWORD_PTR); DWORD (*WriteFile)(object_header_t*,const void*,DWORD,DWORD*); DWORD (*QueryDataAvailable)(object_header_t*,DWORD*,DWORD,DWORD_PTR); @@ -339,6 +340,7 @@ typedef struct
CRITICAL_SECTION read_section; /* section to protect the following fields */ ULONGLONG contentLength; /* total number of bytes to be read */ + ULONGLONG contentPos; 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 */ diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 667ee74fadb..99c67931131 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -583,28 +583,24 @@ static void close_async_handle(HINTERNET handle, int handle_cnt)
static void InternetSetFilePointer_test(const char *host, const char *path) { -#ifndef BUFFER_SIZE -#define BUFFER_SIZE 8192 -#endif - - CHAR expect_response[BUFFER_SIZE], buf[BUFFER_SIZE]; + BYTE expect_response[8192], buf[8192]; HINTERNET hi = 0, hic = 0, hor = 0; BOOL res, expected; DWORD count, size, i, pos, err;
hi = InternetOpenA("Winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); - ok((hi != 0x0), "InternetOpen failed: %lu\n", GetLastError()); + ok(hi != 0x0, "InternetOpen failed: %lu\n", GetLastError()); if(hi == 0x0) goto abort;
hic = InternetConnectA(hi, host, INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok((hic != 0x0), "InternetConnect failed: %lu\n", GetLastError()); + ok(hic != 0x0, "InternetConnect failed: %lu\n", GetLastError()); if(hic == 0x0) goto abort;
hor = HttpOpenRequestA(hic, NULL, path, NULL, NULL, NULL, INTERNET_FLAG_RELOAD, 0x0); - ok((hor != 0x0), "HttpOpenRequest failed: %lu\n", GetLastError()); + ok(hor != 0x0, "HttpOpenRequest failed: %lu\n", GetLastError()); if(hor == 0x0) goto abort;
res = HttpSendRequestA(hor, NULL, 0, NULL, 0); @@ -612,8 +608,8 @@ static void InternetSetFilePointer_test(const char *host, const char *path) if(!res) goto abort;
size = 0; - while(size < BUFFER_SIZE) { - res = InternetReadFile(hor, expect_response+size, BUFFER_SIZE-size, &count); + while(size < sizeof(expect_response)) { + res = InternetReadFile(hor, expect_response+size, sizeof(expect_response)-size, &count); if(!res || !count) break; size += count; @@ -621,14 +617,14 @@ static void InternetSetFilePointer_test(const char *host, const char *path) ok(size, "InternetReadFile returned no content\n"); if(!size) goto abort;
- if(hor) InternetCloseHandle(hor); - if(hic) InternetCloseHandle(hic); - if(hi) InternetCloseHandle(hi); + InternetCloseHandle(hor); + InternetCloseHandle(hic); + InternetCloseHandle(hi);
reset_events();
hi = InternetOpenA("Winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); - ok((hi != 0x0), "InternetOpen failed: %lu\n", GetLastError()); + ok(hi != 0x0, "InternetOpen failed: %lu\n", GetLastError()); if(hi == 0x0) goto abort;
pInternetSetStatusCallbackA(hi, &callback); @@ -636,15 +632,17 @@ static void InternetSetFilePointer_test(const char *host, const char *path) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); hic = InternetConnectA(hi, host, INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0xdeadbeef); - ok((hic != 0x0), "InternetConnect failed: %lu\n", GetLastError()); + ok(hic != 0x0, "InternetConnect failed: %lu\n", GetLastError()); if(hic == 0x0) goto abort; + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED);
SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); hor = HttpOpenRequestA(hic, NULL, path, NULL, NULL, NULL, INTERNET_FLAG_RELOAD|INTERNET_FLAG_DONT_CACHE, 0xdeadbead); - ok((hor != 0x0), "HttpOpenRequest failed: %lu\n", GetLastError()); + ok(hor != 0x0, "HttpOpenRequest failed: %lu\n", GetLastError()); if(hor == 0x0) goto abort; + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED);
/* NULL handle tests */ pos = InternetSetFilePointer(NULL, 0, NULL, FILE_BEGIN, 0); @@ -660,7 +658,39 @@ static void InternetSetFilePointer_test(const char *host, const char *path) expected = pos == INVALID_SET_FILE_POINTER && err == ERROR_INVALID_HANDLE; ok(expected, "Expected ERROR_INVALID_HANDLE. Got %lu\n", err);
- /* INTERNET_FLAG_DONT_CACHE tests */ + /* INTERNET_FLAG_DONT_CACHE before sending request */ + pos = InternetSetFilePointer(hor, 0, NULL, FILE_BEGIN, 0); + err = pos == INVALID_SET_FILE_POINTER ? GetLastError() : NO_ERROR; + expected = pos == INVALID_SET_FILE_POINTER && err == ERROR_INTERNET_INVALID_OPERATION; + ok(expected, "Expected ERROR_INTERNET_INVALID_OPERATION. Got %lu\n", err); + pos = InternetSetFilePointer(hor, 0, NULL, FILE_CURRENT, 0); + err = pos == INVALID_SET_FILE_POINTER ? GetLastError() : NO_ERROR; + expected = pos == INVALID_SET_FILE_POINTER && err == ERROR_INTERNET_INVALID_OPERATION; + ok(expected, "Expected ERROR_INTERNET_INVALID_OPERATION. Got %lu\n", err); + pos = InternetSetFilePointer(hor, 0, NULL, FILE_END, 0); + err = pos == INVALID_SET_FILE_POINTER ? GetLastError() : NO_ERROR; + expected = pos == INVALID_SET_FILE_POINTER && err == ERROR_INTERNET_INVALID_OPERATION; + ok(expected, "Expected ERROR_INTERNET_INVALID_OPERATION. Got %lu\n", err); + + SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); + + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); + + res = HttpSendRequestA(hor, NULL, 0, NULL, 0); + err = !res ? GetLastError() : NO_ERROR; + expected = res && err == NO_ERROR; + ok(expected, "HttpSendRequest failed: %lu\n", err); + + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + + /* INTERNET_FLAG_DONT_CACHE after sending request */ pos = InternetSetFilePointer(hor, 0, NULL, FILE_BEGIN, 0); err = pos == INVALID_SET_FILE_POINTER ? GetLastError() : NO_ERROR; expected = pos == INVALID_SET_FILE_POINTER && err == ERROR_INTERNET_INVALID_OPERATION; @@ -673,27 +703,21 @@ static void InternetSetFilePointer_test(const char *host, const char *path) err = pos == INVALID_SET_FILE_POINTER ? GetLastError() : NO_ERROR; expected = pos == INVALID_SET_FILE_POINTER && err == ERROR_INTERNET_INVALID_OPERATION; ok(expected, "Expected ERROR_INTERNET_INVALID_OPERATION. Got %lu\n", err); - if(hor) { - SET_EXPECT(INTERNET_STATUS_HANDLE_CLOSING); - InternetCloseHandle(hor); - } + + SET_EXPECT(INTERNET_STATUS_HANDLE_CLOSING); + InternetCloseHandle(hor);
SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); hor = HttpOpenRequestA(hic, NULL, path, NULL, NULL, NULL, INTERNET_FLAG_RELOAD, 0xdeadbead); - ok((hor != 0x0), "HttpOpenRequest failed: %lu\n", GetLastError()); + ok(hor != 0x0, "HttpOpenRequest failed: %lu\n", GetLastError()); if(hor == 0x0) goto abort; + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + + SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER);
- CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); - CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); - if (first_connection_to_test_url) - { - SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); - SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); - } - SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); - SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); @@ -704,6 +728,11 @@ static void InternetSetFilePointer_test(const char *host, const char *path) expected = res && err == NO_ERROR; ok(expected, "HttpSendRequest failed: %lu\n", err);
+ CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + /* FILE_BEGIN tests */ i = 0; while(i < min(size, 4)) { @@ -713,11 +742,11 @@ static void InternetSetFilePointer_test(const char *host, const char *path) err = pos == INVALID_SET_FILE_POINTER ? GetLastError() : NO_ERROR; expected = pos == i && err == NO_ERROR; ok(expected, "Expected position %#lx. Got %#lx. GetLastError() %lu\n", i, pos, err); - res = InternetReadFile(hor, buf, BUFFER_SIZE, &count); + res = InternetReadFile(hor, buf, sizeof(buf), &count); err = !res ? GetLastError() : NO_ERROR; ok(res, "InternetReadFile failed: %lu\n", err); ok(count, "InternetReadFile returned no content\n"); - ok(!memcmp(expect_response+i, buf, min(BUFFER_SIZE-i, count)), + ok(!memcmp(expect_response+i, buf, min(sizeof(buf)-i, count)), "Unexpected result from InternetReadFile\n"); i = i + 1; } @@ -728,10 +757,10 @@ static void InternetSetFilePointer_test(const char *host, const char *path) err = pos == INVALID_SET_FILE_POINTER ? GetLastError() : NO_ERROR; expected = pos == i && err == NO_ERROR; ok(expected, "Expected position %#lx. Got %#lx. GetLastError() %lu\n", i, pos, err); - res = InternetReadFile(hor, buf, BUFFER_SIZE, &count); + res = InternetReadFile(hor, buf, sizeof(buf), &count); err = !res ? GetLastError() : NO_ERROR; ok(res, "InternetReadFile failed: %lu\n", err); - ok(!memcmp(expect_response+i, buf, min(BUFFER_SIZE-i, count)), + ok(!memcmp(expect_response+i, buf, min(sizeof(buf)-i, count)), "Unexpected result from InternetReadFile\n"); i = i - 1; } @@ -761,7 +790,7 @@ static void InternetSetFilePointer_test(const char *host, const char *path) res = InternetReadFile(hor, buf, 1024, &count); err = !res ? GetLastError() : NO_ERROR; ok(res, "InternetReadFile failed: %lu\n", err); - ok(!memcmp(expect_response+i, buf, min(BUFFER_SIZE-i, count)), + ok(!memcmp(expect_response+i, buf, min(sizeof(buf)-i, count)), "Unexpected result from InternetReadFile\n"); } pos = InternetSetFilePointer(hor, -1, NULL, FILE_CURRENT, 0); @@ -808,6 +837,9 @@ static void InternetSetFilePointer_test(const char *host, const char *path) todo_wine ok(expected, "Expected ERROR_NEGATIVE_SEEK. Got %lu\n", err); }
+ CLEAR_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CLEAR_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + abort: SET_OPTIONAL(INTERNET_STATUS_CLOSING_CONNECTION); SET_OPTIONAL(INTERNET_STATUS_CONNECTION_CLOSED); @@ -816,10 +848,6 @@ abort: SET_OPTIONAL(INTERNET_STATUS_HANDLE_CLOSING); if(hic) InternetCloseHandle(hic); if(hi) InternetCloseHandle(hi); - -#ifdef BUFFER_SIZE -#undef BUFFER_SIZE -#endif }
static void InternetReadFile_test(int flags, const test_data_t *test)