Delphi/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2024-11-16 00:05:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #242 from ahausladen/JSEvalFpcAV

Browse Source 
Fixed #190: Lazarus : access violation creating a TCefBinaryValueRef in 64 bits
This commit is contained in:
Salvador Díaz Fau 2019-11-11 21:11:20 +01:00 committed by GitHub
commit e9f4bb16d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
demos/Delphi_VCL/JavaScript/JSEval/uJSEval.pas
View File

@ -367,8 +367,9 @@ begin
try
try
TempOpenDialog := TOpenDialog.Create(nil);
TempOpenDialog.Filter := 'JPEG files (*.jpg)|*.JPG';
TempOpenDialog := TOpenDialog.Create(nil);
TempOpenDialog.Options := TempOpenDialog.Options + [ofFileMustExist];
TempOpenDialog.Filter := 'JPEG files (*.jpg)|*.JPG';
if TempOpenDialog.Execute then
begin
@ -378,7 +379,7 @@ begin
if (TempSize > 0) then
begin
SetLength(TempBuffer, TempSize);
TempSize := TempStream.Read(TempBuffer, TempSize);
TempSize := TempStream.Read(TempBuffer[0], TempSize);
if (TempSize > 0) then
begin

15
demos/Lazarus/JavaScript/JSEval/uJSEval.pas
View File

@ -208,7 +208,7 @@ begin
model.AddItem(MINIBROWSER_CONTEXTMENU_EVALJSCODE, 'Evaluate JavaScript code...');
model.AddItem(MINIBROWSER_CONTEXTMENU_GETSCROLLPOS, 'Get vertical scroll position...');
// TODO: Fix bug in creating a TCefBinaryValueRef
//model.AddItem(MINIBROWSER_CONTEXTMENU_JSBINPARAM, 'Send JPEG image...');
model.AddItem(MINIBROWSER_CONTEXTMENU_JSBINPARAM, 'Send JPEG image...');
end;
procedure TJSEvalFrm.Chromium1BeforePopup(Sender: TObject;
@ -367,8 +367,9 @@ begin
try
try
TempOpenDialog := TOpenDialog.Create(nil);
TempOpenDialog.Filter := 'JPEG files (*.jpg)|*.JPG';
TempOpenDialog := TOpenDialog.Create(nil);
TempOpenDialog.Options := TempOpenDialog.Options + [ofFileMustExist];
TempOpenDialog.Filter := 'JPEG files (*.jpg)|*.JPG';
if TempOpenDialog.Execute then
begin
@ -378,7 +379,7 @@ begin
if (TempSize > 0) then
begin
SetLength(TempBuffer, TempSize);
TempSize := TempStream.Read(TempBuffer, TempSize);
TempSize := TempStream.Read(TempBuffer[0], TempSize);
if (TempSize > 0) then
begin
@ -453,7 +454,7 @@ var
TempPointer : pointer;
TempSize : NativeUInt;
TempString : string;
TempDecodedStream : TMemoryStream;
TempDecodedStream : TBytesStream;
TempEncodedStream : TStringStream;
TempEncoder : TBase64EncodingStream;
begin
@ -475,9 +476,7 @@ begin
if (TempSize > 0) then
begin
TempDecodedStream := TMemoryStream.Create();
TempDecodedStream.write(TempPointer, TempSize);
TempDecodedStream.position := 0;
TempDecodedStream := TBytesStream.Create(TempBuffer);
TempEncodedStream := TStringStream.Create('');
TempEncoder := TBase64EncodingStream.Create(TempEncodedStream);