Diff to HTML by rtfpessoa

Files changed (6) hide show

{baseline/home/runner/work/ThunderTools/ThunderTools/ghpages_baseline/PluginSkeletonGenerator/master/latest_raw/OutOfProcessConfigPreconditions → generated/artifacts/PluginSkeleton-OutOfProcessConfigPreconditions}/CMakeLists.txt +2 -0
{baseline/home/runner/work/ThunderTools/ThunderTools/ghpages_baseline/PluginSkeletonGenerator/master/latest_raw/OutOfProcessConfigPreconditions → generated/artifacts/PluginSkeleton-OutOfProcessConfigPreconditions}/Module.h +1 -0
{baseline/home/runner/work/ThunderTools/ThunderTools/ghpages_baseline/PluginSkeletonGenerator/master/latest_raw/OutOfProcessConfigPreconditions → generated/artifacts/PluginSkeleton-OutOfProcessConfigPreconditions}/OutOfProcessConfigPreconditions.cpp +20 -32
{baseline/home/runner/work/ThunderTools/ThunderTools/ghpages_baseline/PluginSkeletonGenerator/master/latest_raw/OutOfProcessConfigPreconditions → generated/artifacts/PluginSkeleton-OutOfProcessConfigPreconditions}/OutOfProcessConfigPreconditions.h +16 -20
{baseline/home/runner/work/ThunderTools/ThunderTools/ghpages_baseline/PluginSkeletonGenerator/master/latest_raw/OutOfProcessConfigPreconditions → generated/artifacts/PluginSkeleton-OutOfProcessConfigPreconditions}/OutOfProcessConfigPreconditionsImplementation.cpp +63 -58
{baseline/home/runner/work/ThunderTools/ThunderTools/ghpages_baseline/PluginSkeletonGenerator/master/latest_raw/OutOfProcessConfigPreconditions → generated/artifacts/PluginSkeleton-OutOfProcessConfigPreconditions}/OutOfProcessConfigPreconditionsPlugin.json +1 -1

{baseline/home/runner/work/ThunderTools/ThunderTools/ghpages_baseline/PluginSkeletonGenerator/master/latest_raw/OutOfProcessConfigPreconditions → generated/artifacts/PluginSkeleton-OutOfProcessConfigPreconditions}/CMakeLists.txt RENAMED Viewed

@@ -34,10 +34,11 @@ set(PLUGIN_OUTOFPROCESSCONFIGPRECONDITIONS_EXAMPLE "Example Text" CACHE STRING "
 if(BUILD_REFERENCE)
     add_definitions(-DBUILD_REFERENCE=${BUILD_REFERENCE})
 endif()
 find_package(${NAMESPACE}Plugins REQUIRED)
+find_package(${NAMESPACE}Definitions REQUIRED)
 find_package(${NAMESPACE}Messaging REQUIRED)
 find_package(CompileSettingsDebug CONFIG REQUIRED)
 add_library(${MODULE_NAME} SHARED
     OutOfProcessConfigPreconditions.cpp
@@ -51,10 +52,11 @@ set_target_properties(${MODULE_NAME} PROPERTIES
 target_link_libraries(${MODULE_NAME}
     PRIVATE
     CompileSettingsDebug::CompileSettingsDebug
     ${NAMESPACE}Plugins::${NAMESPACE}Plugins
+    ${NAMESPACE}Definitions::${NAMESPACE}Definitions
     ${NAMESPACE}Messaging::${NAMESPACE}Messaging)
 target_include_directories(${MODULE_NAME}
     PRIVATE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>)

@@ -24,8 +24,9 @@
 #endif
 #include <core/core.h>
 #include <plugins/plugins.h>
 #include <messaging/messaging.h>
+#include <definitions/definitions.h>
 #undef EXTERNAL
 #define EXTERNAL

@@ -17,46 +17,49 @@
 * limitations under the License.
 */
 #include "OutOfProcessConfigPreconditions.h"
 #include <interfaces/IConfiguration.h>
+#include <interfaces/json/JWifiControl.h>
 namespace Thunder {
 namespace Plugin {
     namespace {
-        static Metadata<OutOfProcessConfigPreconditions>metadata(
+        static Metadata<OutOfProcessConfigPreconditions> metadata(
         // Version
         1, 0, 0,
         // Preconditions
-        {},
+        { subsystem::GRAPHICS},
         // Terminations
-        {},
+        { subsystem::NOT_GRAPHICS},
         // Controls
-        {}
+        { subsystem::TIME}
         );
     }
     const string OutOfProcessConfigPreconditions::Initialize(PluginHost::IShell* service) {
         string message;
         ASSERT(_service == nullptr);
         ASSERT(service != nullptr);
-        ASSERT(_implBluetooth == nullptr);
+        ASSERT(_implWifiControl == nullptr);
         ASSERT(_connectionId == 0);
         _service = service;
         _service->AddRef();
         _service->Register(static_cast<RPC::IRemoteConnection::INotification*>(&_notification));
         _service->Register(static_cast<PluginHost::IShell::ICOMLink::INotification*>(&_notification));
-        _implBluetooth = service->Root<Exchange::IBluetooth>(_connectionId, timeout, _T("OutOfProcessConfigPreconditionsImplementation"));
-        if (_implBluetooth == nullptr) {
-            message = _T("Couldn't create instance of _implBluetooth");
+        _implWifiControl = service->Root<Exchange::IWifiControl>(_connectionId, timeout, _T("OutOfProcessConfigPreconditionsImplementation"));
+        if (_implWifiControl == nullptr) {
+            message = _T("Couldn't create instance of _implWifiControl");
         } else {
-            Exchange::IConfiguration* configuration = _implBluetooth->QueryInterface<Exchange::IConfiguration>();
+            _implWifiControl->Register(&_notification);
+            Exchange::JWifiControl::Register(*this, _implWifiControl);
+            Exchange::IConfiguration* configuration = _implWifiControl->QueryInterface<Exchange::IConfiguration>();
             ASSERT(configuration != nullptr);
             if (configuration != nullptr) {
                 if (configuration->Configure(service) != Core::ERROR_NONE) {
                     message = _T("OutOfProcessConfigPreconditions could not be configured.");
                 }
@@ -72,15 +75,17 @@ namespace Plugin {
         ASSERT(_service == service);
         _service->Unregister(static_cast<RPC::IRemoteConnection::INotification*>(&_notification));
         _service->Unregister(static_cast<PluginHost::IShell::ICOMLink::INotification*>(&_notification));
-        if (_implBluetooth != nullptr) {
+        if (_implWifiControl != nullptr) {
+            Exchange::JWifiControl::Unregister(*this);
+            _implWifiControl->Unregister(&_notification);
             RPC::IRemoteConnection* connection(service->RemoteConnection(_connectionId));
-            VARIABLE_IS_NOT_USED uint32_t result = _implBluetooth->Release();
-            _implBluetooth = nullptr;
+            VARIABLE_IS_NOT_USED uint32_t result = _implWifiControl->Release();
+            _implWifiControl = nullptr;
             ASSERT((result == Core::ERROR_DESTRUCTION_SUCCEEDED) || (result == Core::ERROR_CONNECTION_CLOSED));
             // The process can disappear in the meantime...
             if (connection != nullptr) {
@@ -109,34 +114,17 @@ namespace Plugin {
         }
     }
     void OutOfProcessConfigPreconditions::Dangling(const Core::IUnknown* remote, const uint32_t interfaceId) {
         ASSERT(remote != nullptr);
-        if (interfaceId == Exchange::IBluetooth::INotification::ID) {
-            auto* revokedInterface = remote->QueryInterface<Exchange::IBluetooth::INotification>();
+        if (interfaceId == Exchange::IWifiControl::INotification::ID) {
+            auto* revokedInterface = remote->QueryInterface<Exchange::IWifiControl::INotification>();
             if (revokedInterface) {
-                _implBluetooth->Unregister(revokedInterface);
+                _implWifiControl->Unregister(const_cast<Exchange::IWifiControl::INotification*>(revokedInterface));
                 revokedInterface->Release();
             }
         }
-    }
-    if (interfaceId == Exchange::IBluetooth::INotification::ID) {
-        auto* revokedInterface = remote->QueryInterface<Exchange::IBluetooth::INotification>();
-        if (revokedInterface) {
-            _implBluetooth->Unregister(revokedInterface);
-            revokedInterface->Release();
-        }
-    }
-}
-if (interfaceId == Exchange::IBluetooth::INotification::ID) {
-    auto* revokedInterface = remote->QueryInterface<Exchange::IBluetooth::INotification>();
-    if (revokedInterface) {
-        _implBluetooth->Unregister(revokedInterface);
-        revokedInterface->Release();
     }
-}
-}
 } // Plugin
 } // Thunder

@@ -18,46 +18,47 @@
 */
 #pragma once
 #include "Module.h"
-#include <Y/IBluetooth.h>
+#include <interfaces/IWifiControl.h>
+#include <interfaces/json/JWifiControl.h>
 namespace Thunder {
 namespace Plugin {
-    class OutOfProcessConfigPreconditions : public PluginHost::IPlugin {
+    class OutOfProcessConfigPreconditions : public PluginHost::IPlugin, public PluginHost::JSONRPC {
     public:
         OutOfProcessConfigPreconditions(const OutOfProcessConfigPreconditions&) = delete;
         OutOfProcessConfigPreconditions& operator=(const OutOfProcessConfigPreconditions&) = delete;
         OutOfProcessConfigPreconditions(OutOfProcessConfigPreconditions&&) = delete;
         OutOfProcessConfigPreconditions& operator=(OutOfProcessConfigPreconditions&&) = delete;
         OutOfProcessConfigPreconditions()
             : PluginHost::IPlugin()
+            , PluginHost::JSONRPC()
             , _service(nullptr)
             , _connectionId(0)
-            , _implBluetooth(nullptr)
+            , _implWifiControl(nullptr)
             , _notification(*this)
         {
         }
         ~OutOfProcessConfigPreconditions() override = default;
-        class Notification : public RPC::IRemoteConnection::INotification, public PluginHost::IShell::ICOMLink::INotification, public Exchange::IBluetooth::INotification, public Exchange::IBluetooth::INotification, public Exchange::IBluetooth::INotification {
+    private:
+        class Notification : public RPC::IRemoteConnection::INotification, public PluginHost::IShell::ICOMLink::INotification, public Exchange::IWifiControl::INotification {
         public:
             Notification(const Notification&) = delete;
             Notification& operator=(const Notification&) = delete;
             Notification(Notification&&) = delete;
             Notification& operator=(Notification&&) = delete;
             Notification() = delete;
             explicit Notification(OutOfProcessConfigPreconditions& parent)
                 : RPC::IRemoteConnection::INotification()
                 , PluginHost::IShell::ICOMLink::INotification()
-                , Exchange::IBluetooth::INotification()
-                , Exchange::IBluetooth::INotification()
-                , Exchange::IBluetooth::INotification()
+                , Exchange::IWifiControl::INotification()
                 , _parent(parent)
             {
             }
             ~Notification() override = default;
@@ -71,26 +72,20 @@ namespace Plugin {
             }
             void Dangling(const Core::IUnknown* remote, const uint32_t interfaceId) override {
                 _parent.Dangling(remote, interfaceId);
             }
-            void Update(IDevice* device) override {
-            }
-            void ScanningStateChanged() override {
-            }
-            void AdvertisingStateChanged() override {
-            }
-            void ScanningStateChanged() override {
+            void NetworkChange() override {
+                Exchange::JWifiControl::Event::NetworkChange(_parent);
             }
-            void InquiryScanningStateChanged() override {
+            void ConnectionChange(const string& ssid) override {
+                Exchange::JWifiControl::Event::ConnectionChange(_parent, ssid);
             }
             BEGIN_INTERFACE_MAP(Notification)
                 INTERFACE_ENTRY(RPC::IRemoteConnection::INotification)
                 INTERFACE_ENTRY(PluginHost::IShell::ICOMLink::INotification)
-                INTERFACE_ENTRY(Exchange::IBluetooth::INotification)
-                INTERFACE_ENTRY(Exchange::IBluetooth::INotification)
-                INTERFACE_ENTRY(Exchange::IBluetooth::INotification)
+                INTERFACE_ENTRY(Exchange::IWifiControl::INotification)
             END_INTERFACE_MAP
         private:
             OutOfProcessConfigPreconditions& _parent;
         };
     public:
@@ -101,19 +96,20 @@ namespace Plugin {
         void Deactivated(RPC::IRemoteConnection* connection);
         void Dangling(const Core::IUnknown* remote, const uint32_t interfaceId);
         BEGIN_INTERFACE_MAP(OutOfProcessConfigPreconditions)
             INTERFACE_ENTRY(PluginHost::IPlugin)
-            INTERFACE_AGGREGATE(Exchange::IBluetooth, _implBluetooth)
+            INTERFACE_ENTRY(PluginHost::IDispatcher)
+            INTERFACE_AGGREGATE(Exchange::IWifiControl, _implWifiControl)
         END_INTERFACE_MAP
     private:
         // Timeout (2000ms) may be changed if necessary, however, it must not exceed RPC::CommunicationTimeOut
         static constexpr uint32_t timeout = 2000;
         PluginHost::IShell* _service;
         uint32_t _connectionId;
-        Exchange::IBluetooth* _implBluetooth;
+        Exchange::IWifiControl* _implWifiControl;
         Core::SinkType<Notification> _notification;
     };
 } // Plugin
 } // Thunder

@@ -16,158 +16,163 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 #include "Module.h"
-#include <Y/IBluetooth.h>
+#include <interfaces/IWifiControl.h>
+#include <interfaces/IConfiguration.h>
 namespace Thunder {
 namespace Plugin {
-    class OutOfProcessConfigPreconditionsImplementation : public Exchange::IBluetooth {
+    class OutOfProcessConfigPreconditionsImplementation : public Exchange::IConfiguration, public Exchange::IWifiControl {
     public:
         OutOfProcessConfigPreconditionsImplementation(const OutOfProcessConfigPreconditionsImplementation&) = delete;
         OutOfProcessConfigPreconditionsImplementation& operator=(const OutOfProcessConfigPreconditionsImplementation&) = delete;
         OutOfProcessConfigPreconditionsImplementation(OutOfProcessConfigPreconditionsImplementation&&) = delete;
         OutOfProcessConfigPreconditionsImplementation& operator=(OutOfProcessConfigPreconditionsImplementation&&) = delete;
         OutOfProcessConfigPreconditionsImplementation()
-            : Exchange::IBluetooth()
+            : Exchange::IWifiControl()
             , _adminLock()
-            , _bluetoothNotification()
+            , _wificontrolNotification()
         {
         }
         ~OutOfProcessConfigPreconditionsImplementation() override = default;
     private:
-        class Config : public Core::JSON::Container {
+        class PluginConfig : public Core::JSON::Container {
         public:
-            Config(const Config&) = delete;
-            Config& operator=(const Config&) = delete;
-            Config(Config&&) = delete;
-            Config& operator=(Config&&) = delete;
+            PluginConfig(const PluginConfig&) = delete;
+            PluginConfig& operator=(const PluginConfig&) = delete;
+            PluginConfig(PluginConfig&&) = delete;
+            PluginConfig& operator=(PluginConfig&&) = delete;
-            Config()
+            PluginConfig()
                 : Core::JSON::Container()
                 , Example()
             {
                 Add(_T("example"), &Example);
             }
-            ~Config() override = default;
+            ~PluginConfig() override = default;
         public:
             Core::JSON::String Example;
         };
     public:
         BEGIN_INTERFACE_MAP(OutOfProcessConfigPreconditionsImplementation)
-            INTERFACE_ENTRY(Exchange::IBluetooth)
+            INTERFACE_ENTRY(Exchange::IConfiguration)
+            INTERFACE_ENTRY(Exchange::IWifiControl)
         END_INTERFACE_MAP
-        // IBluetooth methods
+        // Type aliases copied from interface headers
+        using INetworkInfoIterator = RPC::IIteratorType<NetworkInfo, Exchange::ID_WIFICONTROL_NETWORK_INFO_ITERATOR>;
+        using ISecurityIterator = RPC::IIteratorType<SecurityInfo, Exchange::ID_WIFICONTROL_SECURITY_INFO_ITERATOR>;
+        using IStringIterator = RPC::IIteratorType<string, RPC::ID_STRINGITERATOR>;
-        uint32_t Register(Exchange::IBluetooth::INotification* notification) override {
+        // IWifiControl methods
+        uint32_t Register(Exchange::IWifiControl::INotification* notification) override {
             ASSERT(notification != nullptr);
             _adminLock.Lock();
-            auto item = std::find(_bluetoothNotification.begin(), _bluetoothNotification.end(), notification);
-            ASSERT(item == _bluetoothNotification.end());
+            auto item = std::find(_wificontrolNotification.begin(), _wificontrolNotification.end(), notification);
+            ASSERT(item == _wificontrolNotification.end());
-            if (item == _bluetoothNotification.end()) {
+            if (item == _wificontrolNotification.end()) {
                 notification->AddRef();
-                _bluetoothNotification.push_back(notification);
+                _wificontrolNotification.push_back(notification);
             }
             _adminLock.Unlock();
+            return Core::ERROR_NONE;
         }
-        uint32_t Unregister(const Exchange::IBluetooth::INotification* notification) override {
+        uint32_t Unregister(Exchange::IWifiControl::INotification* notification) override {
             ASSERT(notification != nullptr);
             _adminLock.Lock();
-            auto item = std::find(_bluetoothNotification.begin(), _bluetoothNotification.end(), notification);
-            ASSERT(item != _bluetoothNotification.end());
+            auto item = std::find(_wificontrolNotification.begin(), _wificontrolNotification.end(), notification);
+            ASSERT(item != _wificontrolNotification.end());
-            if (item != _bluetoothNotification.end()) {
-                _bluetoothNotification.erase(item);
+            if (item != _wificontrolNotification.end()) {
+                _wificontrolNotification.erase(item);
                 notification->Release();
             }
             _adminLock.Unlock();
+            return Core::ERROR_NONE;
+        }
+        uint32_t Networks(INetworkInfoIterator*& /* networkInfoList */ /* @out */) const override {
+            return Core::ERROR_NONE;
         }
-        bool IsScanning() const override {
+        uint32_t Securities(const string& /* ssid */ /* @index */, ISecurityIterator*& /* securityMethods */ /* @out */) const override {
             return Core::ERROR_NONE;
         }
-        uint32_t Scan(const bool /* lowEnergy */, const uint16_t /* duration */ /* sec */) override {
+        uint32_t Configs(IStringIterator*& /* configs */ /* @out */) const override {
             return Core::ERROR_NONE;
         }
-        uint32_t StopScanning() override {
+        uint32_t Config(const string& /* ssid */ /* @index */, ConfigInfo& /* configInfo */ /* @out */) const override {
             return Core::ERROR_NONE;
         }
-        IDevice* Device(const string& /* address */, const IDevice::type /* type */) override {
+        uint32_t Config(const string& /* ssid */ /* @index */, const ConfigInfo& /* configInfo */) override {
             return Core::ERROR_NONE;
         }
-        IDevice::IIterator* Devices() override {
+        uint32_t Scan() override {
             return Core::ERROR_NONE;
         }
-        uint32_t ForgetDevice(const string& /* address */, const IDevice::type /* type */) override {
+        uint32_t AbortScan() override {
             return Core::ERROR_NONE;
         }
-    private:
-        using BluetoothNotificationContainer = std::vector<Exchange::IBluetooth::INotification*>;
-        void NotifyUpdate(IDevice* device) const {
-            _adminLock.Lock();
-            for (auto* notification : _bluetoothNotification) {
-                notification->Update(device);
-            }
-            _adminLock.Unlock();
+        uint32_t Connect(const string& /* configSSID */) override {
+            return Core::ERROR_NONE;
         }
-        void NotifyScanningStateChanged() const {
-            _adminLock.Lock();
-            for (auto* notification : _bluetoothNotification) {
-                notification->ScanningStateChanged();
-            }
-            _adminLock.Unlock();
+        uint32_t Disconnect(const string& /* configSSID */) override {
+            return Core::ERROR_NONE;
         }
-        void NotifyAdvertisingStateChanged() const {
-            _adminLock.Lock();
-            for (auto* notification : _bluetoothNotification) {
-                notification->AdvertisingStateChanged();
-            }
-            _adminLock.Unlock();
+        uint32_t Status(string& /* connectedSsid */ /* @out */, bool& /* isScanning */ /* @out */) const override {
+            return Core::ERROR_NONE;
         }
-        void NotifyScanningStateChanged() const {
+        uint32_t Configure(PluginHost::IShell* service) override {
+            ASSERT(service != nullptr);
+            PluginConfig config;
+            config.FromString(service->ConfigLine());
+            TRACE(Trace::Information, (_T("This is just an example: [%s]"), config.Example.Value().c_str()));
+            return Core::ERROR_NONE;
+        }
+    private:
+        using WifiControlNotificationContainer = std::vector<Exchange::IWifiControl::INotification*>;
+        void NotifyNetworkChange() const {
             _adminLock.Lock();
-            for (auto* notification : _bluetoothNotification) {
-                notification->ScanningStateChanged();
+            for (auto* notification : _wificontrolNotification) {
+                notification->NetworkChange();
             }
             _adminLock.Unlock();
         }
-        void NotifyInquiryScanningStateChanged() const {
+        void NotifyConnectionChange(const string& ssid) const {
             _adminLock.Lock();
-            for (auto* notification : _bluetoothNotification) {
-                notification->InquiryScanningStateChanged();
+            for (auto* notification : _wificontrolNotification) {
+                notification->ConnectionChange(ssid);
             }
             _adminLock.Unlock();
         }
         mutable Core::CriticalSection _adminLock;
-        BluetoothNotificationContainer _bluetoothNotification;
+        WifiControlNotificationContainer _wificontrolNotification;
     };
     SERVICE_REGISTRATION(OutOfProcessConfigPreconditionsImplementation, 1, 0)
 } // Plugin
 } // Thunder

@@ -24,8 +24,8 @@
         }
       }
     }
   },
   "interface": {
-    "$cppref": "{cppinterfacedir}/IBluetooth.h"
+    "$cppref": "{cppinterfacedir}/IWifiControl.h"
   }
 }