[PATCH 2/3] wininet: Fix some InternetErrorDlg() conditions returning ERROR_INVALID_PARAMETER.
Dmitry Timoshkov
dmitry at baikal.ru
Wed Sep 1 09:13:05 CDT 2021
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
---
dlls/wininet/dialogs.c | 5 +----
dlls/wininet/tests/internet.c | 4 ++--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c
index 7af1bcd59f9..25ed1f2a651 100644
--- a/dlls/wininet/dialogs.c
+++ b/dlls/wininet/dialogs.c
@@ -498,7 +498,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
if( !dwError && !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) )
break;
if(!req)
- return ERROR_INVALID_HANDLE;
+ return ERROR_INVALID_PARAMETER;
switch(req->status_code) {
case HTTP_STATUS_PROXY_AUTH_REQ:
@@ -523,9 +523,6 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
res = ERROR_CANCELLED;
break;
}
- if(!req)
- return ERROR_INVALID_HANDLE;
-
if( dwFlags & ~FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS )
FIXME("%08x contains unsupported flags.\n", dwFlags);
diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c
index 6b8eefc0b78..f7d7f1f49d7 100644
--- a/dlls/wininet/tests/internet.c
+++ b/dlls/wininet/tests/internet.c
@@ -1595,7 +1595,6 @@ static void test_InternetErrorDlg(void)
res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL);
todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION ||
- i == ERROR_INTERNET_INCORRECT_PASSWORD ||
i == ERROR_INTERNET_INSERT_CDROM ||
i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED ||
i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR)
@@ -1608,7 +1607,8 @@ static void test_InternetErrorDlg(void)
i != ERROR_INTERNET_MIXED_SECURITY && i != ERROR_INTERNET_CHG_POST_IS_NON_SECURE &&
i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR &&
i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT &&
- i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION)
+ i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION &&
+ i != ERROR_INTERNET_INCORRECT_PASSWORD)
ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i);
}
--
2.31.1
More information about the wine-devel
mailing list