Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework IE virtual file system support to use new syntax. Remove now unused code for resolving links ourselves, we can let the backend resolves them itself.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-03 18:31:48 +00:00
parent f2049b6837
commit b7d3a622aa
5 changed files with 32 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/msw/webview_ie.cpp
View File

@@ -985,12 +985,6 @@ HRESULT VirtualProtocol::QueryInterface(REFIID riid, void **ppvObject)
AddRef();
return S_OK;
}
else if(riid == IID_IInternetProtocolInfo)
{
*ppvObject = (IInternetProtocolInfo*)this;
AddRef();
return S_OK;
}
else
{
*ppvObject = NULL;
@@ -1078,50 +1072,6 @@ HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
}
}
HRESULT VirtualProtocol::CombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl,
DWORD WXUNUSED(dwCombineFlags),
LPWSTR pwzResult,
DWORD cchResult, DWORD *pcchResult,
DWORD WXUNUSED(dwReserved))
{
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 WXUNUSED(ParseAction),
DWORD WXUNUSED(dwParseFlags),
LPWSTR pwzResult,
DWORD cchResult, DWORD *pcchResult,
DWORD WXUNUSED(dwReserved))
{
//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 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;
}
HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
void ** ppvObject)
{