less TCHARs

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

5 files changed, 13 insertions, 13 deletions

diff --git a/plugins/SMS/src/functions.cpp b/plugins/SMS/src/functions.cpp
index d6256e4726..7f36b72935 100644
--- a/plugins/SMS/src/functions.cpp
+++ b/plugins/SMS/src/functions.cpp
@@ -445,10 +445,10 @@ void LoadMsgDlgFont(int i, LOGFONT *lf, COLORREF *colour)
 

 	if (lf) {

 		if (db_get(NULL, SRMMMOD, str, &dbv)) {

-			mir_tstrncpy(lf->lfFaceName, fontOptionsList[0].szDefFace, _countof(lf->lfFaceName));

+			mir_wstrncpy(lf->lfFaceName, fontOptionsList[0].szDefFace, _countof(lf->lfFaceName));

 		}

 		else {

-			mir_tstrncpy(lf->lfFaceName, dbv.ptszVal, _countof(lf->lfFaceName));

+			mir_wstrncpy(lf->lfFaceName, dbv.ptszVal, _countof(lf->lfFaceName));

 			db_free(&dbv);

 		}

 

diff --git a/plugins/SMS/src/options.cpp b/plugins/SMS/src/options.cpp
index 5a464a79c5..2157187e06 100644
--- a/plugins/SMS/src/options.cpp
+++ b/plugins/SMS/src/options.cpp
@@ -38,7 +38,7 @@ INT_PTR CALLBACK DlgProcEditorOptions(HWND hWndDlg, UINT msg, WPARAM wParam, LPA
 		TranslateDialogDefault(hWndDlg);

 

 		if (DB_SMS_GetStaticStringW(NULL,"Signature",tszSign,_countof(tszSign),NULL)==FALSE)

-			mir_sntprintf(tszSign, TranslateT("From %s:\r\n\r\n"), pcli->pfnGetContactDisplayName(0, 0));

+			mir_snwprintf(tszSign, TranslateT("From %s:\r\n\r\n"), pcli->pfnGetContactDisplayName(0, 0));

 

 		SetDlgItemText(hWndDlg,IDC_SIGNATURE,tszSign);

 		{

diff --git a/plugins/SMS/src/receive.cpp b/plugins/SMS/src/receive.cpp
index 9779f46907..e4f50f03e8 100644
--- a/plugins/SMS/src/receive.cpp
+++ b/plugins/SMS/src/receive.cpp
@@ -158,7 +158,7 @@ int handleAckSMS(WPARAM wParam, LPARAM lParam)
 							GetXMLFieldExBuff(lpszXML, dwXMLSize, szBuff, sizeof(szBuff), NULL, "sms_response", "error", "params", "param", NULL);

 						}

 

-						mir_sntprintf(tszErrorMessage, TranslateT("SMS message didn't send by %S to %s because: %S"), szNetwork, tszPhone, lpszErrorDescription);

+						mir_snwprintf(tszErrorMessage, TranslateT("SMS message didn't send by %S to %s because: %S"), szNetwork, tszPhone, lpszErrorDescription);

 						ShowWindow(hWndDlg, SW_SHOWNORMAL);

 						EnableWindow(hWndDlg, FALSE);

 						HWND hwndTimeOut = CreateDialog(ssSMSSettings.hInstance, MAKEINTRESOURCE(IDD_SENDSMSTIMEDOUT), hWndDlg, SMSTimedOutDlgProc);

@@ -232,7 +232,7 @@ int handleNewMessage(WPARAM hContact, LPARAM hDbEvent)
 			}

 			else {

 				memcpy(pszServiceFunctionName, SMS_READ, sizeof(SMS_READ));

-				mir_sntprintf(szToolTip, TranslateT("SMS Message from %s"), pcli->pfnGetContactDisplayName(hContact, 0));

+				mir_snwprintf(szToolTip, TranslateT("SMS Message from %s"), pcli->pfnGetContactDisplayName(hContact, 0));

 

 				CLISTEVENT cle = {};

 				cle.flags = CLEF_TCHAR;

@@ -255,7 +255,7 @@ int handleNewMessage(WPARAM hContact, LPARAM hDbEvent)
 			UINT iIcon;

 			if (GetDataFromMessage((LPSTR)dbei.pBlob, dbei.cbBlob, NULL, NULL, 0, NULL, &iIcon)) {

 				memcpy(pszServiceFunctionName, SMS_READ_ACK, sizeof(SMS_READ_ACK));

-				mir_sntprintf(szToolTip, TranslateT("SMS Confirmation from %s"), pcli->pfnGetContactDisplayName(hContact, 0));

+				mir_snwprintf(szToolTip, TranslateT("SMS Confirmation from %s"), pcli->pfnGetContactDisplayName(hContact, 0));

 

 				CLISTEVENT cle = {};

 				cle.flags = CLEF_TCHAR;

diff --git a/plugins/SMS/src/recvdlg.cpp b/plugins/SMS/src/recvdlg.cpp
index a2a231e20e..4734d8cf0e 100644
--- a/plugins/SMS/src/recvdlg.cpp
+++ b/plugins/SMS/src/recvdlg.cpp
@@ -210,7 +210,7 @@ HWND RecvSMSWindowAdd(MCONTACT hContact, DWORD dwEventType, LPWSTR lpwszPhone, s
 			}

 

 			lpwszContactDisplayName = pcli->pfnGetContactDisplayName(hContact, 0);

-			mir_sntprintf(wszTitle, L"%s - %s", lpwszContactDisplayName, lpwszTitlepart);

+			mir_snwprintf(wszTitle, L"%s - %s", lpwszContactDisplayName, lpwszTitlepart);

 			MultiByteToWideChar(CP_UTF8, 0, lpszMessage, (int)dwMessageSize, lpwszMessage, (int)dwMessageSize + MAX_PATH);

 

 			SetWindowText(prswdWindowData->hWnd, wszTitle);

diff --git a/plugins/SMS/src/senddlg.cpp b/plugins/SMS/src/senddlg.cpp
index 96f36d700a..637ccfae0c 100644
--- a/plugins/SMS/src/senddlg.cpp
+++ b/plugins/SMS/src/senddlg.cpp
@@ -154,7 +154,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARA
 					EnableWindow(GetDlgItem(hWndDlg, IDOK), dwSignLen != 0);

 				}

 

-			mir_sntprintf(tszSign, L"%d/%d", dwSignLen, GetSMSMessageLenMax(hWndDlg));

+			mir_snwprintf(tszSign, L"%d/%d", dwSignLen, GetSMSMessageLenMax(hWndDlg));

 			SetDlgItemText(hWndDlg, IDC_COUNT, tszSign);

 		}

 

@@ -222,7 +222,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARA
 			else {

 				GetDlgItemText(hWndDlg, IDC_ADDRESS, tszPhone, _countof(tszPhone));

 			}

-			mir_sntprintf(tszMessage, TranslateT("The SMS message send to %s timed out."), tszPhone);

+			mir_snwprintf(tszMessage, TranslateT("The SMS message send to %s timed out."), tszPhone);

 			KillTimer(hWndDlg, wParam);

 			ShowWindow(hWndDlg, SW_SHOWNORMAL);

 			EnableWindow(hWndDlg, FALSE);

@@ -281,7 +281,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARA
 						tvi.pszText = tszPhone;

 						tvi.cchTextMax = _countof(tszPhone);

 						TreeView_GetItem(GetDlgItem(hWndDlg, IDC_NUMBERSLIST), &tvi);

-						dwPhoneSize = mir_tstrlen(tszPhone);

+						dwPhoneSize = mir_wstrlen(tszPhone);

 					}

 					else dwPhoneSize = GetDlgItemText(hWndDlg, IDC_ADDRESS, tszPhone, _countof(tszPhone));

 

@@ -386,7 +386,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARA
 				size_t dwMessageSize = GET_DLG_ITEM_TEXT_LENGTH(hWndDlg, IDC_MESSAGE);

 

 				EnableWindow(GetDlgItem(hWndDlg, IDOK), dwMessageSize != 0);

-				mir_sntprintf(tszBuff, L"%d/%d", dwMessageSize, GetSMSMessageLenMax(hWndDlg));

+				mir_snwprintf(tszBuff, L"%d/%d", dwMessageSize, GetSMSMessageLenMax(hWndDlg));

 				SetDlgItemText(hWndDlg, IDC_COUNT, tszBuff);

 			}

 			break;

@@ -400,7 +400,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARA
 				size_t dwPhoneSize = GetDlgItemText(hWndDlg, IDC_ADDRESS, tszPhone, (_countof(tszPhone) - 4));

 				if (IsPhoneW(tszPhone, dwPhoneSize)) {

 					if (IsContactPhone(psswdWindowData->hMyContact, tszPhone, dwPhoneSize) == FALSE) {

-						mir_tstrcat(tszPhone, L" SMS");

+						mir_wstrcat(tszPhone, L" SMS");

 						for (DWORD i = 0; bCont; i++) {

 							mir_snprintf(szBuff, "MyPhone%d", i);

 							if (db_get(psswdWindowData->hMyContact, "UserInfo", szBuff, &dbv)) bCont = FALSE;

@@ -559,7 +559,7 @@ HWND SendSMSWindowAdd(MCONTACT hContact)
 

 		LPTSTR lptszContactDisplayName = pcli->pfnGetContactDisplayName(hContact, 0);

 		wchar_t tszTitle[MAX_PATH];

-		mir_sntprintf(tszTitle, L"%s - %s", lptszContactDisplayName, TranslateT("Send SMS"));

+		mir_snwprintf(tszTitle, L"%s - %s", lptszContactDisplayName, TranslateT("Send SMS"));

 		SetWindowText(psswdWindowData->hWnd, tszTitle);

 		SendDlgItemMessage(psswdWindowData->hWnd, IDC_NAME, CB_ADDSTRING, 0, (LPARAM)lptszContactDisplayName);

 		SendDlgItemMessage(psswdWindowData->hWnd, IDC_NAME, CB_SETCURSEL, 0, 0);