pascal/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2024-11-24 08:02:15 +02:00
Code Issues Actions Releases Activity

Fixed issue #110 : Correct NativeInt and NativeUInt declaration in FPC

Browse Source
This commit is contained in:
Salvador Díaz Fau 2018-05-14 16:12:21 +02:00
parent 1353ccb7af
commit dae14bed08
5 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/cef4delphi_lazarus.lpk
View File

@ -4,6 +4,7 @@
<PathDelim Value="\"/> <PathDelim Value="\"/>
<Name Value="CEF4Delphi_Lazarus"/> <Name Value="CEF4Delphi_Lazarus"/>
<Type Value="RunAndDesignTime"/> <Type Value="RunAndDesignTime"/>
<Author Value="Salvador Diaz Fau"/>
<CompilerOptions> <CompilerOptions>
<Version Value="11"/> <Version Value="11"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
@ -12,7 +13,14 @@
<OtherUnitFiles Value="..\source"/> <OtherUnitFiles Value="..\source"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Parsing>
<SyntaxOptions>
<AllowLabel Value="False"/>
</SyntaxOptions>
</Parsing>
</CompilerOptions> </CompilerOptions>
<Description Value="CEF4Delphi"/>
<Version Major="1"/>
<Files Count="133"> <Files Count="133">
<Item1> <Item1>
<Filename Value="..\source\uCEFAccessibilityHandler.pas"/> <Filename Value="..\source\uCEFAccessibilityHandler.pas"/>

2
source/cef.inc
View File

@ -144,7 +144,7 @@
{$DEFINE DELPHI15_UP} {$DEFINE DELPHI15_UP}
{$ENDIF} {$ENDIF}
// Delphi XE2 // Delphi XE2 (First 64bit compiler)
{$IFDEF VER230} {$IFDEF VER230}
{$UNDEF DELPHI_VERSION_UNKNOW} {$UNDEF DELPHI_VERSION_UNKNOW}
{$DEFINE DELPHI5_UP} {$DEFINE DELPHI5_UP}

4
source/uCEFApplication.pas
View File

@ -500,8 +500,8 @@ begin
UpdateDeviceScaleFactor; UpdateDeviceScaleFactor;
FillChar(FAppSettings, SizeOf(TCefSettings), 0);
FAppSettings.size := SizeOf(TCefSettings); FAppSettings.size := SizeOf(TCefSettings);
FillChar(FAppSettings, FAppSettings.size, 0);
FChromeVersionInfo.MajorVer := CEF_CHROMEELF_VERSION_MAJOR; FChromeVersionInfo.MajorVer := CEF_CHROMEELF_VERSION_MAJOR;
FChromeVersionInfo.MinorVer := CEF_CHROMEELF_VERSION_MINOR; FChromeVersionInfo.MinorVer := CEF_CHROMEELF_VERSION_MINOR;
@ -952,7 +952,7 @@ begin
InitializeSettings(FAppSettings); InitializeSettings(FAppSettings);
TempArgs.instance := HINSTANCE; TempArgs.instance := HINSTANCE{$IFDEF FPC}(){$ENDIF};
if (cef_initialize(@TempArgs, @FAppSettings, aApp.Wrap, FWindowsSandboxInfo) <> 0) then if (cef_initialize(@TempArgs, @FAppSettings, aApp.Wrap, FWindowsSandboxInfo) <> 0) then
begin begin

2
source/uCEFMiscFunctions.pas
View File

@ -1007,7 +1007,7 @@ end;
function GetModulePath : string; function GetModulePath : string;
begin begin
Result := IncludeTrailingPathDelimiter(ExtractFileDir(GetModuleName(HInstance))); Result := IncludeTrailingPathDelimiter(ExtractFileDir(GetModuleName(HINSTANCE{$IFDEF FPC}(){$ENDIF})));
end; end;
function CefParseUrl(const url: ustring; var parts: TUrlParts): Boolean; function CefParseUrl(const url: ustring; var parts: TUrlParts): Boolean;

31
source/uCEFTypes.pas
View File

@ -234,23 +234,28 @@ type
TCefSSLContentStatus = Cardinal; // /include/internal/cef_types.h (cef_ssl_content_status_t) TCefSSLContentStatus = Cardinal; // /include/internal/cef_types.h (cef_ssl_content_status_t)
TCefLogSeverity = Cardinal; // /include/internal/cef_types.h (cef_log_severity_t) TCefLogSeverity = Cardinal; // /include/internal/cef_types.h (cef_log_severity_t)
{$IFNDEF DELPHI12_UP} {$IFDEF FPC}
NativeUInt = Cardinal; NativeInt = PtrInt;
NativeUInt = PtrUInt;
PNativeInt = ^NativeInt;
PNativeUInt = ^NativeUInt; PNativeUInt = ^NativeUInt;
NativeInt = Integer;
uint16 = Word;
{$IFDEF FPC}
ustring = type UnicodeString; ustring = type UnicodeString;
{$ELSE}
ustring = type WideString;
{$ENDIF}
rbstring = type AnsiString; rbstring = type AnsiString;
{$ELSE} {$ELSE}
ustring = type string; {$IFNDEF DELPHI12_UP}
rbstring = type RawByteString; NativeUInt = Cardinal;
{$IFNDEF DELPHI15_UP} PNativeUInt = ^NativeUInt;
NativeUInt = Cardinal; NativeInt = Integer;
PNativeUInt = ^NativeUInt; uint16 = Word;
ustring = type WideString;
rbstring = type AnsiString;
{$ELSE}
ustring = type string;
rbstring = type RawByteString;
{$IFNDEF DELPHI15_UP}
NativeUInt = Cardinal;
PNativeUInt = ^NativeUInt;
{$ENDIF}
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}