pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-06-12 22:07:39 +02:00
Code Issues Actions Releases Activity

Update to CEF 3.3029.1611.g44e39a8

Browse Source 
Update to CEF 3.3029.1611.g44e39a8
New MDIBroser demo
MultiThreadedMessageLoop initialization bug fix
New function to handle exceptions
Added a function to parse URLs
This commit is contained in:
Salvador Diaz Fau
2017-05-01 14:45:54 +02:00
parent cc893f2b04
commit 0ec2b29075
35 changed files with 2538 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/uCEFMiscFunctions.pas
View File

@ -120,6 +120,7 @@ procedure CefSetCrashKeyValue(const aKey, aValue : ustring);
procedure CefLog(const aFile : string; aLine, aSeverity : integer; const aMessage : string);
procedure OutputDebugMessage(const aMessage : string);
procedure CustomExceptionHandler(const aMessage : string);
function CefRegisterSchemeHandlerFactory(const SchemeName, HostName: ustring; const handler: TCefResourceHandlerClass): Boolean;
function CefClearSchemeHandlerFactories : boolean;
@ -137,6 +138,8 @@ function CheckResources(const aResourcesDirPath : string) : boolean;
function CheckDLLs(const aFrameworkDirPath : string) : boolean;
function CheckDLLVersion(const aDLLFile : string; aMajor, aMinor, aRelease, aBuild : uint16) : boolean;
function CefParseUrl(const url: ustring; var parts: TUrlParts): Boolean;
implementation
uses
@ -464,6 +467,11 @@ begin
if (GlobalCEFApp <> nil) and GlobalCEFApp.LibLoaded then
CefLog('CEF4Delphi', DEFAULT_LINE, CEF_LOG_SEVERITY_ERROR, aMessage);
{$ENDIF}
end;
procedure CustomExceptionHandler(const aMessage : string);
begin
OutputDebugMessage(aMessage);
if (GlobalCEFApp <> nil) and GlobalCEFApp.ReRaiseExceptions then
raise Exception.Create(aMessage);
@ -596,7 +604,7 @@ begin
end;
except
on e : exception do
OutputDebugMessage('CheckLocales error: ' + e.Message);
CustomExceptionHandler('CheckLocales error: ' + e.Message);
end;
end;
@ -630,7 +638,7 @@ begin
FileExists(TempDir + 'devtools_resources.pak');
except
on e : exception do
OutputDebugMessage('CheckResources error: ' + e.Message);
CustomExceptionHandler('CheckResources error: ' + e.Message);
end;
end;
@ -663,7 +671,7 @@ begin
FileExists(TempDir + 'widevinecdmadapter.dll');
except
on e : exception do
OutputDebugMessage('CheckDLLs error: ' + e.Message);
CustomExceptionHandler('CheckDLLs error: ' + e.Message);
end;
end;
@ -704,7 +712,7 @@ begin
end;
except
on e : exception do
OutputDebugMessage('GetExtendedFileVersion error: ' + e.Message);
CustomExceptionHandler('GetExtendedFileVersion error: ' + e.Message);
end;
finally
if (TempBuffer <> nil) then FreeMem(TempBuffer);
@ -726,7 +734,7 @@ begin
end;
except
on e : exception do
OutputDebugMessage('GetDLLVersion error: ' + e.Message);
CustomExceptionHandler('GetDLLVersion error: ' + e.Message);
end;
end;
@ -750,4 +758,26 @@ begin
{$ENDIF}
end;
function CefParseUrl(const url: ustring; var parts: TUrlParts): Boolean;
var
u: TCefString;
p: TCefUrlParts;
begin
FillChar(p, sizeof(p), 0);
u := CefString(url);
Result := cef_parse_url(@u, p) <> 0;
if Result then
begin
//parts.spec := CefString(@p.spec);
parts.scheme := CefString(@p.scheme);
parts.username := CefString(@p.username);
parts.password := CefString(@p.password);
parts.host := CefString(@p.host);
parts.port := CefString(@p.port);
parts.origin := CefString(@p.origin);
parts.path := CefString(@p.path);
parts.query := CefString(@p.query);
end;
end;
end.