ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

urlmon: Correctly handle BINDF_NO_UI in handle_http_error.

This commit is contained in:
Jacek Caban 2012-05-30 16:53:32 +02:00 committed by Alexandre Julliard
parent 586e8b0c61
commit 45a6619e44
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/urlmon/http.c
View File

@ -119,6 +119,9 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error)
IWindowForBindingUI *wfb_ui; IWindowForBindingUI *wfb_ui;
IHttpSecurity *http_security; IHttpSecurity *http_security;
BOOL security_problem; BOOL security_problem;
DWORD dlg_flags;
HWND hwnd;
DWORD res;
HRESULT hres; HRESULT hres;
switch(error) { switch(error) {
@ -183,7 +186,6 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error)
hres = IServiceProvider_QueryService(serv_prov, &IID_IWindowForBindingUI, &IID_IWindowForBindingUI, hres = IServiceProvider_QueryService(serv_prov, &IID_IWindowForBindingUI, &IID_IWindowForBindingUI,
(void**)&wfb_ui); (void**)&wfb_ui);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
HWND hwnd;
const IID *iid_reason; const IID *iid_reason;
if(security_problem) if(security_problem)
@ -194,26 +196,20 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error)
iid_reason = &IID_IWindowForBindingUI; iid_reason = &IID_IWindowForBindingUI;
hres = IWindowForBindingUI_GetWindow(wfb_ui, iid_reason, &hwnd); hres = IWindowForBindingUI_GetWindow(wfb_ui, iid_reason, &hwnd);
if(SUCCEEDED(hres) && hwnd)
{
DWORD res;
res = InternetErrorDlg(hwnd, This->base.request, error,
FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS | FLAGS_ERROR_UI_FLAGS_GENERATE_DATA,
NULL);
if(res == ERROR_INTERNET_FORCE_RETRY || res == ERROR_SUCCESS)
hres = RPC_E_RETRY;
else
hres = E_FAIL;
}
IWindowForBindingUI_Release(wfb_ui); IWindowForBindingUI_Release(wfb_ui);
if(FAILED(hres))
hwnd = NULL;
} }
IServiceProvider_Release(serv_prov); IServiceProvider_Release(serv_prov);
if(hres == RPC_E_RETRY) dlg_flags = FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS | FLAGS_ERROR_UI_FLAGS_GENERATE_DATA;
return hres; if(This->base.bindf & BINDF_NO_UI)
dlg_flags |= FLAGS_ERROR_UI_FLAGS_NO_UI;
res = InternetErrorDlg(hwnd, This->base.request, error, dlg_flags, NULL);
if(res == ERROR_INTERNET_FORCE_RETRY || res == ERROR_SUCCESS)
return RPC_E_RETRY;
return internet_error_to_hres(error); return internet_error_to_hres(error);
} }