[PATCH v4 3/3] wininet: Return correct errors and put handle into invalid state when seeking beyond end of file.

[Torge Matthies]

From: Torge Matthies

---
 dlls/wininet/http.c       | 39 +++++++++++++++++++++++++++++++++++++++
 dlls/wininet/tests/http.c |  8 --------
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index c1bba8a6594..2ebdc0a77f4 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -3048,11 +3048,21 @@ static DWORD read_req_file(http_request_t *req, BYTE *buffer, DWORD size, DWORD
     LARGE_INTEGER off;
     BYTE buf[1024];

+    if (req->state == ERROR_INTERNET_INCORRECT_HANDLE_STATE) {
+        *read = 0;
+        return ERROR_INTERNET_INCORRECT_HANDLE_STATE;
+    }
+
     while (req->content_pos > req->cache_size) {
         res = read_http_stream(req, (BYTE*)buf, min(sizeof(buf), req->content_pos - req->cache_size),
                                &ret_read, allow_blocking);
         if (res != ERROR_SUCCESS)
             return res;
+        if (!ret_read && req->content_pos > req->cache_size) {
+            req->state = ERROR_INTERNET_INCORRECT_HANDLE_STATE;
+            *read = 0;
+            return ERROR_NOACCESS;
+        }
         if (!ret_read) {
             *read = 0;
             return ERROR_SUCCESS;
@@ -3065,6 +3075,10 @@ static DWORD read_req_file(http_request_t *req, BYTE *buffer, DWORD size, DWORD
             return GetLastError();
         if (!ReadFile(req->req_file->file_handle, buffer, size, &ret_read, NULL))
             return GetLastError();
+    } else if (req->content_pos > req->cache_size) {
+        req->state = ERROR_INTERNET_INCORRECT_HANDLE_STATE;
+        *read = 0;
+        return ERROR_NOACCESS;
     }

*read = ret_read;
@@ -3147,12 +3161,26 @@ static void async_read_file_proc(task_header_t *hdr)

TRACE("req %p buf %p size %lu read_pos %lu ret_read %p\n", req, task->buf, task->size, task->read_pos, task->ret_read);

+    if (req->state == ERROR_INTERNET_INCORRECT_HANDLE_STATE) {
+        if(task->ret_read)
+            *task->ret_read = 0;
+        send_request_complete(req, FALSE, ERROR_INTERNET_INCORRECT_HANDLE_STATE);
+        return;
+    }
+
     if(req->req_file && req->req_file->file_handle) {
         DWORD ret, ret_read;
         BYTE buf[1024];
         while (req->content_pos > req->cache_size) {
             ret = read_http_stream(req, (BYTE*)buf, min(sizeof(buf), req->content_pos - req->cache_size),
                                    &ret_read, TRUE);
+            if (!ret_read && req->content_pos > req->cache_size) {
+                req->state = ERROR_INTERNET_INCORRECT_HANDLE_STATE;
+                if(task->ret_read)
+                    *task->ret_read = 0;
+                send_request_complete(req, FALSE, ERROR_NOACCESS);
+                return;
+            }
             if(ret != ERROR_SUCCESS || !ret_read)
                 break;
         }
@@ -3219,6 +3247,12 @@ static DWORD HTTPREQ_SetFilePointer(object_header_t *hdr, LONG lDistanceToMove,

EnterCriticalSection(&req->read_section);

+    if (req->state == ERROR_INTERNET_INCORRECT_HANDLE_STATE) {
+        LeaveCriticalSection(&req->read_section);
+        SetLastError(ERROR_INTERNET_INVALID_OPERATION);
+        return INVALID_SET_FILE_POINTER;
+    }
+
     switch (dwMoveContext) {
         case FILE_BEGIN:
             res = lDistanceToMove;
@@ -3366,6 +3400,11 @@ static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available,
         else if(req->state == INTERNET_HANDLE_IN_USE)
             req->state = ERROR_INTERNET_INTERNAL_ERROR;

+        if (req->state == ERROR_INTERNET_INCORRECT_HANDLE_STATE) {
+            LeaveCriticalSection( &req->read_section );
+            return ERROR_INTERNET_INCORRECT_HANDLE_STATE;
+        }
+
         avail = req->read_size;
         if(req->cache_size > req->content_pos)
             avail = max(avail, req->cache_size - req->content_pos);
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 3fa48ba8996..42d40dc26e3 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -893,35 +893,27 @@ static void InternetSetFilePointer_test(const char *host, const char *path)
     SetLastError(0xdeadbeef);
     res = InternetReadFile(hor, buf, 1024, &count);
     err = !res ? GetLastError() : NO_ERROR;
-    todo_wine
     ok(!res, "InternetReadFile succeeded unexpectedly\n");
-    todo_wine
     ok(err == ERROR_NOACCESS, "InternetReadFile unexpected error %lu\n", err);

SetLastError(0xdeadbeef);
     res = InternetReadFile(hor, buf, 1024, &count);
     err = !res ? GetLastError() : NO_ERROR;
-    todo_wine
     ok(!res, "InternetReadFile succeeded unexpectedly\n");
-    todo_wine
     ok(err == ERROR_INTERNET_INCORRECT_HANDLE_STATE, "InternetReadFile unexpected error %lu\n", err);

SetLastError(0xdeadbeef);
     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;
-    todo_wine
     ok(expected, "Expected position %#x. Got %#lx. GetLastError() %lu\n", INVALID_SET_FILE_POINTER, pos, err);

count = 0;
     SetLastError(0xdeadbeef);
     res = InternetQueryDataAvailable(hor, &count, 0x0, 0x0);
     err = !res ? GetLastError() : NO_ERROR;
-    todo_wine
     ok(!res, "InternetQueryDataAvailable succeeded unexpectedly\n");
-    todo_wine
     ok(err == ERROR_INTERNET_INCORRECT_HANDLE_STATE, "InternetQueryDataAvailable unexpected error %lu\n", err);
-    todo_wine
     ok(count == 0, "InternetQueryDataAvailable unexpected count: %lu\n", count);

size = ARRAY_SIZE(buf);