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

---
 plugins/Folders/src/folders.cpp | 18 ++++++++++++++----
 plugins/Folders/src/stdafx.h    |  4 +---
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'plugins/Folders/src')

diff --git a/plugins/Folders/src/folders.cpp b/plugins/Folders/src/folders.cpp
index 85061f5f38..77045afff7 100644
--- a/plugins/Folders/src/folders.cpp
+++ b/plugins/Folders/src/folders.cpp
@@ -25,7 +25,9 @@ int &hLangpack(g_plugin.m_hLang);
 
 OBJLIST<CFolderItem> lstRegisteredFolders(10, PtrKeySortT);
 
-PLUGININFOEX pluginInfo = {
+/////////////////////////////////////////////////////////////////////////////////////////
+
+PLUGININFOEX pluginInfoEx = {
 	sizeof(PLUGININFOEX),
 	__PLUGIN_NAME,
 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
@@ -35,17 +37,23 @@ PLUGININFOEX pluginInfo = {
 	__AUTHORWEB,
 	UNICODE_AWARE,
 	// {2F129563-2C7D-4A9A-B948-97DFCC0AFDD7}
-	{ 0x2f129563, 0x2c7d, 0x4a9a, { 0xb9, 0x48, 0x97, 0xdf, 0xcc, 0x0a, 0xfd, 0xd7 } }
+	{0x2f129563, 0x2c7d, 0x4a9a, {0xb9, 0x48, 0x97, 0xdf, 0xcc, 0x0a, 0xfd, 0xd7}}
 };
 
+CMPlugin::CMPlugin() :
+	PLUGIN<CMPlugin>(ModuleName, pluginInfoEx)
+{}
+
 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
-	return &pluginInfo;
+	return &pluginInfoEx;
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
 extern "C" __declspec(dllexport) int Load(void)
 {
-	mir_getLP(&pluginInfo);
+	mir_getLP(&pluginInfoEx);
 
 	InitServices();
 	InitEvents();
@@ -53,6 +61,8 @@ extern "C" __declspec(dllexport) int Load(void)
 	return 0;
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
 extern "C" __declspec(dllexport) int Unload()
 {
 	DestroyEvents();
diff --git a/plugins/Folders/src/stdafx.h b/plugins/Folders/src/stdafx.h
index e78ab16a32..a3352f491b 100644
--- a/plugins/Folders/src/stdafx.h
+++ b/plugins/Folders/src/stdafx.h
@@ -58,9 +58,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
-	CMPlugin() :
-		PLUGIN<CMPlugin>(ModuleName)
-	{}
+	CMPlugin();
 };
 
 extern OBJLIST<CFolderItem> lstRegisteredFolders;
-- 
cgit v1.2.3