[PATCH 0/2] MR845: tests: urlmon and wininet fixes

[PATCH 1/2] urlmon/tests: Make BINDSTATUS_DOWNLOADINGDATA optional in test_URLDownloadToFile_abort.

[Jacek Caban]

From: Jacek Caban

---
 dlls/urlmon/tests/url.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c
index 7ec5bf144db..9e1a6edcdfd 100644
--- a/dlls/urlmon/tests/url.c
+++ b/dlls/urlmon/tests/url.c
@@ -3747,7 +3747,7 @@ static void test_URLDownloadToFile_abort(void)
     CHECK_CALLED(OnProgress_SENDINGREQUEST);
     CHECK_CALLED(OnProgress_MIMETYPEAVAILABLE);
     CHECK_CALLED(OnProgress_BEGINDOWNLOADDATA);
-    CHECK_CALLED(OnProgress_DOWNLOADINGDATA);
+    CLEAR_CALLED(OnProgress_DOWNLOADINGDATA);
     CHECK_CALLED(OnProgress_ENDDOWNLOADDATA);
     CHECK_CALLED(OnStopBinding);

[PATCH 1/2] urlmon/tests: Make BINDSTATUS_DOWNLOADINGDATA optional in test_URLDownloadToFile_abort.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=123311

Your paranoid android.

=== w1064_2qxl (64 bit report) ===

urlmon:
url.c:1846: Test failed: binding failed: 800c0006, expected 00000000
url.c:1857: Test failed: res = 00002f4f, expected 00000000
url.c:3284: Test failed: expected OnProgress_SENDINGREQUEST
url.c:3292: Test failed: expected OnProgress_MIMETYPEAVAILABLE
url.c:3293: Test failed: expected OnProgress_BEGINDOWNLOADDATA
url.c:3294: Test failed: expected OnProgress_ENDDOWNLOADDATA
url.c:3306: Test failed: expected OnDataAvailable

=== w1064_adm (64 bit report) ===

urlmon:
url.c:1846: Test failed: binding failed: 800c0006, expected 00000000
url.c:1857: Test failed: res = 00002f4f, expected 00000000
url.c:3284: Test failed: expected OnProgress_SENDINGREQUEST
url.c:3292: Test failed: expected OnProgress_MIMETYPEAVAILABLE
url.c:3293: Test failed: expected OnProgress_BEGINDOWNLOADDATA
url.c:3294: Test failed: expected OnProgress_ENDDOWNLOADDATA
url.c:3306: Test failed: expected OnDataAvailable

=== w1064_tsign (64 bit report) ===

urlmon:
url.c:1846: Test failed: binding failed: 800c0006, expected 00000000
url.c:1857: Test failed: res = 00002f4f, expected 00000000
url.c:3284: Test failed: expected OnProgress_SENDINGREQUEST
url.c:3292: Test failed: expected OnProgress_MIMETYPEAVAILABLE
url.c:3293: Test failed: expected OnProgress_BEGINDOWNLOADDATA
url.c:3294: Test failed: expected OnProgress_ENDDOWNLOADDATA
url.c:3306: Test failed: expected OnDataAvailable

[PATCH 2/2] wininet/tests: Collect persistent connection before running tests in test_async_HttpSendRequestEx.

[Jacek Caban]

From: Jacek Caban

---
 dlls/wininet/tests/http.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 6a5a18fe282..aadedd27f24 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -7400,8 +7400,8 @@ static const struct notification async_send_request_ex_test2[] =
     { http_send_request_ex,  INTERNET_STATUS_COOKIE_SENT, TRUE, FALSE, TRUE },
     { http_send_request_ex,  INTERNET_STATUS_RESOLVING_NAME, TRUE, FALSE, TRUE },
     { http_send_request_ex,  INTERNET_STATUS_NAME_RESOLVED, TRUE, FALSE, TRUE },
-    { http_send_request_ex,  INTERNET_STATUS_CONNECTING_TO_SERVER, TRUE, TRUE },
-    { http_send_request_ex,  INTERNET_STATUS_CONNECTED_TO_SERVER, TRUE, TRUE },
+    { http_send_request_ex,  INTERNET_STATUS_CONNECTING_TO_SERVER, TRUE },
+    { http_send_request_ex,  INTERNET_STATUS_CONNECTED_TO_SERVER, TRUE },
     { http_send_request_ex,  INTERNET_STATUS_SENDING_REQUEST, TRUE },
     { http_send_request_ex,  INTERNET_STATUS_REQUEST_SENT, TRUE },
     { http_send_request_ex,  INTERNET_STATUS_REQUEST_COMPLETE, TRUE },
@@ -7445,8 +7445,8 @@ static const struct notification async_send_request_ex_chunked_test[] =
     { http_end_request,      INTERNET_STATUS_RECEIVING_RESPONSE, TRUE },
     { http_end_request,      INTERNET_STATUS_RESPONSE_RECEIVED, TRUE },
     { http_end_request,      INTERNET_STATUS_REQUEST_COMPLETE, TRUE },
-    { internet_close_handle, INTERNET_STATUS_CLOSING_CONNECTION },
-    { internet_close_handle, INTERNET_STATUS_CONNECTION_CLOSED },
+    { internet_close_handle, INTERNET_STATUS_CLOSING_CONNECTION, FALSE, FALSE, TRUE },
+    { internet_close_handle, INTERNET_STATUS_CONNECTION_CLOSED, FALSE, FALSE, TRUE },
     { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING },
     { internet_close_handle, INTERNET_STATUS_HANDLE_CLOSING }
 };
@@ -7497,6 +7497,10 @@ static void test_async_HttpSendRequestEx(const struct notification_data *nd)

trace("Async HttpSendRequestEx test (%s %s)\n", nd->method, nd->host);

+    /* Collect all existing persistent connections */
+    ret = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0);
+    ok(ret, "InternetSetOption(INTERNET_OPTION_END_BROWSER_SESSION) failed: %lu\n", GetLastError());
+
     InitializeCriticalSection( &notification_cs );

info.test  = nd->test;