From e5bc3c9255b9ca53b27e63b72811790806093655 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 3 Oct 2024 12:37:11 -0400 Subject: [PATCH] Update generated files for void* return value (see #3591) --- libcef_dll/cpptoc/binary_value_cpptoc.cc | 7 +++---- libcef_dll/cpptoc/shared_memory_region_cpptoc.cc | 7 +++---- .../cpptoc/shared_process_message_builder_cpptoc.cc | 8 +++++--- libcef_dll/cpptoc/v8value_cpptoc.cc | 7 +++---- libcef_dll/ctocpp/binary_value_ctocpp.cc | 5 ++--- libcef_dll/ctocpp/shared_memory_region_ctocpp.cc | 7 +++---- .../ctocpp/shared_process_message_builder_ctocpp.cc | 8 +++++--- libcef_dll/ctocpp/v8value_ctocpp.cc | 5 ++--- 8 files changed, 26 insertions(+), 28 deletions(-) diff --git a/libcef_dll/cpptoc/binary_value_cpptoc.cc b/libcef_dll/cpptoc/binary_value_cpptoc.cc index 1399e0273..4e15b85e7 100644 --- a/libcef_dll/cpptoc/binary_value_cpptoc.cc +++ b/libcef_dll/cpptoc/binary_value_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e4cad5e75e1837d5d68c936e71b919e1702afad9$ +// $hash=a5ca27729a570de0318a9d15416fee153afaec32$ // #include "libcef_dll/cpptoc/binary_value_cpptoc.h" @@ -145,14 +145,13 @@ const void* CEF_CALLBACK binary_value_get_raw_data(struct _cef_binary_value_t* self) { shutdown_checker::AssertNotShutdown(); + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + DCHECK(self); if (!self) { return NULL; } - // This manual implementation can be removed once support for 'const void*' - // is integrated into the CEF translator tool (issue #3591). - // Execute const void* _retval = CefBinaryValueCppToC::Get(self)->GetRawData(); diff --git a/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc b/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc index c32a9bfc5..724a05b16 100644 --- a/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc +++ b/libcef_dll/cpptoc/shared_memory_region_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=d9074b7c1500d594cc88a4eedb68d9d31c5f5018$ +// $hash=fd37d01fdcf8c3de25e36d428ca38781c4749586$ // #include "libcef_dll/cpptoc/shared_memory_region_cpptoc.h" @@ -60,14 +60,13 @@ void* CEF_CALLBACK shared_memory_region_memory(struct _cef_shared_memory_region_t* self) { shutdown_checker::AssertNotShutdown(); + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + DCHECK(self); if (!self) { return NULL; } - // This manual implementation can be removed once support for 'void*' - // is integrated into the CEF translator tool (issue #3591). - // Execute void* _retval = CefSharedMemoryRegionCppToC::Get(self)->Memory(); diff --git a/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.cc b/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.cc index 208b9bbb7..24d626750 100644 --- a/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.cc +++ b/libcef_dll/cpptoc/shared_process_message_builder_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=592d43a6597f03f91eb13ea9354ed552f581ebec$ +// $hash=fb7e4b1912656da200ed1dd614a9f03e7d5f8ce7$ // #include "libcef_dll/cpptoc/shared_process_message_builder_cpptoc.h" @@ -84,15 +84,17 @@ void* CEF_CALLBACK shared_process_message_builder_memory( struct _cef_shared_process_message_builder_t* self) { shutdown_checker::AssertNotShutdown(); + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + DCHECK(self); if (!self) { - return 0; + return NULL; } // Execute void* _retval = CefSharedProcessMessageBuilderCppToC::Get(self)->Memory(); - // Return type: simple + // Return type: simple_byaddr return _retval; } diff --git a/libcef_dll/cpptoc/v8value_cpptoc.cc b/libcef_dll/cpptoc/v8value_cpptoc.cc index 78389e362..88b5a7052 100644 --- a/libcef_dll/cpptoc/v8value_cpptoc.cc +++ b/libcef_dll/cpptoc/v8value_cpptoc.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=befb2f29af8a0e8eabf745fad126ebad5a741c74$ +// $hash=10ac43c0f16dedaf21bfa55f126f61c4d179abca$ // #include "libcef_dll/cpptoc/v8value_cpptoc.h" @@ -976,14 +976,13 @@ v8value_get_array_buffer_byte_length(struct _cef_v8value_t* self) { } void* CEF_CALLBACK v8value_get_array_buffer_data(struct _cef_v8value_t* self) { + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + DCHECK(self); if (!self) { return NULL; } - // This manual implementation can be removed once support for 'void*' - // is integrated into the CEF translator tool (issue #3591). - // Execute void* _retval = CefV8ValueCppToC::Get(self)->GetArrayBufferData(); diff --git a/libcef_dll/ctocpp/binary_value_ctocpp.cc b/libcef_dll/ctocpp/binary_value_ctocpp.cc index b7d27c196..97778f896 100644 --- a/libcef_dll/ctocpp/binary_value_ctocpp.cc +++ b/libcef_dll/ctocpp/binary_value_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=e5fd79e6dbb20737b5c3a5b6e4bf547336c62398$ +// $hash=8ff0f88b9a33d5c635a0128aef98046c68ddb3ad$ // #include "libcef_dll/ctocpp/binary_value_ctocpp.h" @@ -148,8 +148,7 @@ NO_SANITIZE("cfi-icall") const void* CefBinaryValueCToCpp::GetRawData() { return nullptr; } - // This manual implementation can be removed once support for 'const void*' - // is integrated into the CEF translator tool (issue #3591). + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute const void* _retval = _struct->get_raw_data(_struct); diff --git a/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc b/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc index 906bdcc67..82608071b 100644 --- a/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc +++ b/libcef_dll/ctocpp/shared_memory_region_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=b2e33c91a598c69f92031e0624bf96803247439c$ +// $hash=2ac7389e153471dba2e636363a5fb49a5afb0d3a$ // #include "libcef_dll/ctocpp/shared_memory_region_ctocpp.h" @@ -57,11 +57,10 @@ NO_SANITIZE("cfi-icall") void* CefSharedMemoryRegionCToCpp::Memory() { cef_shared_memory_region_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, memory)) { - return NULL; + return nullptr; } - // This manual implementation can be removed once support for 'void*' - // is integrated into the CEF translator tool (issue #3591). + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute void* _retval = _struct->memory(_struct); diff --git a/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc b/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc index d8898ce0d..886a6204c 100644 --- a/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc +++ b/libcef_dll/ctocpp/shared_process_message_builder_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=da73d238eb11ae25ae64d3373e2357e40a01051a$ +// $hash=b950950a19b7825e808132e616468bb51f8607fb$ // #include "libcef_dll/ctocpp/shared_process_message_builder_ctocpp.h" @@ -82,13 +82,15 @@ NO_SANITIZE("cfi-icall") void* CefSharedProcessMessageBuilderCToCpp::Memory() { cef_shared_process_message_builder_t* _struct = GetStruct(); if (CEF_MEMBER_MISSING(_struct, memory)) { - return NULL; + return nullptr; } + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING + // Execute void* _retval = _struct->memory(_struct); - // Return type: simple + // Return type: simple_byaddr return _retval; } diff --git a/libcef_dll/ctocpp/v8value_ctocpp.cc b/libcef_dll/ctocpp/v8value_ctocpp.cc index b400f6b59..c1a116799 100644 --- a/libcef_dll/ctocpp/v8value_ctocpp.cc +++ b/libcef_dll/ctocpp/v8value_ctocpp.cc @@ -9,7 +9,7 @@ // implementations. See the translator.README.txt file in the tools directory // for more information. // -// $hash=df9571f843ed0e55e581dc6282079803e3641d2c$ +// $hash=8469f8012718df705bf24d8abc2c127d68df07c2$ // #include "libcef_dll/ctocpp/v8value_ctocpp.h" @@ -989,8 +989,7 @@ NO_SANITIZE("cfi-icall") void* CefV8ValueCToCpp::GetArrayBufferData() { return nullptr; } - // This manual implementation can be removed once support for 'void*' - // is integrated into the CEF translator tool (issue #3591). + // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING // Execute void* _retval = _struct->get_array_buffer_data(_struct);