less TCHARs

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

2 files changed, 13 insertions, 13 deletions

diff --git a/src/core/stdaway/src/awaymsg.cpp b/src/core/stdaway/src/awaymsg.cpp
index b51b6f4d7a..141dfc56c1 100644
--- a/src/core/stdaway/src/awaymsg.cpp
+++ b/src/core/stdaway/src/awaymsg.cpp
@@ -61,11 +61,11 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wP
 			wchar_t *status = pcli->pfnGetStatusModeDescription(dwStatus, 0);

 

 			GetWindowText(hwndDlg, format, _countof(format));

-			mir_sntprintf(str, format, status, contactName);

+			mir_snwprintf(str, format, status, contactName);

 			SetWindowText(hwndDlg, str);

 

 			GetDlgItemText(hwndDlg, IDC_RETRIEVING, format, _countof(format));

-			mir_sntprintf(str, format, status);

+			mir_snwprintf(str, format, status);

 			SetDlgItemText(hwndDlg, IDC_RETRIEVING, str);

 

 			Window_SetProtoIcon_IcoLib(hwndDlg, szProto, dwStatus);

@@ -141,7 +141,7 @@ static int AwayMsgPreBuildMenu(WPARAM hContact, LPARAM)
 			if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGRECV) {

 				if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_3, 0) & Proto_Status2Flag(status)) {

 					wchar_t str[128];

-					mir_sntprintf(str, TranslateT("Re&ad %s message"), pcli->pfnGetStatusModeDescription(status, 0));

+					mir_snwprintf(str, TranslateT("Re&ad %s message"), pcli->pfnGetStatusModeDescription(status, 0));

 					Menu_ModifyItem(hAwayMsgMenuItem, str, Skin_LoadProtoIcon(szProto, status), CMIF_NOTOFFLINE);

 					return 0;

 				}

diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp
index a3f2968588..409e598a07 100644
--- a/src/core/stdaway/src/sendmsg.cpp
+++ b/src/core/stdaway/src/sendmsg.cpp
@@ -90,11 +90,11 @@ static wchar_t* GetAwayMessage(int statusMode, char *szProto)
 	DBVARIANT dbv;

 	if ( GetStatusModeByte(statusMode, "UsePrev")) {

 		if ( db_get_ts(NULL, "SRAway", StatusModeToDbSetting(statusMode, "Msg"), &dbv))

-			dbv.ptszVal = mir_tstrdup(GetDefaultMessage(statusMode));

+			dbv.ptszVal = mir_wstrdup(GetDefaultMessage(statusMode));

 	}

 	else {

 		if ( db_get_ts(NULL, "SRAway", StatusModeToDbSetting(statusMode, "Default"), &dbv))

-			dbv.ptszVal = mir_tstrdup(GetDefaultMessage(statusMode));

+			dbv.ptszVal = mir_wstrdup(GetDefaultMessage(statusMode));

 

 		for (int i=0; dbv.ptszVal[i]; i++) {

 			if (dbv.ptszVal[i] != '%')

@@ -121,10 +121,10 @@ static wchar_t* GetAwayMessage(int statusMode, char *szProto)
 				GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, substituteStr, _countof(substituteStr));

 			else continue;

 

-			if (mir_tstrlen(substituteStr) > 6)

-				dbv.ptszVal = (wchar_t*)mir_realloc(dbv.ptszVal, (mir_tstrlen(dbv.ptszVal) + 1 + mir_tstrlen(substituteStr) - 6) * sizeof(wchar_t));

-			memmove(dbv.ptszVal + i + mir_tstrlen(substituteStr), dbv.ptszVal + i + 6, (mir_tstrlen(dbv.ptszVal) - i - 5) * sizeof(wchar_t));

-			memcpy(dbv.ptszVal+i, substituteStr, mir_tstrlen(substituteStr) * sizeof(wchar_t));

+			if (mir_wstrlen(substituteStr) > 6)

+				dbv.ptszVal = (wchar_t*)mir_realloc(dbv.ptszVal, (mir_wstrlen(dbv.ptszVal) + 1 + mir_wstrlen(substituteStr) - 6) * sizeof(wchar_t));

+			memmove(dbv.ptszVal + i + mir_wstrlen(substituteStr), dbv.ptszVal + i + 6, (mir_wstrlen(dbv.ptszVal) - i - 5) * sizeof(wchar_t));

+			memcpy(dbv.ptszVal+i, substituteStr, mir_wstrlen(substituteStr) * sizeof(wchar_t));

 		}

 	}

 	return dbv.ptszVal;

@@ -226,7 +226,7 @@ static INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wPa
 			{

 				wchar_t str[256], format[128];

 				GetWindowText(hwndDlg, format, _countof(format));

-				mir_sntprintf(str, format, pcli->pfnGetStatusModeDescription(dat->statusMode, 0));

+				mir_snwprintf(str, format, pcli->pfnGetStatusModeDescription(dat->statusMode, 0));

 				SetWindowText(hwndDlg, str);

 			}

 			GetDlgItemText(hwndDlg, IDOK, dat->okButtonFormat, _countof(dat->okButtonFormat));

@@ -247,7 +247,7 @@ static INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wPa
 	case WM_TIMER:

 		if (--dat->countdown >= 0) {

 			wchar_t str[64];

-			mir_sntprintf(str, dat->okButtonFormat, dat->countdown);

+			mir_snwprintf(str, dat->okButtonFormat, dat->countdown);

 			SetDlgItemText(hwndDlg, IDOK, str);

 		}

 		else {

@@ -397,8 +397,8 @@ static INT_PTR CALLBACK DlgProcAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 				DBVARIANT dbv;

 				if (db_get_ts(NULL, "SRAway", StatusModeToDbSetting(statusModes[i], "Default"), &dbv))

 					if (db_get_ts(NULL, "SRAway", StatusModeToDbSetting(statusModes[i], "Msg"), &dbv))

-						dbv.ptszVal = mir_tstrdup(GetDefaultMessage(statusModes[i]));

-				mir_tstrcpy(dat->info[j].msg, dbv.ptszVal);

+						dbv.ptszVal = mir_wstrdup(GetDefaultMessage(statusModes[i]));

+				mir_wstrcpy(dat->info[j].msg, dbv.ptszVal);

 				mir_free(dbv.ptszVal);

 			}

 			if (hLst)