less TCHARs:

- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*

git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

14 files changed, 164 insertions, 164 deletions

diff --git a/protocols/MRA/src/Mra.cpp b/protocols/MRA/src/Mra.cpp
index 0acd463767..b749ea37ee 100644
--- a/protocols/MRA/src/Mra.cpp
+++ b/protocols/MRA/src/Mra.cpp
@@ -54,7 +54,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 

 ///////////////////////////////////////////////////////////////////////////////

 

-static CMraProto* mraProtoInit(const char* pszProtoName, const TCHAR* tszUserName)

+static CMraProto* mraProtoInit(const char* pszProtoName, const wchar_t* tszUserName)

 {

 	CMraProto *ppro = new CMraProto(pszProtoName, tszUserName);

 	g_Instances.insert(ppro);

diff --git a/protocols/MRA/src/MraAdvancedSearch.cpp b/protocols/MRA/src/MraAdvancedSearch.cpp
index 59e2da8242..fd0bd8ecb0 100644
--- a/protocols/MRA/src/MraAdvancedSearch.cpp
+++ b/protocols/MRA/src/MraAdvancedSearch.cpp
@@ -12,42 +12,42 @@ struct FieldNames
 

 static const FieldNames GenderField[] =

 {

-	{ 1, LPGENT("Male")         },

-	{ 2, LPGENT("Female")       },

+	{ 1, LPGENW("Male")         },

+	{ 2, LPGENW("Female")       },

 	{ 0, NULL                   }

 };

 

 static const FieldNames MonthField[] =

 {

-	{ 1,  LPGENT("January")     },

-	{ 2,  LPGENT("February")    },

-	{ 3,  LPGENT("March")       },

-	{ 4,  LPGENT("April")       },

-	{ 5,  LPGENT("May")         },

-	{ 6,  LPGENT("June")        },

-	{ 7,  LPGENT("July")        },

-	{ 8,  LPGENT("August")      },

-	{ 9,  LPGENT("September")   },

-	{ 10, LPGENT("October")     },

-	{ 11, LPGENT("November")    },

-	{ 12, LPGENT("December")    },

+	{ 1,  LPGENW("January")     },

+	{ 2,  LPGENW("February")    },

+	{ 3,  LPGENW("March")       },

+	{ 4,  LPGENW("April")       },

+	{ 5,  LPGENW("May")         },

+	{ 6,  LPGENW("June")        },

+	{ 7,  LPGENW("July")        },

+	{ 8,  LPGENW("August")      },

+	{ 9,  LPGENW("September")   },

+	{ 10, LPGENW("October")     },

+	{ 11, LPGENW("November")    },

+	{ 12, LPGENW("December")    },

 	{ 0,  NULL                  }

 };

 

 static const FieldNames ZodiakField[] =

 {

-	{ 1,  LPGENT("Aries")       },

-	{ 2,  LPGENT("Taurus")      },

-	{ 3,  LPGENT("Gemini")      },

-	{ 4,  LPGENT("Cancer")      },

-	{ 5,  LPGENT("Leo")         },

-	{ 6,  LPGENT("Virgo")       },

-	{ 7,  LPGENT("Libra")       },

-	{ 8,  LPGENT("Scorpio")     },

-	{ 9,  LPGENT("Sagittarius") },

-	{ 10, LPGENT("Capricorn")   },

-	{ 11, LPGENT("Aquarius")    },

-	{ 12, LPGENT("Pisces")      },

+	{ 1,  LPGENW("Aries")       },

+	{ 2,  LPGENW("Taurus")      },

+	{ 3,  LPGENW("Gemini")      },

+	{ 4,  LPGENW("Cancer")      },

+	{ 5,  LPGENW("Leo")         },

+	{ 6,  LPGENW("Virgo")       },

+	{ 7,  LPGENW("Libra")       },

+	{ 8,  LPGENW("Scorpio")     },

+	{ 9,  LPGENW("Sagittarius") },

+	{ 10, LPGENW("Capricorn")   },

+	{ 11, LPGENW("Aquarius")    },

+	{ 12, LPGENW("Pisces")      },

 	{ 0,  NULL                  }

 };

 

@@ -76,7 +76,7 @@ void InitComboBoxNumders(HWND hWndCombo, DWORD dwStart, DWORD dwEnd)
 	ResetComboBox(hWndCombo);

 

 	for (DWORD i = dwStart; i <= dwEnd; i++) {

-		TCHAR szBuff[MAX_PATH];

+		wchar_t szBuff[MAX_PATH];

 		mir_sntprintf(szBuff, L"%lu", i);

 		DWORD dwItem = SendMessage(hWndCombo, CB_ADDSTRING, 0, (LPARAM)szBuff);

 		SendMessage(hWndCombo, CB_SETITEMDATA, dwItem, i);

@@ -254,7 +254,7 @@ HWND CMraProto::SearchAdvanced(HWND hWndDlg)
 {

 	DWORD dwRequestFlags = 0;

 	char szUser[MAX_PATH], szDomain[MAX_PATH];

-	TCHAR wszNickName[MAX_PATH], wszFirstName[MAX_PATH], wszLastName[MAX_PATH];

+	wchar_t wszNickName[MAX_PATH], wszFirstName[MAX_PATH], wszLastName[MAX_PATH];

 

 	size_t dwUserSize = GetDlgItemTextA(hWndDlg, IDC_EMAIL_USER, szUser, _countof(szUser));

 	size_t dwDomainSize = GetDlgItemTextA(hWndDlg, IDC_EMAIL_DOMAIN, szDomain, _countof(szDomain));

diff --git a/protocols/MRA/src/MraAvatars.cpp b/protocols/MRA/src/MraAvatars.cpp
index 9f42d03f4f..b7f7aac5b2 100644
--- a/protocols/MRA/src/MraAvatars.cpp
+++ b/protocols/MRA/src/MraAvatars.cpp
@@ -55,7 +55,7 @@ DWORD CMraProto::MraAvatarsQueueInitialize(HANDLE *phAvatarsQueueHandle)
 

 	MRA_AVATARS_QUEUE *pmraaqAvatarsQueue = new MRA_AVATARS_QUEUE();

 

-	TCHAR szBuffer[MAX_PATH];

+	wchar_t szBuffer[MAX_PATH];

 	mir_sntprintf(szBuffer, L"%s %s", m_tszUserName, TranslateT("Avatars' plugin connections"));

 

 	NETLIBUSER nlu = { sizeof(nlu) };

@@ -316,7 +316,7 @@ void CMraProto::MraAvatarsThreadProc(LPVOID lpParameter)
 			ai.hContact = pmraaqiAvatarsQueueItem->hContact;

 			ai.format = dwAvatarFormat;

 			if (db_get_b(NULL, MRA_AVT_SECT_NAME, "ReturnAbsolutePath", MRA_AVT_DEFAULT_RET_ABC_PATH))

-				_tcsncpy_s(ai.filename, wszFileName, _TRUNCATE);

+				wcsncpy_s(ai.filename, wszFileName, _TRUNCATE);

 			else

 				PathToRelativeT(wszFileName, ai.filename);

 

@@ -475,7 +475,7 @@ DWORD CMraProto::MraAvatarsGetFileName(HANDLE hQueue, MCONTACT hContact, DWORD d
 	if (IsContactChatAgent(hContact))

 		return ERROR_NOT_SUPPORTED;

 

-	TCHAR tszBase[MAX_PATH];

+	wchar_t tszBase[MAX_PATH];

 	mir_sntprintf(tszBase, L"%s\\%s\\", VARST(L"%miranda_avatarcache%"), m_tszUserName);

 	res = tszBase;

 

@@ -631,7 +631,7 @@ INT_PTR CALLBACK MraAvatarsQueueDlgProcOpts(HWND hWndDlg, UINT msg, WPARAM wPara
 			db_set_b(NULL, MRA_AVT_SECT_NAME, "UseKeepAliveConn", IsDlgButtonChecked(hWndDlg, IDC_USE_KEEPALIVE_CONN));

 			db_set_dw(NULL, MRA_AVT_SECT_NAME, "ServerPort", GetDlgItemInt(hWndDlg, IDC_SERVERPORT, NULL, FALSE));

 

-			TCHAR szServer[MAX_PATH];

+			wchar_t szServer[MAX_PATH];

 			GetDlgItemText(hWndDlg, IDC_SERVER, szServer, _countof(szServer));

 			db_set_ts(NULL, MRA_AVT_SECT_NAME, "Server", szServer);

 			return TRUE;

diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h
index 1b9f89a0c1..ab2eb18dc0 100644
--- a/protocols/MRA/src/MraConstans.h
+++ b/protocols/MRA/src/MraConstans.h
@@ -40,7 +40,7 @@ static const LPSTR lpcszMailRuDomains[] =
 #define EMAILS_MIN_COUNT                     16 //internal   // колличество элементов обязательно проверяемых при извлечении email адреса из инфы юзера

 #define PHONES_MIN_COUNT                     4 //internal   // колличество элементов обязательно проверяемых при извлечении email адреса из инфы юзера

 

-#define MRA_ALARM_MESSAGE                    LPGENT("Your contact wakes you")

+#define MRA_ALARM_MESSAGE                    LPGENW("Your contact wakes you")

 

 #define MRA_GOTO_INBOX                       "/GotoInbox"

 #define MRA_GOTO_INBOX_STR                   LPGEN("Display &Inbox")

@@ -157,7 +157,7 @@ static const LPSTR lpcszMailRuDomains[] =
 #define MRA_DEFAULT_SLOW_SEND                TRUE

 #define MRA_DEFAULT_CVT_SMILES_TO_TAGS       TRUE

 #define MRA_DEFAULT_MIRVER_RAW               FALSE // hidden option

-#define MRA_DEFAULT_AUTH_MESSAGE             LPGEN("Please authorize me")

+#define MRA_DEFAULT_AUTH_MESSAGE             LPGENW("Please authorize me")

 

 #define MRA_DEFAULT_RTF_RECEIVE_ENABLE       FALSE

 #define MRA_DEFAULT_RTF_SEND_ENABLE          TRUE

diff --git a/protocols/MRA/src/MraFilesQueue.cpp b/protocols/MRA/src/MraFilesQueue.cpp
index 2b860467f0..bcb9aead3c 100644
--- a/protocols/MRA/src/MraFilesQueue.cpp
+++ b/protocols/MRA/src/MraFilesQueue.cpp
@@ -661,7 +661,7 @@ DWORD CMraProto::MraFilesQueueAddReceive(HANDLE hQueue, DWORD dwFlags, MCONTACT
 		p.dwNameLen = mir_tstrlen(p.lpwszName);

 		p.dwSize = _wtoi(wszCurrSize);

 		dat->dwFilesTotalSize += p.dwSize;

-		dwFileNameTotalSize += p.dwNameLen * sizeof(TCHAR);

+		dwFileNameTotalSize += p.dwNameLen * sizeof(wchar_t);

 

 		dat->dwFilesCount++;

 	}

diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp
index 8faf3d38a1..8b2c83a35d 100644
--- a/protocols/MRA/src/MraIcons.cpp
+++ b/protocols/MRA/src/MraIcons.cpp
@@ -74,7 +74,7 @@ void IconsLoad()
 void InitXStatusIcons()

 {

 	// load libs

-	TCHAR szBuff[MAX_FILEPATH];

+	wchar_t szBuff[MAX_FILEPATH];

 	if (GetModuleFileName(NULL, szBuff, _countof(szBuff))) {

 		LPWSTR lpwszFileName;

 		g_dwMirWorkDirPathLen = GetFullPathName(szBuff, MAX_FILEPATH, g_szMirWorkDirPath, &lpwszFileName);

@@ -89,7 +89,7 @@ void InitXStatusIcons()
 				g_hDLLXStatusIcons = LoadLibraryEx(szBuff, NULL, 0);

 				if (g_hDLLXStatusIcons) {

 					dwBuffLen = LoadString(g_hDLLXStatusIcons, IDS_IDENTIFY, szBuff, MAX_FILEPATH);

-					if (dwBuffLen == 0 || _tcsnicmp(L"# Custom Status Icons #", szBuff, 23)) {

+					if (dwBuffLen == 0 || wcsnicmp(L"# Custom Status Icons #", szBuff, 23)) {

 						FreeLibrary(g_hDLLXStatusIcons);

 						g_hDLLXStatusIcons = NULL;

 					}

@@ -101,8 +101,8 @@ void InitXStatusIcons()
 	GetModuleFileName((g_hDLLXStatusIcons != NULL) ? g_hDLLXStatusIcons : g_hInstance, szBuff, _countof(szBuff));

 

 	SKINICONDESC sid = { 0 };

-	sid.section.t = LPGENT("Protocols")L"/" LPGENT("MRA") L"/" LPGENT("Custom Status");

-	sid.defaultFile.t = szBuff;

+	sid.section.w = LPGENW("Protocols")L"/" LPGENW("MRA") L"/" LPGENW("Custom Status");

+	sid.defaultFile.w = szBuff;

 	sid.flags = SIDF_ALL_TCHAR;

 

 	hXStatusAdvancedStatusIcons[0] = NULL;

@@ -112,7 +112,7 @@ void InitXStatusIcons()
 		sid.pszName = szIconName;

 

 		int iCurIndex = i+IDI_XSTATUS1-1;

-		sid.description.t = (TCHAR*)lpcszXStatusNameDef[i];

+		sid.description.w = (wchar_t*)lpcszXStatusNameDef[i];

 		sid.iDefaultIndex = -iCurIndex;

 

 		hXStatusAdvancedStatusIcons[i] = IcoLib_AddIcon(&sid);

diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp
index 48eb22e5bc..bad3861365 100644
--- a/protocols/MRA/src/MraPopUp.cpp
+++ b/protocols/MRA/src/MraPopUp.cpp
@@ -4,13 +4,13 @@
 #define POPUPS_TYPES_COUNT	7

 static LPCWSTR lpcwszPopupsTypes[] =

 {

-	LPGENT("None"),

-	LPGENT("Debug"),

-	LPGENT("Information"),

-	LPGENT("Question"),

-	LPGENT("Warning"),

-	LPGENT("Error"),

-	LPGENT("NewMail"),

+	LPGENW("None"),

+	LPGENW("Debug"),

+	LPGENW("Information"),

+	LPGENW("Question"),

+	LPGENW("Warning"),

+	LPGENW("Error"),

+	LPGENW("NewMail"),

 	NULL

 };

 

@@ -131,8 +131,8 @@ int CMraProto::OnPopupOptInit(WPARAM wParam, LPARAM)
 		odp.position = 100000000;

 		odp.hInstance = g_hInstance;

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS);

-		odp.ptszTitle = m_tszUserName;

-		odp.ptszGroup = LPGENT("Popups");

+		odp.pwszTitle = m_tszUserName;

+		odp.pwszGroup = LPGENW("Popups");

 		odp.groupPosition = 900000000;

 		odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

 		odp.pfnDlgProc = MraPopupDlgProcOpts;

diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index 5422fd32f8..ac34d5dfd1 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -7,7 +7,7 @@ static int MraExtraIconsApplyAll(WPARAM, LPARAM)
 	return 0;

 }

 

-CMraProto::CMraProto(const char* _module, const TCHAR* _displayName) :

+CMraProto::CMraProto(const char* _module, const wchar_t* _displayName) :

 	PROTO<CMraProto>(_module, _displayName),

 	m_bLoggedIn(false),

 	m_groups(5, NumericKeySortT)

@@ -35,7 +35,7 @@ CMraProto::CMraProto(const char* _module, const TCHAR* _displayName) :
 	if (ServiceExists(MS_NUDGE_SEND))

 		m_heNudgeReceived = CreateProtoEvent(PE_NUDGE);

 

-	TCHAR name[MAX_PATH];

+	wchar_t name[MAX_PATH];

 	mir_sntprintf(name, TranslateT("%s connection"), m_tszUserName);

 

 	NETLIBUSER nlu = { sizeof(nlu) };

@@ -155,7 +155,7 @@ MCONTACT CMraProto::AddToList(int flags, PROTOSEARCHRESULT *psr)
 	if (psr->cbSize != sizeof(PROTOSEARCHRESULT))

 		return 0;

 

-	return AddToListByEmail(psr->email.t, psr->nick.t, psr->firstName.t, psr->lastName.t, flags);

+	return AddToListByEmail(psr->email.w, psr->nick.w, psr->firstName.w, psr->lastName.w, flags);

 }

 

 MCONTACT CMraProto::AddToListByEvent(int, int, MEVENT hDbEvent)

@@ -200,7 +200,7 @@ int CMraProto::Authorize(MEVENT hDBEvent)
 	return 0;

 }

 

-int CMraProto::AuthDeny(MEVENT hDBEvent, const TCHAR* szReason)

+int CMraProto::AuthDeny(MEVENT hDBEvent, const wchar_t* szReason)

 {

 	if (!m_bLoggedIn) return 1;

 

@@ -230,7 +230,7 @@ int CMraProto::AuthRecv(MCONTACT, PROTORECVEVENT* pre)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-HANDLE CMraProto::FileAllow(MCONTACT, HANDLE hTransfer, const TCHAR *szPath)

+HANDLE CMraProto::FileAllow(MCONTACT, HANDLE hTransfer, const wchar_t *szPath)

 {

 	if (szPath != NULL)

 		if (MraFilesQueueAccept(hFilesQueueHandle, (DWORD_PTR)hTransfer, szPath, mir_tstrlen(szPath)) == NO_ERROR)

@@ -249,7 +249,7 @@ int CMraProto::FileCancel(MCONTACT hContact, HANDLE hTransfer)
 	return 1;

 }

 

-int CMraProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR*)

+int CMraProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const wchar_t*)

 {

 	return FileCancel(hContact, hTransfer);

 }

@@ -300,12 +300,12 @@ int CMraProto::GetInfo(MCONTACT hContact, int)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-HANDLE CMraProto::SearchBasic(const TCHAR *id)

+HANDLE CMraProto::SearchBasic(const wchar_t *id)

 {

 	return SearchByEmail(id);

 }

 

-HANDLE CMraProto::SearchByEmail(const TCHAR *email)

+HANDLE CMraProto::SearchByEmail(const wchar_t *email)

 {

 	if (m_bLoggedIn && email) {

 		CMStringA szEmail(email);

@@ -315,7 +315,7 @@ HANDLE CMraProto::SearchByEmail(const TCHAR *email)
 	return NULL;

 }

 

-HANDLE CMraProto::SearchByName(const TCHAR *pszNick, const TCHAR *pszFirstName, const TCHAR *pszLastName)

+HANDLE CMraProto::SearchByName(const wchar_t *pszNick, const wchar_t *pszFirstName, const wchar_t *pszLastName)

 {

 	if (m_bLoggedIn && (*pszNick || *pszFirstName || *pszLastName)) {

 		DWORD dwRequestFlags = 0;

@@ -371,7 +371,7 @@ int CMraProto::SendContacts(MCONTACT hContact, int, int nContacts, MCONTACT *hCo
 	return iRet;

 }

 

-HANDLE CMraProto::SendFile(MCONTACT hContact, const TCHAR*, TCHAR **ppszFiles)

+HANDLE CMraProto::SendFile(MCONTACT hContact, const wchar_t*, wchar_t **ppszFiles)

 {

 	if (!m_bLoggedIn || !hContact || !ppszFiles)

 		return NULL;

@@ -517,7 +517,7 @@ HANDLE CMraProto::GetAwayMsg(MCONTACT hContact)
 	if (!m_bLoggedIn || !hContact)

 		return 0;

 

-	TCHAR szStatusDesc[MICBLOG_STATUS_MAX + MICBLOG_STATUS_MAX + MAX_PATH], szTime[64];

+	wchar_t szStatusDesc[MICBLOG_STATUS_MAX + MICBLOG_STATUS_MAX + MAX_PATH], szTime[64];

 	DWORD dwTime;

 	int iRet = 0;

 

@@ -537,7 +537,7 @@ HANDLE CMraProto::GetAwayMsg(MCONTACT hContact)
 	return (HANDLE)iRet;

 }

 

-int CMraProto::SetAwayMsg(int iStatus, const TCHAR *msg)

+int CMraProto::SetAwayMsg(int iStatus, const wchar_t *msg)

 {

 	if (!m_bLoggedIn)

 		return 1;

diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h
index 1ce195d477..8ea6b37f14 100644
--- a/protocols/MRA/src/MraProto.h
+++ b/protocols/MRA/src/MraProto.h
@@ -31,7 +31,7 @@ struct MraGroupItem
 

 struct CMraProto : public PROTO<CMraProto>

 {

-				CMraProto(const char*, const TCHAR*);

+				CMraProto(const char*, const wchar_t*);

 				~CMraProto();

 

 	// ====================================================================================

@@ -42,33 +42,33 @@ struct CMraProto : public PROTO<CMraProto>
 	virtual	MCONTACT  __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent);

 

 	virtual	int       __cdecl Authorize(MEVENT hDBEvent);

-	virtual	int       __cdecl AuthDeny(MEVENT hDBEvent, const TCHAR* szReason);

+	virtual	int       __cdecl AuthDeny(MEVENT hDBEvent, const wchar_t* szReason);

 	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

 

-	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath);

+	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const wchar_t* szPath);

 	virtual	int       __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer);

-	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason);

+	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const wchar_t* szReason);

 

 	virtual	DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL);

 	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType);

 

-	virtual	HANDLE    __cdecl SearchBasic(const TCHAR* id);

-	virtual	HANDLE    __cdecl SearchByEmail(const TCHAR* email);

-	virtual	HANDLE    __cdecl SearchByName(const TCHAR* nick, const TCHAR* firstName, const TCHAR* lastName);

+	virtual	HANDLE    __cdecl SearchBasic(const wchar_t* id);

+	virtual	HANDLE    __cdecl SearchByEmail(const wchar_t* email);

+	virtual	HANDLE    __cdecl SearchByName(const wchar_t* nick, const wchar_t* firstName, const wchar_t* lastName);

 	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

 	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

 	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

 

 	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

-	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles);

+	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const wchar_t *szDescription, wchar_t **ppszFiles);

 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);

 

 	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);

 	virtual	int       __cdecl SetStatus(int iNewStatus);

 

 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

-	virtual	int       __cdecl SetAwayMsg(int m_iStatus, const TCHAR* msg);

+	virtual	int       __cdecl SetAwayMsg(int m_iStatus, const wchar_t* msg);

 

 	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type);

 

diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index ebeb34d92d..3f863a1ed5 100644
--- a/protocols/MRA/src/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
@@ -648,7 +648,7 @@ void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA &
 		CMStringA szEmail;

 		MCONTACT hContact = NULL;

 

-		TCHAR szMailBoxStatus[MAX_SECONDLINE];

+		wchar_t szMailBoxStatus[MAX_SECONDLINE];

 		mir_sntprintf(szMailBoxStatus, TranslateT("Unread mail is available: %lu/%lu messages"), m_dwEmailMessagesUnread, dwEmailMessagesTotal);

 

 		if (!pszFrom.IsEmpty() || !pszSubject.IsEmpty()) {

@@ -658,7 +658,7 @@ void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA &
 

 			mir_sntprintf(szStatusText, TranslateT("From: %S\r\nSubject: %S\r\n%s"), pszFrom.c_str(), szSubject.c_str(), szMailBoxStatus);

 		}

-		else _tcsncpy_s(szStatusText, szMailBoxStatus, _TRUNCATE);

+		else wcsncpy_s(szStatusText, szMailBoxStatus, _TRUNCATE);

 

 		if (bTrayIconNewMailNotify) {

 			char szServiceFunction[MAX_PATH] = { 0 }, *pszServiceFunctionName;

@@ -870,11 +870,11 @@ bool CMraProto::GetContactFirstEMail(MCONTACT hContact, BOOL bMRAOnly, CMStringA
 

 void CMraProto::ShowFormattedErrorMessage(LPWSTR lpwszErrText, DWORD dwErrorCode)

 {

-	TCHAR szErrorText[2048], szErrDescription[1024];

+	wchar_t szErrorText[2048], szErrDescription[1024];

 	size_t dwErrDescriptionSize;

 

 	if (dwErrorCode == NO_ERROR)

-		_tcsncpy_s(szErrorText, TranslateTS(lpwszErrText), _TRUNCATE);

+		wcsncpy_s(szErrorText, TranslateTS(lpwszErrText), _TRUNCATE);

 	else {

 		dwErrDescriptionSize = (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwErrorCode, 0, szErrDescription, (_countof(szErrDescription) - sizeof(WCHAR)), NULL) - 2);

 		szErrDescription[dwErrDescriptionSize] = 0;

@@ -1019,7 +1019,7 @@ INT_PTR CALLBACK SetXStatusDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LP
 

 	case WM_TIMER:

 		if (dat->dwCountdown != -1) {

-			TCHAR szBuff[MAX_PATH];

+			wchar_t szBuff[MAX_PATH];

 			mir_sntprintf(szBuff, TranslateT("Closing in %ld"), dat->dwCountdown--);

 			SetDlgItemText(hWndDlg, IDOK, szBuff);

 			break;

@@ -1046,7 +1046,7 @@ INT_PTR CALLBACK SetXStatusDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LP
 		SetWindowLongPtr(hWndDlg, GWLP_USERDATA, 0);

 		if (dat) { // set our xStatus

 

-			TCHAR szBuff[STATUS_TITLE_MAX + STATUS_DESC_MAX];

+			wchar_t szBuff[STATUS_TITLE_MAX + STATUS_DESC_MAX];

 			DWORD dwBuffSize = GetDlgItemText(hWndDlg, IDC_XMSG, szBuff, (STATUS_DESC_MAX + 1));

 

 			char szValueName[MAX_PATH];

@@ -1145,7 +1145,7 @@ INT_PTR CALLBACK SendReplyBlogStatusDlgProc(HWND hWndDlg, UINT message, WPARAM w
 			{

 				DWORD dwFlags;

 				DWORDLONG dwBlogStatusID;

-				TCHAR szBuff[MICBLOG_STATUS_MAX];

+				wchar_t szBuff[MICBLOG_STATUS_MAX];

 

 				GetDlgItemText(hWndDlg, IDC_MSG_TO_SEND, szBuff, _countof(szBuff));

 

@@ -1172,7 +1172,7 @@ INT_PTR CALLBACK SendReplyBlogStatusDlgProc(HWND hWndDlg, UINT message, WPARAM w
 

 		case IDC_MSG_TO_SEND:

 			if (HIWORD(wParam) == EN_CHANGE) {

-				TCHAR tszBuff[MAX_PATH];

+				wchar_t tszBuff[MAX_PATH];

 				size_t dwMessageSize = GetWindowTextLength(GetDlgItem(hWndDlg, IDC_MSG_TO_SEND));

 

 				EnableWindow(GetDlgItem(hWndDlg, IDOK), (int)dwMessageSize);

@@ -1232,7 +1232,7 @@ DWORD FindFile(LPWSTR lpszFolder, DWORD dwFolderLen, LPWSTR lpszFileName, DWORD
 	DWORD dwRetErrorCode;

 

 	if (lpszFolder && dwFolderLen && lpszFileName && dwFileNameLen) {

-		TCHAR szPath[32768];

+		wchar_t szPath[32768];

 		DWORD dwPathLen, dwRecDeepAllocated, dwRecDeepCurPos, dwFilePathLen;

 		RECURSION_DATA_STACK_ITEM *prdsiItems;

 

@@ -1434,15 +1434,15 @@ static DWORD ReplaceInBuff(LPVOID lpInBuff, size_t dwInBuffSize, size_t dwReplac
 }

 

 static const LPTSTR lpszXMLTags[] = { L"&apos;", L"&quot;", L"&amp;", L"&lt;", L"&gt;" };

-static const size_t dwXMLTagsCount[] = { (6 * sizeof(TCHAR)), (6 * sizeof(TCHAR)), (5 * sizeof(TCHAR)), (4 * sizeof(TCHAR)), (4 * sizeof(TCHAR)) };

+static const size_t dwXMLTagsCount[] = { (6 * sizeof(wchar_t)), (6 * sizeof(wchar_t)), (5 * sizeof(wchar_t)), (4 * sizeof(wchar_t)), (4 * sizeof(wchar_t)) };

 static const LPTSTR lpszXMLSymbols[] = { L"\'", L"\"", L"&", L"<", L">" };

-static const size_t dwXMLSymbolsCount[] = { sizeof(TCHAR), sizeof(TCHAR), sizeof(TCHAR), sizeof(TCHAR), sizeof(TCHAR) };

+static const size_t dwXMLSymbolsCount[] = { sizeof(wchar_t), sizeof(wchar_t), sizeof(wchar_t), sizeof(wchar_t), sizeof(wchar_t) };

 

 //Decode XML coded string. The function translate special xml code into standard characters.

 CMStringW DecodeXML(const CMStringW &lptszMessage)

 {

 	CMStringW ret('\0', (lptszMessage.GetLength() * 4));

-	ReplaceInBuff((void*)lptszMessage.GetString(), lptszMessage.GetLength()*sizeof(TCHAR), _countof(lpszXMLTags), (LPVOID*)lpszXMLTags, (size_t*)dwXMLTagsCount, (LPVOID*)lpszXMLSymbols, (size_t*)dwXMLSymbolsCount, ret);

+	ReplaceInBuff((void*)lptszMessage.GetString(), lptszMessage.GetLength()*sizeof(wchar_t), _countof(lpszXMLTags), (LPVOID*)lpszXMLTags, (size_t*)dwXMLTagsCount, (LPVOID*)lpszXMLSymbols, (size_t*)dwXMLSymbolsCount, ret);

 	return ret;

 }

 

@@ -1450,6 +1450,6 @@ CMStringW DecodeXML(const CMStringW &lptszMessage)
 CMStringW EncodeXML(const CMStringW &lptszMessage)

 {

 	CMStringW ret('\0', (lptszMessage.GetLength() * 4));

-	ReplaceInBuff((void*)lptszMessage.GetString(), lptszMessage.GetLength()*sizeof(TCHAR), _countof(lpszXMLTags), (LPVOID*)lpszXMLSymbols, (size_t*)dwXMLSymbolsCount, (LPVOID*)lpszXMLTags, (size_t*)dwXMLTagsCount, ret);

+	ReplaceInBuff((void*)lptszMessage.GetString(), lptszMessage.GetLength()*sizeof(wchar_t), _countof(lpszXMLTags), (LPVOID*)lpszXMLSymbols, (size_t*)dwXMLSymbolsCount, (LPVOID*)lpszXMLTags, (size_t*)dwXMLTagsCount, ret);

 	return ret;

 }

diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp
index 902f9eac07..a0ac316017 100644
--- a/protocols/MRA/src/Mra_menus.cpp
+++ b/protocols/MRA/src/Mra_menus.cpp
@@ -76,7 +76,7 @@ INT_PTR CMraProto::MraRequestAuthorization(WPARAM hContact, LPARAM)
 

 	CMStringW wszAuthMessage;

 	if (!mraGetStringW(NULL, "AuthMessage", wszAuthMessage))

-		wszAuthMessage = TranslateT(MRA_DEFAULT_AUTH_MESSAGE);

+		wszAuthMessage = TranslateW(MRA_DEFAULT_AUTH_MESSAGE);

 

 	if (wszAuthMessage.IsEmpty())

 		return 1;

@@ -281,12 +281,12 @@ int CMraProto::MraRebuildStatusMenu(WPARAM, LPARAM)
 

 	HGENMENU hRoot;

 	{

-		TCHAR szItem[MAX_PATH + 64];

+		wchar_t szItem[MAX_PATH + 64];

 		mir_sntprintf(szItem, L"%s Custom Status", m_tszUserName);

 

 		CMenuItem mi;

 		mi.root = pcli->pfnGetProtocolMenu(m_szModuleName);

-		mi.name.t = szItem;

+		mi.name.w = szItem;

 		mi.position = 10001;

 		hRoot = Menu_AddStatusMenuItem(&mi, m_szModuleName);

 	}

@@ -308,14 +308,14 @@ int CMraProto::MraRebuildStatusMenu(WPARAM, LPARAM)
 		if (i) {

 			mir_snprintf(szValueName, "XStatus%ldName", i);

 			if (mraGetStringW(NULL, szValueName, szStatusTitle))

-				mi.name.t = (TCHAR*)szStatusTitle.c_str();

+				mi.name.w = (wchar_t*)szStatusTitle.c_str();

 			else

-				mi.name.t = (TCHAR*)lpcszXStatusNameDef[i];

+				mi.name.w = (wchar_t*)lpcszXStatusNameDef[i];

 

 			mi.hIcolibItem = hXStatusAdvancedStatusIcons[i];

 		}

 		else {

-			mi.name.t = (TCHAR*)lpcszXStatusNameDef[i];

+			mi.name.w = (wchar_t*)lpcszXStatusNameDef[i];

 			mi.hIcolibItem = NULL;

 		}

 		hXStatusMenuItems[i] = Menu_AddStatusMenuItem(&mi, m_szModuleName);

@@ -340,7 +340,7 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI
 

 		hRootMenu = Menu_GetProtocolRoot(this);

 		if (hRootMenu == NULL) {

-			mi.name.t = m_tszUserName;

+			mi.name.w = m_tszUserName;

 			mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 			mi.hIcolibItem = g_hMainIcon;

 			hRootMenu = Menu_AddProtoMenuItem(&mi);

diff --git a/protocols/MRA/src/Mra_options.cpp b/protocols/MRA/src/Mra_options.cpp
index abf966c43f..6247ef9249 100644
--- a/protocols/MRA/src/Mra_options.cpp
+++ b/protocols/MRA/src/Mra_options.cpp
@@ -36,7 +36,7 @@ INT_PTR CALLBACK DlgProcOptsAccount(HWND hWndDlg, UINT msg, WPARAM wParam, LPARA
 	case WM_NOTIFY:

 		switch (((LPNMHDR)lParam)->code) {

 		case PSN_APPLY:

-			TCHAR szBuff[MAX_EMAIL_LEN];

+			wchar_t szBuff[MAX_EMAIL_LEN];

 			GetDlgItemText(hWndDlg, IDC_LOGIN, szBuff, _countof(szBuff));

 			ppro->setTString(NULL, "e-mail", szBuff);

 

@@ -86,7 +86,7 @@ INT_PTR CALLBACK DlgProcAccount(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM lP
 	case WM_NOTIFY:

 		switch (((LPNMHDR)lParam)->code) {

 		case PSN_APPLY:

-			TCHAR szBuff[MAX_EMAIL_LEN];

+			wchar_t szBuff[MAX_EMAIL_LEN];

 			GetDlgItemText(hWndDlg, IDC_LOGIN, szBuff, _countof(szBuff));

 			ppro->mraSetStringW(NULL, "e-mail", szBuff);

 

@@ -186,7 +186,7 @@ INT_PTR CALLBACK DlgProcOptsConnections(HWND hWndDlg, UINT msg, WPARAM wParam, L
 	case WM_NOTIFY:

 		switch (((LPNMHDR)lParam)->code) {

 		case PSN_APPLY:

-			TCHAR szBuff[MAX_PATH];

+			wchar_t szBuff[MAX_PATH];

 			GetDlgItemText(hWndDlg, IDC_SERVER, szBuff, _countof(szBuff));

 			ppro->mraSetStringW(NULL, "Server", szBuff);

 			ppro->setWord("ServerPort", (WORD)GetDlgItemInt(hWndDlg, IDC_SERVERPORT, NULL, FALSE));

@@ -216,26 +216,26 @@ int CMraProto::OnOptionsInit(WPARAM wParam, LPARAM lParam)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.dwInitParam = (LPARAM)this;

 	odp.hInstance = g_hInstance;

-	odp.ptszTitle = m_tszUserName;

-	odp.ptszGroup = LPGENT("Network");

+	odp.pwszTitle = m_tszUserName;

+	odp.pwszGroup = LPGENW("Network");

 	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

 

-	odp.ptszTab = LPGENT("Account");

+	odp.pwszTab = LPGENW("Account");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ACCOUNT);

 	odp.pfnDlgProc = DlgProcOptsAccount;

 	Options_AddPage(wParam, &odp);

 

-	odp.ptszTab = LPGENT("Connections");

+	odp.pwszTab = LPGENW("Connections");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONNECTIONS);

 	odp.pfnDlgProc = DlgProcOptsConnections;

 	Options_AddPage(wParam, &odp);

 

-	odp.ptszTab = LPGENT("Files");

+	odp.pwszTab = LPGENW("Files");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILES);

 	odp.pfnDlgProc = MraFilesQueueDlgProcOpts;

 	Options_AddPage(wParam, &odp);

 

-	odp.ptszTab = LPGENT("Avatars");

+	odp.pwszTab = LPGENW("Avatars");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AVATRS);

 	odp.pfnDlgProc = MraAvatarsQueueDlgProcOpts;

 	Options_AddPage(wParam, &odp);

diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp
index 133101acee..283726a3d2 100644
--- a/protocols/MRA/src/Mra_proto.cpp
+++ b/protocols/MRA/src/Mra_proto.cpp
@@ -502,12 +502,12 @@ bool CMraProto::CmdUserInfo(BinBuffer &buf)
 		}

 		else if (szString == "micblog.status.id") {

 			buf >> szStringW;

-			DWORDLONG dwBlogStatusID = _ttoi64(szStringW);

+			DWORDLONG dwBlogStatusID = _wtoi64(szStringW);

 			mraWriteContactSettingBlob(NULL, DBSETTING_BLOGSTATUSID, &dwBlogStatusID, sizeof(DWORDLONG));

 		}

 		else if (szString == "micblog.status.time") {

 			buf >> szStringW;

-			setDword(DBSETTING_BLOGSTATUSTIME, _ttoi(szStringW));

+			setDword(DBSETTING_BLOGSTATUSTIME, _wtoi(szStringW));

 		}

 		else if (szString == "micblog.status.text") {

 			buf >> szStringW;

@@ -652,7 +652,7 @@ bool CMraProto::CmdFileTransferAck(BinBuffer &buf)
 		MraFilesQueueSendMirror(hFilesQueueHandle, dwTemp, szString);

 		break;

 	default:// ## unknown error

-		TCHAR szBuff[1024];

+		wchar_t szBuff[1024];

 		mir_sntprintf(szBuff, TranslateT("MRIM_CS_FILE_TRANSFER_ACK: unknown error, code: %lu"), dwAckType);

 		ShowFormattedErrorMessage(szBuff, NO_ERROR);

 		break;

@@ -749,7 +749,7 @@ bool CMraProto::CmdContactAck(int cmd, int seq, BinBuffer &buf)
 			ShowFormattedErrorMessage(L"Group limit is 20", NO_ERROR);

 			break;

 		default:// ## unknown error

-			TCHAR szBuff[1024];

+			wchar_t szBuff[1024];

 			mir_sntprintf(szBuff, TranslateT("MRIM_CS_*_CONTACT_ACK: unknown server error, code: %lu"), dwTemp);

 			MraPopupShowFromAgentW(MRA_POPUP_TYPE_DEBUG, 0, szBuff);

 			break;

@@ -941,7 +941,7 @@ bool CMraProto::CmdAnketaInfo(int seq, BinBuffer &buf)
 				}

 			}

 			else if (dwAckType == ACKTYPE_SEARCH) {

-				TCHAR szNick[MAX_EMAIL_LEN] = { 0 },

+				wchar_t szNick[MAX_EMAIL_LEN] = { 0 },

 					szFirstName[MAX_EMAIL_LEN] = { 0 },

 					szLastName[MAX_EMAIL_LEN] = { 0 },

 					szEmail[MAX_EMAIL_LEN] = { 0 };

@@ -950,11 +950,11 @@ bool CMraProto::CmdAnketaInfo(int seq, BinBuffer &buf)
 

 				psr.cbSize = sizeof(psr);

 				psr.flags = PSR_UNICODE;

-				psr.nick.t = szNick;

-				psr.firstName.t = szFirstName;

-				psr.lastName.t = szLastName;

-				psr.email.t = szEmail;

-				psr.id.t = szEmail;

+				psr.nick.w = szNick;

+				psr.firstName.w = szFirstName;

+				psr.lastName.w = szLastName;

+				psr.email.w = szEmail;

+				psr.id.w = szEmail;

 

 				for (DWORD i = 0; i < dwFieldsNum; i++) {

 					CMStringA &fld = pmralpsFields[i];

@@ -1043,7 +1043,7 @@ bool CMraProto::CmdGame(BinBuffer &buf)
 	case GAME_MESSAGES_NUMBER:

 		break;

 	default:

-		TCHAR szBuff[1024];

+		wchar_t szBuff[1024];

 		mir_sntprintf(szBuff, TranslateT("MRIM_CS_GAME: unknown internal game message code: %lu"), dwGameMsg);

 		MraPopupShowFromAgentW(MRA_POPUP_TYPE_DEBUG, 0, szBuff);

 		break;

@@ -1307,7 +1307,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf)
 			CMStringW wszAuthMessage, nick;

 

 			if (mraGetStringW(NULL, "AuthMessage", wszAuthMessage) == FALSE) // def auth message

-				wszAuthMessage = TranslateT(MRA_DEFAULT_AUTH_MESSAGE);

+				wszAuthMessage = TranslateW(MRA_DEFAULT_AUTH_MESSAGE);

 

 			for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

 				if (GetContactBasicInfoW(hContact, &dwID, NULL, NULL, NULL, NULL, &email, NULL, NULL) == NO_ERROR)

@@ -1350,7 +1350,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf)
 		else if (dwTemp == GET_CONTACTS_INTERR) // произошла внутренняя ошибка

 			ShowFormattedErrorMessage(L"MRIM_CS_CONTACT_LIST2: internal server error", NO_ERROR);

 		else {

-			TCHAR szBuff[1024];

+			wchar_t szBuff[1024];

 			mir_sntprintf(szBuff, TranslateT("MRIM_CS_CONTACT_LIST2: unknown server error, code: %lu"), dwTemp);

 			MraPopupShowFromAgentW(MRA_POPUP_TYPE_DEBUG, 0, szBuff);

 		}

diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp
index d5477896e7..b5902ed4ae 100644
--- a/protocols/MRA/src/Mra_svcs.cpp
+++ b/protocols/MRA/src/Mra_svcs.cpp
@@ -66,56 +66,56 @@ LPCSTR lpcszStatusUri[] =
 

 LPCWSTR lpcszXStatusNameDef[] =

 {

-	LPGENT("None"),

-	LPGENT("Sick"),

-	LPGENT("Home"),

-	LPGENT("Eating"),

-	LPGENT("Compass"),

-	LPGENT("On WC"),

-	LPGENT("Cooking"),

-	LPGENT("Walking"),

-	LPGENT("Alien"),

-	LPGENT("Shrimp"),

-	LPGENT("Got lost"),

-	LPGENT("Crazy"),

-	LPGENT("Duck"),

-	LPGENT("Playing"),

-	LPGENT("Smoking"),

-	LPGENT("Office"),

-	LPGENT("Meeting"),

-	LPGENT("Beer"),

-	LPGENT("Coffee"),

-	LPGENT("Working"),

-	LPGENT("Relaxing"),

-	LPGENT("On the phone"),

-	LPGENT("In institute"),

-	LPGENT("At school"),

-	LPGENT("Wrong number"),

-	LPGENT("Laughing"),

-	LPGENT("Malicious"),

-	LPGENT("Imp"),

-	LPGENT("Blind"),

-	LPGENT("Disappointed"),

-	LPGENT("Almost crying"),

-	LPGENT("Fearful"),

-	LPGENT("Angry"),

-	LPGENT("Vampire"),

-	LPGENT("Ass"),

-	LPGENT("Love"),

-	LPGENT("Sleeping"),

-	LPGENT("Cool!"),

-	LPGENT("Peace!"),

-	LPGENT("Cock a snook"),

-	LPGENT("Get out"),

-	LPGENT("Death"),

-	LPGENT("Rocket"),

-	LPGENT("Devil-fish"),

-	LPGENT("Heavy metal"),

-	LPGENT("Things look bad"),

-	LPGENT("Squirrel"),

-	LPGENT("Star"),

-	LPGENT("Music"),

-	LPGENT("Dating"),

+	LPGENW("None"),

+	LPGENW("Sick"),

+	LPGENW("Home"),

+	LPGENW("Eating"),

+	LPGENW("Compass"),

+	LPGENW("On WC"),

+	LPGENW("Cooking"),

+	LPGENW("Walking"),

+	LPGENW("Alien"),

+	LPGENW("Shrimp"),

+	LPGENW("Got lost"),

+	LPGENW("Crazy"),

+	LPGENW("Duck"),

+	LPGENW("Playing"),

+	LPGENW("Smoking"),

+	LPGENW("Office"),

+	LPGENW("Meeting"),

+	LPGENW("Beer"),

+	LPGENW("Coffee"),

+	LPGENW("Working"),

+	LPGENW("Relaxing"),

+	LPGENW("On the phone"),

+	LPGENW("In institute"),

+	LPGENW("At school"),

+	LPGENW("Wrong number"),

+	LPGENW("Laughing"),

+	LPGENW("Malicious"),

+	LPGENW("Imp"),

+	LPGENW("Blind"),

+	LPGENW("Disappointed"),

+	LPGENW("Almost crying"),

+	LPGENW("Fearful"),

+	LPGENW("Angry"),

+	LPGENW("Vampire"),

+	LPGENW("Ass"),

+	LPGENW("Love"),

+	LPGENW("Sleeping"),

+	LPGENW("Cool!"),

+	LPGENW("Peace!"),

+	LPGENW("Cock a snook"),

+	LPGENW("Get out"),

+	LPGENW("Death"),

+	LPGENW("Rocket"),

+	LPGENW("Devil-fish"),

+	LPGENW("Heavy metal"),

+	LPGENW("Things look bad"),

+	LPGENW("Squirrel"),

+	LPGENW("Star"),

+	LPGENW("Music"),

+	LPGENW("Dating"),

 	NULL

 };

 

@@ -247,7 +247,7 @@ int CMraProto::MraDbSettingChanged(WPARAM hContact, LPARAM lParam)
 				if (cws->value.type == DBVT_DELETED || (cws->value.type == DBVT_BYTE && cws->value.bVal == 0)) {

 					CMStringW wszAuthMessage;

 					if (!mraGetStringW(NULL, "AuthMessage", wszAuthMessage))

-						wszAuthMessage = TranslateT(MRA_DEFAULT_AUTH_MESSAGE);

+						wszAuthMessage = TranslateW(MRA_DEFAULT_AUTH_MESSAGE);

 

 					db_unset(hContact, "CList", "Hidden");