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

Use security URL from wxWebViewHandler in wxWebViewIE

Browse Source 
Don't use hard-coded 'http://localhost', but use the URL specified in the
wxWebViewHandler.

By default, the security URL is empty and no modifications are made when
parsing a URL. This fixes using JavaScript in pages loaded with a custom
protocol, e.g. from wxWebViewFSHandler or wxWebViewArchiveHandler.

Closes #17893
This commit is contained in:
Maarten Bent
2020-07-28 21:01:12 +02:00
parent 300fe1a6f9
commit 43f84a9c18
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/msw/webview_ie.cpp
View File

@@ -1762,25 +1762,23 @@ HRESULT STDMETHODCALLTYPE VirtualProtocol::ParseUrl(
DWORD dwReserved)
{
wxUnusedVar(pwzUrl);
wxUnusedVar(ParseAction);
wxUnusedVar(dwParseFlags);
wxUnusedVar(pwzResult);
wxUnusedVar(cchResult);
wxUnusedVar(pcchResult);
wxUnusedVar(dwReserved);
switch (ParseAction)
const size_t secLen = m_handler->GetSecurityURL().length();
if ( secLen > 0 )
{
case wxPARSE_SECURITY_URL:
case wxPARSE_SECURITY_DOMAIN:
switch ( ParseAction )
{
const wchar_t Result[] = L"http://localhost";
size_t Len = wcslen(Result);
if(cchResult <= Len)
return S_FALSE;
wcscpy(pwzResult, Result);
*pcchResult = Len;
return S_OK;
case wxPARSE_SECURITY_URL:
case wxPARSE_SECURITY_DOMAIN:
{
if ( cchResult <= secLen )
return S_FALSE;
wcscpy(pwzResult, m_handler->GetSecurityURL().wc_str());
*pcchResult = secLen;
return S_OK;
}
}
}