// 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
/////////////////////////////////////////////////////////////////////////////
#include "wx/msw/webview_ie.h"
-#if wxUSE_WEBVIEW_IE
+#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE
#include <olectl.h>
#include <oleidl.h>
#include "wx/msw/registry.h"
#include "wx/msw/missing.h"
#include "wx/filesys.h"
+#include "wx/dynlib.h"
+#include <initguid.h>
-//We link to urlmon as it is required for CoInternetGetSession
-#pragma comment(lib, "urlmon")
+/* These GUID definitions are our own implementation to support interfaces
+ * normally in urlmon.h. See include/wx/msw/webview_ie.h
+ */
-//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;
+namespace {
- 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);
- }
- }
+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);
- return s;
}
+wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewIE, wxWebView);
+
BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
EVT_ACTIVEX(wxID_ANY, wxWebViewIE::onActiveXEvent)
EVT_ERASE_BACKGROUND(wxWebViewIE::onEraseBg)
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);
- SetBackgroundStyle(wxBG_STYLE_PAINT);
- SetDoubleBuffered(true);
- LoadUrl(url);
+ LoadURL(url);
return true;
}
+wxWebViewIE::~wxWebViewIE()
+{
+ for(unsigned int i = 0; i < m_factories.size(); i++)
+ {
+ m_factories[i]->Release();
+ }
+}
-void wxWebViewIE::LoadUrl(const wxString& url)
+void wxWebViewIE::LoadURL(const wxString& url)
{
- m_ie.CallMethod("Navigate", (BSTR) url.wc_str(), NULL, NULL, NULL, NULL);
+ m_ie.CallMethod("Navigate", wxConvertStringToOle(url));
}
void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
{
- BSTR bstr = SysAllocString(html.wc_str());
-
- // Creates a new one-dimensional array
+ BSTR bstr = SysAllocString(OLESTR(""));
SAFEARRAY *psaStrings = SafeArrayCreateVector(VT_VARIANT, 0, 1);
if (psaStrings != NULL)
{
VARIANT *param;
-
HRESULT hr = SafeArrayAccessData(psaStrings, (LPVOID*)¶m);
param->vt = VT_BSTR;
param->bstrVal = bstr;
- hr = SafeArrayUnaccessData(psaStrings);
+ hr = SafeArrayUnaccessData(psaStrings);
+
IHTMLDocument2* document = GetDocument();
document->write(psaStrings);
+ document->close();
document->Release();
- // SafeArrayDestroy calls SysFreeString for each BSTR
SafeArrayDestroy(psaStrings);
- //We send the events when we are done to mimic webkit
- //Navigated event
- wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
- GetId(), baseUrl, "", false);
- event.SetEventObject(this);
- HandleWindowEvent(event);
-
- //Document complete event
- event.SetEventType(wxEVT_COMMAND_WEB_VIEW_LOADED);
- event.SetEventObject(this);
- HandleWindowEvent(event);
+ bstr = SysAllocString(html.wc_str());
+
+ // Creates a new one-dimensional array
+ psaStrings = SafeArrayCreateVector(VT_VARIANT, 0, 1);
+ if (psaStrings != NULL)
+ {
+ hr = SafeArrayAccessData(psaStrings, (LPVOID*)¶m);
+ param->vt = VT_BSTR;
+ param->bstrVal = bstr;
+ hr = SafeArrayUnaccessData(psaStrings);
+
+ document = GetDocument();
+ document->write(psaStrings);
+ document->Release();
+
+ // SafeArrayDestroy calls SysFreeString for each BSTR
+ SafeArrayDestroy(psaStrings);
+
+ //We send the events when we are done to mimic webkit
+ //Navigated event
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+ GetId(), baseUrl, "");
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+
+ //Document complete event
+ event.SetEventType(wxEVT_COMMAND_WEB_VIEW_LOADED);
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+ }
+ else
+ {
+ wxLogError("wxWebViewIE::SetPage() : psaStrings is NULL");
+ }
}
else
{
- wxLogError("wxWebViewIE::SetPage() : psaStrings is NULL");
+ wxLogError("wxWebViewIE::SetPage() : psaStrings is NULL during clear");
}
-
}
-wxString wxWebViewIE::GetPageSource()
+wxString wxWebViewIE::GetPageSource() const
{
IHTMLDocument2* document = GetDocument();
IHTMLElement *bodyTag = NULL;
return source;
}
-wxWebViewZoom wxWebViewIE::GetZoom()
+wxWebViewZoom wxWebViewIE::GetZoom() const
{
- if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
- return GetIEOpticalZoom();
- else if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_TEXT)
- return GetIETextZoom();
- else
- wxFAIL;
+ switch( m_zoomType )
+ {
+ case wxWEB_VIEW_ZOOM_TYPE_LAYOUT:
+ return GetIEOpticalZoom();
+ case wxWEB_VIEW_ZOOM_TYPE_TEXT:
+ return GetIETextZoom();
+ default:
+ wxFAIL;
+ }
//Dummy return to stop compiler warnings
return wxWEB_VIEW_ZOOM_MEDIUM;
void wxWebViewIE::SetZoom(wxWebViewZoom zoom)
{
- if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
- SetIEOpticalZoom(zoom);
- else if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_TEXT)
- SetIETextZoom(zoom);
- else
- wxFAIL;
+ switch( m_zoomType )
+ {
+ case wxWEB_VIEW_ZOOM_TYPE_LAYOUT:
+ SetIEOpticalZoom(zoom);
+ break;
+ case wxWEB_VIEW_ZOOM_TYPE_TEXT:
+ SetIETextZoom(zoom);
+ break;
+ default:
+ wxFAIL;
+ }
}
void wxWebViewIE::SetIETextZoom(wxWebViewZoom level)
V_VT(&zoomVariant) = VT_I4;
V_I4(&zoomVariant) = level;
- HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
- OLECMDEXECOPT_DONTPROMPTUSER,
- &zoomVariant, NULL);
+#if wxDEBUG_LEVEL
+ HRESULT result =
+#endif
+ m_webBrowser->ExecWB(OLECMDID_ZOOM,
+ OLECMDEXECOPT_DONTPROMPTUSER,
+ &zoomVariant, NULL);
wxASSERT(result == S_OK);
}
-wxWebViewZoom wxWebViewIE::GetIETextZoom()
+wxWebViewZoom wxWebViewIE::GetIETextZoom() const
{
VARIANT zoomVariant;
VariantInit (&zoomVariant);
V_VT(&zoomVariant) = VT_I4;
- HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
- OLECMDEXECOPT_DONTPROMPTUSER,
- NULL, &zoomVariant);
+#if wxDEBUG_LEVEL
+ HRESULT result =
+#endif
+ m_webBrowser->ExecWB(OLECMDID_ZOOM,
+ OLECMDEXECOPT_DONTPROMPTUSER,
+ NULL, &zoomVariant);
wxASSERT(result == S_OK);
//We can safely cast here as we know that the range matches our enum
wxFAIL;
}
- HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
- OLECMDEXECOPT_DODEFAULT,
- &zoomVariant,
- NULL);
+#if wxDEBUG_LEVEL
+ HRESULT result =
+#endif
+ m_webBrowser->ExecWB((OLECMDID)63 /*OLECMDID_OPTICAL_ZOOM*/,
+ OLECMDEXECOPT_DODEFAULT,
+ &zoomVariant,
+ NULL);
wxASSERT(result == S_OK);
}
-wxWebViewZoom wxWebViewIE::GetIEOpticalZoom()
+wxWebViewZoom wxWebViewIE::GetIEOpticalZoom() const
{
VARIANT zoomVariant;
VariantInit (&zoomVariant);
V_VT(&zoomVariant) = VT_I4;
- HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
- OLECMDEXECOPT_DODEFAULT, NULL,
- &zoomVariant);
+#if wxDEBUG_LEVEL
+ HRESULT result =
+#endif
+ m_webBrowser->ExecWB((OLECMDID)63 /*OLECMDID_OPTICAL_ZOOM*/,
+ OLECMDEXECOPT_DODEFAULT, NULL,
+ &zoomVariant);
wxASSERT(result == S_OK);
const int zoom = V_I4(&zoomVariant);
OLECMDEXECOPT_DODEFAULT, NULL, NULL);
}
-bool wxWebViewIE::CanGoBack()
+bool wxWebViewIE::CanGoBack() const
{
if(m_historyEnabled)
return m_historyPosition > 0;
return false;
}
-bool wxWebViewIE::CanGoForward()
+bool wxWebViewIE::CanGoForward() const
{
if(m_historyEnabled)
return m_historyPosition != static_cast<int>(m_historyList.size()) - 1;
return false;
}
-void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
+void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
{
int pos = -1;
for(unsigned int i = 0; i < m_historyList.size(); i++)
wxASSERT_MSG(pos != static_cast<int>(m_historyList.size()),
"invalid history item");
m_historyLoadingFromList = true;
- LoadUrl(item->GetUrl());
+ LoadURL(item->GetUrl());
m_historyPosition = pos;
}
-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetBackwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewIE::GetBackwardHistory()
{
- wxVector<wxSharedPtr<wxWebHistoryItem> > backhist;
+ wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;
//As we don't have std::copy or an iterator constructor in the wxwidgets
//native vector we construct it by hand
for(int i = 0; i < m_historyPosition; i++)
return backhist;
}
-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetForwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewIE::GetForwardHistory()
{
- wxVector<wxSharedPtr<wxWebHistoryItem> > forwardhist;
+ wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;
//As we don't have std::copy or an iterator constructor in the wxwidgets
//native vector we construct it by hand
for(int i = m_historyPosition + 1; i < static_cast<int>(m_historyList.size()); i++)
{
// FIXME: the wxWidgets docs do not really document what the return
// parameter of PutProperty is
- const bool success = m_ie.PutProperty("Offline", (offline ?
- VARIANT_TRUE :
- VARIANT_FALSE));
+#if wxDEBUG_LEVEL
+ const bool success =
+#endif
+ m_ie.PutProperty("Offline", (offline ?
+ VARIANT_TRUE :
+ VARIANT_FALSE));
wxASSERT(success);
}
-bool wxWebViewIE::IsBusy()
+bool wxWebViewIE::IsBusy() const
{
if (m_isBusy) return true;
return out.GetBool();
}
-wxString wxWebViewIE::GetCurrentURL()
+wxString wxWebViewIE::GetCurrentURL() const
{
wxVariant out = m_ie.GetProperty("LocationURL");
return out.GetString();
}
-wxString wxWebViewIE::GetCurrentTitle()
+wxString wxWebViewIE::GetCurrentTitle() const
{
IHTMLDocument2* document = GetDocument();
BSTR title;
return wxString(title);
}
-bool wxWebViewIE::CanCut()
+bool wxWebViewIE::CanCut() const
{
return CanExecCommand("Cut");
}
-bool wxWebViewIE::CanCopy()
+bool wxWebViewIE::CanCopy() const
{
return CanExecCommand("Copy");
}
-bool wxWebViewIE::CanPaste()
+bool wxWebViewIE::CanPaste() const
{
return CanExecCommand("Paste");
}
ExecCommand("Paste");
}
-bool wxWebViewIE::CanUndo()
+bool wxWebViewIE::CanUndo() const
{
return CanExecCommand("Undo");
}
-bool wxWebViewIE::CanRedo()
+bool wxWebViewIE::CanRedo() const
{
return CanExecCommand("Redo");
}
document->Release();
}
-bool wxWebViewIE::IsEditable()
+bool wxWebViewIE::IsEditable() const
{
IHTMLDocument2* document = GetDocument();
BSTR mode;
ExecCommand("SelectAll");
}
-bool wxWebViewIE::HasSelection()
+bool wxWebViewIE::HasSelection() const
{
IHTMLDocument2* document = GetDocument();
IHTMLSelectionObject* selection;
ExecCommand("Delete");
}
-wxString wxWebViewIE::GetSelectedText()
+wxString wxWebViewIE::GetSelectedText() const
{
IHTMLDocument2* document = GetDocument();
IHTMLSelectionObject* selection;
return selected;
}
-wxString wxWebViewIE::GetSelectedSource()
+wxString wxWebViewIE::GetSelectedSource() const
{
IHTMLDocument2* document = GetDocument();
IHTMLSelectionObject* selection;
document->Release();
}
-wxString wxWebViewIE::GetPageText()
+wxString wxWebViewIE::GetPageText() const
{
IHTMLDocument2* document = GetDocument();
wxString text;
VARIANT level;
VariantInit(&level);
V_VT(&level) = VT_EMPTY;
- window->execScript(SysAllocString(javascript), SysAllocString(language), &level);
+ window->execScript(SysAllocString(javascript.wc_str()),
+ SysAllocString(language.wc_str()),
+ &level);
}
document->Release();
}
-bool wxWebViewIE::CanExecCommand(wxString command)
+void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
+{
+ wxDynamicLibrary urlMon(wxT("urlmon.dll"));
+ if(urlMon.HasSymbol(wxT("CoInternetGetSession")))
+ {
+ typedef HRESULT (WINAPI *CoInternetGetSession_t)(DWORD, wxIInternetSession**, DWORD);
+ wxDYNLIB_FUNCTION(CoInternetGetSession_t, CoInternetGetSession, urlMon);
+
+ ClassFactory* cf = new ClassFactory(handler);
+ wxIInternetSession* session;
+ HRESULT res = (*pfnCoInternetGetSession)(0, &session, 0);
+ if(FAILED(res))
+ {
+ wxFAIL_MSG("Could not retrive internet session");
+ }
+
+ HRESULT hr = session->RegisterNameSpace(cf, CLSID_FileProtocol,
+ handler->GetName().wc_str(),
+ 0, NULL, 0);
+ if(FAILED(hr))
+ {
+ wxFAIL_MSG("Could not register protocol");
+ }
+ m_factories.push_back(cf);
+ }
+ else
+ {
+ wxFAIL_MSG("urlmon does not contain CoInternetGetSession");
+ }
+}
+
+bool wxWebViewIE::CanExecCommand(wxString command) const
{
IHTMLDocument2* document = GetDocument();
VARIANT_BOOL enabled;
document->Release();
}
-IHTMLDocument2* wxWebViewIE::GetDocument()
+IHTMLDocument2* wxWebViewIE::GetDocument() const
{
wxVariant variant = m_ie.GetProperty("Document");
IHTMLDocument2* document = (IHTMLDocument2*)variant.GetVoidPtr();
wxString url = evt[1].GetString();
wxString target = evt[3].GetString();
- wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
- GetId(), url, target, true);
- event.SetEventObject(this);
- HandleWindowEvent(event);
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+ GetId(), url, target);
- if (event.IsVetoed())
+ //skip empty javascript events.
+ if(url == "javascript:\"\"" && target.IsEmpty())
+ {
+ event.Veto();
+ }
+ else
+ {
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+ }
+
+ if (!event.IsAllowed())
{
wxActiveXEventNativeMSW* nativeParams =
evt.GetNativeParameters();
wxString url = evt[1].GetString();
// TODO: set target parameter if possible
wxString target = wxEmptyString;
- wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
- GetId(), url, target, false);
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+ GetId(), url, target);
event.SetEventObject(this);
HandleWindowEvent(event);
break;
//As we are complete we also add to the history list, but not if the
//page is not the main page, ie it is a subframe
- if(m_historyEnabled && !m_historyLoadingFromList && url == GetCurrentURL())
+ //We also have to check if we are loading a file:// url, if so we
+ //need to change the comparison as ie passes back a different style
+ //of url
+ if(m_historyEnabled && !m_historyLoadingFromList &&
+ (url == GetCurrentURL() ||
+ (GetCurrentURL().substr(0, 4) == "file" &&
+ wxFileSystem::URLToFileName(GetCurrentURL()).GetFullPath() == url)))
{
//If we are not at the end of the list, then erase everything
//between us and the end before adding the new page
m_historyList.erase(m_historyList.begin() + m_historyPosition + 1,
m_historyList.end());
}
- wxSharedPtr<wxWebHistoryItem> item(new wxWebHistoryItem(url, GetCurrentTitle()));
+ wxSharedPtr<wxWebViewHistoryItem> item(new wxWebViewHistoryItem(url, GetCurrentTitle()));
m_historyList.push_back(item);
m_historyPosition++;
}
m_historyLoadingFromList = false;
// TODO: set target parameter if possible
wxString target = wxEmptyString;
- wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(),
- url, target, false);
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(),
+ url, target);
event.SetEventObject(this);
HandleWindowEvent(event);
break;
case DISPID_TITLECHANGE:
{
+ wxString title = evt[0].GetString();
+
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+ GetId(), GetCurrentURL(), "");
+ event.SetString(title);
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
break;
}
case DISPID_NAVIGATEERROR:
{
- wxWebNavigationError errorType = wxWEB_NAV_ERR_OTHER;
+ wxWebViewNavigationError errorType = wxWEB_NAV_ERR_OTHER;
wxString errorCode = "?";
switch (evt[3].GetLong())
{
wxString url = evt[1].GetString();
wxString target = evt[2].GetString();
- wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(),
- url, target, false);
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(),
+ url, target);
event.SetEventObject(this);
event.SetInt(errorType);
event.SetString(errorCode);
{
wxString url = evt[4].GetString();
- wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
- GetId(), url, wxEmptyString, true);
+ wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
+ GetId(), url, wxEmptyString);
event.SetEventObject(this);
HandleWindowEvent(event);
evt.Skip();
}
-VirtualProtocol::VirtualProtocol()
+VirtualProtocol::VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler)
{
- m_refCount = 0;
m_file = NULL;
- m_fileSys = new wxFileSystem;
+ m_handler = handler;
}
-VirtualProtocol::~VirtualProtocol()
-{
- wxDELETE(m_fileSys);
-}
-
-ULONG VirtualProtocol::AddRef()
-{
- m_refCount++;
- return m_refCount;
-}
+BEGIN_IID_TABLE(VirtualProtocol)
+ ADD_IID(Unknown)
+ ADD_RAW_IID(wxIID_IInternetProtocolRoot)
+ ADD_RAW_IID(wxIID_IInternetProtocol)
+END_IID_TABLE;
-HRESULT VirtualProtocol::QueryInterface(REFIID riid, void **ppvObject)
-{
- if(riid == IID_IUnknown || riid == IID_IInternetProtocol
- || riid == IID_IInternetProtocolRoot)
- {
- *ppvObject = (IInternetProtocol*)this;
- AddRef();
- return S_OK;
- }
- else if(riid == IID_IInternetProtocolInfo)
- {
- *ppvObject = (IInternetProtocolInfo*)this;
- AddRef();
- return S_OK;
- }
- else
- {
- *ppvObject = NULL;
- return E_POINTER;
- }
-}
-
-ULONG VirtualProtocol::Release()
-{
- m_refCount--;
- if (m_refCount > 0)
- {
- return m_refCount;
- }
- else
- {
- delete this;
- return 0;
- }
-}
+IMPLEMENT_IUNKNOWN_METHODS(VirtualProtocol)
-HRESULT VirtualProtocol::Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
- IInternetBindInfo *pOIBindInfo, DWORD grfPI,
+HRESULT VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSink,
+ wxIInternetBindInfo *pOIBindInfo, DWORD grfPI,
HANDLE_PTR dwReserved)
{
wxUnusedVar(szUrl);
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;
//We return the stream length for current and total size as we can always
//read the whole file from the stream
wxFileOffset length = m_file->GetStream()->GetLength();
- m_protocolSink->ReportData(BSCF_FIRSTDATANOTIFICATION |
- BSCF_DATAFULLYAVAILABLE |
- BSCF_LASTDATANOTIFICATION,
+ m_protocolSink->ReportData(wxBSCF_FIRSTDATANOTIFICATION |
+ wxBSCF_DATAFULLYAVAILABLE |
+ wxBSCF_LASTDATANOTIFICATION,
length, length);
- return S_OK;
+ return S_OK;
}
HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
{
//If the file is null we return false to indicte it is finished
- if(!m_file)
+ if(!m_file)
return S_FALSE;
wxStreamError err = m_file->GetStream()->Read(pv, cb).GetLastError();
}
}
-HRESULT VirtualProtocol::CombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl,
- DWORD dwCombineFlags, LPWSTR pwzResult,
- DWORD cchResult, DWORD *pcchResult,
- DWORD dwReserved)
-{
- return INET_E_DEFAULT_ACTION;
-}
+BEGIN_IID_TABLE(ClassFactory)
+ ADD_IID(Unknown)
+ ADD_IID(ClassFactory)
+END_IID_TABLE;
-HRESULT VirtualProtocol::ParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction,
- DWORD dwParseFlags, LPWSTR pwzResult,
- DWORD cchResult, DWORD *pcchResult,
- DWORD dwReserved)
-{
- return INET_E_DEFAULT_ACTION;
-}
-
-HRESULT VirtualProtocol::QueryInfo(LPCWSTR pwzUrl, QUERYOPTION OueryOption,
- DWORD dwQueryFlags, LPVOID pBuffer,
- DWORD cbBuffer, DWORD *pcbBuf,
- DWORD dwReserved)
-{
- return INET_E_DEFAULT_ACTION;
-}
+IMPLEMENT_IUNKNOWN_METHODS(ClassFactory)
HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
void ** ppvObject)
{
- if (pUnkOuter)
+ 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();
return hr;
-}
+}
STDMETHODIMP ClassFactory::LockServer(BOOL fLock)
{
return S_OK;
}
-ULONG ClassFactory::AddRef(void)
-{
- m_refCount++;
- return m_refCount;
-}
-
-HRESULT ClassFactory::QueryInterface(REFIID riid, void **ppvObject)
-{
- if ((riid == IID_IUnknown) || (riid == IID_IClassFactory))
- {
- *ppvObject = this;
- AddRef();
- return S_OK;
- }
- else
- {
- *ppvObject = NULL;
- return E_POINTER;
- }
-
-}
-
-ULONG ClassFactory::Release(void)
-{
- m_refCount--;
- if (m_refCount > 0)
- {
- return m_refCount;
- }
- else
- {
- delete this;
- return 0;
- }
-
-}
-
-#endif
+#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE
projects / wxWidgets.git / blobdiff