wininet: Read status code directly from request object in InternetErrorDlg.
This commit is contained in:
parent
ebff6036bf
commit
74f596c5ed
|
@ -476,28 +476,6 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog(
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* 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
|
* InternetErrorDlg
|
||||||
*/
|
*/
|
||||||
|
@ -531,16 +509,12 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
|
||||||
{
|
{
|
||||||
case ERROR_SUCCESS:
|
case ERROR_SUCCESS:
|
||||||
case ERROR_INTERNET_INCORRECT_PASSWORD: {
|
case ERROR_INTERNET_INCORRECT_PASSWORD: {
|
||||||
DWORD dwStatus;
|
|
||||||
|
|
||||||
if( !dwError && !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) )
|
if( !dwError && !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) )
|
||||||
break;
|
break;
|
||||||
if(!req)
|
if(!req)
|
||||||
return ERROR_INVALID_HANDLE;
|
return ERROR_INVALID_HANDLE;
|
||||||
|
|
||||||
dwStatus = WININET_GetConnectionStatus( hRequest );
|
switch(req->status_code) {
|
||||||
switch (dwStatus)
|
|
||||||
{
|
|
||||||
case HTTP_STATUS_PROXY_AUTH_REQ:
|
case HTTP_STATUS_PROXY_AUTH_REQ:
|
||||||
res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_PROXYDLG ),
|
res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_PROXYDLG ),
|
||||||
hWnd, WININET_ProxyPasswordDialog, (LPARAM) ¶ms );
|
hWnd, WININET_ProxyPasswordDialog, (LPARAM) ¶ms );
|
||||||
|
@ -550,7 +524,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest,
|
||||||
hWnd, WININET_PasswordDialog, (LPARAM) ¶ms );
|
hWnd, WININET_PasswordDialog, (LPARAM) ¶ms );
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
WARN("unhandled status %u\n", dwStatus);
|
WARN("unhandled status %u\n", req->status_code);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue