Fix wxLaunchDefaultBrowser on wxMSW for local files/directories: the bug could be reproduced using "Open screenshots folder" menu item in screenshotgen application.
Move platform-specific code in platform-specific utils source files. Perform safer URL scheme check. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -33,6 +33,9 @@
|
||||
#include "wx/dynlib.h"
|
||||
|
||||
#include "wx/msw/private.h" // includes <windows.h>
|
||||
#include "wx/msw/registry.h"
|
||||
#include <shellapi.h> // needed for SHELLEXECUTEINFO
|
||||
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
@@ -393,3 +396,117 @@ extern bool wxEnableFileNameAutoComplete(HWND hwnd)
|
||||
#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Launch document with default app
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
bool wxLaunchDefaultApplication(const wxString& document, int flags)
|
||||
{
|
||||
wxUnusedVar(flags);
|
||||
|
||||
WinStruct<SHELLEXECUTEINFO> sei;
|
||||
sei.lpFile = document.wx_str();
|
||||
sei.lpVerb = _T("open");
|
||||
#ifdef __WXWINCE__
|
||||
sei.nShow = SW_SHOWNORMAL; // SW_SHOWDEFAULT not defined under CE (#10216)
|
||||
#else
|
||||
sei.nShow = SW_SHOWDEFAULT;
|
||||
#endif
|
||||
|
||||
// avoid Windows message box in case of error for consistency with
|
||||
// wxLaunchDefaultBrowser() even if don't show the error ourselves in this
|
||||
// function
|
||||
sei.fMask = SEE_MASK_FLAG_NO_UI;
|
||||
|
||||
if ( ::ShellExecuteEx(&sei) )
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Launch default browser
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags)
|
||||
{
|
||||
wxUnusedVar(flags);
|
||||
|
||||
#if wxUSE_IPC
|
||||
if ( flags & wxBROWSER_NEW_WINDOW )
|
||||
{
|
||||
// ShellExecuteEx() opens the URL in an existing window by default so
|
||||
// we can't use it if we need a new window
|
||||
wxRegKey key(wxRegKey::HKCR, scheme + _T("\\shell\\open"));
|
||||
if ( !key.Exists() )
|
||||
{
|
||||
// try the default browser, it must be registered at least for http URLs
|
||||
key.SetName(wxRegKey::HKCR, _T("http\\shell\\open"));
|
||||
}
|
||||
|
||||
if ( key.Exists() )
|
||||
{
|
||||
wxRegKey keyDDE(key, wxT("DDEExec"));
|
||||
if ( keyDDE.Exists() )
|
||||
{
|
||||
// we only know the syntax of WWW_OpenURL DDE request for IE,
|
||||
// optimistically assume that all other browsers are compatible
|
||||
// with it
|
||||
static const wxChar *TOPIC_OPEN_URL = wxT("WWW_OpenURL");
|
||||
wxString ddeCmd;
|
||||
wxRegKey keyTopic(keyDDE, wxT("topic"));
|
||||
bool ok = keyTopic.Exists() &&
|
||||
keyTopic.QueryDefaultValue() == TOPIC_OPEN_URL;
|
||||
if ( ok )
|
||||
{
|
||||
ddeCmd = keyDDE.QueryDefaultValue();
|
||||
ok = !ddeCmd.empty();
|
||||
}
|
||||
|
||||
if ( ok )
|
||||
{
|
||||
// for WWW_OpenURL, the index of the window to open the URL
|
||||
// in is -1 (meaning "current") by default, replace it with
|
||||
// 0 which means "new" (see KB article 160957)
|
||||
ok = ddeCmd.Replace(wxT("-1"), wxT("0"),
|
||||
false /* only first occurrence */) == 1;
|
||||
}
|
||||
|
||||
if ( ok )
|
||||
{
|
||||
// and also replace the parameters: the topic should
|
||||
// contain a placeholder for the URL
|
||||
ok = ddeCmd.Replace(wxT("%1"), url, false) == 1;
|
||||
}
|
||||
|
||||
if ( ok )
|
||||
{
|
||||
// try to send it the DDE request now but ignore the errors
|
||||
wxLogNull noLog;
|
||||
|
||||
const wxString ddeServer = wxRegKey(keyDDE, wxT("application"));
|
||||
if ( wxExecuteDDE(ddeServer, TOPIC_OPEN_URL, ddeCmd) )
|
||||
return true;
|
||||
|
||||
// this is not necessarily an error: maybe browser is
|
||||
// simply not running, but no matter, in any case we're
|
||||
// going to launch it using ShellExecuteEx() below now and
|
||||
// we shouldn't try to open a new window if we open a new
|
||||
// browser anyhow
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif // wxUSE_IPC
|
||||
|
||||
WinStruct<SHELLEXECUTEINFO> sei;
|
||||
sei.lpFile = url.c_str();
|
||||
sei.lpVerb = _T("open");
|
||||
sei.nShow = SW_SHOWNORMAL;
|
||||
sei.fMask = SEE_MASK_FLAG_NO_UI; // we give error message ourselves
|
||||
|
||||
if ( ::ShellExecuteEx(&sei) )
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user