Dmitry Timoshkov : wininet: Fix some InternetErrorDlg() conditions returning ERROR_INVALID_PARAMETER.
Alexandre Julliard
julliard at winehq.org
Mon Sep 6 16:15:05 CDT 2021
Module: wine
Branch: master
Commit: dc48a9ac067490a90470c2f9b5cdfd268e12f8d5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc48a9ac067490a90470c2f9b5cdfd268e12f8d5
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Mon Sep 6 15:26:28 2021 +0200
wininet: Fix some InternetErrorDlg() conditions returning ERROR_INVALID_PARAMETER.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wininet/dialogs.c | 5 +----
dlls/wininet/tests/internet.c | 3 +--
2 files changed, 2 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 7d4935dac01..e83b142e998 100644
--- a/dlls/wininet/tests/internet.c
+++ b/dlls/wininet/tests/internet.c
@@ -1599,7 +1599,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 ||
@@ -1611,7 +1610,7 @@ static void test_InternetErrorDlg(void)
i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA &&
i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED &&
i != ERROR_INTERNET_MIXED_SECURITY && i != ERROR_INTERNET_POST_IS_NON_SECURE &&
- i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR &&
+ i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && i != ERROR_INTERNET_INCORRECT_PASSWORD &&
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)
More information about the wine-cvs
mailing list