插件接口调整；修正一处崩溃的问题

wengu0 · Sep 4, 2021 · 9f00e95 · 9f00e95
1 parent 509818e
commit 9f00e95
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/PluginDemo/PluginDemo.cpp b/PluginDemo/PluginDemo.cpp
@@ -70,10 +70,10 @@ const wchar_t* CPluginDemo::GetInfo(PluginInfoIndex index)
     return L"";
 }
 
-ITMPlugin::OptionReturn CPluginDemo::ShowOptionsDialog(HWND hParent)
+ITMPlugin::OptionReturn CPluginDemo::ShowOptionsDialog(void* hParent)
 {
     AFX_MANAGE_STATE(AfxGetStaticModuleState());
-    COptionsDlg dlg(CWnd::FromHandle(hParent));
+    COptionsDlg dlg(CWnd::FromHandle((HWND)hParent));
     dlg.m_data = CDataManager::Instance().m_setting_data;
     if (dlg.DoModal() == IDOK)
     {

diff --git a/PluginDemo/PluginDemo.h b/PluginDemo/PluginDemo.h
@@ -16,7 +16,7 @@ class CPluginDemo : public ITMPlugin
     virtual IPluginItem* GetItem(int index) override;
     virtual void DataRequired() override;
     virtual const wchar_t* GetInfo(PluginInfoIndex index) override;
-    virtual OptionReturn ShowOptionsDialog(HWND hParent) override;
+    virtual OptionReturn ShowOptionsDialog(void* hParent) override;
 
 private:
     CPluginSystemDate m_system_date;

diff --git a/TrafficMonitor/PluginInfoDlg.cpp b/TrafficMonitor/PluginInfoDlg.cpp
@@ -33,8 +33,8 @@ void CPluginInfoDlg::ShowInfo()
     if (m_cur_index >= 0 && m_cur_index < static_cast<int>(theApp.m_plugins.GetPlugins().size()))
     {
         auto& plugin_info = theApp.m_plugins.GetPlugins()[m_cur_index];
-        m_info_list.SetItemText(RI_NAME, 1, plugin_info.properties.at(ITMPlugin::TMI_NAME).c_str());
-        m_info_list.SetItemText(RI_DESCRIPTION, 1, plugin_info.properties.at(ITMPlugin::TMI_DESCRIPTION).c_str());
+        m_info_list.SetItemText(RI_NAME, 1, plugin_info.Property(ITMPlugin::TMI_NAME).c_str());
+        m_info_list.SetItemText(RI_DESCRIPTION, 1, plugin_info.Property(ITMPlugin::TMI_DESCRIPTION).c_str());
         m_info_list.SetItemText(RI_FILE_NAME, 1, CFilePathHelper(plugin_info.file_path).GetFileName().c_str());
         m_info_list.SetItemText(RI_FILE_PATH, 1, plugin_info.file_path.c_str());
         m_info_list.SetItemText(RI_ITEM_NUM, 1, std::to_wstring(plugin_info.plugin_items.size()).c_str());
@@ -54,9 +54,9 @@ void CPluginInfoDlg::ShowInfo()
         }
         m_info_list.SetItemText(RI_ITEM_NAMES, 1, item_names.c_str());
         m_info_list.SetItemText(RI_ITEM_ID, 1, item_id.c_str());
-        m_info_list.SetItemText(RI_AUTHOR, 1, plugin_info.properties.at(ITMPlugin::TMI_AUTHOR).c_str());
-        m_info_list.SetItemText(RI_COPYRIGHT, 1, plugin_info.properties.at(ITMPlugin::TMI_COPYRIGHT).c_str());
-        m_info_list.SetItemText(RI_VERSION, 1, plugin_info.properties.at(ITMPlugin::TMI_VERSION).c_str());
+        m_info_list.SetItemText(RI_AUTHOR, 1, plugin_info.Property(ITMPlugin::TMI_AUTHOR).c_str());
+        m_info_list.SetItemText(RI_COPYRIGHT, 1, plugin_info.Property(ITMPlugin::TMI_COPYRIGHT).c_str());
+        m_info_list.SetItemText(RI_VERSION, 1, plugin_info.Property(ITMPlugin::TMI_VERSION).c_str());
         if (plugin_info.plugin != nullptr)
             m_info_list.SetItemText(RI_API_VERSION, 1, std::to_wstring(plugin_info.plugin->GetAPIVersion()).c_str());
     }

diff --git a/TrafficMonitor/PluginManager.cpp b/TrafficMonitor/PluginManager.cpp
@@ -123,3 +123,11 @@ int CPluginManager::GetItemIndex(IPluginItem* item) const
     }
     return -1;
 }
+
+std::wstring CPluginManager::PluginInfo::Property(ITMPlugin::PluginInfoIndex index) const
+{
+    auto iter = properties.find(index);
+    if (iter != properties.end())
+        return iter->second;
+    return wstring();
+}
diff --git a/TrafficMonitor/PluginManager.h b/TrafficMonitor/PluginManager.h
@@ -27,6 +27,7 @@ class CPluginManager
         PluginState state{};    //插件的状态
         DWORD error_code{};     //错误代码（GetLastError的返回值）
         std::map<ITMPlugin::PluginInfoIndex, std::wstring> properties;    //插件属性
+        std::wstring Property(ITMPlugin::PluginInfoIndex) const;
     };
 
     CPluginManager();

diff --git a/TrafficMonitor/PluginManagerDlg.cpp b/TrafficMonitor/PluginManagerDlg.cpp
@@ -115,7 +115,7 @@ BOOL CPluginManagerDlg::OnInitDialog()
         }
         int index = m_list_ctrl.GetItemCount();
         m_list_ctrl.InsertItem(index, file_name.c_str());
-        m_list_ctrl.SetItemText(index, 1, plugin.properties.at(ITMPlugin::TMI_NAME).c_str());
+        m_list_ctrl.SetItemText(index, 1, plugin.Property(ITMPlugin::TMI_NAME).c_str());
         m_list_ctrl.SetItemText(index, 2, status);
     }
 

diff --git a/include/PluginInterface.h b/include/PluginInterface.h
@@ -84,7 +84,7 @@ class ITMPlugin
     * 此函数不一定要重写。如果插件提供了选项设置界面，则应该重写此函数，并在最后返回OR_OPTION_CHANGED或OR_OPTION_UNCHANGED。
     * 返回值为OR_OPTION_NOT_PRVIDED则认为插件不提供选项设置对话框。
     */
-    virtual OptionReturn ShowOptionsDialog(HWND hParent) { return OR_OPTION_NOT_PROVIDED; };
+    virtual OptionReturn ShowOptionsDialog(void* hParent) { return OR_OPTION_NOT_PROVIDED; };
 
     //插件信息的索引
     enum PluginInfoIndex