Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Call ShellEx for launching urls in browser on Windows

Browse Source
This commit is contained in:
Lirusaito
2019-03-19 21:28:39 -04:00
parent 3f9f79c155
commit 273c9b3479
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/llwindow/llwindowwin32.cpp
View File

@@ -3375,25 +3375,8 @@ void LLWindowWin32::spawnWebBrowser(const std::string& escaped_url, bool async)
// reliablly on Vista. // reliablly on Vista.
// this is madness.. no, this is.. // this is madness.. no, this is..
LLWString url_wstring = utf8str_to_wstring( escaped_url );
llutf16string url_utf16 = wstring_to_utf16str( url_wstring );
// let the OS decide what to use to open the URL // let the OS decide what to use to open the URL
SHELLEXECUTEINFO sei = { sizeof( sei ) }; ShellEx(escaped_url);
// NOTE: this assumes that SL will stick around long enough to complete the DDE message exchange
// necessary for ShellExecuteEx to complete
if (async)
{
sei.fMask = SEE_MASK_ASYNCOK;
}
else
{
sei.fMask = SEE_MASK_FLAG_DDEWAIT;
}
sei.nShow = SW_SHOWNORMAL;
sei.lpVerb = L"open";
sei.lpFile = url_utf16.c_str();
ShellExecuteEx( &sei );
} }
void LLWindowWin32::setTitle(const std::string &title) void LLWindowWin32::setTitle(const std::string &title)