From e151d6242dafb449fae9784e19e8122c44b57095 Mon Sep 17 00:00:00 2001
From: MikalaiR <nikolay.romanovich@narod.ru>
Date: Sun, 21 Feb 2016 08:23:06 +0000
Subject: dbx_lmdb: old crutches removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@16316 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Dbx_mdb/src/ui.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'plugins/Dbx_mdb/src/ui.cpp')

diff --git a/plugins/Dbx_mdb/src/ui.cpp b/plugins/Dbx_mdb/src/ui.cpp
index aa7a2ecd11..353a2d01a9 100644
--- a/plugins/Dbx_mdb/src/ui.cpp
+++ b/plugins/Dbx_mdb/src/ui.cpp
@@ -27,7 +27,7 @@ struct DlgChangePassParam
 {
 	CDbxMdb *db;
 	TCHAR newPass[100];
-	int wrongPass;
+	unsigned short wrongPass;
 };
 
 #define MS_DB_CHANGEPASSWORD "DB/UI/ChangePassword"
@@ -120,13 +120,15 @@ static INT_PTR CALLBACK sttEnterPassword(HWND hwndDlg, UINT uMsg, WPARAM wParam,
 bool CDbxMdb::EnterPassword(const BYTE *pKey, const size_t keyLen)
 {
 	DlgChangePassParam param = { this };
-	while (true) {
+	while (true) 
+	{
 		// Esc pressed
 		if (IDOK != DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_LOGIN), 0, sttEnterPassword, (LPARAM)&param))
 			return false;
 
-		m_crypto->setPassword(ptrA(mir_utf8encodeT(param.newPass)));
-		if (m_crypto->setKey(pKey, keyLen)) {
+		m_crypto->setPassword(pass_ptrA(mir_utf8encodeT(param.newPass)));
+		if (m_crypto->setKey(pKey, keyLen)) 
+		{
 			m_bUsesPassword = true;
 			SecureZeroMemory(&param, sizeof(param));
 			return true;
@@ -140,11 +142,13 @@ bool CDbxMdb::EnterPassword(const BYTE *pKey, const size_t keyLen)
 
 static bool CheckOldPassword(HWND hwndDlg, CDbxMdb *db)
 {
-	if (db->usesPassword()) {
+	if (db->usesPassword()) 
+	{
 		TCHAR buf[100];
 		GetDlgItemText(hwndDlg, IDC_OLDPASS, buf, _countof(buf));
-		ptrA oldPass(mir_utf8encodeT(buf));
-		if (!db->m_crypto->checkPassword(oldPass)) {
+		pass_ptrA oldPass(mir_utf8encodeT(buf));
+		if (!db->m_crypto->checkPassword(oldPass)) 
+		{
 			SetDlgItemText(hwndDlg, IDC_HEADERBAR, TranslateT("Wrong old password entered!"));
 			return false;
 		}
@@ -311,8 +315,6 @@ static int OnModulesLoaded(PVOID obj, WPARAM, LPARAM)
 
 	HookEventObj(ME_OPT_INITIALISE, OnOptionsInit, db);
 
-	// main menu item
-	// main menu item
 	CMenuItem mi;
 
 	// main menu item
@@ -320,10 +322,8 @@ static int OnModulesLoaded(PVOID obj, WPARAM, LPARAM)
 	Menu_ConfigureItem(mi.root, MCI_OPT_UID, "F7C5567C-D1EE-484B-B4F6-24677A5AAAEF");
 
 	SET_UID(mi, 0x50321866, 0xba1, 0x46dd, 0xb3, 0xa6, 0xc3, 0xcc, 0x55, 0xf2, 0x42, 0x9e);
-	mi.flags = CMIF_TCHAR;
 	mi.hIcolibItem = iconList[1].hIcolib;
-	_A2T tszTitle(db->GetMenuTitle());
-	mi.name.t = tszTitle;
+	mi.name.a = db->GetMenuTitle();
 	mi.pszService = MS_DB_CHANGEPASSWORD;
 	hSetPwdMenu = Menu_AddMainMenuItem(&mi);
 	return 0;
-- 
cgit v1.2.3