hello, Unix.

phase 1: removing _T()

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

9 files changed, 64 insertions, 64 deletions

diff --git a/plugins/YAMN/src/account.cpp b/plugins/YAMN/src/account.cpp
index 3d7648a76f..004dc1bd1b 100644
--- a/plugins/YAMN/src/account.cpp
+++ b/plugins/YAMN/src/account.cpp
@@ -224,8 +224,8 @@ DWORD ReadStringFromMemory(char **Parser,TCHAR *End,char **StoreTo,TCHAR *DebugS
 
 	Finder=*Parser;
 	while((*Finder != (TCHAR)0) && (Finder<=End)) Finder++;
-	mir_sntprintf(Debug, _T("%s: %s,length is %d, remaining %d chars"), DebugString, *Parser, Finder-*Parser, End-Finder);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"%s: %s,length is %d, remaining %d chars", DebugString, *Parser, Finder-*Parser, End-Finder);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 	if (Finder>=End)
 		return EACC_FILECOMPATIBILITY;
 	if (Size=Finder-*Parser)
@@ -335,8 +335,8 @@ static DWORD ReadNotificationFromMemory(char **Parser, char *End, YAMN_NOTIFICAT
 	if (*Parser >= End)
 		return EACC_FILECOMPATIBILITY;
 #ifdef DEBUG_FILEREAD
-	mir_sntprintf(Debug, _T("NFlags: %04x, remaining %d chars"), Which->Flags, End-*Parser);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"NFlags: %04x, remaining %d chars", Which->Flags, End-*Parser);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 #endif
 
 	Which->PopupB = *(COLORREF *)(*Parser);
@@ -344,24 +344,24 @@ static DWORD ReadNotificationFromMemory(char **Parser, char *End, YAMN_NOTIFICAT
 	if (*Parser >= End)
 		return EACC_FILECOMPATIBILITY;
 #ifdef DEBUG_FILEREAD
-	mir_sntprintf(Debug, _T("PopupB: %04x, remaining %d chars"), Which->PopupB, End-*Parser);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"PopupB: %04x, remaining %d chars", Which->PopupB, End-*Parser);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 #endif
 	Which->PopupT = *(COLORREF *)(*Parser);
 	(*Parser) += sizeof(COLORREF);
 	if (*Parser >= End)
 		return EACC_FILECOMPATIBILITY;
 #ifdef DEBUG_FILEREAD
-	mir_sntprintf(Debug, _T("PopupT: %04x, remaining %d chars"), Which->PopupT, End-*Parser);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"PopupT: %04x, remaining %d chars", Which->PopupT, End-*Parser);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 #endif
 	Which->PopupTime = *(DWORD *)(*Parser);
 	(*Parser) += sizeof(DWORD);
 	if (*Parser >= End)
 		return EACC_FILECOMPATIBILITY;
 #ifdef DEBUG_FILEREAD
-	mir_sntprintf(Debug, _T("PopupTime: %04x, remaining %d chars"), Which->PopupTime, End-*Parser);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"PopupTime: %04x, remaining %d chars", Which->PopupTime, End-*Parser);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 #endif
 
 #ifdef	DEBUG_FILEREAD
@@ -388,7 +388,7 @@ DWORD ReadMessagesFromMemory(HACCOUNT Which, char **Parser, char *End)
 	char *ReadString;
 
 #ifdef DEBUG_FILEREAD
-	MessageBox(NULL,_T("going to read messages, if any..."),_T("debug"),MB_OK);
+	MessageBox(NULL,L"going to read messages, if any...",L"debug",MB_OK);
 #endif
 	do
 	{
@@ -412,7 +412,7 @@ DWORD ReadMessagesFromMemory(HACCOUNT Which, char **Parser, char *End)
 			}
 			items = NULL;
 #ifdef DEBUG_FILEREADMESSAGES
-			if (Stat=ReadStringFromMemory(Parser,End,&ActualMail->ID,_T("ID")))
+			if (Stat=ReadStringFromMemory(Parser,End,&ActualMail->ID,L"ID"))
 #else
 			if (Stat = ReadStringFromMemory(Parser, End, &ActualMail->ID))
 #endif
@@ -438,7 +438,7 @@ DWORD ReadMessagesFromMemory(HACCOUNT Which, char **Parser, char *End)
 			do
 			{
 #if defined(DEBUG_FILEREADMESSAGES) || defined(DEBUG_FILEREAD)
-				if (Stat=ReadStringFromMemory(Parser,End,&ReadString,_T("Name")))
+				if (Stat=ReadStringFromMemory(Parser,End,&ReadString,L"Name"))
 #else
 				if (Stat = ReadStringFromMemory(Parser, End, &ReadString))
 #endif
@@ -462,7 +462,7 @@ DWORD ReadMessagesFromMemory(HACCOUNT Which, char **Parser, char *End)
 				items->name = ReadString;
 
 #ifdef DEBUG_FILEREADMESSAGES
-				if (Stat=ReadStringFromMemory(Parser,End,&ReadString,_T("Value")))
+				if (Stat=ReadStringFromMemory(Parser,End,&ReadString,L"Value"))
 #else
 				if (Stat = ReadStringFromMemory(Parser, End, &ReadString))
 #endif
@@ -490,7 +490,7 @@ DWORD ReadAccountFromMemory(HACCOUNT Which, char **Parser, char *End)
 	//Read name of account	
 
 #ifdef DEBUG_FILEREAD
-	if (Stat=ReadStringFromMemory(Parser,End,&Which->Name,_T("Name")))
+	if (Stat=ReadStringFromMemory(Parser,End,&Which->Name,L"Name"))
 #else
 	if (Stat = ReadStringFromMemory(Parser, End, &Which->Name))
 #endif
@@ -500,7 +500,7 @@ DWORD ReadAccountFromMemory(HACCOUNT Which, char **Parser, char *End)
 
 	//Read server parameters
 #ifdef	DEBUG_FILEREAD
-	if (Stat=ReadStringFromMemory(Parser,End,&Which->Server->Name,_T("Server")))
+	if (Stat=ReadStringFromMemory(Parser,End,&Which->Server->Name,L"Server"))
 #else
 	if (Stat = ReadStringFromMemory(Parser, End, &Which->Server->Name))
 #endif
@@ -510,17 +510,17 @@ DWORD ReadAccountFromMemory(HACCOUNT Which, char **Parser, char *End)
 	if (*Parser >= End)
 		return EACC_FILECOMPATIBILITY;
 #ifdef	DEBUG_FILEREAD
-	mir_sntprintf(Debug, _T("Port: %d, remaining %d chars"), Which->Server->Port, End-*Parser);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"Port: %d, remaining %d chars", Which->Server->Port, End-*Parser);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 #endif
 #ifdef	DEBUG_FILEREAD
-	if (Stat=ReadStringFromMemory(Parser,End,&Which->Server->Login,_T("Login")))
+	if (Stat=ReadStringFromMemory(Parser,End,&Which->Server->Login,L"Login"))
 #else
 	if (Stat = ReadStringFromMemory(Parser, End, &Which->Server->Login))
 #endif
 		return Stat;
 #ifdef	DEBUG_FILEREAD
-	if (Stat=ReadStringFromMemory(Parser,End,&Which->Server->Passwd,_T("Password")))
+	if (Stat=ReadStringFromMemory(Parser,End,&Which->Server->Passwd,L"Password"))
 #else
 	if (Stat = ReadStringFromMemory(Parser, End, &Which->Server->Passwd))
 #endif
@@ -533,20 +533,20 @@ DWORD ReadAccountFromMemory(HACCOUNT Which, char **Parser, char *End)
 	if (*Parser >= End)
 		return EACC_FILECOMPATIBILITY;
 #ifdef DEBUG_FILEREAD
-	mir_sntprintf(Debug, _T("Flags: %04x, remaining %d chars"), Which->Flags, End-*Parser);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"Flags: %04x, remaining %d chars", Which->Flags, End-*Parser);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 #endif
 	Which->StatusFlags = *(DWORD *)(*Parser);
 	(*Parser) += sizeof(DWORD);
 #ifdef DEBUG_FILEREAD
-	mir_sntprintf(Debug, _T("STFlags: %04x, remaining %d chars"), Which->StatusFlags, End-*Parser);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"STFlags: %04x, remaining %d chars", Which->StatusFlags, End-*Parser);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 #endif
 	Which->PluginFlags = *(DWORD *)(*Parser);
 	(*Parser) += sizeof(DWORD);
 #ifdef DEBUG_FILEREAD
-	mir_sntprintf(Debug, _T("PFlags: %04x, remaining %d chars"), Which->PluginFlags, End-*Parser);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"PFlags: %04x, remaining %d chars", Which->PluginFlags, End-*Parser);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 #endif
 
 	//Read account miscellaneous parameters
@@ -556,8 +556,8 @@ DWORD ReadAccountFromMemory(HACCOUNT Which, char **Parser, char *End)
 	if (*Parser >= End)
 		return EACC_FILECOMPATIBILITY;
 #ifdef DEBUG_FILEREAD
-	mir_sntprintf(Debug, _T("Interval: %d, remaining %d chars"), Which->Interval, End-*Parser);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"Interval: %d, remaining %d chars", Which->Interval, End-*Parser);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 #endif
 
 	//Read notification parameters
@@ -599,32 +599,32 @@ DWORD ReadAccountFromMemory(HACCOUNT Which, char **Parser, char *End)
 	if (*Parser >= End)
 		return EACC_FILECOMPATIBILITY;
 #ifdef DEBUG_FILEREAD
-	mir_sntprintf(Debug, _T("LastChecked: %04x, remaining %d chars"), Which->LastChecked, End-*Parser);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"LastChecked: %04x, remaining %d chars", Which->LastChecked, End-*Parser);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 #endif
 	Which->LastSChecked = *(SYSTEMTIME *)(*Parser);
 	(*Parser) += sizeof(SYSTEMTIME);
 	if (*Parser >= End)
 		return EACC_FILECOMPATIBILITY;
 #ifdef DEBUG_FILEREAD
-	mir_sntprintf(Debug, _T("LastSChecked: %04x, remaining %d chars"), Which->LastSChecked, End-*Parser);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"LastSChecked: %04x, remaining %d chars", Which->LastSChecked, End-*Parser);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 #endif
 	Which->LastSynchronised = *(SYSTEMTIME *)(*Parser);
 	(*Parser) += sizeof(SYSTEMTIME);
 	if (*Parser >= End)
 		return EACC_FILECOMPATIBILITY;
 #ifdef DEBUG_FILEREAD
-	mir_sntprintf(Debug, _T("LastSynchronised: %04x, remaining %d chars"), Which->LastSynchronised, End-*Parser);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"LastSynchronised: %04x, remaining %d chars", Which->LastSynchronised, End-*Parser);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 #endif
 	Which->LastMail = *(SYSTEMTIME *)(*Parser);
 	(*Parser) += sizeof(SYSTEMTIME);
 	if (*Parser > End)		//WARNING! There's only > at the end of testing
 		return EACC_FILECOMPATIBILITY;
 #ifdef DEBUG_FILEREAD
-	mir_sntprintf(Debug, _T("LastMail: %04x, remaining %d chars"), Which->LastMail, End-*Parser);
-	MessageBox(NULL,Debug,_T("debug"),MB_OK);
+	mir_sntprintf(Debug, L"LastMail: %04x, remaining %d chars", Which->LastMail, End-*Parser);
+	MessageBox(NULL,Debug,L"debug",MB_OK);
 #endif
 	if (*Parser == End)
 		return EACC_ENDOFFILE;
diff --git a/plugins/YAMN/src/browser/badconnect.cpp b/plugins/YAMN/src/browser/badconnect.cpp
index 68ce7fa9db..80816e0704 100644
--- a/plugins/YAMN/src/browser/badconnect.cpp
+++ b/plugins/YAMN/src/browser/badconnect.cpp
@@ -257,7 +257,7 @@ void __cdecl BadConnection(void *Param)
 			nid.hIcon = g_LoadIconEx(3);

 			nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;

 			nid.uCallbackMessage = WM_YAMN_NOTIFYICON;

-			mir_sntprintf(nid.szTip, _T("%S%s"), ActualAccount->Name, TranslateT(" - connection error"));
+			mir_sntprintf(nid.szTip, L"%S%s", ActualAccount->Name, TranslateT(" - connection error"));
 			Shell_NotifyIcon(NIM_ADD, &nid);

 		}

 

diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp
index c9ec017cbc..ccd681a1d5 100644
--- a/plugins/YAMN/src/browser/mailbrowser.cpp
+++ b/plugins/YAMN/src/browser/mailbrowser.cpp
@@ -704,7 +704,7 @@ void DoMailActions(HWND hDlg, HACCOUNT ActualAccount, struct CMailNumbers *MN, D
 				nid.hIcon = g_LoadIconEx(2);
 				nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
 				nid.uCallbackMessage = WM_YAMN_NOTIFYICON;
-				mir_sntprintf(nid.szTip, _T("%S %s"), ActualAccount->Name, TranslateT("- new mail message(s)"));
+				mir_sntprintf(nid.szTip, L"%S %s", ActualAccount->Name, TranslateT("- new mail message(s)"));
 				Shell_NotifyIcon(NIM_ADD, &nid);
 				SetTimer(hDlg, TIMER_FLASHING, 500, NULL);
 			}
@@ -1575,8 +1575,8 @@ INT_PTR CALLBACK DlgProcYAMNShowMessage(HWND hDlg, UINT msg, WPARAM wParam, LPAR
 							if ((nReturnCmd == 1) && (ListView_GetItemState(hList, courRow, LVIS_SELECTED) == 0)) continue;
 							ListView_GetItemText(hList, courRow, 0, headname, _countof(headname));
 							ListView_GetItemText(hList, courRow, 1, headvalue, _countof(headvalue));
-							if (mir_tstrlen(headname)) courPos += mir_sntprintf(&buff[courPos], sizeNeeded + 1, _T("%s:\t%s\r\n"), headname, headvalue);
-							else courPos += mir_sntprintf(&buff[courPos], sizeNeeded + 1, _T("\t%s\r\n"), headvalue);
+							if (mir_tstrlen(headname)) courPos += mir_sntprintf(&buff[courPos], sizeNeeded + 1, L"%s:\t%s\r\n", headname, headvalue);
+							else courPos += mir_sntprintf(&buff[courPos], sizeNeeded + 1, L"\t%s\r\n", headvalue);
 						}
 						GlobalUnlock(hData);
 
@@ -2256,7 +2256,7 @@ INT_PTR CALLBACK DlgProcYAMNMailBrowser(HWND hDlg, UINT msg, WPARAM wParam, LPAR
 							ListView_GetItemText(hList, courRow, 1, subject, _countof(subject));
 							ListView_GetItemText(hList, courRow, 2, size, _countof(size));
 							ListView_GetItemText(hList, courRow, 3, date, _countof(date));
-							courPos += mir_sntprintf(&buff[courPos], sizeNeeded + 1, _T("%s\t%s\t%s\t%s\r\n"), from, subject, size, date);
+							courPos += mir_sntprintf(&buff[courPos], sizeNeeded + 1, L"%s\t%s\t%s\t%s\r\n", from, subject, size, date);
 						}
 						GlobalUnlock(hData);
 
diff --git a/plugins/YAMN/src/debug.cpp b/plugins/YAMN/src/debug.cpp
index e074390fac..6655ebd3a9 100644
--- a/plugins/YAMN/src/debug.cpp
+++ b/plugins/YAMN/src/debug.cpp
@@ -14,21 +14,21 @@
 //--------------------------------------------------------------------------------------------------

 //--------------------------------------------------------------------------------------------------

 

-TCHAR DebugUserDirectory[MAX_PATH] = _T(".");

+TCHAR DebugUserDirectory[MAX_PATH] = L".";

 CRITICAL_SECTION FileAccessCS;

 

 #ifdef DEBUG_SYNCHRO

-TCHAR DebugSynchroFileName2[]=_T("%s\\yamn-debug.synchro.log");

+TCHAR DebugSynchroFileName2[]=L"%s\\yamn-debug.synchro.log";

 HANDLE SynchroFile;

 #endif

 

 #ifdef DEBUG_COMM

-TCHAR DebugCommFileName2[]=_T("%s\\yamn-debug.comm.log");

+TCHAR DebugCommFileName2[]=L"%s\\yamn-debug.comm.log";

 HANDLE CommFile;

 #endif

 

 #ifdef DEBUG_DECODE

-TCHAR DebugDecodeFileName2[]=_T("%s\\yamn-debug.decode.log");

+TCHAR DebugDecodeFileName2[]=L"%s\\yamn-debug.decode.log";

 HANDLE DecodeFile;

 #endif

 

diff --git a/plugins/YAMN/src/mails/mime.cpp b/plugins/YAMN/src/mails/mime.cpp
index bb1c420657..c768ae141f 100644
--- a/plugins/YAMN/src/mails/mime.cpp
+++ b/plugins/YAMN/src/mails/mime.cpp
@@ -579,7 +579,7 @@ void ParseAPart(APartDataType *data)
 	}

 	catch(...)

 	{

-		MessageBox(NULL, TranslateT("Translate header error"), _T(""), 0);

+		MessageBox(NULL, TranslateT("Translate header error"), L"", 0);

 	}

 	if (data->body) data->bodyLen = (int)mir_strlen(data->body);

 }

diff --git a/plugins/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp
index b5cbb99264..bf60915d95 100644
--- a/plugins/YAMN/src/main.cpp
+++ b/plugins/YAMN/src/main.cpp
@@ -63,9 +63,9 @@ static void GetProfileDirectory(TCHAR *szPath, int cbPath)
 {
 	TCHAR tszOldPath[MAX_PATH];
 	CallService(MS_DB_GETPROFILEPATHT, _countof(tszOldPath), (LPARAM)tszOldPath);
-	mir_tstrcat(tszOldPath, _T("\\*.book"));
+	mir_tstrcat(tszOldPath, L"\\*.book");
 
-	VARST ptszNewPath( _T("%miranda_userdata%"));
+	VARST ptszNewPath( L"%miranda_userdata%");
 
 	SHFILEOPSTRUCT file_op = {
 		NULL,
@@ -75,7 +75,7 @@ static void GetProfileDirectory(TCHAR *szPath, int cbPath)
 		FOF_NOERRORUI | FOF_NOCONFIRMATION | FOF_SILENT,
 		false,
 		0,
-		_T("") };
+		L"" };
 	SHFileOperation(&file_op);
 
 	_tcsncpy(szPath, ptszNewPath, cbPath);
@@ -126,7 +126,7 @@ BOOL CALLBACK EnumSystemCodePagesProc(LPTSTR cpStr)
 		#ifdef _DEBUG
 		if (!found) {
 			mir_tstrcat(unknownCP, info.CodePageName);
-			mir_tstrcat(unknownCP, _T("\n"));
+			mir_tstrcat(unknownCP, L"\n");
 		}
 		#endif
 	}
@@ -207,7 +207,7 @@ void WINAPI g_ReleaseIcon( HICON hIcon )
 static void LoadPlugins()
 {
 	TCHAR szSearchPath[MAX_PATH];
-	mir_sntprintf(szSearchPath, _T("%s\\Plugins\\YAMN\\*.dll"), szMirandaDir);
+	mir_sntprintf(szSearchPath, L"%s\\Plugins\\YAMN\\*.dll", szMirandaDir);
 
 	hDllPlugins = NULL;
 
@@ -225,11 +225,11 @@ static void LoadPlugins()
 			TCHAR* end = fd.cFileName+len; // get a pointer to the NULL
 			int safe = (end-dot)-1;	// figure out how many chars after the dot are "safe", not including NULL
 
-			if ((safe != 3) || (mir_tstrcmpi(dot+1, _T("dll")) != 0)) //not bound, however the "dll" string should mean only 3 chars are compared
+			if ((safe != 3) || (mir_tstrcmpi(dot+1, L"dll") != 0)) //not bound, however the "dll" string should mean only 3 chars are compared
 				continue;
 
 			TCHAR szPluginPath[MAX_PATH];
-			mir_sntprintf(szPluginPath, _T("%s\\Plugins\\YAMN\\%s"), szMirandaDir, fd.cFileName);
+			mir_sntprintf(szPluginPath, L"%s\\Plugins\\YAMN\\%s", szMirandaDir, fd.cFileName);
 			HINSTANCE hDll = LoadLibrary(szPluginPath);
 			if (hDll == NULL)
 				continue;
@@ -265,7 +265,7 @@ extern "C" int __declspec(dllexport) Load(void)
 	YAMN_STATUS = ID_STATUS_OFFLINE;
 
 	//	we get the Miranda Root Path
-	PathToAbsoluteT( _T("."), szMirandaDir);
+	PathToAbsoluteT( L".", szMirandaDir);
 
 	// retrieve the current profile name
 	CallService(MS_DB_GETPROFILENAMET, (WPARAM)_countof(ProfileName), (LPARAM)ProfileName);	//not to pass entire array to fcn
diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
index f754263cc6..d4f06bed62 100644
--- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
@@ -247,7 +247,7 @@ int RegisterPOP3Plugin(WPARAM, LPARAM)
 	//You must first register account, before using this function as YAMN must use CreatePOP3Account function to add new accounts

 	//But if CreatePOP3Account is not implemented (equals to NULL), YAMN creates account as YAMN's standard HACCOUNT

 	if (FileName) CallService(MS_YAMN_DELETEFILENAME, (WPARAM)FileName, 0);	//shoud not happen (only for secure)

-	FileName = (TCHAR *)CallService(MS_YAMN_GETFILENAME, (WPARAM)_T("pop3"), 0);

+	FileName = (TCHAR *)CallService(MS_YAMN_GETFILENAME, (WPARAM)L"pop3", 0);

 

 	switch (CallService(MS_YAMN_READACCOUNTS, (WPARAM)POP3Plugin, (LPARAM)FileName)) {

 	case EACC_FILEVERSION:

@@ -269,7 +269,7 @@ int RegisterPOP3Plugin(WPARAM, LPARAM)
 		if (ERROR_FILE_NOT_FOUND != GetLastError())

 		{

 			TCHAR temp[1024] = { 0 };

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

+			mir_sntprintf(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) {

 		TCHAR temp[1024] = { 0 };

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

+		mir_sntprintf(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,8 +380,8 @@ DWORD WINAPI ReadPOP3Options(HACCOUNT Which, char **Parser, char *End)
 	if (*Parser >= End)

 		return EACC_FILECOMPATIBILITY;

 #ifdef DEBUG_FILEREAD

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

-	MessageBox(NULL,Debug,_T("debug"),MB_OK);

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

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

 #endif

 	return 0;

 }

@@ -1544,12 +1544,12 @@ TCHAR* WINAPI GetErrorString(DWORD Code)
 

 	mir_sntprintf(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, _T("%s\n%s"), ErrorString, TranslateTS(POP3Errors[ErrorCode->POP3Error - 1]));

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

 	if (ErrorCode->NetError) {

 		if (ErrorCode->SSL)

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

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

 		else

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

+			mir_sntprintf(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 65730f6391..20ae0c8eac 100644
--- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
@@ -830,7 +830,7 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP
 		case IDC_BTNAPP:

 			{

 				TCHAR filter[MAX_PATH];

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

+				mir_sntprintf(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 };

diff --git a/plugins/YAMN/src/protoplugin.cpp b/plugins/YAMN/src/protoplugin.cpp
index 485286c4ea..e2a492d718 100644
--- a/plugins/YAMN/src/protoplugin.cpp
+++ b/plugins/YAMN/src/protoplugin.cpp
@@ -179,7 +179,7 @@ INT_PTR GetFileNameSvc(WPARAM wParam,LPARAM)
 	if (FileName == NULL)

 		return NULL;

 

-	mir_sntprintf(FileName, MAX_PATH, _T("%s\\yamn-accounts.%s.%s.book"), UserDirectory, wParam, ProfileName);

+	mir_sntprintf(FileName, MAX_PATH, L"%s\\yamn-accounts.%s.%s.book", UserDirectory, wParam, ProfileName);

 	return (INT_PTR)FileName;

 }