X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e52aec972c61d03c631ae46ad676992980978638..be9cae51e696b6e363446a436ea7682e0a3320ca:/src/msw/webview_ie.cpp diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp index 723c4ed096..a5e3c130ae 100644 --- a/src/msw/webview_ie.cpp +++ b/src/msw/webview_ie.cpp @@ -28,6 +28,7 @@ #include "wx/filesys.h" #include "wx/dynlib.h" #include +#include /* These GUID definitions are our own implementation to support interfaces * 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); BEGIN_EVENT_TABLE(wxWebViewIE, wxControl) @@ -92,7 +100,7 @@ bool wxWebViewIE::Create(wxWindow* parent, m_webBrowser->put_RegisterAsBrowser(VARIANT_TRUE); m_webBrowser->put_RegisterAsDropTarget(VARIANT_TRUE); - m_uiHandler = new DocHostUIHandler; + m_uiHandler = new DocHostUIHandler(this); m_container = new wxIEContainer(this, IID_IWebBrowser2, m_webBrowser, m_uiHandler); @@ -104,9 +112,27 @@ bool wxWebViewIE::Create(wxWindow* parent, wxWebViewIE::~wxWebViewIE() { - for(unsigned int i = 0; i < m_factories.size(); i++) + wxDynamicLibrary urlMon(wxT("urlmon.dll")); + if(urlMon.HasSymbol(wxT("CoInternetGetSession"))) { - m_factories[i]->Release(); + typedef HRESULT (WINAPI *CoInternetGetSession_t)(DWORD, + wxIInternetSession**, + DWORD); + wxDYNLIB_FUNCTION(CoInternetGetSession_t, CoInternetGetSession, urlMon); + + wxIInternetSession* session; + HRESULT res = (*pfnCoInternetGetSession)(0, &session, 0); + if(FAILED(res)) + { + wxFAIL_MSG("Could not retrive internet session"); + } + + for(unsigned int i = 0; i < m_factories.size(); i++) + { + session->UnregisterNameSpace(m_factories[i], + (m_factories[i]->GetName()).wc_str()); + m_factories[i]->Release(); + } } FindClear(); } @@ -980,16 +1006,16 @@ void wxWebViewIE::FindInternal(const wxString& text, int flags, int internal_fla pIMS->CreateMarkupPointer(&ptrBegin); pIMS->CreateMarkupPointer(&ptrEnd); - ptrBegin->SetGravity(POINTER_GRAVITY_Right); + ptrBegin->SetGravity(wxPOINTER_GRAVITY_Right); ptrBegin->MoveToContainer(pIMC, TRUE); //Create the find flag from the wx one. if(flags & wxWEB_VIEW_FIND_ENTIRE_WORD) { - find_flag |= FINDTEXT_WHOLEWORD; + find_flag |= wxFINDTEXT_WHOLEWORD; } if(flags & wxWEB_VIEW_FIND_MATCH_CASE) { - find_flag |= FINDTEXT_MATCHCASE; + find_flag |= wxFINDTEXT_MATCHCASE; } //A little speed-up to avoid to re-alloc in the positions vector. @@ -1008,7 +1034,7 @@ void wxWebViewIE::FindInternal(const wxString& text, int flags, int internal_fla if(flags & wxWEB_VIEW_FIND_HIGHLIGHT_RESULT) { IHTMLElement* pFontEl; - pIMS->CreateElement(TAGID_FONT, attr_bstr, &pFontEl); + pIMS->CreateElement(wxTAGID_FONT, attr_bstr, &pFontEl); pIMS->InsertElement(pFontEl, ptrBegin, ptrEnd); } if(internal_flag & wxWEB_VIEW_FIND_REMOVE_HIGHLIGHT) @@ -1303,125 +1329,66 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt) case DISPID_NAVIGATEERROR: { - wxWebViewNavigationError errorType = wxWEB_NAV_ERR_OTHER; - wxString errorCode = "?"; + wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(), + evt[1].GetString(), evt[2].GetString()); + event.SetEventObject(this); + switch (evt[3].GetLong()) { - case INET_E_INVALID_URL: // (0x800C0002L or -2146697214) - errorCode = "INET_E_INVALID_URL"; - errorType = wxWEB_NAV_ERR_REQUEST; - break; - case INET_E_NO_SESSION: // (0x800C0003L or -2146697213) - errorCode = "INET_E_NO_SESSION"; - errorType = wxWEB_NAV_ERR_CONNECTION; - break; - case INET_E_CANNOT_CONNECT: // (0x800C0004L or -2146697212) - errorCode = "INET_E_CANNOT_CONNECT"; - errorType = wxWEB_NAV_ERR_CONNECTION; - break; - case INET_E_RESOURCE_NOT_FOUND: // (0x800C0005L or -2146697211) - errorCode = "INET_E_RESOURCE_NOT_FOUND"; - errorType = wxWEB_NAV_ERR_NOT_FOUND; - break; - case INET_E_OBJECT_NOT_FOUND: // (0x800C0006L or -2146697210) - errorCode = "INET_E_OBJECT_NOT_FOUND"; - 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; + // 400 Error codes + WX_ERROR_CASE(HTTP_STATUS_BAD_REQUEST, wxWEB_NAV_ERR_REQUEST) + WX_ERROR_CASE(HTTP_STATUS_DENIED, wxWEB_NAV_ERR_AUTH) + WX_ERROR_CASE(HTTP_STATUS_PAYMENT_REQ, wxWEB_NAV_ERR_OTHER) + WX_ERROR_CASE(HTTP_STATUS_FORBIDDEN, wxWEB_NAV_ERR_AUTH) + WX_ERROR_CASE(HTTP_STATUS_NOT_FOUND, wxWEB_NAV_ERR_NOT_FOUND) + WX_ERROR_CASE(HTTP_STATUS_BAD_METHOD, wxWEB_NAV_ERR_REQUEST) + WX_ERROR_CASE(HTTP_STATUS_NONE_ACCEPTABLE, wxWEB_NAV_ERR_OTHER) + WX_ERROR_CASE(HTTP_STATUS_PROXY_AUTH_REQ, wxWEB_NAV_ERR_AUTH) + WX_ERROR_CASE(HTTP_STATUS_REQUEST_TIMEOUT, wxWEB_NAV_ERR_CONNECTION) + WX_ERROR_CASE(HTTP_STATUS_CONFLICT, wxWEB_NAV_ERR_REQUEST) + WX_ERROR_CASE(HTTP_STATUS_GONE, wxWEB_NAV_ERR_NOT_FOUND) + WX_ERROR_CASE(HTTP_STATUS_LENGTH_REQUIRED, wxWEB_NAV_ERR_REQUEST) + WX_ERROR_CASE(HTTP_STATUS_PRECOND_FAILED, wxWEB_NAV_ERR_REQUEST) + WX_ERROR_CASE(HTTP_STATUS_REQUEST_TOO_LARGE, wxWEB_NAV_ERR_REQUEST) + WX_ERROR_CASE(HTTP_STATUS_URI_TOO_LONG, wxWEB_NAV_ERR_REQUEST) + WX_ERROR_CASE(HTTP_STATUS_UNSUPPORTED_MEDIA, wxWEB_NAV_ERR_REQUEST) + WX_ERROR_CASE(HTTP_STATUS_RETRY_WITH, wxWEB_NAV_ERR_OTHER) + + // 500 - Error codes + WX_ERROR_CASE(HTTP_STATUS_SERVER_ERROR, wxWEB_NAV_ERR_CONNECTION) + WX_ERROR_CASE(HTTP_STATUS_NOT_SUPPORTED, wxWEB_NAV_ERR_CONNECTION) + WX_ERROR_CASE(HTTP_STATUS_BAD_GATEWAY, wxWEB_NAV_ERR_CONNECTION) + WX_ERROR_CASE(HTTP_STATUS_SERVICE_UNAVAIL, wxWEB_NAV_ERR_CONNECTION) + WX_ERROR_CASE(HTTP_STATUS_GATEWAY_TIMEOUT, wxWEB_NAV_ERR_CONNECTION) + 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) } - - wxString url = evt[1].GetString(); - wxString target = evt[2].GetString(); - wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(), - url, target); - event.SetEventObject(this); - event.SetInt(errorType); - event.SetString(errorCode); HandleWindowEvent(event); break; } @@ -1582,7 +1549,10 @@ HRESULT wxSTDCALL DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt, wxUnusedVar(ppt); wxUnusedVar(pcmdtReserved); wxUnusedVar(pdispReserved); - return E_NOTIMPL; + if(m_browser->IsContextMenuEnabled()) + return E_NOTIMPL; + else + return S_OK; } HRESULT wxSTDCALL DocHostUIHandler::GetHostInfo(DOCHOSTUIINFO *pInfo) @@ -1650,8 +1620,10 @@ HRESULT wxSTDCALL DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg, { if(lpMsg && lpMsg->message == WM_KEYDOWN) { - //control is down? - if((GetKeyState(VK_CONTROL) & 0x8000 )) + // check control is down but that it isn't right-alt which is mapped to + // alt + ctrl + if(GetKeyState(VK_CONTROL) & 0x8000 && + !(GetKeyState(VK_MENU) & 0x8000)) { //skip the accelerators used by the control switch(lpMsg->wParam)