CMPlugin to receive a reference to PLUGININFOEX

5 files changed, 184 insertions, 178 deletions

diff --git a/plugins/wbOSD/src/events.cpp b/plugins/wbOSD/src/events.cpp
index bda652b9ed..b16bcd1c97 100644
--- a/plugins/wbOSD/src/events.cpp
+++ b/plugins/wbOSD/src/events.cpp
@@ -11,7 +11,7 @@ Distributed under GNU's GPL 2 or later
 

 void logmsg2(char *str)

 {

-	FILE *f=fopen("c:\\logm.txt", "a");

+	FILE *f = fopen("c:\\logm.txt", "a");

 	fprintf(f, "%s\n", str);

 	fclose(f);

 }

@@ -19,7 +19,7 @@ void logmsg2(char *str)
 void showmsgwnd(unsigned int param)

 {

 	logmsg("showmsgwnd");

-	if (db_get_b(NULL,THIS_MODULE, "showMessageWindow", DEFAULT_SHOWMSGWIN))

+	if (db_get_b(NULL, MODULENAME, "showMessageWindow", DEFAULT_SHOWMSGWIN))

 		CallService(MS_MSG_SENDMESSAGEW, (WPARAM)param, 0);

 }

 

@@ -30,65 +30,67 @@ LRESULT ShowOSD(wchar_t *str, int timeout, COLORREF color, MCONTACT user)
 	if (!g_hWnd)

 		return 0;

 

-	if (timeout==0)

-		timeout=db_get_dw(NULL,THIS_MODULE, "timeout", DEFAULT_TIMEOUT);

+	if (timeout == 0)

+		timeout = db_get_dw(NULL, MODULENAME, "timeout", DEFAULT_TIMEOUT);

 

 	osdmsg om;

-	om.text=str;

-	om.timeout=timeout;

-	om.color=color;

-	om.param=(unsigned int)user;

-	om.callback=showmsgwnd;

-	

-	return SendMessage(g_hWnd, WM_USER+4, (WPARAM)&om, 0);

+	om.text = str;

+	om.timeout = timeout;

+	om.color = color;

+	om.param = (unsigned int)user;

+	om.callback = showmsgwnd;

+

+	return SendMessage(g_hWnd, WM_USER + 4, (WPARAM)&om, 0);

 }

 

-int ProtoAck(WPARAM,LPARAM lparam)

+int ProtoAck(WPARAM, LPARAM lparam)

 {

-	ACKDATA *ack=(ACKDATA *)lparam;

-	

+	ACKDATA *ack = (ACKDATA *)lparam;

+

 	logmsg("ProtoAck");

 

-	if (!db_get_b(NULL,THIS_MODULE, "a_user", DEFAULT_ANNOUNCESTATUS))

+	if (!db_get_b(NULL, MODULENAME, "a_user", DEFAULT_ANNOUNCESTATUS))

 		return 0;

 

-	if (!(db_get_dw(NULL,THIS_MODULE,"showWhen", DEFAULT_SHOWWHEN)&(1<<(db_get_w(NULL, "CList", "Status", ID_STATUS_OFFLINE)-ID_STATUS_OFFLINE))))

+	if (!(db_get_dw(NULL, MODULENAME, "showWhen", DEFAULT_SHOWWHEN)&(1 << (db_get_w(NULL, "CList", "Status", ID_STATUS_OFFLINE) - ID_STATUS_OFFLINE))))

 		return 0;

 

-	if ( ack->type == ACKTYPE_STATUS ) {

-		if (!db_get_b(NULL,THIS_MODULE, "showMyStatus", DEFAULT_SHOWMYSTATUS))

+	if (ack->type == ACKTYPE_STATUS) {

+		if (!db_get_b(NULL, MODULENAME, "showMyStatus", DEFAULT_SHOWMYSTATUS))

 			return 0;

 

-		if ( ack->result == ACKRESULT_SUCCESS && (LPARAM)ack->hProcess != ack->lParam ) {

-			DWORD ann = db_get_dw( NULL, THIS_MODULE, "announce", DEFAULT_ANNOUNCE );

-			if ( ann & ( 1 << ( ack->lParam - ID_STATUS_OFFLINE ))) {

+		if (ack->result == ACKRESULT_SUCCESS && (LPARAM)ack->hProcess != ack->lParam) {

+			DWORD ann = db_get_dw(NULL, MODULENAME, "announce", DEFAULT_ANNOUNCE);

+			if (ann & (1 << (ack->lParam - ID_STATUS_OFFLINE))) {

 				wchar_t buffer[512];

 				mir_snwprintf(buffer, TranslateT("%s is %s"), Clist_GetContactDisplayName(ack->hContact), Clist_GetStatusModeDescription(ack->lParam, 0));

-				ShowOSD(buffer, 0, db_get_dw(NULL,THIS_MODULE, "clr_status", DEFAULT_CLRSTATUS), ack->hContact);

-	}	}	}

+				ShowOSD(buffer, 0, db_get_dw(NULL, MODULENAME, "clr_status", DEFAULT_CLRSTATUS), ack->hContact);

+			}

+		}

+	}

 

 	return 0;

 }

 

-int ContactSettingChanged(WPARAM wParam,LPARAM lParam)

+int ContactSettingChanged(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT) wParam;

-	DBCONTACTWRITESETTING *cws=(DBCONTACTWRITESETTING*)lParam;

+	MCONTACT hContact = (MCONTACT)wParam;

+	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;

 

-	if(hContact==NULL || strcmp(cws->szSetting,"Status")) return 0;

+	if (hContact == NULL || strcmp(cws->szSetting, "Status")) return 0;

 

 	logmsg("ContactSettingChanged1");

 

 	WORD newStatus = cws->value.wVal;

-	WORD oldStatus = DBGetContactSettingRangedWord(hContact,"UserOnline","OldStatus2",ID_STATUS_OFFLINE, ID_STATUS_MIN, ID_STATUS_MAX);

-	

+	WORD oldStatus = DBGetContactSettingRangedWord(hContact, "UserOnline", "OldStatus2", ID_STATUS_OFFLINE, ID_STATUS_MIN, ID_STATUS_MAX);

+

 	if (oldStatus == newStatus) return 0;

-	

+

 	logmsg("ContactSettingChanged2");

 

-	db_set_w(hContact,"UserOnline","OldStatus2", newStatus);

+	db_set_w(hContact, "UserOnline", "OldStatus2", newStatus);

 

-	if(CallService(MS_IGNORE_ISIGNORED,wParam,IGNOREEVENT_USERONLINE)) return 0;

+	if (CallService(MS_IGNORE_ISIGNORED, wParam, IGNOREEVENT_USERONLINE)) return 0;

 

 	DWORD dwStatuses = MAKELPARAM(oldStatus, newStatus);

 	NotifyEventHooks(hHookContactStatusChanged, wParam, (LPARAM)dwStatuses);

@@ -98,31 +100,31 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam)
 

 int ContactStatusChanged(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT) wParam;

+	MCONTACT hContact = (MCONTACT)wParam;

 	WORD newStatus = HIWORD(lParam);

-	DWORD ann=db_get_dw(NULL,THIS_MODULE,"announce", DEFAULT_ANNOUNCE);

+	DWORD ann = db_get_dw(NULL, MODULENAME, "announce", DEFAULT_ANNOUNCE);

 

 	logmsg("ContactStatusChanged1");

 

-	if (!db_get_b(NULL,THIS_MODULE, "a_user", DEFAULT_ANNOUNCESTATUS))

+	if (!db_get_b(NULL, MODULENAME, "a_user", DEFAULT_ANNOUNCESTATUS))

 		return 0;

 

-	if (!(db_get_dw(NULL,THIS_MODULE,"showWhen", DEFAULT_SHOWWHEN)&(1<<(db_get_w(NULL, "CList", "Status", ID_STATUS_OFFLINE)-ID_STATUS_OFFLINE))))

+	if (!(db_get_dw(NULL, MODULENAME, "showWhen", DEFAULT_SHOWWHEN)&(1 << (db_get_w(NULL, "CList", "Status", ID_STATUS_OFFLINE) - ID_STATUS_OFFLINE))))

 		return 0;

 

-	if (!(ann&(1<<(newStatus-ID_STATUS_OFFLINE))) )

+	if (!(ann&(1 << (newStatus - ID_STATUS_OFFLINE))))

 		return 0;

-	

+

 	logmsg("ContactStatusChanged2");

 

-	if (db_get_b(hContact,"CList","NotOnList",0) || db_get_b(hContact,"CList","Hidden",0) || 

-		(CallService(MS_IGNORE_ISIGNORED,wParam,IGNOREEVENT_USERONLINE) && newStatus==ID_STATUS_ONLINE)

-	)

+	if (db_get_b(hContact, "CList", "NotOnList", 0) || db_get_b(hContact, "CList", "Hidden", 0) ||

+		(CallService(MS_IGNORE_ISIGNORED, wParam, IGNOREEVENT_USERONLINE) && newStatus == ID_STATUS_ONLINE)

+		)

 		return 0;

 

 	wchar_t bufferW[512];

 	mir_snwprintf(bufferW, TranslateT("%s is %s"), Clist_GetContactDisplayName(wParam), Clist_GetStatusModeDescription(newStatus, 0));

-	ShowOSD(bufferW, 0, db_get_dw(NULL,THIS_MODULE, "clr_status", DEFAULT_CLRSTATUS), hContact);

+	ShowOSD(bufferW, 0, db_get_dw(NULL, MODULENAME, "clr_status", DEFAULT_CLRSTATUS), hContact);

 	return 0;

 }

 

@@ -134,68 +136,70 @@ int HookedNewEvent(WPARAM wParam, LPARAM hDBEvent)
 	if (dbe.cbBlob == -1)

 		return 0;

 

-	dbe.pBlob = (PBYTE) malloc(dbe.cbBlob);

-	if(db_event_get(hDBEvent,&dbe))

+	dbe.pBlob = (PBYTE)malloc(dbe.cbBlob);

+	if (db_event_get(hDBEvent, &dbe))

 		return 0;

 

 	if (dbe.flags & DBEF_SENT)

-	    return 0;

+		return 0;

 

-	if (db_get_b(NULL,THIS_MODULE, "messages", DEFAULT_ANNOUNCEMESSAGES)==0)

+	if (db_get_b(NULL, MODULENAME, "messages", DEFAULT_ANNOUNCEMESSAGES) == 0)

 		return 0;

 

-	if (!(db_get_dw(NULL,THIS_MODULE,"showWhen", DEFAULT_SHOWWHEN)&(1<<(db_get_w(NULL, "CList", "Status", ID_STATUS_OFFLINE)-ID_STATUS_OFFLINE))))

+	if (!(db_get_dw(NULL, MODULENAME, "showWhen", DEFAULT_SHOWWHEN)&(1 << (db_get_w(NULL, "CList", "Status", ID_STATUS_OFFLINE) - ID_STATUS_OFFLINE))))

 		return 0;

-	

+

 	logmsg("HookedNewEvent2");

 

 	wchar_t buf[512];

-	wcsncpy(buf, DEFAULT_MESSAGEFORMAT,_countof(buf));

+	wcsncpy(buf, DEFAULT_MESSAGEFORMAT, _countof(buf));

 

 	DBVARIANT dbv;

-	if(!db_get_ws(NULL,THIS_MODULE,"message_format",&dbv)) {

+	if (!db_get_ws(NULL, MODULENAME, "message_format", &dbv)) {

 		mir_wstrcpy(buf, dbv.ptszVal);

 		db_free(&dbv);

 	}

 

-	int i1=-1, i2=-1;

+	int i1 = -1, i2 = -1;

 	wchar_t* pbuf = buf;

 	while (*pbuf) {

-		if (*pbuf=='%') {

-			if (*(pbuf+1)=='n') {

-				if (i1==-1)

-					i1=1;

-				else i2=1;

-				*(pbuf+1)='s';

-			} else if (*(pbuf+1)=='m') {

-				if (i1==-1)

-					i1=2;

-				else i2=2;

-				*(pbuf+1)='s';

-			} else if (*(pbuf+1)=='l') {

-				*pbuf=0x0d;

-				*(pbuf+1)=0x0a;

+		if (*pbuf == '%') {

+			if (*(pbuf + 1) == 'n') {

+				if (i1 == -1)

+					i1 = 1;

+				else i2 = 1;

+				*(pbuf + 1) = 's';

+			}

+			else if (*(pbuf + 1) == 'm') {

+				if (i1 == -1)

+					i1 = 2;

+				else i2 = 2;

+				*(pbuf + 1) = 's';

+			}

+			else if (*(pbuf + 1) == 'l') {

+				*pbuf = 0x0d;

+				*(pbuf + 1) = 0x0a;

 			}

 		}

 		pbuf++;

 	}

 

 	wchar_t *c1 = nullptr, *c2 = nullptr;

-	if ( i1 == 1 )

+	if (i1 == 1)

 		c1 = mir_wstrdup(Clist_GetContactDisplayName(wParam));

-	else if ( i1 == 2 )

-		c1 = DbEvent_GetTextW( &dbe, 0 );

+	else if (i1 == 2)

+		c1 = DbEvent_GetTextW(&dbe, 0);

 

-	if ( i2 == 1 )

+	if (i2 == 1)

 		c2 = mir_wstrdup(Clist_GetContactDisplayName(wParam));

-	else if ( i2 == 2 )

-		c2 = DbEvent_GetTextW( &dbe, 0 );

+	else if (i2 == 2)

+		c2 = DbEvent_GetTextW(&dbe, 0);

 

 	wchar_t buffer[512];

 	mir_snwprintf(buffer, buf, c1, c2);

-	ShowOSD(buffer, 0, db_get_dw(NULL,THIS_MODULE, "clr_msg", DEFAULT_CLRMSG), wParam);

+	ShowOSD(buffer, 0, db_get_dw(NULL, MODULENAME, "clr_msg", DEFAULT_CLRMSG), wParam);

 

-	mir_free( c1 );

-	mir_free( c2 );

+	mir_free(c1);

+	mir_free(c2);

 	return 0;

 }

diff --git a/plugins/wbOSD/src/main.cpp b/plugins/wbOSD/src/main.cpp
index f24e5edb8c..50114b9047 100644
--- a/plugins/wbOSD/src/main.cpp
+++ b/plugins/wbOSD/src/main.cpp
@@ -20,7 +20,7 @@ int MainInit(WPARAM,LPARAM);
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-static PLUGININFOEX pluginInfo = {

+static PLUGININFOEX pluginInfoEx = {

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

@@ -33,16 +33,20 @@ static PLUGININFOEX pluginInfo = {
 	{0xfc718bc7, 0xabc8, 0x43cd, {0xaa, 0xd9, 0x76, 0x16, 0x14, 0x61, 0x77, 0x38}}

 };

 

+CMPlugin::CMPlugin() :

+	PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)

+{}

+

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

 {

-	return &pluginInfo;

+	return &pluginInfoEx;

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

 

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

 {

-	mir_getLP(&pluginInfo);

+	mir_getLP(&pluginInfoEx);

 

 	logmsg("Load");

 	HookEvent(ME_SYSTEM_MODULESLOADED, MainInit);

diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp
index 0b041ed5d9..1c92e5829d 100644
--- a/plugins/wbOSD/src/options.cpp
+++ b/plugins/wbOSD/src/options.cpp
@@ -103,53 +103,53 @@ void loadDBSettings(plgsettings *ps)
 {

 	logmsg("loadDBSettings");

 

-	ps->align = db_get_b(NULL, THIS_MODULE, "align", DEFAULT_ALIGN);

-	ps->salign = db_get_b(NULL, THIS_MODULE, "salign", DEFAULT_SALIGN);

-	ps->altShadow = db_get_b(NULL, THIS_MODULE, "altShadow", DEFAULT_ALTSHADOW);

-	ps->transparent = db_get_b(NULL, THIS_MODULE, "transparent", DEFAULT_TRANPARENT);

-	ps->showShadow = db_get_b(NULL, THIS_MODULE, "showShadow", DEFAULT_SHOWSHADOW);

-	ps->messages = db_get_b(NULL, THIS_MODULE, "messages", DEFAULT_ANNOUNCEMESSAGES);

-	ps->a_user = db_get_b(NULL, THIS_MODULE, "a_user", DEFAULT_ANNOUNCESTATUS);

-	ps->distance = db_get_b(NULL, THIS_MODULE, "distance", DEFAULT_DISTANCE);

-	ps->winx = db_get_dw(NULL, THIS_MODULE, "winx", DEFAULT_WINX);

-	ps->winy = db_get_dw(NULL, THIS_MODULE, "winy", DEFAULT_WINY);

-	ps->winxpos = db_get_dw(NULL, THIS_MODULE, "winxpos", DEFAULT_WINXPOS);

-	ps->winypos = db_get_dw(NULL, THIS_MODULE, "winypos", DEFAULT_WINYPOS);

-	ps->alpha = db_get_b(NULL, THIS_MODULE, "alpha", DEFAULT_ALPHA);

-	ps->showmystatus = db_get_b(NULL, THIS_MODULE, "showMyStatus", DEFAULT_SHOWMYSTATUS);

-	ps->timeout = db_get_dw(NULL, THIS_MODULE, "timeout", DEFAULT_TIMEOUT);

-	ps->clr_msg = db_get_dw(NULL, THIS_MODULE, "clr_msg", DEFAULT_CLRMSG);

-	ps->clr_status = db_get_dw(NULL, THIS_MODULE, "clr_status", DEFAULT_CLRSTATUS);

-	ps->clr_shadow = db_get_dw(NULL, THIS_MODULE, "clr_shadow", DEFAULT_CLRSHADOW);

-	ps->bkclr = db_get_dw(NULL, THIS_MODULE, "bkclr", DEFAULT_BKCLR);

-

-	ps->showMsgWindow = db_get_b(NULL, THIS_MODULE, "showMessageWindow", DEFAULT_SHOWMSGWIN);

-	ps->showWhen = db_get_dw(NULL, THIS_MODULE, "showWhen", DEFAULT_SHOWWHEN);

+	ps->align = db_get_b(NULL, MODULENAME, "align", DEFAULT_ALIGN);

+	ps->salign = db_get_b(NULL, MODULENAME, "salign", DEFAULT_SALIGN);

+	ps->altShadow = db_get_b(NULL, MODULENAME, "altShadow", DEFAULT_ALTSHADOW);

+	ps->transparent = db_get_b(NULL, MODULENAME, "transparent", DEFAULT_TRANPARENT);

+	ps->showShadow = db_get_b(NULL, MODULENAME, "showShadow", DEFAULT_SHOWSHADOW);

+	ps->messages = db_get_b(NULL, MODULENAME, "messages", DEFAULT_ANNOUNCEMESSAGES);

+	ps->a_user = db_get_b(NULL, MODULENAME, "a_user", DEFAULT_ANNOUNCESTATUS);

+	ps->distance = db_get_b(NULL, MODULENAME, "distance", DEFAULT_DISTANCE);

+	ps->winx = db_get_dw(NULL, MODULENAME, "winx", DEFAULT_WINX);

+	ps->winy = db_get_dw(NULL, MODULENAME, "winy", DEFAULT_WINY);

+	ps->winxpos = db_get_dw(NULL, MODULENAME, "winxpos", DEFAULT_WINXPOS);

+	ps->winypos = db_get_dw(NULL, MODULENAME, "winypos", DEFAULT_WINYPOS);

+	ps->alpha = db_get_b(NULL, MODULENAME, "alpha", DEFAULT_ALPHA);

+	ps->showmystatus = db_get_b(NULL, MODULENAME, "showMyStatus", DEFAULT_SHOWMYSTATUS);

+	ps->timeout = db_get_dw(NULL, MODULENAME, "timeout", DEFAULT_TIMEOUT);

+	ps->clr_msg = db_get_dw(NULL, MODULENAME, "clr_msg", DEFAULT_CLRMSG);

+	ps->clr_status = db_get_dw(NULL, MODULENAME, "clr_status", DEFAULT_CLRSTATUS);

+	ps->clr_shadow = db_get_dw(NULL, MODULENAME, "clr_shadow", DEFAULT_CLRSHADOW);

+	ps->bkclr = db_get_dw(NULL, MODULENAME, "bkclr", DEFAULT_BKCLR);

+

+	ps->showMsgWindow = db_get_b(NULL, MODULENAME, "showMessageWindow", DEFAULT_SHOWMSGWIN);

+	ps->showWhen = db_get_dw(NULL, MODULENAME, "showWhen", DEFAULT_SHOWWHEN);

 

 	DBVARIANT dbv;

-	if (!db_get_ws(NULL, THIS_MODULE, "message_format", &dbv)) {

+	if (!db_get_ws(NULL, MODULENAME, "message_format", &dbv)) {

 		mir_wstrcpy(ps->msgformat, dbv.ptszVal);

 		db_free(&dbv);

 	}

 	else mir_wstrcpy(ps->msgformat, DEFAULT_MESSAGEFORMAT);

 

-	ps->announce = db_get_dw(NULL, THIS_MODULE, "announce", DEFAULT_ANNOUNCE);

-

-	ps->lf.lfHeight = db_get_dw(NULL, THIS_MODULE, "fntHeight", DEFAULT_FNT_HEIGHT);

-	ps->lf.lfWidth = db_get_dw(NULL, THIS_MODULE, "fntWidth", DEFAULT_FNT_WIDTH);

-	ps->lf.lfEscapement = db_get_dw(NULL, THIS_MODULE, "fntEscapement", DEFAULT_FNT_ESCAPEMENT);

-	ps->lf.lfOrientation = db_get_dw(NULL, THIS_MODULE, "fntOrientation", DEFAULT_FNT_ORIENTATION);

-	ps->lf.lfWeight = db_get_dw(NULL, THIS_MODULE, "fntWeight", DEFAULT_FNT_WEIGHT);

-	ps->lf.lfItalic = db_get_b(NULL, THIS_MODULE, "fntItalic", DEFAULT_FNT_ITALIC);

-	ps->lf.lfUnderline = db_get_b(NULL, THIS_MODULE, "fntUnderline", DEFAULT_FNT_UNDERLINE);

-	ps->lf.lfStrikeOut = db_get_b(NULL, THIS_MODULE, "fntStrikeout", DEFAULT_FNT_STRIKEOUT);

-	ps->lf.lfCharSet = db_get_b(NULL, THIS_MODULE, "fntCharSet", DEFAULT_FNT_CHARSET);

-	ps->lf.lfOutPrecision = db_get_b(NULL, THIS_MODULE, "fntOutPrecision", DEFAULT_FNT_OUTPRECISION);

-	ps->lf.lfClipPrecision = db_get_b(NULL, THIS_MODULE, "fntClipPrecision", DEFAULT_FNT_CLIPRECISION);

-	ps->lf.lfQuality = db_get_b(NULL, THIS_MODULE, "fntQuality", DEFAULT_FNT_QUALITY);

-	ps->lf.lfPitchAndFamily = db_get_b(NULL, THIS_MODULE, "fntPitchAndFamily", DEFAULT_FNT_PITCHANDFAM);

-

-	if (!db_get_ws(NULL, THIS_MODULE, "fntFaceName", &dbv)) {

+	ps->announce = db_get_dw(NULL, MODULENAME, "announce", DEFAULT_ANNOUNCE);

+

+	ps->lf.lfHeight = db_get_dw(NULL, MODULENAME, "fntHeight", DEFAULT_FNT_HEIGHT);

+	ps->lf.lfWidth = db_get_dw(NULL, MODULENAME, "fntWidth", DEFAULT_FNT_WIDTH);

+	ps->lf.lfEscapement = db_get_dw(NULL, MODULENAME, "fntEscapement", DEFAULT_FNT_ESCAPEMENT);

+	ps->lf.lfOrientation = db_get_dw(NULL, MODULENAME, "fntOrientation", DEFAULT_FNT_ORIENTATION);

+	ps->lf.lfWeight = db_get_dw(NULL, MODULENAME, "fntWeight", DEFAULT_FNT_WEIGHT);

+	ps->lf.lfItalic = db_get_b(NULL, MODULENAME, "fntItalic", DEFAULT_FNT_ITALIC);

+	ps->lf.lfUnderline = db_get_b(NULL, MODULENAME, "fntUnderline", DEFAULT_FNT_UNDERLINE);

+	ps->lf.lfStrikeOut = db_get_b(NULL, MODULENAME, "fntStrikeout", DEFAULT_FNT_STRIKEOUT);

+	ps->lf.lfCharSet = db_get_b(NULL, MODULENAME, "fntCharSet", DEFAULT_FNT_CHARSET);

+	ps->lf.lfOutPrecision = db_get_b(NULL, MODULENAME, "fntOutPrecision", DEFAULT_FNT_OUTPRECISION);

+	ps->lf.lfClipPrecision = db_get_b(NULL, MODULENAME, "fntClipPrecision", DEFAULT_FNT_CLIPRECISION);

+	ps->lf.lfQuality = db_get_b(NULL, MODULENAME, "fntQuality", DEFAULT_FNT_QUALITY);

+	ps->lf.lfPitchAndFamily = db_get_b(NULL, MODULENAME, "fntPitchAndFamily", DEFAULT_FNT_PITCHANDFAM);

+

+	if (!db_get_ws(NULL, MODULENAME, "fntFaceName", &dbv)) {

 		mir_wstrcpy(ps->lf.lfFaceName, dbv.ptszVal);

 		db_free(&dbv);

 	}

@@ -161,52 +161,52 @@ void saveDBSettings(plgsettings *ps)
 {

 	logmsg("saveDBSettings");

 

-	db_set_b(NULL, THIS_MODULE, "showShadow", ps->showShadow);

-	db_set_b(NULL, THIS_MODULE, "altShadow", ps->altShadow);

-	db_set_b(NULL, THIS_MODULE, "distance", ps->distance);

-

-	db_set_dw(NULL, THIS_MODULE, "winx", ps->winx);

-	db_set_dw(NULL, THIS_MODULE, "winy", ps->winy);

-	db_set_dw(NULL, THIS_MODULE, "winxpos", ps->winxpos);

-	db_set_dw(NULL, THIS_MODULE, "winypos", ps->winypos);

-

-	db_set_b(NULL, THIS_MODULE, "alpha", ps->alpha);

-	db_set_dw(NULL, THIS_MODULE, "timeout", ps->timeout);

-

-	db_set_b(NULL, THIS_MODULE, "transparent", ps->transparent);

-	db_set_b(NULL, THIS_MODULE, "messages", ps->messages);

-	db_set_b(NULL, THIS_MODULE, "a_user", ps->a_user);

-	db_set_ws(NULL, THIS_MODULE, "message_format", ps->msgformat);

-

-	db_set_b(NULL, THIS_MODULE, "align", ps->align);

-	db_set_b(NULL, THIS_MODULE, "salign", ps->salign);

-

-	db_set_b(NULL, THIS_MODULE, "showMyStatus", ps->showmystatus);

-

-	db_set_dw(NULL, THIS_MODULE, "clr_msg", ps->clr_msg);

-	db_set_dw(NULL, THIS_MODULE, "clr_shadow", ps->clr_shadow);

-	db_set_dw(NULL, THIS_MODULE, "clr_status", ps->clr_status);

-	db_set_dw(NULL, THIS_MODULE, "bkclr", ps->bkclr);

-

-	db_set_dw(NULL, THIS_MODULE, "fntHeight", ps->lf.lfHeight);

-	db_set_dw(NULL, THIS_MODULE, "fntWidth", ps->lf.lfWidth);

-	db_set_dw(NULL, THIS_MODULE, "fntEscapement", ps->lf.lfEscapement);

-	db_set_dw(NULL, THIS_MODULE, "fntOrientation", ps->lf.lfOrientation);

-	db_set_dw(NULL, THIS_MODULE, "fntWeight", ps->lf.lfWeight);

-	db_set_b(NULL, THIS_MODULE, "fntItalic", ps->lf.lfItalic);

-	db_set_b(NULL, THIS_MODULE, "fntUnderline", ps->lf.lfUnderline);

-	db_set_b(NULL, THIS_MODULE, "fntStrikeout", ps->lf.lfStrikeOut);

-	db_set_b(NULL, THIS_MODULE, "fntCharSet", ps->lf.lfCharSet);

-	db_set_b(NULL, THIS_MODULE, "fntOutPrecision", ps->lf.lfOutPrecision);

-	db_set_b(NULL, THIS_MODULE, "fntClipPrecision", ps->lf.lfClipPrecision);

-	db_set_b(NULL, THIS_MODULE, "fntQuality", ps->lf.lfQuality);

-	db_set_b(NULL, THIS_MODULE, "fntPitchAndFamily", ps->lf.lfPitchAndFamily);

-	db_set_ws(NULL, THIS_MODULE, "fntFaceName", ps->lf.lfFaceName);

-

-	db_set_dw(NULL, THIS_MODULE, "announce", ps->announce);

-

-	db_set_b(NULL, THIS_MODULE, "showMessageWindow", ps->showMsgWindow);

-	db_set_dw(NULL, THIS_MODULE, "showWhen", ps->showWhen);

+	db_set_b(NULL, MODULENAME, "showShadow", ps->showShadow);

+	db_set_b(NULL, MODULENAME, "altShadow", ps->altShadow);

+	db_set_b(NULL, MODULENAME, "distance", ps->distance);

+

+	db_set_dw(NULL, MODULENAME, "winx", ps->winx);

+	db_set_dw(NULL, MODULENAME, "winy", ps->winy);

+	db_set_dw(NULL, MODULENAME, "winxpos", ps->winxpos);

+	db_set_dw(NULL, MODULENAME, "winypos", ps->winypos);

+

+	db_set_b(NULL, MODULENAME, "alpha", ps->alpha);

+	db_set_dw(NULL, MODULENAME, "timeout", ps->timeout);

+

+	db_set_b(NULL, MODULENAME, "transparent", ps->transparent);

+	db_set_b(NULL, MODULENAME, "messages", ps->messages);

+	db_set_b(NULL, MODULENAME, "a_user", ps->a_user);

+	db_set_ws(NULL, MODULENAME, "message_format", ps->msgformat);

+

+	db_set_b(NULL, MODULENAME, "align", ps->align);

+	db_set_b(NULL, MODULENAME, "salign", ps->salign);

+

+	db_set_b(NULL, MODULENAME, "showMyStatus", ps->showmystatus);

+

+	db_set_dw(NULL, MODULENAME, "clr_msg", ps->clr_msg);

+	db_set_dw(NULL, MODULENAME, "clr_shadow", ps->clr_shadow);

+	db_set_dw(NULL, MODULENAME, "clr_status", ps->clr_status);

+	db_set_dw(NULL, MODULENAME, "bkclr", ps->bkclr);

+

+	db_set_dw(NULL, MODULENAME, "fntHeight", ps->lf.lfHeight);

+	db_set_dw(NULL, MODULENAME, "fntWidth", ps->lf.lfWidth);

+	db_set_dw(NULL, MODULENAME, "fntEscapement", ps->lf.lfEscapement);

+	db_set_dw(NULL, MODULENAME, "fntOrientation", ps->lf.lfOrientation);

+	db_set_dw(NULL, MODULENAME, "fntWeight", ps->lf.lfWeight);

+	db_set_b(NULL, MODULENAME, "fntItalic", ps->lf.lfItalic);

+	db_set_b(NULL, MODULENAME, "fntUnderline", ps->lf.lfUnderline);

+	db_set_b(NULL, MODULENAME, "fntStrikeout", ps->lf.lfStrikeOut);

+	db_set_b(NULL, MODULENAME, "fntCharSet", ps->lf.lfCharSet);

+	db_set_b(NULL, MODULENAME, "fntOutPrecision", ps->lf.lfOutPrecision);

+	db_set_b(NULL, MODULENAME, "fntClipPrecision", ps->lf.lfClipPrecision);

+	db_set_b(NULL, MODULENAME, "fntQuality", ps->lf.lfQuality);

+	db_set_b(NULL, MODULENAME, "fntPitchAndFamily", ps->lf.lfPitchAndFamily);

+	db_set_ws(NULL, MODULENAME, "fntFaceName", ps->lf.lfFaceName);

+

+	db_set_dw(NULL, MODULENAME, "announce", ps->announce);

+

+	db_set_b(NULL, MODULENAME, "showMessageWindow", ps->showMsgWindow);

+	db_set_dw(NULL, MODULENAME, "showWhen", ps->showWhen);

 }

 

 INT_PTR CALLBACK OptDlgProc(HWND hDlg, UINT msg, WPARAM wparam, LPARAM lparam)

@@ -364,9 +364,9 @@ xxx:
 		saveDBSettings(ps);

 		SetWindowPos(g_hWnd, nullptr, 0, 0, ps->winx, ps->winy, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);

 		SetLayeredWindowAttributes(g_hWnd, 

-			db_get_dw(NULL, THIS_MODULE, "bkclr", DEFAULT_BKCLR), 

-			db_get_b(NULL, THIS_MODULE, "alpha", DEFAULT_ALPHA), 

-			(db_get_b(NULL, THIS_MODULE, "transparent", DEFAULT_TRANPARENT) ? LWA_COLORKEY : 0) | LWA_ALPHA);

+			db_get_dw(NULL, MODULENAME, "bkclr", DEFAULT_BKCLR), 

+			db_get_b(NULL, MODULENAME, "alpha", DEFAULT_ALPHA), 

+			(db_get_b(NULL, MODULENAME, "transparent", DEFAULT_TRANPARENT) ? LWA_COLORKEY : 0) | LWA_ALPHA);

 		InvalidateRect(g_hWnd, nullptr, TRUE);

 		SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0);

 

@@ -397,7 +397,7 @@ xxx:
 			ps[1] = ps[0]; //apply current settings at closing

 

 			saveDBSettings(ps);

-			SetLayeredWindowAttributes(g_hWnd, db_get_dw(NULL, THIS_MODULE, "bkclr", DEFAULT_BKCLR), db_get_b(NULL, THIS_MODULE, "alpha", DEFAULT_ALPHA), (db_get_b(NULL, THIS_MODULE, "transparent", DEFAULT_TRANPARENT) ? LWA_COLORKEY : 0) | LWA_ALPHA);

+			SetLayeredWindowAttributes(g_hWnd, db_get_dw(NULL, MODULENAME, "bkclr", DEFAULT_BKCLR), db_get_b(NULL, MODULENAME, "alpha", DEFAULT_ALPHA), (db_get_b(NULL, MODULENAME, "transparent", DEFAULT_TRANPARENT) ? LWA_COLORKEY : 0) | LWA_ALPHA);

 			InvalidateRect(g_hWnd, nullptr, TRUE);

 			break;

 		}

diff --git a/plugins/wbOSD/src/stdafx.h b/plugins/wbOSD/src/stdafx.h
index 9d261f861d..1355f3787d 100644
--- a/plugins/wbOSD/src/stdafx.h
+++ b/plugins/wbOSD/src/stdafx.h
@@ -26,13 +26,11 @@ Distributed under GNU's GPL 2 or later
 #include "resource.h"

 #include "version.h"

 

-#define THIS_MODULE "mirandaosd"

+#define MODULENAME "mirandaosd"

 

 struct CMPlugin : public PLUGIN<CMPlugin>

 {

-	CMPlugin() :

-		PLUGIN<CMPlugin>(THIS_MODULE)

-	{}

+	CMPlugin();

 };

 

 // Settings defaults

diff --git a/plugins/wbOSD/src/wbOSD.cpp b/plugins/wbOSD/src/wbOSD.cpp
index 7b227db5cb..4be73bf5f1 100644
--- a/plugins/wbOSD/src/wbOSD.cpp
+++ b/plugins/wbOSD/src/wbOSD.cpp
@@ -163,10 +163,10 @@ LRESULT CALLBACK WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 		ms = (osdmsg*)mir_alloc(sizeof(osdmsg));

 		ms->text = mir_wstrdup((wchar_t *)wParam);

 		if (lParam == 0)

-			lParam = db_get_dw(NULL, THIS_MODULE, "timeout", DEFAULT_TIMEOUT);

+			lParam = db_get_dw(NULL, MODULENAME, "timeout", DEFAULT_TIMEOUT);

 		ms->timeout = lParam;

 		ms->callback = nullptr;

-		ms->color = db_get_dw(NULL, THIS_MODULE, "clr_msg", DEFAULT_CLRMSG);

+		ms->color = db_get_dw(NULL, MODULENAME, "clr_msg", DEFAULT_CLRMSG);

 		ms->param = 0;

 		SendMessage(hwnd, WM_USER + 4, (WPARAM)ms, 0);

 		mir_free(ms->text);

@@ -278,15 +278,15 @@ int MainInit(WPARAM, LPARAM)
 

 	g_hWnd = CreateWindowEx(WS_EX_LAYERED | WS_EX_TOOLWINDOW, szClassName, L"WannaBeOSD",

 		WS_POPUP,

-		db_get_dw(NULL, THIS_MODULE, "winxpos", DEFAULT_WINXPOS),

-		db_get_dw(NULL, THIS_MODULE, "winypos", DEFAULT_WINYPOS),

-		db_get_dw(NULL, THIS_MODULE, "winx", DEFAULT_WINX),

-		db_get_dw(NULL, THIS_MODULE, "winy", DEFAULT_WINY),

+		db_get_dw(NULL, MODULENAME, "winxpos", DEFAULT_WINXPOS),

+		db_get_dw(NULL, MODULENAME, "winypos", DEFAULT_WINYPOS),

+		db_get_dw(NULL, MODULENAME, "winx", DEFAULT_WINX),

+		db_get_dw(NULL, MODULENAME, "winy", DEFAULT_WINY),

 		HWND_DESKTOP, nullptr, g_plugin.getInst(), nullptr);

 

 	SetWindowLongPtr(g_hWnd, GWLP_USERDATA, 0);

 

-	SetLayeredWindowAttributes(g_hWnd, db_get_dw(NULL, THIS_MODULE, "bkclr", DEFAULT_BKCLR), db_get_b(NULL, THIS_MODULE, "alpha", DEFAULT_ALPHA), (db_get_b(NULL, THIS_MODULE, "transparent", DEFAULT_TRANPARENT) ? LWA_COLORKEY : 0) | LWA_ALPHA);

+	SetLayeredWindowAttributes(g_hWnd, db_get_dw(NULL, MODULENAME, "bkclr", DEFAULT_BKCLR), db_get_b(NULL, MODULENAME, "alpha", DEFAULT_ALPHA), (db_get_b(NULL, MODULENAME, "transparent", DEFAULT_TRANPARENT) ? LWA_COLORKEY : 0) | LWA_ALPHA);

 

 	CreateServiceFunction("OSD/Announce", OSDAnnounce);