From 523f3588b6f21adcc4bcf3ec3ffad05e2298863a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 17 May 2018 20:50:08 +0300 Subject: KeyboardNotify, ListeningTo, MessageState, MirandaG15, MirFox, Msg_Export, MsgPopup, mTextControl => CMPlugin --- plugins/ListeningTo/src/listeningto.cpp | 2 +- plugins/ListeningTo/src/main.cpp | 18 +++++------------- plugins/ListeningTo/src/options.cpp | 2 +- plugins/ListeningTo/src/players/generic.cpp | 6 +++--- plugins/ListeningTo/src/players/player.cpp | 2 +- plugins/ListeningTo/src/players/wmp.cpp | 6 +++--- plugins/ListeningTo/src/stdafx.h | 11 +++++++---- 7 files changed, 21 insertions(+), 26 deletions(-) (limited to 'plugins/ListeningTo') diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index 955cbbd483..a9c88e09ce 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -894,5 +894,5 @@ void InitServices() HookEvent(ME_DB_CONTACT_SETTINGCHANGED, SettingChanged); // icons - Icon_Register(hInst, LPGEN("ListeningTo"), iconList, _countof(iconList)); + Icon_Register(g_plugin.getInst(), LPGEN("ListeningTo"), iconList, _countof(iconList)); } diff --git a/plugins/ListeningTo/src/main.cpp b/plugins/ListeningTo/src/main.cpp index d175c983b9..b44b7bd50a 100644 --- a/plugins/ListeningTo/src/main.cpp +++ b/plugins/ListeningTo/src/main.cpp @@ -19,10 +19,13 @@ Boston, MA 02111-1307, USA. #include "stdafx.h" -HINSTANCE hInst; int hLangpack; +CMPlugin g_plugin; -PLUGININFOEX pluginInfo = { +///////////////////////////////////////////////////////////////////////////////////////// + +PLUGININFOEX pluginInfo = +{ sizeof(PLUGININFOEX), __PLUGIN_NAME, PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), @@ -35,16 +38,6 @@ PLUGININFOEX pluginInfo = { { 0xf981f3f5, 0x35a, 0x444f,{ 0x98, 0x92, 0xca, 0x72, 0x2c, 0x19, 0x5a, 0xda } } }; -// Functions //////////////////////////////////////////////////////////////////////////// - -extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) -{ - hInst = hinstDLL; - return TRUE; -} - -///////////////////////////////////////////////////////////////////////////////////////// - extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfo; @@ -69,6 +62,5 @@ extern "C" int __declspec(dllexport) Load(void) extern "C" int __declspec(dllexport) Unload(void) { CoUninitialize(); - return 0; } diff --git a/plugins/ListeningTo/src/options.cpp b/plugins/ListeningTo/src/options.cpp index aeea6a1b6e..549a3a1ef5 100644 --- a/plugins/ListeningTo/src/options.cpp +++ b/plugins/ListeningTo/src/options.cpp @@ -71,7 +71,7 @@ static OptPageControl playersControls[] = { int InitOptionsCallback(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.hInstance = hInst; + odp.hInstance = g_plugin.getInst(); odp.flags = ODPF_BOLDGROUPS; odp.szGroup.a = LPGEN("Status"); diff --git a/plugins/ListeningTo/src/players/generic.cpp b/plugins/ListeningTo/src/players/generic.cpp index c4996d763b..309d424b6d 100644 --- a/plugins/ListeningTo/src/players/generic.cpp +++ b/plugins/ListeningTo/src/players/generic.cpp @@ -71,11 +71,11 @@ GenericPlayer::GenericPlayer() WNDCLASS wc = {}; wc.lpfnWndProc = ReceiverWndProc; - wc.hInstance = hInst; + wc.hInstance = g_plugin.getInst(); wc.lpszClassName = MIRANDA_WINDOWCLASS; RegisterClass(&wc); - hWnd = CreateWindow(MIRANDA_WINDOWCLASS, LPGENW("Miranda ListeningTo receiver"), 0, 0, 0, 0, 0, nullptr, nullptr, hInst, nullptr); + hWnd = CreateWindow(MIRANDA_WINDOWCLASS, LPGENW("Miranda ListeningTo receiver"), 0, 0, 0, 0, 0, nullptr, nullptr, g_plugin.getInst(), nullptr); } GenericPlayer::~GenericPlayer() @@ -88,7 +88,7 @@ GenericPlayer::~GenericPlayer() DestroyWindow(hWnd); hWnd = nullptr; - UnregisterClass(MIRANDA_WINDOWCLASS, hInst); + UnregisterClass(MIRANDA_WINDOWCLASS, g_plugin.getInst()); singleton = nullptr; } diff --git a/plugins/ListeningTo/src/players/player.cpp b/plugins/ListeningTo/src/players/player.cpp index 666f640cf8..23b10f3a8a 100644 --- a/plugins/ListeningTo/src/players/player.cpp +++ b/plugins/ListeningTo/src/players/player.cpp @@ -127,7 +127,7 @@ void CodeInjectionPlayer::InjectCode() // Get the dll path char dll_path[1024] = { 0 }; - if (!GetModuleFileNameA(hInst, dll_path, _countof(dll_path))) + if (!GetModuleFileNameA(g_plugin.getInst(), dll_path, _countof(dll_path))) return; char *p = strrchr(dll_path, '\\'); diff --git a/plugins/ListeningTo/src/players/wmp.cpp b/plugins/ListeningTo/src/players/wmp.cpp index c69f288765..6bc244e742 100644 --- a/plugins/ListeningTo/src/players/wmp.cpp +++ b/plugins/ListeningTo/src/players/wmp.cpp @@ -35,11 +35,11 @@ WindowsMediaPlayer::WindowsMediaPlayer() WNDCLASS wc = {}; wc.lpfnWndProc = ReceiverWndProc; - wc.hInstance = hInst; + wc.hInstance = g_plugin.getInst(); wc.lpszClassName = WMP_WINDOWCLASS; RegisterClass(&wc); - hWnd = CreateWindow(WMP_WINDOWCLASS, LPGENW("Miranda ListeningTo WMP receiver"), 0, 0, 0, 0, 0, nullptr, nullptr, hInst, nullptr); + hWnd = CreateWindow(WMP_WINDOWCLASS, LPGENW("Miranda ListeningTo WMP receiver"), 0, 0, 0, 0, 0, nullptr, nullptr, g_plugin.getInst(), nullptr); } WindowsMediaPlayer::~WindowsMediaPlayer() @@ -52,7 +52,7 @@ WindowsMediaPlayer::~WindowsMediaPlayer() DestroyWindow(hWnd); hWnd = nullptr; - UnregisterClass(WMP_WINDOWCLASS, hInst); + UnregisterClass(WMP_WINDOWCLASS, g_plugin.getInst()); singleton = nullptr; } diff --git a/plugins/ListeningTo/src/stdafx.h b/plugins/ListeningTo/src/stdafx.h index bbb70355dd..905db9e8e9 100644 --- a/plugins/ListeningTo/src/stdafx.h +++ b/plugins/ListeningTo/src/stdafx.h @@ -28,8 +28,6 @@ Boston, MA 02111-1307, USA. #include #include -#define __NO_CMPLUGIN_NEEDED - #include #include #include @@ -71,11 +69,16 @@ Boston, MA 02111-1307, USA. #define MS_LISTENINGTO_HOTKEYS_DISABLE "ListeningTo/HotkeysDisable" #define MS_LISTENINGTO_HOTKEYS_TOGGLE "ListeningTo/HotkeysToggle" -#define MODULE_NAME "ListeningTo" +#define MODULE_NAME "ListeningTo" +struct CMPlugin : public PLUGIN +{ + CMPlugin() : + PLUGIN(MODULE_NAME) + {} +}; // Global Variables -extern HINSTANCE hInst; extern BOOL loaded; #define MIR_FREE(_X_) { mir_free(_X_); _X_ = NULL; } -- cgit v1.2.3