Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add handling of http errors to wxWebViewIE. Tidy up existing large case statement.

Browse Source 
Closes #14877.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2012-12-30 20:19:58 +00:00
parent 04a6ed3efd
commit c13815810e
2 changed files with 82 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
samples/webview/webview.cpp
View File

@@ -965,48 +965,30 @@ void WebFrame::OnSelectAll(wxCommandEvent& WXUNUSED(evt))
* Callback invoked when a loading error occurs * Callback invoked when a loading error occurs
*/ */
void WebFrame::OnError(wxWebViewEvent& evt) void WebFrame::OnError(wxWebViewEvent& evt)
{ {
wxString errorCategory; #define WX_ERROR_CASE(type) \
case type: \
category = #type; \
break;
wxString category;
switch (evt.GetInt()) switch (evt.GetInt())
{ {
case wxWEB_NAV_ERR_CONNECTION: WX_ERROR_CASE(wxWEB_NAV_ERR_CONNECTION);
errorCategory = "wxWEB_NAV_ERR_CONNECTION"; WX_ERROR_CASE(wxWEB_NAV_ERR_CERTIFICATE);
break; WX_ERROR_CASE(wxWEB_NAV_ERR_AUTH);
WX_ERROR_CASE(wxWEB_NAV_ERR_SECURITY);
case wxWEB_NAV_ERR_CERTIFICATE: WX_ERROR_CASE(wxWEB_NAV_ERR_NOT_FOUND);
errorCategory = "wxWEB_NAV_ERR_CERTIFICATE"; WX_ERROR_CASE(wxWEB_NAV_ERR_REQUEST);
break; WX_ERROR_CASE(wxWEB_NAV_ERR_USER_CANCELLED);
WX_ERROR_CASE(wxWEB_NAV_ERR_OTHER);
case wxWEB_NAV_ERR_AUTH:
errorCategory = "wxWEB_NAV_ERR_AUTH";
break;
case wxWEB_NAV_ERR_SECURITY:
errorCategory = "wxWEB_NAV_ERR_SECURITY";
break;
case wxWEB_NAV_ERR_NOT_FOUND:
errorCategory = "wxWEB_NAV_ERR_NOT_FOUND";
break;
case wxWEB_NAV_ERR_REQUEST:
errorCategory = "wxWEB_NAV_ERR_REQUEST";
break;
case wxWEB_NAV_ERR_USER_CANCELLED:
errorCategory = "wxWEB_NAV_ERR_USER_CANCELLED";
break;
case wxWEB_NAV_ERR_OTHER:
errorCategory = "wxWEB_NAV_ERR_OTHER";
break;
} }
wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + errorCategory + "' (" + evt.GetString() + ")"); wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + category + " (" + evt.GetString() + ")'");
//Show the info bar with an error //Show the info bar with an error
m_info->ShowMessage(_("An error occurred loading ") + evt.GetURL() + "\n" + m_info->ShowMessage(_("An error occurred loading ") + evt.GetURL() + "\n" +
"'" + errorCategory + "' (" + evt.GetString() + ")", wxICON_ERROR); "'" + category + "'", wxICON_ERROR);
UpdateState(); UpdateState();
} }

181
src/msw/webview_ie.cpp
View File

@@ -28,6 +28,7 @@
#include "wx/filesys.h" #include "wx/filesys.h"
#include "wx/dynlib.h" #include "wx/dynlib.h"
#include <initguid.h> #include <initguid.h>
#include <wininet.h>
/* These GUID definitions are our own implementation to support interfaces /* These GUID definitions are our own implementation to support interfaces
* normally in urlmon.h. See include/wx/msw/webview_ie.h * normally in urlmon.h. See include/wx/msw/webview_ie.h
@@ -50,6 +51,13 @@ enum //Internal find flags
} }
//Convenience function for error conversion
#define WX_ERROR_CASE(error, wxerror) \
case error: \
event.SetString(#error); \
event.SetInt(wxerror); \
break;
wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewIE, wxWebView); wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewIE, wxWebView);
BEGIN_EVENT_TABLE(wxWebViewIE, wxControl) BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
@@ -1321,125 +1329,66 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
case DISPID_NAVIGATEERROR: case DISPID_NAVIGATEERROR:
{ {
wxWebViewNavigationError errorType = wxWEB_NAV_ERR_OTHER; wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(),
wxString errorCode = "?"; evt[1].GetString(), evt[2].GetString());
event.SetEventObject(this);
switch (evt[3].GetLong()) switch (evt[3].GetLong())
{ {
case INET_E_INVALID_URL: // (0x800C0002L or -2146697214) // 400 Error codes
errorCode = "INET_E_INVALID_URL"; WX_ERROR_CASE(HTTP_STATUS_BAD_REQUEST, wxWEB_NAV_ERR_REQUEST)
errorType = wxWEB_NAV_ERR_REQUEST; WX_ERROR_CASE(HTTP_STATUS_DENIED, wxWEB_NAV_ERR_AUTH)
break; WX_ERROR_CASE(HTTP_STATUS_PAYMENT_REQ, wxWEB_NAV_ERR_OTHER)
case INET_E_NO_SESSION: // (0x800C0003L or -2146697213) WX_ERROR_CASE(HTTP_STATUS_FORBIDDEN, wxWEB_NAV_ERR_AUTH)
errorCode = "INET_E_NO_SESSION"; WX_ERROR_CASE(HTTP_STATUS_NOT_FOUND, wxWEB_NAV_ERR_NOT_FOUND)
errorType = wxWEB_NAV_ERR_CONNECTION; WX_ERROR_CASE(HTTP_STATUS_BAD_METHOD, wxWEB_NAV_ERR_REQUEST)
break; WX_ERROR_CASE(HTTP_STATUS_NONE_ACCEPTABLE, wxWEB_NAV_ERR_OTHER)
case INET_E_CANNOT_CONNECT: // (0x800C0004L or -2146697212) WX_ERROR_CASE(HTTP_STATUS_PROXY_AUTH_REQ, wxWEB_NAV_ERR_AUTH)
errorCode = "INET_E_CANNOT_CONNECT"; WX_ERROR_CASE(HTTP_STATUS_REQUEST_TIMEOUT, wxWEB_NAV_ERR_CONNECTION)
errorType = wxWEB_NAV_ERR_CONNECTION; WX_ERROR_CASE(HTTP_STATUS_CONFLICT, wxWEB_NAV_ERR_REQUEST)
break; WX_ERROR_CASE(HTTP_STATUS_GONE, wxWEB_NAV_ERR_NOT_FOUND)
case INET_E_RESOURCE_NOT_FOUND: // (0x800C0005L or -2146697211) WX_ERROR_CASE(HTTP_STATUS_LENGTH_REQUIRED, wxWEB_NAV_ERR_REQUEST)
errorCode = "INET_E_RESOURCE_NOT_FOUND"; WX_ERROR_CASE(HTTP_STATUS_PRECOND_FAILED, wxWEB_NAV_ERR_REQUEST)
errorType = wxWEB_NAV_ERR_NOT_FOUND; WX_ERROR_CASE(HTTP_STATUS_REQUEST_TOO_LARGE, wxWEB_NAV_ERR_REQUEST)
break; WX_ERROR_CASE(HTTP_STATUS_URI_TOO_LONG, wxWEB_NAV_ERR_REQUEST)
case INET_E_OBJECT_NOT_FOUND: // (0x800C0006L or -2146697210) WX_ERROR_CASE(HTTP_STATUS_UNSUPPORTED_MEDIA, wxWEB_NAV_ERR_REQUEST)
errorCode = "INET_E_OBJECT_NOT_FOUND"; WX_ERROR_CASE(HTTP_STATUS_RETRY_WITH, wxWEB_NAV_ERR_OTHER)
errorType = wxWEB_NAV_ERR_NOT_FOUND;
break;
case INET_E_DATA_NOT_AVAILABLE: // (0x800C0007L or -2146697209)
errorCode = "INET_E_DATA_NOT_AVAILABLE";
errorType = wxWEB_NAV_ERR_NOT_FOUND;
break;
case INET_E_DOWNLOAD_FAILURE: // (0x800C0008L or -2146697208)
errorCode = "INET_E_DOWNLOAD_FAILURE";
errorType = wxWEB_NAV_ERR_CONNECTION;
break;
case INET_E_AUTHENTICATION_REQUIRED: // (0x800C0009L or -2146697207)
errorCode = "INET_E_AUTHENTICATION_REQUIRED";
errorType = wxWEB_NAV_ERR_AUTH;
break;
case INET_E_NO_VALID_MEDIA: // (0x800C000AL or -2146697206)
errorCode = "INET_E_NO_VALID_MEDIA";
errorType = wxWEB_NAV_ERR_REQUEST;
break;
case INET_E_CONNECTION_TIMEOUT: // (0x800C000BL or -2146697205)
errorCode = "INET_E_CONNECTION_TIMEOUT";
errorType = wxWEB_NAV_ERR_CONNECTION;
break;
case INET_E_INVALID_REQUEST: // (0x800C000CL or -2146697204)
errorCode = "INET_E_INVALID_REQUEST";
errorType = wxWEB_NAV_ERR_REQUEST;
break;
case INET_E_UNKNOWN_PROTOCOL: // (0x800C000DL or -2146697203)
errorCode = "INET_E_UNKNOWN_PROTOCOL";
errorType = wxWEB_NAV_ERR_REQUEST;
break;
case INET_E_SECURITY_PROBLEM: // (0x800C000EL or -2146697202)
errorCode = "INET_E_SECURITY_PROBLEM";
errorType = wxWEB_NAV_ERR_SECURITY;
break;
case INET_E_CANNOT_LOAD_DATA: // (0x800C000FL or -2146697201)
errorCode = "INET_E_CANNOT_LOAD_DATA";
errorType = wxWEB_NAV_ERR_OTHER;
break;
case INET_E_CANNOT_INSTANTIATE_OBJECT:
// CoCreateInstance will return an error code if this happens,
// we'll handle this above.
return;
break;
case INET_E_REDIRECT_FAILED: // (0x800C0014L or -2146697196)
errorCode = "INET_E_REDIRECT_FAILED";
errorType = wxWEB_NAV_ERR_OTHER;
break;
case INET_E_REDIRECT_TO_DIR: // (0x800C0015L or -2146697195)
errorCode = "INET_E_REDIRECT_TO_DIR";
errorType = wxWEB_NAV_ERR_REQUEST;
break;
case INET_E_CANNOT_LOCK_REQUEST: // (0x800C0016L or -2146697194)
errorCode = "INET_E_CANNOT_LOCK_REQUEST";
errorType = wxWEB_NAV_ERR_OTHER;
break;
case INET_E_USE_EXTEND_BINDING: // (0x800C0017L or -2146697193)
errorCode = "INET_E_USE_EXTEND_BINDING";
errorType = wxWEB_NAV_ERR_OTHER;
break;
case INET_E_TERMINATED_BIND: // (0x800C0018L or -2146697192)
errorCode = "INET_E_TERMINATED_BIND";
errorType = wxWEB_NAV_ERR_OTHER;
break;
case INET_E_INVALID_CERTIFICATE: // (0x800C0019L or -2146697191)
errorCode = "INET_E_INVALID_CERTIFICATE";
errorType = wxWEB_NAV_ERR_CERTIFICATE;
break;
case INET_E_CODE_DOWNLOAD_DECLINED: // (0x800C0100L or -2146696960)
errorCode = "INET_E_CODE_DOWNLOAD_DECLINED";
errorType = wxWEB_NAV_ERR_USER_CANCELLED;
break;
case INET_E_RESULT_DISPATCHED: // (0x800C0200L or -2146696704)
// cancel request cancelled...
errorCode = "INET_E_RESULT_DISPATCHED";
errorType = wxWEB_NAV_ERR_OTHER;
break;
case INET_E_CANNOT_REPLACE_SFP_FILE: // (0x800C0300L or -2146696448)
errorCode = "INET_E_CANNOT_REPLACE_SFP_FILE";
errorType = wxWEB_NAV_ERR_SECURITY;
break;
case INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY:
errorCode = "INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY";
errorType = wxWEB_NAV_ERR_SECURITY;
break;
case INET_E_CODE_INSTALL_SUPPRESSED:
errorCode = "INET_E_CODE_INSTALL_SUPPRESSED";
errorType = wxWEB_NAV_ERR_SECURITY;
break;
}
wxString url = evt[1].GetString(); // 500 - Error codes
wxString target = evt[2].GetString(); WX_ERROR_CASE(HTTP_STATUS_SERVER_ERROR, wxWEB_NAV_ERR_CONNECTION)
wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(), WX_ERROR_CASE(HTTP_STATUS_NOT_SUPPORTED, wxWEB_NAV_ERR_CONNECTION)
url, target); WX_ERROR_CASE(HTTP_STATUS_BAD_GATEWAY, wxWEB_NAV_ERR_CONNECTION)
event.SetEventObject(this); WX_ERROR_CASE(HTTP_STATUS_SERVICE_UNAVAIL, wxWEB_NAV_ERR_CONNECTION)
event.SetInt(errorType); WX_ERROR_CASE(HTTP_STATUS_GATEWAY_TIMEOUT, wxWEB_NAV_ERR_CONNECTION)
event.SetString(errorCode); WX_ERROR_CASE(HTTP_STATUS_VERSION_NOT_SUP, wxWEB_NAV_ERR_REQUEST)
// URL Moniker error codes
WX_ERROR_CASE(INET_E_INVALID_URL, wxWEB_NAV_ERR_REQUEST)
WX_ERROR_CASE(INET_E_NO_SESSION, wxWEB_NAV_ERR_CONNECTION)
WX_ERROR_CASE(INET_E_CANNOT_CONNECT, wxWEB_NAV_ERR_CONNECTION)
WX_ERROR_CASE(INET_E_RESOURCE_NOT_FOUND, wxWEB_NAV_ERR_NOT_FOUND)
WX_ERROR_CASE(INET_E_OBJECT_NOT_FOUND, wxWEB_NAV_ERR_NOT_FOUND)
WX_ERROR_CASE(INET_E_DATA_NOT_AVAILABLE, wxWEB_NAV_ERR_NOT_FOUND)
WX_ERROR_CASE(INET_E_DOWNLOAD_FAILURE, wxWEB_NAV_ERR_CONNECTION)
WX_ERROR_CASE(INET_E_AUTHENTICATION_REQUIRED, wxWEB_NAV_ERR_AUTH)
WX_ERROR_CASE(INET_E_NO_VALID_MEDIA, wxWEB_NAV_ERR_REQUEST)
WX_ERROR_CASE(INET_E_CONNECTION_TIMEOUT, wxWEB_NAV_ERR_CONNECTION)
WX_ERROR_CASE(INET_E_INVALID_REQUEST, wxWEB_NAV_ERR_REQUEST)
WX_ERROR_CASE(INET_E_UNKNOWN_PROTOCOL, wxWEB_NAV_ERR_REQUEST)
WX_ERROR_CASE(INET_E_SECURITY_PROBLEM, wxWEB_NAV_ERR_SECURITY)
WX_ERROR_CASE(INET_E_CANNOT_LOAD_DATA, wxWEB_NAV_ERR_OTHER)
WX_ERROR_CASE(INET_E_REDIRECT_FAILED, wxWEB_NAV_ERR_OTHER)
WX_ERROR_CASE(INET_E_REDIRECT_TO_DIR, wxWEB_NAV_ERR_REQUEST)
WX_ERROR_CASE(INET_E_CANNOT_LOCK_REQUEST, wxWEB_NAV_ERR_OTHER)
WX_ERROR_CASE(INET_E_USE_EXTEND_BINDING, wxWEB_NAV_ERR_OTHER)
WX_ERROR_CASE(INET_E_TERMINATED_BIND, wxWEB_NAV_ERR_OTHER)
WX_ERROR_CASE(INET_E_INVALID_CERTIFICATE, wxWEB_NAV_ERR_CERTIFICATE)
WX_ERROR_CASE(INET_E_CODE_DOWNLOAD_DECLINED, wxWEB_NAV_ERR_USER_CANCELLED)
WX_ERROR_CASE(INET_E_RESULT_DISPATCHED, wxWEB_NAV_ERR_OTHER)
WX_ERROR_CASE(INET_E_CANNOT_REPLACE_SFP_FILE, wxWEB_NAV_ERR_SECURITY)
WX_ERROR_CASE(INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY, wxWEB_NAV_ERR_SECURITY)
WX_ERROR_CASE(INET_E_CODE_INSTALL_SUPPRESSED, wxWEB_NAV_ERR_SECURITY)
}
HandleWindowEvent(event); HandleWindowEvent(event);
break; break;
} }