[PATCH 3/3] wininet/tests: Fix some test failures with Windows 10.
Zebediah Figura
z.figura12 at gmail.com
Mon Jan 6 14:47:44 CST 2020
Windows 10 1607+ no longer validates a NULL window handle, so remove that test.
Signed-off-by: Zebediah Figura <z.figura12 at 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
More information about the wine-devel
mailing list