From ca55ac7905e8ffd1ee979b5b5fe7121fa7a03a5d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 28 May 2018 22:38:35 +0300 Subject: all plugins => CMPlugin virtual functions --- src/core/stdautoaway/src/main.cpp | 9 +-------- src/core/stdautoaway/src/stdafx.h | 2 ++ src/core/stdaway/src/main.cpp | 9 +-------- src/core/stdaway/src/stdafx.h | 2 ++ src/core/stdclist/src/init.cpp | 10 +--------- src/core/stdclist/src/stdafx.h | 2 ++ src/core/stdcrypt/src/main.cpp | 9 +-------- src/core/stdcrypt/src/stdafx.h | 2 ++ src/core/stdemail/src/main.cpp | 9 +-------- src/core/stdemail/src/stdafx.h | 2 ++ src/core/stdfile/src/main.cpp | 4 ++-- src/core/stdfile/src/stdafx.h | 3 +++ src/core/stdidle/src/main.cpp | 4 ++-- src/core/stdidle/src/stdafx.h | 3 +++ src/core/stdmsg/src/srmm.cpp | 4 ++-- src/core/stdmsg/src/stdafx.h | 3 +++ src/core/stdssl/src/main.cpp | 4 ++-- src/core/stdssl/src/stdafx.h | 3 +++ src/core/stduihist/src/main.cpp | 9 +-------- src/core/stduihist/src/stdafx.h | 2 ++ src/core/stduserinfo/src/main.cpp | 9 +-------- src/core/stduserinfo/src/stdafx.h | 2 ++ src/core/stduseronline/src/main.cpp | 9 +-------- src/core/stduseronline/src/stdafx.h | 2 ++ 24 files changed, 44 insertions(+), 73 deletions(-) (limited to 'src') diff --git a/src/core/stdautoaway/src/main.cpp b/src/core/stdautoaway/src/main.cpp index 51ce693ead..08cb2a891c 100644 --- a/src/core/stdautoaway/src/main.cpp +++ b/src/core/stdautoaway/src/main.cpp @@ -50,15 +50,8 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_AUTOAW ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" int __declspec(dllexport) Load(void) +int CMPlugin::Load() { LoadAutoAwayModule(); return 0; } - -///////////////////////////////////////////////////////////////////////////////////////// - -extern "C" int __declspec(dllexport) Unload(void) -{ - return 0; -} diff --git a/src/core/stdautoaway/src/stdafx.h b/src/core/stdautoaway/src/stdafx.h index 0587b8148c..6c55b9c1b5 100644 --- a/src/core/stdautoaway/src/stdafx.h +++ b/src/core/stdautoaway/src/stdafx.h @@ -70,4 +70,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct CMPlugin : public PLUGIN { CMPlugin(); + + int Load() override; }; diff --git a/src/core/stdaway/src/main.cpp b/src/core/stdaway/src/main.cpp index f67eefefe2..0efb65c767 100644 --- a/src/core/stdaway/src/main.cpp +++ b/src/core/stdaway/src/main.cpp @@ -50,15 +50,8 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRAWAY ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" int __declspec(dllexport) Load(void) +int CMPlugin::Load() { LoadAwayMsgModule(); return 0; } - -///////////////////////////////////////////////////////////////////////////////////////// - -extern "C" int __declspec(dllexport) Unload(void) -{ - return 0; -} diff --git a/src/core/stdaway/src/stdafx.h b/src/core/stdaway/src/stdafx.h index 3f7ba051e1..89f9b34e02 100644 --- a/src/core/stdaway/src/stdafx.h +++ b/src/core/stdaway/src/stdafx.h @@ -71,4 +71,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct CMPlugin : public PLUGIN { CMPlugin(); + + int Load() override; }; diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp index 6d86619ed9..046273e99d 100644 --- a/src/core/stdclist/src/init.cpp +++ b/src/core/stdclist/src/init.cpp @@ -130,15 +130,7 @@ extern "C" __declspec(dllexport) int CListInitialise() ///////////////////////////////////////////////////////////////////////////////////////// // a plugin loader aware of CList exports will never call this. -extern "C" __declspec(dllexport) int Load(void) +int CMPlugin::Load() { return 1; } - -///////////////////////////////////////////////////////////////////////////////////////// -// a plugin unloader - -extern "C" __declspec(dllexport) int Unload(void) -{ - return 0; -} diff --git a/src/core/stdclist/src/stdafx.h b/src/core/stdclist/src/stdafx.h index f42349b00f..d79f6931ed 100644 --- a/src/core/stdclist/src/stdafx.h +++ b/src/core/stdclist/src/stdafx.h @@ -59,6 +59,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct CMPlugin : public PLUGIN { CMPlugin(); + + int Load() override; }; // shared vars diff --git a/src/core/stdcrypt/src/main.cpp b/src/core/stdcrypt/src/main.cpp index 59c390c3f3..f0677e5f6f 100644 --- a/src/core/stdcrypt/src/main.cpp +++ b/src/core/stdcrypt/src/main.cpp @@ -49,14 +49,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_CRYPTO ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" int __declspec(dllexport) Load(void) +int CMPlugin::Load() { return LoadEncryptionModule(); } - -///////////////////////////////////////////////////////////////////////////////////////// - -extern "C" int __declspec(dllexport) Unload(void) -{ - return 0; -} diff --git a/src/core/stdcrypt/src/stdafx.h b/src/core/stdcrypt/src/stdafx.h index 8cc54ff399..d7138bd206 100644 --- a/src/core/stdcrypt/src/stdafx.h +++ b/src/core/stdcrypt/src/stdafx.h @@ -70,6 +70,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct CMPlugin : public PLUGIN { CMPlugin(); + + int Load() override; }; bool getRandomBytes(BYTE *buf, size_t bufLen); diff --git a/src/core/stdemail/src/main.cpp b/src/core/stdemail/src/main.cpp index dd9c3ae081..abab7cbeff 100644 --- a/src/core/stdemail/src/main.cpp +++ b/src/core/stdemail/src/main.cpp @@ -50,15 +50,8 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SREMAI ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" int __declspec(dllexport) Load(void) +int CMPlugin::Load() { LoadSendRecvEMailModule(); return 0; } - -///////////////////////////////////////////////////////////////////////////////////////// - -extern "C" int __declspec(dllexport) Unload(void) -{ - return 0; -} diff --git a/src/core/stdemail/src/stdafx.h b/src/core/stdemail/src/stdafx.h index aa4037b703..3ffcb003b8 100644 --- a/src/core/stdemail/src/stdafx.h +++ b/src/core/stdemail/src/stdafx.h @@ -67,4 +67,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct CMPlugin : public PLUGIN { CMPlugin(); + + int Load() override; }; diff --git a/src/core/stdfile/src/main.cpp b/src/core/stdfile/src/main.cpp index b4b4146518..d979ecc4a5 100644 --- a/src/core/stdfile/src/main.cpp +++ b/src/core/stdfile/src/main.cpp @@ -52,7 +52,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRFILE ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" int __declspec(dllexport) Load(void) +int CMPlugin::Load() { if ( IsWinVer7Plus()) CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_ALL, IID_ITaskbarList3, (void**)&pTaskbarInterface); @@ -63,7 +63,7 @@ extern "C" int __declspec(dllexport) Load(void) ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" int __declspec(dllexport) Unload(void) +int CMPlugin::Unload() { if (pTaskbarInterface) pTaskbarInterface->Release(); diff --git a/src/core/stdfile/src/stdafx.h b/src/core/stdfile/src/stdafx.h index d763d8ae9a..a55763d694 100644 --- a/src/core/stdfile/src/stdafx.h +++ b/src/core/stdfile/src/stdafx.h @@ -77,6 +77,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct CMPlugin : public PLUGIN { CMPlugin(); + + int Load() override; + int Unload() override; }; extern ITaskbarList3 * pTaskbarInterface; diff --git a/src/core/stdidle/src/main.cpp b/src/core/stdidle/src/main.cpp index 747808bb8e..a77bcba4d3 100644 --- a/src/core/stdidle/src/main.cpp +++ b/src/core/stdidle/src/main.cpp @@ -51,7 +51,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_IDLE, ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" int __declspec(dllexport) Load(void) +int CMPlugin::Load() { LoadIdleModule(); return 0; @@ -59,7 +59,7 @@ extern "C" int __declspec(dllexport) Load(void) ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" int __declspec(dllexport) Unload(void) +int CMPlugin::Unload() { UnloadIdleModule(); return 0; diff --git a/src/core/stdidle/src/stdafx.h b/src/core/stdidle/src/stdafx.h index e313a5d426..1efc351565 100644 --- a/src/core/stdidle/src/stdafx.h +++ b/src/core/stdidle/src/stdafx.h @@ -70,6 +70,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct CMPlugin : public PLUGIN { CMPlugin(); + + int Load() override; + int Unload() override; }; struct Settings diff --git a/src/core/stdmsg/src/srmm.cpp b/src/core/stdmsg/src/srmm.cpp index d5004f291b..97df9cbdbf 100644 --- a/src/core/stdmsg/src/srmm.cpp +++ b/src/core/stdmsg/src/srmm.cpp @@ -50,7 +50,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRMM, ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" int __declspec(dllexport) Load(void) +int CMPlugin::Load() { Load_ChatModule(); return LoadSendRecvMessageModule(); @@ -58,7 +58,7 @@ extern "C" int __declspec(dllexport) Load(void) ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" int __declspec(dllexport) Unload(void) +int CMPlugin::Unload() { SplitmsgShutdown(); Unload_ChatModule(); diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h index d0f0f8ae3f..c73b0314b0 100644 --- a/src/core/stdmsg/src/stdafx.h +++ b/src/core/stdmsg/src/stdafx.h @@ -109,6 +109,9 @@ struct GlobalLogSettings : public GlobalLogSettingsBase struct CMPlugin : public PLUGIN { CMPlugin(); + + int Load() override; + int Unload() override; }; ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/stdssl/src/main.cpp b/src/core/stdssl/src/main.cpp index d80db3e488..ebf2b31905 100644 --- a/src/core/stdssl/src/main.cpp +++ b/src/core/stdssl/src/main.cpp @@ -45,12 +45,12 @@ CMPlugin::CMPlugin() : extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SSL, MIID_LAST }; -extern "C" int __declspec(dllexport) Load(void) +int CMPlugin::Load() { return LoadSslModule(); } -extern "C" int __declspec(dllexport) Unload(void) +int CMPlugin::Unload() { UnloadSslModule(); return 0; diff --git a/src/core/stdssl/src/stdafx.h b/src/core/stdssl/src/stdafx.h index 8f875605f0..44b21097ba 100644 --- a/src/core/stdssl/src/stdafx.h +++ b/src/core/stdssl/src/stdafx.h @@ -43,4 +43,7 @@ typedef struct SslHandle *HSSL; struct CMPlugin : public PLUGIN { CMPlugin(); + + int Load() override; + int Unload() override; }; diff --git a/src/core/stduihist/src/main.cpp b/src/core/stduihist/src/main.cpp index 1f5eeae95f..45d183f263 100644 --- a/src/core/stduihist/src/main.cpp +++ b/src/core/stduihist/src/main.cpp @@ -50,15 +50,8 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_UIHIST ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" int __declspec(dllexport) Load(void) +int CMPlugin::Load() { LoadHistoryModule(); return 0; } - -///////////////////////////////////////////////////////////////////////////////////////// - -extern "C" int __declspec(dllexport) Unload(void) -{ - return 0; -} diff --git a/src/core/stduihist/src/stdafx.h b/src/core/stduihist/src/stdafx.h index 5dfae67b52..71003a491e 100644 --- a/src/core/stduihist/src/stdafx.h +++ b/src/core/stduihist/src/stdafx.h @@ -67,6 +67,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct CMPlugin : public PLUGIN { CMPlugin(); + + int Load() override; }; #pragma comment(lib, "version.lib") diff --git a/src/core/stduserinfo/src/main.cpp b/src/core/stduserinfo/src/main.cpp index cefc32e91d..bfc375e5a8 100644 --- a/src/core/stduserinfo/src/main.cpp +++ b/src/core/stduserinfo/src/main.cpp @@ -50,15 +50,8 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_UIUSER ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" int __declspec(dllexport) Load(void) +int CMPlugin::Load() { LoadUserInfoModule(); return 0; } - -///////////////////////////////////////////////////////////////////////////////////////// - -extern "C" int __declspec(dllexport) Unload(void) -{ - return 0; -} diff --git a/src/core/stduserinfo/src/stdafx.h b/src/core/stduserinfo/src/stdafx.h index e73f080e88..6c6a24b279 100644 --- a/src/core/stduserinfo/src/stdafx.h +++ b/src/core/stduserinfo/src/stdafx.h @@ -71,4 +71,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct CMPlugin : public PLUGIN { CMPlugin(); + + int Load() override; }; diff --git a/src/core/stduseronline/src/main.cpp b/src/core/stduseronline/src/main.cpp index 4794c2dc21..9bf49e3ffd 100644 --- a/src/core/stduseronline/src/main.cpp +++ b/src/core/stduseronline/src/main.cpp @@ -50,15 +50,8 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_USERON ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" int __declspec(dllexport) Load(void) +int CMPlugin::Load() { LoadUserOnlineModule(); return 0; } - -///////////////////////////////////////////////////////////////////////////////////////// - -extern "C" int __declspec(dllexport) Unload(void) -{ - return 0; -} diff --git a/src/core/stduseronline/src/stdafx.h b/src/core/stduseronline/src/stdafx.h index aa1da528da..67c57474ef 100644 --- a/src/core/stduseronline/src/stdafx.h +++ b/src/core/stduseronline/src/stdafx.h @@ -69,4 +69,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct CMPlugin : public PLUGIN { CMPlugin(); + + int Load() override; }; -- cgit v1.2.3