From ddd1af0fdf37364c9472faedad941b4cc5f1b465 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Jul 2016 11:50:07 +0000 Subject: removed from git-svn-id: http://svn.miranda-ng.org/main/trunk@17136 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/PluginUpdater/src/DlgUpdate.cpp | 10 +++++----- plugins/PluginUpdater/src/Options.cpp | 24 ++++++++++++------------ plugins/PluginUpdater/src/PluginUpdater.cpp | 6 +++--- plugins/PluginUpdater/src/Utils.cpp | 2 +- plugins/PluginUpdater/src/stdafx.h | 6 +++--- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'plugins/PluginUpdater/src') diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index f09070bd43..27f8377952 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -109,7 +109,7 @@ static void ApplyUpdates(void *param) else { // if file name differs, we also need to backup the old file here // otherwise it would be replaced by unzip - if ( _tcsicmp(p.tszOldName, p.tszNewName)) { + if ( wcsicmp(p.tszOldName, p.tszNewName)) { wchar_t tszSrcPath[MAX_PATH], tszBackFile[MAX_PATH]; mir_sntprintf(tszSrcPath, L"%s\\%s", tszMirandaPath, p.tszOldName); mir_sntprintf(tszBackFile, L"%s\\%s", tszFileBack, p.tszOldName); @@ -459,7 +459,7 @@ static void DlgUpdateSilent(void *param) else { // if file name differs, we also need to backup the old file here // otherwise it would be replaced by unzip - if (_tcsicmp(p.tszOldName, p.tszNewName)) { + if (wcsicmp(p.tszOldName, p.tszNewName)) { wchar_t tszSrcPath[MAX_PATH], tszBackFile[MAX_PATH]; mir_sntprintf(tszSrcPath, L"%s\\%s", tszMirandaPath, p.tszOldName); mir_sntprintf(tszBackFile, L"%s\\%s", tszFileBack, p.tszOldName); @@ -478,7 +478,7 @@ static void DlgUpdateSilent(void *param) #if MIRANDA_VER < 0x0A00 // 4) Change title of clist ptrT title = db_get_tsa(NULL, "CList", "TitleText"); - if (!_tcsicmp(title, L"Miranda IM")) + if (!wcsicmp(title, L"Miranda IM")) db_set_ts(NULL, "CList", "TitleText", L"Miranda NG"); #endif @@ -629,13 +629,13 @@ static bool isValidExtension(const wchar_t *ptszFileName) { const wchar_t *pExt = wcsrchr(ptszFileName, '.'); - return (pExt != NULL) && (!_tcsicmp(pExt, L".dll") || !_tcsicmp(pExt, L".exe") || !_tcsicmp(pExt, L".txt")); + return (pExt != NULL) && (!wcsicmp(pExt, L".dll") || !wcsicmp(pExt, L".exe") || !wcsicmp(pExt, L".txt")); } // We only scan subfolders "Plugins", "Icons", "Languages", "Libs", "Core" static bool isValidDirectory(const wchar_t *ptszDirName) { - return !_tcsicmp(ptszDirName, L"Plugins") || !_tcsicmp(ptszDirName, L"Icons") || !_tcsicmp(ptszDirName, L"Languages") || !_tcsicmp(ptszDirName, L"Libs") || !_tcsicmp(ptszDirName, L"Core"); + return !wcsicmp(ptszDirName, L"Plugins") || !wcsicmp(ptszDirName, L"Icons") || !wcsicmp(ptszDirName, L"Languages") || !wcsicmp(ptszDirName, L"Libs") || !wcsicmp(ptszDirName, L"Core"); } // Scans folders recursively diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp index 1e379e7264..5d54e559fe 100644 --- a/plugins/PluginUpdater/src/Options.cpp +++ b/plugins/PluginUpdater/src/Options.cpp @@ -56,13 +56,13 @@ wchar_t* GetDefaultUrl() wchar_t url[MAX_PATH]; switch (GetUpdateMode()) { case UPDATE_MODE_STABLE: - mir_sntprintf(url, _T(DEFAULT_UPDATE_URL), opts.bChangePlatform ? DEFAULT_OPP_BITS : DEFAULT_BITS); + mir_sntprintf(url, DEFAULT_UPDATE_URL, opts.bChangePlatform ? DEFAULT_OPP_BITS : DEFAULT_BITS); return mir_tstrdup(url); case UPDATE_MODE_TRUNK: - mir_sntprintf(url, _T(DEFAULT_UPDATE_URL_TRUNK), opts.bChangePlatform ? DEFAULT_OPP_BITS : DEFAULT_BITS); + mir_sntprintf(url, DEFAULT_UPDATE_URL_TRUNK, opts.bChangePlatform ? DEFAULT_OPP_BITS : DEFAULT_BITS); return mir_tstrdup(url); case UPDATE_MODE_TRUNK_SYMBOLS: - mir_sntprintf(url, _T(DEFAULT_UPDATE_URL_TRUNK_SYMBOLS), opts.bChangePlatform ? DEFAULT_OPP_BITS : DEFAULT_BITS); + mir_sntprintf(url, DEFAULT_UPDATE_URL_TRUNK_SYMBOLS, opts.bChangePlatform ? DEFAULT_OPP_BITS : DEFAULT_BITS); return mir_tstrdup(url); default: return db_get_tsa(NULL, MODNAME, DB_SETTING_UPDATE_URL); @@ -121,17 +121,17 @@ static INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wPar switch (GetUpdateMode()) { case UPDATE_MODE_STABLE: - mir_sntprintf(defurl, _T(DEFAULT_UPDATE_URL), GetBits(hwndDlg)); + mir_sntprintf(defurl, DEFAULT_UPDATE_URL, GetBits(hwndDlg)); SetDlgItemText(hwndDlg, IDC_CUSTOMURL, defurl); CheckDlgButton(hwndDlg, IDC_STABLE, BST_CHECKED); break; case UPDATE_MODE_TRUNK: - mir_sntprintf(defurl, _T(DEFAULT_UPDATE_URL_TRUNK), GetBits(hwndDlg)); + mir_sntprintf(defurl, DEFAULT_UPDATE_URL_TRUNK, GetBits(hwndDlg)); SetDlgItemText(hwndDlg, IDC_CUSTOMURL, defurl); CheckDlgButton(hwndDlg, IDC_TRUNK, BST_CHECKED); break; case UPDATE_MODE_TRUNK_SYMBOLS: - mir_sntprintf(defurl, _T(DEFAULT_UPDATE_URL_TRUNK_SYMBOLS), GetBits(hwndDlg)); + mir_sntprintf(defurl, DEFAULT_UPDATE_URL_TRUNK_SYMBOLS, GetBits(hwndDlg)); SetDlgItemText(hwndDlg, IDC_CUSTOMURL, defurl); CheckDlgButton(hwndDlg, IDC_TRUNK_SYMBOLS, BST_CHECKED); break; @@ -181,7 +181,7 @@ static INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wPar case IDC_TRUNK_SYMBOLS: EnableWindow(GetDlgItem(hwndDlg, IDC_CHANGE_PLATFORM), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_CUSTOMURL), FALSE); - mir_sntprintf(defurl, _T(DEFAULT_UPDATE_URL_TRUNK_SYMBOLS), GetBits(hwndDlg)); + mir_sntprintf(defurl, DEFAULT_UPDATE_URL_TRUNK_SYMBOLS, GetBits(hwndDlg)); SetDlgItemText(hwndDlg, IDC_CUSTOMURL, defurl); SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; @@ -189,7 +189,7 @@ static INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wPar case IDC_TRUNK: EnableWindow(GetDlgItem(hwndDlg, IDC_CHANGE_PLATFORM), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_CUSTOMURL), FALSE); - mir_sntprintf(defurl, _T(DEFAULT_UPDATE_URL_TRUNK), GetBits(hwndDlg)); + mir_sntprintf(defurl, DEFAULT_UPDATE_URL_TRUNK, GetBits(hwndDlg)); SetDlgItemText(hwndDlg, IDC_CUSTOMURL, defurl); SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; @@ -197,7 +197,7 @@ static INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wPar case IDC_STABLE: EnableWindow(GetDlgItem(hwndDlg, IDC_CHANGE_PLATFORM), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_CUSTOMURL), FALSE); - mir_sntprintf(defurl, _T(DEFAULT_UPDATE_URL), GetBits(hwndDlg)); + mir_sntprintf(defurl, DEFAULT_UPDATE_URL, GetBits(hwndDlg)); SetDlgItemText(hwndDlg, IDC_CUSTOMURL, defurl); SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; @@ -227,15 +227,15 @@ static INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wPar case IDC_CHANGE_PLATFORM: if (IsDlgButtonChecked(hwndDlg, IDC_STABLE)) { - mir_sntprintf(defurl, _T(DEFAULT_UPDATE_URL), GetBits(hwndDlg)); + mir_sntprintf(defurl, DEFAULT_UPDATE_URL, GetBits(hwndDlg)); SetDlgItemText(hwndDlg, IDC_CUSTOMURL, defurl); } else if (IsDlgButtonChecked(hwndDlg, IDC_TRUNK)) { - mir_sntprintf(defurl, _T(DEFAULT_UPDATE_URL_TRUNK), GetBits(hwndDlg)); + mir_sntprintf(defurl, DEFAULT_UPDATE_URL_TRUNK, GetBits(hwndDlg)); SetDlgItemText(hwndDlg, IDC_CUSTOMURL, defurl); } else if (IsDlgButtonChecked(hwndDlg, IDC_TRUNK_SYMBOLS)) { - mir_sntprintf(defurl, _T(DEFAULT_UPDATE_URL_TRUNK_SYMBOLS), GetBits(hwndDlg)); + mir_sntprintf(defurl, DEFAULT_UPDATE_URL_TRUNK_SYMBOLS, GetBits(hwndDlg)); SetDlgItemText(hwndDlg, IDC_CUSTOMURL, defurl); } SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp index a10066806b..d5b1b23564 100644 --- a/plugins/PluginUpdater/src/PluginUpdater.cpp +++ b/plugins/PluginUpdater/src/PluginUpdater.cpp @@ -134,15 +134,15 @@ extern "C" __declspec(dllexport) int Load(void) if (-1 == db_get_b(0, MODNAME, DB_SETTING_UPDATE_MODE, -1)) { ptrT dbvUpdateURL(db_get_tsa(0, MODNAME, DB_SETTING_UPDATE_URL)); if (dbvUpdateURL) { - if (!_tcscmp(dbvUpdateURL, _T(DEFAULT_UPDATE_URL_OLD))) { + if (!wcscmp(dbvUpdateURL, _A2W(DEFAULT_UPDATE_URL_OLD))) { db_set_b(0, MODNAME, DB_SETTING_UPDATE_MODE, UPDATE_MODE_STABLE); db_unset(0, MODNAME, DB_SETTING_UPDATE_URL); } - else if (!_tcscmp(dbvUpdateURL, _T(DEFAULT_UPDATE_URL_TRUNK_OLD))) { + else if (!wcscmp(dbvUpdateURL, _A2W(DEFAULT_UPDATE_URL_TRUNK_OLD))) { db_set_b(0, MODNAME, DB_SETTING_UPDATE_MODE, UPDATE_MODE_TRUNK); db_unset(0, MODNAME, DB_SETTING_UPDATE_URL); } - else if (!_tcscmp(dbvUpdateURL, _T(DEFAULT_UPDATE_URL_TRUNK_SYMBOLS_OLD)L"/")) { + else if (!wcscmp(dbvUpdateURL, _A2W(DEFAULT_UPDATE_URL_TRUNK_SYMBOLS_OLD) L"/")) { db_set_b(0, MODNAME, DB_SETTING_UPDATE_MODE, UPDATE_MODE_TRUNK_SYMBOLS); db_unset(0, MODNAME, DB_SETTING_UPDATE_URL); } diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index b298f38345..00009c75d1 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -125,7 +125,7 @@ int Get_CRC(unsigned char* buffer, ULONG bufsize) int CompareHashes(const ServListEntry *p1, const ServListEntry *p2) { - return _tcsicmp(p1->m_name, p2->m_name); + return wcsicmp(p1->m_name, p2->m_name); } bool ParseHashes(const wchar_t *ptszUrl, ptrT &baseUrl, SERVLIST &arHashes) diff --git a/plugins/PluginUpdater/src/stdafx.h b/plugins/PluginUpdater/src/stdafx.h index 179f0c4879..2fa09762b7 100644 --- a/plugins/PluginUpdater/src/stdafx.h +++ b/plugins/PluginUpdater/src/stdafx.h @@ -104,9 +104,9 @@ extern struct PlugOptions #define DEFAULT_ONLYONCEADAY 1 #endif -#define DEFAULT_UPDATE_URL "http://miranda-ng.org/distr/stable/x%d" -#define DEFAULT_UPDATE_URL_TRUNK "http://miranda-ng.org/distr/x%d" -#define DEFAULT_UPDATE_URL_TRUNK_SYMBOLS "http://miranda-ng.org/distr/pdb_x%d" +#define DEFAULT_UPDATE_URL L"http://miranda-ng.org/distr/stable/x%d" +#define DEFAULT_UPDATE_URL_TRUNK L"http://miranda-ng.org/distr/x%d" +#define DEFAULT_UPDATE_URL_TRUNK_SYMBOLS L"http://miranda-ng.org/distr/pdb_x%d" #define FILENAME_X64 L"miranda64.exe" -- cgit v1.2.3