hello, Unix.

phase 1: removing _T()

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

14 files changed, 103 insertions, 103 deletions

diff --git a/plugins/Scriver/src/chat/chat.h b/plugins/Scriver/src/chat/chat.h
index 53ed0d2758..949202712a 100644
--- a/plugins/Scriver/src/chat/chat.h
+++ b/plugins/Scriver/src/chat/chat.h
@@ -100,5 +100,5 @@ void          DestroyGCMenu(HMENU *hMenu, int iIndex);
 

 //////////////////////////////////////////////////////////////////////////////////

 

-#define DEFLOGFILENAME _T("%miranda_logpath%\\%proto%\\%userid%.log")

+#define DEFLOGFILENAME L"%miranda_logpath%\\%proto%\\%userid%.log"

 #endif

diff --git a/plugins/Scriver/src/chat/main.cpp b/plugins/Scriver/src/chat/main.cpp
index 27644f6e03..29b88790d4 100644
--- a/plugins/Scriver/src/chat/main.cpp
+++ b/plugins/Scriver/src/chat/main.cpp
@@ -154,7 +154,7 @@ static void OnLoadSettings()
 

 int Chat_Load()

 {

-	CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENT("Messaging") _T("/") LPGENT("Group chats"), FONTMODE_SKIP };

+	CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENT("Messaging") L"/" LPGENT("Group chats"), FONTMODE_SKIP };

 	mir_getCI(&data);

 	saveCI = *pci;

 

diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp
index f922a731f2..db8d646289 100644
--- a/plugins/Scriver/src/chat/options.cpp
+++ b/plugins/Scriver/src/chat/options.cpp
@@ -251,7 +251,7 @@ INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa
 		SendMessage(hwndDlg, OPT_FIXHEADINGS, 0, 0);

 		{

 			TCHAR* pszGroup = NULL;

-			InitSetting(&pszGroup, "AddToGroup", _T("Chat rooms"));

+			InitSetting(&pszGroup, "AddToGroup", L"Chat rooms");

 			SetDlgItemText(hwndDlg, IDC_CHAT_GROUP, pszGroup);

 			mir_free(pszGroup);

 		}

@@ -366,36 +366,36 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa
 		RECT rect;

 

 		mir_sntprintf(tszTooltipText,

-			_T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n")

-			_T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n")

-			_T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),

+			L"%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n"

+			L"%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n"

+			L"%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s",

 			// contact vars

-			_T("%nick%"), TranslateT("nick of current contact (if defined)"),

-			_T("%proto%"), TranslateT("protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts"),

-			_T("%accountname%"), TranslateT("user-defined account name of current contact (if defined)."),

-			_T("%userid%"), TranslateT("user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc."),

+			L"%nick%", TranslateT("nick of current contact (if defined)"),

+			L"%proto%", TranslateT("protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts"),

+			L"%accountname%", TranslateT("user-defined account name of current contact (if defined)."),

+			L"%userid%", TranslateT("user ID of current contact (if defined). It is like UIN for ICQ, JID for Jabber, etc."),

 			// global vars

-			_T("%miranda_path%"), TranslateT("path to Miranda root folder"),

-			_T("%miranda_profilesdir%"), TranslateT("path to folder containing Miranda profiles"),

-			_T("%miranda_profilename%"), TranslateT("name of current Miranda profile (filename, without extension)"),

-			_T("%miranda_userdata%"), TranslateT("will return parsed string %miranda_profilesdir%\\%miranda_profilename%"),

-			_T("%miranda_logpath%"), TranslateT("will return parsed string %miranda_userdata%\\Logs"),

-			_T("%appdata%"), TranslateT("same as environment variable %APPDATA% for currently logged-on Windows user"),

-			_T("%username%"), TranslateT("username for currently logged-on Windows user"),

-			_T("%mydocuments%"), TranslateT("\"My Documents\" folder for currently logged-on Windows user"),

-			_T("%desktop%"), TranslateT("\"Desktop\" folder for currently logged-on Windows user"),

-			_T("%xxxxxxx%"), TranslateT("any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)"),

+			L"%miranda_path%", TranslateT("path to Miranda root folder"),

+			L"%miranda_profilesdir%", TranslateT("path to folder containing Miranda profiles"),

+			L"%miranda_profilename%", TranslateT("name of current Miranda profile (filename, without extension)"),

+			L"%miranda_userdata%", TranslateT("will return parsed string %miranda_profilesdir%\\%miranda_profilename%"),

+			L"%miranda_logpath%", TranslateT("will return parsed string %miranda_userdata%\\Logs"),

+			L"%appdata%", TranslateT("same as environment variable %APPDATA% for currently logged-on Windows user"),

+			L"%username%", TranslateT("username for currently logged-on Windows user"),

+			L"%mydocuments%", TranslateT("\"My Documents\" folder for currently logged-on Windows user"),

+			L"%desktop%", TranslateT("\"Desktop\" folder for currently logged-on Windows user"),

+			L"%xxxxxxx%", TranslateT("any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)"),

 			// date/time vars

-			_T("%d%"), TranslateT("day of month, 1-31"),

-			_T("%dd%"), TranslateT("day of month, 01-31"),

-			_T("%m%"), TranslateT("month number, 1-12"),

-			_T("%mm%"), TranslateT("month number, 01-12"),

-			_T("%mon%"), TranslateT("abbreviated month name"),

-			_T("%month%"), TranslateT("full month name"),

-			_T("%yy%"), TranslateT("year without century, 01-99"),

-			_T("%yyyy%"), TranslateT("year with century, 1901-9999"),

-			_T("%wday%"), TranslateT("abbreviated weekday name"),

-			_T("%weekday%"), TranslateT("full weekday name"));

+			L"%d%", TranslateT("day of month, 1-31"),

+			L"%dd%", TranslateT("day of month, 01-31"),

+			L"%m%", TranslateT("month number, 1-12"),

+			L"%mm%", TranslateT("month number, 01-12"),

+			L"%mon%", TranslateT("abbreviated month name"),

+			L"%month%", TranslateT("full month name"),

+			L"%yy%", TranslateT("year without century, 01-99"),

+			L"%yyyy%", TranslateT("year with century, 1901-9999"),

+			L"%wday%", TranslateT("abbreviated weekday name"),

+			L"%weekday%", TranslateT("full weekday name"));

 		GetClientRect(GetDlgItem(hwndDlg, IDC_CHAT_LOGDIRECTORY), &rect);

 		rect.left = -85;

 		hPathTip = CreateToolTip(GetDlgItem(hwndDlg, IDC_CHAT_LOGDIRECTORY), tszTooltipText, TranslateT("Variables"), &rect);

@@ -464,7 +464,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa
 				LPITEMIDLIST idList = SHBrowseForFolder(&bi);

 				if (idList) {

 					SHGetPathFromIDList(idList, tszDirectory);

-					mir_tstrcat(tszDirectory, _T("\\"));

+					mir_tstrcat(tszDirectory, L"\\");

 					PathToRelativeT(tszDirectory, tszTemp);

 					SetDlgItemText(hwndDlg, IDC_CHAT_LOGDIRECTORY, mir_tstrlen(tszTemp) > 1 ? tszTemp : DEFLOGFILENAME);

 				}

diff --git a/plugins/Scriver/src/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp
index 1fab1ef1f8..1a9be6ca87 100644
--- a/plugins/Scriver/src/chat/tools.cpp
+++ b/plugins/Scriver/src/chat/tools.cpp
@@ -68,7 +68,7 @@ UINT CreateGCMenu(HWND hwnd, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO *s
 			mir_tstrncpy(szTemp, TranslateT("&Message"), _countof(szTemp) - 1);

 

 		if (mir_tstrlen(szTemp) > 40)

-			mir_tstrncpy(szTemp + 40, _T("..."), 4);

+			mir_tstrncpy(szTemp + 40, L"...", 4);

 		ModifyMenu(*hMenu, ID_MESS, MF_STRING | MF_BYCOMMAND, ID_MESS, szTemp);

 		gcmi.Type = MENU_ON_NICKLIST;

 	}

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index cfb41abe37..53eaba0c5a 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -237,7 +237,7 @@ LBL_SkipEnd:
 		int topicStart = start;

 		while (topicStart >0 && (pszText[topicStart - 1] == ' ' || pszText[topicStart - 1] == 13 || pszText[topicStart - 1] == VK_TAB))

 			topicStart--;

-		if (topicStart > 5 && _tcsstr(&pszText[topicStart - 6], _T("/topic")) == &pszText[topicStart - 6])

+		if (topicStart > 5 && _tcsstr(&pszText[topicStart - 6], L"/topic") == &pszText[topicStart - 6])

 			isTopic = true;

 	}

 

@@ -274,7 +274,7 @@ LBL_SkipEnd:
 			if (!isRoom && !isTopic && g_Settings.bAddColonToAutoComplete && start == 0) {

 				szReplace = (TCHAR*)mir_alloc((mir_tstrlen(pszName) + 4) * sizeof(TCHAR));

 				mir_tstrcpy(szReplace, pszName);

-				mir_tstrcat(szReplace, _T(": "));

+				mir_tstrcat(szReplace, L": ");

 				pszName = szReplace;

 			}

 			SendMessage(hwnd, EM_SETSEL, start, end);

@@ -706,7 +706,7 @@ static LRESULT CALLBACK LogSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
 

 			case IDM_CLEAR:

 				if (si) {

-					SetWindowText(hwnd, _T(""));

+					SetWindowText(hwnd, L"");

 					pci->LM_RemoveAll(&si->pLog, &si->pLogEnd);

 					si->iEventCount = 0;

 					si->LastTime = 0;

@@ -795,7 +795,7 @@ static void ProcessNickListHovering(HWND hwnd, int hoveredItem, SESSION_INFO * p
 		}

 

 		if (tszBuf[0] == 0)

-			mir_sntprintf(tszBuf, _T("%s: %s\r\n%s: %s\r\n%s: %s"),

+			mir_sntprintf(tszBuf, L"%s: %s\r\n%s: %s\r\n%s: %s",

 				TranslateT("Nickname"), ui->pszNick,

 				TranslateT("Unique ID"), ui->pszUID,

 				TranslateT("Status"), pci->TM_WordToString(parentdat->pStatuses, ui->Status));

@@ -1147,8 +1147,8 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 			SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf);

 		

 			// nicklist

-			int ih = GetTextPixelSize(_T("AQG_glo'"), g_Settings.UserListFont, FALSE);

-			int ih2 = GetTextPixelSize(_T("AQG_glo'"), g_Settings.UserListHeadingsFont, FALSE);

+			int ih = GetTextPixelSize(L"AQG_glo'", g_Settings.UserListFont, FALSE);

+			int ih2 = GetTextPixelSize(L"AQG_glo'", g_Settings.UserListHeadingsFont, FALSE);

 			int height = db_get_b(NULL, CHAT_MODULE, "NicklistRowDist", 12);

 			int font = ih > ih2 ? ih : ih2;

 			// make sure we have space for icon!

@@ -1187,7 +1187,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 				si->ptszName, si->nUsersInNicklist);

 			break;

 		case GCW_SERVER:

-			mir_sntprintf(szTemp, _T("%s: Server"), si->ptszName);

+			mir_sntprintf(szTemp, L"%s: Server", si->ptszName);

 			break;

 		}

 		tbd.iFlags = TBDF_TEXT | TBDF_ICON;

@@ -1200,7 +1200,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 		{

 			MODULEINFO *mi = pci->MM_FindModule(si->pszModule);

 			hIcon = si->wStatus == ID_STATUS_ONLINE ? mi->hOnlineIcon : mi->hOfflineIcon;

-			mir_sntprintf(szTemp, _T("%s : %s"), mi->ptszModDispName, si->ptszStatusbarText ? si->ptszStatusbarText : _T(""));

+			mir_sntprintf(szTemp, L"%s : %s", mi->ptszModDispName, si->ptszStatusbarText ? si->ptszStatusbarText : L"");

 

 			StatusBarData sbd;

 			sbd.iItem = 0;

@@ -1211,7 +1211,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 

 			sbd.iItem = 1;

 			sbd.hIcon = NULL;

-			sbd.pszText = _T("");

+			sbd.pszText = L"";

 			SendMessage(GetParent(hwndDlg), CM_UPDATESTATUSBAR, (WPARAM)&sbd, (LPARAM)hwndDlg);

 

 			StatusIconData sid = { sizeof(sid) };

@@ -1345,7 +1345,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 

 	case GC_ACKMESSAGE:

 		SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_SETREADONLY, FALSE, 0);

-		SetDlgItemText(hwndDlg, IDC_CHAT_MESSAGE, _T(""));

+		SetDlgItemText(hwndDlg, IDC_CHAT_MESSAGE, L"");

 		return TRUE;

 

 	case WM_CTLCOLORLISTBOX:

@@ -1358,8 +1358,8 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 			if (mis->CtlType == ODT_MENU)

 				return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

-			int ih = GetTextPixelSize(_T("AQGgl'"), g_Settings.UserListFont, FALSE);

-			int ih2 = GetTextPixelSize(_T("AQGg'"), g_Settings.UserListHeadingsFont, FALSE);

+			int ih = GetTextPixelSize(L"AQGgl'", g_Settings.UserListFont, FALSE);

+			int ih2 = GetTextPixelSize(L"AQGg'", g_Settings.UserListHeadingsFont, FALSE);

 			int font = ih > ih2 ? ih : ih2;

 			int height = db_get_b(NULL, CHAT_MODULE, "NicklistRowDist", 12);

 			// make sure we have space for icon!

@@ -1428,7 +1428,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 				char szIndicator = SM_GetStatusIndicator(si, ui);

 				if (szIndicator > '\0') {

 					static TCHAR ptszBuf[128];

-					mir_sntprintf(ptszBuf, _T("%c%s"), szIndicator, ui->pszNick);

+					mir_sntprintf(ptszBuf, L"%c%s", szIndicator, ui->pszNick);

 					SendDlgItemMessage(hwndDlg, IDC_CHAT_LIST, LB_ADDSTRING, 0, (LPARAM)ptszBuf);

 				}

 				else SendDlgItemMessage(hwndDlg, IDC_CHAT_LIST, LB_ADDSTRING, 0, (LPARAM)ui->pszNick);

@@ -1456,7 +1456,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 			return TRUE;

 

 		case WINDOW_CLEARLOG:

-			SetDlgItemText(hwndDlg, IDC_CHAT_LOG, _T(""));

+			SetDlgItemText(hwndDlg, IDC_CHAT_LOG, L"");

 			return TRUE;

 

 		case SESSION_TERMINATE:

@@ -1637,7 +1637,7 @@ LABEL_SHOWWINDOW:
 					USERINFO *ui = pci->SM_GetUserFromIndex(parentdat->ptszID, parentdat->pszModule, item);

 					if (ui != NULL) {

 						static TCHAR ptszBuf[1024];

-						mir_sntprintf(ptszBuf, _T("%s: %s\r\n%s: %s\r\n%s: %s"),

+						mir_sntprintf(ptszBuf, L"%s: %s\r\n%s: %s\r\n%s: %s",

 							TranslateT("Nickname"), ui->pszNick,

 							TranslateT("Unique ID"), ui->pszUID,

 							TranslateT("Status"), pci->TM_WordToString(parentdat->pStatuses, ui->Status));

@@ -1670,9 +1670,9 @@ LABEL_SHOWWINDOW:
 						size_t dwNameLenMax = (mir_tstrlen(ui->pszUID) + 4);

 						TCHAR* pszName = (TCHAR*)alloca(sizeof(TCHAR) * dwNameLenMax);

 						if (start == 0)

-							mir_sntprintf(pszName, dwNameLenMax, _T("%s: "), ui->pszUID);

+							mir_sntprintf(pszName, dwNameLenMax, L"%s: ", ui->pszUID);

 						else

-							mir_sntprintf(pszName, dwNameLenMax, _T("%s "), ui->pszUID);

+							mir_sntprintf(pszName, dwNameLenMax, L"%s ", ui->pszUID);

 

 						SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_REPLACESEL, FALSE, (LPARAM)pszName);

 						PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0);

@@ -1709,13 +1709,13 @@ LABEL_SHOWWINDOW:
 				CMString ptszText(ptrT(mir_utf8decodeT(pszRtf)));

 				pci->DoRtfToTags(ptszText, mi->nColorCount, mi->crColors);

 				ptszText.Trim();

-				ptszText.Replace(_T("%"), _T("%%"));

+				ptszText.Replace(L"%", L"%%");

 

 				if (mi->bAckMsg) {

 					EnableWindow(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE), FALSE);

 					SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_SETREADONLY, TRUE, 0);

 				}

-				else SetDlgItemText(hwndDlg, IDC_CHAT_MESSAGE, _T(""));

+				else SetDlgItemText(hwndDlg, IDC_CHAT_MESSAGE, L"");

 

 				EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE);

 

diff --git a/plugins/Scriver/src/infobar.cpp b/plugins/Scriver/src/infobar.cpp
index 83c7fc074b..c8485ed218 100644
--- a/plugins/Scriver/src/infobar.cpp
+++ b/plugins/Scriver/src/infobar.cpp
@@ -86,7 +86,7 @@ void RefreshInfobar(InfobarWindowData* idat)
 	TCHAR szText[2048];

 	SETTEXTEX st;

 	if (szXStatusMsg && *szXStatusMsg)

-		mir_sntprintf(szText, _T("%s (%s)"), TranslateTS(szXStatusName), szXStatusMsg);

+		mir_sntprintf(szText, L"%s (%s)", TranslateTS(szXStatusName), szXStatusMsg);

 	else

 		_tcsncpy_s(szText, TranslateTS(szXStatusName), _TRUNCATE);

 	st.flags = ST_DEFAULT;

diff --git a/plugins/Scriver/src/input.cpp b/plugins/Scriver/src/input.cpp
index 563c2803da..fcc305a9f4 100644
--- a/plugins/Scriver/src/input.cpp
+++ b/plugins/Scriver/src/input.cpp
@@ -109,7 +109,7 @@ void InputAreaContextMenu(HWND hwnd, WPARAM, LPARAM lParam, MCONTACT hContact)
 		SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)&all);

 		break;

 	case IDM_CLEAR:

-		SetWindowText(hwnd, _T(""));

+		SetWindowText(hwnd, L"");

 		break;

 	}

 	DestroyMenu(hMenu);

@@ -224,7 +224,7 @@ int InputAreaShortcuts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, Common
 						if (windowData->cmdListCurrent->next != NULL)

 							cmdListNew = windowData->cmdListCurrent->next;

 						else if (!windowData->cmdListCurrent->temporary)

-							SetWindowText(hwnd, _T(""));

+							SetWindowText(hwnd, L"");

 					}

 				}

 				if (cmdListNew != NULL) {

@@ -376,7 +376,7 @@ BOOL HandleLinkClick(HINSTANCE hInstance, HWND hwndDlg, HWND hwndFocus, ENLINK *
 	SendMessage(lParam->nmhdr.hwndFrom, EM_GETTEXTRANGE, 0, (LPARAM)&tr);

 	if (_tcschr(tr.lpstrText, _T('@')) != NULL && _tcschr(tr.lpstrText, _T(':')) == NULL && _tcschr(tr.lpstrText, _T('/')) == NULL) {

 		memmove(tr.lpstrText + 7, tr.lpstrText, sizeof(TCHAR)*(tr.chrg.cpMax - tr.chrg.cpMin + 1));

-		memcpy(tr.lpstrText, _T("mailto:"), sizeof(TCHAR) * 7);

+		memcpy(tr.lpstrText, L"mailto:", sizeof(TCHAR) * 7);

 	}

 

 	BOOL bOpenLink = TRUE;

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 22b05043b8..34637e2010 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -165,12 +165,12 @@ static void AddToFileList(TCHAR ***pppFiles, int *totalCount, const TCHAR* szFil
 	if (GetFileAttributes(szFilename) & FILE_ATTRIBUTE_DIRECTORY) {

 		WIN32_FIND_DATA fd;

 		TCHAR szPath[MAX_PATH];

-		mir_sntprintf(szPath, _T("%s\\*"), szFilename);

+		mir_sntprintf(szPath, L"%s\\*", szFilename);

 		HANDLE hFind = FindFirstFile(szPath, &fd);

 		if (hFind != INVALID_HANDLE_VALUE) {

 			do {

-				if (!mir_tstrcmp(fd.cFileName, _T(".")) || !mir_tstrcmp(fd.cFileName, _T(".."))) continue;

-				mir_sntprintf(szPath, _T("%s\\%s"), szFilename, fd.cFileName);

+				if (!mir_tstrcmp(fd.cFileName, L".") || !mir_tstrcmp(fd.cFileName, L"..")) continue;

+				mir_sntprintf(szPath, L"%s\\%s", szFilename, fd.cFileName);

 				AddToFileList(pppFiles, totalCount, szPath);

 			} while (FindNextFile(hFind, &fd));

 			FindClose(hFind);

@@ -552,7 +552,7 @@ static void UpdateReadChars(HWND hwndDlg, SrmmWindowData *dat)
 		sbd.iFlags = SBDF_TEXT | SBDF_ICON;

 		sbd.hIcon = NULL;

 		sbd.pszText = szText;

-		mir_sntprintf(szText, _T("%d"), len);

+		mir_sntprintf(szText, L"%d", len);

 		SendMessage(dat->hwndParent, CM_UPDATESTATUSBAR, (WPARAM)&sbd, (LPARAM)hwndDlg);

 	}

 }

@@ -1099,7 +1099,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		pf2.cbSize = sizeof(pf2);

 		pf2.dwMask = PFM_OFFSET;

 		pf2.dxOffset = (g_dat.flags & SMF_INDENTTEXT) ? g_dat.indentSize * 1440 / g_dat.logPixelSX : 0;

-		SetDlgItemText(hwndDlg, IDC_LOG, _T(""));

+		SetDlgItemText(hwndDlg, IDC_LOG, L"");

 		SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETPARAFORMAT, 0, (LPARAM)&pf2);

 		SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETLANGOPTIONS, 0, (LPARAM)SendDlgItemMessage(hwndDlg, IDC_LOG, EM_GETLANGOPTIONS, 0, 0) & ~(IMF_AUTOKEYBOARD | IMF_AUTOFONTSIZEADJUST));

 

@@ -1361,12 +1361,12 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			}

 			else if (dat->lastMessage) {

 				TCHAR date[64], time[64];

-				TimeZone_PrintTimeStamp(NULL, dat->lastMessage, _T("d"), date, _countof(date), 0);

-				TimeZone_PrintTimeStamp(NULL, dat->lastMessage, _T("t"), time, _countof(time), 0);

+				TimeZone_PrintTimeStamp(NULL, dat->lastMessage, L"d", date, _countof(date), 0);

+				TimeZone_PrintTimeStamp(NULL, dat->lastMessage, L"t", time, _countof(time), 0);

 				mir_sntprintf(szText, TranslateT("Last message received on %s at %s."), date, time);

 				sbd.pszText = szText;

 			}

-			else sbd.pszText = _T("");

+			else sbd.pszText = L"";

 

 			SendMessage(dat->hwndParent, CM_UPDATESTATUSBAR, (WPARAM)&sbd, (LPARAM)hwndDlg);

 			UpdateReadChars(hwndDlg, dat);

@@ -1397,7 +1397,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			CallService(MS_IEVIEW_EVENT, 0, (LPARAM)&evt);

 		}

 

-		SetDlgItemText(hwndDlg, IDC_LOG, _T(""));

+		SetDlgItemText(hwndDlg, IDC_LOG, L"");

 		dat->hDbEventFirst = NULL;

 		dat->lastEventType = -1;

 		break;

@@ -1609,7 +1609,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				if (dat->nTypeMode == PROTOTYPE_SELFTYPING_ON)

 					NotifyTyping(dat, PROTOTYPE_SELFTYPING_OFF);

 

-				SetDlgItemText(hwndDlg, IDC_MESSAGE, _T(""));

+				SetDlgItemText(hwndDlg, IDC_MESSAGE, L"");

 				EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE);

 				if (db_get_b(NULL, SRMMMOD, SRMSGSET_AUTOMIN, SRMSGDEFSET_AUTOMIN))

 					ShowWindow(dat->hwndParent, SW_MINIMIZE);

diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp
index 137ff6ead7..43a81f12b8 100644
--- a/plugins/Scriver/src/msglog.cpp
+++ b/plugins/Scriver/src/msglog.cpp
@@ -366,25 +366,25 @@ TCHAR* TimestampToString(DWORD dwFlags, time_t check, int mode)
 		if (dwFlags & SMF_RELATIVEDATE && check >= today) {

 			mir_tstrcpy(szResult, TranslateT("Today"));

 			if (mode == 0)

-				mir_tstrcat(szResult, _T(","));

+				mir_tstrcat(szResult, L",");

 		}

 		else if (dwFlags & SMF_RELATIVEDATE && check > (today - 86400)) {

 			mir_tstrcpy(szResult, TranslateT("Yesterday"));

 			if (mode == 0)

-				mir_tstrcat(szResult, _T(","));

+				mir_tstrcat(szResult, L",");

 		}

 		else {

 			if (dwFlags & SMF_LONGDATE)

-				mir_tstrcpy(format, _T("D"));

+				mir_tstrcpy(format, L"D");

 			else

-				mir_tstrcpy(format, _T("d"));

+				mir_tstrcpy(format, L"d");

 		}

 	}

 	if (mode == 0 || mode == 2) {

 		if (mode == 0 && (dwFlags & SMF_SHOWDATE))

-			mir_tstrcat(format, _T(" "));

+			mir_tstrcat(format, L" ");

 

-		mir_tstrcat(format, (dwFlags & SMF_SHOWSECONDS) ? _T("s") : _T("t"));

+		mir_tstrcat(format, (dwFlags & SMF_SHOWSECONDS) ? L"s" : L"t");

 	}

 	if (format[0] != '\0') {

 		TimeZone_PrintTimeStamp(NULL, check, format, str, _countof(str), 0);

@@ -642,16 +642,16 @@ static char* CreateRTFFromEvent(SrmmWindowData *dat, EventData *evt, GlobalMessa
 				AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, TranslateT("File sent"));

 			else

 				AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, TranslateT("File received"));

-			AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, _T(":"));

+			AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, L":");

 		}

 		else if (evt->eventType == EVENTTYPE_URL) {

 			if (evt->dwFlags & IEEDF_SENT)

 				AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, TranslateT("URL sent"));

 			else

 				AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, TranslateT("URL received"));

-			AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, _T(":"));

+			AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, L":");

 		}

-		AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, _T(" "));

+		AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, L" ");

 

 		if (evt->pszTextW != NULL) {

 			if (evt->dwFlags & IEEDF_UNICODE_TEXT)

@@ -661,12 +661,12 @@ static char* CreateRTFFromEvent(SrmmWindowData *dat, EventData *evt, GlobalMessa
 		}

 

 		if (evt->pszText2W != NULL) {

-			AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, _T(" ("));

+			AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, L" (");

 			if (evt->dwFlags & IEEDF_UNICODE_TEXT2)

 				AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, evt->pszText2W);

 			else

 				AppendAnsiToBuffer(buffer, bufferEnd, bufferAlloced, evt->pszText2);

-			AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, _T(")"));

+			AppendUnicodeToBuffer(buffer, bufferEnd, bufferAlloced, L")");

 		}

 		break;

 	default:

@@ -822,7 +822,7 @@ void StreamInEvents(HWND hwndDlg, MEVENT hDbEventFirst, int count, int fAppend)
 	}

 	else {

 		SendDlgItemMessage(hwndDlg, IDC_LOG, WM_SETREDRAW, FALSE, 0);

-		SetDlgItemText(hwndDlg, IDC_LOG, _T(""));

+		SetDlgItemText(hwndDlg, IDC_LOG, L"");

 		sel.cpMin = 0;

 		sel.cpMax = GetRichTextLength(GetDlgItem(hwndDlg, IDC_LOG), 1200, FALSE);

 		SendDlgItemMessage(hwndDlg, IDC_LOG, EM_EXSETSEL, 0, (LPARAM)&sel);

diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index 75afb7337d..41e9ebd30b 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -60,20 +60,20 @@ typedef struct FontOptionsListStruct
 } FontOptionsList;

 

 static const FontOptionsList fontOptionsList[] = {

-	{ LPGENT("Outgoing messages"), RGB(106, 106, 106), _T("Arial"), 0, -12, LPGENT("Outgoing background")},

-	{ LPGENT("Incoming messages"), RGB(0, 0, 0), _T("Arial"), 0, -12, LPGENT("Incoming background")},

-	{ LPGENT("Outgoing name"), RGB(89, 89, 89), _T("Arial"), FONTF_BOLD, -12, LPGENT("Outgoing background")},

-	{ LPGENT("Outgoing time"), RGB(0, 0, 0), _T("Terminal"), FONTF_BOLD, -9, LPGENT("Outgoing background")},

-	{ LPGENT("Outgoing colon"), RGB(89, 89, 89), _T("Arial"), 0, -11, LPGENT("Outgoing background")},

-	{ LPGENT("Incoming name"), RGB(215, 0, 0), _T("Arial"), FONTF_BOLD, -12, LPGENT("Incoming background")},

-	{ LPGENT("Incoming time"), RGB(0, 0, 0), _T("Terminal"), FONTF_BOLD, -9, LPGENT("Incoming background")},

-	{ LPGENT("Incoming colon"), RGB(215, 0, 0), _T("Arial"), 0, -11, LPGENT("Incoming background")},

-	{ LPGENT("Message area"), RGB(0, 0, 0), _T("Arial"), 0, -12, LPGENT("Input area background")},

-	{ LPGENT("Notices"), RGB(90, 90, 160), _T("Arial"), 0, -12, LPGENT("Incoming background")},

-	{ LPGENT("Outgoing URL"), RGB(0, 0, 255), _T("Arial"), 0, -12, LPGENT("Outgoing background")},

-	{ LPGENT("Incoming URL"), RGB(0, 0, 255), _T("Arial"), 0, -12, LPGENT("Incoming background")},

-	{ LPGENT("Info bar contact name"), RGB(0, 0, 0), _T("Arial"), FONTF_BOLD, -19, LPGENT("Info bar background")},

-	{ LPGENT("Info bar status message"), RGB(50, 50, 50), _T("Arial"), FONTF_ITALIC, -11, LPGENT("Info bar background")}

+	{ LPGENT("Outgoing messages"), RGB(106, 106, 106), L"Arial", 0, -12, LPGENT("Outgoing background")},

+	{ LPGENT("Incoming messages"), RGB(0, 0, 0), L"Arial", 0, -12, LPGENT("Incoming background")},

+	{ LPGENT("Outgoing name"), RGB(89, 89, 89), L"Arial", FONTF_BOLD, -12, LPGENT("Outgoing background")},

+	{ LPGENT("Outgoing time"), RGB(0, 0, 0), L"Terminal", FONTF_BOLD, -9, LPGENT("Outgoing background")},

+	{ LPGENT("Outgoing colon"), RGB(89, 89, 89), L"Arial", 0, -11, LPGENT("Outgoing background")},

+	{ LPGENT("Incoming name"), RGB(215, 0, 0), L"Arial", FONTF_BOLD, -12, LPGENT("Incoming background")},

+	{ LPGENT("Incoming time"), RGB(0, 0, 0), L"Terminal", FONTF_BOLD, -9, LPGENT("Incoming background")},

+	{ LPGENT("Incoming colon"), RGB(215, 0, 0), L"Arial", 0, -11, LPGENT("Incoming background")},

+	{ LPGENT("Message area"), RGB(0, 0, 0), L"Arial", 0, -12, LPGENT("Input area background")},

+	{ LPGENT("Notices"), RGB(90, 90, 160), L"Arial", 0, -12, LPGENT("Incoming background")},

+	{ LPGENT("Outgoing URL"), RGB(0, 0, 255), L"Arial", 0, -12, LPGENT("Outgoing background")},

+	{ LPGENT("Incoming URL"), RGB(0, 0, 255), L"Arial", 0, -12, LPGENT("Incoming background")},

+	{ LPGENT("Info bar contact name"), RGB(0, 0, 0), L"Arial", FONTF_BOLD, -19, LPGENT("Info bar background")},

+	{ LPGENT("Info bar status message"), RGB(50, 50, 50), L"Arial", FONTF_ITALIC, -11, LPGENT("Info bar background")}

 };

 

 int fontOptionsListSize = _countof(fontOptionsList);

@@ -622,7 +622,7 @@ static void ShowPreview(HWND hwndDlg)
 	pf2.cbSize = sizeof(pf2);

 	pf2.dwMask = PFM_OFFSET;

 	pf2.dxOffset = (gdat.flags & SMF_INDENTTEXT) ? gdat.indentSize * 1440 / g_dat.logPixelSX : 0;

-	SetDlgItemText(hwndDlg, IDC_LOG, _T(""));

+	SetDlgItemText(hwndDlg, IDC_LOG, L"");

 	SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETPARAFORMAT, 0, (LPARAM)&pf2);

 	StreamInTestEvents(GetDlgItem(hwndDlg, IDC_LOG), &gdat);

 }

diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index e007c45e79..d397964eae 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -370,7 +370,7 @@ static INT_PTR SetStatusText(WPARAM hContact, LPARAM lParam)
 	}

 

 	SendMessage(pdat->hwndStatus, SB_SETICON, 0, (LPARAM)(st == NULL ? 0 : st->hIcon));

-	SendMessage(pdat->hwndStatus, SB_SETTEXT, 0, (LPARAM)(st == NULL ? _T("") : st->tszText));

+	SendMessage(pdat->hwndStatus, SB_SETTEXT, 0, (LPARAM)(st == NULL ? L"" : st->tszText));

 

 	return 0;

 }

@@ -520,7 +520,7 @@ int OnUnloadModule(void)
 

 int OnLoadModule(void)

 {

-	hMsftEdit = LoadLibrary(_T("Msftedit.dll"));

+	hMsftEdit = LoadLibrary(L"Msftedit.dll");

 	if (hMsftEdit == NULL) {

 		if (IDYES != MessageBox(0,

 			TranslateT

@@ -648,7 +648,7 @@ STDMETHODIMP CREOleCallback::GetInPlaceContext(LPOLEINPLACEFRAME*, LPOLEINPLACEU
 STDMETHODIMP CREOleCallback::GetNewStorage(LPSTORAGE *lplpstg)

 {

 	TCHAR sztName[64];

-	mir_sntprintf(sztName, _T("s%u"), nextStgId++);

+	mir_sntprintf(sztName, L"s%u", nextStgId++);

 	if (pictStg == NULL)

 		return STG_E_MEDIUMFULL;

 	return pictStg->CreateStorage(sztName, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, lplpstg);

diff --git a/plugins/Scriver/src/msgtimedout.cpp b/plugins/Scriver/src/msgtimedout.cpp
index b7e8ae4ebb..e50504a340 100644
--- a/plugins/Scriver/src/msgtimedout.cpp
+++ b/plugins/Scriver/src/msgtimedout.cpp
@@ -50,7 +50,7 @@ INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 					SendDlgItemMessage(hwndDlg, IDC_MSGTEXT, EM_SETTEXTEX, (WPARAM)&st, (LPARAM)ewd->szText);

 				}

 				if (ewd->szName)

-					mir_sntprintf(szText, _T("%s - %s"), TranslateT("Send error"), ewd->szName);

+					mir_sntprintf(szText, L"%s - %s", TranslateT("Send error"), ewd->szName);

 				else

 					_tcsncpy_s(szText, TranslateT("Send error"), _TRUNCATE);

 

diff --git a/plugins/Scriver/src/msgwindow.cpp b/plugins/Scriver/src/msgwindow.cpp
index e58601d3f4..53348f2bdb 100644
--- a/plugins/Scriver/src/msgwindow.cpp
+++ b/plugins/Scriver/src/msgwindow.cpp
@@ -33,7 +33,7 @@ static void DrawTab(ParentWindowData *dat, HWND hwnd, WPARAM wParam, LPARAM lPar
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-static const TCHAR *titleTokenNames[] = { _T("%name%"), _T("%status%"), _T("%statusmsg%"), _T("%account%") };

+static const TCHAR *titleTokenNames[] = { L"%name%", L"%status%", L"%statusmsg%", L"%account%" };

 

 TCHAR* GetWindowTitle(MCONTACT hContact, const char *szProto)

 {

@@ -46,7 +46,7 @@ TCHAR* GetWindowTitle(MCONTACT hContact, const char *szProto)
 		tokens[1] = pcli->pfnGetStatusModeDescription(db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

 		

 		tszStatus = ptrT(db_get_tsa(hContact, "CList", "StatusMsg"));

-		tszStatus.Replace(_T("\r\n"), _T(" "));

+		tszStatus.Replace(L"\r\n", L" ");

 		tokens[2] = tszStatus;

 

 		char *accModule = Proto_GetBaseAccountName(hContact);

@@ -61,9 +61,9 @@ TCHAR* GetWindowTitle(MCONTACT hContact, const char *szProto)
 			tszTemplate = tmplt;

 		else {

 			if (g_dat.flags & SMF_STATUSICON)

-				tszTemplate = _T("%name% - ");

+				tszTemplate = L"%name% - ";

 			else

-				tszTemplate = _T("%name% (%status%) : ");

+				tszTemplate = L"%name% (%status%) : ";

 		}

 	}

 

@@ -280,7 +280,7 @@ static void AddChild(ParentWindowData *dat, HWND hwnd, MCONTACT hContact)
 	tci.mask = TCIF_PARAM | TCIF_IMAGE | TCIF_TEXT;

 	tci.lParam = (LPARAM)mwtd;

 	tci.iImage = -1;

-	tci.pszText = _T("");

+	tci.pszText = L"";

 	TabCtrl_InsertItem(dat->hwndTabs, dat->childrenCount - 1, &tci);

 	SetWindowPos(mwtd->hwnd, HWND_TOP, dat->childRect.left, dat->childRect.top, dat->childRect.right - dat->childRect.left, dat->childRect.bottom - dat->childRect.top, SWP_HIDEWINDOW);

 	SendMessage(dat->hwnd, WM_SIZE, 0, 0);

diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp
index 8cc13d209b..43461d070b 100644
--- a/plugins/Scriver/src/utils.cpp
+++ b/plugins/Scriver/src/utils.cpp
@@ -142,7 +142,7 @@ char* GetRichTextRTF(HWND hwnd)
 

 void rtrimText(TCHAR *text)

 {

-	static TCHAR szTrimString[] = _T(":;,.!?\'\"><()[]- \r\n");

+	static TCHAR szTrimString[] = L":;,.!?\'\"><()[]- \r\n";

 	size_t iLen = mir_tstrlen(text) - 1;

 	while (_tcschr(szTrimString, text[iLen])) {

 		text[iLen] = _T('\0');

@@ -156,7 +156,7 @@ TCHAR* limitText(TCHAR *text, int limit)
 	if (len > g_dat.limitNamesLength) {

 		TCHAR *ptszTemp = (TCHAR*)mir_alloc(sizeof(TCHAR) * (limit + 4));

 		_tcsncpy(ptszTemp, text, limit + 1);

-		_tcsncpy(ptszTemp + limit, _T("..."), 4);

+		_tcsncpy(ptszTemp + limit, L"...", 4);

 		return ptszTemp;

 	}

 	return text;