new sorting functions applied

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

2 files changed, 16 insertions, 16 deletions

diff --git a/plugins/PackUpdater/Src/Notifications.cpp b/plugins/PackUpdater/Src/Notifications.cpp
index 081cae06b8..76f687eaee 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 (lstrcmp(todo[lvI.iItem].tszInfoURL, _T("")))

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

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

 						else

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

@@ -379,7 +379,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 							UpdatesCount++;

 

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

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

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

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

 								CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)szUrl);

 								mir_free(szUrl);

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

 					}

 

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

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

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

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

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

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

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

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

 						INT rc = -1;

 						Title = TranslateT("Pack Updater");

 						Text = tszBuff;

@@ -451,7 +451,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 									break;

 								case 2:

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

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

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

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

 									else

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

@@ -464,7 +464,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 									break;

 								case 3:

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

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

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

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

 									else

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

@@ -477,7 +477,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 									break;

 								case 4:

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

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

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

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

 									else

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

@@ -490,7 +490,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 									break;

 								case 5:

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

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

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

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

 									else

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

diff --git a/plugins/PackUpdater/Src/Utils.cpp b/plugins/PackUpdater/Src/Utils.cpp
index 7a92f49655..edb28607d1 100644
--- a/plugins/PackUpdater/Src/Utils.cpp
+++ b/plugins/PackUpdater/Src/Utils.cpp
@@ -196,7 +196,7 @@ static void CheckUpdates(void *)
 

 	// Load files info

 	db_get_ts(NULL, MODNAME, "File_VersionURL", &dbVar);

-	if (lstrcmp(dbVar.ptszVal, NULL) == 0) { // URL is not set

+	if (mir_tstrcmp(dbVar.ptszVal, NULL) == 0) { // URL is not set

 		Title=TranslateT("Pack Updater");

 		Text = TranslateT("URL for checking updates not found.");

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

@@ -230,7 +230,7 @@ static void CheckUpdates(void *)
 		dbVar.ptszVal = NULL;

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

 		db_get_ts(NULL, MODNAME, szKey, &dbVar);

-		if (lstrcmp(dbVar.ptszVal, NULL) == 0) {

+		if (mir_tstrcmp(dbVar.ptszVal, NULL) == 0) {

 			db_free(&dbVar);

 			mir_tstrncpy(FileInfo.tszCurVer, _T(""), SIZEOF(FileInfo.tszCurVer));

 		}

@@ -239,7 +239,7 @@ static void CheckUpdates(void *)
 		dbVar.ptszVal = NULL;

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

 		db_get_ts(NULL, MODNAME, szKey, &dbVar);

-		if (lstrcmp(dbVar.ptszVal, NULL) == 0) {

+		if (mir_tstrcmp(dbVar.ptszVal, NULL) == 0) {

 			db_free(&dbVar);

 			mir_tstrncpy(FileInfo.tszLastVer, _T(""), SIZEOF(FileInfo.tszLastVer));

 		}

@@ -275,7 +275,7 @@ static void CheckUpdates(void *)
 

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

 			TCHAR pluginFolgerName[MAX_PATH];

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

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

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

 			else

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

@@ -307,7 +307,7 @@ static void CheckUpdates(void *)
 				break;

 			case 2:

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

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

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

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

 				else

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

@@ -315,7 +315,7 @@ static void CheckUpdates(void *)
 				break;

 			case 3:

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

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

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

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

 				else

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

@@ -324,7 +324,7 @@ static void CheckUpdates(void *)
 			case 4:

 			case 5:

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

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

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

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

 				else

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