diff options
51 files changed, 85 insertions, 89 deletions
diff --git a/include/m_utils.h b/include/m_utils.h index 066b328cc9..694e87715f 100644 --- a/include/m_utils.h +++ b/include/m_utils.h @@ -50,8 +50,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. EXTERN_C MIR_CORE_DLL(void) Utils_OpenUrl(const char *pszUrl, bool bOpenInNewWindow = true);
EXTERN_C MIR_CORE_DLL(void) Utils_OpenUrlW(const wchar_t *pszUrl, bool bOpenInNewWindow = true);
-#define Utils_OpenUrlT Utils_OpenUrlW
-
/////////////////////////////////////////////////////////////////////////////////////////
// Resizes a dialog by calling a custom routine to move the individual
// Returns 0 on success, or nonzero on failure
@@ -91,7 +89,7 @@ lParam = 0 Returns a pointer to the string containing the country name on success,
or NULL on failure
*/
-#define MS_UTILS_GETCOUNTRYBYNUMBER "Utils/GetCountryByNumber"
+#define MS_UTILS_GETCOUNTRYBYNUMBER "Utils/GetCountryByNumber"
/* Gets the name of a country given its ISO code v0.1.2.0+
wParam = (char*)ISOcode
@@ -99,7 +97,7 @@ lParam = 0 Returns a pointer to the string containing the country name on success,
or NULL on failure
*/
-#define MS_UTILS_GETCOUNTRYBYISOCODE "Utils/GetCountryByISOCode"
+#define MS_UTILS_GETCOUNTRYBYISOCODE "Utils/GetCountryByISOCode"
/* Gets the full list of country IDs v0.1.2.0+
wParam = (WPARAM)(int*)piCount
@@ -114,7 +112,7 @@ struct CountryListEntry { const char *szName;
char ISOcode[3];
};
-#define MS_UTILS_GETCOUNTRYLIST "Utils/GetCountryList"
+#define MS_UTILS_GETCOUNTRYLIST "Utils/GetCountryList"
/////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////// Window lists //////////////////////////////////////
@@ -354,8 +352,6 @@ struct REPLACEVARSARRAY EXTERN_C MIR_APP_DLL(char*) Utils_ReplaceVars(const char *szData, MCONTACT hContact = 0, REPLACEVARSARRAY *vars = NULL);
EXTERN_C MIR_APP_DLL(wchar_t*) Utils_ReplaceVarsW(const wchar_t *szData, MCONTACT hContact = 0, REPLACEVARSARRAY *vars = NULL);
-#define Utils_ReplaceVarsT Utils_ReplaceVarsW
-
#if defined(__cplusplus)
#if !defined(M_SYSTEM_CPP_H__)
#include "m_system_cpp.h"
diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index aadddd58d2..1f7e86af19 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -223,7 +223,7 @@ int ModulesLoaded(WPARAM, LPARAM) }
wchar_t *log = L"%miranda_logpath%\\BasicHistory\\ftplog.txt";
- wchar_t *logAbsolute = Utils_ReplaceVarsT(log);
+ wchar_t *logAbsolute = Utils_ReplaceVarsW(log);
Options::instance->ftpLogPath = logAbsolute;
mir_free(logAbsolute);
Options::instance->Load();
diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp index 3f2aa1c040..6d19adbe61 100644 --- a/plugins/BasicHistory/src/HistoryWindow.cpp +++ b/plugins/BasicHistory/src/HistoryWindow.cpp @@ -444,7 +444,7 @@ void ClickLink(HWND hwnd, ENLINK *penLink) tr.chrg = penLink->chrg;
tr.lpstrText = buf;
SendMessage(hwnd, EM_GETTEXTRANGE, 0, (LPARAM)& tr);
- Utils_OpenUrlT(tr.lpstrText, penLink->nmhdr.code == IDM_OPENNEW);
+ Utils_OpenUrlW(tr.lpstrText, penLink->nmhdr.code == IDM_OPENNEW);
}
}
}
diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index 6538e93bfc..cd73cb1b30 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -365,8 +365,8 @@ extern "C" int __declspec(dllexport) Load(void) mir_getLP(&pluginInfoEx);
- profname = Utils_ReplaceVarsT(L"%miranda_profilename%.dat");
- profpath = Utils_ReplaceVarsT(L"%miranda_userdata%");
+ profname = Utils_ReplaceVarsW(L"%miranda_profilename%.dat");
+ profpath = Utils_ReplaceVarsW(L"%miranda_userdata%");
if (catchcrashes && !needrestart)
mir_snwprintf(CrashLogFolder, TEXT("%s\\CrashLog"), profpath);
wcsncpy_s(VersionInfoFolder, profpath, _TRUNCATE);
diff --git a/plugins/CrashDumper/src/dumper.cpp b/plugins/CrashDumper/src/dumper.cpp index f802e4e33b..2b07c9766c 100644 --- a/plugins/CrashDumper/src/dumper.cpp +++ b/plugins/CrashDumper/src/dumper.cpp @@ -464,7 +464,7 @@ void PrintVersionInfo(CMStringW& buffer, unsigned flags) GetLanguageString(buffer);
buffer.Append(L"\r\n");
- wchar_t *profpathfull = Utils_ReplaceVarsT(profpath);
+ wchar_t *profpathfull = Utils_ReplaceVarsW(profpath);
if (flags & VI_FLAG_PRNVAR) {
GetFreeDiskString(profpathfull, buffer);
buffer.Append(L"\r\n");
diff --git a/plugins/Db_autobackups/src/backup.cpp b/plugins/Db_autobackups/src/backup.cpp index ee9383fdff..3438427ad8 100644 --- a/plugins/Db_autobackups/src/backup.cpp +++ b/plugins/Db_autobackups/src/backup.cpp @@ -194,7 +194,7 @@ int Backup(wchar_t *backup_filename) DWORD size = _countof(buffer);
bZip = options.use_zip != 0;
- backupfolder = Utils_ReplaceVarsT(options.folder);
+ backupfolder = Utils_ReplaceVarsW(options.folder);
// ensure the backup folder exists (either create it or return non-zero signifying error)
err = CreateDirectoryTreeW(backupfolder);
if (err != ERROR_ALREADY_EXISTS && err != 0) {
@@ -222,7 +222,7 @@ int Backup(wchar_t *backup_filename) SetDlgItemText(progress_dialog, IDC_PROGRESSMESSAGE, TranslateT("Copying database file..."));
mir_snwprintf(source_file, L"%s\\%s", profilePath, dbname);
- wchar_t *pathtmp = Utils_ReplaceVarsT(source_file);
+ wchar_t *pathtmp = Utils_ReplaceVarsW(source_file);
BOOL res = 0;
if (bZip)
{
diff --git a/plugins/Db_autobackups/src/main.cpp b/plugins/Db_autobackups/src/main.cpp index 13bf958c21..e768e1377e 100644 --- a/plugins/Db_autobackups/src/main.cpp +++ b/plugins/Db_autobackups/src/main.cpp @@ -81,7 +81,7 @@ static int ModulesLoad(WPARAM, LPARAM) mi.position = 500100001;
Menu_AddMainMenuItem(&mi);
- profilePath = Utils_ReplaceVarsT(L"%miranda_userdata%");
+ profilePath = Utils_ReplaceVarsW(L"%miranda_userdata%");
if (hFolder = FoldersRegisterCustomPathT(LPGEN("Database backups"), LPGEN("Backup folder"), DIR SUB_DIR)) {
HookEvent(ME_FOLDERS_PATH_CHANGED, FoldersGetBackupPath);
diff --git a/plugins/Db_autobackups/src/options.cpp b/plugins/Db_autobackups/src/options.cpp index 7d1fdeaaab..bd09bf703d 100644 --- a/plugins/Db_autobackups/src/options.cpp +++ b/plugins/Db_autobackups/src/options.cpp @@ -43,7 +43,7 @@ int LoadOptions(void) DBVARIANT dbv;
if (!db_get_ws(0, "AutoBackups", "Folder", &dbv)) {
- wchar_t *tmp = Utils_ReplaceVarsT(dbv.ptszVal);
+ wchar_t *tmp = Utils_ReplaceVarsW(dbv.ptszVal);
if (mir_wstrlen(tmp) >= 2 && tmp[1] == ':')
wcsncpy_s(options.folder, dbv.ptszVal, _TRUNCATE);
@@ -87,7 +87,7 @@ int SaveOptions(void) else
db_set_ws(0, "AutoBackups", "Folder", options.folder);
- wchar_t *tmp = Utils_ReplaceVarsT(options.folder);
+ wchar_t *tmp = Utils_ReplaceVarsW(options.folder);
if (mir_wstrlen(tmp) < 2 || tmp[1] != ':') {
wcsncpy_s(prof_dir, options.folder, _TRUNCATE);
mir_snwprintf(options.folder, L"%s\\%s", profilePath, prof_dir);
@@ -171,7 +171,7 @@ int CALLBACK BrowseProc(HWND hwnd, UINT uMsg, LPARAM, LPARAM) switch (uMsg)
{
case BFFM_INITIALIZED:
- wchar_t *folder = Utils_ReplaceVarsT(options.folder);
+ wchar_t *folder = Utils_ReplaceVarsW(options.folder);
SendMessage(hwnd, BFFM_SETSELECTION, TRUE, (LPARAM)folder);
mir_free(folder);
break;
@@ -351,7 +351,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP {
wchar_t backupfolder[MAX_PATH] = { 0 };
BOOL folder_ok = TRUE;
- wchar_t *tmp = Utils_ReplaceVarsT(folder_buff);
+ wchar_t *tmp = Utils_ReplaceVarsW(folder_buff);
if (mir_wstrlen(tmp) >= 2 && tmp[1] == ':')
wcsncpy_s(backupfolder, tmp, _TRUNCATE);
diff --git a/plugins/Folders/src/services.cpp b/plugins/Folders/src/services.cpp index 59f91d0829..7dab3adde6 100644 --- a/plugins/Folders/src/services.cpp +++ b/plugins/Folders/src/services.cpp @@ -86,7 +86,7 @@ int InitServices() GetModuleFileName(GetModuleHandleA("mir_app.mir"), szMirandaPath, _countof(szMirandaPath));
pos = wcsrchr(szMirandaPath, '\\'); if (pos) *pos = 0;
- wchar_t *szTemp = Utils_ReplaceVarsT(L"%miranda_userdata%");
+ wchar_t *szTemp = Utils_ReplaceVarsW(L"%miranda_userdata%");
mir_snwprintf(szUserDataPath, szTemp);
mir_free(szTemp);
diff --git a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp index f17efc864a..762cd1819b 100644 --- a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp @@ -127,7 +127,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) ShellExecute(HWND_TOP, NULL, link, NULL, NULL, SW_SHOWNORMAL);
else {
bool openNewWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF) != 0xFF;
- Utils_OpenUrlT(link,openNewWindow);
+ Utils_OpenUrlW(link,openNewWindow);
}
mir_free(link);
break;
@@ -157,13 +157,13 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) if (wcsstr(link, L"mailto:") != NULL)
ShellExecute(HWND_TOP, NULL, link, NULL, NULL, SW_SHOWNORMAL);
else
- Utils_OpenUrlT(link,false);
+ Utils_OpenUrlW(link,false);
break;
case IDM_LINK_OPENNEW:
if (wcsstr(link, L"mailto:") != NULL)
ShellExecute(HWND_TOP, NULL, link, NULL, NULL, SW_SHOWNORMAL);
else
- Utils_OpenUrlT(link);
+ Utils_OpenUrlW(link);
break;
case IDM_LINK_COPY: {
if (!OpenClipboard(hDlg))
diff --git a/plugins/IEView/src/IEView.cpp b/plugins/IEView/src/IEView.cpp index 8a4cddba29..febf370288 100644 --- a/plugins/IEView/src/IEView.cpp +++ b/plugins/IEView/src/IEView.cpp @@ -170,7 +170,7 @@ void IEViewSink::BeforeNavigate2(IDispatch*, VARIANT* url, VARIANT*, VARIANT*, V #ifndef GECKO
if (mir_wstrcmp(url->bstrVal, L"about:blank"))
{
- Utils_OpenUrlT(url->bstrVal);
+ Utils_OpenUrlW(url->bstrVal);
*cancel = VARIANT_TRUE;
}
#endif
diff --git a/plugins/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp index a177685952..b4e6acffb7 100644 --- a/plugins/Import/src/miranda.cpp +++ b/plugins/Import/src/miranda.cpp @@ -119,7 +119,7 @@ INT_PTR CALLBACK MirandaPageProc(HWND hwndDlg, UINT message, WPARAM wParam, LPAR break;
case IDC_OTHER:
- ptrW pfd(Utils_ReplaceVarsT(L"%miranda_profilesdir%"));
+ ptrW pfd(Utils_ReplaceVarsW(L"%miranda_profilesdir%"));
wchar_t str[MAX_PATH], text[256];
GetDlgItemText(hwndDlg, IDC_FILENAME, str, _countof(str));
diff --git a/plugins/Msg_Export/src/FileViewer.cpp b/plugins/Msg_Export/src/FileViewer.cpp index a158317a01..f2e7795190 100755 --- a/plugins/Msg_Export/src/FileViewer.cpp +++ b/plugins/Msg_Export/src/FileViewer.cpp @@ -1163,7 +1163,7 @@ static INT_PTR CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam, stToGet.chrg = pstLink->chrg;
stToGet.lpstrText = szUrl;
if (SendMessage(pstLink->nmhdr.hwndFrom, EM_GETTEXTRANGE, 0, (LPARAM)&stToGet) > 0)
- Utils_OpenUrlT(szUrl);
+ Utils_OpenUrlW(szUrl);
return TRUE;
}
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<FILEINFO> &todo = *(vector<FILEINFO> *)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);
diff --git a/plugins/PluginUpdater/src/DlgListNew.cpp b/plugins/PluginUpdater/src/DlgListNew.cpp index 5d30a3a4b3..dab99d6d36 100644 --- a/plugins/PluginUpdater/src/DlgListNew.cpp +++ b/plugins/PluginUpdater/src/DlgListNew.cpp @@ -117,7 +117,7 @@ static LRESULT CALLBACK PluginListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LP wchar_t link[MAX_PATH];
mir_snwprintf(link, PLUGIN_INFO_URL, tszFileName);
- Utils_OpenUrlT(link);
+ Utils_OpenUrlW(link);
}
}
}
diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index d23d5503dd..67fa42ee03 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -148,7 +148,7 @@ bool ParseHashes(const wchar_t *ptszUrl, ptrW &baseUrl, SERVLIST &arHashes) #endif
vars[1].lptzKey = vars[1].lptzValue = 0;
#endif
- baseUrl = Utils_ReplaceVarsT(ptszUrl, 0, vars);
+ baseUrl = Utils_ReplaceVarsW(ptszUrl, 0, vars);
// Download version info
FILEURL pFileUrl;
diff --git a/plugins/Quotes/src/SettingsDlg.cpp b/plugins/Quotes/src/SettingsDlg.cpp index c0f877685d..3a4d3daa52 100644 --- a/plugins/Quotes/src/SettingsDlg.cpp +++ b/plugins/Quotes/src/SettingsDlg.cpp @@ -982,7 +982,7 @@ tstring GenerateLogFileName(const tstring &rsLogFilePattern, const tstring &rsQu }
if (nFlags & glfnResolveUserProfile) {
- wchar_t *ptszParsedName = Utils_ReplaceVarsT(sPath.c_str());
+ wchar_t *ptszParsedName = Utils_ReplaceVarsW(sPath.c_str());
if (ptszParsedName) {
sPath = ptszParsedName;
mir_free(ptszParsedName);
diff --git a/plugins/Scriver/src/input.cpp b/plugins/Scriver/src/input.cpp index e0e838ddbc..423a8d7c5a 100644 --- a/plugins/Scriver/src/input.cpp +++ b/plugins/Scriver/src/input.cpp @@ -409,7 +409,7 @@ BOOL HandleLinkClick(HINSTANCE hInstance, HWND hwndDlg, HWND hwndFocus, ENLINK * DestroyMenu(hMenu);
}
if (bOpenLink)
- Utils_OpenUrlT(tr.lpstrText);
+ Utils_OpenUrlW(tr.lpstrText);
SetFocus(hwndFocus);
mir_free(tr.lpstrText);
diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index 7026c4c832..c3c63ff745 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Main.h" // Prototypes /////////////////////////////////////////////////////////////////////////// -CHAT_MANAGER *pci;
+CHAT_MANAGER *pci; CLIST_INTERFACE *pcli; HINSTANCE g_hSendSS; MGLOBAL g_myGlobals; @@ -71,7 +71,7 @@ IconItem ICONS_BTN[ICO_BTN_END_] = static HANDLE m_hFolderScreenshot = 0; wchar_t* GetCustomPath() { - wchar_t* pszPath = Utils_ReplaceVarsT(L"%miranda_userdata%\\Screenshots"); + wchar_t* pszPath = Utils_ReplaceVarsW(L"%miranda_userdata%\\Screenshots"); if (m_hFolderScreenshot) { wchar_t szPath[1024] = { 0 }; FoldersGetCustomPathT(m_hFolderScreenshot, szPath, 1024, pszPath); @@ -259,7 +259,7 @@ ATOM g_clsTargetHighlighter = 0; DLL_EXPORT int Load(void) { mir_getLP(&pluginInfo); - pci = Chat_GetInterface();
+ pci = Chat_GetInterface(); pcli = Clist_GetInterface(); INT_PTR result = CallService(MS_IMG_GETINTERFACE, FI_IF_VERSION, (LPARAM)&FIP); diff --git a/plugins/SimpleAR/src/Main.cpp b/plugins/SimpleAR/src/Main.cpp index 8f400bd1d2..04fd134bc5 100644 --- a/plugins/SimpleAR/src/Main.cpp +++ b/plugins/SimpleAR/src/Main.cpp @@ -211,7 +211,7 @@ INT addEvent(WPARAM hContact, LPARAM hDBEvent) if (ServiceExists(MS_VARS_FORMATSTRING)) {
ptszTemp = variables_parse(ptszTemp2, 0, hContact);
}
- else ptszTemp = Utils_ReplaceVarsT(ptszTemp2);
+ else ptszTemp = Utils_ReplaceVarsW(ptszTemp2);
T2Utf pszUtf(ptszTemp);
ProtoChainSend(hContact, PSS_MESSAGE, 0, pszUtf);
diff --git a/plugins/SmileyAdd/src/general.cpp b/plugins/SmileyAdd/src/general.cpp index 5878735006..277e49bda6 100644 --- a/plugins/SmileyAdd/src/general.cpp +++ b/plugins/SmileyAdd/src/general.cpp @@ -135,7 +135,7 @@ void pathToAbsolute(const CMStringW &pSrc, CMStringW &pOut) {
wchar_t szOutPath[MAX_PATH];
- wchar_t *szVarPath = Utils_ReplaceVarsT(pSrc.c_str());
+ wchar_t *szVarPath = Utils_ReplaceVarsW(pSrc.c_str());
if (szVarPath == (wchar_t*)CALLSERVICE_NOTFOUND || szVarPath == NULL) {
wchar_t szExpPath[MAX_PATH];
ExpandEnvironmentStrings(pSrc.c_str(), szExpPath, _countof(szExpPath));
diff --git a/plugins/SpellChecker/src/spellchecker.cpp b/plugins/SpellChecker/src/spellchecker.cpp index 48cc788d8f..1706817874 100644 --- a/plugins/SpellChecker/src/spellchecker.cpp +++ b/plugins/SpellChecker/src/spellchecker.cpp @@ -111,19 +111,19 @@ static int ModulesLoaded(WPARAM, LPARAM) dictionariesFolder = (wchar_t *)mir_alloc(sizeof(wchar_t) * MAX_PATH); FoldersGetCustomPathT(hDictionariesFolder, dictionariesFolder, MAX_PATH, L"."); } - else dictionariesFolder = Utils_ReplaceVarsT(DICTIONARIES_FOLDER); + else dictionariesFolder = Utils_ReplaceVarsW(DICTIONARIES_FOLDER); if (hCustomDictionariesFolder = FoldersRegisterCustomPathT(LPGEN("Spell Checker"), LPGEN("Custom Dictionaries"), CUSTOM_DICTIONARIES_FOLDER)) { customDictionariesFolder = (wchar_t *)mir_alloc(sizeof(wchar_t) * MAX_PATH); FoldersGetCustomPathT(hCustomDictionariesFolder, customDictionariesFolder, MAX_PATH, L"."); } - else customDictionariesFolder = Utils_ReplaceVarsT(CUSTOM_DICTIONARIES_FOLDER); + else customDictionariesFolder = Utils_ReplaceVarsW(CUSTOM_DICTIONARIES_FOLDER); if (hFlagsDllFolder = FoldersRegisterCustomPathT(LPGEN("Spell Checker"), LPGEN("Flags DLL"), FLAGS_DLL_FOLDER)) { flagsDllFolder = (wchar_t *)mir_alloc(sizeof(wchar_t) * MAX_PATH); FoldersGetCustomPathT(hFlagsDllFolder, flagsDllFolder, MAX_PATH, L"."); } - else flagsDllFolder = Utils_ReplaceVarsT(FLAGS_DLL_FOLDER); + else flagsDllFolder = Utils_ReplaceVarsW(FLAGS_DLL_FOLDER); InitOptions(); diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp index 1f8e78f5c4..2731a951a9 100644 --- a/plugins/SplashScreen/src/main.cpp +++ b/plugins/SplashScreen/src/main.cpp @@ -64,7 +64,7 @@ void SplashMain() {
if (bstartup) {
// Retrive path to exe of current running Miranda is located
- szMirDir = Utils_ReplaceVarsT(L"%miranda_path%");
+ szMirDir = Utils_ReplaceVarsW(L"%miranda_path%");
mir_snwprintf(szhAdvaimgPath, L"%s\\plugins\\advaimg.dll", szMirDir);
CallService(MS_SYSTEM_GETVERSIONTEXT, MAX_PATH, (LPARAM)szVersion);
diff --git a/plugins/SplashScreen/src/options.cpp b/plugins/SplashScreen/src/options.cpp index a3d9b9405c..b4c51f74a8 100644 --- a/plugins/SplashScreen/src/options.cpp +++ b/plugins/SplashScreen/src/options.cpp @@ -175,7 +175,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP *pos = 0;
}
else {
- szMirDir = Utils_ReplaceVarsT(L"%miranda_path%");
+ szMirDir = Utils_ReplaceVarsW(L"%miranda_path%");
mir_wstrcpy(initDir, szMirDir);
mir_free(szMirDir);
}
@@ -231,7 +231,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if (pos != NULL) *pos = 0;
}
else {
- szMirDir = Utils_ReplaceVarsT(L"%miranda_path%");
+ szMirDir = Utils_ReplaceVarsW(L"%miranda_path%");
mir_wstrcpy(initDir, szMirDir);
mir_free(szMirDir);
}
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index 679b64152a..f0789ef23f 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -2407,14 +2407,14 @@ LABEL_SHOWWINDOW: case ID_SEARCH_GOOGLE: if (pszWord[0]) - Utils_OpenUrlT(CMStringW(FORMAT, L"http://www.google.com/search?q=%s", pszWord)); + Utils_OpenUrlW(CMStringW(FORMAT, L"http://www.google.com/search?q=%s", pszWord)); PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0); break; case ID_SEARCH_WIKIPEDIA: if (pszWord[0]) - Utils_OpenUrlT(CMStringW(FORMAT, L"http://en.wikipedia.org/wiki/%s", pszWord)); + Utils_OpenUrlW(CMStringW(FORMAT, L"http://en.wikipedia.org/wiki/%s", pszWord)); PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0); break; @@ -2473,10 +2473,10 @@ LABEL_SHOWWINDOW: ClientToScreen(((NMHDR*)lParam)->hwndFrom, &pt); switch (TrackPopupMenu(hSubMenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL)) { case ID_NEW: - Utils_OpenUrlT(tr.lpstrText); + Utils_OpenUrlW(tr.lpstrText); break; case ID_CURR: - Utils_OpenUrlT(tr.lpstrText,false); + Utils_OpenUrlW(tr.lpstrText,false); break; case ID_COPY: Utils::CopyToClipBoard(tr.lpstrText, hwndDlg); @@ -2487,7 +2487,7 @@ LABEL_SHOWWINDOW: return TRUE; } if (((ENLINK*)lParam)->msg == WM_LBUTTONUP) { - Utils_OpenUrlT(tr.lpstrText); + Utils_OpenUrlW(tr.lpstrText); SetFocus(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE)); mir_free(tr.lpstrText); return TRUE; diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp index bc1a607bbe..ac49aac97a 100644 --- a/plugins/TabSRMM/src/infopanel.cpp +++ b/plugins/TabSRMM/src/infopanel.cpp @@ -1569,7 +1569,7 @@ INT_PTR CALLBACK CTip::WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ENLINK *e = reinterpret_cast<ENLINK *>(lParam);
ptrW tszUrl(Utils::extractURLFromRichEdit(e, m_hRich));
if (tszUrl)
- Utils_OpenUrlT(tszUrl);
+ Utils_OpenUrlW(tszUrl);
::DestroyWindow(hwnd);
}
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index afc2c235f6..ff2c514826 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -2022,7 +2022,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l break;
if (pLink->msg != WM_RBUTTONDOWN) {
- Utils_OpenUrlT(tszUrl);
+ Utils_OpenUrlW(tszUrl);
SetFocus(GetDlgItem(hwndDlg, IDC_MESSAGE));
break;
}
@@ -2034,11 +2034,11 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l ClientToScreen(((NMHDR*)lParam)->hwndFrom, &pt);
switch (TrackPopupMenu(hSubMenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL)) {
case IDM_OPENNEW:
- Utils_OpenUrlT(tszUrl);
+ Utils_OpenUrlW(tszUrl);
break;
case IDM_OPENEXISTING:
- Utils_OpenUrlT(tszUrl, false);
+ Utils_OpenUrlW(tszUrl, false);
break;
case IDM_COPYLINK:
diff --git a/plugins/TrafficCounter/src/statistics.cpp b/plugins/TrafficCounter/src/statistics.cpp index 85a6ac1281..6eaef9b4c3 100644 --- a/plugins/TrafficCounter/src/statistics.cpp +++ b/plugins/TrafficCounter/src/statistics.cpp @@ -300,7 +300,7 @@ void Stat_ReadFile(BYTE n) wchar_t FileName[MAX_PATH], *pszPath;
SYSTEMTIME stNow;
- pszPath = Utils_ReplaceVarsT(L"%miranda_userdata%\\statistics");
+ pszPath = Utils_ReplaceVarsW(L"%miranda_userdata%\\statistics");
CreateDirectoryTreeW(pszPath);
mir_snwprintf(FileName, L"%s\\%S.stat", pszPath, ProtoList[n].name);
mir_free(pszPath);
diff --git a/plugins/UserGuide/src/main.cpp b/plugins/UserGuide/src/main.cpp index a07c3eca60..e991bd97b2 100644 --- a/plugins/UserGuide/src/main.cpp +++ b/plugins/UserGuide/src/main.cpp @@ -57,7 +57,7 @@ static INT_PTR ShowGuideFile(WPARAM, LPARAM) mir_free(ptszHelpFile);
}
LPTSTR pszDirNameEx;
- pszDirNameEx = Utils_ReplaceVarsT(pszDirName);
+ pszDirNameEx = Utils_ReplaceVarsW(pszDirName);
mir_free(pszDirName);
ShellExecute(NULL, L"open", pszFileName, NULL, pszDirNameEx, SW_SHOW);
diff --git a/plugins/UserInfoEx/src/ctrl_edit.cpp b/plugins/UserInfoEx/src/ctrl_edit.cpp index 39d1be391b..3fb01c479b 100644 --- a/plugins/UserInfoEx/src/ctrl_edit.cpp +++ b/plugins/UserInfoEx/src/ctrl_edit.cpp @@ -287,7 +287,7 @@ void CEditCtrl::OpenUrl() } if (szUrl && (GetWindowText(_hwnd, szUrl, lenUrl) > 0)) - Utils_OpenUrlT(szUrl); + Utils_OpenUrlW(szUrl); if (need_free) MIR_FREE(szUrl); @@ -328,7 +328,7 @@ LRESULT CEditCtrl::LinkNotificationHandler(ENLINK* lnk) memcpy(tr.lpstrText, L"mailto:", (7 * sizeof(wchar_t))); } - Utils_OpenUrlT(tr.lpstrText); + Utils_OpenUrlW(tr.lpstrText); } if (need_free) diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp index 243d3f8789..f1a1d753c0 100644 --- a/plugins/Variables/src/parse_miranda.cpp +++ b/plugins/Variables/src/parse_miranda.cpp @@ -634,7 +634,7 @@ static wchar_t *parseMirandaCoreVar(ARGUMENTSINFO *ai) wchar_t corevar[MAX_PATH];
mir_snwprintf(corevar, L"%%%s%%", ai->targv[0]);
- return Utils_ReplaceVarsT(corevar);
+ return Utils_ReplaceVarsW(corevar);
}
static wchar_t *parseMirSrvExists(ARGUMENTSINFO *ai)
diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp index 9903cbf010..582ba51831 100644 --- a/plugins/Weather/src/weather_contacts.cpp +++ b/plugins/Weather/src/weather_contacts.cpp @@ -30,7 +30,7 @@ static void OpenUrl(wchar_t* format, wchar_t* id) wchar_t loc[512];
GetID(id);
mir_snwprintf(loc, format, id);
- Utils_OpenUrlT(loc);
+ Utils_OpenUrlW(loc);
}
//============ BASIC CONTACTS FUNCTIONS AND LINKS ============
diff --git a/plugins/Weather/src/weather_userinfo.cpp b/plugins/Weather/src/weather_userinfo.cpp index 9462ead897..a11962c332 100644 --- a/plugins/Weather/src/weather_userinfo.cpp +++ b/plugins/Weather/src/weather_userinfo.cpp @@ -212,7 +212,7 @@ static INT_PTR CALLBACK DlgProcMoreData(HWND hwndDlg, UINT msg, WPARAM wParam, L tr.chrg = enlink->chrg;
tr.lpstrText = (LPTSTR)mir_alloc(sizeof(wchar_t)*(tr.chrg.cpMax - tr.chrg.cpMin + 8));
SendMessage(pNmhdr->hwndFrom, EM_GETTEXTRANGE, 0, (LPARAM)&tr);
- Utils_OpenUrlT(tr.lpstrText);
+ Utils_OpenUrlW(tr.lpstrText);
mir_free(tr.lpstrText);
break;
}
diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp index 2a80d1a83f..592a4a734d 100644 --- a/plugins/WebView/src/webview.cpp +++ b/plugins/WebView/src/webview.cpp @@ -174,7 +174,7 @@ int Doubleclick(WPARAM wParam, LPARAM) int action = db_get_b(hContact, MODULENAME, DBLE_WIN_KEY, 1);
if (action == 0) {
ptrW url(db_get_wsa(hContact, MODULENAME, "URL"));
- Utils_OpenUrlT(url);
+ Utils_OpenUrlW(url);
db_set_w(hContact, MODULENAME, "Status", ID_STATUS_ONLINE);
}
@@ -445,7 +445,7 @@ INT_PTR WebsiteMenuCommand(WPARAM wParam, LPARAM) MCONTACT hContact = wParam;
ptrW url(db_get_wsa(hContact, MODULENAME, "URL"));
if (url)
- Utils_OpenUrlT(url);
+ Utils_OpenUrlW(url);
db_set_w(hContact, MODULENAME, "Status", ID_STATUS_ONLINE);
return 0;
diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp index 525d9e8ba6..2e744c3df8 100644 --- a/plugins/WebView/src/webview_alerts.cpp +++ b/plugins/WebView/src/webview_alerts.cpp @@ -42,7 +42,7 @@ int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) }
// open url
if (db_get_b(NULL, MODULENAME, LCLK_WEB_PGE_KEY, 0)) {
- Utils_OpenUrlT(url);
+ Utils_OpenUrlW(url);
PUDeletePopup(hWnd);
db_set_w(wParam, MODULENAME, "Status", ID_STATUS_ONLINE);
}
@@ -63,7 +63,7 @@ int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) }
// open url
if (db_get_b(NULL, MODULENAME, RCLK_WEB_PGE_KEY, 1)) {
- Utils_OpenUrlT(url);
+ Utils_OpenUrlW(url);
PUDeletePopup(hWnd);
db_set_w(wParam, MODULENAME, "Status", ID_STATUS_ONLINE);
}
diff --git a/plugins/WebView/src/webview_datawnd.cpp b/plugins/WebView/src/webview_datawnd.cpp index bf79daf074..dd66e38fbd 100644 --- a/plugins/WebView/src/webview_datawnd.cpp +++ b/plugins/WebView/src/webview_datawnd.cpp @@ -338,7 +338,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA switch (LOWORD(wParam)) {
case IDC_OPEN_URL:
GetDlgItemText(hwndDlg, IDC_OPEN_URL, url, _countof(url));
- Utils_OpenUrlT(url);
+ Utils_OpenUrlW(url);
db_set_w(wParam, MODULENAME, "Status", ID_STATUS_ONLINE);
break;
diff --git a/plugins/XSoundNotify/src/dialog.cpp b/plugins/XSoundNotify/src/dialog.cpp index 4623ef27b6..d4a7353364 100644 --- a/plugins/XSoundNotify/src/dialog.cpp +++ b/plugins/XSoundNotify/src/dialog.cpp @@ -94,7 +94,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP case IDC_CONT_BUTTON_CHOOSE_SOUND:
{
wchar_t FileName[MAX_PATH];
- wchar_t *tszMirDir = Utils_ReplaceVarsT(L"%miranda_path%");
+ wchar_t *tszMirDir = Utils_ReplaceVarsW(L"%miranda_path%");
OPENFILENAME ofn = { 0 };
ofn.lStructSize = sizeof(ofn);
diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp index ebdff5cacf..2d69f08ea5 100644 --- a/plugins/XSoundNotify/src/options.cpp +++ b/plugins/XSoundNotify/src/options.cpp @@ -116,7 +116,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l case IDC_OPT_BUTTON_CHOOSE_SOUND:
{
wchar_t FileName[MAX_PATH];
- wchar_t *tszMirDir = Utils_ReplaceVarsT(L"%miranda_path%");
+ wchar_t *tszMirDir = Utils_ReplaceVarsW(L"%miranda_path%");
OPENFILENAME ofn = { 0 };
ofn.lStructSize = sizeof(ofn);
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index ccfb0fbdbd..588087c3cb 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -972,7 +972,7 @@ void FacebookProto::OpenUrl(std::string url) ForkThread(&FacebookProto::OpenUrlThread, new open_url(browser, data)); else // Or use Miranda's service - Utils_OpenUrlT(data); + Utils_OpenUrlW(data); } void FacebookProto::ReadNotificationWorker(void *p) diff --git a/protocols/GTalkExt/src/inbox.cpp b/protocols/GTalkExt/src/inbox.cpp index f5433032a0..fb317bd2f8 100644 --- a/protocols/GTalkExt/src/inbox.cpp +++ b/protocols/GTalkExt/src/inbox.cpp @@ -191,7 +191,7 @@ void OpenUrl(LPCSTR acc, LPCTSTR mailbox, LPCTSTR url) {
extern DWORD itlsSettings;
if (!ReadCheckbox(0, IDC_AUTHONMAILBOX, (UINT_PTR)TlsGetValue(itlsSettings)) || !OpenUrlWithAuth(acc, mailbox, url))
- Utils_OpenUrlT(url);
+ Utils_OpenUrlW(url);
}
void OpenContactInbox(LPCSTR szModuleName)
diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp index 719d78591d..1c5b90f3df 100644 --- a/protocols/Gadu-Gadu/src/image.cpp +++ b/protocols/Gadu-Gadu/src/image.cpp @@ -801,7 +801,7 @@ int GGPROTO::img_displayasmsg(MCONTACT hContact, void *img) int i, res;
if (hImagesFolder == NULL || FoldersGetCustomPathT(hImagesFolder, path, MAX_PATH, L"")) {
- wchar_t *tmpPath = Utils_ReplaceVarsT( L"%miranda_userdata%");
+ wchar_t *tmpPath = Utils_ReplaceVarsW( L"%miranda_userdata%");
tPathLen = mir_snwprintf(szPath, L"%s\\%s\\ImageCache", tmpPath, m_tszUserName);
mir_free(tmpPath);
}
diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp index cdf748a66d..724c2c9cef 100644 --- a/protocols/Gadu-Gadu/src/sessions.cpp +++ b/protocols/Gadu-Gadu/src/sessions.cpp @@ -347,7 +347,7 @@ static INT_PTR CALLBACK gg_sessions_viewdlg(HWND hwndDlg, UINT message, WPARAM w szIP[0] = 0;
ListView_GetItemText(hList, lvhti.iItem, 1, szIP, _countof(szIP));
mir_snwprintf(szUrl, L"http://whois.domaintools.com/%s", szIP);
- Utils_OpenUrlT(szUrl);
+ Utils_OpenUrlW(szUrl);
break;
}
}
diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index b0faf81af6..de31e447f3 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -213,7 +213,7 @@ int CIrcProto::OnModulesLoaded(WPARAM, LPARAM) wchar_t szTemp[MAX_PATH];
mir_snwprintf(szTemp, L"%%miranda_path%%\\Plugins\\%S_perform.ini", m_szModuleName);
- wchar_t *szLoadFileName = Utils_ReplaceVarsT(szTemp);
+ wchar_t *szLoadFileName = Utils_ReplaceVarsW(szTemp);
char* pszPerformData = IrcLoadFile(szLoadFileName);
if (pszPerformData != NULL) {
char *p1 = pszPerformData, *p2 = pszPerformData;
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index 4037a5e288..d0df6b7b72 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -1314,7 +1314,7 @@ void CIrcProto::InitIgnore(void) {
wchar_t szTemp[MAX_PATH];
mir_snwprintf(szTemp, L"%%miranda_path%%\\Plugins\\%S_ignore.ini", m_szModuleName);
- wchar_t *szLoadFileName = Utils_ReplaceVarsT(szTemp);
+ wchar_t *szLoadFileName = Utils_ReplaceVarsW(szTemp);
char* pszIgnoreData = IrcLoadFile(szLoadFileName);
if (pszIgnoreData != NULL) {
char *p1 = pszIgnoreData;
@@ -1844,14 +1844,14 @@ static void sttImportIni(const wchar_t* szIniFile) void InitServers()
{
- wchar_t *szTemp = Utils_ReplaceVarsT(L"%miranda_path%\\Plugins\\IRC_servers.ini");
+ wchar_t *szTemp = Utils_ReplaceVarsW(L"%miranda_path%\\Plugins\\IRC_servers.ini");
sttImportIni(szTemp);
mir_free(szTemp);
RereadServers();
if (g_servers.getCount() == 0) {
- wchar_t *szIniFile = Utils_ReplaceVarsT(L"%temp%\\default_servers.ini");
+ wchar_t *szIniFile = Utils_ReplaceVarsW(L"%temp%\\default_servers.ini");
FILE *serverFile = _wfopen(szIniFile, L"a");
if (serverFile) {
char* pszSvrs = (char*)LockResource(LoadResource(hInst, FindResource(hInst, MAKEINTRESOURCE(IDR_SERVERS), L"TEXT")));
diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp index b1cc884948..de810c6911 100644 --- a/protocols/JabberG/src/jabber_bookmarks.cpp +++ b/protocols/JabberG/src/jabber_bookmarks.cpp @@ -347,7 +347,7 @@ void CJabberDlgBookmarks::OpenBookmark() m_proto->GroupchatJoinRoom(server, room, ptrW(JabberNickFromJID(m_proto->m_szJabberJID)), item->password);
}
}
- else Utils_OpenUrlT(item->jid);
+ else Utils_OpenUrlW(item->jid);
}
INT_PTR CJabberDlgBookmarks::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp index e610b9c87a..0d3ae4142d 100644 --- a/protocols/MSN/src/msn_misc.cpp +++ b/protocols/MSN/src/msn_misc.cpp @@ -318,7 +318,7 @@ void CMsnProto::MSN_GetCustomSmileyFileName(MCONTACT hContact, wchar_t* pszDest, wchar_t* path = (wchar_t*)alloca(cbLen * sizeof(wchar_t));
if (hCustomSmileyFolder == NULL || FoldersGetCustomPathT(hCustomSmileyFolder, path, (int)cbLen, L"")) {
- wchar_t *tmpPath = Utils_ReplaceVarsT(L"%miranda_userdata%");
+ wchar_t *tmpPath = Utils_ReplaceVarsW(L"%miranda_userdata%");
wchar_t *tszModuleName = mir_a2u(m_szModuleName);
tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%s\\CustomSmiley", tmpPath, tszModuleName);
mir_free(tszModuleName);
diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp index 4a55490432..2fbb046a31 100644 --- a/src/core/stdfile/src/filerecvdlg.cpp +++ b/src/core/stdfile/src/filerecvdlg.cpp @@ -110,7 +110,7 @@ static REPLACEVARSARRAY sttVarsToReplace[] = static void patchDir(wchar_t *str, size_t strSize)
{
- wchar_t *result = Utils_ReplaceVarsT(str, 0, sttVarsToReplace);
+ wchar_t *result = Utils_ReplaceVarsW(str, 0, sttVarsToReplace);
if (result) {
wcsncpy(str, result, strSize);
mir_free(result);
@@ -146,7 +146,7 @@ void GetContactReceivedFilesDir(MCONTACT hContact, wchar_t *szDir, int cchDir, B for (int i = 0; i < (_countof(rvaVarsToReplace) - 1); i++)
RemoveInvalidFilenameChars(rvaVarsToReplace[i].value.w);
- wchar_t *result = Utils_ReplaceVarsT(tszTemp, hContact, rvaVarsToReplace);
+ wchar_t *result = Utils_ReplaceVarsW(tszTemp, hContact, rvaVarsToReplace);
if (result) {
wcsncpy(tszTemp, result, _countof(tszTemp));
mir_free(result);
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp index d810d1b340..61e9fbb0f5 100644 --- a/src/core/stdmsg/src/chat_window.cpp +++ b/src/core/stdmsg/src/chat_window.cpp @@ -2123,14 +2123,14 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar case ID_SEARCH_GOOGLE: if (pszWord[0]) - Utils_OpenUrlT(CMStringW(FORMAT, L"http://www.google.com/search?q=%s", pszWord)); + Utils_OpenUrlW(CMStringW(FORMAT, L"http://www.google.com/search?q=%s", pszWord)); PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0); break; case ID_SEARCH_WIKIPEDIA: if (pszWord[0]) - Utils_OpenUrlT(CMStringW(FORMAT, L"http://en.wikipedia.org/wiki/%s", pszWord)); + Utils_OpenUrlW(CMStringW(FORMAT, L"http://en.wikipedia.org/wiki/%s", pszWord)); PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0); break; @@ -2172,11 +2172,11 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar ClientToScreen(((NMHDR *)lParam)->hwndFrom, &pt); switch (TrackPopupMenu(hSubMenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL)) { case ID_NEW: - Utils_OpenUrlT(tr.lpstrText); + Utils_OpenUrlW(tr.lpstrText); break; case ID_CURR: - Utils_OpenUrlT(tr.lpstrText, false); + Utils_OpenUrlW(tr.lpstrText, false); break; case ID_COPY: @@ -2198,7 +2198,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar return TRUE; } - Utils_OpenUrlT(tr.lpstrText); + Utils_OpenUrlW(tr.lpstrText); SetFocus(GetDlgItem(hwndDlg, IDC_MESSAGE)); mir_free(tr.lpstrText); break; diff --git a/src/mir_app/src/chat_tools.cpp b/src/mir_app/src/chat_tools.cpp index b50f2ba7ce..2ff093934a 100644 --- a/src/mir_app/src/chat_tools.cpp +++ b/src/mir_app/src/chat_tools.cpp @@ -734,7 +734,7 @@ wchar_t* GetChatLogsFilename(SESSION_INFO *si, time_t tTime) }
else ptszVarPath = g_Settings->pszLogDir;
- wchar_t *tszParsedName = Utils_ReplaceVarsT(ptszVarPath, si->hContact, rva);
+ wchar_t *tszParsedName = Utils_ReplaceVarsW(ptszVarPath, si->hContact, rva);
if (chatApi.OnGetLogName)
chatApi.OnGetLogName(si, tszParsedName);
else
diff --git a/src/mir_app/src/enterstring.cpp b/src/mir_app/src/enterstring.cpp index 5632a6acf1..b882ac0133 100644 --- a/src/mir_app/src/enterstring.cpp +++ b/src/mir_app/src/enterstring.cpp @@ -199,7 +199,7 @@ static INT_PTR CALLBACK sttEnterStringDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa tr.lpstrText = (wchar_t *)mir_alloc(sizeof(wchar_t)*(tr.chrg.cpMax - tr.chrg.cpMin + 2));
SendMessage(param->nmhdr.hwndFrom, EM_GETTEXTRANGE, 0, (LPARAM)&tr);
- Utils_OpenUrlT(tr.lpstrText);
+ Utils_OpenUrlW(tr.lpstrText);
mir_free(tr.lpstrText);
}
return TRUE;
|