From 51f216f7e0feb67ad21387219c1b90e42b14658d Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 16 May 2018 13:42:19 +0300
Subject: Core plugins => CMPlugin

---
 src/core/stdemail/src/main.cpp | 8 +-------
 src/core/stdemail/src/stdafx.h | 9 ++++++---
 2 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/core/stdemail')

diff --git a/src/core/stdemail/src/main.cpp b/src/core/stdemail/src/main.cpp
index 97ae5aa792..b767444bda 100644
--- a/src/core/stdemail/src/main.cpp
+++ b/src/core/stdemail/src/main.cpp
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 int LoadSendRecvEMailModule(void);
 
-HINSTANCE hInst;
+CMPlugin g_plugin;
 int hLangpack;
 
 PLUGININFOEX pluginInfo = {
@@ -39,12 +39,6 @@ PLUGININFOEX pluginInfo = {
 	{0xb774d10a, 0xc761, 0x11e1, {0x84, 0x05, 0x27, 0xe7, 0x61, 0x88, 0x70, 0x9b }}
 };
 
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
-{
-	hInst = hinstDLL;
-	return TRUE;
-}
-
 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
 	return &pluginInfo;
diff --git a/src/core/stdemail/src/stdafx.h b/src/core/stdemail/src/stdafx.h
index f9505f25a8..e9a3f62ed1 100644
--- a/src/core/stdemail/src/stdafx.h
+++ b/src/core/stdemail/src/stdafx.h
@@ -40,9 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <direct.h>
 #include <malloc.h>
 
-#define __NO_CMPLUGIN_NEEDED
 #include <win2k.h>
-
 #include <m_system.h>
 #include <newpluginapi.h>
 #include <m_utils.h>
@@ -66,4 +64,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../../mir_app/src/resource.h"
 
-extern HINSTANCE hInst;
+struct CMPlugin : public PLUGIN<CMPlugin>
+{
+	CMPlugin() :
+		PLUGIN<CMPlugin>(nullptr)
+	{}
+};
-- 
cgit v1.2.3