hello, Unix.

phase 1: removing _T()

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

4 files changed, 72 insertions, 72 deletions

diff --git a/plugins/PackUpdater/Src/Events.cpp b/plugins/PackUpdater/Src/Events.cpp
index 12858dec6e..ad126ec69b 100644
--- a/plugins/PackUpdater/Src/Events.cpp
+++ b/plugins/PackUpdater/Src/Events.cpp
@@ -58,12 +58,12 @@ INT_PTR EmptyFolder(WPARAM, LPARAM lParam)
 		NULL,

 		FO_DELETE,

 		tszRoot,

-		_T(""),

+		L"",

 		FOF_NOERRORUI |

 		FOF_SILENT,

 		false,

 		0,

-		_T("") };

+		L"" };

 	if (lParam)

 		file_op.fFlags |= FOF_NOCONFIRMATION;

 	SHFileOperation(&file_op);

diff --git a/plugins/PackUpdater/Src/Notifications.cpp b/plugins/PackUpdater/Src/Notifications.cpp
index d1c9a532a3..9bb3df6958 100644
--- a/plugins/PackUpdater/Src/Notifications.cpp
+++ b/plugins/PackUpdater/Src/Notifications.cpp
@@ -307,7 +307,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 						EnableWindow(hwOk, enableOk ? TRUE : FALSE);

 					}

 					if (nmlv->uNewState & LVIS_SELECTED) {

-						if (mir_tstrcmp(todo[lvI.iItem].tszInfoURL, _T("")))

+						if (mir_tstrcmp(todo[lvI.iItem].tszInfoURL, L""))

 							EnableWindow(GetDlgItem(hDlg, IDC_INFO), TRUE);

 						else

 							EnableWindow(GetDlgItem(hDlg, IDC_INFO), FALSE);

@@ -349,37 +349,37 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 					if (todo[i].enabled) {

 						switch (todo[i].FileType) {

 						case 1:

-							mir_sntprintf(tszFileDest, _T("%s\\Pack"), tszRoot);

+							mir_sntprintf(tszFileDest, L"%s\\Pack", tszRoot);

 							CreateDirectory(tszFileDest, NULL);

 							break;

 						case 2:

-							mir_sntprintf(tszFileDest, _T("%s\\Plugins"), tszRoot);

+							mir_sntprintf(tszFileDest, L"%s\\Plugins", tszRoot);

 							CreateDirectory(tszFileDest, NULL);

 							break;

 						case 3:

-							mir_sntprintf(tszFileDest, _T("%s\\Icons"), tszRoot);

+							mir_sntprintf(tszFileDest, L"%s\\Icons", tszRoot);

 							CreateDirectory(tszFileDest, NULL);

 							break;

 						case 4:

-							mir_sntprintf(tszFileDest, _T("%s\\Others"), tszRoot);

+							mir_sntprintf(tszFileDest, L"%s\\Others", tszRoot);

 							CreateDirectory(tszFileDest, NULL);

 							break;

 						case 5:

-							mir_sntprintf(tszFileDest, _T("%s\\Others"), tszRoot);

+							mir_sntprintf(tszFileDest, L"%s\\Others", tszRoot);

 							CreateDirectory(tszFileDest, NULL);

 							break;

 						default:

 							mir_tstrncpy(tszFileDest, tszRoot, _countof(tszFileDest));

 							break;

 						}

-						mir_sntprintf(tszBuff, _T("%s\\Backups"), tszRoot);

+						mir_sntprintf(tszBuff, L"%s\\Backups", tszRoot);

 						CreateDirectory(tszBuff, NULL);

 						mir_tstrncpy(tszFileName, todo[i].File.tszDiskPath, _countof(tszFileName));

-						mir_sntprintf(todo[i].File.tszDiskPath, _T("%s\\%s"), tszFileDest, tszFileName);

+						mir_sntprintf(todo[i].File.tszDiskPath, L"%s\\%s", tszFileDest, tszFileName);

 						UpdatesCount++;

 

 						tszExt = &todo[i].File.tszDownloadURL[mir_tstrlen(todo[i].File.tszDownloadURL) - 5];

-						if (mir_tstrcmp(tszExt, _T(".html")) == 0) {

+						if (mir_tstrcmp(tszExt, L".html") == 0) {

 							char* szUrl = mir_t2a(todo[i].File.tszDownloadURL);

 							Utils_OpenUrl(szUrl);

 							mir_free(szUrl);

@@ -412,11 +412,11 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 					}

 				}

 

-				if (UpdatesCount > 1 && mir_tstrcmp(arExt[0].c_str(), _T(".html")) != 0)

+				if (UpdatesCount > 1 && mir_tstrcmp(arExt[0].c_str(), L".html") != 0)

 					mir_tstrncpy(tszBuff, TranslateT("Downloads complete. Start updating? All your data will be saved and Miranda NG will be closed."), _countof(tszBuff));

-				else if (UpdatesCount == 1 && mir_tstrcmp(arExt[0].c_str(), _T(".html")) != 0)

+				else if (UpdatesCount == 1 && mir_tstrcmp(arExt[0].c_str(), L".html") != 0)

 					mir_tstrncpy(tszBuff, TranslateT("Download complete. Start updating? All your data will be saved and Miranda NG will be closed."), _countof(tszBuff));

-				if (UpdatesCount > 0 && mir_tstrcmp(arExt[0].c_str(), _T(".html")) != 0) {

+				if (UpdatesCount > 0 && mir_tstrcmp(arExt[0].c_str(), L".html") != 0) {

 					INT rc = -1;

 					Title = TranslateT("Pack Updater");

 					Text = tszBuff;

@@ -445,17 +445,17 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 									TCHAR *p = _tcsrchr(tszCurrentDir, '\\');

 									if (p) *p = 0;

 								}

-								CreateProcess(arFilePath[i].c_str(), _T(""), NULL, NULL, FALSE, NULL, NULL, tszCurrentDir, &si, &pi);

+								CreateProcess(arFilePath[i].c_str(), L"", NULL, NULL, FALSE, NULL, NULL, tszCurrentDir, &si, &pi);

 								i = UpdatesCount;

 								CallFunctionAsync(ExitMe, 0);

 								break;

 							case 2:

-								tszUtilRootPlug = Utils_ReplaceVarsT(_T("%miranda_path%\\Plugins"));

-								if (mir_tstrcmp(arAdvFolder[i].c_str(), _T("")) == 0)

-									mir_sntprintf(tszFilePathDest, _T("%s\\%s"), tszUtilRootPlug, arFileName[i].c_str());

+								tszUtilRootPlug = Utils_ReplaceVarsT(L"%miranda_path%\\Plugins");

+								if (mir_tstrcmp(arAdvFolder[i].c_str(), L"") == 0)

+									mir_sntprintf(tszFilePathDest, L"%s\\%s", tszUtilRootPlug, arFileName[i].c_str());

 								else

-									mir_sntprintf(tszFilePathDest, _T("%s\\%s\\%s"), tszUtilRootPlug, arAdvFolder[i].c_str(), arFileName[i].c_str());

-								mir_sntprintf(tszFilePathBack, _T("%s\\Backups\\%s"), tszRoot, arFileName[i].c_str());

+									mir_sntprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRootPlug, arAdvFolder[i].c_str(), arFileName[i].c_str());

+								mir_sntprintf(tszFilePathBack, L"%s\\Backups\\%s", tszRoot, arFileName[i].c_str());

 								MoveFile(tszFilePathDest, tszFilePathBack);

 								MoveFile(arFilePath[i].c_str(), tszFilePathDest);

 								mir_free(tszUtilRootPlug);

@@ -463,12 +463,12 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 									CallFunctionAsync(RestartMe, 0);

 								break;

 							case 3:

-								tszUtilRootIco = Utils_ReplaceVarsT(_T("%miranda_path%\\Icons"));

-								if (mir_tstrcmp(arAdvFolder[i].c_str(), _T("")) == 0)

-									mir_sntprintf(tszFilePathDest, _T("%s\\%s"), tszUtilRootIco, arFileName[i].c_str());

+								tszUtilRootIco = Utils_ReplaceVarsT(L"%miranda_path%\\Icons");

+								if (mir_tstrcmp(arAdvFolder[i].c_str(), L"") == 0)

+									mir_sntprintf(tszFilePathDest, L"%s\\%s", tszUtilRootIco, arFileName[i].c_str());

 								else

-									mir_sntprintf(tszFilePathDest, _T("%s\\%s\\%s"), tszUtilRootIco, arAdvFolder[i].c_str(), arFileName[i].c_str());

-								mir_sntprintf(tszFilePathBack, _T("%s\\Backups\\%s"), tszRoot, arFileName[i].c_str());

+									mir_sntprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRootIco, arAdvFolder[i].c_str(), arFileName[i].c_str());

+								mir_sntprintf(tszFilePathBack, L"%s\\Backups\\%s", tszRoot, arFileName[i].c_str());

 								MoveFile(tszFilePathDest, tszFilePathBack);

 								MoveFile(arFilePath[i].c_str(), tszFilePathDest);

 								mir_free(tszUtilRootIco);

@@ -476,12 +476,12 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 									CallFunctionAsync(RestartMe, 0);

 								break;

 							case 4:

-								tszUtilRoot = Utils_ReplaceVarsT(_T("%miranda_path%"));

-								if (mir_tstrcmp(arAdvFolder[i].c_str(), _T("")) == 0)

-									mir_sntprintf(tszFilePathDest, _T("%s\\%s"), tszUtilRoot, arFileName[i].c_str());

+								tszUtilRoot = Utils_ReplaceVarsT(L"%miranda_path%");

+								if (mir_tstrcmp(arAdvFolder[i].c_str(), L"") == 0)

+									mir_sntprintf(tszFilePathDest, L"%s\\%s", tszUtilRoot, arFileName[i].c_str());

 								else

-									mir_sntprintf(tszFilePathDest, _T("%s\\%s\\%s"), tszUtilRoot, arAdvFolder[i].c_str(), arFileName[i].c_str());

-								mir_sntprintf(tszFilePathBack, _T("%s\\Backups\\%s"), tszRoot, arFileName[i].c_str());

+									mir_sntprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRoot, arAdvFolder[i].c_str(), arFileName[i].c_str());

+								mir_sntprintf(tszFilePathBack, L"%s\\Backups\\%s", tszRoot, arFileName[i].c_str());

 								MoveFile(tszFilePathDest, tszFilePathBack);

 								MoveFile(arFilePath[i].c_str(), tszFilePathDest);

 								mir_free(tszUtilRoot);

@@ -489,12 +489,12 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 									CallFunctionAsync(RestartMe, 0);

 								break;

 							case 5:

-								tszUtilRoot = Utils_ReplaceVarsT(_T("%miranda_path%"));

-								if (mir_tstrcmp(arAdvFolder[i].c_str(), _T("")) == 0)

-									mir_sntprintf(tszFilePathDest, _T("%s\\%s"), tszUtilRoot, arFileName[i].c_str());

+								tszUtilRoot = Utils_ReplaceVarsT(L"%miranda_path%");

+								if (mir_tstrcmp(arAdvFolder[i].c_str(), L"") == 0)

+									mir_sntprintf(tszFilePathDest, L"%s\\%s", tszUtilRoot, arFileName[i].c_str());

 								else

-									mir_sntprintf(tszFilePathDest, _T("%s\\%s\\%s"), tszUtilRoot, arAdvFolder[i].c_str(), arFileName[i].c_str());

-								mir_sntprintf(tszFilePathBack, _T("%s\\Backups\\%s"), tszRoot, arFileName[i].c_str());

+									mir_sntprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRoot, arAdvFolder[i].c_str(), arFileName[i].c_str());

+								mir_sntprintf(tszFilePathBack, L"%s\\Backups\\%s", tszRoot, arFileName[i].c_str());

 								MoveFile(tszFilePathDest, tszFilePathBack);

 								MoveFile(arFilePath[i].c_str(), tszFilePathDest);

 								mir_free(tszUtilRoot);

diff --git a/plugins/PackUpdater/Src/PackUpdater.cpp b/plugins/PackUpdater/Src/PackUpdater.cpp
index 2977472d72..c4e3a97cad 100644
--- a/plugins/PackUpdater/Src/PackUpdater.cpp
+++ b/plugins/PackUpdater/Src/PackUpdater.cpp
@@ -54,12 +54,12 @@ extern "C" __declspec(dllexport) int Load(void)
 {

 	mir_getLP(&pluginInfoEx);

 

-	TCHAR* tszFolder = Utils_ReplaceVarsT(_T("%miranda_userdata%\\" DEFAULT_UPDATES_FOLDER));

+	TCHAR *tszFolder = Utils_ReplaceVarsT(L"%miranda_userdata%\\" DEFAULT_UPDATES_FOLDER);

 	mir_tstrncpy(tszRoot, tszFolder, _countof(tszRoot));

 

-	hPackUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, LPGEN("Pack Updater"), MIRANDA_USERDATAT _T("\\")DEFAULT_UPDATES_FOLDER);

+	hPackUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, LPGEN("Pack Updater"), MIRANDA_USERDATAT L"\\" DEFAULT_UPDATES_FOLDER);

 	if (hPackUpdaterFolder)

-		FoldersGetCustomPathT(hPackUpdaterFolder, tszRoot, MAX_PATH, _T(""));

+		FoldersGetCustomPathT(hPackUpdaterFolder, tszRoot, MAX_PATH, L"");

 

 	mir_free(tszFolder);

 	LoadOptions();

diff --git a/plugins/PackUpdater/Src/Utils.cpp b/plugins/PackUpdater/Src/Utils.cpp
index b9c3506225..622ee25cab 100644
--- a/plugins/PackUpdater/Src/Utils.cpp
+++ b/plugins/PackUpdater/Src/Utils.cpp
@@ -173,7 +173,7 @@ BOOL IsPluginDisabled(TCHAR* filename)
 size_t getVer(const TCHAR* verStr)

 {

 	int v1 = 0, v2 = 0, v3 = 0, v4 = 0;

-	_stscanf(verStr, _T("%d.%d.%d.%d"), &v1, &v2, &v3, &v4);

+	_stscanf(verStr, L"%d.%d.%d.%d", &v1, &v2, &v3, &v4);

 	return v1 * 10000000 + v2 * 100000 + v3 * 1000 + v4;

 }

 

@@ -206,7 +206,7 @@ static void CheckUpdates(void *)
 	// Download version info

 	pFileUrl = (FILEURL *)mir_alloc(sizeof(*pFileUrl));

 	mir_tstrncpy(pFileUrl->tszDownloadURL, tszDownloadURL, _countof(pFileUrl->tszDownloadURL));

-	mir_sntprintf(tszBuff, _T("%s\\tmp.ini"), tszRoot);

+	mir_sntprintf(tszBuff, L"%s\\tmp.ini", tszRoot);

 	mir_tstrncpy(pFileUrl->tszDiskPath, tszBuff, _countof(pFileUrl->tszDiskPath));

 	mir_tstrncpy(tszTmpIni, tszBuff, _countof(tszTmpIni));

 	Title = TranslateT("Pack Updater");

@@ -219,34 +219,34 @@ static void CheckUpdates(void *)
 	}

 

 	for (CurrentFile = 0; CurrentFile < FileCount; CurrentFile++) {

-		FILEINFO FileInfo = { _T(""), _T(""), _T(""), _T(""), _T(""), _T(""), _T(""), { _T(""), _T("") } };

+		FILEINFO FileInfo = { L"", L"", L"", L"", L"", L"", L"", { L"", L"" } };

 

 		mir_snprintf(szKey, "File_%d_CurrentVersion", CurrentFile + 1);

 		ptrT tszCurVer(db_get_tsa(NULL, MODNAME, szKey));

 		if (tszCurVer)

 			mir_tstrncpy(FileInfo.tszCurVer, tszCurVer, _countof(FileInfo.tszCurVer));

 		else 

-			mir_tstrncpy(FileInfo.tszCurVer, _T(""), _countof(FileInfo.tszCurVer));

+			mir_tstrncpy(FileInfo.tszCurVer, L"", _countof(FileInfo.tszCurVer));

 

 		mir_snprintf(szKey, "File_%d_LastVersion", CurrentFile + 1);

 		ptrT tszLastVer(db_get_tsa(NULL, MODNAME, szKey));

 		if (tszLastVer)

 			mir_tstrncpy(FileInfo.tszLastVer, tszLastVer, _countof(FileInfo.tszLastVer));

 		else

-			mir_tstrncpy(FileInfo.tszLastVer, _T(""), _countof(FileInfo.tszLastVer));

+			mir_tstrncpy(FileInfo.tszLastVer, L"", _countof(FileInfo.tszLastVer));

 

 		Files.push_back(FileInfo);

 

 		// Read version info

-		mir_sntprintf(tszFileInfo, _T("FileInfo_%d"), CurrentFile + 1);

-		GetPrivateProfileString(tszFileInfo, _T("FileVersion"), _T(""), Files[CurrentFile].tszNewVer, _countof(Files[CurrentFile].tszNewVer), tszTmpIni);

-		GetPrivateProfileString(tszFileInfo, _T("Message"), _T(""), Files[CurrentFile].tszMessage, _countof(Files[CurrentFile].tszMessage), tszTmpIni);

-		GetPrivateProfileString(tszFileInfo, _T("DownloadURL"), _T(""), Files[CurrentFile].File.tszDownloadURL, _countof(Files[CurrentFile].File.tszDownloadURL), tszTmpIni);

-		GetPrivateProfileString(tszFileInfo, _T("AdvFolder"), _T(""), Files[CurrentFile].tszAdvFolder, _countof(Files[CurrentFile].tszAdvFolder), tszTmpIni);

-		GetPrivateProfileString(tszFileInfo, _T("Descr"), _T(""), Files[CurrentFile].tszDescr, _countof(Files[CurrentFile].tszDescr), tszTmpIni);

-		GetPrivateProfileString(tszFileInfo, _T("DiskFileName"), _T(""), tszBuff, MAX_PATH, tszTmpIni);

-

-		if (_tcsstr(tszBuff, _T("\\"))) { //check update name

+		mir_sntprintf(tszFileInfo, L"FileInfo_%d", CurrentFile + 1);

+		GetPrivateProfileString(tszFileInfo, L"FileVersion", L"", Files[CurrentFile].tszNewVer, _countof(Files[CurrentFile].tszNewVer), tszTmpIni);

+		GetPrivateProfileString(tszFileInfo, L"Message", L"", Files[CurrentFile].tszMessage, _countof(Files[CurrentFile].tszMessage), tszTmpIni);

+		GetPrivateProfileString(tszFileInfo, L"DownloadURL", L"", Files[CurrentFile].File.tszDownloadURL, _countof(Files[CurrentFile].File.tszDownloadURL), tszTmpIni);

+		GetPrivateProfileString(tszFileInfo, L"AdvFolder", L"", Files[CurrentFile].tszAdvFolder, _countof(Files[CurrentFile].tszAdvFolder), tszTmpIni);

+		GetPrivateProfileString(tszFileInfo, L"Descr", L"", Files[CurrentFile].tszDescr, _countof(Files[CurrentFile].tszDescr), tszTmpIni);

+		GetPrivateProfileString(tszFileInfo, L"DiskFileName", L"", tszBuff, MAX_PATH, tszTmpIni);

+

+		if (_tcsstr(tszBuff, L"\\")) { //check update name

 			Title = TranslateT("Pack Updater");

 			Text = TranslateT("Name of Update's file is not supported.");

 			if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED)) {

@@ -258,16 +258,16 @@ static void CheckUpdates(void *)
 			continue;

 		} // end check update name

 		mir_tstrncpy(Files[CurrentFile].File.tszDiskPath, tszBuff, _countof(Files[CurrentFile].File.tszDiskPath));

-		GetPrivateProfileString(tszFileInfo, _T("InfoURL"), _T(""), Files[CurrentFile].tszInfoURL, _countof(Files[CurrentFile].tszInfoURL), tszTmpIni);

-		Files[CurrentFile].FileType = GetPrivateProfileInt(tszFileInfo, _T("FileType"), 0, tszTmpIni);

-		Files[CurrentFile].Force = GetPrivateProfileInt(tszFileInfo, _T("Force"), 0, tszTmpIni);

+		GetPrivateProfileString(tszFileInfo, L"InfoURL", L"", Files[CurrentFile].tszInfoURL, _countof(Files[CurrentFile].tszInfoURL), tszTmpIni);

+		Files[CurrentFile].FileType = GetPrivateProfileInt(tszFileInfo, L"FileType", 0, tszTmpIni);

+		Files[CurrentFile].Force = GetPrivateProfileInt(tszFileInfo, L"Force", 0, tszTmpIni);

 		Files[CurrentFile].FileNum = CurrentFile + 1;

 

 		if (Files[CurrentFile].FileType == 2) {

-			if (mir_tstrcmp(Files[CurrentFile].tszAdvFolder, _T("")) == 0)

-				mir_sntprintf(tszBuff, _T("Plugins\\%s"), Files[CurrentFile].File.tszDiskPath);

+			if (mir_tstrcmp(Files[CurrentFile].tszAdvFolder, L"") == 0)

+				mir_sntprintf(tszBuff, L"Plugins\\%s", Files[CurrentFile].File.tszDiskPath);

 			else

-				mir_sntprintf(tszBuff, _T("Plugins\\%s\\%s"), Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath);

+				mir_sntprintf(tszBuff, L"Plugins\\%s\\%s", Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath);

 			TCHAR pluginFolderName[MAX_PATH];

 			PathToAbsoluteT(tszBuff, pluginFolderName);

 			if (!Files[CurrentFile].Force && (IsPluginDisabled(Files[CurrentFile].File.tszDiskPath) || !Exists(pluginFolderName))) //check if plugin disabled or not exists

@@ -275,8 +275,8 @@ static void CheckUpdates(void *)
 		}

 		// Compare versions

 		if (getVer(Files[CurrentFile].tszCurVer) < getVer(Files[CurrentFile].tszNewVer)) { // Yeah, we've got new version.

-			VARST tszSysRoot(_T("%SystemRoot%"));

-			VARST tszProgFiles(_T("%ProgramFiles%"));

+			VARST tszSysRoot(L"%SystemRoot%");

+			VARST tszProgFiles(L"%ProgramFiles%");

 

 			if (Files[CurrentFile].FileType != 1 && !IsUserAnAdmin() && (_tcsstr(tszRoot, tszSysRoot) || _tcsstr(tszRoot, tszProgFiles))) {

 				MessageBox(NULL, TranslateT("Update is not possible!\nYou have no Administrator's rights.\nPlease run Miranda NG with Administrator's rights."), Title, MB_ICONINFORMATION);

@@ -292,28 +292,28 @@ static void CheckUpdates(void *)
 			case 1:

 				break;

 			case 2: {

-				VARST tszUtilRootPlug(_T("%miranda_path%\\Plugins"));

-				if (mir_tstrcmp(Files[CurrentFile].tszAdvFolder, _T("")) == 0)

-					mir_sntprintf(tszFilePathDest, _T("%s\\%s"), tszUtilRootPlug, Files[CurrentFile].File.tszDiskPath);

+				VARST tszUtilRootPlug(L"%miranda_path%\\Plugins");

+				if (mir_tstrcmp(Files[CurrentFile].tszAdvFolder, L"") == 0)

+					mir_sntprintf(tszFilePathDest, L"%s\\%s", tszUtilRootPlug, Files[CurrentFile].File.tszDiskPath);

 				else

-					mir_sntprintf(tszFilePathDest, _T("%s\\%s\\%s"), tszUtilRootPlug, Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath);

+					mir_sntprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRootPlug, Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath);

 				}

 				break;

 			case 3: {

-				VARST tszUtilRootIco(_T("%miranda_path%\\Icons"));

-				if (mir_tstrcmp(Files[CurrentFile].tszAdvFolder, _T("")) == 0)

-					mir_sntprintf(tszFilePathDest, _T("%s\\%s"), tszUtilRootIco, Files[CurrentFile].File.tszDiskPath);

+				VARST tszUtilRootIco(L"%miranda_path%\\Icons");

+				if (mir_tstrcmp(Files[CurrentFile].tszAdvFolder, L"") == 0)

+					mir_sntprintf(tszFilePathDest, L"%s\\%s", tszUtilRootIco, Files[CurrentFile].File.tszDiskPath);

 				else

-					mir_sntprintf(tszFilePathDest, _T("%s\\%s\\%s"), tszUtilRootIco, Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath);

+					mir_sntprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRootIco, Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath);

 				}

 				break;

 			case 4:

 			case 5: {

-				TCHAR *tszUtilRoot = VARST(_T("%miranda_path%"));

-				if (mir_tstrcmp(Files[CurrentFile].tszAdvFolder, _T("")) == 0)

-					mir_sntprintf(tszFilePathDest, _T("%s\\%s"), tszUtilRoot, Files[CurrentFile].File.tszDiskPath);

+				TCHAR *tszUtilRoot = VARST(L"%miranda_path%");

+				if (mir_tstrcmp(Files[CurrentFile].tszAdvFolder, L"") == 0)

+					mir_sntprintf(tszFilePathDest, L"%s\\%s", tszUtilRoot, Files[CurrentFile].File.tszDiskPath);

 				else

-					mir_sntprintf(tszFilePathDest, _T("%s\\%s\\%s"), tszUtilRoot, Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath);

+					mir_sntprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRoot, Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath);

 				}

 				break;

 			}//end* switch (Files[CurrentFile].FileType)