1
0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-11-23 21:34:53 +02:00

Fixed IME support in OSR mode

- Added lots of conditional compiler directives to build CEF4DElphi in Linux using Lazarus/FPC
- Updated copyright year
This commit is contained in:
Salvador Díaz Fau
2019-01-08 19:15:25 +01:00
parent ea11d6cd46
commit 769aa4f384
219 changed files with 2231 additions and 334 deletions

View File

@@ -10,7 +10,7 @@
// For more information about CEF4Delphi visit :
// https://www.briskbard.com/index.php?lang=en&pageid=cef
//
// Copyright � 2018 Salvador Diaz Fau. All rights reserved.
// Copyright � 2019 Salvador Diaz Fau. All rights reserved.
//
// ************************************************************************
// ************ vvvv Original license and comments below vvvv *************
@@ -49,10 +49,12 @@ unit uCEFWriteHandler;
interface
uses
{$IFDEF DELPHI16_UP}
{$IFDEF MSWINDOWS}WinApi.Windows,{$ENDIF}
{$ELSE}
Windows,
{$IFDEF MSWINDOWS}
{$IFDEF DELPHI16_UP}
WinApi.Windows,
{$ELSE}
Windows,
{$ENDIF}
{$ENDIF}
uCEFBaseRefCounted, uCEFInterfaces, uCEFTypes;
@@ -218,9 +220,11 @@ end;
constructor TCefBytesWriteHandler.Create(aGrow : NativeUInt);
begin
inherited Create;
{$IFDEF MSWINDOWS}
InitializeCriticalSection(FCriticalSection);
{$ELSE}
InitCriticalSection(FCriticalSection);
{$ENDIF}
FGrow := aGrow;
FBufferSize := aGrow;
FOffset := 0;
@@ -232,15 +236,18 @@ destructor TCefBytesWriteHandler.Destroy;
begin
if (FBuffer <> nil) then FreeMem(FBuffer);
DeleteCriticalSection(FCriticalSection);
FCriticalSection.DebugInfo := nil;
FCriticalSection.LockCount := 0;
FCriticalSection.RecursionCount := 0;
FCriticalSection.OwningThread := 0;
FCriticalSection.LockSemaphore := 0;
{$IFNDEF FPC}
FCriticalSection.Reserved := 0;
{$IFDEF MSWINDOWS}
DeleteCriticalSection(FCriticalSection);
FCriticalSection.DebugInfo := nil;
FCriticalSection.LockCount := 0;
FCriticalSection.RecursionCount := 0;
FCriticalSection.OwningThread := 0;
FCriticalSection.LockSemaphore := 0;
{$IFNDEF FPC}
FCriticalSection.Reserved := 0;
{$ENDIF}
{$ELSE}
DoneCriticalSection(FCriticalSection);
{$ENDIF}
inherited Destroy;
@@ -261,7 +268,7 @@ begin
begin
TempPointer := Pointer(cardinal(FBuffer) + FOffset);
CopyMemory(TempPointer, ptr, TempSize);
Move(ptr^, TempPointer^, TempSize);
FOffset := FOffset + TempSize;
Result := n;