no more TCHARs

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

24 files changed, 73 insertions, 73 deletions

diff --git a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
index 2eb24aff20..056bb048c4 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
@@ -344,7 +344,7 @@ void InitIcons()
 			SKINICONDESC sid = { 0 };

 			sid.section.w = LPGENW("Country flags");

 			sid.pszName = szId; // name to refer to icon when playing and in db

-			sid.flags = SIDF_SORTED | SIDF_TCHAR;

+			sid.flags = SIDF_SORTED | SIDF_UNICODE;

 

 			for (int i=0; i < nCountriesCount; i++) {

 				sid.description.w = mir_a2u(LPGEN(countries[i].szName));

diff --git a/plugins/UserInfoEx/src/classMAnnivDate.cpp b/plugins/UserInfoEx/src/classMAnnivDate.cpp
index b4f9ed84fd..c907d10ad7 100644
--- a/plugins/UserInfoEx/src/classMAnnivDate.cpp
+++ b/plugins/UserInfoEx/src/classMAnnivDate.cpp
@@ -664,7 +664,7 @@ int MAnnivDate::DBWriteAnniversaryDate(MCONTACT hContact, WORD wIndex)
 		if (!DBWriteDateStamp(hContact, USERINFO, pszSetting)) {

 			// write description

 			mir_snprintf(pszSetting, "Anniv%dDesc", wIndex);

-			db_set_ts(hContact, USERINFO, pszSetting, (LPTSTR)Description());

+			db_set_ws(hContact, USERINFO, pszSetting, (LPTSTR)Description());

 			return 0;

 		}

 		// delete date if written incompletely

diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp
index 8108f38d2d..2f16ba1797 100644
--- a/plugins/UserInfoEx/src/classPsTree.cpp
+++ b/plugins/UserInfoEx/src/classPsTree.cpp
@@ -129,7 +129,7 @@ int CPsTree::AddDummyItem(LPCSTR pszGroup)
 
 		OPTIONSDIALOGPAGE odp = { 0 };
 		odp.hInstance = ghInst;
-		odp.flags = ODPF_TCHAR;
+		odp.flags = ODPF_UNICODE;
 		odp.pwszTitle = mir_utf8decodeW(pszGroup);
 		
 		INT_PTR rc = UserInfo_AddPage((WPARAM)&psh, &odp);
diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp
index 22d6872017..f31c4fada9 100644
--- a/plugins/UserInfoEx/src/classPsTreeItem.cpp
+++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp
@@ -255,7 +255,7 @@ int CPsTreeItem::ItemLabel(const BYTE bReadDBValue)
 

 		LPTSTR ptszLabel = mir_utf8decodeW(pszName);

 		if (ptszLabel) {

-			_ptszLabel = mir_wstrdup(TranslateTS(ptszLabel));

+			_ptszLabel = mir_wstrdup(TranslateW(ptszLabel));

 			mir_free(ptszLabel);

 		}

 	}

@@ -316,7 +316,7 @@ int CPsTreeItem::Icon(HIMAGELIST hIml, OPTIONSDIALOGPAGE *odp, BYTE bInitIconsOn
 		bool bNeedFree = false;

 

 		SKINICONDESC sid = { 0 };

-		sid.flags = SIDF_ALL_TCHAR;

+		sid.flags = SIDF_ALL_UNICODE;

 		sid.pszName = (LPSTR)pszIconName;

 		sid.description.w = _ptszLabel;

 		sid.section.w = _A2W(SECT_TREE);

@@ -482,7 +482,7 @@ WORD CPsTreeItem::DBSaveItemState(LPCSTR pszGroup, int iItemPosition, UINT iStat
 

 	// save label

 	if ((dwFlags & PSTVF_LABEL_CHANGED) && (_dwFlags & PSTVF_LABEL_CHANGED))

-		numErrors += db_set_ts(NULL, MODNAME, GlobalPropertyKey(SET_ITEM_LABEL), Label());

+		numErrors += db_set_ws(NULL, MODNAME, GlobalPropertyKey(SET_ITEM_LABEL), Label());

 

 	// save position

 	if ((dwFlags & PSTVF_POS_CHANGED) && !(dwFlags & PSTVF_SORTTREE))

diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.cpp b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
index 3755643b45..05828dfc61 100644
--- a/plugins/UserInfoEx/src/ctrl_annivedit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
@@ -590,7 +590,7 @@ void CAnnivEditCtrl::SetZodiacAndAge(MAnnivDate *mt)
 		if (zod.pszName != NULL)

 		{

 			ShowWindow(GetDlgItem(_hwndDlg, TEXT_ZODIAC), SW_SHOW);

-			SetDlgItemText(_hwndDlg, TEXT_ZODIAC, TranslateTS(zod.pszName));

+			SetDlgItemText(_hwndDlg, TEXT_ZODIAC, TranslateW(zod.pszName));

 			SendDlgItemMessage(_hwndDlg, IDC_ZODIAC, STM_SETIMAGE, IMAGE_ICON, (LPARAM)zod.hIcon);

 		}

 		else

diff --git a/plugins/UserInfoEx/src/ctrl_button.cpp b/plugins/UserInfoEx/src/ctrl_button.cpp
index 59ccb0a1ee..38b8ef5fc3 100644
--- a/plugins/UserInfoEx/src/ctrl_button.cpp
+++ b/plugins/UserInfoEx/src/ctrl_button.cpp
@@ -544,7 +544,7 @@ static LRESULT CALLBACK Button_WndProc(HWND hwndBtn, UINT uMsg, WPARAM wParam, L
 		{

 			wchar_t szButton[MAX_PATH];

 			GetWindowText(bct->hwnd, szButton, _countof(szButton));

-			SetWindowText(bct->hwnd, TranslateTS(szButton));

+			SetWindowText(bct->hwnd, TranslateW(szButton));

 		}

 		break;

 	case WM_SETFOCUS: // set keybord bFocus and redraw

diff --git a/plugins/UserInfoEx/src/ctrl_combo.cpp b/plugins/UserInfoEx/src/ctrl_combo.cpp
index 4677b94a8c..8480e0f969 100644
--- a/plugins/UserInfoEx/src/ctrl_combo.cpp
+++ b/plugins/UserInfoEx/src/ctrl_combo.cpp
@@ -157,8 +157,8 @@ BOOL CCombo::OnInfoChanged(MCONTACT hContact, LPCSTR pszProto)
 			case DBVT_BYTE: iVal = Find((int)dbv.bVal); break;

 			case DBVT_WORD: iVal = Find((int)dbv.wVal); break;

 			case DBVT_DWORD: iVal = Find((int)dbv.dVal); break;

-			case DBVT_TCHAR:

-				iVal = Find(TranslateTS(dbv.ptszVal));

+			case DBVT_WCHAR:

+				iVal = Find(TranslateW(dbv.ptszVal));

 				if (iVal == CB_ERR) {

 					// other

 					iVal = Find(_pList[_nList - 1].nID);

diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp
index 1e882cdfa9..f86c9be82c 100644
--- a/plugins/UserInfoEx/src/ctrl_contact.cpp
+++ b/plugins/UserInfoEx/src/ctrl_contact.cpp
@@ -172,11 +172,11 @@ static INT_PTR CALLBACK DlgProc_EMail(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
 			wchar_t szButton[MAX_PATH];

 			HWND hBtn = GetDlgItem(hDlg, IDOK);

 			GetWindowText(hBtn, szButton, _countof(szButton));

-			SetWindowText(hBtn, TranslateTS(szButton));

+			SetWindowText(hBtn, TranslateW(szButton));

 

 			hBtn = GetDlgItem(hDlg, IDCANCEL);

 			GetWindowText(hBtn, szButton, _countof(szButton));

-			SetWindowText(hBtn, TranslateTS(szButton));

+			SetWindowText(hBtn, TranslateW(szButton));

 		}

 		return TRUE;

 

@@ -256,10 +256,10 @@ INT_PTR CALLBACK DlgProc_Phone(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam
 

 				hBtn = GetDlgItem(hDlg, IDOK);

 				GetWindowText(hBtn, szButton, _countof(szButton));

-				SetWindowText(hBtn, TranslateTS(szButton));

+				SetWindowText(hBtn, TranslateW(szButton));

 				hBtn = GetDlgItem(hDlg, IDCANCEL);

 				GetWindowText(hBtn, szButton, _countof(szButton));

-				SetWindowText(hBtn, TranslateTS(szButton));

+				SetWindowText(hBtn, TranslateW(szButton));

 			}

 			if (*cbi->pszVal) SetWindowText(hDlg, LPGENW("Edit phone number"));

 			if (cbi->wFlags & CBEXIF_SMS) CheckDlgButton(hDlg, CHECK_SMS, BST_CHECKED);

@@ -1430,7 +1430,7 @@ int CtrlContactWriteItemToDB(
 		if (cbi.wFlags & CBEXIF_SMS)

 			mir_wstrncat(szVal, L" SMS", _countof(szVal) - mir_wstrlen(szVal));

 

-		if (db_set_ts(hContact, pszModule, pszSetting, szVal)) return 1;

+		if (db_set_ws(hContact, pszModule, pszSetting, szVal)) return 1;

 	}

 	cbi.wFlags &= ~CTRLF_CHANGED;

 	cbi.wMask = CBEXIM_FLAGS;

@@ -1482,12 +1482,12 @@ int CtrlContactWriteMyItemsToDB(
 			}

 			mir_snprintf(pszSetting, szFormatCat, i);

 			if (*szCat && wcsncmp(szCat, pszOther, ccOther)) {

-				if (db_set_ts(hContact, pszModule, pszSetting, szCat)) return 1;

+				if (db_set_ws(hContact, pszModule, pszSetting, szCat)) return 1;

 			}

 			else

 				db_unset(hContact, pszModule, pszSetting);

 			mir_snprintf(pszSetting, szFormatVal, i);

-			if (db_set_ts(hContact, pszModule, pszSetting, szVal)) return 1;

+			if (db_set_ws(hContact, pszModule, pszSetting, szVal)) return 1;

 			cbi.wFlags &= ~CTRLF_CHANGED;

 			cbi.wMask = CBEXIM_FLAGS;

 			CtrlContactWndProc(hCtrl, CBEXM_SETITEM, NULL, (LPARAM)&cbi);

diff --git a/plugins/UserInfoEx/src/ctrl_edit.cpp b/plugins/UserInfoEx/src/ctrl_edit.cpp
index 874b6846dd..39d1be391b 100644
--- a/plugins/UserInfoEx/src/ctrl_edit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_edit.cpp
@@ -136,7 +136,7 @@ BOOL CEditCtrl::OnInfoChanged(MCONTACT hContact, LPCSTR pszProto)
 			_pszValue = mir_wstrdup(szText);
 			break;
 
-		case DBVT_TCHAR:
+		case DBVT_WCHAR:
 			if (dbv.ptszVal) {
 				SetWindowText(_hwnd, dbv.ptszVal);
 				_pszValue = dbv.ptszVal;
@@ -190,7 +190,7 @@ void CEditCtrl::OnApply(MCONTACT hContact, LPCSTR pszProto)
 						dbv.dVal = (DWORD)wcstol(val, NULL, 10);
 						break;
 
-					case DBVT_TCHAR:
+					case DBVT_WCHAR:
 						dbv.ptszVal = val;
 						break;
 
diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
index 73e8018d72..8eab08d56b 100644
--- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
+++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
@@ -601,7 +601,7 @@ class CAnnivList
 		lvc.cx = db_get_w(NULL, MODNAME, pszSetting, defaultWidth);

 		lvc.mask = LVCF_WIDTH | LVCF_TEXT;

 		lvc.iSubItem = iSubItem;

-		lvc.pszText = TranslateTS(pszText);

+		lvc.pszText = TranslateW(pszText);

 		return ListView_InsertColumn(_hList, lvc.iSubItem++, &lvc) == -1;

 	}

 

diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp
index 68aacb64fa..29ac9cd0df 100644
--- a/plugins/UserInfoEx/src/dlg_msgbox.cpp
+++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp
@@ -664,7 +664,7 @@ INT_PTR CALLBACK MsgBox(HWND hParent, UINT uType, LPCTSTR pszTitle, LPCTSTR pszI
 

 	va_list vl;

 	va_start(vl, pszFormat);

-	mir_vsnwprintf(tszMsg, _countof(tszMsg), TranslateTS(pszFormat), vl);

+	mir_vsnwprintf(tszMsg, _countof(tszMsg), TranslateW(pszFormat), vl);

 	va_end(vl);

 

 	MSGBOX mb = { 0 };

@@ -672,8 +672,8 @@ INT_PTR CALLBACK MsgBox(HWND hParent, UINT uType, LPCTSTR pszTitle, LPCTSTR pszI
 	mb.hParent = hParent;

 	mb.hiLogo = IcoLib_GetIcon(ICO_COMMON_MAIN);

 	mb.hiMsg = NULL;

-	mb.ptszTitle = TranslateTS(pszTitle);

-	mb.ptszInfoText = TranslateTS(pszInfo);

+	mb.ptszTitle = TranslateW(pszTitle);

+	mb.ptszInfoText = TranslateW(pszInfo);

 	mb.ptszMsg = tszMsg;

 	mb.uType = uType;

 	return MsgBoxService(NULL, (LPARAM)&mb);

@@ -691,7 +691,7 @@ INT_PTR CALLBACK MsgErr(HWND hParent, LPCTSTR pszFormat, ...)
 

 	va_list vl;

 	va_start(vl, pszFormat);

-	mir_vsnwprintf(tszMsg, TranslateTS(pszFormat), vl);

+	mir_vsnwprintf(tszMsg, TranslateW(pszFormat), vl);

 	va_end(vl);

 

 	MSGBOX mb = {0};

diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 71f4fef8d7..e1c7a28f75 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -124,7 +124,7 @@ private:
 		// check if icq is online

 		if (!IsProtoOnline((*_pPd)->szModuleName))

 			MsgBox(_pPs->hDlg, MB_ICON_WARNING, TranslateT("Upload details"),

-				CMString(FORMAT, TranslateT("Protocol '%s' is offline"), _A2T((*_pPd)->szModuleName)),

+				CMStringW(FORMAT, TranslateT("Protocol '%s' is offline"), _A2T((*_pPd)->szModuleName)),

 				TranslateT("You are not currently connected to the ICQ network.\nYou must be online in order to update your information on the server.\n\nYour changes will be saved to database only."));

 

 		// start uploading process

@@ -507,7 +507,7 @@ static int InitDetails(WPARAM wParam, LPARAM lParam)
 		if (lParam || bChangeDetailsEnabled) {

 			OPTIONSDIALOGPAGE odp = { 0 };

 			odp.hInstance = ghInst;

-			odp.flags = ODPF_ICON | ODPF_TCHAR;

+			odp.flags = ODPF_ICON | ODPF_UNICODE;

 			odp.pwszGroup = IcoLib_GetDefaultIconFileName();

 

 			if (lParam) {

@@ -1094,14 +1094,14 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 		LPCTSTR pszName;

 		if (!pPs->hContact)

 			pszName = TranslateT("Owner");

-		else if (pdbcws && pdbcws->value.type == DBVT_TCHAR)

+		else if (pdbcws && pdbcws->value.type == DBVT_WCHAR)

 			pszName = pdbcws->value.ptszVal;

 		else

 			pszName = DB::Contact::DisplayName(pPs->hContact);

 

 		HWND hName = GetDlgItem(hDlg, TXT_NAME);

 		SetWindowText(hName, pszName);

-		SetWindowText(hDlg, CMString(FORMAT, L"%s - %s", pszName, TranslateT("edit contact information")));

+		SetWindowText(hDlg, CMStringW(FORMAT, L"%s - %s", pszName, TranslateT("edit contact information")));

 		SetDlgItemText(hDlg, IDC_HEADERBAR, TranslateT("View personal user details and more"));

 

 		// redraw the name control

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
index 74f2a84c49..b8d878b188 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
@@ -257,7 +257,7 @@ MCONTACT CExImContactBase::toDB()
 		// add group
 		if (_pszGroup) {
 			ptrW ptszGroup(mir_utf8decodeW(_pszGroup));
-			db_set_ts(_hContact, MOD_CLIST, "Group", ptszGroup);
+			db_set_ws(_hContact, MOD_CLIST, "Group", ptszGroup);
 			Clist_GroupCreate(NULL, ptszGroup);
 		}
 	}
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
index ea71cc0d20..aaf300bc55 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
@@ -191,7 +191,7 @@ BYTE CProgress::UpdateContact(LPCTSTR pszFormat, ...)
 			va_list vl;

 

 			va_start(vl, pszFormat);

-			mir_vsnwprintf(buf, _countof(buf), TranslateTS(pszFormat), vl);

+			mir_vsnwprintf(buf, _countof(buf), TranslateW(pszFormat), vl);

 			va_end(vl);

 			SetDlgItemText(_hDlg, TXT_CONTACT, buf);	 

 		}

@@ -218,7 +218,7 @@ BYTE CProgress::UpdateSetting(LPCTSTR pszFormat, ...)
 			va_list vl;

 

 			va_start(vl, pszFormat);

-			mir_vsnwprintf(buf, _countof(buf), TranslateTS(pszFormat), vl);

+			mir_vsnwprintf(buf, _countof(buf), TranslateW(pszFormat), vl);

 			va_end(vl);

 			GetDlgItemText(_hDlg, TXT_SETTING, tmp, _countof(tmp));

 			if (mir_wstrcmpi(tmp,buf))

diff --git a/plugins/UserInfoEx/src/mir_icolib.cpp b/plugins/UserInfoEx/src/mir_icolib.cpp
index 33c1a84934..e836756b0d 100644
--- a/plugins/UserInfoEx/src/mir_icolib.cpp
+++ b/plugins/UserInfoEx/src/mir_icolib.cpp
@@ -135,7 +135,7 @@ LPTSTR IcoLib_GetDefaultIconFileName()
 	wchar_t absolute[MAX_PATH];

 

 	for (int i = 0; i < _countof(path); i++) {

-		PathToAbsoluteT(path[i], absolute);

+		PathToAbsoluteW(path[i], absolute);

 		if (PathFileExists(absolute))

 			return path[i];

 	}

@@ -157,7 +157,7 @@ static void IcoLib_CheckIconPackVersion(LPTSTR szIconPack)
 	if (db_get_b(NULL, MODNAME, SET_ICONS_CHECKFILEVERSION, TRUE)) {

 		if (szIconPack) {

 			wchar_t szAbsolutePath[MAX_PATH];

-			PathToAbsoluteT(szIconPack, szAbsolutePath);

+			PathToAbsoluteW(szIconPack, szAbsolutePath);

 

 			HMODULE hIconDll = LoadLibrary(szAbsolutePath);

 			if (hIconDll) {

@@ -227,7 +227,7 @@ static HANDLE IcoLib_RegisterIconHandleEx(LPSTR szIconID, LPSTR szDescription, L
 

 	if (szIconID && szDescription && szSection) {

 		SKINICONDESC sid = { 0 };

-		sid.flags = SIDF_ALL_TCHAR;

+		sid.flags = SIDF_ALL_UNICODE;

 		sid.pszName = szIconID;

 		sid.description.w = mir_a2u(szDescription);

 		sid.section.w = mir_a2u(szSection);

diff --git a/plugins/UserInfoEx/src/psp_about.cpp b/plugins/UserInfoEx/src/psp_about.cpp
index d19175763e..760dabe314 100644
--- a/plugins/UserInfoEx/src/psp_about.cpp
+++ b/plugins/UserInfoEx/src/psp_about.cpp
@@ -49,7 +49,7 @@ INT_PTR CALLBACK PSPProcEdit(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam,
 

 				TranslateDialogDefault(hDlg);

 				

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_ABOUT, pszSetting, DBVT_TCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_ABOUT, pszSetting, DBVT_WCHAR));

 

 				// remove static edge in aero mode

 				if (IsAeroMode())

diff --git a/plugins/UserInfoEx/src/psp_company.cpp b/plugins/UserInfoEx/src/psp_company.cpp
index 48797d60bd..496ff3f60f 100644
--- a/plugins/UserInfoEx/src/psp_company.cpp
+++ b/plugins/UserInfoEx/src/psp_company.cpp
@@ -46,12 +46,12 @@ INT_PTR CALLBACK PSPProcCompany(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 

 				TranslateDialogDefault(hDlg);

 

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_COMPANY, SET_CONTACT_COMPANY, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_DEPARTMENT, SET_CONTACT_COMPANY_DEPARTMENT, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_OFFICE, SET_CONTACT_COMPANY_OFFICE, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_POSITION, SET_CONTACT_COMPANY_POSITION, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_SUPERIOR, SET_CONTACT_COMPANY_SUPERIOR, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_ASSISTENT, SET_CONTACT_COMPANY_ASSISTENT, DBVT_TCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_COMPANY, SET_CONTACT_COMPANY, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_DEPARTMENT, SET_CONTACT_COMPANY_DEPARTMENT, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_OFFICE, SET_CONTACT_COMPANY_OFFICE, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_POSITION, SET_CONTACT_COMPANY_POSITION, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_SUPERIOR, SET_CONTACT_COMPANY_SUPERIOR, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_ASSISTENT, SET_CONTACT_COMPANY_ASSISTENT, DBVT_WCHAR));

 

 				GetOccupationList(&nList, &pList);

 				pCtrlList->insert(CCombo::CreateObj(hDlg, EDIT_OCCUPATION, SET_CONTACT_COMPANY_OCCUPATION, DBVT_WORD, pList, nList));

diff --git a/plugins/UserInfoEx/src/psp_contact.cpp b/plugins/UserInfoEx/src/psp_contact.cpp
index afb2061c38..47c9afaade 100644
--- a/plugins/UserInfoEx/src/psp_contact.cpp
+++ b/plugins/UserInfoEx/src/psp_contact.cpp
@@ -51,11 +51,11 @@ INT_PTR CALLBACK PSPProcContactHome(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				SendDlgItemMessage(hDlg, BTN_GOTO, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open in browser"), MBBF_TCHAR);

 				TranslateDialogDefault(hDlg);

 

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STREET, SET_CONTACT_STREET, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_CITY, SET_CONTACT_CITY, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_ZIP, SET_CONTACT_ZIP, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STATE, SET_CONTACT_STATE, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_HOMEPAGE, SET_CONTACT_HOMEPAGE, DBVT_TCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STREET, SET_CONTACT_STREET, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_CITY, SET_CONTACT_CITY, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_ZIP, SET_CONTACT_ZIP, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STATE, SET_CONTACT_STATE, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_HOMEPAGE, SET_CONTACT_HOMEPAGE, DBVT_WCHAR));

 

 				GetCountryList(&nList, &pList);

 				pCtrlList->insert(CCombo::CreateObj(hDlg, EDIT_COUNTRY, SET_CONTACT_COUNTRY, DBVT_WORD, pList, nList));

@@ -197,11 +197,11 @@ INT_PTR CALLBACK PSPProcContactWork(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				SendDlgItemMessage(hDlg, BTN_GOTO, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open in browser"), MBBF_TCHAR);

 				TranslateDialogDefault(hDlg);

 

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STREET, SET_CONTACT_COMPANY_STREET, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_CITY, SET_CONTACT_COMPANY_CITY, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_ZIP, SET_CONTACT_COMPANY_ZIP, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STATE, SET_CONTACT_COMPANY_STATE, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_HOMEPAGE, SET_CONTACT_COMPANY_HOMEPAGE, DBVT_TCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STREET, SET_CONTACT_COMPANY_STREET, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_CITY, SET_CONTACT_COMPANY_CITY, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_ZIP, SET_CONTACT_COMPANY_ZIP, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STATE, SET_CONTACT_COMPANY_STATE, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_HOMEPAGE, SET_CONTACT_COMPANY_HOMEPAGE, DBVT_WCHAR));

 

 				GetCountryList(&nList, &pList);

 				pCtrlList->insert(CCombo::CreateObj(hDlg, EDIT_COUNTRY, SET_CONTACT_COMPANY_COUNTRY, DBVT_WORD, pList, nList));

diff --git a/plugins/UserInfoEx/src/psp_general.cpp b/plugins/UserInfoEx/src/psp_general.cpp
index e0e5e349b0..5d402909fc 100644
--- a/plugins/UserInfoEx/src/psp_general.cpp
+++ b/plugins/UserInfoEx/src/psp_general.cpp
@@ -46,13 +46,13 @@ INT_PTR CALLBACK PSPProcGeneral(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 				SendDlgItemMessage(hDlg, IDC_PAGETITLE, WM_SETFONT, (WPARAM)hBoldFont, 0);

 				TranslateDialogDefault(hDlg);

 

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_TITLE, SET_CONTACT_TITLE, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_FIRSTNAME, SET_CONTACT_FIRSTNAME, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_SECONDNAME, SET_CONTACT_SECONDNAME, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_LASTNAME, SET_CONTACT_LASTNAME, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_NICK, SET_CONTACT_NICK, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_DISPLAYNAME, "CList", SET_CONTACT_MYHANDLE, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_PARTNER, SET_CONTACT_PARTNER, DBVT_TCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_TITLE, SET_CONTACT_TITLE, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_FIRSTNAME, SET_CONTACT_FIRSTNAME, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_SECONDNAME, SET_CONTACT_SECONDNAME, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_LASTNAME, SET_CONTACT_LASTNAME, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_NICK, SET_CONTACT_NICK, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_DISPLAYNAME, "CList", SET_CONTACT_MYHANDLE, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_PARTNER, SET_CONTACT_PARTNER, DBVT_WCHAR));

 

 				GetNamePrefixList(&nList, &pList);

 				pCtrlList->insert(CCombo::CreateObj(hDlg, EDIT_PREFIX, SET_CONTACT_PREFIX, DBVT_BYTE, pList, nList));

@@ -62,9 +62,9 @@ INT_PTR CALLBACK PSPProcGeneral(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 				pCtrlList->insert(CCombo::CreateObj(hDlg, EDIT_MARITAL, SET_CONTACT_MARITAL, DBVT_BYTE, pList, nList));

 

 				GetLanguageList(&nList, &pList);

-				pCtrlList->insert(CCombo::CreateObj(hDlg, EDIT_LANG1, SET_CONTACT_LANG1, DBVT_TCHAR, pList, nList));

-				pCtrlList->insert(CCombo::CreateObj(hDlg, EDIT_LANG2, SET_CONTACT_LANG2, DBVT_TCHAR, pList, nList));

-				pCtrlList->insert(CCombo::CreateObj(hDlg, EDIT_LANG3, SET_CONTACT_LANG3, DBVT_TCHAR, pList, nList));

+				pCtrlList->insert(CCombo::CreateObj(hDlg, EDIT_LANG1, SET_CONTACT_LANG1, DBVT_WCHAR, pList, nList));

+				pCtrlList->insert(CCombo::CreateObj(hDlg, EDIT_LANG2, SET_CONTACT_LANG2, DBVT_WCHAR, pList, nList));

+				pCtrlList->insert(CCombo::CreateObj(hDlg, EDIT_LANG3, SET_CONTACT_LANG3, DBVT_WCHAR, pList, nList));

 			}

 		}

 		break;

diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp
index 1c93297951..bdb41d321a 100644
--- a/plugins/UserInfoEx/src/psp_options.cpp
+++ b/plugins/UserInfoEx/src/psp_options.cpp
@@ -67,7 +67,7 @@ static void FORCEINLINE ComboBox_SetCurSelByItemDataPtr(HWND hCombo, LPARAM pDat
 

 static void FORCEINLINE ComboBox_AddItemWithData(HWND hCombo, LPTSTR ptszText, LPARAM pData)

 {

-	ComboBox_SetItemData(hCombo, ComboBox_AddString(hCombo, TranslateTS(ptszText)), pData);

+	ComboBox_SetItemData(hCombo, ComboBox_AddString(hCombo, TranslateW(ptszText)), pData);

 }

 

 /**

diff --git a/plugins/UserInfoEx/src/psp_origin.cpp b/plugins/UserInfoEx/src/psp_origin.cpp
index b9d50cec7f..5c696c90b4 100644
--- a/plugins/UserInfoEx/src/psp_origin.cpp
+++ b/plugins/UserInfoEx/src/psp_origin.cpp
@@ -48,10 +48,10 @@ INT_PTR CALLBACK PSPProcOrigin(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 				TranslateDialogDefault(hDlg);

 				SetTimer(hDlg, 1, 5000, NULL);

 

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STREET, SET_CONTACT_ORIGIN_STREET, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_ZIP, SET_CONTACT_ORIGIN_ZIP, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_CITY, SET_CONTACT_ORIGIN_CITY, DBVT_TCHAR));

-				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STATE, SET_CONTACT_ORIGIN_STATE, DBVT_TCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STREET, SET_CONTACT_ORIGIN_STREET, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_ZIP, SET_CONTACT_ORIGIN_ZIP, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_CITY, SET_CONTACT_ORIGIN_CITY, DBVT_WCHAR));

+				pCtrlList->insert(CEditCtrl::CreateObj(hDlg, EDIT_STATE, SET_CONTACT_ORIGIN_STATE, DBVT_WCHAR));

 

 				GetCountryList(&nList, &pList);

 				pCtrlList->insert(CCombo::CreateObj(hDlg, EDIT_COUNTRY, SET_CONTACT_ORIGIN_COUNTRY, DBVT_WORD, pList, nList));

diff --git a/plugins/UserInfoEx/src/psp_profile.cpp b/plugins/UserInfoEx/src/psp_profile.cpp
index 651054eb5c..85a0c98b08 100644
--- a/plugins/UserInfoEx/src/psp_profile.cpp
+++ b/plugins/UserInfoEx/src/psp_profile.cpp
@@ -490,7 +490,7 @@ static int ProfileList_AddItemlistFromDB(
 		mir_snprintf(pszSetting, szValFormat, i);

 		if (DB::Setting::GetTString(hContact, pszModule, pszSetting, &dbvVal))

 			break;

-		if (dbvVal.type != DBVT_TCHAR)

+		if (dbvVal.type != DBVT_WCHAR)

 			continue;

 		mir_snprintf(pszSetting, szCatFormat, i);

 		DB::Setting::GetAString(hContact, pszModule, pszSetting, &dbvCat);

@@ -1219,13 +1219,13 @@ INT_PTR CALLBACK PSPProcContactProfile(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR
 									continue;

 								if (!(pItem->wFlags & (CTRLF_HASPROTO|CTRLF_HASMETA))) {

 									mir_snprintf(pszSetting, pFmt[iFmt].szValFmt, iItem);

-									db_set_ts(hContact, pszModule, pszSetting, pItem->pszText[1]);

+									db_set_ws(hContact, pszModule, pszSetting, pItem->pszText[1]);

 									// save category

 									mir_snprintf(pszSetting, pFmt[iFmt].szCatFmt, iItem);

 									if (pItem->idstrList && pItem->iListItem > 0 && pItem->iListItem < pItem->idstrListCount)

 										db_set_s(hContact, pszModule, pszSetting, (LPSTR)pItem->idstrList[pItem->iListItem].pszText);

 									else if (pItem->pszText[0] && *pItem->pszText[0])

-										db_set_ts(hContact, pszModule, pszSetting, (LPTSTR)pItem->pszText[0]);

+										db_set_ws(hContact, pszModule, pszSetting, (LPTSTR)pItem->pszText[0]);

 									else

 										db_unset(hContact, pszModule, pszSetting);

 									// redraw the item if required

@@ -1339,7 +1339,7 @@ INT_PTR CALLBACK PSPProcContactProfile(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR
 							SetTextColor(cd->nmcd.hdc, GetSysColor(COLOR_3DSHADOW));

 							ProfileList_GetItemText(cd->nmcd.hdr.hwndFrom, cd->nmcd.dwItemSpec, 0, szText, MAX_PATH);

 							rc.left += 6;

-							DrawText(cd->nmcd.hdc, TranslateTS(szText), -1, &rc, DT_NOCLIP | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER);

+							DrawText(cd->nmcd.hdc, TranslateW(szText), -1, &rc, DT_NOCLIP | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER);

 

 							rc.bottom -= 2;

 							rc.top = rc.bottom - 1;

diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index 63e077a06f..94e317b8e6 100644
--- a/plugins/UserInfoEx/src/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
@@ -255,7 +255,7 @@ static int NotifyWithPopup(MCONTACT hContact, CEvent::EType eventType, int DaysT
 

 	if (hContact) {

 		ppd.lchContact = hContact;

-		mir_snwprintf(ppd.lptzContactName, L"%s - %s", TranslateTS(pszDesc), DB::Contact::DisplayName(hContact));

+		mir_snwprintf(ppd.lptzContactName, L"%s - %s", TranslateW(pszDesc), DB::Contact::DisplayName(hContact));

 	}

 	else mir_wstrncpy(ppd.lptzContactName, TranslateT("Reminder"), _countof(ppd.lptzContactName));

 

@@ -372,7 +372,7 @@ static BYTE CheckAnniversaries(MCONTACT hContact, MTime &Now, CEvent &evt, BYTE
 	int numAnniversaries = 0;

 	int Diff = 0;

 	MAnnivDate mta;

-	CMString tszMsg;

+	CMStringW tszMsg;

 

 	if (gRemindOpts.RemindState == REMIND_ANNIV || gRemindOpts.RemindState == REMIND_ALL) {

 		for (int i = 0; i < ANID_LAST && !mta.DBGetAnniversaryDate(hContact, i); i++) {

diff --git a/plugins/UserInfoEx/src/svc_timezone_old.cpp b/plugins/UserInfoEx/src/svc_timezone_old.cpp
index dfb93928ba..759a8a321a 100644
--- a/plugins/UserInfoEx/src/svc_timezone_old.cpp
+++ b/plugins/UserInfoEx/src/svc_timezone_old.cpp
@@ -440,7 +440,7 @@ WORD GetContactTimeZoneCtrl(MCONTACT hContact, LPCSTR pszProto, CTimeZone** pTim
 	CTimeZone* pTz = NULL;

 

 	// try to read windows' timezone name from database

-	flags = DB::Setting::GetCtrl(hContact, USERINFO, USERINFO, pszProto, SET_CONTACT_TIMEZONENAME, &dbv, DBVT_TCHAR);

+	flags = DB::Setting::GetCtrl(hContact, USERINFO, USERINFO, pszProto, SET_CONTACT_TIMEZONENAME, &dbv, DBVT_WCHAR);

 	if (flags == 0 || FAILED(TzMgr.find(&pTz, dbv.ptszVal))) {

 		db_free(&dbv);