no more TCHARs

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

9 files changed, 18 insertions, 18 deletions

diff --git a/protocols/Yahoo/src/avatar.cpp b/protocols/Yahoo/src/avatar.cpp
index 93dbff7f38..e57a331c0c 100644
--- a/protocols/Yahoo/src/avatar.cpp
+++ b/protocols/Yahoo/src/avatar.cpp
@@ -293,7 +293,7 @@ void CYahooProto::ext_got_picture(const char*, const char *who, const char *pic_
 				 */

 				if (getByte("AvatarUL", 0) != 1) {

 					// NO avatar URL??

-					if (!getTString("AvatarFile", &dbv)) {

+					if (!getWString("AvatarFile", &dbv)) {

 						struct _stat statbuf;

 						if (_wstat(dbv.ptszVal, &statbuf) != 0) {

 							LOG(("[ext_yahoo_got_picture] Avatar File Missing? Can't find file: %s", dbv.ptszVal));

@@ -411,7 +411,7 @@ void CYahooProto::ext_got_picture(const char*, const char *who, const char *pic_
 					LOG(("[ext_yahoo_got_picture] Buddy: %s told us this is bad??Expired??. Re-uploading", who));

 					delSetting("AvatarURL");

 

-					if (!getTString("AvatarFile", &dbv2)) {

+					if (!getWString("AvatarFile", &dbv2)) {

 						setString("AvatarInv", who);

 						SendAvatar(dbv2.ptszVal);

 						db_free(&dbv2);

@@ -596,10 +596,10 @@ void CYahooProto::request_avatar(const char* who)
 

 void CYahooProto::GetAvatarFileName(MCONTACT hContact, wchar_t* pszDest, int cbLen, int type)

 {

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

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

 

 	if (_waccess(pszDest, 0))

-		CreateDirectoryTreeT(pszDest);

+		CreateDirectoryTreeW(pszDest);

 

 	if (hContact != NULL) {

 		int ck_sum = getDword(hContact, "PictCK", 0);

@@ -748,7 +748,7 @@ INT_PTR __cdecl CYahooProto::GetMyAvatar(WPARAM wParam, LPARAM lParam)
 	int ret = -3;

 

 	if (getDword("AvatarHash", 0)) {

-		if (!getTString("AvatarFile", &dbv)) {

+		if (!getWString("AvatarFile", &dbv)) {

 			if (_waccess(dbv.ptszVal, 0) == 0) {

 				mir_wstrncpy(buffer, dbv.ptszVal, size - 1);

 				buffer[size - 1] = '\0';

@@ -836,7 +836,7 @@ INT_PTR __cdecl CYahooProto::SetMyAvatar(WPARAM, LPARAM lParam)
 

 			/* now check and make sure we don't reupload same thing over again */

 			if (hash != getDword("AvatarHash", 0)) {

-				setTString("AvatarFile", tszMyFile);

+				setWString("AvatarFile", tszMyFile);

 				setDword("TMPAvatarHash", hash);

 

 				/*	Set Sharing to ON if it's OFF */

diff --git a/protocols/Yahoo/src/file_transfer.cpp b/protocols/Yahoo/src/file_transfer.cpp
index 50156ddd5d..099c78235c 100644
--- a/protocols/Yahoo/src/file_transfer.cpp
+++ b/protocols/Yahoo/src/file_transfer.cpp
@@ -45,7 +45,7 @@ static y_filetransfer* new_ft(CYahooProto* ppro, int id, MCONTACT hContact, cons
 

 	ft->pfts.cbSize = sizeof(PROTOFILETRANSFERSTATUS);

 	ft->pfts.hContact = hContact;

-	ft->pfts.flags = PFTS_TCHAR;

+	ft->pfts.flags = PFTS_UNICODE;

 	ft->pfts.flags |= (sending != 0) ? PFTS_SENDING : PFTS_RECEIVING;

 

 	ft->pfts.tszWorkingDir = NULL;

@@ -505,7 +505,7 @@ void CYahooProto::ext_got_file(const char *me, const char *who, const char *url,
 	char *szFileName = fn;

 

 	PROTORECVFILET pre = { 0 };

-	pre.dwFlags = PRFF_TCHAR;

+	pre.dwFlags = PRFF_UNICODE;

 	pre.fileCount = 1;

 	pre.timestamp = time(NULL);

 	pre.descr.a = (char*)msg;

diff --git a/protocols/Yahoo/src/links.cpp b/protocols/Yahoo/src/links.cpp
index 1eaeadaf44..b831f4cfcd 100644
--- a/protocols/Yahoo/src/links.cpp
+++ b/protocols/Yahoo/src/links.cpp
@@ -140,7 +140,7 @@ static INT_PTR ServiceParseYmsgrLink(WPARAM, LPARAM lParam)
 

 		MCONTACT hContact = proto->add_buddy(id, id, 0, PALF_TEMPORARY); /* ensure contact is on list */

 		if (hContact)

-			CallService(MS_MSG_SENDMESSAGET, hContact, (LPARAM)msg);

+			CallService(MS_MSG_SENDMESSAGEW, hContact, (LPARAM)msg);

 

 		mir_free(id);

 		return 0;

diff --git a/protocols/Yahoo/src/main.cpp b/protocols/Yahoo/src/main.cpp
index f7c04b8097..b7c0c3ff11 100644
--- a/protocols/Yahoo/src/main.cpp
+++ b/protocols/Yahoo/src/main.cpp
@@ -109,7 +109,7 @@ extern "C" int __declspec(dllexport)Load(void)
 

 	NETLIBUSER nlu = { 0 };

 	nlu.cbSize = sizeof(nlu);

-	nlu.flags = NUF_TCHAR | NUF_OUTGOING | NUF_HTTPCONNS;

+	nlu.flags = NUF_UNICODE | NUF_OUTGOING | NUF_HTTPCONNS;

 	nlu.szSettingsModule = "YAHOO/libyahoo2";

 	nlu.ptszDescriptiveName = TranslateT("YAHOO plugin HTTP connections");

 	g_hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);

diff --git a/protocols/Yahoo/src/options.cpp b/protocols/Yahoo/src/options.cpp
index 321851d965..5fe42858d8 100644
--- a/protocols/Yahoo/src/options.cpp
+++ b/protocols/Yahoo/src/options.cpp
@@ -361,7 +361,7 @@ int __cdecl CYahooProto::OnOptionsInit(WPARAM wParam, LPARAM)
 	odp.hInstance = hInstance;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_YAHOO);
 	odp.pwszTitle = m_tszUserName;
-	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;
+	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;
 	odp.pwszGroup = LPGENW("Network");
 	odp.pwszTab = LPGENW("Account");
 	odp.pfnDlgProc = DlgProcYahooOpts;
diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index 56ad2d559e..3d47152262 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -35,7 +35,7 @@ CYahooProto::CYahooProto(const char *aProtoName, const wchar_t *aUserName)
 

 	logoff_buddies();

 

-	SkinAddNewSoundExT("mail", m_tszUserName, LPGENW("New E-mail available in Inbox"));

+	SkinAddNewSoundExW("mail", m_tszUserName, LPGENW("New E-mail available in Inbox"));

 

 	LoadYahooServices();

 }

@@ -72,9 +72,9 @@ int CYahooProto::OnModulesLoadedEx(WPARAM, LPARAM)
 	NETLIBUSER nlu = { 0 };

 	nlu.cbSize = sizeof(nlu);

 #ifdef HTTP_GATEWAY

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

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

 #else

-	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_TCHAR;

+	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;

 #endif

 	nlu.szSettingsModule = m_szModuleName;

 	nlu.ptszDescriptiveName = tModuleDescr;

diff --git a/protocols/Yahoo/src/search.cpp b/protocols/Yahoo/src/search.cpp
index 5b0427d2a4..8a7fa143a8 100644
--- a/protocols/Yahoo/src/search.cpp
+++ b/protocols/Yahoo/src/search.cpp
@@ -36,7 +36,7 @@ void __cdecl CYahooProto::search_simplethread(void *snsearch)
 	YAHOO_SEARCH_RESULT psr;

 	memset(&psr, 0, sizeof(psr));

 	psr.cbSize = sizeof(psr);

-	psr.flags = PSR_TCHAR;

+	psr.flags = PSR_UNICODE;

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

 	psr.protocol = YAHOO_IM_YAHOO;

 

diff --git a/protocols/Yahoo/src/user_info.cpp b/protocols/Yahoo/src/user_info.cpp
index 4b90a00e41..965e51acd4 100644
--- a/protocols/Yahoo/src/user_info.cpp
+++ b/protocols/Yahoo/src/user_info.cpp
@@ -117,7 +117,7 @@ int __cdecl CYahooProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = hInstance;

 	odp.dwInitParam = (LPARAM)this;

-	odp.flags = ODPF_TCHAR | ODPF_DONTTRANSLATE;

+	odp.flags = ODPF_UNICODE | ODPF_DONTTRANSLATE;

 

 	MCONTACT hContact = lParam;

 	if (IsMyContact(hContact)) {

diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index ec97c1c3f1..2d5df96084 100644
--- a/protocols/Yahoo/src/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
@@ -217,8 +217,8 @@ void CYahooProto::AddBuddy(MCONTACT hContact, const char *group, const wchar_t *
 	T2Utf u_msg(msg);

 

 	ptrA ident(getStringA(hContact, "MyIdentity"));

-	ptrW fname(getTStringA(NULL, "FirstName"));

-	ptrW lname(getTStringA(NULL, "LastName"));

+	ptrW fname(getWStringA(NULL, "FirstName"));

+	ptrW lname(getWStringA(NULL, "LastName"));

 

 	SetStringUtf(hContact, "YGroup", group);