From 18e8c62c2a1e1ea9df1bb05ec6d7c17278e19419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Sun, 21 Dec 2025 19:12:15 +0100 Subject: [PATCH] Fixed an issue converting a boolean to integer using Ord in Lazarus. Removed Lazarus warnings about inline functions and uninitilized variables. --- source/cef.inc | 1 - source/uCEFBinaryValue.pas | 44 ++++++++++++-------- source/uCEFClient.pas | 57 +++++++++++++++++--------- source/uCEFCommandHandler.pas | 41 +++++++++++++------ source/uCEFContextMenuHandler.pas | 52 +++++++++++++++--------- source/uCEFCookieAccessFilter.pas | 18 ++++++--- source/uCEFCookieVisitor.pas | 22 +++++----- source/uCEFCustomStreamReader.pas | 35 +++++++++------- source/uCEFDialogHandler.pas | 9 +++-- source/uCEFDisplayHandler.pas | 47 ++++++++++++++-------- source/uCEFDownloadHandler.pas | 18 ++++++--- source/uCEFDragHandler.pas | 9 +++-- source/uCEFFocusHandler.pas | 9 +++-- source/uCEFJsDialogHandler.pas | 19 +++++---- source/uCEFJson.pas | 35 +++++++++------- source/uCEFKeyboardHandler.pas | 19 +++++---- source/uCEFLifeSpanHandler.pas | 15 ++++--- source/uCEFMenuModelDelegate.pas | 13 ++++-- source/uCEFMiscFunctions.pas | 2 +- source/uCEFNavigationEntryVisitor.pas | 9 +++-- source/uCEFPermissionHandler.pas | 18 ++++++--- source/uCEFPostDataElement.pas | 7 +++- source/uCEFRenderHandler.pas | 36 +++++++++++------ source/uCEFRenderProcessHandler.pas | 9 +++-- source/uCEFRequestHandler.pas | 58 ++++++++++++++++++--------- source/uCEFResourceBundleHandler.pas | 21 +++++++--- source/uCEFResourceHandler.pas | 49 +++++++++++++--------- source/uCEFResourceRequestHandler.pas | 9 +++-- source/uCEFResponseFilter.pas | 7 +++- source/uCEFUrlrequestClient.pas | 13 +++--- source/uCEFWriteHandler.pas | 7 +++- source/uCEFv8Accessor.pas | 18 ++++++--- source/uCEFv8Handler.pas | 9 +++-- source/uCEFv8Interceptor.pas | 36 +++++++++++------ update_CEF4Delphi.json | 2 +- 35 files changed, 499 insertions(+), 274 deletions(-) diff --git a/source/cef.inc b/source/cef.inc index 98dd250f..c763ebe7 100644 --- a/source/cef.inc +++ b/source/cef.inc @@ -453,7 +453,6 @@ {$ENDIF} {$IFDEF FPC} - {$DEFINE SUPPORTS_INLINE} {$IF DEFINED(FPC_FULLVERSION) AND (FPC_FULLVERSION >= 30200)} {$DEFINE FPC_VER_320} {$IFEND} diff --git a/source/uCEFBinaryValue.pas b/source/uCEFBinaryValue.pas index eea6866f..bf55a288 100644 --- a/source/uCEFBinaryValue.pas +++ b/source/uCEFBinaryValue.pas @@ -117,46 +117,58 @@ end; function cef_binary_value_is_valid(self: PCefBinaryValue): Integer; stdcall; var - TempObject : TObject; + TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); - TempObject := CefGetObject(self); + TempResult := False; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefBinaryValueOwn) then - Result := Ord(TCefBinaryValueOwn(TempObject).IsValid); + TempResult := TCefBinaryValueOwn(TempObject).IsValid; + + Result := Ord(TempResult); end; function cef_binary_value_is_owned(self: PCefBinaryValue): Integer; stdcall; var - TempObject : TObject; + TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); - TempObject := CefGetObject(self); + TempResult := False; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefBinaryValueOwn) then - Result := Ord(TCefBinaryValueOwn(TempObject).IsOwned); + TempResult := TCefBinaryValueOwn(TempObject).IsOwned; + + Result := Ord(TempResult); end; function cef_binary_value_is_same(self, that: PCefBinaryValue):Integer; stdcall; var - TempObject : TObject; + TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); - TempObject := CefGetObject(self); + TempResult := False; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefBinaryValueOwn) then - Result := Ord(TCefBinaryValueOwn(TempObject).IsSame(TCefBinaryValueRef.UnWrap(that))); + TempResult := TCefBinaryValueOwn(TempObject).IsSame(TCefBinaryValueRef.UnWrap(that)); + + Result := Ord(TempResult); end; function cef_binary_value_is_equal(self, that: PCefBinaryValue): Integer; stdcall; var - TempObject : TObject; + TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); - TempObject := CefGetObject(self); + TempResult := False; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefBinaryValueOwn) then - Result := Ord(TCefBinaryValueOwn(TempObject).IsEqual(TCefBinaryValueRef.UnWrap(that))); + TempResult := TCefBinaryValueOwn(TempObject).IsEqual(TCefBinaryValueRef.UnWrap(that)); + + Result := Ord(TempResult); end; function cef_binary_value_copy(self: PCefBinaryValue): PCefBinaryValue; stdcall; diff --git a/source/uCEFClient.pas b/source/uCEFClient.pas index e3996f92..d91a2e14 100644 --- a/source/uCEFClient.pas +++ b/source/uCEFClient.pas @@ -261,7 +261,8 @@ var TempHandler : ICefAudioHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -279,6 +280,7 @@ var begin Result := nil; TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -295,7 +297,8 @@ var TempHandler : ICefContextMenuHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -312,7 +315,8 @@ var TempHandler : ICefDialogHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -329,7 +333,8 @@ var TempHandler : ICefDisplayHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -346,7 +351,8 @@ var TempHandler : ICefDownloadHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -363,7 +369,8 @@ var TempHandler : ICefDragHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -380,7 +387,8 @@ var TempHandler : ICefFindHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -397,7 +405,8 @@ var TempHandler : ICefFocusHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -415,6 +424,7 @@ var begin Result := nil; TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -431,7 +441,8 @@ var TempHandler : ICefJsDialogHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -448,7 +459,8 @@ var TempHandler : ICefKeyboardHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -465,7 +477,8 @@ var TempHandler : ICefLifeSpanHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -482,7 +495,8 @@ var TempHandler : ICefLoadHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -499,7 +513,8 @@ var TempHandler : ICefRenderHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -516,7 +531,8 @@ var TempHandler : ICefRequestHandler; begin Result := nil; - TempObject := CefGetObject(self); + TempObject := CefGetObject(self); + TempHandler := nil; if (TempObject <> nil) and (TempObject is TCefClientOwn) then try @@ -569,16 +585,19 @@ function cef_client_own_on_process_message_received(self : PCefClient; source_process : TCefProcessId; message_ : PCefProcessMessage): Integer; stdcall; var - TempObject : TObject; + TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); - TempObject := CefGetObject(self); + TempResult := False; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefClientOwn) then - Result := Ord(TCefClientOwn(TempObject).OnProcessMessageReceived(TCefBrowserRef.UnWrap(browser), + TempResult := TCefClientOwn(TempObject).OnProcessMessageReceived(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), source_process, - TCefProcessMessageRef.UnWrap(message_))); + TCefProcessMessageRef.UnWrap(message_)); + + Result := Ord(TempResult); end; constructor TCefClientOwn.Create; diff --git a/source/uCEFCommandHandler.pas b/source/uCEFCommandHandler.pas index 3a7471b5..fd2cd05f 100644 --- a/source/uCEFCommandHandler.pas +++ b/source/uCEFCommandHandler.pas @@ -62,14 +62,17 @@ function cef_command_handler_on_chrome_command(self : PCefCommandHandler; disposition : TCefWindowOpenDisposition): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefCommandHandlerOwn) then - Result := Ord(TCefCommandHandlerOwn(TempObject).OnChromeCommand(TCefBrowserRef.UnWrap(browser), + TempResult := TCefCommandHandlerOwn(TempObject).OnChromeCommand(TCefBrowserRef.UnWrap(browser), command_id, - disposition)); + disposition); + + Result := Ord(TempResult); end; function cef_command_handler_is_chrome_app_menu_item_visible(self : PCefCommandHandler; @@ -77,13 +80,16 @@ function cef_command_handler_is_chrome_app_menu_item_visible(self : PCefCo command_id : integer): integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(True); + TempResult := True; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefCommandHandlerOwn) then - Result := Ord(TCefCommandHandlerOwn(TempObject).OnIsChromeAppMenuItemVisible(TCefBrowserRef.UnWrap(browser), - command_id)); + TempResult := TCefCommandHandlerOwn(TempObject).OnIsChromeAppMenuItemVisible(TCefBrowserRef.UnWrap(browser), + command_id); + + Result := Ord(TempResult); end; function cef_command_handler_is_chrome_app_menu_item_enabled(self : PCefCommandHandler; @@ -91,37 +97,46 @@ function cef_command_handler_is_chrome_app_menu_item_enabled(self : PCefCo command_id : integer): integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(True); + TempResult := True; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefCommandHandlerOwn) then - Result := Ord(TCefCommandHandlerOwn(TempObject).OnIsChromeAppMenuItemEnabled(TCefBrowserRef.UnWrap(browser), - command_id)); + TempResult := TCefCommandHandlerOwn(TempObject).OnIsChromeAppMenuItemEnabled(TCefBrowserRef.UnWrap(browser), + command_id); + + Result := Ord(TempResult); end; function cef_command_handler_is_chrome_page_action_icon_visible(self : PCefCommandHandler; icon_type : TCefChromePageActionIconType): integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(True); + TempResult := True; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefCommandHandlerOwn) then - Result := Ord(TCefCommandHandlerOwn(TempObject).OnIsChromePageActionIconVisible(icon_type)); + TempResult := TCefCommandHandlerOwn(TempObject).OnIsChromePageActionIconVisible(icon_type); + + Result := Ord(TempResult); end; function cef_command_handler_is_chrome_toolbar_button_visible(self : PCefCommandHandler; button_type : TCefChromeToolbarButtonType): integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(True); + TempResult := True; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefCommandHandlerOwn) then - Result := Ord(TCefCommandHandlerOwn(TempObject).OnIsChromeToolbarButtonVisible(button_type)); + TempResult := TCefCommandHandlerOwn(TempObject).OnIsChromeToolbarButtonVisible(button_type); + + Result := Ord(TempResult); end; constructor TCefCommandHandlerOwn.Create; diff --git a/source/uCEFContextMenuHandler.pas b/source/uCEFContextMenuHandler.pas index 02a6805a..51242147 100644 --- a/source/uCEFContextMenuHandler.pas +++ b/source/uCEFContextMenuHandler.pas @@ -85,17 +85,20 @@ function cef_context_menu_handler_run_context_menu(self : PCefContextMenuHan model : PCefMenuModel; callback : PCefRunContextMenuCallback): Integer; stdcall; var - TempObject : TObject; + TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); - TempObject := CefGetObject(self); + TempResult := False; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefContextMenuHandlerOwn) then - Result := Ord(TCefContextMenuHandlerOwn(TempObject).RunContextMenu(TCefBrowserRef.UnWrap(browser), + TempResult := TCefContextMenuHandlerOwn(TempObject).RunContextMenu(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), TCefContextMenuParamsRef.UnWrap(params), TCefMenuModelRef.UnWrap(model), - TCefRunContextMenuCallbackRef.UnWrap(callback))); + TCefRunContextMenuCallbackRef.UnWrap(callback)); + + Result := Ord(TempResult); end; function cef_context_menu_handler_on_context_menu_command(self : PCefContextMenuHandler; @@ -105,17 +108,20 @@ function cef_context_menu_handler_on_context_menu_command(self : PCefCont command_id : Integer; event_flags : TCefEventFlags): Integer; stdcall; var - TempObject : TObject; + TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); - TempObject := CefGetObject(self); + TempResult := False; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefContextMenuHandlerOwn) then - Result := Ord(TCefContextMenuHandlerOwn(TempObject).OnContextMenuCommand(TCefBrowserRef.UnWrap(browser), + TempResult := TCefContextMenuHandlerOwn(TempObject).OnContextMenuCommand(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), TCefContextMenuParamsRef.UnWrap(params), command_id, - event_flags)); + event_flags); + + Result := Ord(TempResult); end; procedure cef_context_menu_handler_on_context_menu_dismissed(self : PCefContextMenuHandler; @@ -139,18 +145,21 @@ function cef_context_menu_handler_run_quick_menu(self : PCefConte edit_state_flags : TCefQuickMenuEditStateFlags; callback : PCefRunQuickMenuCallback): Integer; stdcall; var - TempObject : TObject; + TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); - TempObject := CefGetObject(self); + TempResult := False; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefContextMenuHandlerOwn) then - Result := Ord(TCefContextMenuHandlerOwn(TempObject).RunQuickMenu(TCefBrowserRef.UnWrap(browser), + TempResult := TCefContextMenuHandlerOwn(TempObject).RunQuickMenu(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), location, size, edit_state_flags, - TCefRunQuickMenuCallbackRef.UnWrap(callback))); + TCefRunQuickMenuCallbackRef.UnWrap(callback)); + + Result := Ord(TempResult); end; function cef_context_menu_handler_on_quick_menu_command(self : PCefContextMenuHandler; @@ -159,16 +168,19 @@ function cef_context_menu_handler_on_quick_menu_command(self : PCefContex command_id : Integer; event_flags : TCefEventFlags): Integer; stdcall; var - TempObject : TObject; + TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); - TempObject := CefGetObject(self); + TempResult := False; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefContextMenuHandlerOwn) then - Result := Ord(TCefContextMenuHandlerOwn(TempObject).OnQuickMenuCommand(TCefBrowserRef.UnWrap(browser), + TempResult := TCefContextMenuHandlerOwn(TempObject).OnQuickMenuCommand(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), command_id, - event_flags)); + event_flags); + + Result := Ord(TempResult); end; procedure cef_context_menu_handler_on_quick_menu_dismissed(self : PCefContextMenuHandler; diff --git a/source/uCEFCookieAccessFilter.pas b/source/uCEFCookieAccessFilter.pas index 63924586..d6144e84 100644 --- a/source/uCEFCookieAccessFilter.pas +++ b/source/uCEFCookieAccessFilter.pas @@ -69,15 +69,18 @@ function cef_cookie_access_filter_can_send_cookie( self : PCefCookieAcce const cookie : PCefCookie): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(True); + TempResult := True; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefCookieAccessFilterOwn) then - Result := Ord(TCefCookieAccessFilterOwn(TempObject).CanSendCookie(TCefBrowserRef.UnWrap(browser), + TempResult := TCefCookieAccessFilterOwn(TempObject).CanSendCookie(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), TCefRequestRef.UnWrap(request), - cookie)); + cookie); + + Result := Ord(TempResult); end; function cef_cookie_access_filter_can_save_cookie( self : PCefCookieAccessFilter; @@ -88,16 +91,19 @@ function cef_cookie_access_filter_can_save_cookie( self : PCefCookieAcc const cookie : PCefCookie): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(True); + TempResult := True; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefCookieAccessFilterOwn) then - Result := Ord(TCefCookieAccessFilterOwn(TempObject).CanSaveCookie(TCefBrowserRef.UnWrap(browser), + TempResult := TCefCookieAccessFilterOwn(TempObject).CanSaveCookie(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), TCefRequestRef.UnWrap(request), TCefResponseRef.UnWrap(response), - cookie)); + cookie); + + Result := Ord(TempResult); end; constructor TCefCookieAccessFilterOwn.Create; diff --git a/source/uCEFCookieVisitor.pas b/source/uCEFCookieVisitor.pas index 2feb642d..b658514c 100644 --- a/source/uCEFCookieVisitor.pas +++ b/source/uCEFCookieVisitor.pas @@ -61,21 +61,22 @@ function cef_cookie_visitor_visit( self : PCefCookieVisitor; total : Integer; deleteCookie : PInteger): Integer; stdcall; var - delete : Boolean; - exp : TDateTime; + TempDelete : boolean; + TempExp : TDateTime; TempObject : TObject; + TempResult : boolean; begin - delete := False; - Result := Ord(True); + TempResult := True; + TempDelete := False; TempObject := CefGetObject(self); if (cookie^.has_expires <> 0) then - exp := CefBaseTimeToDateTime(cookie^.expires) + TempExp := CefBaseTimeToDateTime(cookie^.expires) else - exp := 0; + TempExp := 0; if (TempObject <> nil) and (TempObject is TCefCookieVisitorOwn) then - Result := Ord(TCefCookieVisitorOwn(TempObject).visit(CefString(@cookie^.name), + TempResult := TCefCookieVisitorOwn(TempObject).visit(CefString(@cookie^.name), CefString(@cookie^.value), CefString(@cookie^.domain), CefString(@cookie^.path), @@ -84,14 +85,15 @@ begin Boolean(cookie^.has_expires), CefBaseTimeToDateTime(cookie^.creation), CefBaseTimeToDateTime(cookie^.last_access), - exp, + TempExp, count, total, cookie^.same_site, cookie^.priority, - delete)); + TempDelete); - deleteCookie^ := Ord(delete); + deleteCookie^ := Ord(TempDelete); + Result := Ord(TempResult); end; // TCefCookieVisitorOwn diff --git a/source/uCEFCustomStreamReader.pas b/source/uCEFCustomStreamReader.pas index f4a5a66b..7c0b2d37 100644 --- a/source/uCEFCustomStreamReader.pas +++ b/source/uCEFCustomStreamReader.pas @@ -44,10 +44,10 @@ uses function cef_stream_reader_read(self: PCefReadHandler; ptr: Pointer; size, n: NativeUInt): NativeUInt; stdcall; var - TempObject : TObject; + TempObject : TObject; begin - Result := 0; - TempObject := CefGetObject(self); + Result := 0; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefCustomStreamReader) then Result := TCefCustomStreamReader(TempObject).Read(ptr, size, n); @@ -55,10 +55,10 @@ end; function cef_stream_reader_seek(self: PCefReadHandler; offset: Int64; whence: Integer): Integer; stdcall; var - TempObject : TObject; + TempObject : TObject; begin - Result := 0; - TempObject := CefGetObject(self); + Result := 0; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefCustomStreamReader) then Result := TCefCustomStreamReader(TempObject).Seek(offset, whence); @@ -77,26 +77,31 @@ end; function cef_stream_reader_eof(self: PCefReadHandler): Integer; stdcall; var - TempObject : TObject; + TempObject : TObject; + TempResult : boolean; begin - Result := Ord(True); - TempObject := CefGetObject(self); + TempResult := True; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefCustomStreamReader) then - Result := Ord(TCefCustomStreamReader(TempObject).Eof); + TempResult := TCefCustomStreamReader(TempObject).Eof; + + Result := Ord(TempResult); end; function cef_stream_reader_may_block(self: PCefReadHandler): Integer; stdcall; var - TempObject : TObject; + TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); - TempObject := CefGetObject(self); + TempResult := False; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefCustomStreamReader) then - Result := Ord(TCefCustomStreamReader(TempObject).MayBlock); -end; + TempResult := TCefCustomStreamReader(TempObject).MayBlock; + Result := Ord(TempResult); +end; constructor TCefCustomStreamReader.Create(Stream: TStream; Owned: Boolean); begin diff --git a/source/uCEFDialogHandler.pas b/source/uCEFDialogHandler.pas index 65263d3a..bd589929 100644 --- a/source/uCEFDialogHandler.pas +++ b/source/uCEFDialogHandler.pas @@ -70,11 +70,12 @@ var TempCefExtensions : ICefStringList; TempCefDescriptions : ICefStringList; TempObject : TObject; + TempResult : boolean; begin TempFilters := nil; TempExtensions := nil; TempDescriptions := nil; - Result := Ord(False); + TempResult := False; try try @@ -94,14 +95,14 @@ begin TempCefDescriptions := TCefStringListRef.Create(accept_descriptions); TempCefDescriptions.CopyToStrings(TempDescriptions); - Result := Ord(TCefDialogHandlerOwn(TempObject).OnFileDialog(TCefBrowserRef.UnWrap(browser), + TempResult := TCefDialogHandlerOwn(TempObject).OnFileDialog(TCefBrowserRef.UnWrap(browser), mode, CefString(title), CefString(default_file_path), TempFilters, TempExtensions, TempDescriptions, - TCefFileDialogCallbackRef.UnWrap(callback))); + TCefFileDialogCallbackRef.UnWrap(callback)); end; except on e : exception do @@ -111,6 +112,8 @@ begin if (TempFilters <> nil) then FreeAndNil(TempFilters); if (TempExtensions <> nil) then FreeAndNil(TempExtensions); if (TempDescriptions <> nil) then FreeAndNil(TempDescriptions); + + Result := Ord(TempResult); end; end; diff --git a/source/uCEFDisplayHandler.pas b/source/uCEFDisplayHandler.pas index 94fd1d89..d3a6aa77 100644 --- a/source/uCEFDisplayHandler.pas +++ b/source/uCEFDisplayHandler.pas @@ -249,17 +249,20 @@ function cef_display_handler_on_tooltip(self : PCefDisplayHandler; var TempText : ustring; TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefDisplayHandlerOwn) then begin - TempText := CefStringClearAndGet(text); - Result := Ord(TCefDisplayHandlerOwn(TempObject).OnTooltip(TCefBrowserRef.UnWrap(browser), - TempText)); + TempText := CefStringClearAndGet(text); + TempResult := TCefDisplayHandlerOwn(TempObject).OnTooltip(TCefBrowserRef.UnWrap(browser), + TempText); if (text <> nil) then text^ := CefStringAlloc(TempText); end; + + Result := Ord(TempResult); end; procedure cef_display_handler_on_status_message( self : PCefDisplayHandler; @@ -283,16 +286,19 @@ function cef_display_handler_on_console_message( self : PCefDisplayHand line : Integer): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefDisplayHandlerOwn) then - Result := Ord(TCefDisplayHandlerOwn(TempObject).OnConsoleMessage(TCefBrowserRef.UnWrap(browser), + TempResult := TCefDisplayHandlerOwn(TempObject).OnConsoleMessage(TCefBrowserRef.UnWrap(browser), level, CefString(message_), CefString(source), - line)); + line); + + Result := Ord(TempResult); end; function cef_display_handler_on_auto_resize( self : PCefDisplayHandler; @@ -300,13 +306,16 @@ function cef_display_handler_on_auto_resize( self : PCefDisplayHandler; const new_size : PCefSize): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefDisplayHandlerOwn) then - Result := Ord(TCefDisplayHandlerOwn(TempObject).OnAutoResize(TCefBrowserRef.UnWrap(browser), - new_size)); + TempResult := TCefDisplayHandlerOwn(TempObject).OnAutoResize(TCefBrowserRef.UnWrap(browser), + new_size); + + Result := Ord(TempResult); end; @@ -360,25 +369,31 @@ end; function cef_display_handler_on_contents_bounds_change(self: PCefDisplayHandler; browser: PCefBrowser; const new_bounds: PCefRect): integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefDisplayHandlerOwn) then - Result := Ord(TCefDisplayHandlerOwn(TempObject).OnContentsBoundsChange(TCefBrowserRef.UnWrap(browser), - new_bounds)); + TempResult := TCefDisplayHandlerOwn(TempObject).OnContentsBoundsChange(TCefBrowserRef.UnWrap(browser), + new_bounds); + + Result := Ord(TempResult); end; function cef_display_handler_get_root_window_screen_rect(self: PCefDisplayHandler; browser: PCefBrowser; rect: PCefRect): integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefDisplayHandlerOwn) then - Result := Ord(TCefDisplayHandlerOwn(TempObject).GetRootWindowScreenRect(TCefBrowserRef.UnWrap(browser), - rect)); + TempResult := TCefDisplayHandlerOwn(TempObject).GetRootWindowScreenRect(TCefBrowserRef.UnWrap(browser), + rect); + + Result := Ord(TempResult); end; constructor TCefDisplayHandlerOwn.Create; diff --git a/source/uCEFDownloadHandler.pas b/source/uCEFDownloadHandler.pas index c42b5936..066105d1 100644 --- a/source/uCEFDownloadHandler.pas +++ b/source/uCEFDownloadHandler.pas @@ -54,14 +54,17 @@ function cef_download_handler_can_download( self : PCefDownloadHa const request_method : PCefString): integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(True); + TempResult := True; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefDownloadHandlerOwn) then - Result := Ord(TCefDownloadHandlerOwn(TempObject).CanDownload(TCefBrowserRef.UnWrap(browser), + TempResult := TCefDownloadHandlerOwn(TempObject).CanDownload(TCefBrowserRef.UnWrap(browser), CefString(url), - CefString(request_method))); + CefString(request_method)); + + Result := Ord(TempResult); end; function cef_download_handler_on_before_download( self : PCefDownloadHandler; @@ -71,15 +74,18 @@ function cef_download_handler_on_before_download( self : PCefDow callback : PCefBeforeDownloadCallback): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefDownloadHandlerOwn) then - Result := Ord(TCefDownloadHandlerOwn(TempObject).OnBeforeDownload(TCefBrowserRef.UnWrap(browser), + TempResult := TCefDownloadHandlerOwn(TempObject).OnBeforeDownload(TCefBrowserRef.UnWrap(browser), TCefDownLoadItemRef.UnWrap(download_item), CefString(suggested_name), - TCefBeforeDownloadCallbackRef.UnWrap(callback))); + TCefBeforeDownloadCallbackRef.UnWrap(callback)); + + Result := Ord(TempResult); end; procedure cef_download_handler_on_download_updated(self : PCefDownloadHandler; diff --git a/source/uCEFDragHandler.pas b/source/uCEFDragHandler.pas index 12fdc146..6490708d 100644 --- a/source/uCEFDragHandler.pas +++ b/source/uCEFDragHandler.pas @@ -56,14 +56,17 @@ function cef_drag_handler_on_drag_enter(self : PCefDragHandler; mask : TCefDragOperations): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefDragHandlerOwn) then - Result := Ord(TCefDragHandlerOwn(TempObject).OnDragEnter(TCefBrowserRef.UnWrap(browser), + TempResult := TCefDragHandlerOwn(TempObject).OnDragEnter(TCefBrowserRef.UnWrap(browser), TCefDragDataRef.UnWrap(dragData), - mask)); + mask); + + Result := Ord(TempResult); end; procedure cef_drag_handler_on_draggable_regions_changed( self : PCefDragHandler; diff --git a/source/uCEFFocusHandler.pas b/source/uCEFFocusHandler.pas index c3170651..03c43145 100644 --- a/source/uCEFFocusHandler.pas +++ b/source/uCEFFocusHandler.pas @@ -70,13 +70,16 @@ function cef_focus_handler_on_set_focus(self : PCefFocusHandler; source : TCefFocusSource): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefFocusHandlerOwn) then - Result := Ord(TCefFocusHandlerOwn(TempObject).OnSetFocus(TCefBrowserRef.UnWrap(browser), - source)) + TempResult := TCefFocusHandlerOwn(TempObject).OnSetFocus(TCefBrowserRef.UnWrap(browser), + source); + + Result := Ord(TempResult); end; procedure cef_focus_handler_on_got_focus(self : PCefFocusHandler; diff --git a/source/uCEFJsDialogHandler.pas b/source/uCEFJsDialogHandler.pas index dd4cf761..5d5af39e 100644 --- a/source/uCEFJsDialogHandler.pas +++ b/source/uCEFJsDialogHandler.pas @@ -63,23 +63,25 @@ function cef_jsdialog_handler_on_jsdialog( self : PCefJsDial callback : PCefJsDialogCallback; suppress_message : PInteger): Integer; stdcall; var - TempSuppress : Boolean; + TempSuppress : boolean; TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempSuppress := suppress_message^ <> 0; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefJsDialogHandlerOwn) then - Result := Ord(TCefJsDialogHandlerOwn(TempObject).OnJsdialog(TCefBrowserRef.UnWrap(browser), + TempResult := TCefJsDialogHandlerOwn(TempObject).OnJsdialog(TCefBrowserRef.UnWrap(browser), CefString(origin_url), dialog_type, CefString(message_text), CefString(default_prompt_text), TCefJsDialogCallbackRef.UnWrap(callback), - TempSuppress)); + TempSuppress); suppress_message^ := Ord(TempSuppress); + Result := Ord(TempResult); end; function cef_jsdialog_handler_on_before_unload_dialog( self : PCefJsDialogHandler; @@ -89,15 +91,18 @@ function cef_jsdialog_handler_on_before_unload_dialog( self : PCefJ callback : PCefJsDialogCallback): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefJsDialogHandlerOwn) then - Result := Ord(TCefJsDialogHandlerOwn(TempObject).OnBeforeUnloadDialog(TCefBrowserRef.UnWrap(browser), + TempResult := TCefJsDialogHandlerOwn(TempObject).OnBeforeUnloadDialog(TCefBrowserRef.UnWrap(browser), CefString(message_text), is_reload <> 0, - TCefJsDialogCallbackRef.UnWrap(callback))); + TCefJsDialogCallbackRef.UnWrap(callback)); + + Result := Ord(TempResult); end; procedure cef_jsdialog_handler_on_reset_dialog_state(self : PCefJsDialogHandler; diff --git a/source/uCEFJson.pas b/source/uCEFJson.pas index cabb2762..cc00f93a 100644 --- a/source/uCEFJson.pas +++ b/source/uCEFJson.pas @@ -130,8 +130,9 @@ class function TCEFJson.ReadBoolean(const aDictionary : ICefDictionaryValue; con var TempValue : ICefValue; begin - Result := False; - aValue := False; + Result := False; + aValue := False; + TempValue := nil; if ReadValue(aDictionary, aKey, TempValue) and (TempValue.GetType = VTYPE_BOOL) then @@ -145,8 +146,9 @@ class function TCEFJson.ReadInteger(const aDictionary : ICefDictionaryValue; con var TempValue : ICefValue; begin - Result := False; - aValue := 0; + Result := False; + aValue := 0; + TempValue := nil; if ReadValue(aDictionary, aKey, TempValue) and (TempValue.GetType = VTYPE_INT) then @@ -160,8 +162,9 @@ class function TCEFJson.ReadDouble(const aDictionary : ICefDictionaryValue; cons var TempValue : ICefValue; begin - Result := False; - aValue := 0; + Result := False; + aValue := 0; + TempValue := nil; if ReadValue(aDictionary, aKey, TempValue) and (TempValue.GetType = VTYPE_DOUBLE) then @@ -175,8 +178,9 @@ class function TCEFJson.ReadString(const aDictionary : ICefDictionaryValue; cons var TempValue : ICefValue; begin - Result := False; - aValue := ''; + Result := False; + aValue := ''; + TempValue := nil; if ReadValue(aDictionary, aKey, TempValue) and (TempValue.GetType = VTYPE_STRING) then @@ -190,8 +194,9 @@ class function TCEFJson.ReadBinary(const aDictionary : ICefDictionaryValue; cons var TempValue : ICefValue; begin - Result := False; - aValue := nil; + Result := False; + aValue := nil; + TempValue := nil; if ReadValue(aDictionary, aKey, TempValue) and (TempValue.GetType = VTYPE_BINARY) then @@ -205,8 +210,9 @@ class function TCEFJson.ReadDictionary(const aDictionary : ICefDictionaryValue; var TempValue : ICefValue; begin - Result := False; - aValue := nil; + Result := False; + aValue := nil; + TempValue := nil; if ReadValue(aDictionary, aKey, TempValue) and (TempValue.GetType = VTYPE_DICTIONARY) then @@ -220,8 +226,9 @@ class function TCEFJson.ReadList(const aDictionary : ICefDictionaryValue; const var TempValue : ICefValue; begin - Result := False; - aValue := nil; + Result := False; + aValue := nil; + TempValue := nil; if ReadValue(aDictionary, aKey, TempValue) and (TempValue.GetType = VTYPE_LIST) then diff --git a/source/uCEFKeyboardHandler.pas b/source/uCEFKeyboardHandler.pas index 4ded4dc4..b4b4a1e4 100644 --- a/source/uCEFKeyboardHandler.pas +++ b/source/uCEFKeyboardHandler.pas @@ -56,20 +56,22 @@ function cef_keyboard_handler_on_pre_key_event( self : PCef os_event : TCefEventHandle; is_keyboard_shortcut : PInteger): Integer; stdcall; var - TempShortcut : Boolean; + TempShortcut : boolean; TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempShortcut := is_keyboard_shortcut^ <> 0; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefKeyboardHandlerOwn) then - Result := Ord(TCefKeyboardHandlerOwn(TempObject).OnPreKeyEvent(TCefBrowserRef.UnWrap(browser), + TempResult := TCefKeyboardHandlerOwn(TempObject).OnPreKeyEvent(TCefBrowserRef.UnWrap(browser), event, os_event, - TempShortcut)); + TempShortcut); is_keyboard_shortcut^ := Ord(TempShortcut); + Result := Ord(TempResult); end; function cef_keyboard_handler_on_key_event( self : PCefKeyboardHandler; @@ -78,14 +80,17 @@ function cef_keyboard_handler_on_key_event( self : PCefKeyboardHandler; os_event : TCefEventHandle): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefKeyboardHandlerOwn) then - Result := Ord(TCefKeyboardHandlerOwn(TempObject).OnKeyEvent(TCefBrowserRef.UnWrap(browser), + TempResult := TCefKeyboardHandlerOwn(TempObject).OnKeyEvent(TCefBrowserRef.UnWrap(browser), event, - os_event)); + os_event); + + Result := Ord(TempResult); end; constructor TCefKeyboardHandlerOwn.Create; diff --git a/source/uCEFLifeSpanHandler.pas b/source/uCEFLifeSpanHandler.pas index f1f4f839..ac0f71a5 100644 --- a/source/uCEFLifeSpanHandler.pas +++ b/source/uCEFLifeSpanHandler.pas @@ -77,9 +77,10 @@ var TempExtraInfo : ICefDictionaryValue; TempNoJS : boolean; TempObject : TObject; + TempResult : boolean; begin + TempResult := False; try - Result := Ord(False); TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefLifeSpanHandlerOwn) then @@ -88,7 +89,7 @@ begin TempClient := TCefClientRef.UnWrap(client); TempExtraInfo := TCefDictionaryValueRef.UnWrap(extra_info); - Result := Ord(TCefLifeSpanHandlerOwn(TempObject).OnBeforePopup(TCefBrowserRef.UnWrap(browser), + TempResult := TCefLifeSpanHandlerOwn(TempObject).OnBeforePopup(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), popup_id, CefString(target_url), @@ -100,7 +101,7 @@ begin TempClient, settings^, TempExtraInfo, - TempNoJS)); + TempNoJS); no_javascript_access^ := Ord(TempNoJS); @@ -119,6 +120,7 @@ begin finally TempClient := nil; TempExtraInfo := nil; + Result := Ord(TempResult); end; end; @@ -211,12 +213,15 @@ function cef_life_span_handler_do_close(self : PCefLifeSpanHandler; browser : PCefBrowser): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefLifeSpanHandlerOwn) then - Result := Ord(TCefLifeSpanHandlerOwn(TempObject).DoClose(TCefBrowserRef.UnWrap(browser))); + TempResult := TCefLifeSpanHandlerOwn(TempObject).DoClose(TCefBrowserRef.UnWrap(browser)); + + Result := Ord(TempResult); end; constructor TCefLifeSpanHandlerOwn.Create; diff --git a/source/uCEFMenuModelDelegate.pas b/source/uCEFMenuModelDelegate.pas index 31f34050..f1e27c87 100644 --- a/source/uCEFMenuModelDelegate.pas +++ b/source/uCEFMenuModelDelegate.pas @@ -114,16 +114,21 @@ function cef_menu_model_delegate_format_label(self : PCefMenuModelDelegate var TempObject : TObject; TempLabel : ustring; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefMenuModelDelegateOwn) then begin - TempLabel := CefStringClearAndGet(label_); - Result := Ord(TCefMenuModelDelegateOwn(TempObject).FormatLabel(TCefMenuModelRef.UnWrap(menu_model), TempLabel)); - if (label_ <> nil) then label_^ := CefStringAlloc(TempLabel); + TempLabel := CefStringClearAndGet(label_); + TempResult := TCefMenuModelDelegateOwn(TempObject).FormatLabel(TCefMenuModelRef.UnWrap(menu_model), TempLabel); + + if (label_ <> nil) then + label_^ := CefStringAlloc(TempLabel); end; + + Result := Ord(TempResult); end; constructor TCefMenuModelDelegateOwn.Create; diff --git a/source/uCEFMiscFunctions.pas b/source/uCEFMiscFunctions.pas index a9beee26..6b70e44b 100644 --- a/source/uCEFMiscFunctions.pas +++ b/source/uCEFMiscFunctions.pas @@ -1555,7 +1555,7 @@ var begin if (GlobalCEFApp <> nil) and GlobalCEFApp.LibLoaded then begin - TempString := TempString + ', x: $' + inttohex(aEvent.x, SizeOf(aEvent.x) * 2); + TempString := ' x: $' + inttohex(aEvent.x, SizeOf(aEvent.x) * 2); TempString := TempString + ', y: $' + inttohex(aEvent.y, SizeOf(aEvent.y) * 2); TempString := TempString + ', modifiers: $' + inttohex(aEvent.modifiers, SizeOf(aEvent.modifiers) * 2); diff --git a/source/uCEFNavigationEntryVisitor.pas b/source/uCEFNavigationEntryVisitor.pas index a6a6cf00..be3c24cd 100644 --- a/source/uCEFNavigationEntryVisitor.pas +++ b/source/uCEFNavigationEntryVisitor.pas @@ -61,15 +61,18 @@ function cef_navigation_entry_visitor_visit(self : PCefNavigationEntryVisitor total : Integer): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefNavigationEntryVisitorOwn) then - Result := Ord(TCefNavigationEntryVisitorOwn(TempObject).Visit(TCefNavigationEntryRef.UnWrap(entry), + TempResult := TCefNavigationEntryVisitorOwn(TempObject).Visit(TCefNavigationEntryRef.UnWrap(entry), current <> 0, index, - total)); + total); + + Result := Ord(TempResult); end; // TCefNavigationEntryVisitorOwn diff --git a/source/uCEFPermissionHandler.pas b/source/uCEFPermissionHandler.pas index ad6ec19b..faf79cff 100644 --- a/source/uCEFPermissionHandler.pas +++ b/source/uCEFPermissionHandler.pas @@ -60,16 +60,19 @@ function cef_permission_handler_on_request_media_access_permission( self callback : PCefMediaAccessCallback): integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefPermissionHandlerOwn) then - Result := Ord(TCefPermissionHandlerOwn(TempObject).OnRequestMediaAccessPermission(TCefBrowserRef.UnWrap(browser), + TempResult := TCefPermissionHandlerOwn(TempObject).OnRequestMediaAccessPermission(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), CefString(requesting_origin), requested_permissions, - TCefMediaAccessCallbackRef.UnWrap(callback))); + TCefMediaAccessCallbackRef.UnWrap(callback)); + + Result := Ord(TempResult); end; function cef_permission_handler_on_show_permission_prompt( self : PCefPermissionHandler; @@ -80,16 +83,19 @@ function cef_permission_handler_on_show_permission_prompt( self callback : PCefPermissionPromptCallback): integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefPermissionHandlerOwn) then - Result := Ord(TCefPermissionHandlerOwn(TempObject).OnShowPermissionPrompt(TCefBrowserRef.UnWrap(browser), + TempResult := TCefPermissionHandlerOwn(TempObject).OnShowPermissionPrompt(TCefBrowserRef.UnWrap(browser), prompt_id, CefString(requesting_origin), requested_permissions, - TCefPermissionPromptCallbackRef.UnWrap(callback))); + TCefPermissionPromptCallbackRef.UnWrap(callback)); + + Result := Ord(TempResult); end; procedure cef_permission_handler_on_dismiss_permission_prompt(self : PCefPermissionHandler; diff --git a/source/uCEFPostDataElement.pas b/source/uCEFPostDataElement.pas index aa960693..ef90e6ae 100644 --- a/source/uCEFPostDataElement.pas +++ b/source/uCEFPostDataElement.pas @@ -129,12 +129,15 @@ end; function cef_post_data_element_is_read_only(self: PCefPostDataElement): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefPostDataElementOwn) then - Result := Ord(TCefPostDataElementOwn(TempObject).IsReadOnly); + TempResult := TCefPostDataElementOwn(TempObject).IsReadOnly; + + Result := Ord(TempResult); end; procedure cef_post_data_element_set_to_empty(self: PCefPostDataElement); stdcall; diff --git a/source/uCEFRenderHandler.pas b/source/uCEFRenderHandler.pas index 0f1ad34b..6f2e0077 100644 --- a/source/uCEFRenderHandler.pas +++ b/source/uCEFRenderHandler.pas @@ -103,13 +103,16 @@ function cef_render_handler_get_root_screen_rect(self : PCefRenderHandler; rect : PCefRect): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefRenderHandlerOwn) then - Result := Ord(TCefRenderHandlerOwn(TempObject).GetRootScreenRect(TCefBrowserRef.UnWrap(browser), - rect^)); + TempResult := TCefRenderHandlerOwn(TempObject).GetRootScreenRect(TCefBrowserRef.UnWrap(browser), + rect^); + + Result := Ord(TempResult); end; procedure cef_render_handler_get_view_rect(self : PCefRenderHandler; @@ -135,16 +138,19 @@ function cef_render_handler_get_screen_point(self : PCefRenderHandle screenX, screenY : PInteger): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefRenderHandlerOwn) then - Result := Ord(TCefRenderHandlerOwn(TempObject).GetScreenPoint(TCefBrowserRef.UnWrap(browser), + TempResult := TCefRenderHandlerOwn(TempObject).GetScreenPoint(TCefBrowserRef.UnWrap(browser), viewX, viewY, screenX^, - screenY^)); + screenY^); + + Result := Ord(TempResult); end; function cef_render_handler_get_screen_info(self : PCefRenderHandler; @@ -152,13 +158,16 @@ function cef_render_handler_get_screen_info(self : PCefRenderHandler; screen_info : PCefScreenInfo): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefRenderHandlerOwn) then - Result := Ord(TCefRenderHandlerOwn(TempObject).GetScreenInfo(TCefBrowserRef.UnWrap(browser), - screen_info^)); + TempResult := TCefRenderHandlerOwn(TempObject).GetScreenInfo(TCefBrowserRef.UnWrap(browser), + screen_info^); + + Result := Ord(TempResult); end; procedure cef_render_handler_on_popup_show(self : PCefRenderHandler; @@ -237,16 +246,19 @@ function cef_render_handler_start_dragging(self : PCefRenderHandler; y : Integer): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefRenderHandlerOwn) then - Result := Ord(TCefRenderHandlerOwn(TempObject).OnStartDragging(TCefBrowserRef.UnWrap(browser), + TempResult := TCefRenderHandlerOwn(TempObject).OnStartDragging(TCefBrowserRef.UnWrap(browser), TCefDragDataRef.UnWrap(drag_data), allowed_ops, x, - y)); + y); + + Result := Ord(TempResult); end; procedure cef_render_handler_update_drag_cursor(self : PCefRenderHandler; diff --git a/source/uCEFRenderProcessHandler.pas b/source/uCEFRenderProcessHandler.pas index 7e50c421..9bb85b30 100644 --- a/source/uCEFRenderProcessHandler.pas +++ b/source/uCEFRenderProcessHandler.pas @@ -195,16 +195,19 @@ function cef_render_process_handler_on_process_message_received(self : message_ : PCefProcessMessage): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefRenderProcessHandlerOwn) then - Result := Ord(TCefRenderProcessHandlerOwn(TempObject).OnProcessMessageReceived(TCefBrowserRef.UnWrap(browser), + TempResult := TCefRenderProcessHandlerOwn(TempObject).OnProcessMessageReceived(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), source_process, - TCefProcessMessageRef.UnWrap(message_))); + TCefProcessMessageRef.UnWrap(message_)); + + Result := Ord(TempResult); end; diff --git a/source/uCEFRequestHandler.pas b/source/uCEFRequestHandler.pas index 737a87a6..166f6ef4 100644 --- a/source/uCEFRequestHandler.pas +++ b/source/uCEFRequestHandler.pas @@ -77,16 +77,19 @@ function cef_request_handler_on_before_browse(self : PCefRequestHandler; isRedirect : Integer): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefRequestHandlerOwn) then - Result := Ord(TCefRequestHandlerOwn(TempObject).OnBeforeBrowse(TCefBrowserRef.UnWrap(browser), + TempResult := TCefRequestHandlerOwn(TempObject).OnBeforeBrowse(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), TCefRequestRef.UnWrap(request), user_gesture <> 0, - isRedirect <> 0)); + isRedirect <> 0); + + Result := Ord(TempResult); end; function cef_request_handler_on_open_urlfrom_tab( self : PCefRequestHandler; @@ -97,16 +100,19 @@ function cef_request_handler_on_open_urlfrom_tab( self : PCef user_gesture : Integer): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefRequestHandlerOwn) then - Result := Ord(TCefRequestHandlerOwn(TempObject).OnOpenUrlFromTab(TCefBrowserRef.UnWrap(browser), + TempResult := TCefRequestHandlerOwn(TempObject).OnOpenUrlFromTab(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), CefString(target_url), target_disposition, - user_gesture <> 0)); + user_gesture <> 0); + + Result := Ord(TempResult); end; function cef_request_handler_get_resource_request_handler( self : PCefRequestHandler; @@ -156,19 +162,22 @@ function cef_request_handler_get_auth_credentials( self : PCefRequest callback : PCefAuthCallback): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefRequestHandlerOwn) then - Result := Ord(TCefRequestHandlerOwn(TempObject).GetAuthCredentials(TCefBrowserRef.UnWrap(browser), + TempResult := TCefRequestHandlerOwn(TempObject).GetAuthCredentials(TCefBrowserRef.UnWrap(browser), CefString(origin_url), isProxy <> 0, CefString(host), port, CefString(realm), CefString(scheme), - TCefAuthCallbackRef.UnWrap(callback))); + TCefAuthCallbackRef.UnWrap(callback)); + + Result := Ord(TempResult); end; function cef_request_handler_on_certificate_error( self : PCefRequestHandler; @@ -179,16 +188,19 @@ function cef_request_handler_on_certificate_error( self : PCefReques callback : PCefCallback): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefRequestHandlerOwn) then - Result := Ord(TCefRequestHandlerOwn(TempObject).OnCertificateError(TCefBrowserRef.UnWrap(browser), + TempResult := TCefRequestHandlerOwn(TempObject).OnCertificateError(TCefBrowserRef.UnWrap(browser), cert_error, CefString(request_url), TCefSslInfoRef.UnWrap(ssl_info), - TCefCallbackRef.UnWrap(callback))); + TCefCallbackRef.UnWrap(callback)); + + Result := Ord(TempResult); end; procedure cef_request_handler_on_render_view_ready(self : PCefRequestHandler; @@ -207,13 +219,16 @@ function cef_request_handler_on_render_process_unresponsive(self : PCefReque callback : PCefUnresponsiveProcessCallback): integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefRequestHandlerOwn) then - Result := Ord(TCefRequestHandlerOwn(TempObject).OnRenderProcessUnresponsive(TCefBrowserRef.UnWrap(browser), - TCefUnresponsiveProcessCallbackRef.UnWrap(callback))); + TempResult := TCefRequestHandlerOwn(TempObject).OnRenderProcessUnresponsive(TCefBrowserRef.UnWrap(browser), + TCefUnresponsiveProcessCallbackRef.UnWrap(callback)); + + Result := Ord(TempResult); end; procedure cef_request_handler_on_render_process_responsive(self: PCefRequestHandler; browser: PCefBrowser); stdcall; @@ -264,11 +279,12 @@ function cef_request_handler_on_select_client_certificate( self callback : PCefSelectClientCertificateCallback): integer; stdcall; var TempCertArray : TCefX509CertificateArray; - i : NativeUInt; - TempObject : TObject; + i : NativeUInt; + TempObject : TObject; + TempResult : boolean; begin + TempResult := False; TempCertArray := nil; - Result := Ord(False); try try @@ -286,13 +302,13 @@ begin TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefRequestHandlerOwn) then - Result := Ord(TCefRequestHandlerOwn(TempObject).OnSelectClientCertificate(TCefBrowserRef.UnWrap(browser), + TempResult := TCefRequestHandlerOwn(TempObject).OnSelectClientCertificate(TCefBrowserRef.UnWrap(browser), (isProxy <> 0), CefString(host), port, certificatesCount, TempCertArray, - TCefSelectClientCertificateCallbackRef.UnWrap(callback))); + TCefSelectClientCertificateCallbackRef.UnWrap(callback)); i := 0; while (i < certificatesCount) do @@ -311,6 +327,8 @@ begin Finalize(TempCertArray); TempCertArray := nil; end; + + Result := Ord(TempResult); end; end; diff --git a/source/uCEFResourceBundleHandler.pas b/source/uCEFResourceBundleHandler.pas index e7460671..50c9be6c 100644 --- a/source/uCEFResourceBundleHandler.pas +++ b/source/uCEFResourceBundleHandler.pas @@ -58,15 +58,16 @@ function cef_resource_bundle_handler_get_localized_string(self : PCefResou var TempString : ustring; TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefResourceBundleHandlerOwn) then begin TempString := ''; - Result := Ord(TCefResourceBundleHandlerOwn(TempObject).GetLocalizedString(string_id, TempString)); + TempResult := TCefResourceBundleHandlerOwn(TempObject).GetLocalizedString(string_id, TempString); if (string_val <> nil) then begin @@ -74,6 +75,8 @@ begin string_val^ := CefStringAlloc(TempString); end; end; + + Result := Ord(TempResult); end; function cef_resource_bundle_handler_get_data_resource( self : PCefResourceBundleHandler; @@ -82,13 +85,16 @@ function cef_resource_bundle_handler_get_data_resource( self : PCefRes var data_size : NativeUInt): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefResourceBundleHandlerOwn) then - Result := Ord(TCefResourceBundleHandlerOwn(TempObject).GetDataResource(resource_id, data, data_size)); + TempResult := TCefResourceBundleHandlerOwn(TempObject).GetDataResource(resource_id, data, data_size); + + Result := Ord(TempResult); end; function cef_resource_bundle_handler_get_data_resource_for_scale( self : PCefResourceBundleHandler; @@ -98,13 +104,16 @@ function cef_resource_bundle_handler_get_data_resource_for_scale( self var data_size : NativeUInt): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefResourceBundleHandlerOwn) then - Result := Ord(TCefResourceBundleHandlerOwn(TempObject).GetDataResourceForScale(resource_id, scale_factor, data, data_size)); + TempResult := TCefResourceBundleHandlerOwn(TempObject).GetDataResourceForScale(resource_id, scale_factor, data, data_size); + + Result := Ord(TempResult); end; constructor TCefResourceBundleHandlerOwn.Create; diff --git a/source/uCEFResourceHandler.pas b/source/uCEFResourceHandler.pas index 44c16fdb..ea2d18e3 100644 --- a/source/uCEFResourceHandler.pas +++ b/source/uCEFResourceHandler.pas @@ -59,19 +59,21 @@ function cef_resource_handler_open(self : PCefResourceHandler; handle_request : PInteger; callback : PCefCallback): Integer; stdcall; var - TempObject : TObject; - TempHandleRequest : Boolean; + TempObject : TObject; + TempHandleRequest : boolean; + TempResult : boolean; begin - Result := Ord(False); - TempObject := CefGetObject(self); + TempResult := False; TempHandleRequest := False; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefResourceHandlerOwn) then - Result := Ord(TCefResourceHandlerOwn(TempObject).Open(TCefRequestRef.UnWrap(request), + TempResult := TCefResourceHandlerOwn(TempObject).Open(TCefRequestRef.UnWrap(request), TempHandleRequest, - TCefCallbackRef.UnWrap(callback))); + TCefCallbackRef.UnWrap(callback)); handle_request^ := Ord(TempHandleRequest); + Result := Ord(TempResult); end; function cef_resource_handler_process_request(self : PCefResourceHandler; @@ -79,13 +81,16 @@ function cef_resource_handler_process_request(self : PCefResourceHandler; callback : PCefCallback): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefResourceHandlerOwn) then - Result := Ord(TCefResourceHandlerOwn(TempObject).ProcessRequest(TCefRequestRef.UnWrap(request), - TCefCallbackRef.UnWrap(callback))); + TempResult := TCefResourceHandlerOwn(TempObject).ProcessRequest(TCefRequestRef.UnWrap(request), + TCefCallbackRef.UnWrap(callback)); + + Result := Ord(TempResult); end; procedure cef_resource_handler_get_response_headers(self : PCefResourceHandler; @@ -116,16 +121,19 @@ function cef_resource_handler_skip(self : PCefResourceHandler; var TempObject : TObject; TempBytesSkipped : int64; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); TempBytesSkipped := bytes_skipped^; if (TempObject <> nil) and (TempObject is TCefResourceHandlerOwn) then - Result := Ord(TCefResourceHandlerOwn(TempObject).Skip(bytes_to_skip, + TempResult := TCefResourceHandlerOwn(TempObject).Skip(bytes_to_skip, TempBytesSkipped, - TCefResourceSkipCallbackRef.UnWrap(callback))); + TCefResourceSkipCallbackRef.UnWrap(callback)); + bytes_skipped^ := TempBytesSkipped; + Result := Ord(TempResult); end; function cef_resource_handler_read(self : PCefResourceHandler; @@ -137,20 +145,21 @@ var TempObject : TObject; TempBytesRead : integer; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); TempBytesRead := bytes_read^; if (TempObject <> nil) and (TempObject is TCefResourceHandlerOwn) then - Result := Ord(TCefResourceHandlerOwn(TempObject).Read(data_out, + TempResult := TCefResourceHandlerOwn(TempObject).Read(data_out, bytes_to_read, TempBytesRead, - TCefResourceReadCallbackRef.UnWrap(callback))); + TCefResourceReadCallbackRef.UnWrap(callback)); bytes_read^ := TempBytesRead; - + Result := Ord(TempResult); end; function cef_resource_handler_read_response(self : PCefResourceHandler; @@ -161,18 +170,20 @@ function cef_resource_handler_read_response(self : PCefResourceHandler; var TempObject : TObject; TempBytesRead : integer; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); TempBytesRead := bytes_read^; if (TempObject <> nil) and (TempObject is TCefResourceHandlerOwn) then - Result := Ord(TCefResourceHandlerOwn(TempObject).ReadResponse(data_out, + TempResult := TCefResourceHandlerOwn(TempObject).ReadResponse(data_out, bytes_to_read, TempBytesRead, - TCefCallbackRef.UnWrap(callback))); + TCefCallbackRef.UnWrap(callback)); bytes_read^ := TempBytesRead; + Result := Ord(TempResult); end; procedure cef_resource_handler_cancel(self: PCefResourceHandler); stdcall; diff --git a/source/uCEFResourceRequestHandler.pas b/source/uCEFResourceRequestHandler.pas index 0e5827ab..e601ddcb 100644 --- a/source/uCEFResourceRequestHandler.pas +++ b/source/uCEFResourceRequestHandler.pas @@ -181,15 +181,18 @@ function cef_resource_request_handler_on_resource_response(self : PCefResour response : PCefResponse): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefResourceRequestHandlerOwn) then - Result := Ord(TCefResourceRequestHandlerOwn(TempObject).OnResourceResponse(TCefBrowserRef.UnWrap(browser), + TempResult := TCefResourceRequestHandlerOwn(TempObject).OnResourceResponse(TCefBrowserRef.UnWrap(browser), TCefFrameRef.UnWrap(frame), TCefRequestRef.UnWrap(request), - TCefResponseRef.UnWrap(response))); + TCefResponseRef.UnWrap(response)); + + Result := Ord(TempResult); end; function cef_resource_request_handler_get_resource_response_filter(self : PCefResourceRequestHandler; diff --git a/source/uCEFResponseFilter.pas b/source/uCEFResponseFilter.pas index 3f4bd794..ca65305d 100644 --- a/source/uCEFResponseFilter.pas +++ b/source/uCEFResponseFilter.pas @@ -185,12 +185,15 @@ uses function cef_response_filter_init_filter(self: PCefResponseFilter): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(True); + TempResult := True; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefResponseFilterOwn) then - Result := Ord(TCefResponseFilterOwn(TempObject).InitFilter()); + TempResult := TCefResponseFilterOwn(TempObject).InitFilter(); + + Result := Ord(TempResult); end; function cef_response_filter_filter( self : PCefResponseFilter; diff --git a/source/uCEFUrlrequestClient.pas b/source/uCEFUrlrequestClient.pas index 8c5cfab7..a61e7e17 100644 --- a/source/uCEFUrlrequestClient.pas +++ b/source/uCEFUrlrequestClient.pas @@ -135,18 +135,21 @@ function cef_url_request_client_get_auth_credentials( self : PCefUrlReq const scheme : PCefString; callback : PCefAuthCallback): Integer; stdcall; var - TempObject : TObject; + TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); - TempObject := CefGetObject(self); + TempResult := False; + TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefUrlrequestClientOwn) then - Result := Ord(TCefUrlrequestClientOwn(TempObject).OnGetAuthCredentials(isProxy <> 0, + TempResult := TCefUrlrequestClientOwn(TempObject).OnGetAuthCredentials(isProxy <> 0, CefString(host), port, CefString(realm), CefString(scheme), - TCefAuthCallbackRef.UnWrap(callback))); + TCefAuthCallbackRef.UnWrap(callback)); + + Result := Ord(TempResult); end; diff --git a/source/uCEFWriteHandler.pas b/source/uCEFWriteHandler.pas index d5b8ded7..004d38f3 100644 --- a/source/uCEFWriteHandler.pas +++ b/source/uCEFWriteHandler.pas @@ -128,12 +128,15 @@ end; function cef_write_handler_may_block(self: PCefWriteHandler): Integer; stdcall; var TempObject : TObject; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefWriteHandlerOwn) then - Result := Ord(TCefWriteHandlerOwn(TempObject).MayBlock); + TempResult := TCefWriteHandlerOwn(TempObject).MayBlock; + + Result := Ord(TempResult); end; constructor TCefWriteHandlerOwn.Create; diff --git a/source/uCEFv8Accessor.pas b/source/uCEFv8Accessor.pas index 9ef8794f..d6b0fac3 100644 --- a/source/uCEFv8Accessor.pas +++ b/source/uCEFv8Accessor.pas @@ -51,8 +51,9 @@ var TempException : ustring; TempReturnValue : ICefv8Value; TempRecObject : ICefv8Value; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefV8AccessorOwn) then @@ -61,10 +62,10 @@ begin TempException := ''; TempReturnValue := nil; - Result := Ord(TCefV8AccessorOwn(TempObject).Get(CefString(name), + TempResult := TCefV8AccessorOwn(TempObject).Get(CefString(name), TempRecObject, TempReturnValue, - TempException)); + TempException); retval := CefGetData(TempReturnValue); @@ -77,6 +78,8 @@ begin TempRecObject := nil; TempReturnValue := nil; end; + + Result := Ord(TempResult); end; function cef_v8_accessor_set( self : PCefV8Accessor; @@ -89,8 +92,9 @@ var TempException : ustring; TempValue : ICefv8Value; TempRecObject : ICefv8Value; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefV8AccessorOwn) then @@ -99,10 +103,10 @@ begin TempValue := TCefv8ValueRef.UnWrap(value); TempException := ''; - Result := Ord(TCefV8AccessorOwn(TempObject).Set_(CefString(name), + TempResult := TCefV8AccessorOwn(TempObject).Set_(CefString(name), TempRecObject, TempValue, - TempException)); + TempException); if (exception <> nil) then begin @@ -113,6 +117,8 @@ begin TempRecObject := nil; TempValue := nil; end; + + Result := Ord(TempResult); end; // TCefV8AccessorOwn diff --git a/source/uCEFv8Handler.pas b/source/uCEFv8Handler.pas index 20b87193..d5ed0018 100644 --- a/source/uCEFv8Handler.pas +++ b/source/uCEFv8Handler.pas @@ -93,8 +93,9 @@ var TempException : ustring; TempObject : TObject; TempRecObject : ICefv8Value; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefv8HandlerOwn) then @@ -116,11 +117,11 @@ begin end; end; - Result := Ord(TCefv8HandlerOwn(TempObject).Execute(CefString(name), + TempResult := TCefv8HandlerOwn(TempObject).Execute(CefString(name), TempRecObject, TempArgs, TempReturnValue, - TempException)); + TempException); retval := CefGetData(TempReturnValue); @@ -140,6 +141,8 @@ begin TempRecObject := nil; TempReturnValue := nil; end; + + Result := Ord(TempResult); end; function TCefv8HandlerRef.Execute(const name : ustring; diff --git a/source/uCEFv8Interceptor.pas b/source/uCEFv8Interceptor.pas index e120cbc2..8132732f 100644 --- a/source/uCEFv8Interceptor.pas +++ b/source/uCEFv8Interceptor.pas @@ -60,8 +60,9 @@ var TempException : ustring; TempReturnValue : ICefv8Value; TempRecObject : ICefv8Value; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; retval := nil; TempObject := CefGetObject(self); @@ -71,10 +72,10 @@ begin TempException := ''; TempReturnValue := nil; - Result := Ord(TCefV8InterceptorOwn(TempObject).GetByName(CefString(name), + TempResult := TCefV8InterceptorOwn(TempObject).GetByName(CefString(name), TempRecObject, TempReturnValue, - TempException)); + TempException); retval := CefGetData(TempReturnValue); @@ -87,6 +88,8 @@ begin TempRecObject := nil; TempReturnValue := nil; end; + + Result := Ord(TempResult); end; function cef_v8_interceptor_get_byindex( self : PCefV8Interceptor; @@ -99,8 +102,9 @@ var TempException : ustring; TempReturnValue : ICefv8Value; TempRecObject : ICefv8Value; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; retval := nil; TempObject := CefGetObject(self); @@ -110,10 +114,10 @@ begin TempException := ''; TempReturnValue := nil; - Result := Ord(TCefV8InterceptorOwn(TempObject).GetByIndex(index, + TempResult := TCefV8InterceptorOwn(TempObject).GetByIndex(index, TempRecObject, TempReturnValue, - TempException)); + TempException); retval := CefGetData(TempReturnValue); @@ -126,6 +130,8 @@ begin TempRecObject := nil; TempReturnValue := nil; end; + + Result := Ord(TempResult); end; function cef_v8_interceptor_set_byname( self : PCefV8Interceptor; @@ -138,8 +144,9 @@ var TempException : ustring; TempValue : ICefv8Value; TempRecObject : ICefv8Value; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefV8InterceptorOwn) then @@ -148,10 +155,10 @@ begin TempValue := TCefv8ValueRef.UnWrap(value); TempException := ''; - Result := Ord(TCefV8InterceptorOwn(TempObject).SetByName(CefString(name), + TempResult := TCefV8InterceptorOwn(TempObject).SetByName(CefString(name), TempRecObject, TempValue, - TempException)); + TempException); if (exception <> nil) then begin @@ -162,6 +169,8 @@ begin TempRecObject := nil; TempValue := nil; end; + + Result := Ord(TempResult); end; function cef_v8_interceptor_set_byindex(self : PCefV8Interceptor; @@ -174,8 +183,9 @@ var TempException : ustring; TempValue : ICefv8Value; TempRecObject : ICefv8Value; + TempResult : boolean; begin - Result := Ord(False); + TempResult := False; TempObject := CefGetObject(self); if (TempObject <> nil) and (TempObject is TCefV8InterceptorOwn) then @@ -184,10 +194,10 @@ begin TempValue := TCefv8ValueRef.UnWrap(value); TempException := ''; - Result := Ord(TCefV8InterceptorOwn(TempObject).SetByIndex(index, + TempResult := TCefV8InterceptorOwn(TempObject).SetByIndex(index, TempRecObject, TempValue, - TempException)); + TempException); if (exception <> nil) then begin @@ -198,6 +208,8 @@ begin TempRecObject := nil; TempValue := nil; end; + + Result := Ord(TempResult); end; // TCefV8InterceptorOwn diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 7a9733ef..7d3aaa3b 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,7 +2,7 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 837, + "InternalVersion" : 838, "Name" : "cef4delphi_lazarus.lpk", "Version" : "143.0.13" }