wininet: Fix some InternetErrorDlg() conditions returning ERROR_INVALID_PARAMETER.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wininet: Fix some InternetErrorDlg() conditions returning ERROR_INVALID_PARAMETER.
dc48a9ac · Dmitry Timoshkov · Alexandre Julliard · 3ffca866 · dc48a9ac · dc48a9ac
Commit dc48a9ac authored Sep 06, 2021 by Dmitry Timoshkov Committed by Alexandre Julliard Sep 06, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

dialogs.c dlls/wininet/dialogs.c +1 -4

internet.c dlls/wininet/tests/internet.c +1 -2

No files found.
--- 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);

--- 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)