Jacek Caban : wininet: Read status code directly from request object in InternetErrorDlg.
Alexandre Julliard
julliard at winehq.org
Fri Jun 8 13:36:14 CDT 2012
Module: wine
Branch: master
Commit: 74f596c5edf95fc3677690b642a55070fc6c8f43
URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f596c5edf95fc3677690b642a55070fc6c8f43
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Jun 8 10:52:42 2012 +0200
wininet: Read status code directly from request object in InternetErrorDlg.
---
dlls/wininet/dialogs.c | 30 ++----------------------------
1 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c
index e660e2b..a3235a4 100644
--- a/dlls/wininet/dialogs.c
+++ b/dlls/wininet/dialogs.c
@@ -477,28 +477,6 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog(
}
/***********************************************************************
- * WININET_GetConnectionStatus
- */
-static INT WININET_GetConnectionStatus( HINTERNET hRequest )
-{
- WCHAR szStatus[0x20];
- DWORD sz, index, dwStatus;
-
- TRACE("%p\n", hRequest );
-
- sz = sizeof szStatus;
- index = 0;
- if( !HttpQueryInfoW( hRequest, HTTP_QUERY_STATUS_CODE,
- szStatus, &sz, &index))
- return -1;
- dwStatus = atoiW( szStatus );
-
- TRACE("request %p status = %d\n", hRequest, dwStatus );
-
- return dwStatus;
-}
-
-/***********************************************************************
* InternetErrorDlg
*/
DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
@@ -531,16 +509,12 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
{
case ERROR_SUCCESS:
case ERROR_INTERNET_INCORRECT_PASSWORD: {
- DWORD dwStatus;
-
if( !dwError && !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) )
break;
if(!req)
return ERROR_INVALID_HANDLE;
- dwStatus = WININET_GetConnectionStatus( hRequest );
- switch (dwStatus)
- {
+ switch(req->status_code) {
case HTTP_STATUS_PROXY_AUTH_REQ:
res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_PROXYDLG ),
hWnd, WININET_ProxyPasswordDialog, (LPARAM) ¶ms );
@@ -550,7 +524,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
hWnd, WININET_PasswordDialog, (LPARAM) ¶ms );
break;
default:
- WARN("unhandled status %u\n", dwStatus);
+ WARN("unhandled status %u\n", req->status_code);
}
break;
}
More information about the wine-cvs
mailing list