Utils_OpenUrlT

Utils_ReplaceVarsT

3 files changed, 7 insertions, 7 deletions

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);