Hide the infobar in the sample if we start navigating to another page.

[wxWidgets.git] / src / msw / webview_ie.cpp

diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index 761e9cc2698c3567831b9784930ceca58c59b889..9f0c1168b406385aca22cc79d204b6fe30287aaa 100644 (file)
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxMSW wxWebViewIE class implementation for web view component
 // Author:      Marianne Gagnon
 // Id:          $Id$
-// Copyright:   (c) 2010 Marianne Gagnon, Steven Lamerton
+// Copyright:   (c) 2010 Marianne Gagnon, 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -30,31 +30,6 @@
 //We link to urlmon as it is required for CoInternetGetSession
 #pragma comment(lib, "urlmon")
 
-//Taken from wx/filesys.cpp
-static wxString EscapeFileNameCharsInURL(const char *in)
-{
-    wxString s;
-
-    for ( const unsigned char *p = (const unsigned char*)in; *p; ++p )
-    {
-        const unsigned char c = *p;
-
-        if ( c == '/' || c == '-' || c == '.' || c == '_' || c == '~' ||
-             (c >= '0' && c <= '9') ||
-             (c >= 'a' && c <= 'z') ||
-             (c >= 'A' && c <= 'Z') )
-        {
-            s << c;
-        }
-        else
-        {
-            s << wxString::Format("%%%02x", c);
-        }
-    }
-
-    return s;
-}
-
 BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
     EVT_ACTIVEX(wxID_ANY, wxWebViewIE::onActiveXEvent)
     EVT_ERASE_BACKGROUND(wxWebViewIE::onEraseBg)
@@ -93,17 +68,6 @@ bool wxWebViewIE::Create(wxWindow* parent,
 
     m_webBrowser->put_RegisterAsBrowser(VARIANT_TRUE);
     m_webBrowser->put_RegisterAsDropTarget(VARIANT_TRUE);
-    //m_webBrowser->put_Silent(VARIANT_FALSE);
-
-    //We register a custom handler for the file protocol so we can handle
-    //Virtual file systems
-    ClassFactory* cf = new ClassFactory;
-    IInternetSession* session;
-    if(CoInternetGetSession(0, &session, 0) != S_OK)
-        return false;
-    HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol, L"test", 0, NULL, 0);
-    if(FAILED(hr))
-        return false; 
 
     m_container = new wxActiveXContainer(this, IID_IWebBrowser2, m_webBrowser);
 
@@ -699,6 +663,22 @@ void wxWebViewIE::RunScript(const wxString& javascript)
     document->Release();
 }
 
+void wxWebViewIE::RegisterHandler(wxWebHandler* handler)
+{
+    ClassFactory* cf = new ClassFactory(handler);
+    IInternetSession* session;
+    if(FAILED(CoInternetGetSession(0, &session, 0)))
+    {
+        wxFAIL_MSG("Could not retrive internet session");
+    }
+
+    HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol, handler->GetName(), 0, NULL, 0);
+    if(FAILED(hr))
+    {
+        wxFAIL_MSG("Could not register protocol");
+    }
+}
+
 bool wxWebViewIE::CanExecCommand(wxString command)
 {
     IHTMLDocument2* document = GetDocument();
@@ -823,6 +803,13 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
 
         case DISPID_TITLECHANGE:
         {
+            wxString title = evt[0].GetString();
+
+            wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+                                       GetId(), GetCurrentURL(), wxEmptyString, true);
+            event.SetString(title);
+            event.SetEventObject(this);
+            HandleWindowEvent(event);
             break;
         }
 
@@ -970,16 +957,15 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
     evt.Skip();
 }
 
-VirtualProtocol::VirtualProtocol()
+VirtualProtocol::VirtualProtocol(wxWebHandler *handler)
 {
     m_refCount = 0;
     m_file = NULL;
-    m_fileSys = new wxFileSystem;
+    m_handler = handler;
 }
 
 VirtualProtocol::~VirtualProtocol()
 {
-    wxDELETE(m_fileSys);
 }
 
 ULONG VirtualProtocol::AddRef()
@@ -990,8 +976,8 @@ ULONG VirtualProtocol::AddRef()
 
 HRESULT VirtualProtocol::QueryInterface(REFIID riid, void **ppvObject)
 {
-    if(riid == IID_IUnknown || riid == IID_IInternetProtocol
-       || riid == IID_IInternetProtocolRoot)
+    if(riid == IID_IUnknown || riid == IID_IInternetProtocolRoot || 
+       riid == IID_IInternetProtocol)
     {
         *ppvObject = (IInternetProtocol*)this;
         AddRef();
@@ -1033,13 +1019,10 @@ HRESULT VirtualProtocol::Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink
     wxUnusedVar(grfPI);
     wxUnusedVar(dwReserved);
     m_protocolSink = pOIProtSink;
-    //We have to clean up incoming paths from the webview control as they are
-    //not properly escaped, see also the comment in filesys.cpp line 668
-    wxString path = wxString(szUrl).BeforeFirst(':') +  ":" + 
-                    EscapeFileNameCharsInURL(wxString(szUrl).AfterFirst(':'));
-    path.Replace("///", "/");
-    path.Replace("test", "file");
-    m_file = m_fileSys->OpenFile(path);
+    
+    //We get the file itself from the protocol handler
+    m_file = m_handler->GetFile(szUrl);
+
 
     if(!m_file)
         return INET_E_RESOURCE_NOT_FOUND;
@@ -1094,25 +1077,45 @@ HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
 }
 
 HRESULT VirtualProtocol::CombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl,
-                                    DWORD dwCombineFlags, LPWSTR pwzResult, 
+                                    DWORD WXUNUSED(dwCombineFlags), 
+                                    LPWSTR pwzResult, 
                                     DWORD cchResult, DWORD *pcchResult, 
-                                    DWORD dwReserved)
+                                    DWORD WXUNUSED(dwReserved))
 {
-    return INET_E_DEFAULT_ACTION;
+
+    wxString newuri = m_handler->CombineURIs(pwzBaseUrl, pwzRelativeUrl);
+    //Check the buffer we are given can hold the new url
+    if(wxStrlen(newuri) > cchResult)
+        return S_FALSE;
+
+    wxStrcpy(pwzResult, newuri.c_str());
+    *pcchResult = wxStrlen(newuri);
+    return S_OK;
 }
 
-HRESULT VirtualProtocol::ParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction,
-                                  DWORD dwParseFlags, LPWSTR pwzResult,
+HRESULT VirtualProtocol::ParseUrl(LPCWSTR pwzUrl, 
+                                  PARSEACTION WXUNUSED(ParseAction),
+                                  DWORD WXUNUSED(dwParseFlags), 
+                                  LPWSTR pwzResult,
                                   DWORD cchResult, DWORD *pcchResult,
-                                  DWORD dwReserved)
+                                  DWORD WXUNUSED(dwReserved))
 {
-    return INET_E_DEFAULT_ACTION;
+    //Check the buffer we are given can hold the new url
+    if(wxStrlen(pwzUrl) > cchResult)
+        return S_FALSE;
+
+    wxStrcpy(pwzResult, pwzUrl);
+    *pcchResult = wxStrlen(pwzResult);
+    return S_OK;
 }
     
-HRESULT VirtualProtocol::QueryInfo(LPCWSTR pwzUrl, QUERYOPTION OueryOption, 
-                                   DWORD dwQueryFlags, LPVOID pBuffer,
-                                   DWORD cbBuffer, DWORD *pcbBuf,  
-                                   DWORD dwReserved)
+HRESULT VirtualProtocol::QueryInfo(LPCWSTR WXUNUSED(pwzUrl), 
+                                   QUERYOPTION WXUNUSED(OueryOption), 
+                                   DWORD WXUNUSED(dwQueryFlags), 
+                                   LPVOID WXUNUSED(pBuffer),
+                                   DWORD WXUNUSED(cbBuffer), 
+                                   DWORD* WXUNUSED(pcbBuf),  
+                                   DWORD WXUNUSED(dwReserved))
 {
     return INET_E_DEFAULT_ACTION;
 }
@@ -1122,7 +1125,7 @@ HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
 {
     if (pUnkOuter) 
         return CLASS_E_NOAGGREGATION;
-    VirtualProtocol* vp = new VirtualProtocol;
+    VirtualProtocol* vp = new VirtualProtocol(m_handler);
     vp->AddRef();
     HRESULT hr = vp->QueryInterface(riid, ppvObject);
     vp->Release();