hello, Unix.

phase 1: removing _T()

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

11 files changed, 64 insertions, 64 deletions

diff --git a/protocols/MSN/src/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp
index 8739f0e239..27a002ceba 100644
--- a/protocols/MSN/src/msn_auth.cpp
+++ b/protocols/MSN/src/msn_auth.cpp
@@ -359,8 +359,8 @@ int CMsnProto::MSN_GetPassportAuth(void)
 	time_t ts = time(NULL);

 

 	TCHAR szTs1[64], szTs2[64];

-	TimeZone_PrintTimeStamp(UTC_TIME_HANDLE, ts, _T("I"), szTs1, _countof(szTs1), 0);

-	TimeZone_PrintTimeStamp(UTC_TIME_HANDLE, ts + 20 * 60, _T("I"), szTs2, _countof(szTs2), 0);

+	TimeZone_PrintTimeStamp(UTC_TIME_HANDLE, ts, L"I", szTs1, _countof(szTs1), 0);

+	TimeZone_PrintTimeStamp(UTC_TIME_HANDLE, ts + 20 * 60, L"I", szTs2, _countof(szTs2), 0);

 

 	CMStringA szAuthInfo(FORMAT, authPacket, int(ts), MyOptions.szEmail, ptrA(HtmlEncode(szPassword)), szTs1, szTs2);

 

@@ -929,7 +929,7 @@ LRESULT CALLBACK AuthWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar
 				 * InternetGetCookieExA

 				 */

 				if (!fpInternetGetCookieExA) {

-					HMODULE hMod = LoadLibrary(_T("wininet.dll"));

+					HMODULE hMod = LoadLibrary(L"wininet.dll");

 					if (hMod) fpInternetGetCookieExA = (pfnInternetGetCookieExA)GetProcAddress(hMod, "InternetGetCookieExA");

 				}

 				if (fpInternetGetCookieExA &&

@@ -969,7 +969,7 @@ void __cdecl CMsnProto::msn_IEAuthThread(void *pParam)
 	HWND hWnd;

 	MSG msg;

     WNDCLASSEX wc={0};

-    static const TCHAR  *ClassName = _T("SkypeLoginWindow");

+    static const TCHAR  *ClassName = L"SkypeLoginWindow";

 

     CoInitialize(NULL);

 

@@ -980,7 +980,7 @@ void __cdecl CMsnProto::msn_IEAuthThread(void *pParam)
     wc.lpszClassName = ClassName;

     RegisterClassEx(&wc);

 

-    if ((hWnd = CreateWindowEx(0, ClassName, _T("MSN Login"), WS_OVERLAPPEDWINDOW,

+    if ((hWnd = CreateWindowEx(0, ClassName, L"MSN Login", WS_OVERLAPPEDWINDOW,

                                             CW_USEDEFAULT, CW_USEDEFAULT, 640, 480,

                                             HWND_DESKTOP, NULL, g_hInst, pParam))) {

 		ShowWindow( hWnd, SW_SHOW );

diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp
index 99e6354cd1..9c13070bc1 100644
--- a/protocols/MSN/src/msn_chat.cpp
+++ b/protocols/MSN/src/msn_chat.cpp
@@ -26,8 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_history.h>

 

 static const TCHAR *m_ptszRoles[] = {

-	_T("admin"),

-	_T("user")

+	L"admin",

+	L"user"

 };

 

 MCONTACT CMsnProto::MSN_GetChatInernalHandle(MCONTACT hContact)

@@ -55,7 +55,7 @@ int CMsnProto::MSN_ChatInit(GCThreadData *info, const char *pszID, const char *p
 	TCHAR szName[512];

 	InterlockedIncrement(&m_chatID);

 	if (*pszTopic) _tcsncpy(szName, _A2T(pszTopic), _countof(szName));

-	else mir_sntprintf(szName, _T("%s %s%d"),

+	else mir_sntprintf(szName, L"%s %s%d",

 		m_tszUserName, TranslateT("Chat #"), m_chatID);

 

 	GCSESSION gcw = { sizeof(gcw) };

@@ -219,7 +219,7 @@ void CMsnProto::MSN_GCProcessThreadActivity(ezxml_t xmli, const TCHAR *mChatID)
 				hContInitiator = MSN_HContactFromEmail(initiator->txt);

 				gce.ptszText= GetContactNameT(hContInitiator);

 			}

-			gce.ptszStatus = _T("admin");

+			gce.ptszStatus = L"admin";

 		}

 

 		if (gcd.iType) {

@@ -330,7 +330,7 @@ static void ChatInviteSend(HANDLE hItem, HWND hwndList, STRLIST &str, CMsnProto
 			int chk = SendMessage(hwndList, CLM_GETCHECKMARK, (WPARAM)hItem, 0);

 			if (chk) {

 				if (IsHContactInfo(hItem)) {

-					TCHAR buf[128] = _T("");

+					TCHAR buf[128] = L"";

 					SendMessage(hwndList, CLM_GETITEMTEXT, (WPARAM)hItem, (LPARAM)buf);

 

 					if (buf[0]) str.insert(mir_t2a(buf));

@@ -511,7 +511,7 @@ int CMsnProto::MSN_GCEventHook(WPARAM, LPARAM lParam)
 				GCDEST gcd = { m_szModuleName, gch->pDest->ptszID, GC_EVENT_MESSAGE };

 				GCEVENT gce = { sizeof(gce), &gcd };

 				gce.dwFlags = GCEF_ADDTOLOG;

-				gce.ptszNick = bError ? _T("") : dbv.ptszVal;

+				gce.ptszNick = bError ? L"" : dbv.ptszVal;

 				gce.ptszUID = mir_a2t(MyOptions.szEmail);

 				gce.time = time(NULL);

 				gce.ptszText = gch->ptszText;

@@ -574,7 +574,7 @@ int CMsnProto::MSN_GCEventHook(WPARAM, LPARAM lParam)
 

 		case 40:

 			const TCHAR *pszRole = MSN_GCGetRole(MSN_GetThreadByChatId(gch->pDest->ptszID), _T2A(gch->ptszUID));

-			MSN_Promoteuser(gch, (pszRole && !mir_tstrcmp(pszRole, _T("admin"))) ? "user" : "admin");

+			MSN_Promoteuser(gch, (pszRole && !mir_tstrcmp(pszRole, L"admin")) ? "user" : "admin");

 			break;

 		}

 		break;

@@ -605,7 +605,7 @@ int CMsnProto::MSN_GCMenuHook(WPARAM, LPARAM lParam)
 			{

 				{ LPGENT("User &details"), 10, MENU_ITEM, FALSE },

 				{ LPGENT("User &history"), 20, MENU_ITEM, FALSE },

-				{ _T(""), 100, MENU_SEPARATOR, FALSE },

+				{ L"", 100, MENU_SEPARATOR, FALSE },

 				{ LPGENT("&Leave chat session"), 110, MENU_ITEM, FALSE }

 			};

 			gcmi->nItems = _countof(Items);

@@ -620,13 +620,13 @@ int CMsnProto::MSN_GCMenuHook(WPARAM, LPARAM lParam)
 				{ LPGENT("&Op user")     , 40, MENU_ITEM, FALSE }

 			};

 			GCThreadData* thread = MSN_GetThreadByChatId(gcmi->pszID);

-			if (thread && thread->mMe && mir_tstrcmpi(thread->mMe->role, _T("admin"))) {

+			if (thread && thread->mMe && mir_tstrcmpi(thread->mMe->role, L"admin")) {

 				Items[2].bDisabled = TRUE;

 				Items[3].bDisabled = TRUE;

 			}

 			else {

 				const TCHAR *pszRole = MSN_GCGetRole(thread, email);

-				if (pszRole && !mir_tstrcmpi(pszRole, _T("admin")))

+				if (pszRole && !mir_tstrcmpi(pszRole, L"admin"))

 					Items[3].pszDesc = LPGENT("&Deop user");

 			}

 			gcmi->nItems = _countof(Items);

diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp
index a2a7dab1be..c2a02ae5c1 100644
--- a/protocols/MSN/src/msn_commands.cpp
+++ b/protocols/MSN/src/msn_commands.cpp
@@ -182,7 +182,7 @@ void CMsnProto::MSN_ReceiveMessage(ThreadData* info, char* cmdString, char* para
 		msgBody = tHeader.readFromBuffer(msgBody);

 		if (!(email = NEWSTR_ALLOCA(tHeader["From"]))) return;

 		mChatID = mir_a2t(tHeader["To"]);

-		if (_tcsncmp(mChatID, _T("19:"), 3)) mChatID[0]=0; // NETID_THREAD

+		if (_tcsncmp(mChatID, L"19:", 3)) mChatID[0]=0; // NETID_THREAD

 		msgBody = tHeader.readFromBuffer(msgBody);

 		msgBody = tHeader.readFromBuffer(msgBody);

 		nick = NEWSTR_ALLOCA(tHeader["IM-Display-Name"]);

@@ -848,7 +848,7 @@ void CMsnProto::MSN_ProcessStatusMessage(ezxml_t xmli, const char* wlid)
 		if (pCount > 12) lti.ptszType = mir_utf8decodeT(parts[12]);

 		else lti.ptszType = mir_utf8decodeT(parts[1]);

 

-		TCHAR *cm = (TCHAR *)CallService(MS_LISTENINGTO_GETPARSEDTEXT, (WPARAM)_T("%title% - %artist%"), (LPARAM)&lti);

+		TCHAR *cm = (TCHAR *)CallService(MS_LISTENINGTO_GETPARSEDTEXT, (WPARAM)L"%title% - %artist%", (LPARAM)&lti);

 		setTString(hContact, "ListeningTo", cm);

 

 		mir_free(cm);

diff --git a/protocols/MSN/src/msn_links.cpp b/protocols/MSN/src/msn_links.cpp
index 60e9f12147..d047b03213 100644
--- a/protocols/MSN/src/msn_links.cpp
+++ b/protocols/MSN/src/msn_links.cpp
@@ -34,7 +34,7 @@ static MCONTACT GetContact(TCHAR *arg, TCHAR **pemail, CMsnProto *proto)
 		TCHAR *tok = _tcschr(arg, '&'); /* next token */

 		if (tok != NULL) *tok++ = '\0';

 

-		if (_tcsnicmp(arg, _T("contact="), 8) == 0) {

+		if (_tcsnicmp(arg, L"contact=", 8) == 0) {

 			arg += 8;

 			UrlDecode(arg);

 			email = arg;

@@ -85,7 +85,7 @@ static INT_PTR ServiceParseMsnimLink(WPARAM, LPARAM lParam)
 

 

 	/* add a contact to the list */

-	if (_tcsnicmp(arg, _T("add?"), 4) == 0) {

+	if (_tcsnicmp(arg, L"add?", 4) == 0) {

 		arg += 4;

 

 		TCHAR *email;

@@ -109,7 +109,7 @@ static INT_PTR ServiceParseMsnimLink(WPARAM, LPARAM lParam)
 	}

 	/* send a message to a contact */

 	/* "voice" and "video" not yet implemented, perform same action as "chat" */

-	else if (_tcsnicmp(arg, _T("chat?"), 5) == 0) {

+	else if (_tcsnicmp(arg, L"chat?", 5) == 0) {

 		arg += 5;

 

 		MCONTACT hContact = GetContact(arg, NULL, proto);

@@ -119,7 +119,7 @@ static INT_PTR ServiceParseMsnimLink(WPARAM, LPARAM lParam)
 			return 0;

 		}

 	}

-	else if (_tcsnicmp(arg, _T("voice?"), 6) == 0) {

+	else if (_tcsnicmp(arg, L"voice?", 6) == 0) {

 		arg += 6;

 

 		MCONTACT hContact = GetContact(arg, NULL, proto);

@@ -129,7 +129,7 @@ static INT_PTR ServiceParseMsnimLink(WPARAM, LPARAM lParam)
 			return 0;

 		}

 	}

-	else if (_tcsnicmp(arg, _T("video?"), 6) == 0) {

+	else if (_tcsnicmp(arg, L"video?", 6) == 0) {

 		arg += 6;

 

 		MCONTACT hContact = GetContact(arg, NULL, proto);

diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp
index 99ea736122..364d437356 100644
--- a/protocols/MSN/src/msn_mail.cpp
+++ b/protocols/MSN/src/msn_mail.cpp
@@ -388,7 +388,7 @@ void CMsnProto::displayEmailCount(MCONTACT hContact)
 	rtrimt(name);

 

 	TCHAR szNick[128];

-	mir_sntprintf(szNick, getByte("DisableHotmailJunk", 0) ? _T("%s [%d]") : _T("%s [%d][%d]"), name, mUnreadMessages, mUnreadJunkEmails);

+	mir_sntprintf(szNick, getByte("DisableHotmailJunk", 0) ? L"%s [%d]" : L"%s [%d][%d]", name, mUnreadMessages, mUnreadJunkEmails);

 

 	nickChg = true;

 	setTString(hContact, "Nick", szNick);

diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index 3ac3245410..6d5b581a89 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -118,7 +118,7 @@ void CMsnProto::InitCustomFolders(void)
 	if (InitCstFldRan) return;

 

 	TCHAR folder[MAX_PATH];

-	mir_sntprintf(folder, _T("%%miranda_avatarcache%%\\%S"), m_szModuleName);

+	mir_sntprintf(folder, L"%%miranda_avatarcache%%\\%S", m_szModuleName);

 	hCustomSmileyFolder = FoldersRegisterCustomPathT(LPGEN("Custom Smileys"), m_szModuleName, folder, m_tszUserName);

 

 	InitCstFldRan = true;

@@ -170,7 +170,7 @@ char* MSN_GetAvatarHash(char* szContext, char** pszUrl)
 // MSN_GetAvatarFileName - gets a file name for an contact's avatar

 void CMsnProto::MSN_GetAvatarFileName(MCONTACT hContact, TCHAR* pszDest, size_t cbLen, const TCHAR *ext)

 {

-	size_t tPathLen = mir_sntprintf(pszDest, cbLen, _T("%s\\%S"), VARST(_T("%miranda_avatarcache%")), m_szModuleName);

+	size_t tPathLen = mir_sntprintf(pszDest, cbLen, L"%s\\%S", VARST(L"%miranda_avatarcache%"), m_szModuleName);

 

 	if (_taccess(pszDest, 0))

 		CreateDirectoryTreeT(pszDest);

@@ -182,7 +182,7 @@ void CMsnProto::MSN_GetAvatarFileName(MCONTACT hContact, TCHAR* pszDest, size_t
 			char* szAvatarHash = MSN_GetAvatarHash(dbv.pszVal);

 			if (szAvatarHash != NULL) {

 				TCHAR *sztAvatarHash = mir_a2t(szAvatarHash);

-				tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, _T("\\%s."), sztAvatarHash);

+				tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, L"\\%s.", sztAvatarHash);

 				mir_free(sztAvatarHash);

 				mir_free(szAvatarHash);

 			}

@@ -197,12 +197,12 @@ void CMsnProto::MSN_GetAvatarFileName(MCONTACT hContact, TCHAR* pszDest, size_t
 	}

 	else {

 		TCHAR *sztModuleName = mir_a2t(m_szModuleName);

-		tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, _T("\\%s avatar."), sztModuleName);

+		tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, L"\\%s avatar.", sztModuleName);

 		mir_free(sztModuleName);

 	}

 

 	if (ext == NULL) {

-		mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, _T("*"));

+		mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, L"*");

 

 		bool found = false;

 		_tfinddata_t c_file;

@@ -210,7 +210,7 @@ void CMsnProto::MSN_GetAvatarFileName(MCONTACT hContact, TCHAR* pszDest, size_t
 		if (hFile > -1L) {

 			do {

 				if (_tcsrchr(c_file.name, '.')) {

-					mir_sntprintf(pszDest + tPathLen2, cbLen - tPathLen2, _T("\\%s"), c_file.name);

+					mir_sntprintf(pszDest + tPathLen2, cbLen - tPathLen2, L"\\%s", c_file.name);

 					found = true;

 				}

 			} while (_tfindnext(hFile, &c_file) == 0);

@@ -317,10 +317,10 @@ void CMsnProto::MSN_GetCustomSmileyFileName(MCONTACT hContact, TCHAR* pszDest, s
 	InitCustomFolders();

 

 	TCHAR* path = (TCHAR*)alloca(cbLen * sizeof(TCHAR));

-	if (hCustomSmileyFolder == NULL || FoldersGetCustomPathT(hCustomSmileyFolder, path, (int)cbLen, _T(""))) {

-		TCHAR *tmpPath = Utils_ReplaceVarsT(_T("%miranda_userdata%"));

+	if (hCustomSmileyFolder == NULL || FoldersGetCustomPathT(hCustomSmileyFolder, path, (int)cbLen, L"")) {

+		TCHAR *tmpPath = Utils_ReplaceVarsT(L"%miranda_userdata%");

 		TCHAR *tszModuleName = mir_a2t(m_szModuleName);

-		tPathLen = mir_sntprintf(pszDest, cbLen, _T("%s\\%s\\CustomSmiley"), tmpPath, tszModuleName);

+		tPathLen = mir_sntprintf(pszDest, cbLen, L"%s\\%s\\CustomSmiley", tmpPath, tszModuleName);

 		mir_free(tszModuleName);

 		mir_free(tmpPath);

 	}

@@ -337,12 +337,12 @@ void CMsnProto::MSN_GetCustomSmileyFileName(MCONTACT hContact, TCHAR* pszDest, s
 			_ui64tot((UINT_PTR)hContact, dbv.ptszVal, 10);

 		}

 

-		tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, _T("\\%s"), dbv.ptszVal);

+		tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, L"\\%s", dbv.ptszVal);

 		db_free(&dbv);

 	}

 	else {

 		TCHAR *tszModuleName = mir_a2t(m_szModuleName);

-		tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, _T("\\%s"), tszModuleName);

+		tPathLen += mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, L"\\%s", tszModuleName);

 		mir_free(tszModuleName);

 	}

 

@@ -357,8 +357,8 @@ void CMsnProto::MSN_GetCustomSmileyFileName(MCONTACT hContact, TCHAR* pszDest, s
 		CreateDirectoryTreeT(pszDest);

 

 	TCHAR *sztSmileyName = mir_a2t(SmileyName);

-	mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, _T("\\%s.%s"), sztSmileyName,

-		type == MSN_APPID_CUSTOMSMILEY ? _T("png") : _T("gif"));

+	mir_sntprintf(pszDest + tPathLen, cbLen - tPathLen, L"\\%s.%s", sztSmileyName,

+		type == MSN_APPID_CUSTOMSMILEY ? L"png" : L"gif");

 	mir_free(sztSmileyName);

 }

 

@@ -623,21 +623,21 @@ void CMsnProto::MSN_SendStatusMessage(const char*)
 		if (ServiceExists(MS_LISTENINGTO_GETPARSEDTEXT)) {

 			LISTENINGTOINFO lti = { 0 };

 			lti.cbSize = sizeof(lti);

-			if (msnCurrentMedia.ptszTitle != NULL) lti.ptszTitle = _T("{0}");

-			if (msnCurrentMedia.ptszArtist != NULL) lti.ptszArtist = _T("{1}");

-			if (msnCurrentMedia.ptszAlbum != NULL) lti.ptszAlbum = _T("{2}");

-			if (msnCurrentMedia.ptszTrack != NULL) lti.ptszTrack = _T("{3}");

-			if (msnCurrentMedia.ptszYear != NULL) lti.ptszYear = _T("{4}");

-			if (msnCurrentMedia.ptszGenre != NULL) lti.ptszGenre = _T("{5}");

-			if (msnCurrentMedia.ptszLength != NULL) lti.ptszLength = _T("{6}");

-			if (msnCurrentMedia.ptszPlayer != NULL) lti.ptszPlayer = _T("{7}");

-			if (msnCurrentMedia.ptszType != NULL) lti.ptszType = _T("{8}");

-

-			TCHAR *tmp = (TCHAR *)CallService(MS_LISTENINGTO_GETPARSEDTEXT, (WPARAM)_T("%title% - %artist%"), (LPARAM)&lti);

+			if (msnCurrentMedia.ptszTitle != NULL) lti.ptszTitle = L"{0}";

+			if (msnCurrentMedia.ptszArtist != NULL) lti.ptszArtist = L"{1}";

+			if (msnCurrentMedia.ptszAlbum != NULL) lti.ptszAlbum = L"{2}";

+			if (msnCurrentMedia.ptszTrack != NULL) lti.ptszTrack = L"{3}";

+			if (msnCurrentMedia.ptszYear != NULL) lti.ptszYear = L"{4}";

+			if (msnCurrentMedia.ptszGenre != NULL) lti.ptszGenre = L"{5}";

+			if (msnCurrentMedia.ptszLength != NULL) lti.ptszLength = L"{6}";

+			if (msnCurrentMedia.ptszPlayer != NULL) lti.ptszPlayer = L"{7}";

+			if (msnCurrentMedia.ptszType != NULL) lti.ptszType = L"{8}";

+

+			TCHAR *tmp = (TCHAR *)CallService(MS_LISTENINGTO_GETPARSEDTEXT, (WPARAM)L"%title% - %artist%", (LPARAM)&lti);

 			szFormatEnc = HtmlEncodeUTF8T(tmp);

 			mir_free(tmp);

 		}

-		else szFormatEnc = HtmlEncodeUTF8T(_T("{0} - {1}"));

+		else szFormatEnc = HtmlEncodeUTF8T(L"{0} - {1}");

 

 		char *szArtist = HtmlEncodeUTF8T(msnCurrentMedia.ptszArtist),

 			*szAlbum = HtmlEncodeUTF8T(msnCurrentMedia.ptszAlbum),

@@ -788,7 +788,7 @@ void CMsnProto::MSN_SetServerStatus(int newStatus)
 		if (!getStringUtf("Place", &dbv))

 			szPlace = dbv.pszVal;

 		else {

-			TCHAR buf[128] = _T("Miranda");

+			TCHAR buf[128] = L"Miranda";

 			DWORD buflen = _countof(buf);

 			GetComputerName(buf, &buflen);

 			szPlace = mir_utf8encodeT(buf);

@@ -996,14 +996,14 @@ void CMsnProto::InitPopups(void)
 	ppc.colorBack = RGB(173, 206, 247);

 	ppc.colorText = GetSysColor(COLOR_WINDOWTEXT);

 	ppc.iSeconds = 3;

-	mir_sntprintf(desc, _T("%s/%s"), m_tszUserName, TranslateT("Hotmail"));

+	mir_sntprintf(desc, L"%s/%s", m_tszUserName, TranslateT("Hotmail"));

 	mir_snprintf(name, "%s_%s", m_szModuleName, "Hotmail");

 	hPopupHotmail = Popup_RegisterClass(&ppc);

 

 	ppc.colorBack = RGB(173, 206, 247);

 	ppc.colorText = GetSysColor(COLOR_WINDOWTEXT);

 	ppc.iSeconds = 3;

-	mir_sntprintf(desc, _T("%s/%s"), m_tszUserName, TranslateT("Notify"));

+	mir_sntprintf(desc, L"%s/%s", m_tszUserName, TranslateT("Notify"));

 	mir_snprintf(name, "%s_%s", m_szModuleName, "Notify");

 	hPopupNotify = Popup_RegisterClass(&ppc);

 

@@ -1012,7 +1012,7 @@ void CMsnProto::InitPopups(void)
 	ppc.colorText = RGB(255, 245, 225); //Yellow

 	ppc.iSeconds = 60;

 

-	mir_sntprintf(desc, _T("%s/%s"), m_tszUserName, TranslateT("Error"));

+	mir_sntprintf(desc, L"%s/%s", m_tszUserName, TranslateT("Error"));

 	mir_snprintf(name, "%s_%s", m_szModuleName, "Error");

 	hPopupError = Popup_RegisterClass(&ppc);

 }

@@ -1026,7 +1026,7 @@ void CALLBACK sttMainThreadCallback(void *param)
 	if ((iserr && !pud->proto->MyOptions.ShowErrorsAsPopups) || !ServiceExists(MS_POPUP_ADDPOPUPCLASS)) {

 		if (pud->flags & MSN_ALLOW_MSGBOX) {

 			TCHAR szMsg[MAX_SECONDLINE + MAX_CONTACTNAME];

-			mir_sntprintf(szMsg, _T("%s:\n%s"), pud->title, pud->text);

+			mir_sntprintf(szMsg, L"%s:\n%s", pud->title, pud->text);

 			int ret = MessageBox(NULL, szMsg, TranslateT("MSN Protocol"),

 				MB_YESNO | (iserr ? MB_ICONERROR : MB_ICONINFORMATION));

 			if (ret == IDYES)

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index 4db3c921d2..d7258e5533 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -492,7 +492,7 @@ void __cdecl CMsnProto::MsnFileAckThread(void* arg)
 	filetransfer* ft = (filetransfer*)arg;

 

 	TCHAR filefull[MAX_PATH];

-	mir_sntprintf(filefull, _T("%s\\%s"), ft->std.tszWorkingDir, ft->std.tszCurrentFile);

+	mir_sntprintf(filefull, L"%s\\%s", ft->std.tszWorkingDir, ft->std.tszCurrentFile);

 	replaceStrT(ft->std.tszCurrentFile, filefull);

 

 	ResetEvent(ft->hResumeEvt);

diff --git a/protocols/MSN/src/msn_skypeab.cpp b/protocols/MSN/src/msn_skypeab.cpp
index 716b408726..d2b1b52444 100644
--- a/protocols/MSN/src/msn_skypeab.cpp
+++ b/protocols/MSN/src/msn_skypeab.cpp
@@ -45,7 +45,7 @@ static TCHAR* get_json_str(JSONNode *item, const char *pszValue)
 {

 	if (JSONNode *node = json_get(item, pszValue)) {

 		TCHAR *ret = json_as_string(node);

-		if (!mir_tstrcmp(ret, _T("null"))) {

+		if (!mir_tstrcmp(ret, L"null")) {

 			mir_free(ret);

 			return NULL;

 		}

@@ -197,7 +197,7 @@ bool CMsnProto::MSN_SKYABGetProfile(const char *wlid)
 				if (value = get_json_str(item, "gender")) setByte(hContact, "Gender", (BYTE)(_ttoi(value) == 1 ? 'M' : 'F'));

 				if (value = get_json_str(item, "birthday")) {

 					int d, m, y;

-					_stscanf(value, _T("%d-%d-%d"), &y, &m, &d);

+					_stscanf(value, L"%d-%d-%d", &y, &m, &d);

 					setWord(hContact, "BirthYear", y);

 					setByte(hContact, "BirthDay", d);

 					setByte(hContact, "BirthMonth", m);

diff --git a/protocols/MSN/src/msn_soapstore.cpp b/protocols/MSN/src/msn_soapstore.cpp
index b8c52b9e73..09c8844223 100644
--- a/protocols/MSN/src/msn_soapstore.cpp
+++ b/protocols/MSN/src/msn_soapstore.cpp
@@ -282,7 +282,7 @@ bool CMsnProto::MSN_StoreGetProfile(bool allowRecurse)
 				while (docstr) {

 					const char *docname = ezxml_txt(ezxml_child(docstr, "DocumentStreamName"));

 					if (!mir_strcmp(docname, "UserTileStatic")) {

-						getMyAvatarFile(ezxml_txt(ezxml_child(docstr, "PreAuthURL")), _T("miranda_avatar.tmp"));

+						getMyAvatarFile(ezxml_txt(ezxml_child(docstr, "PreAuthURL")), L"miranda_avatar.tmp");

 						break;

 					}

 					docstr = ezxml_next(docstr);

diff --git a/protocols/MSN/src/msn_std.cpp b/protocols/MSN/src/msn_std.cpp
index 4df80b1c65..1edd062c00 100644
--- a/protocols/MSN/src/msn_std.cpp
+++ b/protocols/MSN/src/msn_std.cpp
@@ -54,7 +54,7 @@ TCHAR* CMsnProto::GetContactNameT(MCONTACT hContact)
 		return m_DisplayNameCache = str;

 	}

 

-	return _T("Me");

+	return L"Me";

 }

 

 unsigned MSN_GenRandom(void)

diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp
index 502ed01b46..0a9e5b5b0b 100644
--- a/protocols/MSN/src/msn_svcs.cpp
+++ b/protocols/MSN/src/msn_svcs.cpp
@@ -139,7 +139,7 @@ INT_PTR CMsnProto::GetAvatarInfo(WPARAM wParam, LPARAM lParam)
 			ft->std.hContact = pai->hContact;

 			ft->p2p_object = mir_strdup(szContext);

 

-			MSN_GetAvatarFileName(pai->hContact, filename, _countof(filename), _T("unk"));

+			MSN_GetAvatarFileName(pai->hContact, filename, _countof(filename), L"unk");

 			ft->std.tszCurrentFile = mir_tstrdup(filename);

 

 			p2p_invite(MSN_APPID_AVATAR, ft, NULL);

@@ -340,10 +340,10 @@ INT_PTR CMsnProto::SetCurrentMedia(WPARAM, LPARAM lParam)
 		msnCurrentMedia.cbSize = sizeof(msnCurrentMedia);	// Marks that there is info set

 		msnCurrentMedia.dwFlags = LTI_TCHAR;

 

-		overrideStr(msnCurrentMedia.ptszType, cm->ptszType, unicode, _T("Music"));

+		overrideStr(msnCurrentMedia.ptszType, cm->ptszType, unicode, L"Music");

 		overrideStr(msnCurrentMedia.ptszArtist, cm->ptszArtist, unicode);

 		overrideStr(msnCurrentMedia.ptszAlbum, cm->ptszAlbum, unicode);

-		overrideStr(msnCurrentMedia.ptszTitle, cm->ptszTitle, unicode, _T("No Title"));

+		overrideStr(msnCurrentMedia.ptszTitle, cm->ptszTitle, unicode, L"No Title");

 		overrideStr(msnCurrentMedia.ptszTrack, cm->ptszTrack, unicode);

 		overrideStr(msnCurrentMedia.ptszYear, cm->ptszYear, unicode);

 		overrideStr(msnCurrentMedia.ptszGenre, cm->ptszGenre, unicode);

@@ -357,11 +357,11 @@ INT_PTR CMsnProto::SetCurrentMedia(WPARAM, LPARAM lParam)
 	else {

 		TCHAR *text;

 		if (ServiceExists(MS_LISTENINGTO_GETPARSEDTEXT))

-			text = (TCHAR *)CallService(MS_LISTENINGTO_GETPARSEDTEXT, (WPARAM)_T("%title% - %artist%"), (LPARAM)&msnCurrentMedia);

+			text = (TCHAR *)CallService(MS_LISTENINGTO_GETPARSEDTEXT, (WPARAM)L"%title% - %artist%", (LPARAM)&msnCurrentMedia);

 		else {

 			text = (TCHAR *)mir_alloc(128 * sizeof(TCHAR));

-			mir_sntprintf(text, 128, _T("%s - %s"), (msnCurrentMedia.ptszTitle ? msnCurrentMedia.ptszTitle : _T("")),

-				(msnCurrentMedia.ptszArtist ? msnCurrentMedia.ptszArtist : _T("")));

+			mir_sntprintf(text, 128, L"%s - %s", (msnCurrentMedia.ptszTitle ? msnCurrentMedia.ptszTitle : L""),

+				(msnCurrentMedia.ptszArtist ? msnCurrentMedia.ptszArtist : L""));

 		}

 		setTString("ListeningTo", text);

 		mir_free(text);