less TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 14 insertions, 14 deletions

diff --git a/plugins/wbOSD/src/events.cpp b/plugins/wbOSD/src/events.cpp
index 015e240ff4..e2207bd059 100644
--- a/plugins/wbOSD/src/events.cpp
+++ b/plugins/wbOSD/src/events.cpp
@@ -63,7 +63,7 @@ int ProtoAck(WPARAM,LPARAM lparam)
 			DWORD ann = db_get_dw( NULL, THIS_MODULE, "announce", DEFAULT_ANNOUNCE );

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

 				wchar_t buffer[512];

-				mir_sntprintf(buffer, TranslateT("%s is %s"), pcli->pfnGetContactDisplayName(ack->hContact, 0), pcli->pfnGetStatusModeDescription(ack->lParam, 0));

+				mir_snwprintf(buffer, TranslateT("%s is %s"), pcli->pfnGetContactDisplayName(ack->hContact, 0), pcli->pfnGetStatusModeDescription(ack->lParam, 0));

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

 	}	}	}

 

@@ -121,7 +121,7 @@ int ContactStatusChanged(WPARAM wParam, LPARAM lParam)
 		return 0;

 

 	wchar_t bufferW[512];

-	mir_sntprintf(bufferW, TranslateT("%s is %s"), pcli->pfnGetContactDisplayName(wParam, 0), pcli->pfnGetStatusModeDescription(newStatus, 0));

+	mir_snwprintf(bufferW, TranslateT("%s is %s"), pcli->pfnGetContactDisplayName(wParam, 0), pcli->pfnGetStatusModeDescription(newStatus, 0));

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

 	return 0;

 }

@@ -155,7 +155,7 @@ int HookedNewEvent(WPARAM wParam, LPARAM hDBEvent)
 

 	DBVARIANT dbv;

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

-		mir_tstrcpy(buf, dbv.ptszVal);

+		mir_wstrcpy(buf, dbv.ptszVal);

 		db_free(&dbv);

 	}

 

@@ -183,17 +183,17 @@ int HookedNewEvent(WPARAM wParam, LPARAM hDBEvent)
 

 	wchar_t *c1 = 0, *c2 = 0;

 	if ( i1 == 1 )

-		c1 = mir_tstrdup(pcli->pfnGetContactDisplayName(wParam, 0));

+		c1 = mir_wstrdup(pcli->pfnGetContactDisplayName(wParam, 0));

 	else if ( i1 == 2 )

 		c1 = DbGetEventTextT( &dbe, 0 );

 

 	if ( i2 == 1 )

-		c2 = mir_tstrdup(pcli->pfnGetContactDisplayName(wParam, 0));

+		c2 = mir_wstrdup(pcli->pfnGetContactDisplayName(wParam, 0));

 	else if ( i2 == 2 )

 		c2 = DbGetEventTextT( &dbe, 0 );

 

 	wchar_t buffer[512];

-	mir_sntprintf(buffer, buf, c1, c2);

+	mir_snwprintf(buffer, buf, c1, c2);

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

 

 	mir_free( c1 );

diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp
index 76af0a3bb1..3749330a0f 100644
--- a/plugins/wbOSD/src/options.cpp
+++ b/plugins/wbOSD/src/options.cpp
@@ -128,10 +128,10 @@ void loadDBSettings(plgsettings *ps)
 

 	DBVARIANT dbv;

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

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

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

 		db_free(&dbv);

 	}

-	else mir_tstrcpy(ps->msgformat, DEFAULT_MESSAGEFORMAT);

+	else mir_wstrcpy(ps->msgformat, DEFAULT_MESSAGEFORMAT);

 

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

 

@@ -150,11 +150,11 @@ void loadDBSettings(plgsettings *ps)
 	ps->lf.lfPitchAndFamily = db_get_b(NULL, THIS_MODULE, "fntPitchAndFamily", DEFAULT_FNT_PITCHANDFAM);

 

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

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

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

 		db_free(&dbv);

 	}

 	else

-		mir_tstrcpy(ps->lf.lfFaceName, DEFAULT_FNT_FACENAME);

+		mir_wstrcpy(ps->lf.lfFaceName, DEFAULT_FNT_FACENAME);

 }

 

 void saveDBSettings(plgsettings *ps)

@@ -250,7 +250,7 @@ INT_PTR CALLBACK OptDlgProc(HWND hDlg, UINT msg, WPARAM wparam, LPARAM lparam)
 

 		{

 			wchar_t buf[20];

-			mir_sntprintf(buf, L"%d %%", ps->alpha * 100 / 255);

+			mir_snwprintf(buf, L"%d %%", ps->alpha * 100 / 255);

 			SetDlgItemText(hDlg, IDC_ALPHATXT, buf);

 		}

 

@@ -266,7 +266,7 @@ INT_PTR CALLBACK OptDlgProc(HWND hDlg, UINT msg, WPARAM wparam, LPARAM lparam)
 		ps->alpha = SendDlgItemMessage(hDlg, IDC_SLIDER1, TBM_GETPOS, 0, 0);

 		{

 			wchar_t buf[20];

-			mir_sntprintf(buf, L"%d %%", ps->alpha * 100 / 255);

+			mir_snwprintf(buf, L"%d %%", ps->alpha * 100 / 255);

 			SetDlgItemText(hDlg, IDC_ALPHATXT, buf);

 		}

 		goto xxx;

diff --git a/plugins/wbOSD/src/wbOSD.cpp b/plugins/wbOSD/src/wbOSD.cpp
index bc602ec52c..b48bfd6ee0 100644
--- a/plugins/wbOSD/src/wbOSD.cpp
+++ b/plugins/wbOSD/src/wbOSD.cpp
@@ -161,7 +161,7 @@ LRESULT CALLBACK WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 		logmsg("WindowProcedure::USER+1");

 

 		ms = (osdmsg*)mir_alloc(sizeof(osdmsg));

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

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

 		if (lParam == 0)

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

 		ms->timeout = lParam;

@@ -206,7 +206,7 @@ LRESULT CALLBACK WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 

 		ms = (osdmsg*)mir_alloc(sizeof(osdmsg));

 		memcpy(ms, (osdmsg*)wParam, sizeof(osdmsg));

-		ms->text = mir_tstrdup(ms->text);

+		ms->text = mir_wstrdup(ms->text);

 

 		SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)ms);

 		SetTimer(hwnd, (UINT_PTR)ms, (UINT)ms->timeout, 0);