From 7f7252104c054002c8b30636ac0b327e915e7b6d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 17 Nov 2016 22:30:41 +0300 Subject: Utils_OpenUrlT Utils_ReplaceVarsT --- plugins/PackUpdater/Src/Notifications.cpp | 10 +++++----- plugins/PackUpdater/Src/PackUpdater.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/PackUpdater') diff --git a/plugins/PackUpdater/Src/Notifications.cpp b/plugins/PackUpdater/Src/Notifications.cpp index 98633872c8..ad2d76124a 100644 --- a/plugins/PackUpdater/Src/Notifications.cpp +++ b/plugins/PackUpdater/Src/Notifications.cpp @@ -450,7 +450,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam CallFunctionAsync(ExitMe, 0); break; case 2: - tszUtilRootPlug = Utils_ReplaceVarsT(L"%miranda_path%\\Plugins"); + tszUtilRootPlug = Utils_ReplaceVarsW(L"%miranda_path%\\Plugins"); if (mir_wstrcmp(arAdvFolder[i].c_str(), L"") == 0) mir_snwprintf(tszFilePathDest, L"%s\\%s", tszUtilRootPlug, arFileName[i].c_str()); else @@ -463,7 +463,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam CallFunctionAsync(RestartMe, 0); break; case 3: - tszUtilRootIco = Utils_ReplaceVarsT(L"%miranda_path%\\Icons"); + tszUtilRootIco = Utils_ReplaceVarsW(L"%miranda_path%\\Icons"); if (mir_wstrcmp(arAdvFolder[i].c_str(), L"") == 0) mir_snwprintf(tszFilePathDest, L"%s\\%s", tszUtilRootIco, arFileName[i].c_str()); else @@ -476,7 +476,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam CallFunctionAsync(RestartMe, 0); break; case 4: - tszUtilRoot = Utils_ReplaceVarsT(L"%miranda_path%"); + tszUtilRoot = Utils_ReplaceVarsW(L"%miranda_path%"); if (mir_wstrcmp(arAdvFolder[i].c_str(), L"") == 0) mir_snwprintf(tszFilePathDest, L"%s\\%s", tszUtilRoot, arFileName[i].c_str()); else @@ -489,7 +489,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam CallFunctionAsync(RestartMe, 0); break; case 5: - tszUtilRoot = Utils_ReplaceVarsT(L"%miranda_path%"); + tszUtilRoot = Utils_ReplaceVarsW(L"%miranda_path%"); if (mir_wstrcmp(arAdvFolder[i].c_str(), L"") == 0) mir_snwprintf(tszFilePathDest, L"%s\\%s", tszUtilRoot, arFileName[i].c_str()); else @@ -529,7 +529,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam case IDC_INFO: int sel = ListView_GetSelectionMark(hwndList); vector &todo = *(vector *)GetWindowLongPtr(hDlg, GWLP_USERDATA); - Utils_OpenUrlT(todo[sel].tszInfoURL); + Utils_OpenUrlW(todo[sel].tszInfoURL); } break; } diff --git a/plugins/PackUpdater/Src/PackUpdater.cpp b/plugins/PackUpdater/Src/PackUpdater.cpp index 3f8ee10e8d..b1557c9428 100644 --- a/plugins/PackUpdater/Src/PackUpdater.cpp +++ b/plugins/PackUpdater/Src/PackUpdater.cpp @@ -54,7 +54,7 @@ extern "C" __declspec(dllexport) int Load(void) { mir_getLP(&pluginInfoEx); - wchar_t *tszFolder = Utils_ReplaceVarsT(L"%miranda_userdata%\\" DEFAULT_UPDATES_FOLDER); + wchar_t *tszFolder = Utils_ReplaceVarsW(L"%miranda_userdata%\\" DEFAULT_UPDATES_FOLDER); mir_wstrncpy(tszRoot, tszFolder, _countof(tszRoot)); hPackUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, LPGEN("Pack Updater"), MIRANDA_USERDATAT L"\\" DEFAULT_UPDATES_FOLDER); -- cgit v1.2.3