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

Fix remaining warnings in ie backend.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-01 13:20:46 +00:00
parent 8bccab8f06
commit b7d74e9ca3
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -210,8 +210,9 @@ public:
DWORD dwCombineFlags, DWORD dwCombineFlags,
LPWSTR pwzResult, DWORD cchResult, LPWSTR pwzResult, DWORD cchResult,
DWORD *pcchResult, DWORD dwReserved); DWORD *pcchResult, DWORD dwReserved);
HRESULT STDMETHODCALLTYPE CompareUrl(LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, HRESULT STDMETHODCALLTYPE CompareUrl(LPCWSTR WXUNUSED(pwzUrl1),
DWORD dwCompareFlags) LPCWSTR WXUNUSED(pwzUrl2),
DWORD WXUNUSED(dwCompareFlags))
{ return INET_E_DEFAULT_ACTION; } { return INET_E_DEFAULT_ACTION; }
HRESULT STDMETHODCALLTYPE ParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, HRESULT STDMETHODCALLTYPE ParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction,
DWORD dwParseFlags, LPWSTR pwzResult, DWORD dwParseFlags, LPWSTR pwzResult,

32
src/msw/webview_ie.cpp
View File

@@ -1077,12 +1077,14 @@ HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
} }
HRESULT VirtualProtocol::CombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, HRESULT VirtualProtocol::CombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl,
DWORD dwCombineFlags, LPWSTR pwzResult, DWORD WXUNUSED(dwCombineFlags),
LPWSTR pwzResult,
DWORD cchResult, DWORD *pcchResult, DWORD cchResult, DWORD *pcchResult,
DWORD dwReserved) DWORD WXUNUSED(dwReserved))
{ {
wxString newuri = m_handler->CombineURIs(pwzBaseUrl, pwzRelativeUrl); wxString newuri = m_handler->CombineURIs(pwzBaseUrl, pwzRelativeUrl);
//Check the buffer we are given can hold the new urll //Check the buffer we are given can hold the new url
if(wxStrlen(newuri) > cchResult) if(wxStrlen(newuri) > cchResult)
return S_FALSE; return S_FALSE;
@@ -1091,21 +1093,29 @@ HRESULT VirtualProtocol::CombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl,
return S_OK; return S_OK;
} }
HRESULT VirtualProtocol::ParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, HRESULT VirtualProtocol::ParseUrl(LPCWSTR pwzUrl,
DWORD dwParseFlags, LPWSTR pwzResult, PARSEACTION WXUNUSED(ParseAction),
DWORD WXUNUSED(dwParseFlags),
LPWSTR pwzResult,
DWORD cchResult, DWORD *pcchResult, 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); wxStrcpy(pwzResult, pwzUrl);
*pcchResult = wxStrlen(pwzResult); *pcchResult = wxStrlen(pwzResult);
return S_OK; return S_OK;
} }
HRESULT VirtualProtocol::QueryInfo(LPCWSTR pwzUrl, QUERYOPTION OueryOption, HRESULT VirtualProtocol::QueryInfo(LPCWSTR WXUNUSED(pwzUrl),
DWORD dwQueryFlags, LPVOID pBuffer, QUERYOPTION WXUNUSED(OueryOption),
DWORD cbBuffer, DWORD *pcbBuf, DWORD WXUNUSED(dwQueryFlags),
DWORD dwReserved) LPVOID WXUNUSED(pBuffer),
DWORD WXUNUSED(cbBuffer),
DWORD* WXUNUSED(pcbBuf),
DWORD WXUNUSED(dwReserved))
{ {
return INET_E_DEFAULT_ACTION; return INET_E_DEFAULT_ACTION;
} }