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/ICQCorp/src/corp.cpp | 21 ++++++++++++++++++---
 protocols/ICQCorp/src/stdafx.h | 15 +--------------
 2 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'protocols/ICQCorp/src')

diff --git a/protocols/ICQCorp/src/corp.cpp b/protocols/ICQCorp/src/corp.cpp
index e71c55b57b..fb3559bedb 100644
--- a/protocols/ICQCorp/src/corp.cpp
+++ b/protocols/ICQCorp/src/corp.cpp
@@ -26,7 +26,7 @@ char protoName[64];
 CMPlugin g_plugin;
 HNETLIBUSER hNetlibUser;
 
-PLUGININFOEX pluginInfo =
+PLUGININFOEX pluginInfoEx =
 {
 	sizeof(PLUGININFOEX),
 	__PLUGIN_NAME,
@@ -38,9 +38,24 @@ PLUGININFOEX pluginInfo =
 	UNICODE_AWARE
 };
 
+CMPlugin::CMPlugin() :
+	PLUGIN<CMPlugin>(protoName, pluginInfoEx)
+{
+	char fileName[MAX_PATH];
+	GetModuleFileNameA(m_hInst, fileName, MAX_PATH);
+
+	WIN32_FIND_DATAA findData;
+	FindClose(FindFirstFileA(fileName, &findData));
+	findData.cFileName[strlen(findData.cFileName) - 4] = 0;
+	strncpy_s(protoName, findData.cFileName, _TRUNCATE);
+
+	Proto_RegisterModule(PROTOTYPE_PROTOCOL, protoName);
+	Proto_SetUniqueId(protoName, "UIN");
+}
+
 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
-	return &pluginInfo;
+	return &pluginInfoEx;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -52,7 +67,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOC
 
 extern "C" __declspec(dllexport) int Load()
 {
-	mir_getLP(&pluginInfo);
+	mir_getLP(&pluginInfoEx);
 
 	CMStringA szDescr(FORMAT, "%s connection", protoName);
 	NETLIBUSER nlu = {};
diff --git a/protocols/ICQCorp/src/stdafx.h b/protocols/ICQCorp/src/stdafx.h
index d31ba24953..215bb0a9dc 100644
--- a/protocols/ICQCorp/src/stdafx.h
+++ b/protocols/ICQCorp/src/stdafx.h
@@ -59,18 +59,5 @@ extern int UnloadServices();
 
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
-	CMPlugin() :
-		PLUGIN<CMPlugin>(protoName)
-	{
-		char fileName[MAX_PATH];
-		GetModuleFileNameA(m_hInst, fileName, MAX_PATH);
-
-		WIN32_FIND_DATAA findData;
-		FindClose(FindFirstFileA(fileName, &findData));
-		findData.cFileName[strlen(findData.cFileName) - 4] = 0;
-		strncpy_s(protoName, findData.cFileName, _TRUNCATE);
-
-		Proto_RegisterModule(PROTOTYPE_PROTOCOL, protoName);
-		Proto_SetUniqueId(protoName, "UIN");
-	}
+	CMPlugin();
 };
-- 
cgit v1.2.3