less TCHARs

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

2 files changed, 17 insertions, 17 deletions

diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp
index d17340cfb0..12a70ba570 100644
--- a/plugins/BuddyPounce/src/dialog.cpp
+++ b/plugins/BuddyPounce/src/dialog.cpp
@@ -16,7 +16,7 @@ void populateContacts(MCONTACT BPhContact, HWND hwnd2CB)
 		char *szProto = GetContactProto(hContact);

 		if (szProto && (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM)) {

 			wchar_t name[300];

-			mir_sntprintf(name, L"%s (%s)", pcli->pfnGetContactDisplayName(hContact, 0), _A2T(szProto));

+			mir_snwprintf(name, L"%s (%s)", pcli->pfnGetContactDisplayName(hContact, 0), _A2T(szProto));

 			int index = SendMessage(hwnd2CB, CB_ADDSTRING, 0, (LPARAM)name);

 			SendMessage(hwnd2CB, CB_SETITEMDATA, index, hContact);

 			if (BPhContact == hContact)

@@ -102,7 +102,7 @@ INT_PTR CALLBACK StatusModesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 				|(IsDlgButtonChecked(hwnd, IDC_CHECK9)<<8)

 				|(IsDlgButtonChecked(hwnd, IDC_CHECK10)<<9);

 

-			if (!mir_tstrcmp(type, L"Any")) {

+			if (!mir_wstrcmp(type, L"Any")) {

 				if (LOWORD(wParam) == IDOK)

 					db_set_w(wi->hContact, modname, "SendIfMyStatusIsFLAG", flag);

 				wi->SendIfMy = 0;

@@ -201,7 +201,7 @@ INT_PTR CALLBACK BuddyPounceSimpleDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, L
 		SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)lParam);

 

 		getDefaultMessage(hwnd, IDC_MESSAGE, hContact);

-		mir_sntprintf(msg, TranslateT("The Message    (%d Characters)"), GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE)));

+		mir_snwprintf(msg, TranslateT("The Message    (%d Characters)"), GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE)));

 		SetDlgItemText(hwnd, GRP_MSG, msg);	

 		return FALSE;

 

@@ -210,7 +210,7 @@ INT_PTR CALLBACK BuddyPounceSimpleDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, L
 		case IDC_MESSAGE:

 			if (HIWORD(wParam) == EN_CHANGE) {

 				int length = GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE));

-				mir_sntprintf(msg, TranslateT("The Message    (%d Characters)"), length);

+				mir_snwprintf(msg, TranslateT("The Message    (%d Characters)"), length);

 				SetDlgItemText(hwnd, GRP_MSG, msg);

 			}

 			break;

@@ -258,7 +258,7 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
 		SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)wi);

 		getDefaultMessage(hwnd, IDC_MESSAGE, wi->hContact);

 

-		mir_sntprintf(msg, TranslateT("The Message    (%d Characters)"), GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE)));

+		mir_snwprintf(msg, TranslateT("The Message    (%d Characters)"), GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE)));

 		SetDlgItemText(hwnd, GRP_MSG, msg);	

 

 		populateSettingsList(GetDlgItem(hwnd, IDC_SETTINGS));

@@ -272,7 +272,7 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
 		case IDC_MESSAGE:

 			if (HIWORD(wParam) == EN_CHANGE) {

 				int length = GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE));

-				mir_sntprintf(msg, TranslateT("The Message    (%d Characters)"), length);

+				mir_snwprintf(msg, TranslateT("The Message    (%d Characters)"), length);

 				SetDlgItemText(hwnd, GRP_MSG, msg);

 			}

 			break;

@@ -315,7 +315,7 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM
 		case IDC_DEFAULT:

 			getDefaultMessage(hwnd, IDC_MESSAGE, wi->hContact);

 

-			mir_sntprintf(msg, TranslateT("The Message    (%d Characters)"), GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE)));

+			mir_snwprintf(msg, TranslateT("The Message    (%d Characters)"), GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE)));

 			SetDlgItemText(hwnd, GRP_MSG, msg);

 

 			db_set_w(wi->hContact, modname, "SendIfMyStatusIsFLAG", (WORD)db_get_w(NULL, modname, "SendIfMyStatusIsFLAG",0));

@@ -390,7 +390,7 @@ INT_PTR CALLBACK BuddyPounceOptionsDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam,
 			SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)wi);

 

 			getDefaultMessage(hwnd, IDC_MESSAGE, wi->hContact);

-			mir_sntprintf(msg, TranslateT("The Message    (%d Characters)"), GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE)));

+			mir_snwprintf(msg, TranslateT("The Message    (%d Characters)"), GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE)));

 			SetDlgItemText(hwnd, GRP_MSG, msg);	

 			populateSettingsList(GetDlgItem(hwnd, IDC_SETTINGS));

 			SendDlgItemMessage(hwnd, IDC_SPIN, UDM_SETRANGE, 0, (LPARAM)MAKELONG((short)1024, (short)0));

@@ -433,7 +433,7 @@ INT_PTR CALLBACK BuddyPounceOptionsDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam,
 		case IDC_MESSAGE:

 			if (HIWORD(wParam) == EN_CHANGE) {

 				int length = GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE));

-				mir_sntprintf(msg, TranslateT("The Message    (%d Characters)"), length);

+				mir_snwprintf(msg, TranslateT("The Message    (%d Characters)"), length);

 				SetDlgItemText(hwnd, GRP_MSG, msg);

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

 			}

@@ -524,7 +524,7 @@ INT_PTR CALLBACK SendPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 	case WM_TIMER:

 		{

 			wchar_t message[1024];

-			mir_sntprintf(message, TranslateT("Pounce being sent to %s in %d seconds"), pcli->pfnGetContactDisplayName(spdps->hContact, 0), spdps->timer);

+			mir_snwprintf(message, TranslateT("Pounce being sent to %s in %d seconds"), pcli->pfnGetContactDisplayName(spdps->hContact, 0), spdps->timer);

 			SetDlgItemText(hwnd, LBL_CONTACT, message);

 		}

 		spdps->timer--;

@@ -582,7 +582,7 @@ INT_PTR CALLBACK PounceSentDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 			{

 				wchar_t text[2048];

 				GetDlgItemText(hwnd, IDOK, text, _countof(text));

-				if (!mir_tstrcmp(text, TranslateT("Retry"))) {

+				if (!mir_wstrcmp(text, TranslateT("Retry"))) {

 					GetDlgItemText(hwnd, IDC_MESSAGE, text, _countof(text));

 					SendPounce(text, hContact);

 				}

@@ -601,12 +601,12 @@ void CreateMessageAcknowlegedWindow(MCONTACT hContact, int SentSuccess)
 	HWND hwnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_CONFIRMSEND), 0, PounceSentDlgProc, hContact);

 	wchar_t msg[256];

 	if (SentSuccess) {

-		mir_sntprintf(msg, TranslateT("Message successfully sent to %s"), pcli->pfnGetContactDisplayName(hContact, 0));

+		mir_snwprintf(msg, TranslateT("Message successfully sent to %s"), pcli->pfnGetContactDisplayName(hContact, 0));

 		SetDlgItemText(hwnd, IDOK, TranslateT("OK"));

 		ShowWindow(GetDlgItem(hwnd, IDCANCEL), 0);

 	}

 	else {

-		mir_sntprintf(msg, TranslateT("Message failed to send to %s"), pcli->pfnGetContactDisplayName(hContact, 0));

+		mir_snwprintf(msg, TranslateT("Message failed to send to %s"), pcli->pfnGetContactDisplayName(hContact, 0));

 		SetDlgItemText(hwnd, IDOK, TranslateT("Retry"));

 	}

 	SetDlgItemText(hwnd, LBL_CONTACT, msg);

diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp
index 0d112acef5..35e6f5d9ba 100644
--- a/plugins/BuddyPounce/src/main.cpp
+++ b/plugins/BuddyPounce/src/main.cpp
@@ -169,7 +169,7 @@ int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam)
 					if (CheckDate(hContact)) {

 						if (db_get_w(hContact, modname, "ConfirmTimeout", 0)) {

 							SendPounceDlgProcStruct *spdps = (SendPounceDlgProcStruct *)mir_alloc(sizeof(SendPounceDlgProcStruct));

-							wchar_t *message = mir_tstrdup(dbv.ptszVal); // will get free()ed in the send confirm window proc

+							wchar_t *message = mir_wstrdup(dbv.ptszVal); // will get free()ed in the send confirm window proc

 							spdps->hContact = hContact;

 							spdps->message = message;

 							CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_CONFIRMSEND), 0, SendPounceDlgProc, (LPARAM)spdps);

@@ -215,10 +215,10 @@ INT_PTR AddToPounce(WPARAM wParam, LPARAM lParam)
 	DBVARIANT dbv;

 	if (!db_get_ts(hContact, modname, "PounceMsg",&dbv))

 	{

-		wchar_t* newPounce = (wchar_t*)mir_alloc(mir_tstrlen(dbv.ptszVal) + mir_tstrlen(message) + 1);

+		wchar_t* newPounce = (wchar_t*)mir_alloc(mir_wstrlen(dbv.ptszVal) + mir_wstrlen(message) + 1);

 		if (!newPounce) return 1;

-		mir_tstrcpy(newPounce, dbv.ptszVal);

-		mir_tstrcat(newPounce, message);

+		mir_wstrcpy(newPounce, dbv.ptszVal);

+		mir_wstrcat(newPounce, message);

 		db_set_ws(hContact, modname, "PounceMsg", newPounce);

 		mir_free(newPounce);

 		db_free(&dbv);