From b12321b9897b511e94301b73c1c48c533412d739 Mon Sep 17 00:00:00 2001
From: Mataes <mataes2007@gmail.com>
Date: Wed, 16 May 2018 19:12:38 +0300
Subject: BossKey, BuddyExpectator, BuddyPounce, ChangeKeyboardLayout,
 ClientChangeNotify, Cln_skinedit, CmdLine: cmplugin adaptation

---
 plugins/BuddyExpectator/src/BuddyExpectator.cpp | 10 ++--------
 plugins/BuddyExpectator/src/options.cpp         |  4 ++--
 plugins/BuddyExpectator/src/stdafx.h            | 10 +++++++---
 3 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'plugins/BuddyExpectator')

diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
index e7a9de1dae..17ec545ef8 100644
--- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp
+++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
@@ -22,7 +22,7 @@
 #include "stdafx.h"
 
 CLIST_INTERFACE *pcli;
-HINSTANCE hInst;
+CMPlugin g_plugin;
 int hLangpack;
 
 DWORD timer_id = 0;
@@ -60,12 +60,6 @@ static IconItem iconList[] =
 	{ LPGEN("Never hide"), "neverhide_icon", IDI_NEVERHIDE }
 };
 
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
-{
-	hInst = hinstDLL;
-	return TRUE;
-}
-
 time_t getLastSeen(MCONTACT hContact)
 {
 	return db_get_dw(hContact, MODULE_NAME, "LastSeen", db_get_dw(hContact, MODULE_NAME, "CreationTime", (DWORD)-1));
@@ -679,7 +673,7 @@ extern "C" int __declspec(dllexport) Load(void)
 			db_set_dw(hContact, MODULE_NAME, "CreationTime", current_time);
 	}
 
-	Icon_Register(hInst, "BuddyExpectator", iconList, _countof(iconList));
+	Icon_Register(g_plugin.getInst(), "BuddyExpectator", iconList, _countof(iconList));
 
 	HookEvent(ME_SKIN2_ICONSCHANGED, onIconsChanged);
 
diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp
index 2cf090f633..576fabd1dd 100644
--- a/plugins/BuddyExpectator/src/options.cpp
+++ b/plugins/BuddyExpectator/src/options.cpp
@@ -432,7 +432,7 @@ static INT_PTR CALLBACK PopupOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wP
 static int OptionsInit(WPARAM wParam, LPARAM)
 {
 	OPTIONSDIALOGPAGE odp = { 0 };
-	odp.hInstance = hInst;
+	odp.hInstance = g_plugin.getInst();
 	odp.szGroup.w = LPGENW("Contacts");
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPANEL);
 	odp.szTitle.w = LPGENW("Buddy Expectator");
@@ -529,7 +529,7 @@ int UserinfoInit(WPARAM wparam, LPARAM lparam)
 {
 	if (lparam > 0) {
 		OPTIONSDIALOGPAGE uip = { sizeof(uip) };
-		uip.hInstance = hInst;
+		uip.hInstance = g_plugin.getInst();
 		uip.pszTemplate = MAKEINTRESOURCEA(IDD_USERINFO);
 		uip.szTitle.a = LPGEN("Buddy Expectator");
 		uip.pfnDlgProc = UserinfoDlgProc;
diff --git a/plugins/BuddyExpectator/src/stdafx.h b/plugins/BuddyExpectator/src/stdafx.h
index d5e606febe..ba7a01892f 100644
--- a/plugins/BuddyExpectator/src/stdafx.h
+++ b/plugins/BuddyExpectator/src/stdafx.h
@@ -27,8 +27,6 @@
 #include <time.h>
 #include <locale.h>
 
-#define __NO_CMPLUGIN_NEEDED
-
 #include <newpluginapi.h>
 #include <m_skin.h>
 #include <m_clistint.h>
@@ -49,7 +47,13 @@
 
 #define MODULE_NAME     "BuddyExpectator"
 
-extern HINSTANCE hInst;
+struct CMPlugin : public PLUGIN<CMPlugin>
+{
+	CMPlugin() :
+		PLUGIN<CMPlugin>(MODULE_NAME)
+	{}
+};
+
 extern HANDLE hExtraIcon;
 
 void CALLBACK TimerProc(HWND, UINT, UINT_PTR, DWORD);
-- 
cgit v1.2.3