no more TCHARs

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

11 files changed, 49 insertions, 49 deletions

diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp
index 539280f125..0c87d43f5b 100644
--- a/protocols/MSN/src/msn_chat.cpp
+++ b/protocols/MSN/src/msn_chat.cpp
@@ -506,7 +506,7 @@ int CMsnProto::MSN_GCEventHook(WPARAM, LPARAM lParam)
 				msnNsThread->sendMessage('N', thread->szEmail, thread->netId, UTF8(pszMsg), 0);

 

 				DBVARIANT dbv;

-				int bError = getTString("Nick", &dbv);

+				int bError = getWString("Nick", &dbv);

 

 				GCDEST gcd = { m_szModuleName, gch->pDest->ptszID, GC_EVENT_MESSAGE };

 				GCEVENT gce = { sizeof(gce), &gcd };

diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp
index 2a37ab21e1..190fb1e704 100644
--- a/protocols/MSN/src/msn_commands.cpp
+++ b/protocols/MSN/src/msn_commands.cpp
@@ -273,7 +273,7 @@ void CMsnProto::MSN_ReceiveMessage(ThreadData* info, char* cmdString, char* para
 								case 'p':

 									psr[cnt] = (PROTOSEARCHRESULT*)mir_calloc(sizeof(PROTOSEARCHRESULT));

 									psr[cnt]->cbSize = sizeof(psr);

-									psr[cnt]->flags = PSR_TCHAR;

+									psr[cnt]->flags = PSR_UNICODE;

 									psr[cnt]->id.w = psr[cnt]->nick.w = psr[cnt]->email.w = mir_a2u(wlid);

 									cnt++;

 								}

@@ -523,7 +523,7 @@ void CMsnProto::MSN_ProcessURIObject(MCONTACT hContact, ezxml_t xmli)
 				mir_snwprintf(tComment, TranslateT("%I64u bytes"), ft->std.currentFileSize);

 

 				PROTORECVFILET pre = { 0 };

-				pre.dwFlags = PRFF_TCHAR;

+				pre.dwFlags = PRFF_UNICODE;

 				pre.fileCount = 1;

 				pre.timestamp = time(NULL);

 				pre.descr.w = (desc = ezxml_child(xmli, "Description"))?mir_utf8decodeW(desc->txt):tComment;

@@ -573,7 +573,7 @@ void CMsnProto::MSN_ProcessYFind(char* buf, size_t len)
 

 			PROTOSEARCHRESULT psr = { 0 };

 			psr.cbSize = sizeof(psr);

-			psr.flags = PSR_TCHAR;

+			psr.flags = PSR_UNICODE;

 			psr.id.w = szEmailT;

 			psr.nick.w = szEmailT;

 			psr.email.w = szEmailT;

@@ -849,7 +849,7 @@ void CMsnProto::MSN_ProcessStatusMessage(ezxml_t xmli, const char* wlid)
 		else lti.ptszType = mir_utf8decodeW(parts[1]);

 

 		wchar_t *cm = (wchar_t *)CallService(MS_LISTENINGTO_GETPARSEDTEXT, (WPARAM)L"%title% - %artist%", (LPARAM)&lti);

-		setTString(hContact, "ListeningTo", cm);

+		setWString(hContact, "ListeningTo", cm);

 

 		mir_free(cm);

 

@@ -1473,7 +1473,7 @@ void CMsnProto::MSN_InviteMessage(ThreadData* info, char* msgBody, char* email,
 		mir_snwprintf(tComment, TranslateT("%I64u bytes"), ft->std.currentFileSize);

 

 		PROTORECVFILET pre = { 0 };

-		pre.dwFlags = PRFF_TCHAR;

+		pre.dwFlags = PRFF_UNICODE;

 		pre.fileCount = 1;

 		pre.timestamp = time(NULL);

 		pre.descr.w = tComment;

diff --git a/protocols/MSN/src/msn_links.cpp b/protocols/MSN/src/msn_links.cpp
index a46e26e1a6..35ab65cfa3 100644
--- a/protocols/MSN/src/msn_links.cpp
+++ b/protocols/MSN/src/msn_links.cpp
@@ -95,7 +95,7 @@ static INT_PTR ServiceParseMsnimLink(WPARAM, LPARAM lParam)
 		/* does not yet check if email is current user */

 		if (hContact == NULL) {

 			PROTOSEARCHRESULT psr = { sizeof(psr) };

-			psr.flags = PSR_TCHAR;

+			psr.flags = PSR_UNICODE;

 			psr.nick.w = email;

 			psr.email.w = email;

 

diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp
index 2016dfc9b9..9ca0aa8942 100644
--- a/protocols/MSN/src/msn_mail.cpp
+++ b/protocols/MSN/src/msn_mail.cpp
@@ -391,6 +391,6 @@ void CMsnProto::displayEmailCount(MCONTACT hContact)
 	mir_snwprintf(szNick, getByte("DisableHotmailJunk", 0) ? L"%s [%d]" : L"%s [%d][%d]", name, mUnreadMessages, mUnreadJunkEmails);

 

 	nickChg = true;

-	setTString(hContact, "Nick", szNick);

+	setWString(hContact, "Nick", szNick);

 	nickChg = false;

 }

diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index ef12418621..5a7e2418a8 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
@@ -198,7 +198,7 @@ static INT_PTR CALLBACK DlgProcSetNickname(HWND hwndDlg, UINT msg, WPARAM wParam
 		SendDlgItemMessage(hwndDlg, IDC_NICKNAME, EM_LIMITTEXT, 129, 0);

 

 		DBVARIANT dbv;

-		if (!proto->getTString("Nick", &dbv)) {

+		if (!proto->getWString("Nick", &dbv)) {

 			SetDlgItemText(hwndDlg, IDC_NICKNAME, dbv.ptszVal);

 			db_free(&dbv);

 		}

diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index 5b6b1b1ec7..7fa82d51e8 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -170,10 +170,10 @@ char* MSN_GetAvatarHash(char* szContext, char** pszUrl)
 // MSN_GetAvatarFileName - gets a file name for an contact's avatar

 void CMsnProto::MSN_GetAvatarFileName(MCONTACT hContact, wchar_t* pszDest, size_t cbLen, const wchar_t *ext)

 {

-	size_t tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARST(L"%miranda_avatarcache%"), m_szModuleName);

+	size_t tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%"), m_szModuleName);

 

 	if (_waccess(pszDest, 0))

-		CreateDirectoryTreeT(pszDest);

+		CreateDirectoryTreeW(pszDest);

 

 	size_t tPathLen2 = tPathLen;

 	if (hContact != NULL) {

@@ -331,7 +331,7 @@ void CMsnProto::MSN_GetCustomSmileyFileName(MCONTACT hContact, wchar_t* pszDest,
 

 	if (hContact != NULL) {

 		DBVARIANT dbv = { 0 };

-		if (getTString(hContact, "e-mail", &dbv)) {

+		if (getWString(hContact, "e-mail", &dbv)) {

 			dbv.type = DBVT_ASCIIZ;

 			dbv.ptszVal = (wchar_t*)mir_alloc(11*sizeof(wchar_t));

 			_ui64tow((UINT_PTR)hContact, dbv.ptszVal, 10);

@@ -354,7 +354,7 @@ void CMsnProto::MSN_GetCustomSmileyFileName(MCONTACT hContact, wchar_t* pszDest,
 	}

 

 	if (!exist)

-		CreateDirectoryTreeT(pszDest);

+		CreateDirectoryTreeW(pszDest);

 

 	wchar_t *sztSmileyName = mir_a2u(SmileyName);

 	mir_snwprintf(pszDest + tPathLen, cbLen - tPathLen, L"\\%s.%s", sztSmileyName,

@@ -397,7 +397,7 @@ void CMsnProto::MSN_GoOffline(void)
 		{

 			if (isChatRoom(hContact) != 0) {

 				DBVARIANT dbv;

-				if (getTString(hContact, "ChatRoomID", &dbv) == 0) {

+				if (getWString(hContact, "ChatRoomID", &dbv) == 0) {

 					GCDEST gcd = { m_szModuleName, dbv.ptszVal, GC_EVENT_CONTROL };

 					GCEVENT gce = { sizeof(gce), &gcd };

 					CallServiceSync(MS_GC_EVENT, SESSION_OFFLINE, (LPARAM)&gce);

@@ -990,7 +990,7 @@ void CMsnProto::InitPopups(void)
 	ppc.flags = PCF_TCHAR;

 	ppc.PluginWindowProc = NullWindowProc;

 	ppc.hIcon = LoadIconEx("main");

-	ppc.ptszDescription = desc;

+	ppc.pwszDescription = desc;

 	ppc.pszName = name;

 

 	ppc.colorBack = RGB(173, 206, 247);

@@ -1087,7 +1087,7 @@ filetransfer::filetransfer(CMsnProto* prt)
 	memset(this, 0, sizeof(filetransfer));

 	fileId = -1;

 	std.cbSize = sizeof(std);

-	std.flags = PFTS_TCHAR;

+	std.flags = PFTS_UNICODE;

 	proto = prt;

 

 	hLockHandle = CreateMutex(NULL, FALSE, NULL);

diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp
index 38b32891a8..be5634e4aa 100644
--- a/protocols/MSN/src/msn_opts.cpp
+++ b/protocols/MSN/src/msn_opts.cpp
@@ -98,7 +98,7 @@ static INT_PTR CALLBACK DlgProcMsnOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 			HWND wnd = GetDlgItem(hwndDlg, IDC_HANDLE2);

 			DBVARIANT dbv;

-			if (!proto->getTString("Nick", &dbv)) {

+			if (!proto->getWString("Nick", &dbv)) {

 				SetWindowText(wnd, dbv.ptszVal);

 				db_free(&dbv);

 			}

@@ -249,7 +249,7 @@ LBL_Continue:
 

 #ifdef OBSOLETE

 			GetDlgItemText(hwndDlg, IDC_HANDLE2, screenStr, _countof(screenStr));

-			if (!proto->getTString("Nick", &dbv)) {

+			if (!proto->getWString("Nick", &dbv)) {

 				if (mir_wstrcmp(dbv.ptszVal, screenStr))

 					proto->MSN_SendNickname(screenStr);

 				db_free(&dbv);

@@ -276,7 +276,7 @@ LBL_Continue:
 			proto->setByte("ManageServer", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MANAGEGROUPS));

 

 			GetDlgItemText(hwndDlg, IDC_MAILER_APP, screenStr, _countof(screenStr));

-			proto->setTString("MailerPath", screenStr);

+			proto->setWString("MailerPath", screenStr);

 

 			if (reconnectRequired && proto->msnLoggedIn)

 				MessageBox(hwndDlg,

@@ -522,7 +522,7 @@ static INT_PTR CALLBACK DlgProcAccMgrUI(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			SendDlgItemMessage(hwndDlg, IDC_PASSWORD, EM_SETLIMITTEXT, 16, 0);

 

 			DBVARIANT dbv;

-			if (!proto->getTString("Place", &dbv)) {

+			if (!proto->getWString("Place", &dbv)) {

 				SetDlgItemText(hwndDlg, IDC_PLACE, dbv.ptszVal);

 				db_free(&dbv);

 			}

@@ -570,7 +570,7 @@ static INT_PTR CALLBACK DlgProcAccMgrUI(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			wchar_t szPlace[64];

 			GetDlgItemText(hwndDlg, IDC_PLACE, szPlace, _countof(szPlace));

 			if (szPlace[0])

-				proto->setTString("Place", szPlace);

+				proto->setWString("Place", szPlace);

 			else

 				proto->delSetting("Place");

 

@@ -630,7 +630,7 @@ int CMsnProto::OnOptionsInit(WPARAM wParam, LPARAM)
 	odp.pwszTitle = m_tszUserName;

 	odp.pwszGroup = LPGENW("Network");

 	odp.pwszTab = LPGENW("Account");

-	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;

+	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;

 	odp.pfnDlgProc = DlgProcMsnOpts;

 	odp.dwInitParam = (LPARAM)this;

 	Options_AddPage(wParam, &odp);

diff --git a/protocols/MSN/src/msn_p2p.cpp b/protocols/MSN/src/msn_p2p.cpp
index 5bb5a9b610..c4698514ad 100644
--- a/protocols/MSN/src/msn_p2p.cpp
+++ b/protocols/MSN/src/msn_p2p.cpp
@@ -1227,7 +1227,7 @@ void CMsnProto::p2p_InitFileTransfer(
 			mir_snwprintf(tComment, TranslateT("%I64u bytes"), ft->std.currentFileSize);

 

 			PROTORECVFILET pre = { 0 };

-			pre.dwFlags = PRFF_TCHAR;

+			pre.dwFlags = PRFF_UNICODE;

 			pre.fileCount = 1;

 			pre.timestamp = time(NULL);

 			pre.descr.w = tComment;

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index e9e6950beb..41e853830d 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -125,11 +125,11 @@ CMsnProto::CMsnProto(const char* aProtoName, const wchar_t* aUserName) :
 

 	mailsoundname = (char*)mir_alloc(64);

 	mir_snprintf(mailsoundname, 64, "%s:Hotmail", m_szModuleName);

-	SkinAddNewSoundExT(mailsoundname, m_tszUserName, LPGENW("Live Mail"));

+	SkinAddNewSoundExW(mailsoundname, m_tszUserName, LPGENW("Live Mail"));

 

 	alertsoundname = (char*)mir_alloc(64);

 	mir_snprintf(alertsoundname, 64, "%s:Alerts", m_szModuleName);

-	SkinAddNewSoundExT(alertsoundname, m_tszUserName, LPGENW("Live Alert"));

+	SkinAddNewSoundExW(alertsoundname, m_tszUserName, LPGENW("Live Alert"));

 

 	AvatarQueue_Init();

 	InitCustomFolders();

@@ -139,7 +139,7 @@ CMsnProto::CMsnProto(const char* aProtoName, const wchar_t* aUserName) :
 

 	NETLIBUSER nlu1 = { 0 };

 	nlu1.cbSize = sizeof(nlu1);

-	nlu1.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_TCHAR;

+	nlu1.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;

 	nlu1.szSettingsModule = szDbsettings;

 	nlu1.ptszDescriptiveName = szBuffer;

 

@@ -149,7 +149,7 @@ CMsnProto::CMsnProto(const char* aProtoName, const wchar_t* aUserName) :
 

 	NETLIBUSER nlu = { 0 };

 	nlu.cbSize = sizeof(nlu);

-	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_TCHAR;

+	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;

 	nlu.szSettingsModule = m_szModuleName;

 	nlu.ptszDescriptiveName = szBuffer;

 

@@ -417,7 +417,7 @@ void __cdecl CMsnProto::MsnSearchAckThread(void* arg)
 		{

 			PROTOSEARCHRESULT psr = { 0 };

 			psr.cbSize = sizeof(psr);

-			psr.flags = PSR_TCHAR;

+			psr.flags = PSR_UNICODE;

 			psr.id.w = (wchar_t*)emailT;

 			psr.nick.w = (wchar_t*)emailT;

 			psr.email.w = (wchar_t*)emailT;

@@ -736,7 +736,7 @@ void __cdecl CMsnProto::MsnGetAwayMsgThread(void* arg)
 

 	AwayMsgInfo *inf = (AwayMsgInfo*)arg;

 	DBVARIANT dbv;

-	if (!db_get_ts(inf->hContact, "CList", "StatusMsg", &dbv)) {

+	if (!db_get_ws(inf->hContact, "CList", "StatusMsg", &dbv)) {

 		ProtoBroadcastAck(inf->hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)inf->id, (LPARAM)dbv.ptszVal);

 		db_free(&dbv);

 	}

diff --git a/protocols/MSN/src/msn_skypeab.cpp b/protocols/MSN/src/msn_skypeab.cpp
index a0cd9ca76d..e27727c1da 100644
--- a/protocols/MSN/src/msn_skypeab.cpp
+++ b/protocols/MSN/src/msn_skypeab.cpp
@@ -144,12 +144,12 @@ bool CMsnProto::MSN_SKYABGetProfiles(const char *pszPOST)
 				MCONTACT hContact = MSN_HContactFromEmail(szWLId, skypename, false, false);

 

 				if (hContact) {

-					if (value = get_json_str(item, "firstname")) setTString(hContact, "FirstName", value);

-					if (value = get_json_str(item, "lastname")) setTString(hContact, "LastName", value);

-					if (value = get_json_str(item, "displayname")) setTString(hContact, "Nick", value);

+					if (value = get_json_str(item, "firstname")) setWString(hContact, "FirstName", value);

+					if (value = get_json_str(item, "lastname")) setWString(hContact, "LastName", value);

+					if (value = get_json_str(item, "displayname")) setWString(hContact, "Nick", value);

 					if (value = get_json_str(item, "country")) setString(hContact, "Country", (char*)CallService(MS_UTILS_GETCOUNTRYBYISOCODE, (WPARAM)(char*)_T2A(value), 0));

-					if (value = get_json_str(item, "city")) setTString(hContact, "City", value);

-					if (value = get_json_str(item, "mood")) db_set_ts(hContact, "CList", "StatusMsg", value);

+					if (value = get_json_str(item, "city")) setWString(hContact, "City", value);

+					if (value = get_json_str(item, "mood")) db_set_ws(hContact, "CList", "StatusMsg", value);

 				}

 			}

 			json_delete(items);

@@ -191,9 +191,9 @@ bool CMsnProto::MSN_SKYABGetProfile(const char *wlid)
 			MCONTACT hContact = MSN_HContactFromEmail(szWLId, skypename, false, false);

 

 			if (hContact) {

-				if (value = get_json_str(item, "firstname")) setTString(hContact, "FirstName", value);

-				if (value = get_json_str(item, "lastname")) setTString(hContact, "LastName", value);

-				if (value = get_json_str(item, "displayname")) setTString(hContact, "Nick", value);

+				if (value = get_json_str(item, "firstname")) setWString(hContact, "FirstName", value);

+				if (value = get_json_str(item, "lastname")) setWString(hContact, "LastName", value);

+				if (value = get_json_str(item, "displayname")) setWString(hContact, "Nick", value);

 				if (value = get_json_str(item, "gender")) setByte(hContact, "Gender", (BYTE)(_wtoi(value) == 1 ? 'M' : 'F'));

 				if (value = get_json_str(item, "birthday")) {

 					int d, m, y;

@@ -203,10 +203,10 @@ bool CMsnProto::MSN_SKYABGetProfile(const char *wlid)
 					setByte(hContact, "BirthMonth", m);

 				}

 				if (value = get_json_str(item, "country")) setString(hContact, "Country", (char*)CallService(MS_UTILS_GETCOUNTRYBYISOCODE, (WPARAM)(char*)_T2A(value), 0));

-				if (value = get_json_str(item, "province")) setTString(hContact, "State", value);

-				if (value = get_json_str(item, "city")) setTString(hContact, "City", value);

-				if (value = get_json_str(item, "homepage")) setTString(hContact, "Homepage", value);

-				if (value = get_json_str(item, "about")) setTString(hContact, "About", value);

+				if (value = get_json_str(item, "province")) setWString(hContact, "State", value);

+				if (value = get_json_str(item, "city")) setWString(hContact, "City", value);

+				if (value = get_json_str(item, "homepage")) setWString(hContact, "Homepage", value);

+				if (value = get_json_str(item, "about")) setWString(hContact, "About", value);

 

 				JSONNode *node = json_get(item, "emails");

 				if (node && !node->empty()) {

@@ -220,10 +220,10 @@ bool CMsnProto::MSN_SKYABGetProfile(const char *wlid)
 						setStringUtf(hContact, szName, (*it).as_string().c_str());

 					}

 				}

-				if (value = get_json_str(item, "phoneMobile")) setTString(hContact, "Cellular", value);

-				if (value = get_json_str(item, "phone")) setTString(hContact, "Phone", value);

-				if (value = get_json_str(item, "phoneOffice")) setTString(hContact, "CompanyPhone", value);

-				if (value = get_json_str(item, "mood")) db_set_ts(hContact, "CList", "StatusMsg", value);

+				if (value = get_json_str(item, "phoneMobile")) setWString(hContact, "Cellular", value);

+				if (value = get_json_str(item, "phone")) setWString(hContact, "Phone", value);

+				if (value = get_json_str(item, "phoneOffice")) setWString(hContact, "CompanyPhone", value);

+				if (value = get_json_str(item, "mood")) db_set_ws(hContact, "CList", "StatusMsg", value);

 			}

 			bRet = true;

 		}

@@ -391,7 +391,7 @@ bool CMsnProto::MSN_SKYABSearch(const char *keyWord, HANDLE hSearch)
 				wchar_t *sSkypeName = json_as_string(json_get(Skype, "SkypeName"));

 

 				PROTOSEARCHRESULT psr = { sizeof(psr) };

-				psr.flags = PSR_TCHAR;

+				psr.flags = PSR_UNICODE;

 				psr.id.w = sSkypeName;

 				psr.nick.w = sDisplayName;

 				ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_DATA, hSearch, (LPARAM)&psr);

diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp
index 4746906aca..0b466b67ba 100644
--- a/protocols/MSN/src/msn_svcs.cpp
+++ b/protocols/MSN/src/msn_svcs.cpp
@@ -363,7 +363,7 @@ INT_PTR CMsnProto::SetCurrentMedia(WPARAM, LPARAM lParam)
 			mir_snwprintf(text, 128, L"%s - %s", (msnCurrentMedia.ptszTitle ? msnCurrentMedia.ptszTitle : L""),

 				(msnCurrentMedia.ptszArtist ? msnCurrentMedia.ptszArtist : L""));

 		}

-		setTString("ListeningTo", text);

+		setWString("ListeningTo", text);

 		mir_free(text);

 	}

 

@@ -385,7 +385,7 @@ int CMsnProto::OnContactDeleted(WPARAM hContact, LPARAM)
 

 	if (isChatRoom(hContact)) {

 		DBVARIANT dbv;

-		if (!getTString(hContact, "ChatRoomID", &dbv)) {

+		if (!getWString(hContact, "ChatRoomID", &dbv)) {

 			MSN_KillChatSession(dbv.ptszVal);

 			db_free(&dbv);

 		}

@@ -595,7 +595,7 @@ INT_PTR CMsnProto::OnLeaveChat(WPARAM hContact, LPARAM)
 {

 	if (isChatRoom(hContact) != 0) {

 		DBVARIANT dbv;

-		if (getTString(hContact, "ChatRoomID", &dbv) == 0) {

+		if (getWString(hContact, "ChatRoomID", &dbv) == 0) {

 			MSN_KillChatSession(dbv.ptszVal);

 			db_free(&dbv);

 		}