[PATCH 1/3] wininet/tests: Don't test that the URL cache is used for persistent cookies.

[Zebediah Figura]

This seems to be an implementation detail, which is no longer true in Windows
1709+.

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
Enumerating cache entries still yields the cookie, but the local path is a
file "deprecated.cookie" which states: "Cookies are no longer stored in files.
Please use Internet*Cookie* APIs to access cookies."

 dlls/wininet/tests/internet.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c
index 13b29309888..b94c0647e20 100644
--- a/dlls/wininet/tests/internet.c
+++ b/dlls/wininet/tests/internet.c
@@ -376,7 +376,6 @@ static void test_complicated_cookie(void)
   BOOL ret;
 
   CHAR buffer[1024];
-  CHAR user[256];
   WCHAR wbuf[1024];
 
   static const WCHAR testing_example_comW[] =
@@ -530,25 +529,16 @@ static void test_complicated_cookie(void)
   ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT");
   ok(ret, "InternetSetCookie failed with error %d\n", GetLastError());
 
-  len = sizeof(user);
-  ret = GetUserNameA(user, &len);
-  ok(ret, "GetUserName failed with error %d\n", GetLastError());
-  for(; len>0; len--)
-      user[len-1] = tolower(user[len-1]);
-
-  sprintf(buffer, "Cookie:%s(a)testing.example.com/", user);
-  ret = GetUrlCacheEntryInfoA(buffer, NULL, &len);
-  ok(!ret, "GetUrlCacheEntryInfo succeeded\n");
-  ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() = %d\n", GetLastError());
+  len = sizeof(buffer);
+  ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len);
+  ok(ret, "got error %u\n", GetLastError());
+  ok(len == 24, "got len %u\n", len);
+  ok(!!strstr(buffer, "A=B"), "cookie is not present\n");
 
   /* remove persistent cookie */
   ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B");
   ok(ret, "InternetSetCookie failed with error %d\n", GetLastError());
 
-  ret = GetUrlCacheEntryInfoA(buffer, NULL, &len);
-  ok(!ret, "GetUrlCacheEntryInfo succeeded\n");
-  ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError());
-
   /* try setting cookie for different domain */
   ret = InternetSetCookieA("http://www.aaa.example.com/bar",NULL,"E=F; domain=different.com");
   ok(!ret, "InternetSetCookie succeeded\n");
-- 
2.24.1

[PATCH 2/3] wininet/tests: Simplify test_InternetErrorDlg().

[Zebediah Figura]

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 dlls/wininet/tests/internet.c | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c
index b94c0647e20..c7525f796b8 100644
--- a/dlls/wininet/tests/internet.c
+++ b/dlls/wininet/tests/internet.c
@@ -1459,7 +1459,7 @@ static void test_Option_PerConnectionOptionA(void)
 static void test_InternetErrorDlg(void)
 {
     HINTERNET ses, con, req;
-    DWORD res, flags;
+    DWORD res;
     HWND hwnd;
     ULONG i;
     static const struct {
@@ -1486,12 +1486,9 @@ static void test_InternetErrorDlg(void)
         { ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT, ERROR_CANCELLED, FLAG_TODO },
         { ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION, ERROR_CANCELLED, FLAG_TODO },
         { ERROR_INTERNET_SEC_CERT_REVOKED       , ERROR_CANCELLED, 0 },
-        { 0, ERROR_NOT_SUPPORTED }
     };
 
-    flags = 0;
-
-    res = InternetErrorDlg(NULL, NULL, 12055, flags, NULL);
+    res = InternetErrorDlg(NULL, NULL, ERROR_INTERNET_SEC_CERT_ERRORS, 0, NULL);
     ok(res == ERROR_INVALID_HANDLE, "Got %d\n", res);
 
     ses = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0);
@@ -1504,27 +1501,28 @@ static void test_InternetErrorDlg(void)
     /* NULL hwnd and FLAGS_ERROR_UI_FLAGS_NO_UI not set */
     for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++)
     {
-        res = InternetErrorDlg(NULL, req, i, flags, NULL);
+        res = InternetErrorDlg(NULL, req, i, 0, NULL);
         ok(res == ERROR_INVALID_HANDLE, "Got %d (%d)\n", res, i);
     }
 
     hwnd = GetDesktopWindow();
     ok(hwnd != NULL, "GetDesktopWindow failed (%d)\n", GetLastError());
 
-    flags = FLAGS_ERROR_UI_FLAGS_NO_UI;
     for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++)
     {
-        DWORD expected, test_flags, j;
+        DWORD expected = ERROR_NOT_SUPPORTED, test_flags = 0, j;
 
-        for(j = 0; no_ui_res[j].error != 0; ++j)
-            if(no_ui_res[j].error == i)
-                break;
-
-        test_flags = no_ui_res[j].test_flags;
-        expected = no_ui_res[j].res;
+        for (j = 0; j < ARRAY_SIZE(no_ui_res); ++j)
+        {
+            if (no_ui_res[j].error == i)
+            {
+                test_flags = no_ui_res[j].test_flags;
+                expected = no_ui_res[j].res;
+            }
+        }
 
         /* Try an invalid request handle */
-        res = InternetErrorDlg(hwnd, (HANDLE)0xdeadbeef, i, flags, NULL);
+        res = InternetErrorDlg(hwnd, (HANDLE)0xdeadbeef, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL);
         if(res == ERROR_CALL_NOT_IMPLEMENTED)
         {
             ok(test_flags & FLAG_UNIMPL, "%i is unexpectedly unimplemented.\n", i);
@@ -1540,7 +1538,7 @@ static void test_InternetErrorDlg(void)
         if(i == ERROR_INTERNET_SEC_CERT_REVOKED)
             continue; /* Interactive (XP, Win7) */
 
-        res = InternetErrorDlg(hwnd, req, i, flags, NULL);
+        res = InternetErrorDlg(hwnd, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL);
 
         /* Handle some special cases */
         switch(i)
@@ -1571,7 +1569,7 @@ static void test_InternetErrorDlg(void)
             ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i);
 
         /* Same thing with NULL hwnd */
-        res = InternetErrorDlg(NULL, req, i, flags, NULL);
+        res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL);
         todo_wine_if(test_flags & FLAG_TODO)
             ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i);
 
@@ -1580,7 +1578,7 @@ static void test_InternetErrorDlg(void)
         if(test_flags & FLAG_NEEDREQ)
             expected = ERROR_INVALID_PARAMETER;
 
-        res = InternetErrorDlg(hwnd, NULL, i, flags, NULL);
+        res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL);
         todo_wine_if( test_flags & FLAG_TODO || i == ERROR_INTERNET_INCORRECT_PASSWORD)
             ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i);
     }
-- 
2.24.1

[PATCH 2/3] wininet/tests: Simplify test_InternetErrorDlg().

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=62934

Your paranoid android.


=== w1064v1809_ar (task log) ===

Task errors:
The task timed out

=== w1064v1809_he (32 bit report) ===

wininet:
internet.c:1505: Test failed: Got 87 (12014)
internet.c:1505: Test failed: Got 1223 (12044)
internet.c:1505: Test failed: Got 120 (12053)

=== w1064v1809_he (task log) ===

Task errors:
The task timed out

=== w1064v1809_ja (task log) ===

Task errors:
The task timed out

=== w1064v1809_zh_CN (task log) ===

Task errors:
The task timed out

[PATCH 3/3] wininet/tests: Fix some test failures with Windows 10.

[Zebediah Figura]

Windows 10 1607+ no longer validates a NULL window handle, so remove that test.

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 dlls/wininet/tests/internet.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c
index c7525f796b8..e69b45a7e6f 100644
--- a/dlls/wininet/tests/internet.c
+++ b/dlls/wininet/tests/internet.c
@@ -25,6 +25,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "wininet.h"
+#include "winineti.h"
 #include "winerror.h"
 #include "winreg.h"
 
@@ -1498,13 +1499,6 @@ static void test_InternetErrorDlg(void)
     req = HttpOpenRequestA(con, "GET", "/", NULL, NULL, NULL, 0, 0);
     ok(req != 0, "HttpOpenRequest failed: 0x%08x\n", GetLastError());
 
-    /* NULL hwnd and FLAGS_ERROR_UI_FLAGS_NO_UI not set */
-    for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++)
-    {
-        res = InternetErrorDlg(NULL, req, i, 0, NULL);
-        ok(res == ERROR_INVALID_HANDLE, "Got %d (%d)\n", res, i);
-    }
-
     hwnd = GetDesktopWindow();
     ok(hwnd != NULL, "GetDesktopWindow failed (%d)\n", GetLastError());
 
@@ -1537,6 +1531,8 @@ static void test_InternetErrorDlg(void)
 
         if(i == ERROR_INTERNET_SEC_CERT_REVOKED)
             continue; /* Interactive (XP, Win7) */
+        if (i == ERROR_INTERNET_PROXY_ALERT)
+            continue; /* Interactive (Win10 1607+) */
 
         res = InternetErrorDlg(hwnd, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL);
 
@@ -1550,13 +1546,8 @@ static void test_InternetErrorDlg(void)
                 expected = ERROR_CANCELLED;
             break;
         case ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED:
-            if(res != expected)
-            {
-                /* Windows XP, W2K3 */
-                ok(res == NTE_PROV_TYPE_NOT_DEF, "Got %d\n", res);
-                win_skip("Skipping some tests for %d\n", i);
-                continue;
-            }
+            if (res == NTE_PROV_TYPE_NOT_DEF) /* XP, 2003 */
+                expected = NTE_PROV_TYPE_NOT_DEF;
             break;
         case ERROR_INTERNET_CHG_POST_IS_NON_SECURE:
             if(res == ERROR_SUCCESS) /* win10 returns ERROR_SUCCESS */
@@ -1565,6 +1556,9 @@ static void test_InternetErrorDlg(void)
         default: break;
         }
 
+        if (expected == ERROR_NOT_SUPPORTED && res == ERROR_CANCELLED) /* Win10 1607+ */
+            expected = ERROR_CANCELLED;
+
         todo_wine_if(test_flags & FLAG_TODO)
             ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i);
 
-- 
2.24.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=62933

Your paranoid android.


=== w1064v1809_ar (task log) ===

Task errors:
The task timed out

=== w1064v1809_he (32 bit report) ===

wininet:
internet.c:1508: Test failed: Got 87 (12014)
internet.c:1508: Test failed: Got 1223 (12044)
internet.c:1508: Test failed: Got 120 (12053)

=== w1064v1809_he (task log) ===

Task errors:
The task timed out

=== w1064v1809_ja (task log) ===

Task errors:
The task timed out

=== w1064v1809_zh_CN (task log) ===

Task errors:
The task timed out