Popup, PManagerEx, QuickContacts, RemovePersonalSettings, Restart, SeenPlugin, SendSS, ShlExt, SimpleAR, SimpleStatusMsg, SkypeStatusChange, SmileyAdd, SMS => CMPlugin

7 files changed, 248 insertions, 274 deletions

diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp
index ab62e4bd34..6606f86a3d 100644
--- a/plugins/SimpleStatusMsg/src/awaymsg.cpp
+++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp
@@ -183,7 +183,7 @@ static INT_PTR GetMessageCommand(WPARAM wParam, LPARAM)
 		SetForegroundWindow(hwnd);

 		SetFocus(hwnd);

 	}

-	else CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_READAWAYMSG), nullptr, ReadAwayMsgDlgProc, wParam);

+	else CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_READAWAYMSG), nullptr, ReadAwayMsgDlgProc, wParam);

 	return 0;

 }

 

@@ -288,7 +288,7 @@ static INT_PTR CopyAwayMsgCommand(WPARAM wParam, LPARAM)
 		SetFocus(hwnd);

 	}

 	else

-		CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_COPY), nullptr, CopyAwayMsgDlgProc, wParam);

+		CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_COPY), nullptr, CopyAwayMsgDlgProc, wParam);

 	return 0;

 }

 

diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp
index b2216a2846..1a7dd6631a 100644
--- a/plugins/SimpleStatusMsg/src/main.cpp
+++ b/plugins/SimpleStatusMsg/src/main.cpp
@@ -20,11 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 

 #include "stdafx.h"

 

-HINSTANCE g_hInst;

-

 int hLangpack;

-PROTOACCOUNTS *accounts;

+CMPlugin g_plugin;

 

+PROTOACCOUNTS *accounts;

 static int g_iIdleTime = -1;

 UINT_PTR g_uUpdateMsgTimer = 0, *g_uSetStatusTimer;

 static wchar_t *g_ptszWinampSong;

@@ -32,7 +31,10 @@ HANDLE hTTBButton = nullptr, h_statusmodechange;
 HWND hwndSAMsgDialog;

 static HANDLE *hProtoStatusMenuItem;

 

-PLUGININFOEX pluginInfo = {

+/////////////////////////////////////////////////////////////////////////////////////////

+

+PLUGININFOEX pluginInfo =

+{

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

@@ -42,51 +44,19 @@ PLUGININFOEX pluginInfo = {
 	__AUTHORWEB,

 	UNICODE_AWARE,

 	// {768CE156-34AC-45A3-B53B-0083C47615C4}

-	{0x768ce156, 0x34ac, 0x45a3, {0xb5, 0x3b, 0x0, 0x83, 0xc4, 0x76, 0x15, 0xc4}}

+	{ 0x768ce156, 0x34ac, 0x45a3, { 0xb5, 0x3b, 0x0, 0x83, 0xc4, 0x76, 0x15, 0xc4 }}

 };

 

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

-{

-	g_hInst = hinstDLL;

-	return TRUE;

-}

-

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

 {

 	return &pluginInfo;

 }

 

-extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRAWAY, MIID_LAST };

-

-#ifdef _DEBUG

-void log2file(const char *fmt, ...)

-{

-	DWORD dwBytesWritten;

-	va_list	va;

-	char szText[1024];

-	HANDLE hFile = CreateFileA("simplestatusmsg.log", GENERIC_WRITE, FILE_SHARE_READ, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);

-	SetFilePointer(hFile, 0, nullptr, FILE_END);

+/////////////////////////////////////////////////////////////////////////////////////////

 

-	strncpy(szText, "[\0", _countof(szText));

-	WriteFile(hFile, szText, (DWORD)mir_strlen(szText), &dwBytesWritten, nullptr);

-

-	GetTimeFormatA(LOCALE_USER_DEFAULT, 0, nullptr, nullptr, szText, _countof(szText));

-	WriteFile(hFile, szText, (DWORD)mir_strlen(szText), &dwBytesWritten, nullptr);

-

-	strncpy(szText, "] \0", _countof(szText));

-

-	va_start(va, fmt);

-	mir_vsnprintf(szText + mir_strlen(szText), _countof(szText) - mir_strlen(szText), fmt, va);

-	va_end(va);

-

-	WriteFile(hFile, szText, (DWORD)mir_strlen(szText), &dwBytesWritten, nullptr);

+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRAWAY, MIID_LAST };

 

-	strncpy(szText, "\n\0", _countof(szText));

-	WriteFile(hFile, szText, (DWORD)mir_strlen(szText), &dwBytesWritten, nullptr);

-

-	CloseHandle(hFile);

-}

-#endif

+/////////////////////////////////////////////////////////////////////////////////////////

 

 static wchar_t* GetWinampSong(void)

 {

@@ -148,7 +118,7 @@ wchar_t* InsertBuiltinVarsIntoMsg(wchar_t *in, const char *szProto, int)
 	wchar_t substituteStr[1024], *msg = mir_wstrdup(in);

 

 	for (int i = 0; msg[i]; i++) {

-		if (msg[i] == 0x0D && db_get_b(NULL, "SimpleStatusMsg", "RemoveCR", 0)) {

+		if (msg[i] == 0x0D && db_get_b(NULL, MODULENAME, "RemoveCR", 0)) {

 			wchar_t *p = msg + i;

 			if (i + 1 <= 1024 && msg[i + 1]) {

 				if (msg[i + 1] == 0x0A) {

@@ -174,8 +144,8 @@ wchar_t* InsertBuiltinVarsIntoMsg(wchar_t *in, const char *szProto, int)
 				mir_free(g_ptszWinampSong);

 				g_ptszWinampSong = mir_wstrdup(ptszWinampTitle);

 			}

-			else if (g_ptszWinampSong && mir_wstrcmp(g_ptszWinampSong, L"SimpleStatusMsg")

-				&& db_get_b(NULL, "SimpleStatusMsg", "AmpLeaveTitle", 1)) {

+			else if (g_ptszWinampSong && mir_wstrcmp(g_ptszWinampSong, TEXT(MODULENAME))

+				&& db_get_b(NULL, MODULENAME, "AmpLeaveTitle", 1)) {

 				ptszWinampTitle = mir_wstrdup(g_ptszWinampSong);

 			}

 			else

@@ -254,7 +224,7 @@ wchar_t* InsertBuiltinVarsIntoMsg(wchar_t *in, const char *szProto, int)
 			BOOL rmark[25];

 

 			for (k = 0; k < _countof(rmark); k++) rmark[k] = FALSE;

-			int maxk = db_get_b(NULL, "SimpleStatusMsg", "MaxHist", 10);

+			int maxk = db_get_b(NULL, MODULENAME, "MaxHist", 10);

 			if (maxk == 0) rmark[0] = TRUE;

 

 			while (!rmark[0]) {

@@ -266,7 +236,7 @@ wchar_t* InsertBuiltinVarsIntoMsg(wchar_t *in, const char *szProto, int)
 

 				mir_snprintf(buff, "SMsg%d", k);

 

-				wchar_t *tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", buff);

+				wchar_t *tszStatusMsg = db_get_wsa(NULL, MODULENAME, buff);

 				if (tszStatusMsg == nullptr)

 					continue;

 

@@ -296,7 +266,7 @@ wchar_t* InsertBuiltinVarsIntoMsg(wchar_t *in, const char *szProto, int)
 			BOOL rmark[25];

 

 			for (k = 0; k < _countof(rmark); k++) rmark[k] = FALSE;

-			int maxk = db_get_w(NULL, "SimpleStatusMsg", "DefMsgCount", 0);

+			int maxk = db_get_w(NULL, MODULENAME, "DefMsgCount", 0);

 			if (maxk == 0) rmark[0] = TRUE;

 

 			while (!rmark[0]) {

@@ -308,7 +278,7 @@ wchar_t* InsertBuiltinVarsIntoMsg(wchar_t *in, const char *szProto, int)
 

 				mir_snprintf(buff, "DefMsg%d", k);

 

-				wchar_t *tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", buff);

+				wchar_t *tszStatusMsg = db_get_wsa(NULL, MODULENAME, buff);

 				if (tszStatusMsg == nullptr)

 					continue;

 

@@ -340,7 +310,7 @@ wchar_t* InsertBuiltinVarsIntoMsg(wchar_t *in, const char *szProto, int)
 	if (szProto) {

 		char szSetting[80];

 		mir_snprintf(szSetting, "Proto%sMaxLen", szProto);

-		size_t len = db_get_w(NULL, "SimpleStatusMsg", szSetting, 1024);

+		size_t len = db_get_w(NULL, MODULENAME, szSetting, 1024);

 		if (len < mir_wstrlen(msg)) {

 			msg = (wchar_t *)mir_realloc(msg, len * sizeof(wchar_t));

 			msg[len] = 0;

@@ -352,7 +322,7 @@ wchar_t* InsertBuiltinVarsIntoMsg(wchar_t *in, const char *szProto, int)
 

 wchar_t* InsertVarsIntoMsg(wchar_t *tszMsg, const char *szProto, int iStatus, MCONTACT hContact)

 {

-	if (ServiceExists(MS_VARS_FORMATSTRING) && db_get_b(NULL, "SimpleStatusMsg", "EnableVariables", 1)) {

+	if (ServiceExists(MS_VARS_FORMATSTRING) && db_get_b(NULL, MODULENAME, "EnableVariables", 1)) {

 		wchar_t *tszVarsMsg = variables_parse(tszMsg, nullptr, hContact);

 		if (tszVarsMsg != nullptr) {

 			wchar_t *format = InsertBuiltinVarsIntoMsg(tszVarsMsg, szProto, iStatus);

@@ -370,7 +340,7 @@ static wchar_t* GetAwayMessageFormat(int iStatus, const char *szProto)
 	wchar_t *format;

 

 	mir_snprintf(szSetting, "%sFlags", szProto ? szProto : "");

-	int flags = db_get_b(NULL, "SimpleStatusMsg", StatusModeToDbSetting(iStatus, szSetting), STATUS_DEFAULT);

+	int flags = db_get_b(NULL, MODULENAME, StatusModeToDbSetting(iStatus, szSetting), STATUS_DEFAULT);

 

 	if (flags & STATUS_EMPTY_MSG) {

 		return mir_wstrdup(L"");

@@ -389,11 +359,11 @@ static wchar_t* GetAwayMessageFormat(int iStatus, const char *szProto)
 		else

 			mir_snprintf(szSetting, "LastMsg");

 

-		char *szLastMsg = db_get_sa(NULL, "SimpleStatusMsg", szSetting);

+		char *szLastMsg = db_get_sa(NULL, MODULENAME, szSetting);

 		if (szLastMsg == nullptr)

 			return nullptr; //mir_wstrdup(L"");

 

-		format = db_get_wsa(NULL, "SimpleStatusMsg", szLastMsg);

+		format = db_get_wsa(NULL, MODULENAME, szLastMsg);

 		mir_free(szLastMsg);

 	}

 	else if (flags & STATUS_THIS_MSG) {

@@ -415,9 +385,9 @@ static wchar_t* GetAwayMessageFormat(int iStatus, const char *szProto)
 void DBWriteMessage(char *szSetting, wchar_t *tszMsg)

 {

 	if (tszMsg && mir_wstrlen(tszMsg))

-		db_set_ws(NULL, "SimpleStatusMsg", szSetting, tszMsg);

+		db_set_ws(NULL, MODULENAME, szSetting, tszMsg);

 	else

-		db_unset(NULL, "SimpleStatusMsg", szSetting);

+		db_unset(NULL, MODULENAME, szSetting);

 }

 

 void SaveMessageToDB(const char *szProto, wchar_t *tszMsg, BOOL bIsFormat)

@@ -440,9 +410,9 @@ void SaveMessageToDB(const char *szProto, wchar_t *tszMsg, BOOL bIsFormat)
 			DBWriteMessage(szSetting, tszMsg);

 #ifdef _DEBUG

 			if (bIsFormat)

-				log2file("SaveMessageToDB(): Set \"%S\" status message (without inserted vars) for %s.", tszMsg, pa->szModuleName);

+				g_plugin.debugLogA("SaveMessageToDB(): Set \"%S\" status message (without inserted vars) for %s.", tszMsg, pa->szModuleName);

 			else

-				log2file("SaveMessageToDB(): Set \"%S\" status message for %s.", tszMsg, pa->szModuleName);

+				g_plugin.debugLogA("SaveMessageToDB(): Set \"%S\" status message for %s.", tszMsg, pa->szModuleName);

 #endif

 		}

 	}

@@ -454,9 +424,9 @@ void SaveMessageToDB(const char *szProto, wchar_t *tszMsg, BOOL bIsFormat)
 		DBWriteMessage(szSetting, tszMsg);

 #ifdef _DEBUG

 		if (bIsFormat)

-			log2file("SaveMessageToDB(): Set \"%S\" status message (without inserted vars) for %s.", tszMsg, szProto);

+			g_plugin.debugLogA("SaveMessageToDB(): Set \"%S\" status message (without inserted vars) for %s.", tszMsg, szProto);

 		else

-			log2file("SaveMessageToDB(): Set \"%S\" status message for %s.", tszMsg, szProto);

+			g_plugin.debugLogA("SaveMessageToDB(): Set \"%S\" status message for %s.", tszMsg, szProto);

 #endif

 	}

 }

@@ -465,7 +435,7 @@ void SaveStatusAsCurrent(const char *szProto, int iStatus)
 {

 	char szSetting[80];

 	mir_snprintf(szSetting, "Cur%sStatus", szProto);

-	db_set_w(NULL, "SimpleStatusMsg", szSetting, (WORD)iStatus);

+	db_set_w(NULL, MODULENAME, szSetting, (WORD)iStatus);

 }

 

 static wchar_t *GetAwayMessage(int iStatus, const char *szProto, BOOL bInsertVars, MCONTACT hContact)

@@ -475,7 +445,7 @@ static wchar_t *GetAwayMessage(int iStatus, const char *szProto, BOOL bInsertVar
 

 	if ((!iStatus || iStatus == ID_STATUS_CURRENT) && szProto) {

 		mir_snprintf(szSetting, "FCur%sMsg", szProto);

-		format = db_get_wsa(NULL, "SimpleStatusMsg", szSetting);

+		format = db_get_wsa(NULL, MODULENAME, szSetting);

 	}

 	else {

 		if (!iStatus || iStatus == ID_STATUS_CURRENT)

@@ -485,22 +455,17 @@ static wchar_t *GetAwayMessage(int iStatus, const char *szProto, BOOL bInsertVar
 			return nullptr;

 

 		mir_snprintf(szSetting, "Proto%sFlags", szProto ? szProto : "");

-		int flags = db_get_b(NULL, "SimpleStatusMsg", szSetting, PROTO_DEFAULT);

+		int flags = db_get_b(NULL, MODULENAME, szSetting, PROTO_DEFAULT);

 

-		//if (flags & PROTO_NO_MSG)

-		//{

-		//	format = mir_wstrdup(L"");

-		//}

-		//else

 		if (flags & PROTO_THIS_MSG) {

 			mir_snprintf(szSetting, "Proto%sDefault", szProto);

-			format = db_get_wsa(NULL, "SimpleStatusMsg", szSetting);

+			format = db_get_wsa(NULL, MODULENAME, szSetting);

 			if (format == nullptr)

 				format = mir_wstrdup(L"");

 		}

 		else if (flags & PROTO_NOCHANGE && szProto) {

 			mir_snprintf(szSetting, "FCur%sMsg", szProto);

-			format = db_get_wsa(NULL, "SimpleStatusMsg", szSetting);

+			format = db_get_wsa(NULL, MODULENAME, szSetting);

 		}

 		else if (flags & PROTO_POPUPDLG)

 			format = GetAwayMessageFormat(iStatus, szProto);

@@ -508,7 +473,7 @@ static wchar_t *GetAwayMessage(int iStatus, const char *szProto, BOOL bInsertVar
 			format = nullptr;

 	}

 #ifdef _DEBUG

-	log2file("GetAwayMessage(): %s has %s status and \"%S\" status message.", szProto, StatusModeToDbSetting(iStatus, ""), format);

+	g_plugin.debugLogA("GetAwayMessage(): %s has %s status and \"%S\" status message.", szProto, StatusModeToDbSetting(iStatus, ""), format);

 #endif

 

 	if (bInsertVars && format != nullptr) {

@@ -522,7 +487,7 @@ static wchar_t *GetAwayMessage(int iStatus, const char *szProto, BOOL bInsertVar
 

 int CheckProtoSettings(const char *szProto, int iInitialStatus)

 {

-	int	iSetting = db_get_w(NULL, szProto, "LeaveStatus", -1); //GG settings

+	int iSetting = db_get_w(NULL, szProto, "LeaveStatus", -1); //GG settings

 	if (iSetting != -1)

 		return iSetting ? iSetting : iInitialStatus;

 	iSetting = db_get_w(NULL, szProto, "OfflineMessageOption", -1); //TLEN settings

@@ -570,7 +535,7 @@ int HasProtoStaticStatusMsg(const char *szProto, int iInitialStatus, int iStatus
 {

 	char szSetting[80];

 	mir_snprintf(szSetting, "Proto%sFlags", szProto);

-	int flags = db_get_b(NULL, "SimpleStatusMsg", szSetting, PROTO_DEFAULT);

+	int flags = db_get_b(NULL, MODULENAME, szSetting, PROTO_DEFAULT);

 

 	if (flags & PROTO_NO_MSG) {

 		Proto_SetStatus(szProto, iInitialStatus, iStatus, nullptr);

@@ -580,7 +545,7 @@ int HasProtoStaticStatusMsg(const char *szProto, int iInitialStatus, int iStatus
 	}

 	else if (flags & PROTO_THIS_MSG) {

 		mir_snprintf(szSetting, "Proto%sDefault", szProto);

-		wchar_t *szSimpleStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", szSetting);

+		wchar_t *szSimpleStatusMsg = db_get_wsa(NULL, MODULENAME, szSetting);

 		if (szSimpleStatusMsg != nullptr) {

 			SaveMessageToDB(szProto, szSimpleStatusMsg, TRUE);

 			wchar_t *msg = InsertVarsIntoMsg(szSimpleStatusMsg, szProto, iStatus, NULL);

@@ -654,7 +619,7 @@ void SetStatusMessage(const char *szProto, int iInitialStatus, int iStatus, wcha
 {

 	wchar_t *msg = nullptr;

 #ifdef _DEBUG

-	log2file("SetStatusMessage(\"%s\", %d, %d, \"%S\", %d)", szProto, iInitialStatus, iStatus, message, bOnStartup);

+	g_plugin.debugLogA("SetStatusMessage(\"%s\", %d, %d, \"%S\", %d)", szProto, iInitialStatus, iStatus, message, bOnStartup);

 #endif

 	if (szProto) {

 		if (bOnStartup && accounts->statusCount > 1) // TODO not only at startup?

@@ -676,7 +641,7 @@ void SetStatusMessage(const char *szProto, int iInitialStatus, int iStatus, wcha
 						CallProtoService(pa->szModuleName, PS_SETSTATUS, (WPARAM)status, 0);

 				}

 			}

-		}

+	}

 

 		if (message)

 			msg = InsertVarsIntoMsg(message, szProto, iStatus, NULL);

@@ -689,7 +654,7 @@ void SetStatusMessage(const char *szProto, int iInitialStatus, int iStatus, wcha
 

 		Proto_SetStatus(szProto, iInitialStatus, iStatus, msg);

 		mir_free(msg);

-	}

+}

 	else {

 		int iProfileStatus = iStatus > ID_STATUS_CURRENT ? iStatus : 0;

 		BOOL bIsStatusCurrent = iStatus == ID_STATUS_CURRENT;

@@ -731,7 +696,7 @@ void SetStatusMessage(const char *szProto, int iInitialStatus, int iStatus, wcha
 				if (!(bOnStartup && iStatus == ID_STATUS_OFFLINE) && GetCurrentStatus(pa->szModuleName) != iStatus && iStatus != iInitialStatus) {

 					CallProtoService(pa->szModuleName, PS_SETSTATUS, (WPARAM)iStatus, 0);

 #ifdef _DEBUG

-					log2file("SetStatusMessage(): Set %s status for %s.", StatusModeToDbSetting(iStatus, ""), pa->szModuleName);

+					g_plugin.debugLogA("SetStatusMessage(): Set %s status for %s.", StatusModeToDbSetting(iStatus, ""), pa->szModuleName);

 #endif

 				}

 				continue;

@@ -748,7 +713,7 @@ void SetStatusMessage(const char *szProto, int iInitialStatus, int iStatus, wcha
 

 			Proto_SetStatus(pa->szModuleName, iInitialStatus, iStatus, msg);

 			mir_free(msg);

-		}

+			}

 

 		if (GetCurrentStatus(nullptr) != iStatus && !bIsStatusCurrent && !iProfileStatus) {

 			// not so nice...

@@ -756,8 +721,8 @@ void SetStatusMessage(const char *szProto, int iInitialStatus, int iStatus, wcha
 			Clist_SetStatusMode(iStatus);

 			h_statusmodechange = HookEvent(ME_CLIST_STATUSMODECHANGE, ChangeStatusMessage);

 		}

+		}

 	}

-}

 

 INT_PTR ShowStatusMessageDialogInternal(WPARAM, LPARAM lParam)

 {

@@ -828,7 +793,7 @@ INT_PTR ShowStatusMessageDialogInternal(WPARAM, LPARAM lParam)
 

 	if (hwndSAMsgDialog)

 		DestroyWindow(hwndSAMsgDialog);

-	hwndSAMsgDialog = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_AWAYMSGBOX), nullptr, AwayMsgBoxDlgProc, (LPARAM)box_data);

+	hwndSAMsgDialog = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_AWAYMSGBOX), nullptr, AwayMsgBoxDlgProc, (LPARAM)box_data);

 	return 0;

 }

 

@@ -875,7 +840,7 @@ INT_PTR ShowStatusMessageDialog(WPARAM, LPARAM lParam)
 

 	if (hwndSAMsgDialog)

 		DestroyWindow(hwndSAMsgDialog);

-	hwndSAMsgDialog = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_AWAYMSGBOX), nullptr, AwayMsgBoxDlgProc, (LPARAM)box_data);

+	hwndSAMsgDialog = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_AWAYMSGBOX), nullptr, AwayMsgBoxDlgProc, (LPARAM)box_data);

 

 	return 0;

 }

@@ -918,7 +883,7 @@ int ChangeStatusMessage(WPARAM wParam, LPARAM lParam)
 

 	char szSetting[80];

 	mir_snprintf(szSetting, "%sFlags", szProto ? szProto : "");

-	int iDlgFlags = db_get_b(NULL, "SimpleStatusMsg", (char *)StatusModeToDbSetting(iStatus, szSetting), STATUS_DEFAULT);

+	int iDlgFlags = db_get_b(NULL, MODULENAME, (char *)StatusModeToDbSetting(iStatus, szSetting), STATUS_DEFAULT);

 

 	BOOL bShowDlg = iDlgFlags & STATUS_SHOW_DLG || bOnStartup;

 	BOOL bScreenSaverRunning = IsScreenSaverRunning();

@@ -936,24 +901,24 @@ int ChangeStatusMessage(WPARAM wParam, LPARAM lParam)
 			if (bOnStartup && GetCurrentStatus(szProto) != iStatus) {

 				CallProtoService(szProto, PS_SETSTATUS, iStatus, 0);

 #ifdef _DEBUG

-				log2file("ChangeStatusMessage(): Set %s status for %s.", StatusModeToDbSetting(iStatus, ""), szProto);

+				g_plugin.debugLogA("ChangeStatusMessage(): Set %s status for %s.", StatusModeToDbSetting(iStatus, ""), szProto);

 #endif

 			}

 			return 0;

 		}

 

 		mir_snprintf(szSetting, "Proto%sFlags", szProto);

-		iProtoFlags = db_get_b(NULL, "SimpleStatusMsg", szSetting, PROTO_DEFAULT);

+		iProtoFlags = db_get_b(NULL, MODULENAME, szSetting, PROTO_DEFAULT);

 		if (iProtoFlags & PROTO_NO_MSG || iProtoFlags & PROTO_THIS_MSG) {

 			if (HasProtoStaticStatusMsg(szProto, iStatus, iStatus))

 				return 1;

 		}

 		else if (iProtoFlags & PROTO_NOCHANGE && !bOnStartup) {

 			mir_snprintf(szSetting, "FCur%sMsg", szProto);

-			wchar_t *msg = db_get_wsa(NULL, "SimpleStatusMsg", szSetting);

+			wchar_t *msg = db_get_wsa(NULL, MODULENAME, szSetting);

 

 #ifdef _DEBUG

-			log2file("ChangeStatusMessage(): Set %s status and \"%S\" status message for %s.", StatusModeToDbSetting(iStatus, ""), msg, szProto);

+			g_plugin.debugLogA("ChangeStatusMessage(): Set %s status and \"%S\" status message for %s.", StatusModeToDbSetting(iStatus, ""), msg, szProto);

 #endif

 			SetStatusMessage(szProto, iStatus, iStatus, msg, FALSE);

 			if (msg) mir_free(msg);

@@ -963,7 +928,7 @@ int ChangeStatusMessage(WPARAM wParam, LPARAM lParam)
 		if (!bShowDlg || bScreenSaverRunning) {

 			wchar_t *msg = GetAwayMessageFormat(iStatus, szProto);

 #ifdef _DEBUG

-			log2file("ChangeStatusMessage(): Set %s status and \"%S\" status message for %s.", StatusModeToDbSetting(iStatus, ""), msg, szProto);

+			g_plugin.debugLogA("ChangeStatusMessage(): Set %s status and \"%S\" status message for %s.", StatusModeToDbSetting(iStatus, ""), msg, szProto);

 #endif

 			SetStatusMessage(szProto, iStatus, iStatus, msg, FALSE);

 			if (msg) mir_free(msg);

@@ -988,14 +953,14 @@ int ChangeStatusMessage(WPARAM wParam, LPARAM lParam)
 

 		if (hwndSAMsgDialog)

 			DestroyWindow(hwndSAMsgDialog);

-		hwndSAMsgDialog = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_AWAYMSGBOX), nullptr, AwayMsgBoxDlgProc, (LPARAM)box_data);

-	}

+		hwndSAMsgDialog = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_AWAYMSGBOX), nullptr, AwayMsgBoxDlgProc, (LPARAM)box_data);

+		}

 	else {

 		// iStatus == ID_STATUS_CURRENT only when bOnStartup == TRUE

 		if (iStatus == ID_STATUS_OFFLINE || (!(accounts->statusMsgFlags & Proto_Status2Flag(iStatus)) && iStatus != ID_STATUS_CURRENT))

 			return 0;

 

-		int iProtoFlags = db_get_b(NULL, "SimpleStatusMsg", "ProtoFlags", PROTO_DEFAULT);

+		int iProtoFlags = db_get_b(NULL, MODULENAME, "ProtoFlags", PROTO_DEFAULT);

 		if (!bShowDlg || bScreenSaverRunning || (iProtoFlags & PROTO_NOCHANGE && !bOnStartup)) {

 			for (int i = 0; i < accounts->count; ++i) {

 				auto *pa = accounts->pa[i];

@@ -1015,19 +980,19 @@ int ChangeStatusMessage(WPARAM wParam, LPARAM lParam)
 				wchar_t *msg;

 				if (iProtoFlags & PROTO_NOCHANGE) {

 					mir_snprintf(szSetting, "FCur%sMsg", pa->szModuleName);

-					msg = db_get_wsa(NULL, "SimpleStatusMsg", szSetting);

+					msg = db_get_wsa(NULL, MODULENAME, szSetting);

 				}

 				else

 					msg = GetAwayMessageFormat(iStatus, nullptr);

 #ifdef _DEBUG

-				log2file("ChangeStatusMessage(): Set %s status and \"%S\" status message for %s.", StatusModeToDbSetting(iStatus, ""), msg, pa->szModuleName);

+				g_plugin.debugLogA("ChangeStatusMessage(): Set %s status and \"%S\" status message for %s.", StatusModeToDbSetting(iStatus, ""), msg, pa->szModuleName);

 #endif

 				SetStatusMessage(pa->szModuleName, iStatus, iStatus, msg, FALSE);

 				if (msg)

 					mir_free(msg);

 			}

 			return 1;

-		}

+			}

 

 		MsgBoxInitData *box_data = (MsgBoxInitData*)mir_alloc(sizeof(MsgBoxInitData));

 		box_data->m_szProto = nullptr;

@@ -1039,10 +1004,10 @@ int ChangeStatusMessage(WPARAM wParam, LPARAM lParam)
 

 		if (hwndSAMsgDialog)

 			DestroyWindow(hwndSAMsgDialog);

-		hwndSAMsgDialog = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_AWAYMSGBOX), nullptr, AwayMsgBoxDlgProc, (LPARAM)box_data);

-	}

+		hwndSAMsgDialog = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_AWAYMSGBOX), nullptr, AwayMsgBoxDlgProc, (LPARAM)box_data);

+		}

 	return 0;

-}

+	}

 

 static INT_PTR ChangeStatusMsg(WPARAM wParam, LPARAM lParam)

 {

@@ -1064,7 +1029,7 @@ static int ProcessProtoAck(WPARAM, LPARAM lParam)
 

 	SaveStatusAsCurrent(ack->szModule, (int)ack->lParam);

 #ifdef _DEBUG

-	log2file("ProcessProtoAck(): Set %s (%d) status for %s.", StatusModeToDbSetting((int)ack->lParam, ""), (int)ack->lParam, (char *)ack->szModule);

+	g_plugin.debugLogA("ProcessProtoAck(): Set %s (%d) status for %s.", StatusModeToDbSetting((int)ack->lParam, ""), (int)ack->lParam, (char *)ack->szModule);

 #endif

 

 	return 0;

@@ -1088,7 +1053,7 @@ int SetStartupStatus(int i)
 	}

 

 	mir_snprintf(szSetting, "Proto%sFlags", pa->szModuleName);

-	int flags = db_get_b(NULL, "SimpleStatusMsg", szSetting, PROTO_DEFAULT);

+	int flags = db_get_b(NULL, MODULENAME, szSetting, PROTO_DEFAULT);

 	if (flags & PROTO_NO_MSG || flags & PROTO_THIS_MSG) {

 		if (HasProtoStaticStatusMsg(pa->szModuleName, ID_STATUS_OFFLINE, iStatus))

 			return 0;

@@ -1097,13 +1062,13 @@ int SetStartupStatus(int i)
 	}

 	else if (flags & PROTO_NOCHANGE) {

 		mir_snprintf(szSetting, "FCur%sMsg", pa->szModuleName);

-		fmsg = db_get_wsa(NULL, "SimpleStatusMsg", szSetting);

+		fmsg = db_get_wsa(NULL, MODULENAME, szSetting);

 	}

 	else

 		fmsg = GetAwayMessageFormat(iStatus, pa->szModuleName);

 

 #ifdef _DEBUG

-	log2file("SetStartupStatus(): Set %s status and \"%S\" status message for %s.", StatusModeToDbSetting(iStatus, ""), fmsg, pa->szModuleName);

+	g_plugin.debugLogA("SetStartupStatus(): Set %s status and \"%S\" status message for %s.", StatusModeToDbSetting(iStatus, ""), fmsg, pa->szModuleName);

 #endif

 

 	if (fmsg)

@@ -1151,12 +1116,12 @@ VOID CALLBACK SetStartupStatusGlobal(HWND hwnd, UINT, UINT_PTR idEvent, DWORD)
 	}

 

 	// popup status msg dialog at startup?

-	if (db_get_b(NULL, "SimpleStatusMsg", "StartupPopupDlg", 1) && accounts->statusMsgFlags) {

+	if (db_get_b(NULL, MODULENAME, "StartupPopupDlg", 1) && accounts->statusMsgFlags) {

 		if (globalstatus)

 			ChangeStatusMessage(status_mode, (LPARAM)"SimpleStatusMsgGlobalStartupStatus");

 		else {

 			// pseudo-currentDesiredStatusMode ;-)

-			db_set_w(NULL, "SimpleStatusMsg", "StartupStatus", (WORD)temp_status_mode);

+			db_set_w(NULL, MODULENAME, "StartupStatus", (WORD)temp_status_mode);

 			ChangeStatusMessage(ID_STATUS_CURRENT, (LPARAM)"SimpleStatusMsgGlobalStartupStatus");

 		}

 		return;

@@ -1205,7 +1170,7 @@ VOID CALLBACK UpdateMsgTimerProc(HWND, UINT, UINT_PTR, DWORD)
 {

 	MIRANDA_IDLE_INFO mii;

 	Idle_GetInfo(mii);

-	if (db_get_b(NULL, "SimpleStatusMsg", "NoUpdateOnIdle", 1) && mii.idleType)

+	if (db_get_b(NULL, MODULENAME, "NoUpdateOnIdle", 1) && mii.idleType)

 		return;

 

 	if (!hwndSAMsgDialog) {

@@ -1229,7 +1194,7 @@ VOID CALLBACK UpdateMsgTimerProc(HWND, UINT, UINT_PTR, DWORD)
 				continue;

 

 			mir_snprintf(szBuffer, "FCur%sMsg", pa->szModuleName);

-			wchar_t *tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", szBuffer);

+			wchar_t *tszStatusMsg = db_get_wsa(NULL, MODULENAME, szBuffer);

 			if (tszStatusMsg == nullptr)

 				continue;

 

@@ -1238,7 +1203,7 @@ VOID CALLBACK UpdateMsgTimerProc(HWND, UINT, UINT_PTR, DWORD)
 

 			mir_snprintf(szBuffer, "Cur%sMsg", pa->szModuleName);

 

-			tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", szBuffer);

+			tszStatusMsg = db_get_wsa(NULL, MODULENAME, szBuffer);

 			if ((tszMsg && tszStatusMsg && !mir_wstrcmp(tszMsg, tszStatusMsg)) || (!tszMsg && !tszStatusMsg)) {

 				mir_free(tszStatusMsg);

 				mir_free(tszMsg);

@@ -1249,15 +1214,15 @@ VOID CALLBACK UpdateMsgTimerProc(HWND, UINT, UINT_PTR, DWORD)
 

 			if (tszMsg && mir_wstrlen(tszMsg)) {

 #ifdef _DEBUG

-				log2file("UpdateMsgTimerProc(): Set %s status and \"%S\" status message for %s.", StatusModeToDbSetting(iCurrentStatus, ""), tszMsg, pa->szModuleName);

+				g_plugin.debugLogA("UpdateMsgTimerProc(): Set %s status and \"%S\" status message for %s.", StatusModeToDbSetting(iCurrentStatus, ""), tszMsg, pa->szModuleName);

 #endif

 				Proto_SetStatus(pa->szModuleName, iCurrentStatus, iCurrentStatus, tszMsg);

 				SaveMessageToDB(pa->szModuleName, tszMsg, FALSE);

 			}

 			mir_free(tszMsg);

+			}

 		}

 	}

-}

 

 static int AddTopToolbarButton(WPARAM, LPARAM)

 {

@@ -1309,7 +1274,7 @@ static int ChangeStatusMsgPrebuild(WPARAM, LPARAM)
 

 	CMenuItem mi;

 	mi.flags = CMIF_UNICODE;

-	if (!db_get_b(NULL, "SimpleStatusMsg", "ShowStatusMenuItem", 1))

+	if (!db_get_b(NULL, MODULENAME, "ShowStatusMenuItem", 1))

 		mi.flags |= CMIF_HIDDEN;

 	mi.hIcolibItem = GetIconHandle(IDI_CSMSG);

 	mi.pszService = MS_SIMPLESTATUSMSG_SHOWDIALOGINT;

@@ -1336,7 +1301,7 @@ static int ChangeStatusMsgPrebuild(WPARAM, LPARAM)
 

 		char szSetting[80];

 		mir_snprintf(szSetting, "Proto%sFlags", pa->szModuleName);

-		int iProtoFlags = db_get_b(NULL, "SimpleStatusMsg", szSetting, PROTO_DEFAULT);

+		int iProtoFlags = db_get_b(NULL, MODULENAME, szSetting, PROTO_DEFAULT);

 		if (iProtoFlags & PROTO_NO_MSG || iProtoFlags & PROTO_THIS_MSG)

 			continue;

 

@@ -1356,7 +1321,7 @@ static int ChangeStatusMsgPrebuild(WPARAM, LPARAM)
 static int OnIdleChanged(WPARAM, LPARAM lParam)

 {

 #ifdef _DEBUG

-	log2file("OnIdleChanged()");

+	g_plugin.debugLogA("OnIdleChanged()");

 #endif

 	if (!(lParam & IDF_ISIDLE))

 		g_iIdleTime = -1;

@@ -1366,7 +1331,7 @@ static int OnIdleChanged(WPARAM, LPARAM lParam)
 

 	if (mii.aaStatus == 0) {

 #ifdef _DEBUG

-		log2file("OnIdleChanged(): AutoAway disabled");

+		g_plugin.debugLogA("OnIdleChanged(): AutoAway disabled");

 #endif

 		return 0;

 	}

@@ -1404,7 +1369,7 @@ static int OnIdleChanged(WPARAM, LPARAM lParam)
 			mir_free(tszMsg);

 			mir_free(tszVarsMsg);

 		}

-	}

+}

 

 	return 0;

 }

@@ -1430,7 +1395,7 @@ static int CSStatusChange(WPARAM wParam, LPARAM)
 

 		SaveStatusAsCurrent(ps[i]->m_szName, status_mode);

 #ifdef _DEBUG

-		log2file("CSStatusChange(): Set %s status for %s.", StatusModeToDbSetting(status_mode, ""), ps[i]->m_szName);

+		g_plugin.debugLogA("CSStatusChange(): Set %s status for %s.", StatusModeToDbSetting(status_mode, ""), ps[i]->m_szName);

 #endif

 

 		// TODO SaveMessageToDB also when NULL?

@@ -1440,17 +1405,17 @@ static int CSStatusChange(WPARAM wParam, LPARAM)
 			wchar_t *szMsgW = mir_wstrdup(ps[i]->m_szMsg);

 

 #ifdef _DEBUG

-			log2file("CSStatusChange(): Set \"%s\" status message for %s.", ps[i]->m_szMsg, ps[i]->m_szName);

+			g_plugin.debugLogA("CSStatusChange(): Set \"%s\" status message for %s.", ps[i]->m_szMsg, ps[i]->m_szName);

 #endif

-			int max_hist_msgs = db_get_b(NULL, "SimpleStatusMsg", "MaxHist", 10);

+			int max_hist_msgs = db_get_b(NULL, MODULENAME, "MaxHist", 10);

 			for (int j = 1; j <= max_hist_msgs; j++) {

 				mir_snprintf(buff, "SMsg%d", j);

-				wchar_t *tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", buff);

+				wchar_t *tszStatusMsg = db_get_wsa(NULL, MODULENAME, buff);

 				if (tszStatusMsg != nullptr) {

 					if (!mir_wstrcmp(tszStatusMsg, szMsgW)) {

 						found = true;

 						mir_snprintf(szSetting, "Last%sMsg", ps[i]->m_szName);

-						db_set_s(NULL, "SimpleStatusMsg", szSetting, buff);

+						db_set_s(NULL, MODULENAME, szSetting, buff);

 						mir_free(tszStatusMsg);

 						break;

 					}

@@ -1462,7 +1427,7 @@ static int CSStatusChange(WPARAM wParam, LPARAM)
 			if (!found) {

 				mir_snprintf(buff, "FCur%sMsg", ps[i]->m_szName);

 				mir_snprintf(szSetting, "Last%sMsg", ps[i]->m_szName);

-				db_set_s(NULL, "SimpleStatusMsg", szSetting, buff);

+				db_set_s(NULL, MODULENAME, szSetting, buff);

 			}

 

 			mir_snprintf(szSetting, "%sMsg", ps[i]->m_szName);

@@ -1474,8 +1439,8 @@ static int CSStatusChange(WPARAM wParam, LPARAM)
 

 			SaveMessageToDB(ps[i]->m_szName, msg, FALSE);

 			mir_free(msg);

-		}

 	}

+}

 

 	return 0;

 }

@@ -1492,7 +1457,7 @@ static wchar_t *ParseWinampSong(ARGUMENTSINFO *ai)
 		mir_free(g_ptszWinampSong);

 		g_ptszWinampSong = mir_wstrdup(ptszWinampTitle);

 	}

-	else if (g_ptszWinampSong && mir_wstrcmp(g_ptszWinampSong, L"SimpleStatusMsg") && db_get_b(NULL, "SimpleStatusMsg", "AmpLeaveTitle", 1))

+	else if (g_ptszWinampSong && mir_wstrcmp(g_ptszWinampSong, TEXT(MODULENAME)) && db_get_b(NULL, MODULENAME, "AmpLeaveTitle", 1))

 		ptszWinampTitle = mir_wstrdup(g_ptszWinampSong);

 

 	return ptszWinampTitle;

@@ -1526,10 +1491,10 @@ int ICQMsgTypeToStatus(int iMsgType)
 static int OnICQStatusMsgRequest(WPARAM wParam, LPARAM lParam, LPARAM lMirParam)

 {

 #ifdef _DEBUG

-	log2file("OnICQStatusMsgRequest(): UIN: %d on %s", (int)lParam, (char *)lMirParam);

+	g_plugin.debugLogA("OnICQStatusMsgRequest(): UIN: %d on %s", (int)lParam, (char *)lMirParam);

 #endif

 

-	if (db_get_b(NULL, "SimpleStatusMsg", "NoUpdateOnICQReq", 1))

+	if (db_get_b(NULL, MODULENAME, "NoUpdateOnICQReq", 1))

 		return 0;

 

 	char *szProto = (char *)lMirParam;

@@ -1555,7 +1520,7 @@ static int OnICQStatusMsgRequest(WPARAM wParam, LPARAM lParam, LPARAM lMirParam)
 static int OnAccListChanged(WPARAM, LPARAM)

 {

 #ifdef _DEBUG

-	log2file("OnAccListChanged()");

+	g_plugin.debugLogA("OnAccListChanged()");

 #endif

 	accounts->statusFlags = 0;

 	accounts->statusCount = 0;

@@ -1594,7 +1559,7 @@ static int OnAccListChanged(WPARAM, LPARAM)
 static int OnModulesLoaded(WPARAM, LPARAM)

 {

 #ifdef _DEBUG

-	log2file("### Session started ###");

+	g_plugin.debugLogA("### Session started ###");

 #endif

 	OnAccListChanged(0, 0);

 

@@ -1622,7 +1587,7 @@ static int OnModulesLoaded(WPARAM, LPARAM)
 		tr.szHelpText = LPGEN("External Applications") "\t" LPGEN("retrieves song name of the song currently playing in Winamp (Simple Status Message compatible)");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);

 

-		if (db_get_b(NULL, "SimpleStatusMsg", "ExclDateToken", 0) != 0) {

+		if (db_get_b(NULL, MODULENAME, "ExclDateToken", 0) != 0) {

 			tr.tszTokenString = L"date";

 			tr.parseFunctionT = ParseDate;

 			tr.szHelpText = LPGEN("Miranda Related") "\t" LPGEN("get the date (Simple Status Message compatible)");

@@ -1630,12 +1595,12 @@ static int OnModulesLoaded(WPARAM, LPARAM)
 		}

 	}

 

-	g_ptszWinampSong = db_get_wsa(NULL, "SimpleStatusMsg", "AmpLastTitle");

+	g_ptszWinampSong = db_get_wsa(NULL, MODULENAME, "AmpLastTitle");

 	if (g_ptszWinampSong == nullptr)

-		g_ptszWinampSong = mir_wstrdup(L"SimpleStatusMsg");

+		g_ptszWinampSong = mir_wstrdup(TEXT(MODULENAME));

 

-	if (db_get_b(NULL, "SimpleStatusMsg", "UpdateMsgOn", 1))

-		g_uUpdateMsgTimer = SetTimer(nullptr, 0, db_get_w(NULL, "SimpleStatusMsg", "UpdateMsgInt", 10) * 1000, UpdateMsgTimerProc);

+	if (db_get_b(NULL, MODULENAME, "UpdateMsgOn", 1))

+		g_uUpdateMsgTimer = SetTimer(nullptr, 0, db_get_w(NULL, MODULENAME, "UpdateMsgInt", 10) * 1000, UpdateMsgTimerProc);

 

 	HookEvent(ME_CS_STATUSCHANGEEX, CSStatusChange);

 

@@ -1643,8 +1608,8 @@ static int OnModulesLoaded(WPARAM, LPARAM)
 		return 0;

 

 	if (!ServiceExists(MS_SS_GETPROFILECOUNT)) {

-		if (db_get_b(NULL, "SimpleStatusMsg", "GlobalStatusDelay", 1))

-			SetTimer(nullptr, 0, db_get_w(NULL, "SimpleStatusMsg", "SetStatusDelay", 300), SetStartupStatusGlobal);

+		if (db_get_b(NULL, MODULENAME, "GlobalStatusDelay", 1))

+			SetTimer(nullptr, 0, db_get_w(NULL, MODULENAME, "SetStatusDelay", 300), SetStartupStatusGlobal);

 		else {

 			g_uSetStatusTimer = (UINT_PTR *)mir_alloc(sizeof(UINT_PTR) * accounts->count);

 			for (int i = 0; i < accounts->count; ++i) {

@@ -1657,7 +1622,7 @@ static int OnModulesLoaded(WPARAM, LPARAM)
 

 				char szSetting[80];

 				mir_snprintf(szSetting, "Set%sStatusDelay", pa->szModuleName);

-				g_uSetStatusTimer[i] = SetTimer(nullptr, 0, db_get_w(NULL, "SimpleStatusMsg", szSetting, 300), SetStartupStatusProc);

+				g_uSetStatusTimer[i] = SetTimer(nullptr, 0, db_get_w(NULL, MODULENAME, szSetting, 300), SetStartupStatusProc);

 			}

 		}

 	}

@@ -1679,10 +1644,10 @@ static int OnOkToExit(WPARAM, LPARAM)
 				continue;

 

 			mir_snprintf(szSetting, "Last%sStatus", pa->szModuleName);

-			db_set_w(NULL, "SimpleStatusMsg", szSetting, Proto_GetStatus(pa->szModuleName));

+			db_set_w(NULL, MODULENAME, szSetting, Proto_GetStatus(pa->szModuleName));

 		}

 

-		if (g_ptszWinampSong && mir_wstrcmp(g_ptszWinampSong, L"SimpleStatusMsg") /*&& db_get_b(NULL, "SimpleStatusMsg", "AmpLeaveTitle", 1)*/)

+		if (g_ptszWinampSong && mir_wstrcmp(g_ptszWinampSong, TEXT(MODULENAME)) /*&& db_get_b(NULL, MODULENAME, "AmpLeaveTitle", 1)*/)

 			DBWriteMessage("AmpLastTitle", g_ptszWinampSong);

 	}

 

@@ -1710,6 +1675,8 @@ static INT_PTR sttGetAwayMessageT(WPARAM wParam, LPARAM lParam)
 	return (INT_PTR)GetAwayMessage((int)wParam, (char *)lParam, TRUE, NULL);

 }

 

+/////////////////////////////////////////////////////////////////////////////////////////

+

 extern "C" int __declspec(dllexport) Load(void)

 {

 	mir_getLP(&pluginInfo);

@@ -1732,10 +1699,11 @@ extern "C" int __declspec(dllexport) Load(void)
 	HookEvent(ME_SYSTEM_PRESHUTDOWN, OnPreShutdown);

 

 	IconsInit();

-

 	return 0;

 }

 

+/////////////////////////////////////////////////////////////////////////////////////////

+

 extern "C" int __declspec(dllexport) Unload(void)

 {

 	UnhookEvent(h_statusmodechange);

@@ -1744,7 +1712,7 @@ extern "C" int __declspec(dllexport) Unload(void)
 	mir_free(accounts);

 

 #ifdef _DEBUG

-	log2file("### Session ended ###");

+	g_plugin.debugLogA("### Session ended ###");

 #endif

 

 	return 0;

diff --git a/plugins/SimpleStatusMsg/src/msgbox.cpp b/plugins/SimpleStatusMsg/src/msgbox.cpp
index 9d02ca54c3..70a53b2bd5 100644
--- a/plugins/SimpleStatusMsg/src/msgbox.cpp
+++ b/plugins/SimpleStatusMsg/src/msgbox.cpp
@@ -106,7 +106,7 @@ HWND WINAPI CreateStatusComboBoxEx(HWND hwndDlg, struct MsgBoxData *data)
 
 	HWND handle = CreateWindowEx(0, WC_COMBOBOXEX, nullptr,
 		WS_TABSTOP | CBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_CHILD | CBS_DROPDOWNLIST,
-		0, 0, 0, 240, hwndDlg, nullptr, g_hInst, nullptr);
+		0, 0, 0, 240, hwndDlg, nullptr, g_plugin.getInst(), nullptr);
 
 	COMBOBOXEXITEM cbei = { 0 };
 	if (!(data->m_iDlgFlags & DLG_SHOW_STATUS_ICONS))
@@ -221,7 +221,7 @@ HWND WINAPI CreateRecentComboBoxEx(HWND hwndDlg, struct MsgBoxData *data)
 
 	HWND handle = CreateWindowEx(0, WC_COMBOBOXEX, nullptr,
 		WS_TABSTOP | CBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_CHILD | CBS_DROPDOWNLIST,
-		0, 0, 0, 300, hwndDlg, nullptr, g_hInst, nullptr);
+		0, 0, 0, 300, hwndDlg, nullptr, g_plugin.getInst(), nullptr);
 
 	COMBOBOXEXITEM cbei = { 0 };
 	if (!(data->m_iDlgFlags & DLG_SHOW_LIST_ICONS))
@@ -229,7 +229,7 @@ HWND WINAPI CreateRecentComboBoxEx(HWND hwndDlg, struct MsgBoxData *data)
 	else
 		cbei.mask = CBEIF_LPARAM | CBEIF_TEXT | CBEIF_IMAGE | CBEIF_SELECTEDIMAGE;
 
-	int j = db_get_w(NULL, "SimpleStatusMsg", "LMMsg", 1);
+	int j = db_get_w(NULL, MODULENAME, "LMMsg", 1);
 
 	for (int i = 1; i <= data->max_hist_msgs; ++i) {
 		// history messages
@@ -238,7 +238,7 @@ HWND WINAPI CreateRecentComboBoxEx(HWND hwndDlg, struct MsgBoxData *data)
 		mir_snprintf(buff, "SMsg%d", j);
 		j--;
 
-		wchar_t *tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", buff);
+		wchar_t *tszStatusMsg = db_get_wsa(NULL, MODULENAME, buff);
 		if (tszStatusMsg != nullptr) {
 			if (*tszStatusMsg != '\0') {
 				found = TRUE;
@@ -332,7 +332,7 @@ HWND WINAPI CreateRecentComboBoxEx(HWND hwndDlg, struct MsgBoxData *data)
 	for (int i = 1; i <= data->num_def_msgs; ++i) {
 		// predefined messages
 		mir_snprintf(buff, "DefMsg%d", i);
-		wchar_t *tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", buff);
+		wchar_t *tszStatusMsg = db_get_wsa(NULL, MODULENAME, buff);
 		if (tszStatusMsg != nullptr) {
 			if (*tszStatusMsg != '\0') {
 				cbei.iItem = -1;
@@ -353,7 +353,7 @@ HWND WINAPI CreateRecentComboBoxEx(HWND hwndDlg, struct MsgBoxData *data)
 		}
 	}
 
-	if (db_get_b(NULL, "SimpleStatusMsg", "PutDefInList", 0)) {
+	if (db_get_b(NULL, MODULENAME, "PutDefInList", 0)) {
 		cbei.iItem = -1;
 		cbei.pszText = (LPTSTR)GetDefaultMessage(data->m_iStatus);
 		if (data->m_iDlgFlags & DLG_SHOW_LIST_ICONS) {
@@ -391,7 +391,7 @@ HWND WINAPI CreateRecentComboBoxEx(HWND hwndDlg, struct MsgBoxData *data)
 
 VOID APIENTRY HandlePopupMenu(HWND hwnd, POINT pt, HWND edit_control)
 {
-	HMENU hmenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_EDITMENU));
+	HMENU hmenu = LoadMenu(g_plugin.getInst(), MAKEINTRESOURCE(IDR_EDITMENU));
 	if (hmenu == nullptr)
 		return;
 
@@ -640,9 +640,9 @@ void ClearHistory(struct MsgBoxData *data, int cur_sel)
 
 	for (i = 1; i <= data->max_hist_msgs; i++) {
 		mir_snprintf(text, "SMsg%d", i);
-		db_set_ws(NULL, "SimpleStatusMsg", text, L"");
+		db_set_ws(NULL, MODULENAME, text, L"");
 	}
-	db_set_s(NULL, "SimpleStatusMsg", "LastMsg", "");
+	db_set_s(NULL, MODULENAME, "LastMsg", "");
 	for (i = 0; i < accounts->count; i++) {
 		auto *pa = accounts->pa[i];
 		if (!pa->IsEnabled())
@@ -655,9 +655,9 @@ void ClearHistory(struct MsgBoxData *data, int cur_sel)
 			continue;
 
 		mir_snprintf(buff2, "Last%sMsg", pa->szModuleName);
-		db_set_s(NULL, "SimpleStatusMsg", buff2, "");
+		db_set_s(NULL, MODULENAME, buff2, "");
 	}
-	db_set_w(NULL, "SimpleStatusMsg", "LMMsg", (WORD)data->max_hist_msgs);
+	db_set_w(NULL, MODULENAME, "LMMsg", (WORD)data->max_hist_msgs);
 	SendMessage(data->recent_cbex, CB_SETCURSEL, -1, 0);
 	num_items = SendMessage(data->recent_cbex, CB_GETCOUNT, 0, 0);
 	if (num_items == CB_ERR)
@@ -685,7 +685,7 @@ void DisplayCharsCount(struct MsgBoxData *dlg_data, HWND hwndDlg)
 		return;
 
 	len = GetDlgItemText(hwndDlg, IDC_EDIT1, msg, _countof(msg));
-	if (db_get_b(NULL, "SimpleStatusMsg", "RemoveCR", 0)) {
+	if (db_get_b(NULL, MODULENAME, "RemoveCR", 0)) {
 		int index, num_lines = SendDlgItemMessage(hwndDlg, IDC_EDIT1, EM_GETLINECOUNT, 0, 0);
 		for (int i = 1; i < num_lines; ++i) {
 			index = SendDlgItemMessage(hwndDlg, IDC_EDIT1, EM_LINEINDEX, (WPARAM)i, 0);
@@ -706,7 +706,7 @@ void SetEditControlText(struct MsgBoxData *data, HWND hwndDlg, int iStatus)
 	num_start -= data->num_def_msgs + 1;
 
 	mir_snprintf(setting, "%sFlags", data->m_szProto ? data->m_szProto : "");
-	flags = db_get_b(NULL, "SimpleStatusMsg", (char *)StatusModeToDbSetting(iStatus, setting), STATUS_DEFAULT);
+	flags = db_get_b(NULL, MODULENAME, (char *)StatusModeToDbSetting(iStatus, setting), STATUS_DEFAULT);
 
 	if (flags & STATUS_LAST_MSG) {
 		if (data->m_szProto)
@@ -714,10 +714,10 @@ void SetEditControlText(struct MsgBoxData *data, HWND hwndDlg, int iStatus)
 		else
 			mir_snprintf(setting, "LastMsg");
 
-		char *szSetting = db_get_sa(NULL, "SimpleStatusMsg", setting);
+		char *szSetting = db_get_sa(NULL, MODULENAME, setting);
 		if (szSetting != nullptr) {
 			if (*szSetting != '\0') {
-				wchar_t *tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", szSetting);
+				wchar_t *tszStatusMsg = db_get_wsa(NULL, MODULENAME, szSetting);
 				if (tszStatusMsg != nullptr) {
 					if (*tszStatusMsg != '\0') {
 						SetDlgItemText(hwndDlg, IDC_EDIT1, tszStatusMsg);
@@ -734,7 +734,7 @@ void SetEditControlText(struct MsgBoxData *data, HWND hwndDlg, int iStatus)
 	else if (flags & STATUS_DEFAULT_MSG) {
 		SetDlgItemText(hwndDlg, IDC_EDIT1, GetDefaultMessage(iStatus));
 
-		if (db_get_b(NULL, "SimpleStatusMsg", "PutDefInList", 0)) {
+		if (db_get_b(NULL, MODULENAME, "PutDefInList", 0)) {
 			fcursel = SendMessage(data->recent_cbex, CB_FINDSTRINGEXACT, num_start, (LPARAM)GetDefaultMessage(iStatus));
 			if (fcursel != CB_ERR)
 				SendMessage(data->recent_cbex, CB_SETCURSEL, (WPARAM)fcursel, 0);
@@ -932,9 +932,9 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 			HookEventMessage(ME_SYSTEM_PRESHUTDOWN, hwndDlg, DM_SIMPAWAY_SHUTDOWN);
 			HookEventMessage(ME_SKIN2_ICONSCHANGED, hwndDlg, DM_SIMPAWAY_CHANGEICONS);
 
-			copy_init_data->num_def_msgs = db_get_w(NULL, "SimpleStatusMsg", "DefMsgCount", 0);
-			copy_init_data->max_hist_msgs = db_get_b(NULL, "SimpleStatusMsg", "MaxHist", 10);
-			copy_init_data->m_iDlgFlags = db_get_b(NULL, "SimpleStatusMsg", "DlgFlags", DLG_SHOW_DEFAULT);
+			copy_init_data->num_def_msgs = db_get_w(NULL, MODULENAME, "DefMsgCount", 0);
+			copy_init_data->max_hist_msgs = db_get_b(NULL, MODULENAME, "MaxHist", 10);
+			copy_init_data->m_iDlgFlags = db_get_b(NULL, MODULENAME, "DlgFlags", DLG_SHOW_DEFAULT);
 			copy_init_data->m_szProto = init_data->m_szProto;
 			copy_init_data->m_iStatus = init_data->m_iStatus;
 			copy_init_data->m_iStatusModes = init_data->m_iStatusModes;
@@ -1045,8 +1045,8 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 				}
 			}
 
-			if (db_get_b(NULL, "SimpleStatusMsg", "AutoClose", 1) && init_data->m_bOnEvent) {
-				copy_init_data->m_iCountdown = db_get_b(NULL, "SimpleStatusMsg", "DlgTime", 5);
+			if (db_get_b(NULL, MODULENAME, "AutoClose", 1) && init_data->m_bOnEvent) {
+				copy_init_data->m_iCountdown = db_get_b(NULL, MODULENAME, "DlgTime", 5);
 				SendMessage(hwndDlg, WM_TIMER, 0, 0);
 				SetTimer(hwndDlg, 1, 1000, nullptr);
 			}
@@ -1068,15 +1068,15 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 
 			mir_free(init_data);
 
-			if (!db_get_b(NULL, "SimpleStatusMsg", "WinCentered", 1)) {
+			if (!db_get_b(NULL, MODULENAME, "WinCentered", 1)) {
 				WINDOWPLACEMENT wp;
 				int x, y;
 
 				wp.length = sizeof(wp);
 				GetWindowPlacement(hwndDlg, &wp);
 
-				x = (int)db_get_dw(NULL, "SimpleStatusMsg", "Winx", -1);
-				y = (int)db_get_dw(NULL, "SimpleStatusMsg", "Winy", -1);
+				x = (int)db_get_dw(NULL, MODULENAME, "Winx", -1);
+				y = (int)db_get_dw(NULL, MODULENAME, "Winy", -1);
 
 				if (x != -1) {
 					OffsetRect(&wp.rcNormalPosition, x - wp.rcNormalPosition.left, y - wp.rcNormalPosition.top);
@@ -1127,13 +1127,13 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 					char szSetting[80];
 					if (msgbox_data->m_szProto) {
 						mir_snprintf(szSetting, "Last%sMsg", msgbox_data->m_szProto);
-						db_set_s(NULL, "SimpleStatusMsg", szSetting, "");
+						db_set_s(NULL, MODULENAME, szSetting, "");
 
 						mir_snprintf(szSetting, "%sMsg", msgbox_data->m_szProto);
 						db_set_ws(NULL, "SRAway", StatusModeToDbSetting(msgbox_data->m_iStatus, szSetting), L"");
 					}
 					else {
-						db_set_s(NULL, "SimpleStatusMsg", "LastMsg", "");
+						db_set_s(NULL, MODULENAME, "LastMsg", "");
 						for (int j = 0; j < accounts->count; j++) {
 							auto *pa = accounts->pa[j];
 							if (!pa->IsEnabled())
@@ -1149,7 +1149,7 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 								continue;
 
 							mir_snprintf(szSetting, "Last%sMsg", pa->szModuleName);
-							db_set_s(NULL, "SimpleStatusMsg", szSetting, "");
+							db_set_s(NULL, MODULENAME, szSetting, "");
 
 							mir_snprintf(szSetting, "%sMsg", pa->szModuleName);
 							iStatus = msgbox_data->m_bOnStartup ? GetStartupStatus(pa->szModuleName) : GetCurrentStatus(pa->szModuleName);
@@ -1172,19 +1172,19 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 
 					for (int i = 1; i <= msgbox_data->max_hist_msgs; i++) {
 						mir_snprintf(buff, "SMsg%d", i);
-						wchar_t *tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", buff);
+						wchar_t *tszStatusMsg = db_get_wsa(NULL, MODULENAME, buff);
 						if (tszStatusMsg != nullptr) {
 							if (!mir_wstrcmp(tszStatusMsg, tszMsg)) {
 								found = true;
 								if (msgbox_data->m_szProto) {
 									mir_snprintf(buff2, "Last%sMsg", msgbox_data->m_szProto);
-									db_set_s(NULL, "SimpleStatusMsg", buff2, buff);
+									db_set_s(NULL, MODULENAME, buff2, buff);
 
 									mir_snprintf(buff2, "%sMsg", msgbox_data->m_szProto);
 									db_set_ws(NULL, "SRAway", StatusModeToDbSetting(msgbox_data->m_iStatus, buff2), tszMsg);
 								}
 								else {
-									db_set_s(NULL, "SimpleStatusMsg", "LastMsg", buff);
+									db_set_s(NULL, MODULENAME, "LastMsg", buff);
 									for (int j = 0; j < accounts->count; j++) {
 										auto *pa = accounts->pa[j];
 										if (!pa->IsEnabled())
@@ -1200,7 +1200,7 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 											continue;
 
 										mir_snprintf(buff2, "Last%sMsg", pa->szModuleName);
-										db_set_s(NULL, "SimpleStatusMsg", buff2, buff);
+										db_set_s(NULL, MODULENAME, buff2, buff);
 
 										mir_snprintf(buff2, "%sMsg", pa->szModuleName);
 										iStatus = msgbox_data->m_bOnStartup ? GetStartupStatus(pa->szModuleName) : GetCurrentStatus(pa->szModuleName);
@@ -1215,7 +1215,7 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 					}
 
 					if (!found) {
-						int last_modified_msg = db_get_w(NULL, "SimpleStatusMsg", "LMMsg", msgbox_data->max_hist_msgs);
+						int last_modified_msg = db_get_w(NULL, MODULENAME, "LMMsg", msgbox_data->max_hist_msgs);
 
 						if (last_modified_msg == msgbox_data->max_hist_msgs)
 							last_modified_msg = 1;
@@ -1223,17 +1223,17 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 							last_modified_msg++;
 
 						mir_snprintf(buff, "SMsg%d", last_modified_msg);
-						db_set_ws(NULL, "SimpleStatusMsg", buff, tszMsg);
+						db_set_ws(NULL, MODULENAME, buff, tszMsg);
 
 						if (msgbox_data->m_szProto) {
 							mir_snprintf(buff2, "Last%sMsg", msgbox_data->m_szProto);
-							db_set_s(NULL, "SimpleStatusMsg", buff2, buff);
+							db_set_s(NULL, MODULENAME, buff2, buff);
 
 							mir_snprintf(buff2, "%sMsg", msgbox_data->m_szProto);
 							db_set_ws(NULL, "SRAway", StatusModeToDbSetting(msgbox_data->m_iStatus, buff2), tszMsg);
 						}
 						else {
-							db_set_s(NULL, "SimpleStatusMsg", "LastMsg", buff);
+							db_set_s(NULL, MODULENAME, "LastMsg", buff);
 							for (int j = 0; j < accounts->count; j++) {
 								auto *pa = accounts->pa[j];
 								if (!pa->IsEnabled())
@@ -1249,14 +1249,14 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 									continue;
 
 								mir_snprintf(buff2, "Last%sMsg", pa->szModuleName);
-								db_set_s(NULL, "SimpleStatusMsg", buff2, buff);
+								db_set_s(NULL, MODULENAME, buff2, buff);
 
 								mir_snprintf(buff2, "%sMsg", pa->szModuleName);
 								iStatus = msgbox_data->m_bOnStartup ? GetStartupStatus(pa->szModuleName) : GetCurrentStatus(pa->szModuleName);
 								db_set_ws(NULL, "SRAway", StatusModeToDbSetting(iStatus, buff2), tszMsg);
 							}
 						}
-						db_set_w(NULL, "SimpleStatusMsg", "LMMsg", (WORD)last_modified_msg);
+						db_set_w(NULL, MODULENAME, "LMMsg", (WORD)last_modified_msg);
 					}
 
 					if (!msgbox_data->m_szProto)
@@ -1387,7 +1387,7 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 					if (LOWORD(histitem.lParam) == HISTORY_MSG) {
 						char szSetting[16];
 						mir_snprintf(szSetting, "SMsg%d", (int)HIWORD(histitem.lParam));
-						db_set_ws(NULL, "SimpleStatusMsg", szSetting, L"");
+						db_set_ws(NULL, MODULENAME, szSetting, L"");
 						SendMessage(msgbox_data->recent_cbex, CBEM_DELETEITEM, (WPARAM)msgbox_data->curr_sel_msg, 0);
 					}
 					if (LOWORD(histitem.lParam) == PREDEFINED_MSG) {
@@ -1499,7 +1499,7 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 
 				if (LOWORD(histitem.lParam) == HISTORY_MSG) {
 					mir_snprintf(buff, "SMsg%d", (int)HIWORD(histitem.lParam));
-					db_set_ws(NULL, "SimpleStatusMsg", buff, L"");
+					db_set_ws(NULL, MODULENAME, buff, L"");
 				}
 				else if (LOWORD(histitem.lParam) == PREDEFINED_MSG)
 					msgbox_data->m_bPredefChanged = TRUE;
@@ -1570,8 +1570,8 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 			WINDOWPLACEMENT wp;
 			wp.length = sizeof(wp);
 			GetWindowPlacement(hwndDlg, &wp);
-			db_set_dw(NULL, "SimpleStatusMsg", "Winx", wp.rcNormalPosition.left);
-			db_set_dw(NULL, "SimpleStatusMsg", "Winy", wp.rcNormalPosition.top);
+			db_set_dw(NULL, MODULENAME, "Winx", wp.rcNormalPosition.left);
+			db_set_dw(NULL, MODULENAME, "Winy", wp.rcNormalPosition.top);
 
 			if (msgbox_data->m_bPredefChanged) {
 				int i, num_items, new_num_def_msgs = 0;
@@ -1591,13 +1591,13 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 					mir_snprintf(buff, "DefMsg%d", i);
 					if (LOWORD(cbitem.lParam) == PREDEFINED_MSG) {
 						new_num_def_msgs++;
-						db_set_ws(NULL, "SimpleStatusMsg", buff, text);
+						db_set_ws(NULL, MODULENAME, buff, text);
 					}
 					else
-						db_unset(NULL, "SimpleStatusMsg", buff);
+						db_unset(NULL, MODULENAME, buff);
 					num_items--;
 				}
-				db_set_w(NULL, "SimpleStatusMsg", "DefMsgCount", (WORD)new_num_def_msgs);
+				db_set_w(NULL, MODULENAME, "DefMsgCount", (WORD)new_num_def_msgs);
 			}
 
 			ImageList_Destroy(msgbox_data->status_icons);
diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp
index e83297dcad..9646aac6fd 100644
--- a/plugins/SimpleStatusMsg/src/options.cpp
+++ b/plugins/SimpleStatusMsg/src/options.cpp
@@ -131,7 +131,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 

 						SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_SETITEMDATA, (WPARAM)index, (LPARAM)i - ID_STATUS_ONLINE);

 

-						val = db_get_b(NULL, "SimpleStatusMsg", (char *)StatusModeToDbSetting(i, "Flags"), STATUS_DEFAULT);

+						val = db_get_b(NULL, MODULENAME, (char *)StatusModeToDbSetting(i, "Flags"), STATUS_DEFAULT);

 						data->status_msg[0].flags[i - ID_STATUS_ONLINE] = val;

 						ptrW text(db_get_wsa(NULL, "SRAway", StatusModeToDbSetting(i, "Default")));

 						mir_wstrncpy(data->status_msg[0].msg[i - ID_STATUS_ONLINE], (text == NULL) ? GetDefaultMessage(i) : text, 1024);

@@ -142,7 +142,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 								continue;

 

 							mir_snprintf(setting, "%sFlags", pa->szModuleName);

-							val = db_get_b(NULL, "SimpleStatusMsg", (char *)StatusModeToDbSetting(i, setting), STATUS_DEFAULT);

+							val = db_get_b(NULL, MODULENAME, (char *)StatusModeToDbSetting(i, setting), STATUS_DEFAULT);

 							data->status_msg[j + 1].flags[i - ID_STATUS_ONLINE] = val;

 							mir_snprintf(setting, "%sDefault", pa->szModuleName);

 							text = db_get_wsa(NULL, "SRAway", StatusModeToDbSetting(i, setting));

@@ -174,7 +174,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 				if (index != CB_ERR && index != CB_ERRSPACE) {

 					data->proto_msg[0].msg = nullptr;

 

-					val = db_get_b(NULL, "SimpleStatusMsg", "ProtoFlags", PROTO_DEFAULT);

+					val = db_get_b(NULL, MODULENAME, "ProtoFlags", PROTO_DEFAULT);

 					data->proto_msg[0].flags = val;

 					data->proto_msg[0].max_length = 0;

 					SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_SETITEMDATA, (WPARAM)index, 0);

@@ -193,14 +193,14 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 					// SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_SETITEMDATA, index, (LPARAM)i + 1);

 					if (index != CB_ERR && index != CB_ERRSPACE) {

 						mir_snprintf(setting, "Proto%sDefault", pa->szModuleName);

-						data->proto_msg[i + 1].msg = db_get_wsa(NULL, "SimpleStatusMsg", setting);

+						data->proto_msg[i + 1].msg = db_get_wsa(NULL, MODULENAME, setting);

 

 						mir_snprintf(setting, "Proto%sFlags", pa->szModuleName);

-						val = db_get_b(NULL, "SimpleStatusMsg", setting, PROTO_DEFAULT);

+						val = db_get_b(NULL, MODULENAME, setting, PROTO_DEFAULT);

 						data->proto_msg[i + 1].flags = val;

 

 						mir_snprintf(setting, "Proto%sMaxLen", pa->szModuleName);

-						val = db_get_w(NULL, "SimpleStatusMsg", setting, 1024);

+						val = db_get_w(NULL, MODULENAME, setting, 1024);

 						data->proto_msg[i + 1].max_length = val;

 						SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_SETITEMDATA, (WPARAM)index, (LPARAM)i + 1);

 					}

@@ -216,7 +216,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 				SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDC_CBOPTPROTO, CBN_SELCHANGE), (LPARAM)GetDlgItem(hwndDlg, IDC_CBOPTPROTO));

 			}

 

-			if (db_get_b(NULL, "SimpleStatusMsg", "PutDefInList", 0))

+			if (db_get_b(NULL, MODULENAME, "PutDefInList", 0))

 				CheckDlgButton(hwndDlg, IDC_COPTMSG2, BST_CHECKED);

 

 			if (ServiceExists(MS_VARS_FORMATSTRING)) {

@@ -417,9 +417,9 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 								mir_snprintf(setting, "LastMsg");

 

 							SetDlgItemText(hwndDlg, IDC_OPTEDIT1, L"");

-							char *szSetting = db_get_sa(NULL, "SimpleStatusMsg", setting);

+							char *szSetting = db_get_sa(NULL, MODULENAME, setting);

 							if (szSetting) {

-								wchar_t *tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", szSetting);

+								wchar_t *tszStatusMsg = db_get_wsa(NULL, MODULENAME, szSetting);

 								if (tszStatusMsg && mir_wstrlen(tszStatusMsg)) {

 									if (tszStatusMsg && mir_wstrlen(tszStatusMsg))

 										SetDlgItemText(hwndDlg, IDC_OPTEDIT1, tszStatusMsg);

@@ -554,9 +554,9 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 								mir_snprintf(setting, "LastMsg");

 

 							SetDlgItemText(hwndDlg, IDC_OPTEDIT1, L"");

-							char *szSetting = db_get_sa(NULL, "SimpleStatusMsg", setting);

+							char *szSetting = db_get_sa(NULL, MODULENAME, setting);

 							if (szSetting != nullptr) {

-								wchar_t *tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", szSetting);

+								wchar_t *tszStatusMsg = db_get_wsa(NULL, MODULENAME, szSetting);

 								if (tszStatusMsg) {

 									if (tszStatusMsg[0])

 										SetDlgItemText(hwndDlg, IDC_OPTEDIT1, tszStatusMsg);

@@ -639,9 +639,9 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 							mir_snprintf(setting, "LastMsg");

 

 						SetDlgItemText(hwndDlg, IDC_OPTEDIT1, L"");

-						char *szSetting = db_get_sa(NULL, "SimpleStatusMsg", setting);

+						char *szSetting = db_get_sa(NULL, MODULENAME, setting);

 						if (szSetting != nullptr) {

-							wchar_t *tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", szSetting);

+							wchar_t *tszStatusMsg = db_get_wsa(NULL, MODULENAME, szSetting);

 							if (tszStatusMsg) {

 								if (tszStatusMsg[0])

 									SetDlgItemText(hwndDlg, IDC_OPTEDIT1, tszStatusMsg);

@@ -741,9 +741,9 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 						SetDlgItemText(hwndDlg, IDC_OPTEDIT1, L"");

 

 

-						char *szSetting = db_get_sa(NULL, "SimpleStatusMsg", setting);

+						char *szSetting = db_get_sa(NULL, MODULENAME, setting);

 						if (szSetting != nullptr) {

-							wchar_t *tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", szSetting);

+							wchar_t *tszStatusMsg = db_get_wsa(NULL, MODULENAME, szSetting);

 							if (tszStatusMsg) {

 								if (tszStatusMsg[0])

 									SetDlgItemText(hwndDlg, IDC_OPTEDIT1, tszStatusMsg);

@@ -908,7 +908,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 			for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

 				if (accounts->statusMsgFlags & Proto_Status2Flag(i)) {

 					db_set_ws(NULL, "SRAway", StatusModeToDbSetting(i, "Default"), data->status_msg[0].msg[i - ID_STATUS_ONLINE]);

-					db_set_b(NULL, "SimpleStatusMsg", StatusModeToDbSetting(i, "Flags"), (BYTE)data->status_msg[0].flags[i - ID_STATUS_ONLINE]);

+					db_set_b(NULL, MODULENAME, StatusModeToDbSetting(i, "Flags"), (BYTE)data->status_msg[0].flags[i - ID_STATUS_ONLINE]);

 

 					for (int j = 0; j < accounts->count; j++) {

 						auto *pa = accounts->pa[j];

@@ -923,16 +923,16 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 							db_set_ws(NULL, "SRAway", StatusModeToDbSetting(i, szSetting), data->status_msg[j + 1].msg[i - ID_STATUS_ONLINE]);

 

 							mir_snprintf(szSetting, "%sFlags", pa->szModuleName);

-							db_set_b(NULL, "SimpleStatusMsg", StatusModeToDbSetting(i, szSetting), (BYTE)data->status_msg[j + 1].flags[i - ID_STATUS_ONLINE]);

+							db_set_b(NULL, MODULENAME, StatusModeToDbSetting(i, szSetting), (BYTE)data->status_msg[j + 1].flags[i - ID_STATUS_ONLINE]);

 						}

 					}

 				}

 			}

 

-			db_set_b(NULL, "SimpleStatusMsg", "PutDefInList", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_COPTMSG2) == BST_CHECKED));

+			db_set_b(NULL, MODULENAME, "PutDefInList", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_COPTMSG2) == BST_CHECKED));

 

 			if (data->proto_ok) {

-				db_set_b(NULL, "SimpleStatusMsg", "ProtoFlags", (BYTE)data->proto_msg[0].flags);

+				db_set_b(NULL, MODULENAME, "ProtoFlags", (BYTE)data->proto_msg[0].flags);

 

 				for (int i = 0; i < accounts->count; i++) {

 					auto *pa = accounts->pa[i];

@@ -947,15 +947,15 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 

 					mir_snprintf(szSetting, "Proto%sDefault", pa->szModuleName);

 					if (data->proto_msg[i + 1].msg && (data->proto_msg[i + 1].flags & PROTO_THIS_MSG))

-						db_set_ws(NULL, "SimpleStatusMsg", szSetting, data->proto_msg[i + 1].msg);

+						db_set_ws(NULL, MODULENAME, szSetting, data->proto_msg[i + 1].msg);

 					//						else

-					//							db_unset(NULL, "SimpleStatusMsg", szSetting);

+					//							db_unset(NULL, MODULENAME, szSetting);

 

 					mir_snprintf(szSetting, "Proto%sMaxLen", pa->szModuleName);

-					db_set_w(NULL, "SimpleStatusMsg", szSetting, (WORD)data->proto_msg[i + 1].max_length);

+					db_set_w(NULL, MODULENAME, szSetting, (WORD)data->proto_msg[i + 1].max_length);

 

 					mir_snprintf(szSetting, "Proto%sFlags", pa->szModuleName);

-					db_set_b(NULL, "SimpleStatusMsg", szSetting, (BYTE)data->proto_msg[i + 1].flags);

+					db_set_b(NULL, MODULENAME, szSetting, (BYTE)data->proto_msg[i + 1].flags);

 				}

 			}

 			RebuildStatusMenu();

@@ -987,16 +987,16 @@ static INT_PTR CALLBACK DlgVariablesOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM
 

 			SendDlgItemMessage(hwndDlg, IDC_SSECUPDTMSG, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_ESECUPDTMSG), 0);

 			SendDlgItemMessage(hwndDlg, IDC_SSECUPDTMSG, UDM_SETRANGE32, 1, 999);

-			SendDlgItemMessage(hwndDlg, IDC_SSECUPDTMSG, UDM_SETPOS, 0, MAKELONG((short)db_get_w(NULL, "SimpleStatusMsg", "UpdateMsgInt", 10), 0));

+			SendDlgItemMessage(hwndDlg, IDC_SSECUPDTMSG, UDM_SETPOS, 0, MAKELONG((short)db_get_w(NULL, MODULENAME, "UpdateMsgInt", 10), 0));

 			SendDlgItemMessage(hwndDlg, IDC_ESECUPDTMSG, EM_LIMITTEXT, 3, 0);

 

-			CheckDlgButton(hwndDlg, IDC_CUPDATEMSG, db_get_b(NULL, "SimpleStatusMsg", "UpdateMsgOn", 1) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_CNOIDLE, db_get_b(NULL, "SimpleStatusMsg", "NoUpdateOnIdle", 1) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_CNOICQREQ, db_get_b(NULL, "SimpleStatusMsg", "NoUpdateOnICQReq", 1) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_CLEAVEWINAMP, db_get_b(NULL, "SimpleStatusMsg", "AmpLeaveTitle", 1) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_CUPDATEMSG, db_get_b(NULL, MODULENAME, "UpdateMsgOn", 1) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_CNOIDLE, db_get_b(NULL, MODULENAME, "NoUpdateOnIdle", 1) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_CNOICQREQ, db_get_b(NULL, MODULENAME, "NoUpdateOnICQReq", 1) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_CLEAVEWINAMP, db_get_b(NULL, MODULENAME, "AmpLeaveTitle", 1) ? BST_CHECKED : BST_UNCHECKED);

 			if (ServiceExists(MS_VARS_FORMATSTRING)) {

-				CheckDlgButton(hwndDlg, IDC_CVARIABLES, db_get_b(NULL, "SimpleStatusMsg", "EnableVariables", 1) ? BST_CHECKED : BST_UNCHECKED);

-				CheckDlgButton(hwndDlg, IDC_CDATEPARSING, db_get_b(NULL, "SimpleStatusMsg", "ExclDateToken", 0) ? BST_CHECKED : BST_UNCHECKED);

+				CheckDlgButton(hwndDlg, IDC_CVARIABLES, db_get_b(NULL, MODULENAME, "EnableVariables", 1) ? BST_CHECKED : BST_UNCHECKED);

+				CheckDlgButton(hwndDlg, IDC_CDATEPARSING, db_get_b(NULL, MODULENAME, "ExclDateToken", 0) ? BST_CHECKED : BST_UNCHECKED);

 			}

 			else {

 				EnableWindow(GetDlgItem(hwndDlg, IDC_CVARIABLES), FALSE);

@@ -1046,22 +1046,22 @@ static INT_PTR CALLBACK DlgVariablesOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM
 				KillTimer(nullptr, g_uUpdateMsgTimer);

 

 			int val = SendDlgItemMessage(hwndDlg, IDC_SSECUPDTMSG, UDM_GETPOS, 0, 0);

-			db_set_w(NULL, "SimpleStatusMsg", "UpdateMsgInt", (WORD)val);

+			db_set_w(NULL, MODULENAME, "UpdateMsgInt", (WORD)val);

 

 			if (IsDlgButtonChecked(hwndDlg, IDC_CUPDATEMSG) == BST_CHECKED && val) {

-				db_set_b(NULL, "SimpleStatusMsg", "UpdateMsgOn", (BYTE)1);

+				db_set_b(NULL, MODULENAME, "UpdateMsgOn", (BYTE)1);

 				g_uUpdateMsgTimer = SetTimer(nullptr, 0, val * 1000, (TIMERPROC)UpdateMsgTimerProc);

 			}

 			else {

-				db_set_b(NULL, "SimpleStatusMsg", "UpdateMsgOn", (BYTE)0);

+				db_set_b(NULL, MODULENAME, "UpdateMsgOn", (BYTE)0);

 			}

 

-			db_set_b(NULL, "SimpleStatusMsg", "NoUpdateOnIdle", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CNOIDLE) == BST_CHECKED));

-			db_set_b(NULL, "SimpleStatusMsg", "NoUpdateOnICQReq", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CNOICQREQ) == BST_CHECKED));

-			db_set_b(NULL, "SimpleStatusMsg", "AmpLeaveTitle", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CLEAVEWINAMP) == BST_CHECKED));

+			db_set_b(NULL, MODULENAME, "NoUpdateOnIdle", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CNOIDLE) == BST_CHECKED));

+			db_set_b(NULL, MODULENAME, "NoUpdateOnICQReq", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CNOICQREQ) == BST_CHECKED));

+			db_set_b(NULL, MODULENAME, "AmpLeaveTitle", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CLEAVEWINAMP) == BST_CHECKED));

 			if (ServiceExists(MS_VARS_FORMATSTRING)) {

-				db_set_b(NULL, "SimpleStatusMsg", "EnableVariables", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CVARIABLES) == BST_CHECKED));

-				db_set_b(NULL, "SimpleStatusMsg", "ExclDateToken", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CDATEPARSING) == BST_CHECKED));

+				db_set_b(NULL, MODULENAME, "EnableVariables", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CVARIABLES) == BST_CHECKED));

+				db_set_b(NULL, MODULENAME, "ExclDateToken", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CDATEPARSING) == BST_CHECKED));

 			}

 			return TRUE;

 		}

@@ -1073,12 +1073,12 @@ static INT_PTR CALLBACK DlgVariablesOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM
 static bool IsHistoryMsgsFound(HWND, int histMax)

 {

 	char szSetting[16];

-	int j = db_get_w(NULL, "SimpleStatusMsg", "LMMsg", 1);

+	int j = db_get_w(NULL, MODULENAME, "LMMsg", 1);

 	for (int i = 1; i <= histMax; ++i, --j) {

 		if (j < 1)

 			j = histMax;

 		mir_snprintf(szSetting, "SMsg%d", j);

-		wchar_t *tszStatusMsg = db_get_wsa(NULL, "SimpleStatusMsg", szSetting);

+		wchar_t *tszStatusMsg = db_get_wsa(NULL, MODULENAME, szSetting);

 		if (tszStatusMsg != nullptr) {

 			if (*tszStatusMsg != '\0') {

 				mir_free(tszStatusMsg);

@@ -1110,7 +1110,7 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w
 			SendDlgItemMessage(hwndDlg, IDC_CBOPTBUTTONS, CB_SETITEMDATA, (WPARAM)i_btndownflat, DLG_SHOW_BUTTONS_FLAT);

 			SendDlgItemMessage(hwndDlg, IDC_CBOPTBUTTONS, CB_SETITEMDATA, (WPARAM)i_btnlist, DLG_SHOW_BUTTONS_INLIST);

 

-			settingValue = db_get_b(NULL, "SimpleStatusMsg", "DlgFlags", DLG_SHOW_DEFAULT);

+			settingValue = db_get_b(NULL, MODULENAME, "DlgFlags", DLG_SHOW_DEFAULT);

 			CheckDlgButton(hwndDlg, IDC_CSTATUSLIST, settingValue & DLG_SHOW_STATUS ? BST_CHECKED : BST_UNCHECKED);

 			CheckDlgButton(hwndDlg, IDC_CPROFILES, settingValue & DLG_SHOW_STATUS_PROFILES ? BST_CHECKED : BST_UNCHECKED);

 			CheckDlgButton(hwndDlg, IDC_CICONS1, settingValue & DLG_SHOW_STATUS_ICONS ? BST_CHECKED : BST_UNCHECKED);

@@ -1139,7 +1139,7 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w
 			}

 

 			// Misc.

-			settingValue = db_get_b(NULL, "SimpleStatusMsg", "MaxHist", 10);

+			settingValue = db_get_b(NULL, MODULENAME, "MaxHist", 10);

 

 			SendDlgItemMessage(hwndDlg, IDC_SMAXHIST, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_EMAXHIST), 0);

 			SendDlgItemMessage(hwndDlg, IDC_SMAXHIST, UDM_SETRANGE32, 0, 25);

@@ -1150,17 +1150,17 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w
 				EnableWindow(GetDlgItem(hwndDlg, IDC_CICONS2), FALSE);

 

 			EnableWindow(GetDlgItem(hwndDlg, IDC_BOPTHIST), IsHistoryMsgsFound(hwndDlg, settingValue));

-			EnableWindow(GetDlgItem(hwndDlg, IDC_BOPTDEF), db_get_w(NULL, "SimpleStatusMsg", "DefMsgCount", 0) != 0);

+			EnableWindow(GetDlgItem(hwndDlg, IDC_BOPTDEF), db_get_w(NULL, MODULENAME, "DefMsgCount", 0) != 0);

 

 			SendDlgItemMessage(hwndDlg, IDC_STIMEOUT, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_ETIMEOUT), 0);

 			SendDlgItemMessage(hwndDlg, IDC_STIMEOUT, UDM_SETRANGE32, 1, 60);

-			SendDlgItemMessage(hwndDlg, IDC_STIMEOUT, UDM_SETPOS, 0, MAKELONG((short)db_get_b(NULL, "SimpleStatusMsg", "DlgTime", 5), 0));

+			SendDlgItemMessage(hwndDlg, IDC_STIMEOUT, UDM_SETPOS, 0, MAKELONG((short)db_get_b(NULL, MODULENAME, "DlgTime", 5), 0));

 			SendDlgItemMessage(hwndDlg, IDC_ETIMEOUT, EM_LIMITTEXT, 2, 0);

 

-			CheckDlgButton(hwndDlg, IDC_CCLOSEWND, db_get_b(NULL, "SimpleStatusMsg", "AutoClose", 1) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_CRPOSWND, !db_get_b(NULL, "SimpleStatusMsg", "WinCentered", 1) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_CREMOVECR, db_get_b(NULL, "SimpleStatusMsg", "RemoveCR", 0) ? BST_CHECKED : BST_UNCHECKED);

-			CheckDlgButton(hwndDlg, IDC_CSHOWSMSG, db_get_b(NULL, "SimpleStatusMsg", "ShowStatusMenuItem", 1) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_CCLOSEWND, db_get_b(NULL, MODULENAME, "AutoClose", 1) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_CRPOSWND, !db_get_b(NULL, MODULENAME, "WinCentered", 1) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_CREMOVECR, db_get_b(NULL, MODULENAME, "RemoveCR", 0) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_CSHOWSMSG, db_get_b(NULL, MODULENAME, "ShowStatusMenuItem", 1) ? BST_CHECKED : BST_UNCHECKED);

 

 			SendMessage(hwndDlg, WM_USER + 2, 0, 0);

 			return TRUE;

@@ -1222,14 +1222,14 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w
 				if (hwndSAMsgDialog)

 					DestroyWindow(hwndSAMsgDialog);

 

-				int max_hist_msgs = db_get_b(NULL, "SimpleStatusMsg", "MaxHist", 10);

+				int max_hist_msgs = db_get_b(NULL, MODULENAME, "MaxHist", 10);

 				for (int i = 1; i <= max_hist_msgs; i++) {

 					char text[8];

 					mir_snprintf(text, "SMsg%d", i);

-					db_set_ws(NULL, "SimpleStatusMsg", text, L"");

+					db_set_ws(NULL, MODULENAME, text, L"");

 				}

 

-				db_set_s(NULL, "SimpleStatusMsg", "LastMsg", "");

+				db_set_s(NULL, MODULENAME, "LastMsg", "");

 

 				for (int i = 0; i < accounts->count; i++) {

 					auto *pa = accounts->pa[i];

@@ -1244,9 +1244,9 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w
 

 					char setting[80];

 					mir_snprintf(setting, "Last%sMsg", pa->szModuleName);

-					db_set_s(NULL, "SimpleStatusMsg", setting, "");

+					db_set_s(NULL, MODULENAME, setting, "");

 				}

-				db_set_w(NULL, "SimpleStatusMsg", "LMMsg", (WORD)max_hist_msgs);

+				db_set_w(NULL, MODULENAME, "LMMsg", (WORD)max_hist_msgs);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_BOPTHIST), FALSE);

 			}

 			return 0;

@@ -1256,13 +1256,13 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w
 				if (hwndSAMsgDialog)

 					DestroyWindow(hwndSAMsgDialog);

 

-				int nDefMSgCount = db_get_w(NULL, "SimpleStatusMsg", "DefMsgCount", 0);

+				int nDefMSgCount = db_get_w(NULL, MODULENAME, "DefMsgCount", 0);

 				for (int i = 1; i <= nDefMSgCount; i++) {

 					char szSetting[16];

 					mir_snprintf(szSetting, "DefMsg%d", i);

-					db_unset(NULL, "SimpleStatusMsg", szSetting);

+					db_unset(NULL, MODULENAME, szSetting);

 				}

-				db_set_w(NULL, "SimpleStatusMsg", "DefMsgCount", 0);

+				db_set_w(NULL, MODULENAME, "DefMsgCount", 0);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_BOPTDEF), FALSE);

 			}

 			return 0;

@@ -1288,15 +1288,15 @@ static INT_PTR CALLBACK DlgAdvancedOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM w
 			if (curSel != CB_ERR)

 				flags |= SendDlgItemMessage(hwndDlg, IDC_CBOPTBUTTONS, CB_GETITEMDATA, (WPARAM)curSel, 0);

 

-			db_set_b(NULL, "SimpleStatusMsg", "DlgFlags", (BYTE)flags);

+			db_set_b(NULL, MODULENAME, "DlgFlags", (BYTE)flags);

 

 			// Misc.

-			db_set_b(NULL, "SimpleStatusMsg", "MaxHist", (BYTE)GetDlgItemInt(hwndDlg, IDC_EMAXHIST, nullptr, FALSE));

-			db_set_b(NULL, "SimpleStatusMsg", "AutoClose", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CCLOSEWND) == BST_CHECKED));

-			db_set_b(NULL, "SimpleStatusMsg", "DlgTime", (BYTE)GetDlgItemInt(hwndDlg, IDC_ETIMEOUT, nullptr, FALSE));

-			db_set_b(NULL, "SimpleStatusMsg", "WinCentered", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CRPOSWND) != BST_CHECKED));

-			db_set_b(NULL, "SimpleStatusMsg", "RemoveCR", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CREMOVECR) == BST_CHECKED));

-			db_set_b(NULL, "SimpleStatusMsg", "ShowStatusMenuItem", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CSHOWSMSG) == BST_CHECKED));

+			db_set_b(NULL, MODULENAME, "MaxHist", (BYTE)GetDlgItemInt(hwndDlg, IDC_EMAXHIST, nullptr, FALSE));

+			db_set_b(NULL, MODULENAME, "AutoClose", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CCLOSEWND) == BST_CHECKED));

+			db_set_b(NULL, MODULENAME, "DlgTime", (BYTE)GetDlgItemInt(hwndDlg, IDC_ETIMEOUT, nullptr, FALSE));

+			db_set_b(NULL, MODULENAME, "WinCentered", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CRPOSWND) != BST_CHECKED));

+			db_set_b(NULL, MODULENAME, "RemoveCR", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CREMOVECR) == BST_CHECKED));

+			db_set_b(NULL, MODULENAME, "ShowStatusMenuItem", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CSHOWSMSG) == BST_CHECKED));

 			RebuildStatusMenu();

 

 			return TRUE;

@@ -1335,22 +1335,22 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 			if (index != LB_ERR && index != LB_ERRSPACE) {

 				char setting[80];

 				mir_snprintf(setting, "Startup%sStatus", pa->szModuleName);

-				data->status[i] = db_get_w(NULL, "SimpleStatusMsg", setting, ID_STATUS_CURRENT);

+				data->status[i] = db_get_w(NULL, MODULENAME, setting, ID_STATUS_CURRENT);

 				mir_snprintf(setting, "Set%sStatusDelay", pa->szModuleName);

-				data->setdelay[i] = db_get_w(NULL, "SimpleStatusMsg", setting, 300);

+				data->setdelay[i] = db_get_w(NULL, MODULENAME, setting, 300);

 				SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_SETITEMDATA, (WPARAM)index, (LPARAM)i);

 			}

 		}

 		SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_SETCURSEL, 0, 0);

 		SendMessage(hwndDlg, WM_COMMAND, MAKEWPARAM(IDC_LISTPROTO, LBN_SELCHANGE), (LPARAM)GetDlgItem(hwndDlg, IDC_LISTPROTO));

 

-		data->setglobaldelay = db_get_w(NULL, "SimpleStatusMsg", "SetStatusDelay", 300);

+		data->setglobaldelay = db_get_w(NULL, MODULENAME, "SetStatusDelay", 300);

 

 		SendDlgItemMessage(hwndDlg, IDC_SSETSTATUS, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_ESETSTATUS), 0);

 		SendDlgItemMessage(hwndDlg, IDC_SSETSTATUS, UDM_SETRANGE32, 0, 9000);

 		SendDlgItemMessage(hwndDlg, IDC_ESETSTATUS, EM_LIMITTEXT, 4, 0);

 

-		if (!db_get_b(NULL, "SimpleStatusMsg", "GlobalStatusDelay", 1)) {

+		if (!db_get_b(NULL, MODULENAME, "GlobalStatusDelay", 1)) {

 			CheckDlgButton(hwndDlg, IDC_SPECSET, BST_CHECKED);

 			int i = SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_LISTPROTO, LB_GETCURSEL, 0, 0), 0);

 			SetDlgItemInt(hwndDlg, IDC_ESETSTATUS, data->setdelay[i], FALSE);

@@ -1360,7 +1360,7 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 			SetDlgItemInt(hwndDlg, IDC_ESETSTATUS, data->setglobaldelay, FALSE);

 		}

 

-		if (db_get_b(NULL, "SimpleStatusMsg", "StartupPopupDlg", 1)) {

+		if (db_get_b(NULL, MODULENAME, "StartupPopupDlg", 1)) {

 			CheckDlgButton(hwndDlg, IDC_POPUPDLG, BST_CHECKED);

 			if (IsDlgButtonChecked(hwndDlg, IDC_SPECSET) == BST_CHECKED) {

 				CheckDlgButton(hwndDlg, IDC_SPECSET, BST_UNCHECKED);

@@ -1499,14 +1499,14 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 

 				char szSetting[80];

 				mir_snprintf(szSetting, "Startup%sStatus", pa->szModuleName);

-				db_set_w(NULL, "SimpleStatusMsg", szSetting, (WORD)data->status[i]);

+				db_set_w(NULL, MODULENAME, szSetting, (WORD)data->status[i]);

 

 				mir_snprintf(szSetting, "Set%sStatusDelay", pa->szModuleName);

-				db_set_w(NULL, "SimpleStatusMsg", szSetting, (WORD)data->setdelay[i]);

+				db_set_w(NULL, MODULENAME, szSetting, (WORD)data->setdelay[i]);

 			}

-			db_set_w(NULL, "SimpleStatusMsg", "SetStatusDelay", (WORD)data->setglobaldelay);

-			db_set_b(NULL, "SimpleStatusMsg", "GlobalStatusDelay", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_SPECSET) != BST_CHECKED));

-			db_set_b(NULL, "SimpleStatusMsg", "StartupPopupDlg", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_POPUPDLG) == BST_CHECKED));

+			db_set_w(NULL, MODULENAME, "SetStatusDelay", (WORD)data->setglobaldelay);

+			db_set_b(NULL, MODULENAME, "GlobalStatusDelay", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_SPECSET) != BST_CHECKED));

+			db_set_b(NULL, MODULENAME, "StartupPopupDlg", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_POPUPDLG) == BST_CHECKED));

 			return TRUE;

 		}

 		break;

@@ -1526,7 +1526,7 @@ int InitOptions(WPARAM wParam, LPARAM)
 		return 0;

 

 	OPTIONSDIALOGPAGE odp = { 0 };

-	odp.hInstance = g_hInst;

+	odp.hInstance = g_plugin.getInst();

 	odp.flags = ODPF_BOLDGROUPS;

 

 	if (!ServiceExists(MS_SS_GETPROFILECOUNT)) {

diff --git a/plugins/SimpleStatusMsg/src/simplestatusmsg.h b/plugins/SimpleStatusMsg/src/simplestatusmsg.h
index 7b027b8e58..08b03f1d15 100644
--- a/plugins/SimpleStatusMsg/src/simplestatusmsg.h
+++ b/plugins/SimpleStatusMsg/src/simplestatusmsg.h
@@ -21,16 +21,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SIMPLESTATUSMSG_H__

 #define SIMPLESTATUSMSG_H__ 1

 

-typedef struct tagACCOUNTS

+struct PROTOACCOUNTS

 {

-	PROTOACCOUNT	**pa;

-	int				count;

-	int				statusCount;

-	DWORD			statusFlags;

-	int				statusMsgCount;

-	DWORD			statusMsgFlags;

-}

-PROTOACCOUNTS;

+	PROTOACCOUNT **pa;

+	int   count;

+	int   statusCount;

+	DWORD statusFlags;

+	int   statusMsgCount;

+	DWORD statusMsgFlags;

+};

 

 extern PROTOACCOUNTS *accounts;

 

@@ -39,11 +38,11 @@ extern PROTOACCOUNTS *accounts;
 

 #define DLG_SHOW_STATUS				1

 #define DLG_SHOW_STATUS_ICONS		2

-#define DLG_SHOW_LIST_ICONS			4

+#define DLG_SHOW_LIST_ICONS		4

 #define DLG_SHOW_BUTTONS			8

-#define DLG_SHOW_BUTTONS_INLIST		16

+#define DLG_SHOW_BUTTONS_INLIST	16

 #define DLG_SHOW_BUTTONS_FLAT		32

-#define	DLG_SHOW_STATUS_PROFILES	64

+#define DLG_SHOW_STATUS_PROFILES	64

 //NOTE: MAX 128

 #define DLG_SHOW_DEFAULT			DLG_SHOW_STATUS | DLG_SHOW_STATUS_ICONS | DLG_SHOW_LIST_ICONS | DLG_SHOW_BUTTONS

 

@@ -71,7 +70,6 @@ struct MsgBoxInitData
 	BOOL	m_bOnStartup;

 };

 

-extern HINSTANCE g_hInst;

 extern HWND hwndSAMsgDialog;

 

 #define MS_SIMPLESTATUSMSG_SHOWDIALOGINT "SimpleStatusMsg/ShowDialogInternal" // internal use ONLY

diff --git a/plugins/SimpleStatusMsg/src/stdafx.h b/plugins/SimpleStatusMsg/src/stdafx.h
index 64928dfee7..4a0082bf49 100644
--- a/plugins/SimpleStatusMsg/src/stdafx.h
+++ b/plugins/SimpleStatusMsg/src/stdafx.h
@@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <windowsx.h>

 #include <time.h>

 

-#define __NO_CMPLUGIN_NEEDED

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_clistint.h>

@@ -45,6 +44,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <m_variables.h>

 #include <m_simplestatusmsg.h>

 

+#define MODULENAME "SimpleStatusMsg"

+

+struct CMPlugin : public PLUGIN<CMPlugin>

+{

+	CMPlugin() :

+		PLUGIN<CMPlugin>(MODULENAME)

+	{}

+};

+

 #include "simplestatusmsg.h"

 #include "resource.h"

 #include "version.h"

diff --git a/plugins/SimpleStatusMsg/src/utils.cpp b/plugins/SimpleStatusMsg/src/utils.cpp
index 1b046968ff..0c127418ca 100644
--- a/plugins/SimpleStatusMsg/src/utils.cpp
+++ b/plugins/SimpleStatusMsg/src/utils.cpp
@@ -36,7 +36,7 @@ static IconItem iconList[] =
 

 void IconsInit(void)

 {

-	Icon_Register(g_hInst, LPGEN("Simple Status Message"), iconList, _countof(iconList), "SimpleStatusMsg");

+	Icon_Register(g_plugin.getInst(), LPGEN("Simple Status Message"), iconList, _countof(iconList), MODULENAME);

 }

 

 HICON LoadIconEx(const char *name)

@@ -135,7 +135,7 @@ int GetCurrentStatus(const char *szProto)
 	if (szProto) {

 		char szSetting[80];

 		mir_snprintf(szSetting, "Cur%sStatus", szProto);

-		return (int)db_get_w(NULL, "SimpleStatusMsg", szSetting, ID_STATUS_OFFLINE);

+		return (int)db_get_w(NULL, MODULENAME, szSetting, ID_STATUS_OFFLINE);

 

 	}

 	return CallService(MS_CLIST_GETSTATUSMODE, 0, 0);

@@ -148,13 +148,13 @@ int GetStartupStatus(const char *szProto)
 		char szSetting[80];

 

 		mir_snprintf(szSetting, "Startup%sStatus", szProto);

-		status_mode = db_get_w(NULL, "SimpleStatusMsg", szSetting, ID_STATUS_CURRENT);

+		status_mode = db_get_w(NULL, MODULENAME, szSetting, ID_STATUS_CURRENT);

 		if (status_mode == ID_STATUS_CURRENT) {

 			// load status used for this proto last time

 			mir_snprintf(szSetting, "Last%sStatus", szProto);

-			status_mode = db_get_w(NULL, "SimpleStatusMsg", szSetting, ID_STATUS_OFFLINE);

+			status_mode = db_get_w(NULL, MODULENAME, szSetting, ID_STATUS_OFFLINE);

 		}

 		return status_mode;

 	}

-	return (int)db_get_w(NULL, "SimpleStatusMsg", "StartupStatus", ID_STATUS_OFFLINE);

+	return (int)db_get_w(NULL, MODULENAME, "StartupStatus", ID_STATUS_OFFLINE);

 }