paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-09 12:08:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL/LazHelpHtml: Fix Microsoft Edge not being detected as default browser on Windows 10. Issue #35659, patch by jamie philbrook, slightly modified.

Browse Source 
git-svn-id: trunk@62387 -
This commit is contained in:
wp 2019-12-14 16:53:03 +00:00
parent 9a11939004
commit f9775cd366
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lcl/lazhelphtml.pas
View File

@ -18,6 +18,7 @@ unit LazHelpHTML;
interface
uses
{$IFDEF Windows}Windows, ShellApi,{$ENDIF}
Classes, SysUtils,
// LazUtils
LazFileUtils, UTF8Process, LazUTF8, LazConfigStorage,
@ -320,6 +321,7 @@ var
URLMacroPos: LongInt;
BrowserProcess: TProcessUTF8;
Executable, ParamsStr: String;
IsShellStr: Boolean = false;
begin
Result:=shrViewerError;
ErrMsg:='';
@ -351,16 +353,19 @@ begin
//otherwise FileExistsUf8 and FileIsExecutable fail. Issue #0030502
if (Length(Executable) > 1) and (Executable[1] = '"') and (Executable[Length(Executable)] = '"') then
Executable := Copy(Executable, 2, Length(Executable)-2);
// Preparation of special handling for Microsoft Edge in Win10, issue #35659
IsShellStr := UpperCase(LeftStr(Executable,Pos(':',Executable)))='SHELL:';
{$endif windows}
if (not FileExistsUTF8(Executable)) then begin
ErrMsg:=Format(hhsHelpBrowserNotFound, [Executable]);
exit;
if not IsShellStr then begin
if (not FileExistsUTF8(Executable)) then begin
ErrMsg:=Format(hhsHelpBrowserNotFound, [Executable]);
exit;
end;
if (not FileIsExecutable(Executable)) then begin
ErrMsg:=Format(hhsHelpBrowserNotExecutable, [Executable]);
exit;
end;
end;
if (not FileIsExecutable(Executable)) then begin
ErrMsg:=Format(hhsHelpBrowserNotExecutable, [Executable]);
exit;
end;
//debugln('THTMLBrowserHelpViewer.ShowNode Node.URL=',Node.URL);
// create params and replace %ParamsStr for URL
@ -378,6 +383,15 @@ begin
{$ENDIF}
// run
{$IFDEF Windows}
// Special handling for Microsoft Edge in Win10, issue #35659
if IsShellStr then begin
if ShellExecute(0,'open',PChar(Executable),PChar(ParamsStr),'',SW_SHOWNORMAL)<=32 then
ErrMsg := Format(hhsHelpErrorWhileExecuting,[Executable+' ',ParamsStr, LineEnding, 'ShellExecute'])
else
Result := shrSuccess;
end else
{$ENDIF}
try
BrowserProcess:=TProcessUTF8.Create(nil);
try