Skip to content

[R4_4] Update Thunder for generators backport #2117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sebaszm wants to merge 7 commits into
base: R4_4
Choose a base branch
from
Open

[R4_4] Update Thunder for generators backport #2117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
93bef47
Adjust code to work with upgraded tools
sebaszm Mar 24, 2026
62c7efd
port index in notifications
sebaszm Apr 30, 2026
db2bcf8
bw compatibility for old status listener code
sebaszm May 5, 2026
c93b889
Status has optional index!
sebaszm May 6, 2026
c3c3b18
Merge branch 'R4_4' into development/adjust-to-tools-update
sebaszm May 8, 2026
e3f26ed
COM add Channel accessor
sebaszm May 14, 2026
eca6162
COM add unknonw accessor
sebaszm May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Source/com/ICOM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
#include "Ids.h"
#include "IIteratorType.h"

// @stubgen:include "IIteratorType.h"
// @insert "IIteratorType.h"
// @insert "Ids.h"

namespace WPEFramework {
namespace RPC {
Expand Down
12 changes: 10 additions & 2 deletions Source/com/IUnknown.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,10 @@ namespace ProxyStub {
{
return (_implementation);
}
// Required by proxystubs!
const Core::ProxyType<Core::IPCChannel>& Channel() const {
return (_channel);
}

// -------------------------------------------------------------------------------------------------------------------------------
// Proxy environment calls
Expand All @@ -332,7 +336,7 @@ namespace ProxyStub {

uint32_t Invoke(Core::ProxyType<RPC::InvokeMessage>& message, const uint32_t waitTime = RPC::CommunicationTimeOut) const;

inline uint32_t Complete(const Core::instance_id& impl, const uint32_t id, const RPC::Data::Output::mode how)
inline uint32_t Complete(const Core::instance_id& impl, const uint32_t id, const RPC::Data::Output::mode how) const
{
// This method is called from the stubs.
uint32_t result = Core::ERROR_NONE;
Expand Down Expand Up @@ -469,6 +473,10 @@ namespace ProxyStub {
{
return(&_unknown);
}
const UnknownProxy* Administration() const
{
return(&_unknown);
}

// -------------------------------------------------------------------------------------------------------------------------------
// Proxy environment calls
Expand All @@ -485,7 +493,7 @@ namespace ProxyStub {
{
return (_unknown.Interface(implementation, id));
}
uint32_t Complete(const Core::instance_id& instance, const uint32_t id, const RPC::Data::Output::mode how)
uint32_t Complete(const Core::instance_id& instance, const uint32_t id, const RPC::Data::Output::mode how) const
{
return (_unknown.Complete(instance, id, how));
}
Expand Down
5 changes: 5 additions & 0 deletions Source/core/Services.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,11 @@ namespace Core {
mutable uint32_t _referenceCount;
};

template <typename TYPE>
Copy link
Copy Markdown
Contributor

@MFransen69 MFransen69 May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haha, that is much smarter then adjusting all code :)

using SinkType = Sink<TYPE>;

template <typename TYPE>
using ServiceType = Service<TYPE>;

// Baseclass to turn objects into services
template <typename ACTUALSERVICE>
Expand Down
10 changes: 5 additions & 5 deletions Source/plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ string(TOLOWER ${NAMESPACE} NAMESPACE_LIB)

option(VIRTUALINPUT_TOOLS "Build VirtualInput tools" OFF)

ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IPlugin.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IShell.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IPlugin.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/..")
ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IShell.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/..")
ProxyStubGenerator(NAMESPACE "WPEFramework::Exchange" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IController.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/..")
ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IControllerDeprecated.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/..")
ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IStateControl.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ISubSystem.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IDispatcher.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IStateControl.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/..")
ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ISubSystem.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/..")
ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IDispatcher.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/..")

JsonGenerator(CODE NAMESPACE WPEFramework::Exchange::Controller INPUT ${CMAKE_CURRENT_SOURCE_DIR}/IController.h OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated/jsonrpc" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." NO_INCLUDES LEGACY_ALT)

Expand Down
4 changes: 2 additions & 2 deletions Source/plugins/IController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ namespace Controller {

// @brief Starts the network discovery. Use this method to initiate SSDP network discovery process.
// @param TTL (time to live) parameter for SSDP discovery
virtual Core::hresult StartDiscovery(const uint8_t& ttl) = 0;
virtual Core::hresult StartDiscovery(const uint8_t& ttl /* @optional @default:1 */) = 0;

// @property
// @brief Provides SSDP network discovery results.
Expand Down Expand Up @@ -124,7 +124,7 @@ namespace Controller {
virtual Core::hresult Proxies(string& response /* @out @opaque */) const = 0;
// @property
// @brief Provides status of a plugin, including their configurations
virtual Core::hresult Status(const string& index /* @index */, string& response /* @out @opaque */) const = 0;
virtual Core::hresult Status(const string& index /* @index @optional */, string& response /* @out @opaque */) const = 0;
// @property
// @brief Provides active connection details
virtual Core::hresult Links(string& response /* @out @opaque */) const = 0;
Expand Down
Loading
Loading