Core plugins => CMPlugin

2 files changed, 7 insertions, 9 deletions

diff --git a/src/core/stdssl/src/main.cpp b/src/core/stdssl/src/main.cpp
index 5cde1cd401..6fb8898d70 100644
--- a/src/core/stdssl/src/main.cpp
+++ b/src/core/stdssl/src/main.cpp
@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 int LoadSslModule(void);

 void UnloadSslModule(void);

 

-HINSTANCE hInst;

+CMPlugin g_plugin;

 int hLangpack;

 

 PLUGININFOEX pluginInfo = {

@@ -40,12 +40,6 @@ PLUGININFOEX pluginInfo = {
 	{ 0x312C4F84, 0x75BE, 0x4404, {0xBC, 0xB1, 0xC1, 0x03, 0xDB, 0xE5, 0xA3, 0xB8 }}

 };

 

-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/stdssl/src/stdafx.h b/src/core/stdssl/src/stdafx.h
index ae3bbd4f13..6221d6c3b4 100644
--- a/src/core/stdssl/src/stdafx.h
+++ b/src/core/stdssl/src/stdafx.h
@@ -32,7 +32,6 @@ typedef struct SslHandle *HSSL;
 

 #include <malloc.h>

 

-#define __NO_CMPLUGIN_NEEDED

 #include <newpluginapi.h>

 #include <m_langpack.h>

 #include <m_netlib.h>

@@ -41,4 +40,9 @@ typedef struct SslHandle *HSSL;
 

 #include "version.h"

 

-extern HINSTANCE g_hInst;

+struct CMPlugin : public PLUGIN<CMPlugin>

+{

+	CMPlugin() :

+		PLUGIN<CMPlugin>(nullptr)

+	{}

+};