From a905c9c3f92fd54f37a5466649ac378db69e7cb0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 28 Mar 2018 14:29:31 +0300 Subject: all protocols rewritten to CMPluginBase --- protocols/ICQCorp/src/corp.cpp | 33 ++++++++++++++++++++------------- protocols/ICQCorp/src/stdafx.h | 1 + 2 files changed, 21 insertions(+), 13 deletions(-) (limited to 'protocols/ICQCorp') diff --git a/protocols/ICQCorp/src/corp.cpp b/protocols/ICQCorp/src/corp.cpp index 2687a3e9fc..4eabd5862c 100644 --- a/protocols/ICQCorp/src/corp.cpp +++ b/protocols/ICQCorp/src/corp.cpp @@ -61,19 +61,6 @@ extern "C" __declspec(dllexport) int Load() { mir_getLP(&pluginInfo); - char fileName[MAX_PATH]; - GetModuleFileNameA(hInstance, fileName, MAX_PATH); - - WIN32_FIND_DATAA findData; - FindClose(FindFirstFileA(fileName, &findData)); - findData.cFileName[strlen(findData.cFileName) - 4] = 0; - strncpy_s(protoName, findData.cFileName, _TRUNCATE); - - PROTOCOLDESCRIPTOR pd = { PROTOCOLDESCRIPTOR_V3_SIZE }; - pd.szName = protoName; - pd.type = PROTOTYPE_PROTOCOL; - Proto_RegisterModule(&pd); - LoadServices(); return 0; } @@ -85,6 +72,26 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) return &pluginInfo; } +///////////////////////////////////////////////////////////////////////////////////////// + +struct CMPlugin : public CMPluginBase +{ + CMPlugin() : + CMPluginBase(protoName) + { + char fileName[MAX_PATH]; + GetModuleFileNameA(hInstance, fileName, MAX_PATH); + + WIN32_FIND_DATAA findData; + FindClose(FindFirstFileA(fileName, &findData)); + findData.cFileName[strlen(findData.cFileName) - 4] = 0; + strncpy_s(protoName, findData.cFileName, _TRUNCATE); + + RegisterProtocol(PROTOTYPE_PROTOCOL); + } +} + g_plugin; + /////////////////////////////////////////////////////////////////////////////// #ifdef _DEBUG diff --git a/protocols/ICQCorp/src/stdafx.h b/protocols/ICQCorp/src/stdafx.h index 5aac37d71e..536858d2f6 100644 --- a/protocols/ICQCorp/src/stdafx.h +++ b/protocols/ICQCorp/src/stdafx.h @@ -37,6 +37,7 @@ #include #include #include +#include #include "user.h" #include "transfer.h" -- cgit v1.2.3