X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58f513e9904a7e4e11007f459f57dac666ea88ce..ee6c519a4b1c8e919c1353b977e6396a160bc4b3:/src/msw/webview_ie.cpp diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp index c6d830de56..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 @@ -38,6 +39,9 @@ namespace { DEFINE_GUID(wxIID_IInternetProtocolRoot,0x79eac9e3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); DEFINE_GUID(wxIID_IInternetProtocol,0x79eac9e4,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb); DEFINE_GUID(wxIID_IDocHostUIHandler, 0xbd3f23c0, 0xd43e, 0x11cf, 0x89, 0x3b, 0x00, 0xaa, 0x00, 0xbd, 0xce, 0x1a); +DEFINE_GUID(wxIID_IHTMLElement2,0x3050f434,0x98b5,0x11cf,0xbb,0x82,0,0xaa,0,0xbd,0xce,0x0b); +DEFINE_GUID(wxIID_IMarkupServices,0x3050f4a0,0x98b5,0x11cf,0xbb,0x82,0,0xaa,0,0xbd,0xce,0x0b); +DEFINE_GUID(wxIID_IMarkupContainer,0x3050f5f9,0x98b5,0x11cf,0xbb,0x82,0,0xaa,0,0xbd,0xce,0x0b); enum //Internal find flags { @@ -47,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) @@ -89,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); @@ -101,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(); } @@ -601,7 +630,6 @@ void wxWebViewIE::Redo() long wxWebViewIE::Find(const wxString& text, int flags) { -#if !defined(__MINGW32__) && !defined(__VISUALC6__) //If the text is empty then we clear. if(text.IsEmpty()) { @@ -645,9 +673,6 @@ long wxWebViewIE::Find(const wxString& text, int flags) //find the text and return count. FindInternal(text, flags, wxWEB_VIEW_FIND_ADD_POINTERS); return m_findPointers.empty() ? wxNOT_FOUND : m_findPointers.size(); -#else - return wxNOT_FOUND; -#endif } void wxWebViewIE::SetEditable(bool enable) @@ -917,17 +942,16 @@ wxCOMPtr wxWebViewIE::GetDocument() const bool wxWebViewIE::IsElementVisible(IHTMLElement* elm) { -#if !defined(__MINGW32__) && !defined(__VISUALC6__) - IHTMLCurrentStyle* style; + wxIHTMLCurrentStyle* style; IHTMLElement *elm1 = elm; - IHTMLElement2 *elm2; + wxIHTMLElement2 *elm2; BSTR tmp_bstr; bool is_visible = true; //This method is not perfect but it does discover most of the hidden elements. //so if a better solution is found, then please do improve. while(elm1) { - if(SUCCEEDED(elm1->QueryInterface(IID_IHTMLElement2, (void**) &elm2))) + if(SUCCEEDED(elm1->QueryInterface(wxIID_IHTMLElement2, (void**) &elm2))) { if(SUCCEEDED(elm2->get_currentStyle(&style))) { @@ -962,40 +986,36 @@ bool wxWebViewIE::IsElementVisible(IHTMLElement* elm) } } return is_visible; -#else - return false; -#endif } void wxWebViewIE::FindInternal(const wxString& text, int flags, int internal_flag) { -#if !defined(__MINGW32__) && !defined(__VISUALC6__) - IMarkupServices *pIMS; - IMarkupContainer *pIMC; - IMarkupPointer *ptrBegin, *ptrEnd; + wxIMarkupServices *pIMS; + wxIMarkupContainer *pIMC; + wxIMarkupPointer *ptrBegin, *ptrEnd; IHTMLElement* elm; long find_flag = 0; IHTMLDocument2 *document = GetDocument(); //This function does the acutal work. - if(SUCCEEDED(document->QueryInterface(IID_IMarkupServices, (void **)&pIMS))) + if(SUCCEEDED(document->QueryInterface(wxIID_IMarkupServices, (void **)&pIMS))) { - if(SUCCEEDED(document->QueryInterface(IID_IMarkupContainer, (void **)&pIMC))) + if(SUCCEEDED(document->QueryInterface(wxIID_IMarkupContainer, (void **)&pIMC))) { BSTR attr_bstr = SysAllocString(L"style=\"background-color:#ffff00\""); BSTR text_bstr = SysAllocString(text.wc_str()); 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. @@ -1014,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) @@ -1026,7 +1046,7 @@ void wxWebViewIE::FindInternal(const wxString& text, int flags, int internal_fla } if(internal_flag & wxWEB_VIEW_FIND_ADD_POINTERS) { - IMarkupPointer *cptrBegin, *cptrEnd; + wxIMarkupPointer *cptrBegin, *cptrEnd; pIMS->CreateMarkupPointer(&cptrBegin); pIMS->CreateMarkupPointer(&cptrEnd); cptrBegin->MoveToPointer(ptrBegin); @@ -1048,12 +1068,10 @@ void wxWebViewIE::FindInternal(const wxString& text, int flags, int internal_fla pIMS->Release(); } document->Release(); -#endif } long wxWebViewIE::FindNext(int direction) { -#if !defined(__MINGW32__) && !defined(__VISUALC6__) //Don't bother if we have no pointers set. if(m_findPointers.empty()) { @@ -1096,8 +1114,8 @@ long wxWebViewIE::FindNext(int direction) //some variables to use later on. IHTMLElement *body_element; IHTMLBodyElement *body; - IHTMLTxtRange *range = NULL; - IMarkupServices *pIMS; + wxIHTMLTxtRange *range = NULL; + wxIMarkupServices *pIMS; IHTMLDocument2 *document = GetDocument(); long ret = -1; //Now try to create a range from the body. @@ -1105,12 +1123,12 @@ long wxWebViewIE::FindNext(int direction) { if(SUCCEEDED(body_element->QueryInterface(IID_IHTMLBodyElement,(void**)&body))) { - if(SUCCEEDED(body->createTextRange(&range))) + if(SUCCEEDED(body->createTextRange((IHTMLTxtRange**)(&range)))) { //So far so good, now we try to position our find pointers. - if(SUCCEEDED(document->QueryInterface(IID_IMarkupServices,(void **)&pIMS))) + if(SUCCEEDED(document->QueryInterface(wxIID_IMarkupServices,(void **)&pIMS))) { - IMarkupPointer *begin = m_findPointers[m_findPosition].begin, *end = m_findPointers[m_findPosition].end; + wxIMarkupPointer *begin = m_findPointers[m_findPosition].begin, *end = m_findPointers[m_findPosition].end; if(pIMS->MoveRangeToPointers(begin,end,range) == S_OK && range->select() == S_OK) { ret = m_findPosition; @@ -1125,14 +1143,10 @@ long wxWebViewIE::FindNext(int direction) } document->Release(); return ret; -#else - return wxNOT_FOUND; -#endif } void wxWebViewIE::FindClear() { -#if !defined(__MINGW32__) && !defined(__VISUALC6__) //Reset find variables. m_findText.Empty(); m_findFlags = wxWEB_VIEW_FIND_DEFAULT; @@ -1150,7 +1164,6 @@ void wxWebViewIE::FindClear() m_findPointers[i].end->Release(); } m_findPointers.clear(); -#endif } bool wxWebViewIE::EnableControlFeature(long flag, bool enable) @@ -1316,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; } @@ -1595,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) @@ -1663,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)