From 2f261839b60692e33d0e160344d0d636d49c90ba Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Jul 2016 14:23:31 +0000 Subject: less TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/PackUpdater/Src/Notifications.cpp | 78 +++++++++++++++---------------- plugins/PackUpdater/Src/PackUpdater.cpp | 2 +- plugins/PackUpdater/Src/Utils.cpp | 56 +++++++++++----------- 3 files changed, 68 insertions(+), 68 deletions(-) (limited to 'plugins/PackUpdater') diff --git a/plugins/PackUpdater/Src/Notifications.cpp b/plugins/PackUpdater/Src/Notifications.cpp index b22066e480..9670d9e905 100644 --- a/plugins/PackUpdater/Src/Notifications.cpp +++ b/plugins/PackUpdater/Src/Notifications.cpp @@ -115,8 +115,8 @@ void show_popup(HWND hDlg, LPCTSTR pszTitle, LPCTSTR pszText, int iNumber, int A pd.cbSize = sizeof(pd); pd.lchContact = NULL; //(HANDLE)wParam; pd.lchIcon = Skin_LoadIcon(PopupsList[iNumber].Icon); - mir_tstrncpy(pd.lptzText, pszText, _countof(pd.lptzText)); - mir_tstrncpy(pd.lptzContactName, pszTitle, _countof(pd.lptzContactName)); + mir_wstrncpy(pd.lptzText, pszText, _countof(pd.lptzText)); + mir_wstrncpy(pd.lptzContactName, pszTitle, _countof(pd.lptzContactName)); switch (MyOptions.DefColors) { case byCOLOR_WINDOWS: pd.colorBack = GetSysColor(COLOR_BTNFACE); @@ -179,7 +179,7 @@ static void __stdcall CreateDownloadDialog(void*) if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups3", DEFAULT_POPUP_ENABLED)) hDlgDld = CreateDialog(hInst, MAKEINTRESOURCE(IDD_POPUPDUMMI), NULL, DlgDownloadPop); else if (db_get_b(NULL, MODNAME, "Popups3M", DEFAULT_MESSAGE_ENABLED)) { - mir_tstrncpy(tszDialogMsg, Text, _countof(tszDialogMsg)); + mir_wstrncpy(tszDialogMsg, Text, _countof(tszDialogMsg)); hDlgDld = CreateDialog(hInst, MAKEINTRESOURCE(IDD_DOWNLOAD), NULL, DlgDownload); } } @@ -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, L"")) + if (mir_wstrcmp(todo[lvI.iItem].tszInfoURL, L"")) EnableWindow(GetDlgItem(hDlg, IDC_INFO), TRUE); else EnableWindow(GetDlgItem(hDlg, IDC_INFO), FALSE); @@ -349,38 +349,38 @@ 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, L"%s\\Pack", tszRoot); + mir_snwprintf(tszFileDest, L"%s\\Pack", tszRoot); CreateDirectory(tszFileDest, NULL); break; case 2: - mir_sntprintf(tszFileDest, L"%s\\Plugins", tszRoot); + mir_snwprintf(tszFileDest, L"%s\\Plugins", tszRoot); CreateDirectory(tszFileDest, NULL); break; case 3: - mir_sntprintf(tszFileDest, L"%s\\Icons", tszRoot); + mir_snwprintf(tszFileDest, L"%s\\Icons", tszRoot); CreateDirectory(tszFileDest, NULL); break; case 4: - mir_sntprintf(tszFileDest, L"%s\\Others", tszRoot); + mir_snwprintf(tszFileDest, L"%s\\Others", tszRoot); CreateDirectory(tszFileDest, NULL); break; case 5: - mir_sntprintf(tszFileDest, L"%s\\Others", tszRoot); + mir_snwprintf(tszFileDest, L"%s\\Others", tszRoot); CreateDirectory(tszFileDest, NULL); break; default: - mir_tstrncpy(tszFileDest, tszRoot, _countof(tszFileDest)); + mir_wstrncpy(tszFileDest, tszRoot, _countof(tszFileDest)); break; } - mir_sntprintf(tszBuff, L"%s\\Backups", tszRoot); + mir_snwprintf(tszBuff, L"%s\\Backups", tszRoot); CreateDirectory(tszBuff, NULL); - mir_tstrncpy(tszFileName, todo[i].File.tszDiskPath, _countof(tszFileName)); - mir_sntprintf(todo[i].File.tszDiskPath, L"%s\\%s", tszFileDest, tszFileName); + mir_wstrncpy(tszFileName, todo[i].File.tszDiskPath, _countof(tszFileName)); + mir_snwprintf(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, L".html") == 0) { - char* szUrl = mir_t2a(todo[i].File.tszDownloadURL); + tszExt = &todo[i].File.tszDownloadURL[mir_wstrlen(todo[i].File.tszDownloadURL) - 5]; + if (mir_wstrcmp(tszExt, L".html") == 0) { + char* szUrl = mir_u2a(todo[i].File.tszDownloadURL); Utils_OpenUrl(szUrl); mir_free(szUrl); } @@ -399,7 +399,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam continue; } } - mir_tstrncpy(todo[i].tszCurVer, todo[i].tszNewVer, _countof(todo[i].tszCurVer)); + mir_wstrncpy(todo[i].tszCurVer, todo[i].tszNewVer, _countof(todo[i].tszCurVer)); mir_snprintf(szKey, "File_%d_CurrentVersion", todo[i].FileNum); db_set_ts(NULL, MODNAME, szKey, todo[i].tszCurVer); arFileType.push_back(todo[i].FileType); @@ -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(), 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(), 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(), L".html") != 0) { + if (UpdatesCount > 1 && mir_wstrcmp(arExt[0].c_str(), L".html") != 0) + mir_wstrncpy(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_wstrcmp(arExt[0].c_str(), L".html") != 0) + mir_wstrncpy(tszBuff, TranslateT("Download complete. Start updating? All your data will be saved and Miranda NG will be closed."), _countof(tszBuff)); + if (UpdatesCount > 0 && mir_wstrcmp(arExt[0].c_str(), L".html") != 0) { INT rc = -1; Title = TranslateT("Pack Updater"); Text = tszBuff; @@ -451,11 +451,11 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam break; case 2: 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()); + if (mir_wstrcmp(arAdvFolder[i].c_str(), L"") == 0) + mir_snwprintf(tszFilePathDest, L"%s\\%s", tszUtilRootPlug, arFileName[i].c_str()); else - 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()); + mir_snwprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRootPlug, arAdvFolder[i].c_str(), arFileName[i].c_str()); + mir_snwprintf(tszFilePathBack, L"%s\\Backups\\%s", tszRoot, arFileName[i].c_str()); MoveFile(tszFilePathDest, tszFilePathBack); MoveFile(arFilePath[i].c_str(), tszFilePathDest); mir_free(tszUtilRootPlug); @@ -464,11 +464,11 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam break; case 3: 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()); + if (mir_wstrcmp(arAdvFolder[i].c_str(), L"") == 0) + mir_snwprintf(tszFilePathDest, L"%s\\%s", tszUtilRootIco, arFileName[i].c_str()); else - 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()); + mir_snwprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRootIco, arAdvFolder[i].c_str(), arFileName[i].c_str()); + mir_snwprintf(tszFilePathBack, L"%s\\Backups\\%s", tszRoot, arFileName[i].c_str()); MoveFile(tszFilePathDest, tszFilePathBack); MoveFile(arFilePath[i].c_str(), tszFilePathDest); mir_free(tszUtilRootIco); @@ -477,11 +477,11 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam break; case 4: 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()); + if (mir_wstrcmp(arAdvFolder[i].c_str(), L"") == 0) + mir_snwprintf(tszFilePathDest, L"%s\\%s", tszUtilRoot, arFileName[i].c_str()); else - 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()); + mir_snwprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRoot, arAdvFolder[i].c_str(), arFileName[i].c_str()); + mir_snwprintf(tszFilePathBack, L"%s\\Backups\\%s", tszRoot, arFileName[i].c_str()); MoveFile(tszFilePathDest, tszFilePathBack); MoveFile(arFilePath[i].c_str(), tszFilePathDest); mir_free(tszUtilRoot); @@ -490,11 +490,11 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam break; case 5: 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()); + if (mir_wstrcmp(arAdvFolder[i].c_str(), L"") == 0) + mir_snwprintf(tszFilePathDest, L"%s\\%s", tszUtilRoot, arFileName[i].c_str()); else - 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()); + mir_snwprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRoot, arAdvFolder[i].c_str(), arFileName[i].c_str()); + mir_snwprintf(tszFilePathBack, L"%s\\Backups\\%s", tszRoot, arFileName[i].c_str()); MoveFile(tszFilePathDest, tszFilePathBack); MoveFile(arFilePath[i].c_str(), tszFilePathDest); mir_free(tszUtilRoot); @@ -505,7 +505,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam else { //reminder for not installed pack update if (Reminder && (UpdatesCount == 1) && (arFileType[0] == 1)) db_set_b(NULL, MODNAME, "Reminder", 2); - mir_sntprintf(tszBuff, TranslateT("You have chosen not to install the pack update immediately.\nYou can install it manually from this location:\n\n%s"), arFilePath[0].c_str()); + mir_snwprintf(tszBuff, TranslateT("You have chosen not to install the pack update immediately.\nYou can install it manually from this location:\n\n%s"), arFilePath[0].c_str()); Title = TranslateT("Pack Updater"); Text = tszBuff; if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED)) { diff --git a/plugins/PackUpdater/Src/PackUpdater.cpp b/plugins/PackUpdater/Src/PackUpdater.cpp index eabc12dbba..d4df5c677f 100644 --- a/plugins/PackUpdater/Src/PackUpdater.cpp +++ b/plugins/PackUpdater/Src/PackUpdater.cpp @@ -55,7 +55,7 @@ extern "C" __declspec(dllexport) int Load(void) mir_getLP(&pluginInfoEx); wchar_t *tszFolder = Utils_ReplaceVarsT(L"%miranda_userdata%\\" DEFAULT_UPDATES_FOLDER); - mir_tstrncpy(tszRoot, tszFolder, _countof(tszRoot)); + mir_wstrncpy(tszRoot, tszFolder, _countof(tszRoot)); hPackUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, LPGEN("Pack Updater"), MIRANDA_USERDATAT L"\\" DEFAULT_UPDATES_FOLDER); if (hPackUpdaterFolder) diff --git a/plugins/PackUpdater/Src/Utils.cpp b/plugins/PackUpdater/Src/Utils.cpp index 62fa5d83e1..b555e97d37 100644 --- a/plugins/PackUpdater/Src/Utils.cpp +++ b/plugins/PackUpdater/Src/Utils.cpp @@ -112,7 +112,7 @@ BOOL DownloadFile(LPCTSTR tszURL, LPCTSTR tszLocal) nlhr.cbSize = sizeof(nlhr); nlhr.requestType = REQUEST_GET; nlhr.flags = NLHRF_REDIRECT | NLHRF_DUMPASTEXT | NLHRF_HTTP11; - char* szUrl = mir_t2a(tszURL); + char* szUrl = mir_u2a(tszURL); nlhr.szUrl = szUrl; nlhr.headersCount = 4; nlhr.headers = (NETLIBHTTPHEADER*)mir_alloc(sizeof(NETLIBHTTPHEADER)*nlhr.headersCount); @@ -164,7 +164,7 @@ BOOL Exists(LPCTSTR strName) BOOL IsPluginDisabled(wchar_t* filename) { - char* fname = mir_t2a(filename); + char* fname = mir_u2a(filename); int res = db_get_b(NULL, "PluginDisable", fname, 0); mir_free(fname); return res; @@ -190,7 +190,7 @@ static void CheckUpdates(void *) FileCount = db_get_dw(NULL, MODNAME, "FileCount", DEFAULT_FILECOUNT); // Load files info - ptrT tszDownloadURL(db_get_tsa(NULL, MODNAME, "File_VersionURL")); + ptrW tszDownloadURL(db_get_tsa(NULL, MODNAME, "File_VersionURL")); if (!tszDownloadURL) { // URL is not set Title = TranslateT("Pack Updater"); Text = TranslateT("URL for checking updates not found."); @@ -205,10 +205,10 @@ static void CheckUpdates(void *) } // Download version info pFileUrl = (FILEURL *)mir_alloc(sizeof(*pFileUrl)); - mir_tstrncpy(pFileUrl->tszDownloadURL, tszDownloadURL, _countof(pFileUrl->tszDownloadURL)); - mir_sntprintf(tszBuff, L"%s\\tmp.ini", tszRoot); - mir_tstrncpy(pFileUrl->tszDiskPath, tszBuff, _countof(pFileUrl->tszDiskPath)); - mir_tstrncpy(tszTmpIni, tszBuff, _countof(tszTmpIni)); + mir_wstrncpy(pFileUrl->tszDownloadURL, tszDownloadURL, _countof(pFileUrl->tszDownloadURL)); + mir_snwprintf(tszBuff, L"%s\\tmp.ini", tszRoot); + mir_wstrncpy(pFileUrl->tszDiskPath, tszBuff, _countof(pFileUrl->tszDiskPath)); + mir_wstrncpy(tszTmpIni, tszBuff, _countof(tszTmpIni)); Title = TranslateT("Pack Updater"); Text = TranslateT("Downloading version info..."); DlgDownloadProc(); @@ -222,23 +222,23 @@ static void CheckUpdates(void *) 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)); + ptrW tszCurVer(db_get_tsa(NULL, MODNAME, szKey)); if (tszCurVer) - mir_tstrncpy(FileInfo.tszCurVer, tszCurVer, _countof(FileInfo.tszCurVer)); + mir_wstrncpy(FileInfo.tszCurVer, tszCurVer, _countof(FileInfo.tszCurVer)); else - mir_tstrncpy(FileInfo.tszCurVer, L"", _countof(FileInfo.tszCurVer)); + mir_wstrncpy(FileInfo.tszCurVer, L"", _countof(FileInfo.tszCurVer)); mir_snprintf(szKey, "File_%d_LastVersion", CurrentFile + 1); - ptrT tszLastVer(db_get_tsa(NULL, MODNAME, szKey)); + ptrW tszLastVer(db_get_tsa(NULL, MODNAME, szKey)); if (tszLastVer) - mir_tstrncpy(FileInfo.tszLastVer, tszLastVer, _countof(FileInfo.tszLastVer)); + mir_wstrncpy(FileInfo.tszLastVer, tszLastVer, _countof(FileInfo.tszLastVer)); else - mir_tstrncpy(FileInfo.tszLastVer, L"", _countof(FileInfo.tszLastVer)); + mir_wstrncpy(FileInfo.tszLastVer, L"", _countof(FileInfo.tszLastVer)); Files.push_back(FileInfo); // Read version info - mir_sntprintf(tszFileInfo, L"FileInfo_%d", CurrentFile + 1); + mir_snwprintf(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); @@ -257,17 +257,17 @@ static void CheckUpdates(void *) MessageBox(NULL, Text, Title, MB_ICONINFORMATION); continue; } // end check update name - mir_tstrncpy(Files[CurrentFile].File.tszDiskPath, tszBuff, _countof(Files[CurrentFile].File.tszDiskPath)); + mir_wstrncpy(Files[CurrentFile].File.tszDiskPath, tszBuff, _countof(Files[CurrentFile].File.tszDiskPath)); 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, L"") == 0) - mir_sntprintf(tszBuff, L"Plugins\\%s", Files[CurrentFile].File.tszDiskPath); + if (mir_wstrcmp(Files[CurrentFile].tszAdvFolder, L"") == 0) + mir_snwprintf(tszBuff, L"Plugins\\%s", Files[CurrentFile].File.tszDiskPath); else - mir_sntprintf(tszBuff, L"Plugins\\%s\\%s", Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath); + mir_snwprintf(tszBuff, L"Plugins\\%s\\%s", Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath); wchar_t pluginFolderName[MAX_PATH]; PathToAbsoluteT(tszBuff, pluginFolderName); if (!Files[CurrentFile].Force && (IsPluginDisabled(Files[CurrentFile].File.tszDiskPath) || !Exists(pluginFolderName))) //check if plugin disabled or not exists @@ -293,27 +293,27 @@ static void CheckUpdates(void *) break; case 2: { 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); + if (mir_wstrcmp(Files[CurrentFile].tszAdvFolder, L"") == 0) + mir_snwprintf(tszFilePathDest, L"%s\\%s", tszUtilRootPlug, Files[CurrentFile].File.tszDiskPath); else - mir_sntprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRootPlug, Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath); + mir_snwprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRootPlug, Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath); } break; case 3: { 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); + if (mir_wstrcmp(Files[CurrentFile].tszAdvFolder, L"") == 0) + mir_snwprintf(tszFilePathDest, L"%s\\%s", tszUtilRootIco, Files[CurrentFile].File.tszDiskPath); else - mir_sntprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRootIco, Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath); + mir_snwprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRootIco, Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath); } break; case 4: case 5: { wchar_t *tszUtilRoot = VARST(L"%miranda_path%"); - if (mir_tstrcmp(Files[CurrentFile].tszAdvFolder, L"") == 0) - mir_sntprintf(tszFilePathDest, L"%s\\%s", tszUtilRoot, Files[CurrentFile].File.tszDiskPath); + if (mir_wstrcmp(Files[CurrentFile].tszAdvFolder, L"") == 0) + mir_snwprintf(tszFilePathDest, L"%s\\%s", tszUtilRoot, Files[CurrentFile].File.tszDiskPath); else - mir_sntprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRoot, Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath); + mir_snwprintf(tszFilePathDest, L"%s\\%s\\%s", tszUtilRoot, Files[CurrentFile].tszAdvFolder, Files[CurrentFile].File.tszDiskPath); } break; }//end* switch (Files[CurrentFile].FileType) @@ -321,7 +321,7 @@ static void CheckUpdates(void *) if (Files[CurrentFile].Force || Exists(tszFilePathDest)) UpdateFiles.push_back(Files[CurrentFile]); // Save last version - mir_tstrncpy(Files[CurrentFile].tszLastVer, Files[CurrentFile].tszNewVer, _countof(Files[CurrentFile].tszLastVer)); + mir_wstrncpy(Files[CurrentFile].tszLastVer, Files[CurrentFile].tszNewVer, _countof(Files[CurrentFile].tszLastVer)); mir_snprintf(szKey, "File_%d_LastVersion", CurrentFile + 1); db_set_ts(NULL, MODNAME, szKey, Files[CurrentFile].tszLastVer); } // end compare versions -- cgit v1.2.3