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

Fix warnings in the MSW IE backend.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-07-25 15:43:18 +00:00
parent d37e7d35ad
commit 0995b9dc18
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/wx/msw/webview_ie.h
View File

@@ -179,9 +179,10 @@ public:
ULONG STDMETHODCALLTYPE Release(); ULONG STDMETHODCALLTYPE Release();
//IInternetProtocolRoot //IInternetProtocolRoot
HRESULT STDMETHODCALLTYPE Abort(HRESULT hrReason, DWORD dwOptions) HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason),
DWORD WXUNUSED(dwOptions))
{ return E_NOTIMPL; } { return E_NOTIMPL; }
HRESULT STDMETHODCALLTYPE Continue(PROTOCOLDATA *pProtocolData) HRESULT STDMETHODCALLTYPE Continue(PROTOCOLDATA *WXUNUSED(pProtocolData))
{ return S_OK; } { return S_OK; }
HRESULT STDMETHODCALLTYPE Resume() { return S_OK; } HRESULT STDMETHODCALLTYPE Resume() { return S_OK; }
HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl, HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl,
@@ -190,13 +191,15 @@ public:
DWORD grfPI, DWORD grfPI,
HANDLE_PTR dwReserved); HANDLE_PTR dwReserved);
HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; } HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; }
HRESULT STDMETHODCALLTYPE Terminate(DWORD dwOptions) { return S_OK; } HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) { return S_OK; }
//IInternetProtocol //IInternetProtocol
HRESULT STDMETHODCALLTYPE LockRequest(DWORD dwOptions) { return S_OK; } HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions))
{ return S_OK; }
HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead); HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead);
HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove),
ULARGE_INTEGER* plibNewPosition) DWORD WXUNUSED(dwOrigin),
ULARGE_INTEGER* WXUNUSED(plibNewPosition))
{ return E_FAIL; } { return E_FAIL; }
HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; } HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; }
}; };

18
src/msw/webview_ie.cpp
View File

@@ -1019,9 +1019,13 @@ ULONG VirtualProtocol::Release()
} }
HRESULT VirtualProtocol::Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, HRESULT VirtualProtocol::Start(LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink,
IInternetBindInfo *pOIBindInfo, DWORD grfPI, IInternetBindInfo *pOIBindInfo, DWORD grfPI,
HANDLE_PTR dwReserved) HANDLE_PTR dwReserved)
{ {
wxUnusedVar(szUrl);
wxUnusedVar(pOIBindInfo);
wxUnusedVar(grfPI);
wxUnusedVar(dwReserved);
m_protocolSink = pOIProtSink; m_protocolSink = pOIProtSink;
//We have to clean up incoming paths from the webview control as they are //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 //not properly escaped, see also the comment in filesys.cpp line 668
@@ -1074,6 +1078,12 @@ HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
wxDELETE(m_file); wxDELETE(m_file);
return INET_E_DOWNLOAD_FAILURE; return INET_E_DOWNLOAD_FAILURE;
} }
else
{
//Dummy return to surpress a compiler warning
wxFAIL;
return INET_E_DOWNLOAD_FAILURE;
}
} }
HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid, HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
@@ -1091,8 +1101,8 @@ HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
STDMETHODIMP ClassFactory::LockServer(BOOL fLock) STDMETHODIMP ClassFactory::LockServer(BOOL fLock)
{ {
return S_OK; wxUnusedVar(fLock);
return S_OK;
} }
ULONG ClassFactory::AddRef(void) ULONG ClassFactory::AddRef(void)