Alarms: cmplugin adaptation

9 files changed, 40 insertions, 51 deletions

diff --git a/plugins/Alarms/src/alarm_win.cpp b/plugins/Alarms/src/alarm_win.cpp
index 1eb844c870..0379da801b 100644
--- a/plugins/Alarms/src/alarm_win.cpp
+++ b/plugins/Alarms/src/alarm_win.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"

-#include "alarm_win.h"

 

 #define ID_TIMER_SOUND				10101

 #define SOUND_REPEAT_PERIOD			5000	// milliseconds

diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp
index dfeabf55a1..4d39c16e1c 100755
--- a/plugins/Alarms/src/alarmlist.cpp
+++ b/plugins/Alarms/src/alarmlist.cpp
@@ -1,6 +1,4 @@
 #include "stdafx.h"

-#include "alarmlist.h"

-#include <list>

 

 AlarmList alarms;

 mir_cs alarm_cs;

@@ -663,7 +661,7 @@ void DoAlarm(ALARM *alarm)
 			if (options.use_popup_module && ServiceExists(MS_POPUP_ADDPOPUPT))

 				ShowPopup(alarm);

 			else {

-				HWND hwndDlg = CreateDialog(hInst, MAKEINTRESOURCE(IDD_ALARM), GetDesktopWindow(), DlgProcAlarm);

+				HWND hwndDlg = CreateDialog(g_plugin.getInst(), MAKEINTRESOURCE(IDD_ALARM), GetDesktopWindow(), DlgProcAlarm);

 				WindowList_Add(hAlarmWindowList, hwndDlg, 0);

 

 				ALARM *data = new ALARM;

diff --git a/plugins/Alarms/src/alarms.cpp b/plugins/Alarms/src/alarms.cpp
index 1ee20d6f8f..b2e01d91e1 100644
--- a/plugins/Alarms/src/alarms.cpp
+++ b/plugins/Alarms/src/alarms.cpp
@@ -8,7 +8,6 @@ There is no warranty.
 */

 

 #include "stdafx.h"

-#include "alarms.h"

 

 #define SERVICENAME L"mp"

 #define COMMANDPREFIX L"/" SERVICENAME

@@ -19,7 +18,7 @@ There is no warranty.
 wchar_t szGamePrefix[] = COMMANDPREFIX;

 

 CLIST_INTERFACE *pcli;

-HINSTANCE hInst;

+CMPlugin g_plugin;

 int hLangpack;

 

 HANDLE hTopToolbarButton;

@@ -37,12 +36,6 @@ PLUGININFOEX pluginInfo = {
 	{0x4dd7762b, 0xd612, 0x4f84, {0xaa, 0x86, 0x6, 0x8f, 0x17, 0x85, 0x9b, 0x6d}}

 };

 

-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)

-{

-	hInst = hinstDLL;

-	return TRUE;

-}

-

 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)

 {

 	return &pluginInfo;

@@ -87,7 +80,7 @@ void ShowPopup(MCONTACT hContact, const wchar_t *msg)
 

 HBITMAP LoadBmpFromIcon(int IdRes)

 {

-	HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IdRes));

+	HICON hIcon = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IdRes));

 

 	BITMAPINFOHEADER bih = { 0 };

 	bih.biSize = sizeof(bih);

@@ -124,8 +117,8 @@ HBITMAP LoadBmpFromIcon(int IdRes)
 static int InitTopToolbarButton(WPARAM, LPARAM)

 {

 	TTBButton ttb = {};

-	ttb.hIconUp = LoadIcon(hInst, MAKEINTRESOURCE(IDI_TBUP));

-	ttb.hIconDn = LoadIcon(hInst, MAKEINTRESOURCE(IDI_TBDN));

+	ttb.hIconUp = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_TBUP));

+	ttb.hIconDn = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_TBDN));

 	ttb.pszService = MODULE "/NewAlarm";

 	ttb.dwFlags = TTBBF_VISIBLE;

 	ttb.name = ttb.pszTooltipUp = LPGEN("Set alarm");

diff --git a/plugins/Alarms/src/alarms.h b/plugins/Alarms/src/alarms.h
deleted file mode 100644
index 1f480e4bc0..0000000000
--- a/plugins/Alarms/src/alarms.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _TESTPLUG_INC

-#define _TESTPLUG_INC

-

-//#include "win.h"

-#include "alarmlist.h"

-#include "options.h"

-#include "frame.h"

-

-#endif

diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp
index b6ad0770c4..c23d8e31ea 100755
--- a/plugins/Alarms/src/frame.cpp
+++ b/plugins/Alarms/src/frame.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"

-#include "frame.h"

 

 HWND hwnd_plugin = nullptr;

 HWND hwnd_frame = nullptr;

@@ -100,7 +99,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 	case WM_CREATE:

 		hwnd_list = CreateWindow(L"LISTBOX", L"",

 			(WS_VISIBLE | WS_CHILD | LBS_NOINTEGRALHEIGHT | LBS_STANDARD | LBS_NOTIFY | LBS_OWNERDRAWFIXED) & ~LBS_SORT

-			& ~WS_BORDER, 0, 0, 0, 0, hwnd, nullptr, hInst, nullptr);

+			& ~WS_BORDER, 0, 0, 0, 0, hwnd, nullptr, g_plugin.getInst(), nullptr);

 		return FALSE;

 

 	case WMU_INITIALIZE:

@@ -350,7 +349,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 			mir_cslock lck(list_cs);

 			DWORD item = SendMessage(hwnd_list, LB_ITEMFROMPOINT, 0, MAKELPARAM(pt.x, pt.y));

 

-			HMENU menu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_MENU1)), submenu = GetSubMenu(menu, 0);

+			HMENU menu = LoadMenu(g_plugin.getInst(), MAKEINTRESOURCE(IDR_MENU1)), submenu = GetSubMenu(menu, 0);

 			TranslateMenu(submenu);

 

 			if (HIWORD(item) == 0) {

@@ -482,7 +481,7 @@ int CreateFrame()
 {

 	WNDCLASS wndclass = {};

 	wndclass.hCursor = LoadCursor(nullptr, IDC_ARROW);

-	wndclass.hInstance = hInst;

+	wndclass.hInstance = g_plugin.getInst();

 	wndclass.lpfnWndProc = FrameWindowProc;

 	wndclass.lpszClassName = L"AlarmsFrame";

 	RegisterClass(&wndclass);

@@ -490,7 +489,7 @@ int CreateFrame()
 	if (ServiceExists(MS_CLIST_FRAMES_ADDFRAME)) {

 		hwnd_plugin = CreateWindow(L"AlarmsFrame", TranslateT("Alarms"),

 			WS_CHILD | WS_CLIPCHILDREN,

-			0, 0, 10, 10, pcli->hwndContactList, nullptr, hInst, nullptr);

+			0, 0, 10, 10, pcli->hwndContactList, nullptr, g_plugin.getInst(), nullptr);

 

 		CLISTFrame Frame = { sizeof(CLISTFrame) };

 		Frame.tname = TranslateT("Alarms");

@@ -503,18 +502,18 @@ int CreateFrame()
 	}

 	else {

 		wndclass.hCursor = LoadCursor(nullptr, IDC_ARROW);

-		wndclass.hInstance = hInst;

+		wndclass.hInstance = g_plugin.getInst();

 		wndclass.lpfnWndProc = FrameContainerWindowProc;

 		wndclass.lpszClassName = L"AlarmsFrameContainer";

 		RegisterClass(&wndclass);

 

 		hwnd_frame = CreateWindowEx(WS_EX_TOOLWINDOW, L"AlarmsFrameContainer", TranslateT("Alarms"),

 			(WS_POPUPWINDOW | WS_THICKFRAME | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN) & ~WS_VISIBLE,

-			0, 0, 200, 100, pcli->hwndContactList, nullptr, hInst, nullptr);

+			0, 0, 200, 100, pcli->hwndContactList, nullptr, g_plugin.getInst(), nullptr);

 

 		hwnd_plugin = CreateWindow(L"AlarmsFrame", TranslateT("Alarms"),

 			WS_CHILD | WS_CLIPCHILDREN | WS_VISIBLE,

-			0, 0, 10, 10, hwnd_frame, nullptr, hInst, nullptr);

+			0, 0, 10, 10, hwnd_frame, nullptr, g_plugin.getInst(), nullptr);

 

 		SetWindowLongPtr(hwnd_frame, GWLP_USERDATA, (LONG_PTR)hwnd_plugin);

 

diff --git a/plugins/Alarms/src/icons.cpp b/plugins/Alarms/src/icons.cpp
index 45fa921ca4..77d0e53e52 100644
--- a/plugins/Alarms/src/icons.cpp
+++ b/plugins/Alarms/src/icons.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"

-#include "icons.h"

 

 HICON hIconMenuSet, hIconList1, hIconList2, hIconMenuShowHide, hIconSystray;

 

@@ -26,7 +25,7 @@ int ReloadIcons(WPARAM, LPARAM)
 

 void InitIcons()

 {

-	Icon_Register(hInst, "Alarms", iconList, _countof(iconList));

+	Icon_Register(g_plugin.getInst(), "Alarms", iconList, _countof(iconList));

 

 	if (!ServiceExists(MS_CLIST_FRAMES_ADDFRAME))

 		hIconMenuShowHide = IcoLib_GetIcon("alarms_menu_showhide");

diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp
index ec2a9a3467..91880d9a80 100755
--- a/plugins/Alarms/src/options.cpp
+++ b/plugins/Alarms/src/options.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"

-#include "options.h"

 

 Options options;

 

@@ -764,13 +763,13 @@ BOOL Edit(HWND hwnd, ALARM &alarm, bool modal)
 

 	if (modal) {

 		param->self_add = FALSE;

-		if (DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_DIALOG2), hwnd, DlgProcAddEdit, (LPARAM)param) == IDOK) {

+		if (DialogBoxParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_DIALOG2), hwnd, DlgProcAddEdit, (LPARAM)param) == IDOK) {

 			return TRUE;

 		}

 	}

 	else {

 		param->self_add = TRUE;

-		HWND hwndDlg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_DIALOG2), hwnd, DlgProcAddEdit, (LPARAM)param);

+		HWND hwndDlg = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_DIALOG2), hwnd, DlgProcAddEdit, (LPARAM)param);

 

 		//SetActiveWindow(hwndDlg);

 		//SetWindowPos(hwndDlg, 

@@ -788,12 +787,12 @@ BOOL New(HWND hwnd, ALARM &alarm, bool modal)
 

 	if (modal) {

 		param->self_add = FALSE;

-		if (DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_DIALOG2), hwnd, DlgProcAddEdit, (LPARAM)param) == IDOK)

+		if (DialogBoxParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_DIALOG2), hwnd, DlgProcAddEdit, (LPARAM)param) == IDOK)

 			return TRUE;

 	}

 	else {

 		param->self_add = TRUE;

-		HWND hwndDlg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_DIALOG2), hwnd, DlgProcAddEdit, (LPARAM)param);

+		HWND hwndDlg = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_DIALOG2), hwnd, DlgProcAddEdit, (LPARAM)param);

 

 		//SetActiveWindow(hwndDlg);

 		//SetWindowPos(hwndDlg, 

@@ -998,7 +997,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			switch (LOWORD(wParam)) {

 			case IDC_BTN_PREVIEW:

 				{

-					HWND hwndDlgPrev = CreateDialog(hInst, MAKEINTRESOURCE(IDD_ALARM), GetDesktopWindow(), DlgProcAlarm);

+					HWND hwndDlgPrev = CreateDialog(g_plugin.getInst(), MAKEINTRESOURCE(IDD_ALARM), GetDesktopWindow(), DlgProcAlarm);

 					WindowList_Add(hAlarmWindowList, hwndDlgPrev, 0);

 					SendMessage(hwndDlgPrev, WMU_FAKEALARM, 0, 0);

 					SendMessage(hwndDlgPrev, WMU_SETOPT, 0, (LPARAM)&temp_options);

@@ -1213,7 +1212,7 @@ int OptInit(WPARAM wParam, LPARAM)
 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = -790000000;

-	odp.hInstance = hInst;

+	odp.hInstance = g_plugin.getInst();

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1);

 	odp.szTitle.a = LPGEN("Alarms");

 	odp.szGroup.a = LPGEN("Events");

diff --git a/plugins/Alarms/src/stdafx.h b/plugins/Alarms/src/stdafx.h
index 7ab9fd2a8b..26575d45a4 100755
--- a/plugins/Alarms/src/stdafx.h
+++ b/plugins/Alarms/src/stdafx.h
@@ -6,8 +6,7 @@
 

 #include <windows.h>

 #include <shellapi.h>

-

-#define __NO_CMPLUGIN_NEEDED

+#include <list>

 

 #include <newpluginapi.h>

 #include <m_utils.h>

@@ -29,12 +28,6 @@
 #include "resource.h"

 #include "version.h"

 

-#define MODULE	"Alarm"

-

-extern HINSTANCE hInst;

-

-extern HANDLE hTopToolbarButton;

-

 typedef struct ALARM_tag {

 	unsigned short id;

 	wchar_t *szTitle;

@@ -47,6 +40,25 @@ typedef struct ALARM_tag {
 	wchar_t *szCommandParams;

 	BYTE sound_num;

 	int flags, day_mask;

-} ALARM;

+} ALARM; 

+

+#include "alarmlist.h"

+#include "options.h"

+#include "icons.h"

+#include "frame.h"

+#include "alarm_win.h"

+#include "time_utils.h"

+

+#define MODULE	"Alarm"

+

+struct CMPlugin : public PLUGIN<CMPlugin>

+{

+	CMPlugin() :

+		PLUGIN<CMPlugin>(MODULE)

+	{}

+};

+

+extern HANDLE hTopToolbarButton;

+

 

 #endif

diff --git a/plugins/Alarms/src/time_utils.cpp b/plugins/Alarms/src/time_utils.cpp
index 1960cf04f4..aaab0a671b 100644
--- a/plugins/Alarms/src/time_utils.cpp
+++ b/plugins/Alarms/src/time_utils.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"

-#include "time_utils.h"

 

 SYSTEMTIME last_check;