X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9447a0d6af1eb8244f9b434767943df67dc47534..fd20ceff24ca5f002d6424856e9d19f6d9178fb5:/src/msw/webview_ie.cpp

diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index 25464fae02..2bdddcdd72 100644
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -83,7 +83,6 @@ bool wxWebViewIE::Create(wxWindow* parent,
     m_webBrowser->put_RegisterAsDropTarget(VARIANT_TRUE);
 
     m_uiHandler = new DocHostUIHandler;
-    m_uiHandler->AddRef();
 
     m_container = new wxIEContainer(this, IID_IWebBrowser2, m_webBrowser, m_uiHandler);
 
@@ -99,8 +98,6 @@ wxWebViewIE::~wxWebViewIE()
     {
         m_factories[i]->Release();
     }
-
-    m_uiHandler->Release();
 }
 
 void wxWebViewIE::LoadURL(const wxString& url)
@@ -121,10 +118,13 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
 
         hr = SafeArrayUnaccessData(psaStrings);
 
-        IHTMLDocument2* document = GetDocument();
+        wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+        if(!document)
+            return;
+
         document->write(psaStrings);
         document->close();
-        document->Release();
 
         SafeArrayDestroy(psaStrings);
 
@@ -140,8 +140,11 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
             hr = SafeArrayUnaccessData(psaStrings);
 
             document = GetDocument();
+
+            if(!document)
+                return;
+
             document->write(psaStrings);
-            document->Release();
 
             // SafeArrayDestroy calls SysFreeString for each BSTR
             SafeArrayDestroy(psaStrings);
@@ -171,26 +174,30 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
 
 wxString wxWebViewIE::GetPageSource() const
 {
-    IHTMLDocument2* document = GetDocument();
-    IHTMLElement *bodyTag = NULL;
-    IHTMLElement *htmlTag = NULL;
-    wxString source;
-    HRESULT hr = document->get_body(&bodyTag);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
     {
-        hr = bodyTag->get_parentElement(&htmlTag);
+        wxCOMPtr<IHTMLElement> bodyTag;
+        wxCOMPtr<IHTMLElement> htmlTag;
+        wxString source;
+        HRESULT hr = document->get_body(&bodyTag);
         if(SUCCEEDED(hr))
         {
-            BSTR bstr;
-            htmlTag->get_outerHTML(&bstr);
-            source = wxString(bstr);
-            htmlTag->Release();
+            hr = bodyTag->get_parentElement(&htmlTag);
+            if(SUCCEEDED(hr))
+            {
+                BSTR bstr;
+                htmlTag->get_outerHTML(&bstr);
+                source = wxString(bstr);
+            }
         }
-        bodyTag->Release();
+        return source;
+    }
+    else
+    {
+        return "";
     }
-
-    document->Release();
-    return source;
 }
 
 wxWebViewZoom wxWebViewIE::GetZoom() const
@@ -520,12 +527,18 @@ wxString wxWebViewIE::GetCurrentURL() const
 
 wxString wxWebViewIE::GetCurrentTitle() const
 {
-    IHTMLDocument2* document = GetDocument();
-    BSTR title;
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
 
-    document->get_nameProp(&title);
-    document->Release();
-    return wxString(title);
+    if(document)
+    {
+        BSTR title;
+        document->get_nameProp(&title);
+        return wxString(title);
+    }
+    else
+    {
+        return "";
+    }
 }
 
 bool wxWebViewIE::CanCut() const
@@ -537,6 +550,7 @@ bool wxWebViewIE::CanCopy() const
 {
     return CanExecCommand("Copy");
 }
+
 bool wxWebViewIE::CanPaste() const
 {
     return CanExecCommand("Paste");
@@ -561,6 +575,7 @@ bool wxWebViewIE::CanUndo() const
 {
     return CanExecCommand("Undo");
 }
+
 bool wxWebViewIE::CanRedo() const
 {
     return CanExecCommand("Redo");
@@ -578,25 +593,35 @@ void wxWebViewIE::Redo()
 
 void wxWebViewIE::SetEditable(bool enable)
 {
-    IHTMLDocument2* document = GetDocument();
-    if( enable )
-        document->put_designMode(SysAllocString(L"On"));
-    else
-        document->put_designMode(SysAllocString(L"Off"));
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
 
-    document->Release();
+    if(document)
+    {
+        if( enable )
+            document->put_designMode(SysAllocString(L"On"));
+        else
+            document->put_designMode(SysAllocString(L"Off"));
+
+    }
 }
 
 bool wxWebViewIE::IsEditable() const
 {
-    IHTMLDocument2* document = GetDocument();
-    BSTR mode;
-    document->get_designMode(&mode);
-    document->Release();
-    if(wxString(mode) == "On")
-        return true;
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
+    {
+        BSTR mode;
+        document->get_designMode(&mode);
+        if(wxString(mode) == "On")
+            return true;
+        else
+            return false;
+    }
     else
+    {
         return false;
+    }
 }
 
 void wxWebViewIE::SelectAll()
@@ -606,19 +631,25 @@ void wxWebViewIE::SelectAll()
 
 bool wxWebViewIE::HasSelection() const
 {
-    IHTMLDocument2* document = GetDocument();
-    IHTMLSelectionObject* selection;
-    wxString sel;
-    HRESULT hr = document->get_selection(&selection);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
+    {
+        wxCOMPtr<IHTMLSelectionObject> selection;
+        wxString sel;
+        HRESULT hr = document->get_selection(&selection);
+        if(SUCCEEDED(hr))
+        {
+            BSTR type;
+            selection->get_type(&type);
+            sel = wxString(type);
+        }
+        return sel != "None";
+    }
+    else
     {
-        BSTR type;
-        selection->get_type(&type);
-        sel = wxString(type);
-        selection->Release();
+        return false;
     }
-    document->Release();
-    return sel != "None";
 }
 
 void wxWebViewIE::DeleteSelection()
@@ -628,109 +659,128 @@ void wxWebViewIE::DeleteSelection()
 
 wxString wxWebViewIE::GetSelectedText() const
 {
-    IHTMLDocument2* document = GetDocument();
-    IHTMLSelectionObject* selection;
-    wxString selected;
-    HRESULT hr = document->get_selection(&selection);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
     {
-        IDispatch* disrange;
-        hr = selection->createRange(&disrange);
+        wxCOMPtr<IHTMLSelectionObject> selection;
+        wxString selected;
+        HRESULT hr = document->get_selection(&selection);
         if(SUCCEEDED(hr))
         {
-            IHTMLTxtRange* range;
-            hr = disrange->QueryInterface(IID_IHTMLTxtRange, (void**)&range);
+            wxCOMPtr<IDispatch> disrange;
+            hr = selection->createRange(&disrange);
             if(SUCCEEDED(hr))
             {
-                BSTR text;
-                range->get_text(&text);
-                selected = wxString(text);
-                range->Release();
+                wxCOMPtr<IHTMLTxtRange> range;
+                hr = disrange->QueryInterface(IID_IHTMLTxtRange, (void**)&range);
+                if(SUCCEEDED(hr))
+                {
+                    BSTR text;
+                    range->get_text(&text);
+                    selected = wxString(text);
+                }
             }
-            disrange->Release();
         }
-        selection->Release();
+        return selected;
+    }
+    else
+    {
+        return "";
     }
-    document->Release();
-    return selected;
 }
 
 wxString wxWebViewIE::GetSelectedSource() const
 {
-    IHTMLDocument2* document = GetDocument();
-    IHTMLSelectionObject* selection;
-    wxString selected;
-    HRESULT hr = document->get_selection(&selection);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
     {
-        IDispatch* disrange;
-        hr = selection->createRange(&disrange);
+        wxCOMPtr<IHTMLSelectionObject> selection;
+        wxString selected;
+        HRESULT hr = document->get_selection(&selection);
         if(SUCCEEDED(hr))
         {
-            IHTMLTxtRange* range;
-            hr = disrange->QueryInterface(IID_IHTMLTxtRange, (void**)&range);
+            wxCOMPtr<IDispatch> disrange;
+            hr = selection->createRange(&disrange);
             if(SUCCEEDED(hr))
             {
-                BSTR text;
-                range->get_htmlText(&text);
-                selected = wxString(text);
-                range->Release();
+                wxCOMPtr<IHTMLTxtRange> range;
+                hr = disrange->QueryInterface(IID_IHTMLTxtRange, (void**)&range);
+                if(SUCCEEDED(hr))
+                {
+                    BSTR text;
+                    range->get_htmlText(&text);
+                    selected = wxString(text);
+                }
             }
-            disrange->Release();
         }
-        selection->Release();
+        return selected;
+    }
+    else
+    {
+        return "";
     }
-    document->Release();
-    return selected;
 }
 
 void wxWebViewIE::ClearSelection()
 {
-    IHTMLDocument2* document = GetDocument();
-    IHTMLSelectionObject* selection;
-    wxString selected;
-    HRESULT hr = document->get_selection(&selection);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
     {
-        selection->empty();
-        selection->Release();
+        wxCOMPtr<IHTMLSelectionObject> selection;
+        wxString selected;
+        HRESULT hr = document->get_selection(&selection);
+        if(SUCCEEDED(hr))
+        {
+            selection->empty();
+        }
     }
-    document->Release();
 }
 
 wxString wxWebViewIE::GetPageText() const
 {
-    IHTMLDocument2* document = GetDocument();
-    wxString text;
-    IHTMLElement* body;
-    HRESULT hr = document->get_body(&body);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
+    {
+        wxString text;
+        wxCOMPtr<IHTMLElement> body;
+        HRESULT hr = document->get_body(&body);
+        if(SUCCEEDED(hr))
+        {
+            BSTR out;
+            body->get_innerText(&out);
+            text = wxString(out);
+        }
+        return text;
+    }
+    else
     {
-        BSTR out;
-        body->get_innerText(&out);
-        text = wxString(out);
-        body->Release();
+        return "";
     }
-    document->Release();
-    return text;
 }
 
 void wxWebViewIE::RunScript(const wxString& javascript)
 {
-    IHTMLDocument2* document = GetDocument();
-    IHTMLWindow2* window;
-    wxString language = "javascript";
-    HRESULT hr = document->get_parentWindow(&window);
-    if(SUCCEEDED(hr))
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
     {
-        VARIANT level;
-        VariantInit(&level);
-        V_VT(&level) = VT_EMPTY;
-        window->execScript(SysAllocString(javascript.wc_str()),
-                           SysAllocString(language.wc_str()),
-                           &level);
+        wxCOMPtr<IHTMLWindow2> window;
+        wxString language = "javascript";
+        HRESULT hr = document->get_parentWindow(&window);
+        if(SUCCEEDED(hr))
+        {
+            VARIANT level;
+            VariantInit(&level);
+            V_VT(&level) = VT_EMPTY;
+            window->execScript(SysAllocString(javascript.wc_str()),
+                               SysAllocString(language.wc_str()),
+                               &level);
+        }
     }
-    document->Release();
 }
 
 void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
@@ -766,29 +816,43 @@ void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
 
 bool wxWebViewIE::CanExecCommand(wxString command) const
 {
-    IHTMLDocument2* document = GetDocument();
-    VARIANT_BOOL enabled;
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
 
-    document->queryCommandEnabled(SysAllocString(command.wc_str()), &enabled);
-    document->Release();
+    if(document)
+    {
+        VARIANT_BOOL enabled;
+
+        document->queryCommandEnabled(SysAllocString(command.wc_str()), &enabled);
+
+        return (enabled == VARIANT_TRUE);
+    }
+    else
+    {
+        return false;
+    }
 
-    return (enabled == VARIANT_TRUE);
 }
 
 void wxWebViewIE::ExecCommand(wxString command)
 {
-    IHTMLDocument2* document = GetDocument();
-    document->execCommand(SysAllocString(command.wc_str()), VARIANT_FALSE, VARIANT(), NULL);
-    document->Release();
+    wxCOMPtr<IHTMLDocument2> document(GetDocument());
+
+    if(document)
+    {
+        document->execCommand(SysAllocString(command.wc_str()), VARIANT_FALSE, VARIANT(), NULL);
+    }
 }
 
-IHTMLDocument2* wxWebViewIE::GetDocument() const
+wxCOMPtr<IHTMLDocument2> wxWebViewIE::GetDocument() const
 {
-    wxVariant variant = m_ie.GetProperty("Document");
-    IHTMLDocument2* document = (IHTMLDocument2*)variant.GetVoidPtr();
-
-    wxASSERT(document);
-
+    wxCOMPtr<IDispatch> dispatch;
+    wxCOMPtr<IHTMLDocument2> document;
+    HRESULT result = m_webBrowser->get_Document(&dispatch);
+    if(dispatch && SUCCEEDED(result))
+    {
+        //document is set to null automatically if the interface isn't supported
+        dispatch->QueryInterface(IID_IHTMLDocument2, (void**)&document);
+    }
     return document;
 }
 
@@ -797,8 +861,8 @@ bool wxWebViewIE::EnableControlFeature(long flag, bool enable)
 #if wxUSE_DYNLIB_CLASS
 
     wxDynamicLibrary urlMon(wxT("urlmon.dll"));
-    if( urlMon.IsLoaded() && 
-        urlMon.HasSymbol("CoInternetSetFeatureEnabled") && 
+    if( urlMon.IsLoaded() &&
+        urlMon.HasSymbol("CoInternetSetFeatureEnabled") &&
         urlMon.HasSymbol("CoInternetIsFeatureEnabled"))
     {
         typedef HRESULT (WINAPI *CoInternetSetFeatureEnabled_t)(DWORD, DWORD, BOOL);
@@ -1201,7 +1265,7 @@ STDMETHODIMP ClassFactory::LockServer(BOOL fLock)
     return S_OK;
 }
 
-wxIEContainer::wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk, 
+wxIEContainer::wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk,
                              DocHostUIHandler* uiHandler) :
     wxActiveXContainer(parent,iid,pUnk)
 {
@@ -1212,7 +1276,7 @@ wxIEContainer::~wxIEContainer()
 {
 }
 
-bool wxIEContainer::QueryClientSiteInterface(REFIID iid, void **_interface, 
+bool wxIEContainer::QueryClientSiteInterface(REFIID iid, void **_interface,
                                              const char *&desc)
 {
     if (m_uiHandler && IsEqualIID(iid, wxIID_IDocHostUIHandler))
@@ -1224,8 +1288,8 @@ bool wxIEContainer::QueryClientSiteInterface(REFIID iid, void **_interface,
     return false;
 }
 
-HRESULT DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt, 
-                                          IUnknown *pcmdtReserved, 
+HRESULT DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt,
+                                          IUnknown *pcmdtReserved,
                                           IDispatch *pdispReserved)
 {
     wxUnusedVar(dwID);
@@ -1237,13 +1301,13 @@ HRESULT DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt,
 
 HRESULT DocHostUIHandler::GetHostInfo(DOCHOSTUIINFO *pInfo)
 {
-    //don't show 3d border and ebales themes.
+    //don't show 3d border and enable themes.
     pInfo->dwFlags = pInfo->dwFlags | DOCHOSTUIFLAG_NO3DBORDER | DOCHOSTUIFLAG_THEME;
     return S_OK;
 }
 
 HRESULT DocHostUIHandler::ShowUI(DWORD dwID,
-                                 IOleInPlaceActiveObject *pActiveObject, 
+                                 IOleInPlaceActiveObject *pActiveObject,
                                  IOleCommandTarget *pCommandTarget,
                                  IOleInPlaceFrame *pFrame,
                                  IOleInPlaceUIWindow *pDoc)
@@ -1284,7 +1348,7 @@ HRESULT DocHostUIHandler::OnFrameWindowActivate(BOOL fActivate)
     return E_NOTIMPL;
 }
 
-HRESULT DocHostUIHandler::ResizeBorder(LPCRECT prcBorder, 
+HRESULT DocHostUIHandler::ResizeBorder(LPCRECT prcBorder,
                                        IOleInPlaceUIWindow *pUIWindow,
                                        BOOL fFrameWindow)
 {
@@ -1294,7 +1358,7 @@ HRESULT DocHostUIHandler::ResizeBorder(LPCRECT prcBorder,
     return E_NOTIMPL;
 }
 
-HRESULT DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg, 
+HRESULT DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
                                                const GUID *pguidCmdGroup,
                                                DWORD nCmdID)
 {
@@ -1303,10 +1367,15 @@ HRESULT DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
         //control is down?
         if((GetKeyState(VK_CONTROL) & 0x8000 ))
         {
-            //skip CTRL-N, CTRL-F and CTRL-P
-            if(lpMsg->wParam == 'N' || lpMsg->wParam == 'P' || lpMsg->wParam == 'F')
+            //skip the accelerators used by the control
+            switch(lpMsg->wParam)
             {
-                return S_OK;
+                case 'F':
+                case 'L':
+                case 'N':
+                case 'O':
+                case 'P':
+                    return S_OK;
             }
         }
         //skip F5