From 8a74e7495ce5ad39de4f5c25121a84d35df90c36 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 20 May 2018 15:08:48 +0300
Subject: CMPlugin to receive a reference to PLUGININFOEX
---
protocols/EmLanProto/src/amdproto.cpp | 13 ++++++++++---
protocols/EmLanProto/src/stdafx.h | 7 +------
2 files changed, 11 insertions(+), 9 deletions(-)
(limited to 'protocols/EmLanProto')
diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp
index 43f2bc2c23..b4ed858561 100644
--- a/protocols/EmLanProto/src/amdproto.cpp
+++ b/protocols/EmLanProto/src/amdproto.cpp
@@ -18,7 +18,7 @@ std::fstream emlanLog("EmLanLog.txt", std::ios::out|std::ios::app);
//////////////////////////////////////////////////////////////////////////
-PLUGININFOEX pluginInfo = {
+PLUGININFOEX pluginInfoEx = {
sizeof(PLUGININFOEX),
__PLUGIN_NAME,
PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
@@ -31,9 +31,16 @@ PLUGININFOEX pluginInfo = {
{ 0xe08ce7c4, 0x9eeb, 0x4272, { 0xb5, 0x44, 0xd, 0x32, 0xe1, 0x8d, 0x90, 0xde } }
};
+CMPlugin::CMPlugin() :
+ PLUGIN<CMPlugin>(PROTONAME, pluginInfoEx)
+{
+ RegisterProtocol(PROTOTYPE_PROTOCOL);
+ SetUniqueId("Nick");
+}
+
extern "C" __declspec(dllexport) PLUGININFOEX* __cdecl MirandaPluginInfoEx(DWORD)
{
- return &pluginInfo;
+ return &pluginInfoEx;
}
/////////////////////////////////////////////////////////////////////////////////////////
@@ -328,7 +335,7 @@ INT_PTR CALLBACK EMPDlgProcMessage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
extern "C" int __declspec(dllexport) __cdecl Load()
{
- mir_getLP(&pluginInfo);
+ mir_getLP(&pluginInfoEx);
g_lan = new CMLan();
CreateProtoServiceFunction(PROTONAME, PS_GETCAPS, EMPGetCaps);
diff --git a/protocols/EmLanProto/src/stdafx.h b/protocols/EmLanProto/src/stdafx.h
index 1fc82252ce..30aca9c8a4 100644
--- a/protocols/EmLanProto/src/stdafx.h
+++ b/protocols/EmLanProto/src/stdafx.h
@@ -27,12 +27,7 @@
struct CMPlugin : public PLUGIN<CMPlugin>
{
- CMPlugin() :
- PLUGIN<CMPlugin>(PROTONAME)
- {
- RegisterProtocol(PROTOTYPE_PROTOCOL);
- SetUniqueId("Nick");
- }
+ CMPlugin();
};
//#define VERBOSE
--
cgit v1.2.3