less TCHARs

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

2 files changed, 18 insertions, 18 deletions

diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
index cd8c3121db..9b2d0da53e 100644
--- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
@@ -269,7 +269,7 @@ int RegisterPOP3Plugin(WPARAM, LPARAM)
 		if (ERROR_FILE_NOT_FOUND != GetLastError())

 		{

 			wchar_t temp[1024] = { 0 };

-			mir_sntprintf(temp, L"%s\n%s", TranslateT("Reading file error. File already in use?"), FileName);

+			mir_snwprintf(temp, L"%s\n%s", TranslateT("Reading file error. File already in use?"), FileName);

 			MessageBox(NULL, temp, TranslateT("YAMN (internal POP3) read error"), MB_OK);

 			CallService(MS_YAMN_DELETEFILENAME, (WPARAM)FileName, 0);

 			FileName = NULL;

@@ -344,7 +344,7 @@ DWORD WINAPI WritePOP3Accounts()
 	DWORD ReturnValue = CallService(MS_YAMN_WRITEACCOUNTS, (WPARAM)POP3Plugin, (LPARAM)FileName);

 	if (ReturnValue == EACC_SYSTEM) {

 		wchar_t temp[1024] = { 0 };

-		mir_sntprintf(temp, L"%s\n%s", TranslateT("Error while copying data to disk occurred. Is file in use?"), FileName);

+		mir_snwprintf(temp, L"%s\n%s", TranslateT("Error while copying data to disk occurred. Is file in use?"), FileName);

 		MessageBox(NULL, temp, TranslateT("POP3 plugin - write file error"), MB_OK);

 	}

 

@@ -380,7 +380,7 @@ DWORD WINAPI ReadPOP3Options(HACCOUNT Which, char **Parser, char *End)
 	if (*Parser >= End)

 		return EACC_FILECOMPATIBILITY;

 #ifdef DEBUG_FILEREAD

-	mir_sntprintf(Debug, L"CodePage: %d, remaining %d chars", ((HPOP3ACCOUNT)Which)->CP, End-*Parser);

+	mir_snwprintf(Debug, L"CodePage: %d, remaining %d chars", ((HPOP3ACCOUNT)Which)->CP, End-*Parser);

 	MessageBox(NULL,Debug,L"debug",MB_OK);

 #endif

 	return 0;

@@ -713,7 +713,7 @@ DWORD WINAPI SynchroPOP3(struct CheckParam * WhichTemp)
 				for (NewMsgsPtr = (HYAMNMAIL)NewMails; NewMsgsPtr != NULL; NewMsgsPtr = NewMsgsPtr->Next) {

 					if (!mir_strcmp(MsgQueuePtr->ID, NewMsgsPtr->ID)) {

 						wchar_t accstatus[512];

-						mir_sntprintf(accstatus, TranslateT("Reading body %s"), NewMsgsPtr->ID);

+						mir_snwprintf(accstatus, TranslateT("Reading body %s"), NewMsgsPtr->ID);

 						SetAccountStatus(ActualAccount, accstatus);

 						DataRX = MyClient->Top(MsgQueuePtr->Number, 100);

 #ifdef DEBUG_DECODE

@@ -786,7 +786,7 @@ DWORD WINAPI SynchroPOP3(struct CheckParam * WhichTemp)
 			{

 				BOOL autoretr = (ActualAccount->Flags & YAMN_ACC_BODY) != 0;

 				DataRX = MyClient->Top(MsgQueuePtr->Number, autoretr ? 100 : 0);

-				mir_sntprintf(accstatus, TranslateT("Reading new mail messages (%d%% done)"), 100 * i / msgs);

+				mir_snwprintf(accstatus, TranslateT("Reading new mail messages (%d%% done)"), 100 * i / msgs);

 				SetAccountStatus(ActualAccount, accstatus);

 

 #ifdef DEBUG_DECODE

@@ -1542,14 +1542,14 @@ wchar_t* WINAPI GetErrorString(DWORD Code)
 	wchar_t *ErrorString = new wchar_t[ERRORSTR_MAXLEN];

 	POP3_ERRORCODE *ErrorCode = (POP3_ERRORCODE *)(UINT_PTR)Code;

 

-	mir_sntprintf(ErrorString, ERRORSTR_MAXLEN, TranslateT("Error %d-%d-%d-%d:"), ErrorCode->AppError, ErrorCode->POP3Error, ErrorCode->NetError, ErrorCode->SystemError);

+	mir_snwprintf(ErrorString, ERRORSTR_MAXLEN, TranslateT("Error %d-%d-%d-%d:"), ErrorCode->AppError, ErrorCode->POP3Error, ErrorCode->NetError, ErrorCode->SystemError);

 	if (ErrorCode->POP3Error)

-		mir_sntprintf(ErrorString, ERRORSTR_MAXLEN, L"%s\n%s", ErrorString, TranslateTS(POP3Errors[ErrorCode->POP3Error - 1]));

+		mir_snwprintf(ErrorString, ERRORSTR_MAXLEN, L"%s\n%s", ErrorString, TranslateTS(POP3Errors[ErrorCode->POP3Error - 1]));

 	if (ErrorCode->NetError) {

 		if (ErrorCode->SSL)

-			mir_sntprintf(ErrorString, ERRORSTR_MAXLEN, L"%s\n%s", ErrorString, TranslateTS(SSLErrors[ErrorCode->NetError - 1]));

+			mir_snwprintf(ErrorString, ERRORSTR_MAXLEN, L"%s\n%s", ErrorString, TranslateTS(SSLErrors[ErrorCode->NetError - 1]));

 		else

-			mir_sntprintf(ErrorString, ERRORSTR_MAXLEN, L"%s\n%s", ErrorString, TranslateTS(NetlibErrors[ErrorCode->NetError - 4]));

+			mir_snwprintf(ErrorString, ERRORSTR_MAXLEN, L"%s\n%s", ErrorString, TranslateTS(NetlibErrors[ErrorCode->NetError - 4]));

 	}

 

 	return ErrorString;

diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
index 4e083211fd..3148158989 100644
--- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
@@ -650,7 +650,7 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP
 			SendDlgItemMessage(hDlg, IDC_COMBOCP, CB_ADDSTRING, 0, (LPARAM)TranslateT("Default"));

 			for (i = 1; i < CPLENSUPP; i++) {

 				CPINFOEX info; GetCPInfoEx(CodePageNamesSupp[i].CP, 0, &info);

-				size_t len = mir_tstrlen(info.CodePageName + 7);

+				size_t len = mir_wstrlen(info.CodePageName + 7);

 				info.CodePageName[len + 6] = 0;

 				SendDlgItemMessage(hDlg, IDC_COMBOCP, CB_ADDSTRING, 0, (LPARAM)(info.CodePageName + 7));

 			}

@@ -687,7 +687,7 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP
 	case WM_YAMN_CHANGETIME:

 		if ((HPOP3ACCOUNT)wParam == ActualAccount) {

 			wchar_t Text[256];

-			mir_sntprintf(Text, TranslateT("Time left to next check [s]: %d"), (DWORD)lParam);

+			mir_snwprintf(Text, TranslateT("Time left to next check [s]: %d"), (DWORD)lParam);

 			SetDlgItemText(hDlg, IDC_STTIMELEFT, Text);

 		}

 		return TRUE;

@@ -830,7 +830,7 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP
 		case IDC_BTNAPP:

 			{

 				wchar_t filter[MAX_PATH];

-				mir_sntprintf(filter, L"%s (*.exe;*.bat;*.cmd;*.com)%c*.exe;*.bat;*.cmd;*.com%c%s (*.*)%c*.*%c",

+				mir_snwprintf(filter, L"%s (*.exe;*.bat;*.cmd;*.com)%c*.exe;*.bat;*.cmd;*.com%c%s (*.*)%c*.*%c",

 					TranslateT("Executables"), 0, 0, TranslateT("All Files"), 0, 0);

 

 				OPENFILENAME OFNStruct = { 0 };

@@ -1289,12 +1289,12 @@ INT_PTR CALLBACK DlgProcPOP3AccPopup(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
 					TesterF.lchIcon = g_LoadIconEx(3);

 					TesterN.lchIcon = g_LoadIconEx(1);

 

-					mir_tstrncpy(Tester.lptzContactName, TranslateT("Account Test"), MAX_CONTACTNAME);

-					mir_tstrncpy(TesterF.lptzContactName, TranslateT("Account Test (failed)"), MAX_CONTACTNAME);

-					mir_tstrncpy(TesterN.lptzContactName, TranslateT("Account Test"), MAX_CONTACTNAME);

-					mir_tstrncpy(Tester.lptzText, TranslateT("You have N new mail messages"), MAX_SECONDLINE);

-					mir_tstrncpy(TesterF.lptzText, TranslateT("Connection failed message"), MAX_SECONDLINE);

-					mir_tstrncpy(TesterN.lptzText, TranslateT("No new mail message"), MAX_SECONDLINE);

+					mir_wstrncpy(Tester.lptzContactName, TranslateT("Account Test"), MAX_CONTACTNAME);

+					mir_wstrncpy(TesterF.lptzContactName, TranslateT("Account Test (failed)"), MAX_CONTACTNAME);

+					mir_wstrncpy(TesterN.lptzContactName, TranslateT("Account Test"), MAX_CONTACTNAME);

+					mir_wstrncpy(Tester.lptzText, TranslateT("You have N new mail messages"), MAX_SECONDLINE);

+					mir_wstrncpy(TesterF.lptzText, TranslateT("Connection failed message"), MAX_SECONDLINE);

+					mir_wstrncpy(TesterN.lptzText, TranslateT("No new mail message"), MAX_SECONDLINE);

 					if (TesterC) {

 						Tester.colorBack = SendDlgItemMessage(hDlg, IDC_CPB, CPM_GETCOLOUR, 0, 0);

 						Tester.colorText = SendDlgItemMessage(hDlg, IDC_CPT, CPM_GETCOLOUR, 0, 0);