less TCHARs

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

26 files changed, 221 insertions, 221 deletions

diff --git a/plugins/Clist_modern/src/cluiframes.cpp b/plugins/Clist_modern/src/cluiframes.cpp
index 38d402c835..4cd01abef0 100644
--- a/plugins/Clist_modern/src/cluiframes.cpp
+++ b/plugins/Clist_modern/src/cluiframes.cpp
@@ -681,7 +681,7 @@ static int LocateStorePosition(int Frameid, int maxstored)
 		if (db_get_ts(NULL, CLUIFrameModule, settingname, &dbv))

 			continue;

 

-		if (mir_tstrcmpi(dbv.ptszVal, g_pfwFrames[Frameid].name) == 0) {

+		if (mir_wstrcmpi(dbv.ptszVal, g_pfwFrames[Frameid].name) == 0) {

 			db_free(&dbv);

 			return i;

 		}

@@ -1049,9 +1049,9 @@ static int _us_DoSetFrameOptions(WPARAM wParam, LPARAM lParam)
 

 		mir_free(fw.name);

 		if (bUnicodeText)

-			fw.name = mir_tstrdup((LPTSTR)lParam);

+			fw.name = mir_wstrdup((LPTSTR)lParam);

 		else

-			fw.name = mir_a2t((char *)lParam);

+			fw.name = mir_a2u((char *)lParam);

 		return 0;

 

 	case FO_TBNAME:

@@ -1060,9 +1060,9 @@ static int _us_DoSetFrameOptions(WPARAM wParam, LPARAM lParam)
 

 		mir_free(fw.TitleBar.tbname);

 		if (bUnicodeText)

-			fw.TitleBar.tbname = mir_tstrdup((LPTSTR)lParam);

+			fw.TitleBar.tbname = mir_wstrdup((LPTSTR)lParam);

 		else

-			fw.TitleBar.tbname = mir_a2t((char*)lParam);

+			fw.TitleBar.tbname = mir_a2u((char*)lParam);

 

 		if (fw.floating && (fw.TitleBar.tbname != NULL))

 			SetWindowText(fw.ContainerWnd, fw.TitleBar.tbname);

@@ -1075,9 +1075,9 @@ static int _us_DoSetFrameOptions(WPARAM wParam, LPARAM lParam)
 		if (fw.TitleBar.tooltip != NULL)

 			mir_free_and_nil(fw.TitleBar.tooltip);

 		if (bUnicodeText)

-			fw.TitleBar.tooltip = mir_tstrdup((LPTSTR)lParam);

+			fw.TitleBar.tooltip = mir_wstrdup((LPTSTR)lParam);

 		else

-			fw.TitleBar.tooltip = mir_a2t((char*)lParam);

+			fw.TitleBar.tooltip = mir_a2u((char*)lParam);

 

 		UpdateTBToolTip(pos);

 		return 0;

@@ -1568,13 +1568,13 @@ static int _us_DoAddFrame(WPARAM wParam, LPARAM)
 		g_pfwFrames[g_nFramesCount].name = (LPTSTR)mir_alloc(255 * sizeof(wchar_t));

 		GetClassName(g_pfwFrames[g_nFramesCount].hWnd, g_pfwFrames[g_nFramesCount].name, 255);

 	}

-	else g_pfwFrames[g_nFramesCount].name = (clfrm->Flags & F_UNICODE) ? mir_u2t(clfrm->wname) : mir_a2t(clfrm->name);

+	else g_pfwFrames[g_nFramesCount].name = (clfrm->Flags & F_UNICODE) ? mir_wstrdup(clfrm->wname) : mir_a2u(clfrm->name);

 

 	if (IsBadCodePtr((FARPROC)clfrm->TBname) || clfrm->TBname == NULL

 		|| ((clfrm->Flags&F_UNICODE) ? mir_wstrlen(clfrm->TBwname) : mir_strlen(clfrm->TBname)) == 0)

-		g_pfwFrames[g_nFramesCount].TitleBar.tbname = mir_tstrdup(g_pfwFrames[g_nFramesCount].name);

+		g_pfwFrames[g_nFramesCount].TitleBar.tbname = mir_wstrdup(g_pfwFrames[g_nFramesCount].name);

 	else

-		g_pfwFrames[g_nFramesCount].TitleBar.tbname = (clfrm->Flags & F_UNICODE) ? mir_u2t(clfrm->TBwname) : mir_a2t(clfrm->TBname);

+		g_pfwFrames[g_nFramesCount].TitleBar.tbname = (clfrm->Flags & F_UNICODE) ? mir_wstrdup(clfrm->TBwname) : mir_a2u(clfrm->TBname);

 

 	g_pfwFrames[g_nFramesCount].needhide = FALSE;

 	g_pfwFrames[g_nFramesCount].TitleBar.ShowTitleBar = (clfrm->Flags & F_SHOWTB ? TRUE : FALSE);

@@ -2362,7 +2362,7 @@ int OnFrameTitleBarBackgroundChange(WPARAM, LPARAM)
 		}

 		if (g_CluiData.fDisableSkinEngine) {

 			if (db_get_b(NULL, "FrameTitleBar", "UseBitmap", CLCDEFAULT_USEBITMAP)) {

-				ptrT tszBitmapName(db_get_tsa(NULL, "FrameTitleBar", "BkBitmap"));

+				ptrW tszBitmapName(db_get_tsa(NULL, "FrameTitleBar", "BkBitmap"));

 				if (tszBitmapName)

 					sttBmpBackground = Bitmap_Load(tszBitmapName);

 			}

@@ -2552,7 +2552,7 @@ int DrawTitleBar(HDC hdcMem2, RECT *rect, int Frameid)
 			textrc.left += GetSystemMetrics(SM_CXSMICON) + 2;

 			textrc.top += 2;

 		}

-		ske_TextOut(hdcMem, textrc.left, textrc.top, g_pfwFrames[pos].TitleBar.tbname, (int)mir_tstrlen(g_pfwFrames[pos].TitleBar.tbname));

+		ske_TextOut(hdcMem, textrc.left, textrc.top, g_pfwFrames[pos].TitleBar.tbname, (int)mir_wstrlen(g_pfwFrames[pos].TitleBar.tbname));

 

 		if (!AlignCOLLIconToLeft)

 			ske_DrawIconEx(hdcMem, g_pfwFrames[pos].TitleBar.wndSize.right - GetSystemMetrics(SM_CXSMICON) - 2, rc.top + ((g_nTitleBarHeight >> 1) - (GetSystemMetrics(SM_CXSMICON) >> 1)), g_pfwFrames[pos].collapsed ? Skin_LoadIcon(SKINICON_OTHER_GROUPOPEN) : Skin_LoadIcon(SKINICON_OTHER_GROUPSHUT), GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, NULL, DI_NORMAL);

@@ -2735,7 +2735,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam
 			if (pos != -1) {

 				int oldflags;

 

-				mir_sntprintf(TBcapt, L"%s - h:%d, vis:%d, fl:%d, fl:(%d,%d,%d,%d),or: %d",

+				mir_snwprintf(TBcapt, L"%s - h:%d, vis:%d, fl:%d, fl:(%d,%d,%d,%d),or: %d",

 					g_pfwFrames[pos].name, g_pfwFrames[pos].height, g_pfwFrames[pos].visible, g_pfwFrames[pos].floating,

 					g_pfwFrames[pos].FloatingPos.x, g_pfwFrames[pos].FloatingPos.y,

 					g_pfwFrames[pos].FloatingSize.x, g_pfwFrames[pos].FloatingSize.y,

diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp
index 9eb5a578f8..74e4809ab5 100644
--- a/plugins/Clist_modern/src/modern_aniavatars.cpp
+++ b/plugins/Clist_modern/src/modern_aniavatars.cpp
@@ -153,7 +153,7 @@ static int _AniAva_SortAvatarInfo(const ANIAVA_INFO *aai1, const ANIAVA_INFO *aa
 {

 	int res;

 	if (aai1 && aai1->tcsFilename && aai2 && aai2->tcsFilename)

-		res = mir_tstrcmpi(aai2->tcsFilename, aai1->tcsFilename);

+		res = mir_wstrcmpi(aai2->tcsFilename, aai1->tcsFilename);

 	else {

 		int a1 = (aai1 != NULL && aai1->tcsFilename != NULL);

 		int a2 = (aai2 != NULL && aai2->tcsFilename != NULL);

@@ -351,7 +351,7 @@ static int	_AniAva_LoadAvatarFromImage(wchar_t * szFileName, int width, int heig
 	int idx = s_AniAvatarList.getIndex(&aai);

 	if (idx == -1) { //item not present in list

 		paai = (ANIAVA_INFO *)mir_calloc(sizeof(ANIAVA_INFO));

-		paai->tcsFilename = mir_tstrdup(szFileName);

+		paai->tcsFilename = mir_wstrdup(szFileName);

 		paai->dwAvatarUniqId = rand();

 

 		// get image strip

diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp
index 95e2a7f196..2406754e47 100644
--- a/plugins/Clist_modern/src/modern_cachefuncs.cpp
+++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp
@@ -79,7 +79,7 @@ void CSmileyString::AddListeningToIcon(ClcData *dat, wchar_t *szText)
 	if (szText == NULL)
 		return;
 
-	int text_size = (int)mir_tstrlen(szText);
+	int text_size = (int)mir_wstrlen(szText);
 
 	plText = List_Create(0, 1);
 
@@ -180,7 +180,7 @@ void CSmileyString::ReplaceSmileys(ClcData *dat, ClcCacheEntry *pdnce, wchar_t *
 	if (!dat->text_replace_smileys || !replace_smileys || szText == NULL)
 		return;
 
-	int text_size = (int)mir_tstrlen(szText);
+	int text_size = (int)mir_wstrlen(szText);
 
 	// Call service for the first time to see if needs to be used...
 	SMADD_BATCHPARSE2 sp = { 0 };
@@ -283,7 +283,7 @@ int GetStatusName(wchar_t *text, int text_size, ClcCacheEntry *pdnce, BOOL xstat
 	if (!noAwayMsg && !noXstatus &&  xstatus_has_priority && pdnce->hContact && pdnce->m_pszProto) {
 		DBVARIANT dbv = { 0 };
 		if (!db_get_ts(pdnce->hContact, pdnce->m_pszProto, "XStatusName", &dbv)) {
-			//mir_tstrncpy(text, dbv.pszVal, text_size);
+			//mir_wstrncpy(text, dbv.pszVal, text_size);
 			CopySkipUnprintableChars(text, dbv.ptszVal, text_size - 1);
 			db_free(&dbv);
 
@@ -295,7 +295,7 @@ int GetStatusName(wchar_t *text, int text_size, ClcCacheEntry *pdnce, BOOL xstat
 	// Get Status name
 	wchar_t *tmp = pcli->pfnGetStatusModeDescription(nStatus, 0);
 	if (tmp && *tmp) {
-		mir_tstrncpy(text, tmp, text_size);
+		mir_wstrncpy(text, tmp, text_size);
 		return 1;
 	}
 
@@ -324,7 +324,7 @@ void GetListeningTo(wchar_t *text, int text_size, ClcCacheEntry *pdnce)
 	if (pdnce->m_iStatus == ID_STATUS_OFFLINE || pdnce->m_iStatus == 0)
 		return;
 
-	ptrT tszValue(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "ListeningTo"));
+	ptrW tszValue(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "ListeningTo"));
 	if (tszValue != NULL)
 		CopySkipUnprintableChars(text, tszValue, text_size - 1);
 }
@@ -345,7 +345,7 @@ int GetStatusMessage(wchar_t *text, int text_size, ClcCacheEntry *pdnce, BOOL xs
 
 	// Get XStatusMsg
 	if (!noAwayMsg  && xstatus_has_priority && pdnce->hContact && pdnce->m_pszProto) {
-		ptrT tszXStatusMsg(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "XStatusMsg"));
+		ptrW tszXStatusMsg(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "XStatusMsg"));
 		if (tszXStatusMsg != NULL) {
 			CopySkipUnprintableChars(text, tszXStatusMsg, text_size - 1);
 			if (text[0] != '\0')
@@ -355,7 +355,7 @@ int GetStatusMessage(wchar_t *text, int text_size, ClcCacheEntry *pdnce, BOOL xs
 
 	// Get StatusMsg
 	if (pdnce->hContact && text[0] == '\0') {
-		ptrT tszStatusMsg(db_get_tsa(pdnce->hContact, "CList", "StatusMsg"));
+		ptrW tszStatusMsg(db_get_tsa(pdnce->hContact, "CList", "StatusMsg"));
 		if (tszStatusMsg != NULL) {
 			CopySkipUnprintableChars(text, tszStatusMsg, text_size - 1);
 			if (text[0] != '\0')
@@ -366,7 +366,7 @@ int GetStatusMessage(wchar_t *text, int text_size, ClcCacheEntry *pdnce, BOOL xs
 	// Get XStatusMsg
 	if (!noAwayMsg && !xstatus_has_priority && pdnce->hContact && pdnce->m_pszProto && text[0] == '\0') {
 		// Try to get XStatusMsg
-		ptrT tszXStatusMsg(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "XStatusMsg"));
+		ptrW tszXStatusMsg(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "XStatusMsg"));
 		if (tszXStatusMsg != NULL) {
 			CopySkipUnprintableChars(text, tszXStatusMsg, text_size - 1);
 			if (text[0] != '\0')
@@ -391,10 +391,10 @@ int Cache_GetLineText(ClcCacheEntry *pdnce, int type, LPTSTR text, int text_size
 LBL_Status:
 		if (GetStatusName(text, text_size, pdnce, line.xstatus_has_priority) == -1 && line.use_name_and_message_for_xstatus) {
 			// Try to get XStatusMsg
-			ptrT tszXStatusMsg(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "XStatusMsg"));
+			ptrW tszXStatusMsg(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "XStatusMsg"));
 			if (tszXStatusMsg != NULL && tszXStatusMsg[0] != 0) {
 				wchar_t *tmp = NEWWSTR_ALLOCA(text);
-				mir_sntprintf(text, text_size, L"%s: %s", tmp, tszXStatusMsg);
+				mir_snwprintf(text, text_size, L"%s: %s", tmp, tszXStatusMsg);
 				CopySkipUnprintableChars(text, text, text_size - 1);
 			}
 		}
@@ -402,9 +402,9 @@ LBL_Status:
 
 	case TEXT_NICKNAME:
 		if (pdnce->hContact && pdnce->m_pszProto) {
-			ptrT tszNick(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "Nick"));
+			ptrW tszNick(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "Nick"));
 			if (tszNick != NULL) {
-				mir_tstrncpy(text, tszNick, text_size);
+				mir_wstrncpy(text, tszNick, text_size);
 				CopySkipUnprintableChars(text, text, text_size - 1);
 			}
 		}
@@ -413,18 +413,18 @@ LBL_Status:
 	case TEXT_STATUS_MESSAGE:
 		if (GetStatusMessage(text, text_size, pdnce, line.xstatus_has_priority) == -1 && line.use_name_and_message_for_xstatus) {
 			// Try to get XStatusName
-			ptrT tszXStatusName(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "XStatusName"));
+			ptrW tszXStatusName(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "XStatusName"));
 			if (tszXStatusName != NULL && tszXStatusName[0] != 0) {
 				wchar_t *tmp = NEWWSTR_ALLOCA(text);
-				mir_sntprintf(text, text_size, L"%s: %s", tszXStatusName, tmp);
+				mir_snwprintf(text, text_size, L"%s: %s", tszXStatusName, tmp);
 				CopySkipUnprintableChars(text, text, text_size - 1);
 			}
 		}
 		else if (line.use_name_and_message_for_xstatus && line.xstatus_has_priority) {
 			// Try to get XStatusName
-			ptrT tszXStatusName(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "XStatusName"));
+			ptrW tszXStatusName(db_get_tsa(pdnce->hContact, pdnce->m_pszProto, "XStatusName"));
 			if (tszXStatusName != NULL && tszXStatusName[0] != 0) {
-				mir_tstrncpy(text, tszXStatusName, text_size);
+				mir_wstrncpy(text, tszXStatusName, text_size);
 				CopySkipUnprintableChars(text, text, text_size - 1);
 			}
 		}
@@ -447,8 +447,8 @@ LBL_Status:
 
 	case TEXT_TEXT:
 		{
-			ptrT tmp(variables_parsedup(line.text, pdnce->tszName, pdnce->hContact));
-			mir_tstrncpy(text, tmp, text_size);
+			ptrW tmp(variables_parsedup(line.text, pdnce->tszName, pdnce->hContact));
+			mir_wstrncpy(text, tmp, text_size);
 			CopySkipUnprintableChars(text, text, text_size - 1);
 		}
 		return TEXT_TEXT;
@@ -479,18 +479,18 @@ void Cache_GetFirstLineText(ClcData *dat, ClcContact *contact)
 		DBVARIANT dbv = { 0 };
 		if (!db_get_ts(pdnce->hContact, pdnce->m_pszProto, "Nick", &dbv)) {
 			wchar_t nick[_countof(contact->szText)];
-			mir_tstrncpy(nick, dbv.ptszVal, _countof(contact->szText));
+			mir_wstrncpy(nick, dbv.ptszVal, _countof(contact->szText));
 			db_free(&dbv);
 
 			// They are the same -> use the name to keep the case
-			if (mir_tstrcmpi(name, nick) == 0)
-				mir_tstrncpy(contact->szText, name, _countof(contact->szText));
+			if (mir_wstrcmpi(name, nick) == 0)
+				mir_wstrncpy(contact->szText, name, _countof(contact->szText));
 			else // Append then
-				mir_sntprintf(contact->szText, L"%s - %s", name, nick);
+				mir_snwprintf(contact->szText, L"%s - %s", name, nick);
 		}
-		else mir_tstrncpy(contact->szText, name, _countof(contact->szText));
+		else mir_wstrncpy(contact->szText, name, _countof(contact->szText));
 	}
-	else mir_tstrncpy(contact->szText, name, _countof(contact->szText));
+	else mir_wstrncpy(contact->szText, name, _countof(contact->szText));
 
 	if (!dat->bForceInDialog)
 		contact->ssText.ReplaceSmileys(dat, pdnce, contact->szText, dat->first_line_draw_smileys);
@@ -505,20 +505,20 @@ void Cache_GetNthLineText(ClcData *dat, ClcCacheEntry *pdnce, int n)
 	ClcLineInfo &line = (n == 2) ? dat->secondLine : dat->thirdLine;
 	wchar_t* &szText = (n == 2) ? pdnce->szSecondLineText : pdnce->szThirdLineText;
 
-	// in most cases replaceStrT does nothing
+	// in most cases replaceStrW does nothing
 	if (!line.show) {
-		replaceStrT(szText, NULL);
+		replaceStrW(szText, NULL);
 		return;
 	}
 	
 	int type = Cache_GetLineText(pdnce, line.type, Text, _countof(Text), line);
 	if (Text[0] == 0) {
-		replaceStrT(szText, NULL);
+		replaceStrW(szText, NULL);
 		return;
 	}
 	
 	Text[_countof(Text) - 1] = 0; //to be sure that it is null terminated string
-	replaceStrT(szText, Text);
+	replaceStrW(szText, Text);
 
 	CSmileyString &ss = (n == 2) ? pdnce->ssSecondLine : pdnce->ssThirdLine;
 	if (type == TEXT_LISTENING_TO && szText[0] != '\0')
@@ -532,8 +532,8 @@ void Cache_GetNthLineText(ClcData *dat, ClcCacheEntry *pdnce, int n)
 void RemoveTag(wchar_t *to, wchar_t *tag)
 {
 	wchar_t *st = to;
-	int len = (int)mir_tstrlen(tag);
-	int lastsize = (int)mir_tstrlen(to) + 1;
+	int len = (int)mir_wstrlen(tag);
+	int lastsize = (int)mir_wstrlen(to) + 1;
 	while (st = wcsstr(st, tag)) {
 		lastsize -= len;
 		memmove((void*)st, (void*)(st + len), (lastsize)*sizeof(wchar_t));
@@ -669,7 +669,7 @@ void Cache_ProceedAvatarInList(ClcData *dat, ClcContact *contact)
 		else
 			height_clip = width_clip * ace->bmHeight / ace->bmWidth;
 
-		if (wildcmpit(contact->avatar_data->szFilename, L"*.gif")) {
+		if (wildcmpiw(contact->avatar_data->szFilename, L"*.gif")) {
 			if (old_pos == AVATAR_POS_ANIMATED)
 				AniAva_RemoveAvatar(contact->hContact);
 
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index b2c4001665..ed48ac41bc 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -205,7 +205,7 @@ static int clcProceedDragToScroll(HWND hwnd, int Y)
 static int clcSearchNextContact(HWND hwnd, ClcData *dat, int index, const wchar_t *text, int prefixOk, BOOL fSearchUp)

 {

 	ClcGroup *group = &dat->list;

-	int testlen = (int)mir_tstrlen(text);

+	int testlen = (int)mir_wstrlen(text);

 	BOOL fReturnAsFound = FALSE;

 	int	 nLastFound = -1;

 	if (index == -1) fReturnAsFound = TRUE;

@@ -229,7 +229,7 @@ static int clcSearchNextContact(HWND hwnd, ClcData *dat, int index, const wchar_
 				wchar_t *lowered_search = CharLowerW(NEWWSTR_ALLOCA(dat->szQuickSearch));

 				found = wcsstr(lowered_szText, lowered_search) != NULL;

 			}

-			else found = ((prefixOk && CSTR_EQUAL == CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, text, -1, cc->szText, testlen)) || (!prefixOk && !mir_tstrcmpi(text, cc->szText)));

+			else found = ((prefixOk && CSTR_EQUAL == CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, text, -1, cc->szText, testlen)) || (!prefixOk && !mir_wstrcmpi(text, cc->szText)));

 

 			if (found) {

 				ClcGroup *contactGroup = group;

@@ -1083,7 +1083,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 				if (mir_strcmp(contSour->proto, META_PROTO)) {

 					if (!contSour->iSubNumber) {

 						MCONTACT hDest = contDest->hContact;

-						mir_sntprintf(Wording, TranslateT("Do you want contact '%s' to be converted to metacontact and '%s' be added to it?"), contDest->szText, contSour->szText);

+						mir_snwprintf(Wording, TranslateT("Do you want contact '%s' to be converted to metacontact and '%s' be added to it?"), contDest->szText, contSour->szText);

 						int res = MessageBox(hwnd, Wording, TranslateT("Converting to metacontact"), MB_OKCANCEL | MB_ICONQUESTION);

 						if (res == 1) {

 							MCONTACT handle = CallService(MS_MC_CONVERTTOMETA, hDest, 0);

@@ -1096,7 +1096,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 					else {

 						hcontact = contSour->hContact;

 						MCONTACT hdest = contDest->hContact;

-						mir_sntprintf(Wording, TranslateT("Do you want contact '%s' to be converted to metacontact and '%s' be added to it (remove it from '%s')?"), contDest->szText, contSour->szText, contSour->subcontacts->szText);

+						mir_snwprintf(Wording, TranslateT("Do you want contact '%s' to be converted to metacontact and '%s' be added to it (remove it from '%s')?"), contDest->szText, contSour->szText, contSour->subcontacts->szText);

 						int res = MessageBox(hwnd, Wording, TranslateT("Converting to metacontact (moving)"), MB_OKCANCEL | MB_ICONQUESTION);

 						if (res == 1) {

 							MCONTACT handle = (MCONTACT)CallService(MS_MC_CONVERTTOMETA, (WPARAM)hdest, 0);

@@ -1122,7 +1122,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 				if (!contSour->iSubNumber) {

 					MCONTACT hcontact = contSour->hContact;

 					MCONTACT handle = contDest->hContact;

-					mir_sntprintf(Wording, TranslateT("Do you want contact '%s' to be added to metacontact '%s'?"), contSour->szText, contDest->szText);

+					mir_snwprintf(Wording, TranslateT("Do you want contact '%s' to be added to metacontact '%s'?"), contSour->szText, contDest->szText);

 					int res = MessageBox(hwnd, Wording, TranslateT("Adding contact to metacontact"), MB_OKCANCEL | MB_ICONQUESTION);

 					if (res == 1) {

 						if (!handle)

@@ -1132,7 +1132,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 				}

 				else if (contSour->subcontacts == contDest) {

 					MCONTACT hsour = contSour->hContact;

-					mir_sntprintf(Wording, TranslateT("Do you want contact '%s' to be default?"), contSour->szText);

+					mir_snwprintf(Wording, TranslateT("Do you want contact '%s' to be default?"), contSour->szText);

 					int res = MessageBox(hwnd, Wording, TranslateT("Set default contact"), MB_OKCANCEL | MB_ICONQUESTION);

 					if (res == 1)

 						db_mc_setDefault(contDest->hContact, hsour, true);

@@ -1140,7 +1140,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 				else {

 					MCONTACT hcontact = contSour->hContact;

 					MCONTACT handle = contDest->hContact;

-					mir_sntprintf(Wording, TranslateT("Do you want contact '%s' to be removed from metacontact '%s' and added to '%s'?"), contSour->szText, contSour->subcontacts->szText, contDest->szText);

+					mir_snwprintf(Wording, TranslateT("Do you want contact '%s' to be removed from metacontact '%s' and added to '%s'?"), contSour->szText, contSour->subcontacts->szText, contDest->szText);

 					int res = MessageBox(hwnd, Wording, TranslateT("Changing metacontacts (moving)"), MB_OKCANCEL | MB_ICONQUESTION);

 					if (res == 1) {

 						if (!handle)

@@ -1164,7 +1164,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 				if (!contSour->iSubNumber) {

 					MCONTACT hcontact = contSour->hContact;

 					MCONTACT handle = contDest->subcontacts->hContact;

-					mir_sntprintf(Wording, TranslateT("Do you want contact '%s' to be added to metacontact '%s'?"), contSour->szText, contDest->subcontacts->szText);

+					mir_snwprintf(Wording, TranslateT("Do you want contact '%s' to be added to metacontact '%s'?"), contSour->szText, contDest->subcontacts->szText);

 					int res = MessageBox(hwnd, Wording, TranslateT("Changing metacontacts (moving)"), MB_OKCANCEL | MB_ICONQUESTION);

 					if (res == 1) {

 						if (!handle)

@@ -1176,7 +1176,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 				else if (contSour->subcontacts != contDest->subcontacts) {

 					MCONTACT hcontact = contSour->hContact;

 					MCONTACT handle = contDest->subcontacts->hContact;

-					mir_sntprintf(Wording, TranslateT("Do you want contact '%s' to be removed from metacontact '%s' and added to '%s'?"), contSour->szText, contSour->subcontacts->szText, contDest->subcontacts->szText);

+					mir_snwprintf(Wording, TranslateT("Do you want contact '%s' to be removed from metacontact '%s' and added to '%s'?"), contSour->szText, contSour->subcontacts->szText, contDest->subcontacts->szText);

 					int res = MessageBox(hwnd, Wording, TranslateT("Changing metacontacts (moving)"), MB_OKCANCEL | MB_ICONQUESTION);

 					if (res == 1) {

 						if (!handle)

@@ -1202,11 +1202,11 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 				pcli->pfnGetRowByIndex(dat, dat->iDragItem, &contact, &group);

 				int i = pcli->pfnGetRowByIndex(dat, dat->iInsertionMark, &destcontact, &destgroup);

 				if (i != -1 && group->groupId != destgroup->groupId) {

-					wchar_t *groupName = mir_tstrdup(Clist_GroupGetName(contact->groupId, 0));

+					wchar_t *groupName = mir_wstrdup(Clist_GroupGetName(contact->groupId, 0));

 					wchar_t *shortGroup = NULL;

-					wchar_t *sourceGrName = mir_tstrdup(Clist_GroupGetName(destgroup->groupId, 0));

+					wchar_t *sourceGrName = mir_wstrdup(Clist_GroupGetName(destgroup->groupId, 0));

 					if (groupName) {

-						int len = (int)mir_tstrlen(groupName);

+						int len = (int)mir_wstrlen(groupName);

 						do { len--; } while (len >= 0 && groupName[len] != '\\');

 						if (len >= 0)

 							shortGroup = groupName + len + 1;

@@ -1216,9 +1216,9 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 					if (shortGroup) {

 						NeedRename = TRUE;

 						if (sourceGrName)

-							mir_sntprintf(newName, L"%s\\%s", sourceGrName, shortGroup);

+							mir_snwprintf(newName, L"%s\\%s", sourceGrName, shortGroup);

 						else

-							mir_tstrncpy(newName, shortGroup, _countof(newName));

+							mir_wstrncpy(newName, shortGroup, _countof(newName));

 					}

 					mir_free(groupName);

 					mir_free(sourceGrName);

diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index e2a5cb896f..d23703ba0a 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -433,10 +433,10 @@ int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, ClcData *dat)
 		}

 

 		if (g_CluiData.bFilterEffective & CLVM_FILTER_GROUPS) {

-			ptrT tszGroup(db_get_tsa(hContact, "CList", "Group"));

+			ptrW tszGroup(db_get_tsa(hContact, "CList", "Group"));

 			if (tszGroup != NULL) {

 				wchar_t szGroupMask[256];

-				mir_sntprintf(szGroupMask, L"%s|", tszGroup);

+				mir_snwprintf(szGroupMask, L"%s|", tszGroup);

 				filterResult = (g_CluiData.filterFlags & CLVM_PROTOGROUP_OP) ? (filterResult | (wcsstr(g_CluiData.groupFilter, szGroupMask) ? 1 : 0)) : (filterResult & (wcsstr(g_CluiData.groupFilter, szGroupMask) ? 1 : 0));

 			}

 			else if (g_CluiData.filterFlags & CLVM_INCLUDED_UNGROUPED)

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 4abc781b90..bacc564cc9 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -138,8 +138,8 @@ void RegisterCLUIFonts(void)
 		fontid.flags = FIDF_DEFAULTVALID | FIDF_APPENDNAME | FIDF_SAVEPOINTSIZE | FIDF_ALLOWEFFECTS | FIDF_ALLOWREREGISTER | FIDF_NOAS;

 		fontid.flags |= fontOptionsList[i].dwFlags;

 

-		mir_tstrncpy(fontid.group, fontOptionsList[i].szGroup, _countof(fontid.group));

-		mir_tstrncpy(fontid.name, fontOptionsList[i].szDescr, _countof(fontid.name));

+		mir_wstrncpy(fontid.group, fontOptionsList[i].szGroup, _countof(fontid.group));

+		mir_wstrncpy(fontid.name, fontOptionsList[i].szDescr, _countof(fontid.name));

 		mir_snprintf(idstr, "Font%d", fontOptionsList[i].fontID);

 		mir_strncpy(fontid.prefix, idstr, _countof(fontid.prefix));

 		fontid.order = i + 1;

@@ -148,12 +148,12 @@ void RegisterCLUIFonts(void)
 		fontid.deffontsettings.colour = fontOptionsList[i].defColour;

 		fontid.deffontsettings.size = fontOptionsList[i].defSize;

 		fontid.deffontsettings.style = fontOptionsList[i].defStyle;

-		mir_tstrncpy(fontid.deffontsettings.szFace, fontOptionsList[i].szDefFace, _countof(fontid.deffontsettings.szFace));

+		mir_wstrncpy(fontid.deffontsettings.szFace, fontOptionsList[i].szDefFace, _countof(fontid.deffontsettings.szFace));

 

 		FontRegisterT(&fontid);

 

-		mir_tstrncpy(effectid.group, fontOptionsList[i].szGroup, _countof(effectid.group));

-		mir_tstrncpy(effectid.name, fontOptionsList[i].szDescr, _countof(effectid.name));

+		mir_wstrncpy(effectid.group, fontOptionsList[i].szGroup, _countof(effectid.group));

+		mir_wstrncpy(effectid.name, fontOptionsList[i].szDescr, _countof(effectid.name));

 		mir_snprintf(idstr, "Font%d", fontOptionsList[i].fontID);

 		mir_strncpy(effectid.setting, idstr, _countof(effectid.setting));

 		effectid.order = i + 1;

@@ -169,8 +169,8 @@ void RegisterCLUIFonts(void)
 	colourid.cbSize = sizeof(colourid);

 

 	for (int i = 0; i < _countof(colourOptionsList); i++) {

-		mir_tstrncpy(colourid.group, colourOptionsList[i].szGroup, _countof(colourid.group));

-		mir_tstrncpy(colourid.name, colourOptionsList[i].szDescr, _countof(colourid.group));

+		mir_wstrncpy(colourid.group, colourOptionsList[i].szGroup, _countof(colourid.group));

+		mir_wstrncpy(colourid.name, colourOptionsList[i].szDescr, _countof(colourid.group));

 		mir_strncpy(colourid.setting, colourOptionsList[i].chName, _countof(colourid.setting));

 		mir_strncpy(colourid.dbSettingsGroup, colourOptionsList[i].chGroup, _countof(colourid.dbSettingsGroup));

 		colourid.defcolour = colourOptionsList[i].defColour;

@@ -205,8 +205,8 @@ void GetFontSetting(int i, LOGFONT *lf, COLORREF *colour, BYTE *effect, COLORREF
 

 	FontIDT fontid = { 0 };

 	fontid.cbSize = sizeof(fontid);

-	mir_tstrncpy(fontid.group, fontOptionsList[index].szGroup, _countof(fontid.group));

-	mir_tstrncpy(fontid.name, fontOptionsList[index].szDescr, _countof(fontid.name));

+	mir_wstrncpy(fontid.group, fontOptionsList[index].szGroup, _countof(fontid.group));

+	mir_wstrncpy(fontid.name, fontOptionsList[index].szDescr, _countof(fontid.name));

 

 	COLORREF col = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)lf);

 

diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp
index e03c992085..babe45df32 100644
--- a/plugins/Clist_modern/src/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/src/modern_clcpaint.cpp
@@ -199,7 +199,7 @@ void CLCPaint::GetTextSize(SIZE *text_size, HDC hdcMem, RECT free_row_rc, wchar_
 		free_height = text_rc.bottom - text_rc.top;

 

 		// Always need cy...

-		text_size->cy = ske_DrawText(hdcMem, szText, (int)mir_tstrlen(szText), &text_rc, DT_CALCRECT | uTextFormat);

+		text_size->cy = ske_DrawText(hdcMem, szText, (int)mir_wstrlen(szText), &text_rc, DT_CALCRECT | uTextFormat);

 		text_size->cy = min(text_size->cy, free_height);

 		if (plText == NULL)

 			text_size->cx = min(text_rc.right - text_rc.left + 2, free_width);

@@ -419,7 +419,7 @@ void CLCPaint::_DrawTextSmiley(HDC hdcMem, RECT *free_rc, SIZE * text_size, wcha
 		int pos_x = 0;

 		int row_height;

 		RECT tmp_rc = *free_rc;

-		if (len == -1) len = (int)mir_tstrlen(szText);

+		if (len == -1) len = (int)mir_wstrlen(szText);

 		if (uTextFormat & DT_RTLREADING)

 			i = plText->realCount - 1;

 		else

@@ -783,7 +783,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 				int space_width = 0;

 				szCounts = pcli->pfnGetGroupCountsText(dat, Drawing);

 				// Has to draw the count?

-				if (szCounts && mir_tstrlen(szCounts) > 0) {

+				if (szCounts && mir_wstrlen(szCounts) > 0) {

 					// calc width and height

 					ChangeToFont(hdcMem, dat, Drawing->group->expanded ? FONTID_OPENGROUPCOUNTS : FONTID_CLOSEDGROUPCOUNTS, NULL);

 					ske_DrawText(hdcMem, L" ", 1, &count_rc, DT_CALCRECT | DT_NOPREFIX);

@@ -791,7 +791,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 					space_width = count_size.cx;

 					count_rc.right = 0;

 					count_rc.left = 0;

-					ske_DrawText(hdcMem, szCounts, (int)mir_tstrlen(szCounts), &count_rc, DT_CALCRECT);

+					ske_DrawText(hdcMem, szCounts, (int)mir_wstrlen(szCounts), &count_rc, DT_CALCRECT);

 					count_size.cx += count_rc.right - count_rc.left;

 					count_size.cy = count_rc.bottom - count_rc.top;

 				}

@@ -833,21 +833,21 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 				else if (hottrack)

 					_SetHotTrackColour(hdcMem, dat);

 				if (dat->text_rtl != 0) _RTLRect(&nameRect, free_row_rc.right);

-				_DrawTextSmiley(hdcMem, &nameRect, &text_size, Drawing->szText, 0, (int)mir_tstrlen(Drawing->szText), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

+				_DrawTextSmiley(hdcMem, &nameRect, &text_size, Drawing->szText, 0, (int)mir_wstrlen(Drawing->szText), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

 

 				if (selected && !dat->bFilterSearch) {

 					SetTextColor(hdcMem, dat->quickSearchColour);

-					_DrawTextSmiley(hdcMem, &nameRect, &text_size, Drawing->szText, 0, (int)mir_tstrlen(Drawing->szText), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

+					_DrawTextSmiley(hdcMem, &nameRect, &text_size, Drawing->szText, 0, (int)mir_wstrlen(Drawing->szText), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

 				}

 

-				if (szCounts && mir_tstrlen(szCounts) > 0) {

+				if (szCounts && mir_wstrlen(szCounts) > 0) {

 					ChangeToFont(hdcMem, dat, Drawing->group->expanded ? FONTID_OPENGROUPCOUNTS : FONTID_CLOSEDGROUPCOUNTS, NULL);

 					if (selected)

 						SetTextColor(hdcMem, dat->selTextColour);

 					else if (hottrack)

 						_SetHotTrackColour(hdcMem, dat);

 					if (dat->text_rtl != 0) _RTLRect(&countRect, free_row_rc.right);

-					ske_DrawText(hdcMem, szCounts, (int)mir_tstrlen(szCounts), &countRect, uTextFormat);

+					ske_DrawText(hdcMem, szCounts, (int)mir_wstrlen(szCounts), &countRect, uTextFormat);

 				}

 				Drawing->pos_label = nameRect;

 				return;

@@ -869,7 +869,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 					space_size.cy = min(space_rc.bottom - space_rc.top, fr_rc.bottom - fr_rc.top);

 

 					ChangeToFont(hdcMem, dat, Drawing->group->expanded ? FONTID_OPENGROUPCOUNTS : FONTID_CLOSEDGROUPCOUNTS, NULL);

-					DrawText(hdcMem, szCounts, (int)mir_tstrlen(szCounts), &counts_rc, DT_CALCRECT);

+					DrawText(hdcMem, szCounts, (int)mir_wstrlen(szCounts), &counts_rc, DT_CALCRECT);

 

 					counts_size.cx = counts_rc.right - counts_rc.left;

 					counts_size.cy = min(counts_rc.bottom - counts_rc.top, fr_rc.bottom - fr_rc.top);

@@ -899,7 +899,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 			else if (hottrack)

 				_SetHotTrackColour(hdcMem, dat);

 			if (dat->text_rtl != 0) _RTLRect(&text_rect, free_row_rc.right);

-			_DrawTextSmiley(hdcMem, &text_rect, &text_size, Drawing->szText, 0, (int)mir_tstrlen(Drawing->szText), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

+			_DrawTextSmiley(hdcMem, &text_rect, &text_size, Drawing->szText, 0, (int)mir_wstrlen(Drawing->szText), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

 			if (((dat->bFilterSearch && Drawing->type != CLCIT_GROUP) || selected) && dat->szQuickSearch[0] != '\0') {

 				int idx = 0;

 				if (dat->bFilterSearch) {

@@ -910,12 +910,12 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 						idx = int(p1 - lowered);

 				}

 				SetTextColor(hdcMem, dat->quickSearchColour);

-				_DrawTextSmiley(hdcMem, &text_rect, &text_size, Drawing->szText, idx, (int)mir_tstrlen(dat->szQuickSearch), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

+				_DrawTextSmiley(hdcMem, &text_rect, &text_size, Drawing->szText, idx, (int)mir_wstrlen(dat->szQuickSearch), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

 			}

 			if (Drawing->type == CLCIT_GROUP && szCounts && szCounts[0] && counts_rc.right - counts_rc.left > 0) {

 				ChangeToFont(hdcMem, dat, Drawing->group->expanded ? FONTID_OPENGROUPCOUNTS : FONTID_CLOSEDGROUPCOUNTS, NULL);

 				if (dat->text_rtl != 0) _RTLRect(&counts_rc, free_row_rc.right);

-				ske_DrawText(hdcMem, szCounts, (int)mir_tstrlen(szCounts), &counts_rc, uTextFormat);

+				ske_DrawText(hdcMem, szCounts, (int)mir_wstrlen(szCounts), &counts_rc, uTextFormat);

 				if (dat->text_rtl == 0)

 					text_rect.right = counts_rc.right;

 				else

@@ -977,7 +977,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 							SetTextColor(hdcMem, dat->selTextColour);

 						else if (hottrack)

 							_SetHotTrackColour(hdcMem, dat);

-						_DrawTextSmiley(hdcMem, &p_rect, &text_size, Drawing->szText, 0, (int)mir_tstrlen(Drawing->szText), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

+						_DrawTextSmiley(hdcMem, &p_rect, &text_size, Drawing->szText, 0, (int)mir_wstrlen(Drawing->szText), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

 						if ((dat->bFilterSearch || selected) && dat->szQuickSearch[0] != '\0') {

 							int idx = 0;

 							if (dat->bFilterSearch) {

@@ -988,7 +988,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 									idx = int(p1 - lowered);

 							}

 							SetTextColor(hdcMem, dat->quickSearchColour);

-							_DrawTextSmiley(hdcMem, &p_rect, &text_size, Drawing->szText, idx, (int)mir_tstrlen(dat->szQuickSearch), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

+							_DrawTextSmiley(hdcMem, &p_rect, &text_size, Drawing->szText, idx, (int)mir_wstrlen(dat->szQuickSearch), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

 						}

 

 						SIZE size;

@@ -1004,7 +1004,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 						int space_width = 0;

 						wchar_t *szCounts = pcli->pfnGetGroupCountsText(dat, Drawing);

 						// Has to draw the count?

-						if (szCounts && mir_tstrlen(szCounts) > 0) {

+						if (szCounts && mir_wstrlen(szCounts) > 0) {

 							// calc width and height

 							ChangeToFont(hdcMem, dat, Drawing->group->expanded ? FONTID_OPENGROUPCOUNTS : FONTID_CLOSEDGROUPCOUNTS, NULL);

 							ske_DrawText(hdcMem, L" ", 1, &count_rc, DT_CALCRECT | DT_NOPREFIX);

@@ -1012,7 +1012,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 							space_width = count_size.cx;

 							count_rc.right = 0;

 							count_rc.left = 0;

-							ske_DrawText(hdcMem, szCounts, (int)mir_tstrlen(szCounts), &count_rc, DT_CALCRECT);

+							ske_DrawText(hdcMem, szCounts, (int)mir_wstrlen(szCounts), &count_rc, DT_CALCRECT);

 							count_size.cx += count_rc.right - count_rc.left;

 							count_size.cy = count_rc.bottom - count_rc.top;

 						}

@@ -1053,18 +1053,18 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 							SetTextColor(hdcMem, dat->selTextColour);

 						else if (hottrack)

 							_SetHotTrackColour(hdcMem, dat);

-						_DrawTextSmiley(hdcMem, &nameRect, &text_size, Drawing->szText, 0, (int)mir_tstrlen(Drawing->szText), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

+						_DrawTextSmiley(hdcMem, &nameRect, &text_size, Drawing->szText, 0, (int)mir_wstrlen(Drawing->szText), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

 						if (selected && !dat->bFilterSearch) {

 							SetTextColor(hdcMem, dat->quickSearchColour);

-							_DrawTextSmiley(hdcMem, &nameRect, &text_size, Drawing->szText, 0, (int)mir_tstrlen(Drawing->szText), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

+							_DrawTextSmiley(hdcMem, &nameRect, &text_size, Drawing->szText, 0, (int)mir_wstrlen(Drawing->szText), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

 						}

-						if (szCounts && mir_tstrlen(szCounts) > 0) {

+						if (szCounts && mir_wstrlen(szCounts) > 0) {

 							ChangeToFont(hdcMem, dat, Drawing->group->expanded ? FONTID_OPENGROUPCOUNTS : FONTID_CLOSEDGROUPCOUNTS, NULL);

 							if (selected)

 								SetTextColor(hdcMem, dat->selTextColour);

 							else if (hottrack)

 								_SetHotTrackColour(hdcMem, dat);

-							ske_DrawText(hdcMem, szCounts, (int)mir_tstrlen(szCounts), &countRect, uTextFormat);

+							ske_DrawText(hdcMem, szCounts, (int)mir_wstrlen(szCounts), &countRect, uTextFormat);

 						}

 						Drawing->pos_label = nameRect;

 					}

@@ -1084,7 +1084,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 						mir_free_and_nil(pdnce->szSecondLineText);

 

 						TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", buf, _countof(buf), 0);

-						pdnce->szSecondLineText = mir_tstrdup(buf);

+						pdnce->szSecondLineText = mir_wstrdup(buf);

 					}

 

 					uTextFormat |= (gl_RowTabAccess[i]->valign == TC_VCENTER) ? DT_VCENTER : (gl_RowTabAccess[i]->valign == TC_BOTTOM) ? DT_BOTTOM : 0;

@@ -1096,7 +1096,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 					ChangeToFont(hdcMem, dat, FONTID_SECONDLINE, NULL);

 					uTextFormat = uTextFormat | (gl_TrimText ? DT_END_ELLIPSIS : 0) | DT_SINGLELINE;

 					if (Drawing->type == CLCIT_CONTACT)

-						_DrawTextSmiley(hdcMem, &p_rect, &text_size, pdnce->szSecondLineText, 0, (int)mir_tstrlen(pdnce->szSecondLineText), pdnce->ssSecondLine.plText, uTextFormat, dat->text_resize_smileys);

+						_DrawTextSmiley(hdcMem, &p_rect, &text_size, pdnce->szSecondLineText, 0, (int)mir_wstrlen(pdnce->szSecondLineText), pdnce->ssSecondLine.plText, uTextFormat, dat->text_resize_smileys);

 				}

 				break;

 

@@ -1112,7 +1112,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 						mir_free(pdnce->szThirdLineText);

 

 						TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", buf, _countof(buf), 0);

-						pdnce->szThirdLineText = mir_tstrdup(buf);

+						pdnce->szThirdLineText = mir_wstrdup(buf);

 					}

 

 					uTextFormat |= (gl_RowTabAccess[i]->valign == TC_VCENTER) ? DT_VCENTER : (gl_RowTabAccess[i]->valign == TC_BOTTOM) ? DT_BOTTOM : 0;

@@ -1124,7 +1124,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 					ChangeToFont(hdcMem, dat, FONTID_THIRDLINE, NULL);

 					uTextFormat = uTextFormat | (gl_TrimText ? DT_END_ELLIPSIS : 0) | DT_SINGLELINE;

 					if (Drawing->type == CLCIT_CONTACT)

-						_DrawTextSmiley(hdcMem, &p_rect, &text_size, pdnce->szThirdLineText, 0, (int)mir_tstrlen(pdnce->szThirdLineText), pdnce->ssThirdLine.plText, uTextFormat, dat->text_resize_smileys);

+						_DrawTextSmiley(hdcMem, &p_rect, &text_size, pdnce->szThirdLineText, 0, (int)mir_wstrlen(pdnce->szThirdLineText), pdnce->ssThirdLine.plText, uTextFormat, dat->text_resize_smileys);

 				}

 				break;

 

@@ -1395,7 +1395,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 				if (!TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", szResult, _countof(szResult), 0)) {

 					// Select font

 					ChangeToFont(hdcMem, dat, FONTID_CONTACT_TIME, NULL);

-					ske_DrawText(hdcMem, szResult, (int)mir_tstrlen(szResult), &p_rect, DT_NOPREFIX | DT_SINGLELINE | (dat->text_rtl ? DT_RTLREADING : 0));

+					ske_DrawText(hdcMem, szResult, (int)mir_wstrlen(szResult), &p_rect, DT_NOPREFIX | DT_SINGLELINE | (dat->text_rtl ? DT_RTLREADING : 0));

 				}

 				break;

 			}

@@ -2112,7 +2112,7 @@ void CLCPaint::_CalcItemsPos(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT
 					// Get text size

 					RECT rc;

 					SIZE text_size;

-					text_size.cy = ske_DrawText(hdcMem, szResult, (int)mir_tstrlen(szResult), &rc, DT_CALCRECT | DT_NOPREFIX | DT_SINGLELINE);

+					text_size.cy = ske_DrawText(hdcMem, szResult, (int)mir_wstrlen(szResult), &rc, DT_CALCRECT | DT_NOPREFIX | DT_SINGLELINE);

 					text_size.cy = min(text_size.cy, free_row_rc.bottom - free_row_rc.top);

 					text_size.cx = rc.right - rc.left;

 

@@ -2213,7 +2213,7 @@ void CLCPaint::_CalcItemsPos(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT
 				space_size.cy = min(space_rc.bottom - space_rc.top, free_height);

 

 				ChangeToFont(hdcMem, dat, Drawing->group->expanded ? FONTID_OPENGROUPCOUNTS : FONTID_CLOSEDGROUPCOUNTS, NULL);

-				DrawText(hdcMem, szCounts, (int)mir_tstrlen(szCounts), &counts_rc, DT_CALCRECT);

+				DrawText(hdcMem, szCounts, (int)mir_wstrlen(szCounts), &counts_rc, DT_CALCRECT);

 

 				counts_size.cx = counts_rc.right - counts_rc.left;

 				counts_size.cy = min(counts_rc.bottom - counts_rc.top, free_height);

@@ -2267,7 +2267,7 @@ void CLCPaint::_CalcItemsPos(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT
 					// Get contact time

 					wchar_t buf[70] = L"";

 					TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", buf, _countof(buf), 0);

-					replaceStrT(pdnce->szSecondLineText, buf);

+					replaceStrW(pdnce->szSecondLineText, buf);

 				}

 

 				if (pdnce->szSecondLineText && pdnce->szSecondLineText[0] && free_height > dat->secondLine.top_space) {

@@ -2300,7 +2300,7 @@ void CLCPaint::_CalcItemsPos(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT
 					// Get contact time

 					wchar_t buf[70] = L"";

 					TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", buf, _countof(buf), 0);

-					replaceStrT(pdnce->szThirdLineText, buf);

+					replaceStrW(pdnce->szThirdLineText, buf);

 				}

 				if (pdnce->szThirdLineText != NULL && pdnce->szThirdLineText[0] && free_height > dat->thirdLine.top_space) {

 					ChangeToFont(hdcMem, dat, FONTID_THIRDLINE, NULL);

@@ -2652,7 +2652,7 @@ void CLCPaint::_DrawContactText(HDC hdcMem, ClcData *dat, ClcContact *Drawing, i
 		ske_DrawText(hdcMem, Drawing->szText, -1, prcItem, uTextFormat);

 		if (selected && !dat->bFilterSearch) {

 			SetTextColor(hdcMem, dat->quickSearchColour);

-			ske_DrawText(hdcMem, Drawing->szText, (int)mir_tstrlen(dat->szQuickSearch), prcItem, uTextFormat);

+			ske_DrawText(hdcMem, Drawing->szText, (int)mir_wstrlen(dat->szQuickSearch), prcItem, uTextFormat);

 		}

 	}

 	else if (Drawing->type == CLCIT_CONTACT) {

@@ -2672,7 +2672,7 @@ void CLCPaint::_DrawContactText(HDC hdcMem, ClcData *dat, ClcContact *Drawing, i
 					idx = int(p1 - lowered);

 			}

 			SetTextColor(hdcMem, dat->quickSearchColour);

-			_DrawTextSmiley(hdcMem, prcItem, &text_size, Drawing->szText, idx, (int)mir_tstrlen(dat->szQuickSearch), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

+			_DrawTextSmiley(hdcMem, prcItem, &text_size, Drawing->szText, idx, (int)mir_wstrlen(dat->szQuickSearch), Drawing->ssText.plText, uTextFormat, dat->text_resize_smileys);

 		}

 	}

 	else ske_DrawText(hdcMem, Drawing->szText, -1, prcItem, uTextFormat);

@@ -2726,7 +2726,7 @@ void CLCPaint::_DrawContactTime(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 	if (!TimeZone_PrintDateTime(pdnce->hTimeZone, L"t", szResult, _countof(szResult), 0)) {

 		// Select font

 		ChangeToFont(hdcMem, dat, FONTID_CONTACT_TIME, NULL);

-		ske_DrawText(hdcMem, szResult, (int)mir_tstrlen(szResult), prcItem, DT_NOPREFIX | DT_SINGLELINE);

+		ske_DrawText(hdcMem, szResult, (int)mir_wstrlen(szResult), prcItem, DT_NOPREFIX | DT_SINGLELINE);

 	}

 }

 

diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp
index c20e9740e8..1d99f11abf 100644
--- a/plugins/Clist_modern/src/modern_clcutils.cpp
+++ b/plugins/Clist_modern/src/modern_clcutils.cpp
@@ -560,9 +560,9 @@ void cli_LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst)
 		dat->secondLine.draw_smileys = db_get_b(NULL, "CList", "SecondLineDrawSmileys", SETTING_SECONDLINE_SMILEYS_DEFAULT);

 		dat->secondLine.type = db_get_w(NULL, "CList", "SecondLineType", SETTING_SECONDLINE_TYPE_DEFAULT);

 

-		ptrT tszLineText(db_get_tsa(NULL, "CList", "SecondLineText"));

+		ptrW tszLineText(db_get_tsa(NULL, "CList", "SecondLineText"));

 		if (tszLineText)

-			mir_tstrncpy(dat->secondLine.text, tszLineText, _countof(dat->secondLine.text));

+			mir_wstrncpy(dat->secondLine.text, tszLineText, _countof(dat->secondLine.text));

 		else

 			dat->secondLine.text[0] = '\0';

 

@@ -580,9 +580,9 @@ void cli_LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst)
 		dat->thirdLine.draw_smileys = db_get_b(NULL, "CList", "ThirdLineDrawSmileys", SETTING_THIRDLINE_SMILEYS_DEFAULT);

 		dat->thirdLine.type = db_get_w(NULL, "CList", "ThirdLineType", SETTING_THIRDLINE_TYPE_DEFAULT);

 

-		ptrT tszLineText(db_get_tsa(NULL, "CList", "ThirdLineText"));

+		ptrW tszLineText(db_get_tsa(NULL, "CList", "ThirdLineText"));

 		if (tszLineText)

-			mir_tstrncpy(dat->thirdLine.text, tszLineText, _countof(dat->thirdLine.text));

+			mir_wstrncpy(dat->thirdLine.text, tszLineText, _countof(dat->thirdLine.text));

 		else

 			dat->thirdLine.text[0] = '\0';

 

@@ -608,7 +608,7 @@ void cli_LoadCLCOptions(HWND hwnd, ClcData *dat, BOOL bFirst)
 		dat->MenuTextHiColor = cliGetColor("Menu", "SelTextColour", CLCDEFAULT_MODERN_SELTEXTCOLOUR);

 

 		if (db_get_b(NULL, "Menu", "UseBitmap", CLCDEFAULT_USEBITMAP)) {

-			ptrT tszBitmap(db_get_tsa(NULL, "Menu", "BkBitmap"));

+			ptrW tszBitmap(db_get_tsa(NULL, "Menu", "BkBitmap"));

 			if (tszBitmap != NULL)

 				dat->hMenuBackground = Bitmap_Load(tszBitmap);

 		}

@@ -657,7 +657,7 @@ int ExpandMetaContact(HWND hwnd, ClcContact *contact, ClcData *dat)
 int cliFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk)

 {

 	ClcGroup *group = &dat->list;

-	int testlen = (int)mir_tstrlen(text);

+	int testlen = (int)mir_wstrlen(text);

 	int SubCount = 0;

 

 	group->scanIndex = 0;

@@ -677,7 +677,7 @@ int cliFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk)
 				wchar_t *lowered_text = CharLowerW(NEWWSTR_ALLOCA(text));

 				found = wcsstr(lowered_szText, lowered_text) != NULL;

 			}

-			else found = (prefixOk && !wcsnicmp(text, cc->szText, testlen)) || (!prefixOk && !mir_tstrcmpi(text, cc->szText));

+			else found = (prefixOk && !wcsnicmp(text, cc->szText, testlen)) || (!prefixOk && !mir_wstrcmpi(text, cc->szText));

 

 			if (found) {

 				ClcGroup *ccGroup = group;

@@ -708,7 +708,7 @@ int cliFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk)
 						wchar_t *lowered_text = CharLowerW(NEWWSTR_ALLOCA(text));

 						found = wcsstr(lowered_szText, lowered_text) != NULL;

 					}

-					else found = (prefixOk && !wcsnicmp(text, ccSub.szText, testlen)) || (!prefixOk && !mir_tstrcmpi(text, ccSub.szText));

+					else found = (prefixOk && !wcsnicmp(text, ccSub.szText, testlen)) || (!prefixOk && !mir_wstrcmpi(text, ccSub.szText));

 

 					if (found) {

 						ClcGroup *ccGroup = group;

diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index 24cc1f273c..2585918e00 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -119,7 +119,7 @@ CListEvent* cli_AddEvent(CLISTEVENT *cle)
 				wchar_t szwProto[64];

 				MultiByteToWideChar(CP_ACP, 0, szProto, -1, szwProto, 64);

 				szwProto[63] = 0;

-				mir_sntprintf(szBuffer, L"%s: %s (%s)", szwProto, szName, szStatus);

+				mir_snwprintf(szBuffer, L"%s: %s (%s)", szwProto, szName, szStatus);

 				szBuffer[127] = 0;

 				AppendMenu(g_CluiData.hMenuNotify, MF_BYCOMMAND | MF_STRING, g_CluiData.wNextMenuID, szBuffer);

 				mii.hbmpItem = HBMMENU_CALLBACK;

@@ -249,7 +249,7 @@ static int ehhEventAreaBackgroundSettingsChanged(WPARAM, LPARAM)
 	if (g_CluiData.fDisableSkinEngine) {

 		event_area.bkColour = cliGetColor("EventArea", "BkColour", CLCDEFAULT_BKCOLOUR);

 		if (db_get_b(NULL, "EventArea", "UseBitmap", CLCDEFAULT_USEBITMAP)) {

-			ptrT tszBitmap(db_get_tsa(NULL, "EventArea", "BkBitmap"));

+			ptrW tszBitmap(db_get_tsa(NULL, "EventArea", "BkBitmap"));

 			if (tszBitmap != NULL)

 				event_area.hBmpBackground = Bitmap_Load(tszBitmap);

 		}

@@ -321,7 +321,7 @@ static int EventArea_DrawWorker(HWND hWnd, HDC hDC)
 	else {

 		HICON hIcon = (HICON)LoadImage(g_hMirApp, MAKEINTRESOURCE(IDI_BLANK), IMAGE_ICON, 16, 16, 0);

 		wchar_t *ptszEvents = TranslateT("No events");

-		ske_DrawText(hDC, ptszEvents, (int)mir_tstrlen(ptszEvents), &rc, DT_VCENTER | DT_SINGLELINE);

+		ske_DrawText(hDC, ptszEvents, (int)mir_wstrlen(ptszEvents), &rc, DT_VCENTER | DT_SINGLELINE);

 		ske_DrawIconEx(hDC, 4, (rc.bottom + rc.top - 16) / 2, hIcon, 16, 16, 0, 0, DI_NORMAL | DI_COMPAT);

 		DestroyIcon(hIcon);

 	}

diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp
index 5e8f223061..bc23afacfe 100644
--- a/plugins/Clist_modern/src/modern_clistmod.cpp
+++ b/plugins/Clist_modern/src/modern_clistmod.cpp
@@ -292,7 +292,7 @@ int GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY)
 					if (hAuxOld == hAux) {

 						wchar_t buf[255];

 						GetClassName(hAux, buf, _countof(buf));

-						if (!mir_tstrcmp(buf, CLUIFrameSubContainerClassName)) {

+						if (!mir_wstrcmp(buf, CLUIFrameSubContainerClassName)) {

 							hWndFound = TRUE;

 							break;

 						}

diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp
index ed7b571b64..051ef974a9 100644
--- a/plugins/Clist_modern/src/modern_clistopts.cpp
+++ b/plugins/Clist_modern/src/modern_clistopts.cpp
@@ -584,7 +584,7 @@ static INT_PTR CALLBACK DlgProcItemSecondLineOpts(HWND hwndDlg, UINT msg, WPARAM
 

 		CheckDlgButton(hwndDlg, IDC_DRAW_SMILEYS, db_get_b(NULL, "CList", "SecondLineDrawSmileys", SETTING_SECONDLINE_SMILEYS_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED);

 		{

-			ptrT tszText(db_get_tsa(NULL, "CList", "SecondLineText"));

+			ptrW tszText(db_get_tsa(NULL, "CList", "SecondLineText"));

 			if (tszText)

 				SetDlgItemText(hwndDlg, IDC_VARIABLE_TEXT, tszText);

 		}

diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp
index a212170259..71e4dc11c6 100644
--- a/plugins/Clist_modern/src/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/src/modern_clistsettings.cpp
@@ -57,7 +57,7 @@ void cliCheckCacheItem(ClcCacheEntry *pdnce)
 

 	if (pdnce->tszName == NULL) {

 		pdnce->tszName = pcli->pfnGetContactDisplayName(pdnce->hContact, GCDNF_NOCACHE);

-		pdnce->m_bIsUnknown = !mir_tstrcmp(pdnce->tszName, UnknownConctactTranslatedName);

+		pdnce->m_bIsUnknown = !mir_wstrcmp(pdnce->tszName, UnknownConctactTranslatedName);

 	}

 

 	if (pdnce->m_iStatus == 0) //very strange look status sort is broken let always reread status

diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp
index 6ab0f4926f..30c489ca90 100644
--- a/plugins/Clist_modern/src/modern_clisttray.cpp
+++ b/plugins/Clist_modern/src/modern_clisttray.cpp
@@ -461,7 +461,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int)
 	trayIconInfo_t &p = pcli->trayIcon[i];

 	DestroyIcon(p.hBaseIcon);

 	p.hBaseIcon = hIcon;

-	replaceStrT(p.ptszToolTip, pcli->szTip);

+	replaceStrW(p.ptszToolTip, pcli->szTip);

 

 	NOTIFYICONDATA nid = { sizeof(NOTIFYICONDATA) };

 	nid.hWnd = pcli->hwndContactList;

@@ -471,7 +471,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int)
 

 	// if Tipper is missing or turned off for tray, use system tooltips

 	if (!ServiceExists("mToolTip/ShowTip") || !db_get_b(NULL, "Tipper", "TrayTip", 1))

-		mir_tstrncpy(nid.szTip, pcli->szTip, _countof(nid.szTip));

+		mir_wstrncpy(nid.szTip, pcli->szTip, _countof(nid.szTip));

 

 	Shell_NotifyIcon(NIM_MODIFY, &nid);

 

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 9256ecf893..6fd42fbb23 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -186,7 +186,7 @@ int CLUI::OnEvent_ContactMenuPreBuild(WPARAM, LPARAM)
 	HWND hwndClist = GetFocus();

 	wchar_t cls[128];

 	GetClassName(hwndClist, cls, _countof(cls));

-	if (mir_tstrcmp(CLISTCONTROL_CLASSW, cls))

+	if (mir_wstrcmp(CLISTCONTROL_CLASSW, cls))

 		hwndClist = pcli->hwndContactList;

 

 	MCONTACT hItem = (MCONTACT)SendMessage(hwndClist, CLM_GETSELECTION, 0, 0);

@@ -498,7 +498,7 @@ BOOL CLUI_CheckOwnedByClui(HWND hWnd)
 

 	wchar_t buf[255];

 	GetClassName(hWndMid, buf, 254);

-	if (!mir_tstrcmpi(buf, CLUIFrameSubContainerClassName))

+	if (!mir_wstrcmpi(buf, CLUIFrameSubContainerClassName))

 		return TRUE;

 

 	return FALSE;

@@ -667,9 +667,9 @@ void CLUI_ChangeWindowMode()
 	wchar_t titleText[255] = { 0 };

 	DBVARIANT dbv;

 	if (db_get_ts(NULL, "CList", "TitleText", &dbv))

-		mir_tstrncpy(titleText, _A2W(MIRANDANAME), _countof(titleText));

+		mir_wstrncpy(titleText, _A2W(MIRANDANAME), _countof(titleText));

 	else {

-		mir_tstrncpy(titleText, dbv.ptszVal, _countof(titleText));

+		mir_wstrncpy(titleText, dbv.ptszVal, _countof(titleText));

 		db_free(&dbv);

 	}

 	SetWindowText(pcli->hwndContactList, titleText);

@@ -893,7 +893,7 @@ static int CLUI_GetConnectingIconForProtoCount(char *szAccoName)
 

 	if (szAccoName) {

 		// first of all try to find by account name( or empty - global )

-		mir_sntprintf(fileFull, L"%s\\Icons\\proto_conn_%S.dll", tszFolderPath, szAccoName);

+		mir_snwprintf(fileFull, L"%s\\Icons\\proto_conn_%S.dll", tszFolderPath, szAccoName);

 		if (count = ExtractIconEx(fileFull, -1, NULL, NULL, 1))

 			return count;

 

@@ -901,7 +901,7 @@ static int CLUI_GetConnectingIconForProtoCount(char *szAccoName)
 			// second try to find by protocol name

 			PROTOACCOUNT *acc = Proto_GetAccount(szAccoName);

 			if (acc && !acc->bOldProto) {

-				mir_sntprintf(fileFull, L"%s\\Icons\\proto_conn_%S.dll", tszFolderPath, acc->szProtoName);

+				mir_snwprintf(fileFull, L"%s\\Icons\\proto_conn_%S.dll", tszFolderPath, acc->szProtoName);

 				if (count = ExtractIconEx(fileFull, -1, NULL, NULL, 1))

 					return count;

 			}

@@ -909,7 +909,7 @@ static int CLUI_GetConnectingIconForProtoCount(char *szAccoName)
 	}

 

 	// third try global

-	mir_sntprintf(fileFull, L"%s\\Icons\\proto_conn.dll", tszFolderPath);

+	mir_snwprintf(fileFull, L"%s\\Icons\\proto_conn.dll", tszFolderPath);

 	if (count = ExtractIconEx(fileFull, -1, NULL, NULL, 1))

 		return count;

 

@@ -919,7 +919,7 @@ static int CLUI_GetConnectingIconForProtoCount(char *szAccoName)
 static HICON CLUI_LoadIconFromExternalFile(wchar_t *filename, int i)

 {

 	wchar_t szPath[MAX_PATH], szFullPath[MAX_PATH];

-	mir_sntprintf(szPath, L"Icons\\%s", filename);

+	mir_snwprintf(szPath, L"Icons\\%s", filename);

 	PathToAbsoluteT(szPath, szFullPath);

 	if (_waccess(szPath, 0))

 		return NULL;

@@ -935,7 +935,7 @@ static HICON CLUI_GetConnectingIconForProto(char *szAccoName, int idx)
 	HICON hIcon;

 

 	if (szAccoName) {

-		mir_sntprintf(szFullPath, L"proto_conn_%S.dll", szAccoName);

+		mir_snwprintf(szFullPath, L"proto_conn_%S.dll", szAccoName);

 		if (hIcon = CLUI_LoadIconFromExternalFile(szFullPath, idx))

 			return hIcon;

 

@@ -943,7 +943,7 @@ static HICON CLUI_GetConnectingIconForProto(char *szAccoName, int idx)
 			// second try to find by protocol name

 			PROTOACCOUNT *acc = Proto_GetAccount(szAccoName);

 			if (acc && !acc->bOldProto) {

-				mir_sntprintf(szFullPath, L"proto_conn_%S.dll", acc->szProtoName);

+				mir_snwprintf(szFullPath, L"proto_conn_%S.dll", acc->szProtoName);

 				if (hIcon = CLUI_LoadIconFromExternalFile(szFullPath, idx))

 					return hIcon;

 			}

@@ -951,7 +951,7 @@ static HICON CLUI_GetConnectingIconForProto(char *szAccoName, int idx)
 	}

 

 	// third try global

-	mir_tstrncpy(szFullPath, L"proto_conn.dll", _countof(szFullPath));

+	mir_wstrncpy(szFullPath, L"proto_conn.dll", _countof(szFullPath));

 	if (hIcon = CLUI_LoadIconFromExternalFile(szFullPath, idx))

 		return hIcon;

 

@@ -2421,7 +2421,7 @@ LRESULT CLUI::OnMeasureItem(UINT, WPARAM, LPARAM lParam)
 		HDC hdc = GetDC(m_hWnd);

 		wchar_t *ptszStr = TranslateT("Status");

 		SIZE textSize;

-		GetTextExtentPoint32(hdc, ptszStr, (int)mir_tstrlen(ptszStr), &textSize);

+		GetTextExtentPoint32(hdc, ptszStr, (int)mir_wstrlen(ptszStr), &textSize);

 		pmis->itemWidth = textSize.cx;

 		pmis->itemHeight = 0;

 		ReleaseDC(m_hWnd, hdc);

diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp
index 33c21ce24c..6d6d5698e0 100644
--- a/plugins/Clist_modern/src/modern_contact.cpp
+++ b/plugins/Clist_modern/src/modern_contact.cpp
@@ -118,7 +118,7 @@ int cliCompareContacts(const ClcContact *contact1, const ClcContact *contact2)
 

 		switch (by) {

 		case SORTBY_NAME: // name

-			r = mir_tstrcmpi(contact1->szText, contact2->szText);

+			r = mir_wstrcmpi(contact1->szText, contact2->szText);

 			break;

 

 		case SORTBY_NAME_LOCALE: // name

diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
index 1fe7d491fb..a6dedca8db 100644
--- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
+++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
@@ -109,7 +109,7 @@ int RowHeight_CalcRowHeight(ClcData *dat, ClcContact *contact, int item)
 					g_clcPainter.GetTextSize(&size, hdc, dummyRect, contact->szText, contact->ssText.plText, 0, dat->text_resize_smileys ? 0 : contact->ssText.iMaxSmileyHeight);

 					if (contact->type == CLCIT_GROUP) {

 						wchar_t *szCounts = pcli->pfnGetGroupCountsText(dat, contact);

-						if (szCounts && mir_tstrlen(szCounts) > 0) {

+						if (szCounts && mir_wstrlen(szCounts) > 0) {

 							RECT count_rc = { 0 };

 							// calc width and height

 							g_clcPainter.ChangeToFont(hdc, dat, contact->group->expanded ? FONTID_OPENGROUPCOUNTS : FONTID_CLOSEDGROUPCOUNTS, NULL);

@@ -117,7 +117,7 @@ int RowHeight_CalcRowHeight(ClcData *dat, ClcContact *contact, int item)
 							size.cx += count_rc.right - count_rc.left;

 							count_rc.right = 0;

 							count_rc.left = 0;

-							ske_DrawText(hdc, szCounts, (int)mir_tstrlen(szCounts), &count_rc, DT_CALCRECT);

+							ske_DrawText(hdc, szCounts, (int)mir_wstrlen(szCounts), &count_rc, DT_CALCRECT);

 							size.cx += count_rc.right - count_rc.left;

 							pCell->h = max(pCell->h, count_rc.bottom - count_rc.top);

 						}

@@ -249,7 +249,7 @@ int RowHeight_CalcRowHeight(ClcData *dat, ClcContact *contact, int item)
 							g_clcPainter.ChangeToFont(hdc, dat, FONTID_CONTACT_TIME, NULL);

 

 							// Get text size

-							text_size.cy = ske_DrawText(hdc, szResult, (int)mir_tstrlen(szResult), &rc, DT_CALCRECT | DT_NOPREFIX | DT_SINGLELINE);

+							text_size.cy = ske_DrawText(hdc, szResult, (int)mir_wstrlen(szResult), &rc, DT_CALCRECT | DT_NOPREFIX | DT_SINGLELINE);

 							SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT));

 							ske_ResetTextEffect(hdc);

 							DeleteDC(hdc);

diff --git a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp
index a83baa7089..2cbabaafe4 100644
--- a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp
+++ b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp
@@ -312,18 +312,18 @@ void RefreshTree(HWND hwndDlg, HTREEITEM hti)
 			if (!cell->child)

 			{

 				if (cell->type == 0)

-					mir_sntprintf(buf, TranslateT("Empty %s cell"), cell->cont == TC_COL ? TranslateT("column") : TranslateT("line"));

+					mir_snwprintf(buf, TranslateT("Empty %s cell"), cell->cont == TC_COL ? TranslateT("column") : TranslateT("line"));

 				else

-					mir_tstrncpy(buf, TranslateTS(types[cell->type]), _countof(buf));

+					mir_wstrncpy(buf, TranslateTS(types[cell->type]), _countof(buf));

 			}

 			else

 			{

 				if (cell->type == 0)

-					mir_tstrncpy(buf, (cell->cont != TC_COL ? TranslateT("columns") : TranslateT("lines")), _countof(buf));

+					mir_wstrncpy(buf, (cell->cont != TC_COL ? TranslateT("columns") : TranslateT("lines")), _countof(buf));

 				else

-					mir_sntprintf(buf, TranslateT("%s, contain %s"), TranslateTS(types[cell->type]), cell->cont != TC_COL ? TranslateT("columns") : TranslateT("lines"));

+					mir_snwprintf(buf, TranslateT("%s, contain %s"), TranslateTS(types[cell->type]), cell->cont != TC_COL ? TranslateT("columns") : TranslateT("lines"));

 			}

-			if (cell->layer) mir_tstrncat(buf, TranslateT(" layered"), _countof(buf) - mir_tstrlen(buf));

+			if (cell->layer) mir_wstrncat(buf, TranslateT(" layered"), _countof(buf) - mir_wstrlen(buf));

 			tvi.mask = TVIF_HANDLE | TVIF_TEXT;

 			tvi.pszText = buf;

 			TreeView_SetItem(htree, &tvi);

diff --git a/plugins/Clist_modern/src/modern_skinbutton.cpp b/plugins/Clist_modern/src/modern_skinbutton.cpp
index f37a2a4715..5d9b79ddfe 100644
--- a/plugins/Clist_modern/src/modern_skinbutton.cpp
+++ b/plugins/Clist_modern/src/modern_skinbutton.cpp
@@ -561,7 +561,7 @@ int ModernSkinButton_AddButton(HWND parent,
 		if (DBkey && *DBkey != '\0') bct->ValueDBSection = mir_strdup(DBkey); else bct->ValueDBSection = NULL;
 		if (TypeDef && *TypeDef != '\0') bct->ValueTypeDef = mir_strdup(TypeDef); else bct->ValueTypeDef = mir_strdup("sDefault");
 		bct->ID = mir_strdup(ID);
-		bct->Hint = mir_tstrdup(Hint);
+		bct->Hint = mir_wstrdup(Hint);
 		Buttons[ButtonsCount].bct = bct;
 		Buttons[ButtonsCount].hwnd = NULL;
 		Buttons[ButtonsCount].OrL = Left;
diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp
index cc28081cb1..f493876e60 100644
--- a/plugins/Clist_modern/src/modern_skinengine.cpp
+++ b/plugins/Clist_modern/src/modern_skinengine.cpp
@@ -202,22 +202,22 @@ HRESULT IniParser::WriteStrToDb(const char * szSection, const char * szName, con
 
 int IniParser::GetSkinFolder(IN const wchar_t * szFileName, OUT wchar_t * pszFolderName)
 {
-	wchar_t *szBuff = mir_tstrdup(szFileName);
-	wchar_t *pszPos = szBuff + mir_tstrlen(szBuff);
+	wchar_t *szBuff = mir_wstrdup(szFileName);
+	wchar_t *pszPos = szBuff + mir_wstrlen(szBuff);
 	while (pszPos > szBuff && *pszPos != '.') { pszPos--; }
 	*pszPos = '\0';
-	mir_tstrcpy(pszFolderName, szBuff);
+	mir_wstrcpy(pszFolderName, szBuff);
 
 	wchar_t custom_folder[MAX_PATH], cus[MAX_PATH];
 	wchar_t *b3;
-	mir_tstrncpy(custom_folder, pszFolderName, _countof(custom_folder));
-	b3 = custom_folder + mir_tstrlen(custom_folder);
+	mir_wstrncpy(custom_folder, pszFolderName, _countof(custom_folder));
+	b3 = custom_folder + mir_wstrlen(custom_folder);
 	while (b3 > custom_folder && *b3 != '\\') { b3--; }
 	*b3 = '\0';
 
 	GetPrivateProfileString(L"Skin_Description_Section", L"SkinFolder", L"", cus, _countof(custom_folder), szFileName);
 	if (cus[0] != 0)
-		mir_sntprintf(pszFolderName, MAX_PATH, L"%s\\%s", custom_folder, cus);
+		mir_snwprintf(pszFolderName, MAX_PATH, L"%s\\%s", custom_folder, cus);
 
 	mir_free(szBuff);
 	PathToRelativeT(pszFolderName, pszFolderName);
@@ -1471,13 +1471,13 @@ int ske_GetFullFilename(wchar_t *buf, const wchar_t *file, wchar_t *skinfolder,
 {
 	wchar_t *SkinPlace = db_get_tsa(NULL, SKIN, "SkinFolder");
 	if (SkinPlace == NULL)
-		SkinPlace = mir_tstrdup(L"\\Skin\\default");
+		SkinPlace = mir_wstrdup(L"\\Skin\\default");
 
 	wchar_t b2[MAX_PATH];
 	if (file[0] != '\\' && file[1] != ':')
-		mir_sntprintf(b2, L"%s\\%s", (skinfolder == NULL) ? SkinPlace : ((INT_PTR)skinfolder != -1) ? skinfolder : L"", file);
+		mir_snwprintf(b2, L"%s\\%s", (skinfolder == NULL) ? SkinPlace : ((INT_PTR)skinfolder != -1) ? skinfolder : L"", file);
 	else
-		mir_tstrncpy(b2, file, _countof(b2));
+		mir_wstrncpy(b2, file, _countof(b2));
 
 	if (madeAbsolute) {
 		if (b2[0] == '\\' && b2[1] != '\\')
@@ -1485,7 +1485,7 @@ int ske_GetFullFilename(wchar_t *buf, const wchar_t *file, wchar_t *skinfolder,
 		else
 			PathToAbsoluteT(b2, buf);
 	}
-	else mir_tstrncpy(buf, b2, MAX_PATH);
+	else mir_wstrncpy(buf, b2, MAX_PATH);
 
 	mir_free(SkinPlace);
 	return 0;
@@ -1564,7 +1564,7 @@ static HBITMAP ske_LoadGlyphImage_TGA(const wchar_t *szFilename)
 	BOOL err = FALSE;
 	tga_header_t header;
 	if (!szFilename) return NULL;
-	if (!wildcmpit(szFilename, L"*\\*%.tga")) {
+	if (!wildcmpiw(szFilename, L"*\\*%.tga")) {
 		//Loading TGA image from file
 		FILE *fp = _wfopen(szFilename, L"rb");
 		if (!fp) {
@@ -1631,7 +1631,7 @@ static HBITMAP ske_LoadGlyphImageByDecoders(const wchar_t *tszFileName)
 	HBITMAP hBitmap;
 	bool f = false;
 
-	if (!mir_tstrcmpi(ext, L".tga")) {
+	if (!mir_wstrcmpi(ext, L".tga")) {
 		hBitmap = ske_LoadGlyphImage_TGA(tszFileName);
 		f = true;
 	}
@@ -1663,7 +1663,7 @@ static HBITMAP ske_LoadGlyphImageByDecoders(const wchar_t *tszFileName)
 
 static HBITMAP ske_skinLoadGlyphImage(const wchar_t *tszFileName)
 {
-	if (!wildcmpit(tszFileName, L"*.tga"))
+	if (!wildcmpiw(tszFileName, L"*.tga"))
 		return GDIPlus_LoadGlyphImage(tszFileName);
 
 	return ske_LoadGlyphImageByDecoders(tszFileName);
@@ -1679,7 +1679,7 @@ HBITMAP ske_LoadGlyphImage(const wchar_t *tszFileName)
 
 	if (pLoadedImages) {
 		for (DWORD i = 0; i < dwLoadedImagesCount; i++) {
-			if (!mir_tstrcmpi(pLoadedImages[i].szFileName, szFile)) {
+			if (!mir_wstrcmpi(pLoadedImages[i].szFileName, szFile)) {
 				pLoadedImages[i].dwLoadedTimes++;
 				return pLoadedImages[i].hGlyph;
 			}
@@ -1701,7 +1701,7 @@ HBITMAP ske_LoadGlyphImage(const wchar_t *tszFileName)
 
 	pLoadedImages[dwLoadedImagesCount].dwLoadedTimes = 1;
 	pLoadedImages[dwLoadedImagesCount].hGlyph = hbmp;
-	pLoadedImages[dwLoadedImagesCount].szFileName = mir_tstrdup(szFile);
+	pLoadedImages[dwLoadedImagesCount].szFileName = mir_wstrdup(szFile);
 	dwLoadedImagesCount++;
 	return hbmp;
 }
@@ -1918,7 +1918,7 @@ static int ske_GetSkinFromDB(char *, SKINOBJECTSLIST *Skin)
 		if (Skin->szSkinPlace && wcschr(Skin->szSkinPlace, '%'))
 			bOnlyObjects = TRUE;
 		mir_free(Skin->szSkinPlace);
-		Skin->szSkinPlace = mir_tstrdup(L"%Default%");
+		Skin->szSkinPlace = mir_wstrdup(L"%Default%");
 		ske_LoadSkinFromResource(bOnlyObjects);
 	}
 
@@ -2217,7 +2217,7 @@ static int ske_AlphaTextOut(HDC hDC, LPCTSTR lpString, int nCount, RECT *lpRect,
 
 	// Calc len of input string
 	if (nCount == -1)
-		nCount = (int)mir_tstrlen(lpString);
+		nCount = (int)mir_wstrlen(lpString);
 
 	// retrieve destination bitmap bits
 	HBITMAP hDestBitmap = (HBITMAP)GetCurrentObject(hDC, OBJ_BITMAP);
@@ -3299,8 +3299,8 @@ static DWORD ske_HexToARGB(char * Hex)
 
 static wchar_t *ske_ReAppend(wchar_t *lfirst, wchar_t * lsecond, int len)
 {
-	size_t l1 = lfirst ? mir_tstrlen(lfirst) : 0;
-	size_t l2 = (len ? len : (mir_tstrlen(lsecond) + 1));
+	size_t l1 = lfirst ? mir_wstrlen(lfirst) : 0;
+	size_t l2 = (len ? len : (mir_wstrlen(lsecond) + 1));
 	wchar_t *buf = (wchar_t *)mir_alloc((l1 + l2 + 1)*sizeof(wchar_t));
 	if (lfirst) memmove(buf, lfirst, l1*sizeof(wchar_t));
 	memmove(buf + l1, lsecond, l2*sizeof(wchar_t));
@@ -3311,8 +3311,8 @@ static wchar_t *ske_ReAppend(wchar_t *lfirst, wchar_t * lsecond, int len)
 
 wchar_t* ske_ReplaceVar(wchar_t *var)
 {
-	if (!var) return mir_tstrdup(L"");
-	if (!mir_tstrcmpi(var, L"Profile")) {
+	if (!var) return mir_wstrdup(L"");
+	if (!mir_wstrcmpi(var, L"Profile")) {
 		char buf[MAX_PATH] = { 0 };
 		CallService(MS_DB_GETPROFILENAME, (WPARAM)MAX_PATH, (LPARAM)buf);
 
@@ -3324,12 +3324,12 @@ wchar_t* ske_ReplaceVar(wchar_t *var)
 	}
 
 	mir_free(var);
-	return mir_tstrdup(L"");
+	return mir_wstrdup(L"");
 }
 
 wchar_t *ske_ParseText(wchar_t *stzText)
 {
-	size_t len = mir_tstrlen(stzText);
+	size_t len = mir_wstrlen(stzText);
 	wchar_t *result = NULL;
 	size_t stpos = 0, curpos = 0;
 
diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp
index 1b2514e0f7..5207c15c8b 100644
--- a/plugins/Clist_modern/src/modern_skinopt.cpp
+++ b/plugins/Clist_modern/src/modern_skinopt.cpp
@@ -123,11 +123,11 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 					GetPrivateProfileString(L"Skin_Description_Section", L"URL", L"", URL, _countof(URL), sd->File);
 					GetPrivateProfileString(L"Skin_Description_Section", L"Contact", L"", Contact, _countof(Contact), sd->File);
 					GetPrivateProfileString(L"Skin_Description_Section", L"Description", L"", Description, _countof(Description), sd->File);
-					mir_sntprintf(text, TranslateT("%s\n\n%s\n\nAuthor(s):\t %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s"),
+					mir_snwprintf(text, TranslateT("%s\n\n%s\n\nAuthor(s):\t %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s"),
 						sd->Name, Description, Author, Contact, URL, sd->File);
 				}
 				else {
-					mir_sntprintf(text, TranslateT("%s\n\n%s\n\nAuthor(s): %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s"),
+					mir_snwprintf(text, TranslateT("%s\n\n%s\n\nAuthor(s): %s\nContact:\t %s\nWeb:\t %s\n\nFile:\t %s"),
 						TranslateT("reVista for Modern v0.5"),
 						TranslateT("This is second default Modern Contact list skin in Vista Aero style"),
 						TranslateT("Angeli-Ka (graphics), FYR (template)"),
@@ -261,7 +261,7 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 					wchar_t prfn[MAX_PATH] = { 0 }, imfn[MAX_PATH] = { 0 }, skinfolder[MAX_PATH] = { 0 };
 					GetPrivateProfileString(L"Skin_Description_Section", L"Preview", L"", imfn, _countof(imfn), sd->File);
 					IniParser::GetSkinFolder(sd->File, skinfolder);
-					mir_sntprintf(prfn, L"%s\\%s", skinfolder, imfn);
+					mir_snwprintf(prfn, L"%s\\%s", skinfolder, imfn);
 					PathToAbsoluteT(prfn, imfn);
 					hPreviewBitmap = ske_LoadGlyphImage(imfn);
 
@@ -288,11 +288,11 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 							GetPrivateProfileString(L"Skin_Description_Section", L"URL", L"", URL, _countof(URL), sd2->File);
 							GetPrivateProfileString(L"Skin_Description_Section", L"Contact", L"", Contact, _countof(Contact), sd2->File);
 							GetPrivateProfileString(L"Skin_Description_Section", L"Description", L"", Description, _countof(Description), sd2->File);
-							mir_sntprintf(text, TranslateT("Preview is not available\n\n%s\n----------------------\n\n%s\n\nAUTHOR(S):\n%s\n\nCONTACT:\n%s\n\nHOMEPAGE:\n%s"),
+							mir_snwprintf(text, TranslateT("Preview is not available\n\n%s\n----------------------\n\n%s\n\nAUTHOR(S):\n%s\n\nCONTACT:\n%s\n\nHOMEPAGE:\n%s"),
 								sd2->Name, Description, Author, Contact, URL);
 						}
 						else {
-							mir_sntprintf(text, TranslateT("%s\n\n%s\n\nAUTHORS:\n%s\n\nCONTACT:\n%s\n\nWEB:\n%s\n\n\n"),
+							mir_snwprintf(text, TranslateT("%s\n\n%s\n\nAUTHORS:\n%s\n\nCONTACT:\n%s\n\nWEB:\n%s\n\n\n"),
 								TranslateT("reVista for Modern v0.5"),
 								TranslateT("This is second default Modern Contact list skin in Vista Aero style"),
 								TranslateT("graphics by Angeli-Ka\ntemplate by FYR"),
@@ -330,7 +330,7 @@ int SearchSkinFiles(HWND hwndDlg, wchar_t * Folder)
 	struct _wfinddata_t fd = { 0 };
 	wchar_t mask[MAX_PATH];
 	long hFile;
-	mir_sntprintf(mask, L"%s\\*.msf", Folder);
+	mir_snwprintf(mask, L"%s\\*.msf", Folder);
 	//fd.attrib = _A_SUBDIR;
 	hFile = _wfindfirst(mask, &fd);
 	if (hFile != -1) {
@@ -339,13 +339,13 @@ int SearchSkinFiles(HWND hwndDlg, wchar_t * Folder)
 		} while (!_wfindnext(hFile, &fd));
 		_findclose(hFile);
 	}
-	mir_sntprintf(mask, L"%s\\*", Folder);
+	mir_snwprintf(mask, L"%s\\*", Folder);
 	hFile = _wfindfirst(mask, &fd);
 
 	do {
-		if (fd.attrib&_A_SUBDIR && !(mir_tstrcmpi(fd.name, L".") == 0 || mir_tstrcmpi(fd.name, L"..") == 0)) {//Next level of subfolders
+		if (fd.attrib&_A_SUBDIR && !(mir_wstrcmpi(fd.name, L".") == 0 || mir_wstrcmpi(fd.name, L"..") == 0)) {//Next level of subfolders
 			wchar_t path[MAX_PATH];
-			mir_sntprintf(path, L"%s\\%s", Folder, fd.name);
+			mir_snwprintf(path, L"%s\\%s", Folder, fd.name);
 			SearchSkinFiles(hwndDlg, path);
 		}
 	} while (!_wfindnext(hFile, &fd));
@@ -367,7 +367,7 @@ HTREEITEM FillAvailableSkinList(HWND hwndDlg)
 		SearchSkinFiles(hwndDlg, SkinsFolder);
 	{
 		wchar_t skinfull[MAX_PATH];
-		ptrT skinfile(db_get_tsa(NULL, SKIN, "SkinFile"));
+		ptrW skinfile(db_get_tsa(NULL, SKIN, "SkinFile"));
 		if (skinfile) {
 			PathToAbsoluteT(skinfile, skinfull);
 			res = AddSkinToListFullName(hwndDlg, skinfull);
@@ -380,8 +380,8 @@ HTREEITEM AddSkinToListFullName(HWND hwndDlg, wchar_t * fullName)
 	wchar_t path[MAX_PATH] = { 0 };
 	wchar_t file[MAX_PATH] = { 0 };
 	wchar_t *buf;
-	mir_tstrncpy(path, fullName, _countof(path));
-	buf = path + mir_tstrlen(path);
+	mir_wstrncpy(path, fullName, _countof(path));
+	buf = path + mir_wstrlen(path);
 	while (buf > path) {
 		if (*buf == '\\') {
 			*buf = '\0';
@@ -390,7 +390,7 @@ HTREEITEM AddSkinToListFullName(HWND hwndDlg, wchar_t * fullName)
 		buf--;
 	}
 	buf++;
-	mir_tstrncpy(file, buf, _countof(file));
+	mir_wstrncpy(file, buf, _countof(file));
 	return AddSkinToList(hwndDlg, path, file);
 }
 
@@ -403,12 +403,12 @@ HTREEITEM AddSkinToList(HWND hwndDlg, wchar_t * path, wchar_t* file)
 		return 0;
 
 	if (!file || wcschr(file, '%')) {
-		mir_sntprintf(sd->File, L"%%Default Skin%%");
-		mir_sntprintf(sd->Name, TranslateT("%Default Skin%"));
+		mir_snwprintf(sd->File, L"%%Default Skin%%");
+		mir_snwprintf(sd->Name, TranslateT("%Default Skin%"));
 		wcsncpy_s(fullName, TranslateT("Default Skin"), _TRUNCATE);
 	}
 	else {
-		mir_sntprintf(fullName, L"%s\\%s", path, file);
+		mir_snwprintf(fullName, L"%s\\%s", path, file);
 		wcsncpy_s(defskinname, file, _TRUNCATE);
 		wchar_t *p = wcsrchr(defskinname, '.'); if (p) *p = 0;
 		GetPrivateProfileString(L"Skin_Description_Section", L"Name", defskinname, sd->Name, _countof(sd->Name), fullName);
@@ -433,7 +433,7 @@ HTREEITEM FindChild(HWND hTree, HTREEITEM Parent, wchar_t * Caption, void * data
 		tvi.pszText = buf;
 		tvi.cchTextMax = _countof(buf);
 		TreeView_GetItem(hTree, &tvi);
-		if (mir_tstrcmpi(Caption, tvi.pszText) == 0) {
+		if (mir_wstrcmpi(Caption, tvi.pszText) == 0) {
 			if (!data)
 				return tmp;
 
@@ -443,7 +443,7 @@ HTREEITEM FindChild(HWND hTree, HTREEITEM Parent, wchar_t * Caption, void * data
 			TreeView_GetItem(hTree, &tvi2);
 			SkinListData *sd = (SkinListData*)tvi2.lParam;
 			if (sd)
-				if (!mir_tstrcmpi(sd->File, ((SkinListData*)data)->File))
+				if (!mir_wstrcmpi(sd->File, ((SkinListData*)data)->File))
 					return tmp;
 		}
 		tmp = TreeView_GetNextSibling(hTree, tmp);
@@ -471,11 +471,11 @@ HTREEITEM AddItemToTree(HWND hTree, wchar_t *itemName, void *data)
 
 INT_PTR SvcActiveSkin(WPARAM, LPARAM)
 {
-	ptrT skinfile(db_get_tsa(NULL, SKIN, "SkinFile"));
+	ptrW skinfile(db_get_tsa(NULL, SKIN, "SkinFile"));
 	if (skinfile) {
 		wchar_t skinfull[MAX_PATH];
 		PathToAbsoluteT(skinfile, skinfull);
-		return (INT_PTR)mir_tstrdup(skinfull);
+		return (INT_PTR)mir_wstrdup(skinfull);
 	}
 
 	return NULL;
@@ -524,7 +524,7 @@ INT_PTR SvcPreviewSkin(WPARAM wParam, LPARAM lParam)
 		wchar_t skinfolder[MAX_PATH] = { 0 };
 		GetPrivateProfileString(L"Skin_Description_Section", L"Preview", L"", imfn, _countof(imfn), (LPCTSTR)lParam);
 		IniParser::GetSkinFolder((LPCTSTR)lParam, skinfolder);
-		mir_sntprintf(prfn, L"%s\\%s", skinfolder, imfn);
+		mir_snwprintf(prfn, L"%s\\%s", skinfolder, imfn);
 		PathToAbsoluteT(prfn, imfn);
 
 		hPreviewBitmap = ske_LoadGlyphImage(imfn);
diff --git a/plugins/Clist_modern/src/modern_skinselector.cpp b/plugins/Clist_modern/src/modern_skinselector.cpp
index d6a4a80fc5..119ceb7f8d 100644
--- a/plugins/Clist_modern/src/modern_skinselector.cpp
+++ b/plugins/Clist_modern/src/modern_skinselector.cpp
@@ -375,7 +375,7 @@ wchar_t* GetParamNT(char *string, wchar_t *buf, int buflen, BYTE paramN, char De
 WCHAR* GetParamN(WCHAR *string, WCHAR *buf, int buflen, BYTE paramN, WCHAR Delim, BOOL SkipSpaces)

 {

 	size_t i = 0, start = 0, CurentCount = 0, len;

-	while (i < mir_tstrlen(string)) {

+	while (i < mir_wstrlen(string)) {

 		if (string[i] == Delim) {

 			if (CurentCount == paramN) break;

 			start = i + 1;

@@ -385,13 +385,13 @@ WCHAR* GetParamN(WCHAR *string, WCHAR *buf, int buflen, BYTE paramN, WCHAR Delim
 	}

 	if (CurentCount == paramN) {

 		if (SkipSpaces) { //remove spaces

-			while (string[start] == ' ' && (int)start < mir_tstrlen(string))

+			while (string[start] == ' ' && (int)start < mir_wstrlen(string))

 				start++;

 			while (i > 1 && string[i - 1] == ' ' && i > (int)start)

 				i--;

 		}

 		len = ((int)(i - start) < buflen) ? i - start : buflen;

-		mir_tstrncpy(buf, string + start, len);

+		mir_wstrncpy(buf, string + start, len);

 		buf[len] = '\0';

 	}

 	else buf[0] = '\0';

diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp
index f49faaa894..8e2e364a9b 100644
--- a/plugins/Clist_modern/src/modern_statusbar.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar.cpp
@@ -28,10 +28,10 @@ struct ProtoItemData : public MZeroedObject
 	ptrA   szProtoName;

 	ptrA   szAccountName;

 	int    iProtoStatus;

-	ptrT   tszProtoHumanName;

-	ptrT   szProtoEMailCount;

-	ptrT   tszProtoStatusText;

-	ptrT   tszProtoXStatus;

+	ptrW   tszProtoHumanName;

+	ptrW   szProtoEMailCount;

+	ptrW   tszProtoStatusText;

+	ptrW   tszProtoXStatus;

 	int    iProtoPos;

 	int    fullWidth;

 	RECT   protoRect;

@@ -106,7 +106,7 @@ int LoadStatusBarData()
 	if (g_CluiData.fDisableSkinEngine) {

 		g_StatusBarData.bkColour = cliGetColor("StatusBar", "BkColour", CLCDEFAULT_BKCOLOUR);

 		if (db_get_b(NULL, "StatusBar", "UseBitmap", CLCDEFAULT_USEBITMAP)) {

-			ptrT tszBitmapName(db_get_tsa(NULL, "StatusBar", "BkBitmap"));

+			ptrW tszBitmapName(db_get_tsa(NULL, "StatusBar", "BkBitmap"));

 			if (tszBitmapName)

 				g_StatusBarData.hBmpBackground = Bitmap_Load(tszBitmapName);

 		}

@@ -241,15 +241,15 @@ int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC)
 				int nEmails = (int)CallProtoService(szProto, PS_GETUNREADEMAILCOUNT, 0, 0);

 				if (nEmails > 0) {

 					wchar_t str[40];

-					mir_sntprintf(str, L"[%d]", nEmails);

-					p->szProtoEMailCount = mir_tstrdup(str);

+					mir_snwprintf(str, L"[%d]", nEmails);

+					p->szProtoEMailCount = mir_wstrdup(str);

 				}

 			}

 

-		p->tszProtoHumanName = mir_tstrdup(accs[i]->tszAccountName);

+		p->tszProtoHumanName = mir_wstrdup(accs[i]->tszAccountName);

 		p->szAccountName = mir_strdup(szProto);

 		p->szProtoName = mir_strdup(accs[i]->szProtoName);

-		p->tszProtoStatusText = mir_tstrdup(pcli->pfnGetStatusModeDescription(p->iProtoStatus, 0));

+		p->tszProtoStatusText = mir_wstrdup(pcli->pfnGetStatusModeDescription(p->iProtoStatus, 0));

 		p->iProtoPos = iProtoInStatusMenu++;

 

 		p->bIsDimmed = 0;

@@ -348,7 +348,7 @@ int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC)
 					cs.flags = CSSF_MASK_NAME | CSSF_TCHAR;

 					cs.ptszName = str;

 					if (CallProtoService(p.szAccountName, PS_GETCUSTOMSTATUSEX, 0, (LPARAM)&cs) == 0)

-						p.tszProtoXStatus = mir_tstrdup(str);

+						p.tszProtoXStatus = mir_wstrdup(str);

 				}

 

 				if ((p.xStatusMode & 3)) {

@@ -363,22 +363,22 @@ int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC)
 

 			SIZE txtSize;

 			if (p.bShowProtoName) {

-				GetTextExtentPoint32(hDC, p.tszProtoHumanName, (int)mir_tstrlen(p.tszProtoHumanName), &txtSize);

+				GetTextExtentPoint32(hDC, p.tszProtoHumanName, (int)mir_wstrlen(p.tszProtoHumanName), &txtSize);

 				w += txtSize.cx + 3 + spaceWidth;

 			}

 

 			if (p.bShowProtoEmails && p.szProtoEMailCount) {

-				GetTextExtentPoint32(hDC, p.szProtoEMailCount, (int)mir_tstrlen(p.szProtoEMailCount), &txtSize);

+				GetTextExtentPoint32(hDC, p.szProtoEMailCount, (int)mir_wstrlen(p.szProtoEMailCount), &txtSize);

 				w += txtSize.cx + 3 + spaceWidth;

 			}

 

 			if (p.bShowStatusName) {

-				GetTextExtentPoint32(hDC, p.tszProtoStatusText, (int)mir_tstrlen(p.tszProtoStatusText), &txtSize);

+				GetTextExtentPoint32(hDC, p.tszProtoStatusText, (int)mir_wstrlen(p.tszProtoStatusText), &txtSize);

 				w += txtSize.cx + 3 + spaceWidth;

 			}

 

 			if ((p.xStatusMode & 8) && p.tszProtoXStatus) {

-				GetTextExtentPoint32(hDC, p.tszProtoXStatus, (int)mir_tstrlen(p.tszProtoXStatus), &txtSize);

+				GetTextExtentPoint32(hDC, p.tszProtoXStatus, (int)mir_wstrlen(p.tszProtoXStatus), &txtSize);

 				w += txtSize.cx + 3 + spaceWidth;

 			}

 

@@ -517,7 +517,7 @@ int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC)
 			}

 

 			if (p.bShowProtoName) {

-				int cbLen = (int)mir_tstrlen(p.tszProtoHumanName);

+				int cbLen = (int)mir_wstrlen(p.tszProtoHumanName);

 				RECT rt = r;

 				rt.left = x + (spaceWidth >> 1);

 				rt.top = textY;

@@ -531,7 +531,7 @@ int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC)
 			}

 

 			if (p.bShowProtoEmails && p.szProtoEMailCount != NULL) {

-				int cbLen = (int)mir_tstrlen(p.szProtoEMailCount);

+				int cbLen = (int)mir_wstrlen(p.szProtoEMailCount);

 				RECT rt = r;

 				rt.left = x + (spaceWidth >> 1);

 				rt.top = textY;

@@ -544,7 +544,7 @@ int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC)
 			}

 

 			if (p.bShowStatusName) {

-				int cbLen = (int)mir_tstrlen(p.tszProtoStatusText);

+				int cbLen = (int)mir_wstrlen(p.tszProtoStatusText);

 				RECT rt = r;

 				rt.left = x + (spaceWidth >> 1);

 				rt.top = textY;

@@ -560,7 +560,7 @@ int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC)
 				RECT rt = r;

 				rt.left = x + (spaceWidth >> 1);

 				rt.top = textY;

-				ske_DrawText(hDC, p.tszProtoXStatus, (int)mir_tstrlen(p.tszProtoXStatus), &rt, 0);

+				ske_DrawText(hDC, p.tszProtoXStatus, (int)mir_wstrlen(p.tszProtoXStatus), &rt, 0);

 			}

 

 			p.protoRect = r;

diff --git a/plugins/Clist_modern/src/modern_tbbutton.cpp b/plugins/Clist_modern/src/modern_tbbutton.cpp
index 0ea00a70be..24b642d0d9 100644
--- a/plugins/Clist_modern/src/modern_tbbutton.cpp
+++ b/plugins/Clist_modern/src/modern_tbbutton.cpp
@@ -238,7 +238,7 @@ static LRESULT CALLBACK ToolbarButtonProc(HWND hwndDlg, UINT  msg, WPARAM wParam
 		break;

 

 	case WM_SETTEXT:

-		mir_tstrncpy(bct->szText, (wchar_t*)lParam, _countof(bct->szText));

+		mir_wstrncpy(bct->szText, (wchar_t*)lParam, _countof(bct->szText));

 		break;

 

 	case WM_SETFONT:

diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index 7db4523adb..3009c46d0c 100644
--- a/plugins/Clist_modern/src/modern_toolbar.cpp
+++ b/plugins/Clist_modern/src/modern_toolbar.cpp
@@ -138,7 +138,7 @@ static int ehhToolBarBackgroundSettingsChanged(WPARAM, LPARAM)
 	if (g_CluiData.fDisableSkinEngine) {

 		tbdat.mtb_bkColour = cliGetColor("ToolBar", "BkColour", CLCDEFAULT_BKCOLOUR);

 		if (db_get_b(NULL, "ToolBar", "UseBitmap", CLCDEFAULT_USEBITMAP)) {

-			ptrT tszBitmapName(db_get_tsa(NULL, "ToolBar", "BkBitmap"));

+			ptrW tszBitmapName(db_get_tsa(NULL, "ToolBar", "BkBitmap"));

 			if (tszBitmapName)

 				tbdat.mtb_hBmpBackground = Bitmap_Load(tszBitmapName);

 		}

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 8c4a49db88..bcfec081be 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -116,7 +116,7 @@ int FillModes(char *szsetting)
 	if (szsetting[0] == 13)

 		return 1;

 

-	ptrT temp(mir_utf8decodeT(szsetting));

+	ptrW temp(mir_utf8decodeW(szsetting));

 	if (temp != NULL)

 		SendDlgItemMessage(clvmHwnd, IDC_VIEWMODES, LB_INSERTSTRING, -1, (LPARAM)temp);

 	return 1;

@@ -413,8 +413,8 @@ void SaveState()
 				item.cchTextMax = _countof(szTemp);

 				item.iItem = i;

 				SendMessage(hwndList, LVM_GETITEM, 0, (LPARAM)&item);

-				mir_tstrncat(newGroupFilter, szTemp, _countof(newGroupFilter) - mir_tstrlen(newGroupFilter));

-				mir_tstrncat(newGroupFilter, L"|", _countof(newGroupFilter) - mir_tstrlen(newGroupFilter));

+				mir_wstrncat(newGroupFilter, szTemp, _countof(newGroupFilter) - mir_wstrlen(newGroupFilter));

+				mir_wstrncat(newGroupFilter, L"|", _countof(newGroupFilter) - mir_wstrlen(newGroupFilter));

 				newGroupFilter[2047] = 0;

 			}

 		}

@@ -502,7 +502,7 @@ static void UpdateFilters()
 	mir_strncpy(g_szModename, szBuf, _countof(g_szModename));

 	{

 		wchar_t szTemp[100];

-		mir_sntprintf(szTemp, TranslateT("Configuring view mode: %s"), szTempBuf);

+		mir_snwprintf(szTemp, TranslateT("Configuring view mode: %s"), szTempBuf);

 		SetDlgItemText(clvmHwnd, IDC_CURVIEWMODE2, szTemp);

 	}

 	mir_snprintf(szSetting, "%c%s_PF", 246, szBuf);

@@ -511,7 +511,7 @@ static void UpdateFilters()
 		return;

 

 	mir_snprintf(szSetting, "%c%s_GF", 246, szBuf);

-	ptrT szGF(db_get_tsa(NULL, CLVM_MODULE, szSetting));

+	ptrW szGF(db_get_tsa(NULL, CLVM_MODULE, szSetting));

 	if (szGF == NULL)

 		return;

 

@@ -561,7 +561,7 @@ static void UpdateFilters()
 		for (i = 1; i < ListView_GetItemCount(hwndList); i++) {

 			item.iItem = i;

 			SendMessage(hwndList, LVM_GETITEM, 0, (LPARAM)&item);

-			mir_sntprintf(szMask, L"%s|", szTemp);

+			mir_snwprintf(szMask, L"%s|", szTemp);

 			if (szGF && wcsstr(szGF, szMask))

 				ListView_SetCheckState(hwndList, i, TRUE)

 			else

@@ -890,7 +890,7 @@ static int FillMenuCallback(char *szSetting)
 	if (szSetting[0] == 13)

 		return 1;

 

-	wchar_t *temp = mir_utf8decodeT(szSetting);

+	wchar_t *temp = mir_utf8decodeW(szSetting);

 	if (temp) {

 		AppendMenu(hViewModeMenu, MFT_STRING, menuCounter++, temp);

 		mir_free(temp);

@@ -987,7 +987,7 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 		}

 

 		if (g_CluiData.bFilterEffective)

-			SetDlgItemText(hwnd, IDC_SELECTMODE, ptrT(mir_utf8decodeT(g_CluiData.current_viewmode)));

+			SetDlgItemText(hwnd, IDC_SELECTMODE, ptrW(mir_utf8decodeW(g_CluiData.current_viewmode)));

 		else

 			SetDlgItemText(hwnd, IDC_SELECTMODE, TranslateT("All contacts"));

 		break;

@@ -1167,7 +1167,7 @@ static int ehhViewModeBackgroundSettingsChanged(WPARAM, LPARAM)
 	if (g_CluiData.fDisableSkinEngine) {

 		view_mode.bkColour = cliGetColor("ViewMode", "BkColour", CLCDEFAULT_BKCOLOUR);

 		if (db_get_b(NULL, "ViewMode", "UseBitmap", CLCDEFAULT_USEBITMAP)) {

-			ptrT tszBitmapName(db_get_tsa(NULL, "ViewMode", "BkBitmap"));

+			ptrW tszBitmapName(db_get_tsa(NULL, "ViewMode", "BkBitmap"));

 			if (tszBitmapName)

 				view_mode.hBmpBackground = Bitmap_Load(tszBitmapName);

 		}

@@ -1268,8 +1268,8 @@ void ApplyViewMode(const char *Name, bool onlySelector)
 		}

 		mir_snprintf(szSetting, "%c%s_GF", 246, Name);

 		if (!db_get_ts(NULL, CLVM_MODULE, szSetting, &dbv)) {

-			if (mir_tstrlen(dbv.ptszVal) >= 2) {

-				mir_tstrncpy(g_CluiData.groupFilter, dbv.ptszVal, _countof(g_CluiData.groupFilter));

+			if (mir_wstrlen(dbv.ptszVal) >= 2) {

+				mir_wstrncpy(g_CluiData.groupFilter, dbv.ptszVal, _countof(g_CluiData.groupFilter));

 				g_CluiData.groupFilter[_countof(g_CluiData.groupFilter) - 1] = 0;

 				g_CluiData.bFilterEffective |= CLVM_FILTER_GROUPS;

 			}

@@ -1360,7 +1360,7 @@ void ApplyViewMode(const char *Name, bool onlySelector)
 		}

 	}

 

-	SetWindowText(hwndSelector, ptrT(mir_utf8decodeW((Name[0] == 13) ? Name + 1 : Name)));

+	SetWindowText(hwndSelector, ptrW(mir_utf8decodeW((Name[0] == 13) ? Name + 1 : Name)));

 

 	Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);

 	cliInvalidateRect(pcli->hwndStatus, NULL, FALSE);

diff --git a/plugins/Clist_modern/src/stdafx.h b/plugins/Clist_modern/src/stdafx.h
index 814eed1ffa..3f58571406 100644
--- a/plugins/Clist_modern/src/stdafx.h
+++ b/plugins/Clist_modern/src/stdafx.h
@@ -181,7 +181,7 @@ void MakeButtonSkinned(HWND hWnd);
 #endif

 

 #define strsetA(a,b) {if (a) mir_free_and_nill(a); a=mir_strdup(b);}

-#define strsetT(a,b) {if (a) mir_free_and_nill(a); a=mir_tstrdup(b);}

+#define strsetT(a,b) {if (a) mir_free_and_nill(a); a=mir_wstrdup(b);}

 

 void TRACE_ERROR();