pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-05-23 21:50:21 +02:00
Code Issues Actions 1 Releases Activity

Workaround for issue #333

Browse Source 
Disabled range checking in some units when using old Delphi versions to avoid internal compiler errors.
This commit is contained in:
Salvador Diaz Fau 2021-01-05 11:44:41 +01:00
parent bef1626f31
commit 83cf65a8ec
5 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/uCEFApplicationCore.pas
View File

@ -46,6 +46,11 @@ unit uCEFApplicationCore;
{$I cef.inc} {$I cef.inc}
{$IFNDEF FPC}{$IFNDEF DELPHI12_UP}
// Workaround for "Internal error" in old Delphi versions caused by uint64 handling
{$R-}
{$ENDIF}{$ENDIF}
interface interface
uses uses
@ -2234,8 +2239,7 @@ var
{$ENDIF} {$ENDIF}
begin begin
Result := 0; Result := 0;
{$IFDEF MSWINDOWS}
{$IFDEF MSWINDOWS}
TempHandle := CreateToolHelp32SnapShot(TH32CS_SNAPPROCESS, 0); TempHandle := CreateToolHelp32SnapShot(TH32CS_SNAPPROCESS, 0);
if (TempHandle = INVALID_HANDLE_VALUE) then exit; if (TempHandle = INVALID_HANDLE_VALUE) then exit;
@ -2264,7 +2268,8 @@ begin
ZeroMemory(@TempMemCtrs, SizeOf(TProcessMemoryCounters)); ZeroMemory(@TempMemCtrs, SizeOf(TProcessMemoryCounters));
TempMemCtrs.cb := SizeOf(TProcessMemoryCounters); TempMemCtrs.cb := SizeOf(TProcessMemoryCounters);
if GetProcessMemoryInfo(TempProcHWND, {$IFNDEF FPC}@{$ENDIF}TempMemCtrs, TempMemCtrs.cb) then inc(Result, TempMemCtrs.WorkingSetSize); if GetProcessMemoryInfo(TempProcHWND, {$IFNDEF FPC}@{$ENDIF}TempMemCtrs, TempMemCtrs.cb) then
inc(Result, TempMemCtrs.WorkingSetSize);
CloseHandle(TempProcHWND); CloseHandle(TempProcHWND);
end; end;
@ -2273,7 +2278,7 @@ begin
until not(Process32Next(TempHandle, TempProcess)); until not(Process32Next(TempHandle, TempProcess));
CloseHandle(TempHandle); CloseHandle(TempHandle);
{$ENDIF} {$ENDIF}
end; end;
function TCefApplicationCore.GetTotalSystemMemory : uint64; function TCefApplicationCore.GetTotalSystemMemory : uint64;
@ -2283,11 +2288,11 @@ var
{$ENDIF} {$ENDIF}
begin begin
Result := 0; Result := 0;
{$IFDEF MSWINDOWS} {$IFDEF MSWINDOWS}
ZeroMemory(@TempMemStatus, SizeOf(TMyMemoryStatusEx)); ZeroMemory(@TempMemStatus, SizeOf(TMyMemoryStatusEx));
TempMemStatus.dwLength := SizeOf(TMyMemoryStatusEx); TempMemStatus.dwLength := SizeOf(TMyMemoryStatusEx);
if GetGlobalMemoryStatusEx(TempMemStatus) then Result := TempMemStatus.ullTotalPhys; if GetGlobalMemoryStatusEx(TempMemStatus) then
Result := TempMemStatus.ullTotalPhys;
{$ENDIF} {$ENDIF}
end; end;
@ -2298,11 +2303,11 @@ var
{$ENDIF} {$ENDIF}
begin begin
Result := 0; Result := 0;
{$IFDEF MSWINDOWS} {$IFDEF MSWINDOWS}
ZeroMemory(@TempMemStatus, SizeOf(TMyMemoryStatusEx)); ZeroMemory(@TempMemStatus, SizeOf(TMyMemoryStatusEx));
TempMemStatus.dwLength := SizeOf(TMyMemoryStatusEx); TempMemStatus.dwLength := SizeOf(TMyMemoryStatusEx);
if GetGlobalMemoryStatusEx(TempMemStatus) then Result := TempMemStatus.ullAvailPhys; if GetGlobalMemoryStatusEx(TempMemStatus) then
Result := TempMemStatus.ullAvailPhys;
{$ENDIF} {$ENDIF}
end; end;

5
source/uCEFDragAndDropMgr.pas
View File

@ -43,6 +43,11 @@ unit uCEFDragAndDropMgr;
{$I cef.inc} {$I cef.inc}
{$IFNDEF FPC}{$IFNDEF DELPHI12_UP}
// Workaround for "Internal error" in old Delphi versions caused by uint64 handling
{$R-}
{$ENDIF}{$ENDIF}
interface interface
uses uses

5
source/uCEFMiscFunctions.pas
View File

@ -46,6 +46,11 @@ unit uCEFMiscFunctions;
{$I cef.inc} {$I cef.inc}
{$IFNDEF FPC}{$IFNDEF DELPHI12_UP}
// Workaround for "Internal error" in old Delphi versions caused by uint64 handling
{$R-}
{$ENDIF}{$ENDIF}
interface interface
uses uses

7
source/uCEFOLEDragAndDrop.pas
View File

@ -1,4 +1,4 @@
// ************************************************************************ // ************************************************************************
// ***************************** CEF4Delphi ******************************* // ***************************** CEF4Delphi *******************************
// ************************************************************************ // ************************************************************************
// //
@ -43,6 +43,11 @@ unit uCEFOLEDragAndDrop;
{$I cef.inc} {$I cef.inc}
{$IFNDEF FPC}{$IFNDEF DELPHI12_UP}
// Workaround for "Internal error" in old Delphi versions caused by uint64 handling
{$R-}
{$ENDIF}{$ENDIF}
interface interface
uses uses

2
update_CEF4Delphi.json
View File

@ -2,7 +2,7 @@
"UpdateLazPackages" : [ "UpdateLazPackages" : [
{ {
"ForceNotify" : true, "ForceNotify" : true,
"InternalVersion" : 222, "InternalVersion" : 223,
"Name" : "cef4delphi_lazarus.lpk", "Name" : "cef4delphi_lazarus.lpk",
"Version" : "87.1.12.0" "Version" : "87.1.12.0"
} }