From 2f261839b60692e33d0e160344d0d636d49c90ba Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/Dbx_mdb/src/dbcrypt.cpp | 4 ++--
 plugins/Dbx_mdb/src/dbintf.cpp  | 4 ++--
 plugins/Dbx_mdb/src/ui.cpp      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/Dbx_mdb')

diff --git a/plugins/Dbx_mdb/src/dbcrypt.cpp b/plugins/Dbx_mdb/src/dbcrypt.cpp
index 0b5d3e6bf2..74b51d1084 100644
--- a/plugins/Dbx_mdb/src/dbcrypt.cpp
+++ b/plugins/Dbx_mdb/src/dbcrypt.cpp
@@ -100,7 +100,7 @@ int CDbxMdb::InitCrypt()
 			{
 				if (-128 != dlg.DoModal())
 					return 4;
-				m_crypto->setPassword(pass_ptrA(mir_utf8encodeT(param.newPass)));
+				m_crypto->setPassword(pass_ptrA(mir_utf8encodeW(param.newPass)));
 				if (m_crypto->setKey((const BYTE*)value.mv_data, value.mv_size))
 				{
 					m_bUsesPassword = true;
@@ -156,7 +156,7 @@ void CDbxMdb::SetPassword(LPCTSTR ptszPassword)
 	else 
 	{
 		m_bUsesPassword = true;
-		m_crypto->setPassword(pass_ptrA(mir_utf8encodeT(ptszPassword)));
+		m_crypto->setPassword(pass_ptrA(mir_utf8encodeW(ptszPassword)));
 	}
 	UpdateMenuItem();
 }
diff --git a/plugins/Dbx_mdb/src/dbintf.cpp b/plugins/Dbx_mdb/src/dbintf.cpp
index 1bfc1ddc24..a47dd6b677 100644
--- a/plugins/Dbx_mdb/src/dbintf.cpp
+++ b/plugins/Dbx_mdb/src/dbintf.cpp
@@ -30,7 +30,7 @@ CDbxMdb::CDbxMdb(const TCHAR *tszFileName, int iMode) :
 	m_lResidentSettings(50, strcmp),
 	m_maxContactId(1)
 {
-	m_tszProfileName = mir_tstrdup(tszFileName);
+	m_tszProfileName = mir_wstrdup(tszFileName);
 	InitDbInstance(this);
 
 	mdb_env_create(&m_pMdbEnv);
@@ -226,7 +226,7 @@ EXTERN_C void __cdecl dbpanic(void *)
 			msg = TranslateT("Disk is full. Miranda will now shut down.");
 
 		TCHAR err[256];
-		mir_sntprintf(err, _countof(err), msg, TranslateT("Database failure. Miranda will now shut down."), dwErr);
+		mir_snwprintf(err, msg, TranslateT("Database failure. Miranda will now shut down."), dwErr);
 
 		MessageBox(0, err, TranslateT("Database Error"), MB_SETFOREGROUND | MB_TOPMOST | MB_APPLMODAL | MB_ICONWARNING | MB_OK);
 	}
diff --git a/plugins/Dbx_mdb/src/ui.cpp b/plugins/Dbx_mdb/src/ui.cpp
index 7f73b41cd6..9845552062 100644
--- a/plugins/Dbx_mdb/src/ui.cpp
+++ b/plugins/Dbx_mdb/src/ui.cpp
@@ -48,7 +48,7 @@ static bool CheckOldPassword(HWND hwndDlg, CDbxMdb *db)
 	{
 		TCHAR buf[100];
 		GetDlgItemText(hwndDlg, IDC_OLDPASS, buf, _countof(buf));
-		pass_ptrA oldPass(mir_utf8encodeT(buf));
+		pass_ptrA oldPass(mir_utf8encodeW(buf));
 		if (!db->m_crypto->checkPassword(oldPass)) 
 		{
 			SetDlgItemText(hwndDlg, IDC_HEADERBAR, TranslateT("Wrong old password entered!"));
-- 
cgit v1.2.3