no more TCHARs

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

4 files changed, 11 insertions, 11 deletions

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 0c68e5b22d..2c335fec1a 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -763,7 +763,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 			//restore saved msg if any...

 			if (dat->hContact) {

 				DBVARIANT dbv;

-				if (!db_get_ts(dat->hContact, SRMSGMOD, DBSAVEDMSG, &dbv)) {

+				if (!db_get_ws(dat->hContact, SRMSGMOD, DBSAVEDMSG, &dbv)) {

 					if (dbv.ptszVal[0]) {

 						SetDlgItemText(hwndDlg, IDC_MESSAGE, dbv.ptszVal);

 						EnableWindow(GetDlgItem(hwndDlg, IDOK), TRUE);

@@ -1589,7 +1589,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 				wchar_t *msg = (wchar_t*)alloca(sizeof(wchar_t)*len);

 				GetDlgItemText(hwndDlg, IDC_MESSAGE, msg, len);

 				if (msg[0])

-					db_set_ts(dat->hContact, SRMSGMOD, DBSAVEDMSG, msg);

+					db_set_ws(dat->hContact, SRMSGMOD, DBSAVEDMSG, msg);

 				else

 					db_unset(dat->hContact, SRMSGMOD, DBSAVEDMSG);

 			}

diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 7096284dac..4771ce1622 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -305,7 +305,7 @@ static char* CreateRTFFromDbEvent(SrmmWindowData *dat, MCONTACT hContact, MEVENT
 		AppendToBufferWithRTF(buffer, szName);

 		AppendToBufferWithRTF(buffer, L" ");

 

-		msg = DbGetEventTextT(&dbei, CP_ACP);

+		msg = DbGetEventTextW(&dbei, CP_ACP);

 		if (msg) {

 			AppendToBufferWithRTF(buffer, msg);

 			mir_free(msg);

@@ -334,7 +334,7 @@ static char* CreateRTFFromDbEvent(SrmmWindowData *dat, MCONTACT hContact, MEVENT
 

 	case EVENTTYPE_MESSAGE:

 	default:

-		msg = DbGetEventTextT(&dbei, CP_ACP);

+		msg = DbGetEventTextW(&dbei, CP_ACP);

 		buffer.AppendFormat(" %s ", SetToStyle((dbei.eventType == EVENTTYPE_MESSAGE) ? ((dbei.flags & DBEF_SENT) ? MSGFONTID_MYMSG : MSGFONTID_YOURMSG) : MSGFONTID_NOTICE));

 		AppendToBufferWithRTF(buffer, msg);

 		mir_free(msg);

diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index f5968b5cce..5fb40206cf 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -81,7 +81,7 @@ bool LoadMsgDlgFont(int i, LOGFONT* lf, COLORREF * colour)
 		mir_snprintf(str, "SRMFont%d", i);

 

 		DBVARIANT dbv;

-		if (db_get_ts(NULL, SRMMMOD, str, &dbv))

+		if (db_get_ws(NULL, SRMMMOD, str, &dbv))

 			wcsncpy(lf->lfFaceName, fontOptionsList[i].szDefFace, _countof(lf->lfFaceName)-1);

 		else {

 			mir_wstrncpy(lf->lfFaceName, dbv.ptszVal, _countof(lf->lfFaceName));

@@ -97,7 +97,7 @@ void RegisterSRMMFonts(void)
 {

 	char idstr[10];

 

-	FontIDT fontid = { sizeof(fontid) };

+	FontIDW fontid = { sizeof(fontid) };

 	fontid.flags = FIDF_ALLOWREREGISTER | FIDF_DEFAULTVALID;

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

 		strncpy_s(fontid.dbSettingsGroup, SRMMMOD, _TRUNCATE);

@@ -117,16 +117,16 @@ void RegisterSRMMFonts(void)
 		fontid.deffontsettings.charset = MsgDlgGetFontDefaultCharset(fontOptionsList[i].szDefFace);

 		wcsncpy_s(fontid.backgroundGroup, LPGENW("Message log"), _TRUNCATE);

 		wcsncpy_s(fontid.backgroundName, LPGENW("Background"), _TRUNCATE);

-		FontRegisterT(&fontid);

+		FontRegisterW(&fontid);

 	}

 

-	ColourIDT colourid = { sizeof(colourid) };

+	ColourIDW colourid = { sizeof(colourid) };

 	strncpy_s(colourid.dbSettingsGroup, SRMMMOD, _TRUNCATE);

 	strncpy_s(colourid.setting, SRMSGSET_BKGCOLOUR, _TRUNCATE);

 	colourid.defcolour = SRMSGDEFSET_BKGCOLOUR;

 	wcsncpy_s(colourid.name, LPGENW("Background"), _TRUNCATE);

 	wcsncpy_s(colourid.group, LPGENW("Message log"), _TRUNCATE);

-	ColourRegisterT(&colourid);

+	ColourRegisterW(&colourid);

 }

 

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

@@ -158,7 +158,7 @@ static void FillCheckBoxTree(HWND hwndTree, const struct CheckBoxValues_t *value
 	tvis.item.mask = TVIF_PARAM | TVIF_TEXT | TVIF_STATE;

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

 		tvis.item.lParam = values[i].style;

-		tvis.item.pszText = TranslateTS(values[i].szDescr);

+		tvis.item.pszText = TranslateW(values[i].szDescr);

 		tvis.item.stateMask = TVIS_STATEIMAGEMASK;

 		tvis.item.state = INDEXTOSTATEIMAGEMASK((style & tvis.item.lParam) != 0 ? 2 : 1);

 		TreeView_InsertItem(hwndTree, &tvis);

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 2737384610..b38fea7b07 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -407,7 +407,7 @@ static wchar_t tszError[] = LPGENW("Miranda could not load the built-in message
 int LoadSendRecvMessageModule(void)

 {

 	if ((hMsftEdit = LoadLibrary(L"Msftedit.dll")) == NULL) {

-		if (IDYES != MessageBox(0, TranslateTS(tszError), TranslateT("Information"), MB_YESNO | MB_ICONINFORMATION))

+		if (IDYES != MessageBox(0, TranslateW(tszError), TranslateT("Information"), MB_YESNO | MB_ICONINFORMATION))

 			return 1;

 		return 0;

 	}