new sorting functions applied

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

13 files changed, 53 insertions, 53 deletions

diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp
index 17373420c2..a4b9913dc1 100644
--- a/protocols/IRCG/src/clist.cpp
+++ b/protocols/IRCG/src/clist.cpp
@@ -182,24 +182,24 @@ MCONTACT CIrcProto::CList_FindContact(CONTACT *user)
 		if (DBWildcard)

 			CharLower(DBWildcard);

 		if (IsChannel(user->name)) {

-			if (DBDefault && !lstrcmpi(DBDefault, user->name))

+			if (DBDefault && !mir_tstrcmpi(DBDefault, user->name))

 				hContact_temp = (MCONTACT)-1;

 		}

-		else if (user->ExactNick && DBNick && !lstrcmpi(DBNick, user->name))

+		else if (user->ExactNick && DBNick && !mir_tstrcmpi(DBNick, user->name))

 			hContact_temp = hContact;

 

-		else if (user->ExactOnly && DBDefault && !lstrcmpi(DBDefault, user->name))

+		else if (user->ExactOnly && DBDefault && !mir_tstrcmpi(DBDefault, user->name))

 			hContact_temp = hContact;

 

 		else if (user->ExactWCOnly) {

-			if (DBWildcard && !lstrcmpi(DBWildcard, lowercasename)

-				|| (DBWildcard && !lstrcmpi(DBNick, lowercasename) && !WCCmp(DBWildcard, lowercasename))

-				|| (!DBWildcard && !lstrcmpi(DBNick, lowercasename))) {

+			if (DBWildcard && !mir_tstrcmpi(DBWildcard, lowercasename)

+				|| (DBWildcard && !mir_tstrcmpi(DBNick, lowercasename) && !WCCmp(DBWildcard, lowercasename))

+				|| (!DBWildcard && !mir_tstrcmpi(DBNick, lowercasename))) {

 				hContact_temp = hContact;

 			}

 		}

 		else if (_tcschr(user->name, ' ') == 0) {

-			if ((DBDefault && !lstrcmpi(DBDefault, user->name) || DBNick && !lstrcmpi(DBNick, user->name) ||

+			if ((DBDefault && !mir_tstrcmpi(DBDefault, user->name) || DBNick && !mir_tstrcmpi(DBNick, user->name) ||

 				DBWildcard && WCCmp(DBWildcard, lowercasename))

 				&& (WCCmp(DBUser, user->user) && WCCmp(DBHost, user->host))) {

 				hContact_temp = hContact;

diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index 5bc6b89aa5..4c5236b898 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -659,7 +659,7 @@ bool CIrcProto::OnIrc_INVITE(const CIrcMessage* pmsg)
 	if (pmsg->m_bIncoming && (m_ignore && IsIgnored(pmsg->prefix.sNick, pmsg->prefix.sUser, pmsg->prefix.sHost, 'i')))

 		return true;

 

-	if (pmsg->m_bIncoming && m_joinOnInvite && pmsg->parameters.getCount() > 1 && lstrcmpi(pmsg->parameters[0].c_str(), m_info.sNick.c_str()) == 0)

+	if (pmsg->m_bIncoming && m_joinOnInvite && pmsg->parameters.getCount() > 1 && mir_tstrcmpi(pmsg->parameters[0].c_str(), m_info.sNick.c_str()) == 0)

 		PostIrcMessage(_T("/JOIN %s"), pmsg->parameters[1].c_str());

 

 	ShowMessage(pmsg);

@@ -1196,7 +1196,7 @@ bool CIrcProto::IsCTCP(const CIrcMessage* pmsg)
 		// if the whois window is visible and the ctcp reply belongs to the user in it, then show the reply in the whois window

 		if (m_whoisDlg && IsWindowVisible(m_whoisDlg->GetHwnd())) {

 			m_whoisDlg->m_InfoNick.GetText(szTemp, SIZEOF(szTemp));

-			if (lstrcmpi(szTemp, pmsg->prefix.sNick.c_str()) == 0) {

+			if (mir_tstrcmpi(szTemp, pmsg->prefix.sNick.c_str()) == 0) {

 				if (pmsg->m_bIncoming && (command == _T("version") || command == _T("userinfo") || command == _T("time"))) {

 					SetActiveWindow(m_whoisDlg->GetHwnd());

 					m_whoisDlg->m_Reply.SetText(DoColorCodes(GetWordAddress(mess.c_str(), 1), TRUE, FALSE));

@@ -1256,7 +1256,7 @@ bool CIrcProto::OnIrc_ENDNAMES(const CIrcMessage* pmsg)
 				while (_tcschr(sUserModePrefixes.c_str(), name[index]))

 					index++;

 

-				if (!lstrcmpi(name.Mid(index, name.GetLength()).c_str(), m_info.sNick.c_str())) {

+				if (!mir_tstrcmpi(name.Mid(index, name.GetLength()).c_str(), m_info.sNick.c_str())) {

 					bFlag = true;

 					break;

 				}

@@ -1315,7 +1315,7 @@ bool CIrcProto::OnIrc_ENDNAMES(const CIrcMessage* pmsg)
 					gce.ptszUID = sTemp.c_str();

 					gce.ptszNick = sTemp.c_str();

 					gce.ptszStatus = sStat.c_str();

-					BOOL bIsMe = (!lstrcmpi(gce.ptszNick, m_info.sNick.c_str())) ? TRUE : FALSE;

+					BOOL bIsMe = (!mir_tstrcmpi(gce.ptszNick, m_info.sNick.c_str())) ? TRUE : FALSE;

 					if (bIsMe) {

 						char BitNr = -1;

 						switch (sTemp2[0]) {

@@ -1362,7 +1362,7 @@ bool CIrcProto::OnIrc_ENDNAMES(const CIrcMessage* pmsg)
 					wi->codepage = getCodepage();

 					DoEvent(GC_EVENT_SETITEMDATA, sChanName, NULL, NULL, NULL, NULL, (DWORD_PTR)wi, false, false, 0);

 

-					if (!sTopic.IsEmpty() && !lstrcmpi(GetWord(sTopic.c_str(), 0).c_str(), sChanName)) {

+					if (!sTopic.IsEmpty() && !mir_tstrcmpi(GetWord(sTopic.c_str(), 0).c_str(), sChanName)) {

 						DoEvent(GC_EVENT_TOPIC, sChanName, sTopicName.IsEmpty() ? NULL : sTopicName.c_str(), GetWordAddress(sTopic.c_str(), 1), NULL, sTopicTime.IsEmpty() ? NULL : sTopicTime.c_str(), NULL, true, false);

 						AddWindowItemData(sChanName, 0, 0, 0, GetWordAddress(sTopic.c_str(), 1));

 						sTopic = _T("");

@@ -1394,7 +1394,7 @@ bool CIrcProto::OnIrc_ENDNAMES(const CIrcMessage* pmsg)
 						i++;

 						if (!command.IsEmpty()) {

 							CMString S = command.Mid(1, command.GetLength());

-							if (!lstrcmpi(sChanName, S.c_str()))

+							if (!mir_tstrcmpi(sChanName, S.c_str()))

 								break;

 

 							save += command + _T(" ");

@@ -1967,18 +1967,18 @@ bool CIrcProto::OnIrc_WHO_END(const CIrcMessage* pmsg)
 					nick = GetWord(p1, 0);

 					user = GetWord(p1, 1);

 					host = GetWord(p1, 2);

-					if ((DBWildcard && WCCmp(DBWildcard, nick.c_str()) || DBNick && !lstrcmpi(DBNick, nick.c_str()) || DBDefault && !lstrcmpi(DBDefault, nick.c_str()))

+					if ((DBWildcard && WCCmp(DBWildcard, nick.c_str()) || DBNick && !mir_tstrcmpi(DBNick, nick.c_str()) || DBDefault && !mir_tstrcmpi(DBDefault, nick.c_str()))

 						&& (WCCmp(DBUser, user.c_str()) && WCCmp(DBHost, host.c_str()))) {

 						if (away[0] == 'G' && getWord(hContact, "Status", ID_STATUS_OFFLINE) != ID_STATUS_AWAY)

 							setWord(hContact, "Status", ID_STATUS_AWAY);

 						else if (away[0] == 'H' && getWord(hContact, "Status", ID_STATUS_OFFLINE) != ID_STATUS_ONLINE)

 							setWord(hContact, "Status", ID_STATUS_ONLINE);

 

-						if ((DBNick && lstrcmpi(nick.c_str(), DBNick)) || !DBNick)

+						if ((DBNick && mir_tstrcmpi(nick.c_str(), DBNick)) || !DBNick)

 							setTString(hContact, "Nick", nick.c_str());

-						if ((DBManUser && lstrcmpi(user.c_str(), DBManUser)) || !DBManUser)

+						if ((DBManUser && mir_tstrcmpi(user.c_str(), DBManUser)) || !DBManUser)

 							setTString(hContact, "User", user.c_str());

-						if ((DBManHost && lstrcmpi(host.c_str(), DBManHost)) || !DBManHost)

+						if ((DBManHost && mir_tstrcmpi(host.c_str(), DBManHost)) || !DBManHost)

 							setTString(hContact, "Host", host.c_str());

 						return true;

 					}

@@ -2014,7 +2014,7 @@ bool CIrcProto::OnIrc_WHO_REPLY(const CIrcMessage* pmsg)
 	CMString command = PeekAtReasons(2);

 	if (pmsg->m_bIncoming && pmsg->parameters.getCount() > 6 && command[0] == 'S') {

 		m_whoReply.AppendFormat(_T("%s %s %s %s "), pmsg->parameters[5].c_str(), pmsg->parameters[2].c_str(), pmsg->parameters[3].c_str(), pmsg->parameters[6].c_str());

-		if (lstrcmpi(pmsg->parameters[5].c_str(), m_info.sNick.c_str()) == 0) {

+		if (mir_tstrcmpi(pmsg->parameters[5].c_str(), m_info.sNick.c_str()) == 0) {

 			TCHAR host[1024];

 			mir_tstrncpy(host, pmsg->parameters[3].c_str(), 1024);

 			ForkThread(&CIrcProto::ResolveIPThread, new IPRESOLVE(_T2A(host), IP_AUTO));

@@ -2117,7 +2117,7 @@ bool CIrcProto::OnIrc_USERHOST_REPLY(const CIrcMessage* pmsg)
 	

 							// If user found, remove from checklist

 							for (int i = 0; i < checklist.getCount(); i++)

-								if (!lstrcmpi(checklist[i].c_str(), nick.c_str()))

+								if (!mir_tstrcmpi(checklist[i].c_str(), nick.c_str()))

 									checklist.remove(i);

 						}

 					}

@@ -2415,12 +2415,12 @@ int CIrcProto::IsIgnored(CMString user, char type)
 	for (int i = 0; i < m_ignoreItems.getCount(); i++) {

 		const CIrcIgnoreItem& C = m_ignoreItems[i];

 

-		if (type == 0 && !lstrcmpi(user.c_str(), C.mask.c_str()))

+		if (type == 0 && !mir_tstrcmpi(user.c_str(), C.mask.c_str()))

 			return i + 1;

 

 		bool bUserContainsWild = (_tcschr(user.c_str(), '*') != NULL || _tcschr(user.c_str(), '?') != NULL);

 		if (!bUserContainsWild && WCCmp(C.mask.c_str(), user.c_str()) ||

-			bUserContainsWild && !lstrcmpi(user.c_str(), C.mask.c_str())) {

+			bUserContainsWild && !mir_tstrcmpi(user.c_str(), C.mask.c_str())) {

 			if (C.flags.IsEmpty() || C.flags[0] != '+')

 				continue;

 

@@ -2430,7 +2430,7 @@ int CIrcProto::IsIgnored(CMString user, char type)
 			if (C.network.IsEmpty())

 				return i + 1;

 

-			if (IsConnected() && !lstrcmpi(C.network.c_str(), m_info.sNetwork.c_str()))

+			if (IsConnected() && !mir_tstrcmpi(C.network.c_str(), m_info.sNetwork.c_str()))

 				return i + 1;

 		}

 	}

diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp
index 019ac57cb2..9c66bffb8e 100644
--- a/protocols/IRCG/src/input.cpp
+++ b/protocols/IRCG/src/input.cpp
@@ -251,7 +251,7 @@ BOOL CIrcProto::DoHardcodedCommand(CMString text, TCHAR* window, MCONTACT hConta
 			else

 				S = MakeWndID(one.c_str());

 		}

-		else if (lstrcmpi(window, SERVERWINDOW) == 0)

+		else if (mir_tstrcmpi(window, SERVERWINDOW) == 0)

 			S = window;

 		else

 			S = MakeWndID(window);

@@ -273,12 +273,12 @@ BOOL CIrcProto::DoHardcodedCommand(CMString text, TCHAR* window, MCONTACT hConta
 					DoEvent(GC_EVENT_INFORMATION, NULL, m_info.sNick.c_str(), TranslateT("Ignore system is disabled"), NULL, NULL, NULL, true, false);

 				return true;

 			}

-			if (!lstrcmpi(one.c_str(), _T("on"))) {

+			if (!mir_tstrcmpi(one.c_str(), _T("on"))) {

 				m_ignore = 1;

 				DoEvent(GC_EVENT_INFORMATION, NULL, m_info.sNick.c_str(), TranslateT("Ignore system is enabled"), NULL, NULL, NULL, true, false);

 				return true;

 			}

-			if (!lstrcmpi(one.c_str(), _T("off"))) {

+			if (!mir_tstrcmpi(one.c_str(), _T("off"))) {

 				m_ignore = 0;

 				DoEvent(GC_EVENT_INFORMATION, NULL, m_info.sNick.c_str(), TranslateT("Ignore system is disabled"), NULL, NULL, NULL, true, false);

 				return true;

@@ -385,12 +385,12 @@ BOOL CIrcProto::DoHardcodedCommand(CMString text, TCHAR* window, MCONTACT hConta
 		if (one.IsEmpty())

 			return true;

 

-		if (!lstrcmpi(one.c_str(), _T("on"))) {

+		if (!mir_tstrcmpi(one.c_str(), _T("on"))) {

 			bEcho = TRUE;

 			DoEvent(GC_EVENT_INFORMATION, NULL, m_info.sNick.c_str(), TranslateT("Outgoing commands are shown"), NULL, NULL, NULL, true, false);

 		}

 

-		if (!lstrcmpi(one.c_str(), _T("off"))) {

+		if (!mir_tstrcmpi(one.c_str(), _T("off"))) {

 			DoEvent(GC_EVENT_INFORMATION, NULL, m_info.sNick.c_str(), TranslateT("Outgoing commands are not shown"), NULL, NULL, NULL, true, false);

 			bEcho = FALSE;

 		}

@@ -406,17 +406,17 @@ BOOL CIrcProto::DoHardcodedCommand(CMString text, TCHAR* window, MCONTACT hConta
 				DoEvent(GC_EVENT_INFORMATION, NULL, m_info.sNick.c_str(), TranslateT("The buddy check function is disabled"), NULL, NULL, NULL, true, false);

 			return true;

 		}

-		if (!lstrcmpi(one.c_str(), _T("on"))) {

+		if (!mir_tstrcmpi(one.c_str(), _T("on"))) {

 			bTempForceCheck = true;

 			bTempDisableCheck = false;

 			CallFunctionAsync(sttSetTimerOn, this);

 		}

-		if (!lstrcmpi(one.c_str(), _T("off"))) {

+		if (!mir_tstrcmpi(one.c_str(), _T("off"))) {

 			bTempForceCheck = false;

 			bTempDisableCheck = true;

 			CallFunctionAsync(sttSetTimerOff, this);

 		}

-		if (!lstrcmpi(one.c_str(), _T("time")) && !two.IsEmpty()) {

+		if (!mir_tstrcmpi(one.c_str(), _T("time")) && !two.IsEmpty()) {

 			m_iTempCheckTime = StrToInt(two.c_str());

 			if (m_iTempCheckTime < 10 && m_iTempCheckTime != 0)

 				m_iTempCheckTime = 10;

@@ -597,15 +597,15 @@ BOOL CIrcProto::DoHardcodedCommand(CMString text, TCHAR* window, MCONTACT hConta
 			ulAdr = ConvertIPToInteger(m_IPFromServer ? m_myHost : m_myLocalHost);

 

 		// if it is not dcc or if it is dcc and a local ip exist

-		if (lstrcmpi(two.c_str(), _T("dcc")) != 0 || ulAdr) {

-			if (lstrcmpi(two.c_str(), _T("ping")) == 0)

+		if (mir_tstrcmpi(two.c_str(), _T("dcc")) != 0 || ulAdr) {

+			if (mir_tstrcmpi(two.c_str(), _T("ping")) == 0)

 				mir_sntprintf(szTemp, SIZEOF(szTemp), _T("/PRIVMSG %s \001%s %u\001"), one.c_str(), two.c_str(), time(0));

 			else

 				mir_sntprintf(szTemp, SIZEOF(szTemp), _T("/PRIVMSG %s \001%s\001"), one.c_str(), GetWordAddress(text.c_str(), 2));

 			PostIrcMessageWnd(window, hContact, szTemp);

 		}

 

-		if (lstrcmpi(two.c_str(), _T("dcc")) != 0) {

+		if (mir_tstrcmpi(two.c_str(), _T("dcc")) != 0) {

 			mir_sntprintf(szTemp, SIZEOF(szTemp), TranslateT("CTCP %s request sent to %s"), two.c_str(), one.c_str());

 			DoEvent(GC_EVENT_INFORMATION, SERVERWINDOW, m_info.sNick.c_str(), szTemp, NULL, NULL, NULL, true, false);

 		}

@@ -617,7 +617,7 @@ BOOL CIrcProto::DoHardcodedCommand(CMString text, TCHAR* window, MCONTACT hConta
 		if (one.IsEmpty() || two.IsEmpty())

 			return true;

 

-		if (lstrcmpi(one.c_str(), _T("send")) == 0) {

+		if (mir_tstrcmpi(one.c_str(), _T("send")) == 0) {

 			TCHAR szTemp[1000];

 			unsigned long ulAdr = 0;

 

@@ -667,7 +667,7 @@ BOOL CIrcProto::DoHardcodedCommand(CMString text, TCHAR* window, MCONTACT hConta
 			return true;

 		}

 

-		if (lstrcmpi(one.c_str(), _T("chat")) == 0) {

+		if (mir_tstrcmpi(one.c_str(), _T("chat")) == 0) {

 			TCHAR szTemp[1000];

 

 			unsigned long ulAdr = 0;

@@ -826,7 +826,7 @@ bool CIrcProto::PostIrcMessageWnd(TCHAR* window, MCONTACT hContact, const TCHAR*
 	else

 		mir_tstrncpy(windowname, SERVERWINDOW, 255);

 

-	if (lstrcmpi(window, SERVERWINDOW) != 0) {

+	if (mir_tstrcmpi(window, SERVERWINDOW) != 0) {

 		TCHAR* p1 = _tcschr(windowname, ' ');

 		if (p1)

 			*p1 = '\0';

@@ -885,7 +885,7 @@ bool CIrcProto::PostIrcMessageWnd(TCHAR* window, MCONTACT hContact, const TCHAR*
 			((GetWord(DoThis.c_str(), 0)[0] == '/') && (GetWord(DoThis.c_str(), 0)[1] == '/')) ||		// or double backslash at the beginning

 			hContact) {

 			CMString S = _T("/PRIVMSG ");

-			if (lstrcmpi(window, SERVERWINDOW) == 0 && !m_info.sServerName.IsEmpty())

+			if (mir_tstrcmpi(window, SERVERWINDOW) == 0 && !m_info.sServerName.IsEmpty())

 				S += m_info.sServerName + _T(" ") + DoThis;

 			else

 				S += CMString(windowname) + _T(" ") + DoThis;

diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp
index 9cea32cdf6..3a08e3b817 100644
--- a/protocols/IRCG/src/irclib.cpp
+++ b/protocols/IRCG/src/irclib.cpp
@@ -29,7 +29,7 @@ int CDccSession::nDcc = 0;
 
 static int CompareHandlers( const CIrcHandler* p1, const CIrcHandler* p2 )
 {
-	return lstrcmp( p1->m_name, p2->m_name );
+	return mir_tstrcmp( p1->m_name, p2->m_name );
 }
 
 OBJLIST<CIrcHandler> CIrcProto::m_handlers( 30, CompareHandlers );
@@ -525,7 +525,7 @@ CDccSession* CIrcProto::FindDCCRecvByPortAndName(int iPort, const TCHAR* szName)
 		CDccSession* p = m_dcc_xfers[i];
 		DBVARIANT dbv;
 		if (!getTString(p->di->hContact, "Nick", &dbv)) {
-			if (p->di->iType == DCC_SEND && !p->di->bSender && !lstrcmpi(szName, dbv.ptszVal) && iPort == p->di->iPort) {
+			if (p->di->iType == DCC_SEND && !p->di->bSender && !mir_tstrcmpi(szName, dbv.ptszVal) && iPort == p->di->iPort) {
 				db_free(&dbv);
 				return p;
 			}
diff --git a/protocols/IRCG/src/main.cpp b/protocols/IRCG/src/main.cpp
index f7e10448e5..e5d7dc7e3a 100644
--- a/protocols/IRCG/src/main.cpp
+++ b/protocols/IRCG/src/main.cpp
@@ -28,7 +28,7 @@ int hLangpack;
 

 static int CompareServers( const SERVER_INFO* p1, const SERVER_INFO* p2 )

 {

-	return lstrcmpA( p1->m_name, p2->m_name );

+	return mir_strcmp( p1->m_name, p2->m_name );

 }

 

 OBJLIST<SERVER_INFO> g_servers( 20, CompareServers );

diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 83e83cd725..ce0aaec509 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -1303,7 +1303,7 @@ static int CALLBACK IgnoreListSort(LPARAM lParam1, LPARAM lParam2, LPARAM lParam
 	hwndDlg->m_list.GetItem(&lvm);

 

 	if (temp1[0] && temp2[0])

-		return lstrcmpi(temp1, temp2);

+		return mir_tstrcmpi(temp1, temp2);

 

 	return (temp1[0] == 0) ? 1 : -1;

 }

diff --git a/protocols/IRCG/src/output.cpp b/protocols/IRCG/src/output.cpp
index 69a3c69335..016918f612 100644
--- a/protocols/IRCG/src/output.cpp
+++ b/protocols/IRCG/src/output.cpp
@@ -89,7 +89,7 @@ static CMString FormatOutput(const CIrcMessage* pmsg)
 			tempstr.Delete(0, 1);

 			tempstr.Delete(tempstr.GetLength() - 1, 1);

 			CMString type = GetWord(tempstr.c_str(), 0);

-			if (lstrcmpi(type.c_str(), _T("ping")) == 0)

+			if (mir_tstrcmpi(type.c_str(), _T("ping")) == 0)

 				mir_sntprintf(temp, SIZEOF(temp), TranslateT("CTCP %s reply sent to %s"), type.c_str(), pmsg->parameters[0].c_str());

 			else

 				mir_sntprintf(temp, SIZEOF(temp), TranslateT("CTCP %s reply sent to %s: %s"), type.c_str(), pmsg->parameters[0].c_str(), GetWordAddress(tempstr.c_str(), 1));

diff --git a/protocols/IRCG/src/scripting.cpp b/protocols/IRCG/src/scripting.cpp
index 3f2b63b4a6..4b18be6f63 100644
--- a/protocols/IRCG/src/scripting.cpp
+++ b/protocols/IRCG/src/scripting.cpp
@@ -172,7 +172,7 @@ INT_PTR __cdecl CIrcProto::Scripting_GetIrcData(WPARAM, LPARAM lparam)
 					gci.pszModule = m_szModuleName;

 					gci.iItem = j;

 					if (!CallServiceSync(MS_GC_GETINFO, 0, (LPARAM)&gci)) {

-						if (lstrcmpi(gci.pszID, SERVERWINDOW)) {

+						if (mir_tstrcmpi(gci.pszID, SERVERWINDOW)) {

 							CMString S1 = gci.pszID;

 							int k = S1.Find(_T(" "));

 							if (k != -1)

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index b7a9f14381..085cc2b898 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -504,7 +504,7 @@ int __cdecl CIrcProto::GCEventHook(WPARAM wParam, LPARAM lParam)
 

 	// handle the hook

 	if (gch) {

-		if (!lstrcmpiA(gch->pDest->pszModule, m_szModuleName)) {

+		if (!mir_strcmpi(gch->pDest->pszModule, m_szModuleName)) {

 			TCHAR *p1 = mir_tstrdup(gch->pDest->ptszID);

 			TCHAR *p2 = _tcsstr(p1, _T(" - "));

 			if (p2)

@@ -850,9 +850,9 @@ int __cdecl CIrcProto::GCMenuHook(WPARAM, LPARAM lParam)
 {

 	GCMENUITEMS *gcmi = (GCMENUITEMS*)lParam;

 	if (gcmi) {

-		if (!lstrcmpiA(gcmi->pszModule, m_szModuleName)) {

+		if (!mir_strcmpi(gcmi->pszModule, m_szModuleName)) {

 			if (gcmi->Type == MENU_ON_LOG) {

-				if (lstrcmpi(gcmi->pszID, SERVERWINDOW)) {

+				if (mir_tstrcmpi(gcmi->pszID, SERVERWINDOW)) {

 					gcmi->nItems = SIZEOF(logItems);

 					gcmi->Item = logItems;

 				}

@@ -932,7 +932,7 @@ int __cdecl CIrcProto::OnMenuPreBuild(WPARAM hContact, LPARAM)
 		return 0;

 

 	char *szProto = GetContactProto(hContact);

-	if (szProto && !lstrcmpiA(szProto, m_szModuleName)) {

+	if (szProto && !mir_strcmpi(szProto, m_szModuleName)) {

 		bool bIsOnline = getWord(hContact, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE;

 

 		// context menu for chatrooms

diff --git a/protocols/IRCG/src/tools.cpp b/protocols/IRCG/src/tools.cpp
index 30c1e217f2..45c7ded352 100644
--- a/protocols/IRCG/src/tools.cpp
+++ b/protocols/IRCG/src/tools.cpp
@@ -400,7 +400,7 @@ INT_PTR CIrcProto::DoEvent(int iEvent, const TCHAR* pszWindow, const TCHAR* pszN
 	}

 

 	if (pszWindow) {

-		if (lstrcmpi(pszWindow, SERVERWINDOW))

+		if (mir_tstrcmpi(pszWindow, SERVERWINDOW))

 			sID = pszWindow + (CMString)_T(" - ") + m_info.sNetwork;

 		else

 			sID = pszWindow;

diff --git a/protocols/IRCG/src/ui_utils.cpp b/protocols/IRCG/src/ui_utils.cpp
index daaa364a14..d1e999f7bc 100644
--- a/protocols/IRCG/src/ui_utils.cpp
+++ b/protocols/IRCG/src/ui_utils.cpp
@@ -1341,7 +1341,7 @@ HTREEITEM CCtrlTreeView::FindNamedItem(HTREEITEM hItem, const TCHAR *name)
 	{

 		GetItem(&tvi);

 

-		if (!lstrcmp(tvi.pszText, name))

+		if (!mir_tstrcmp(tvi.pszText, name))

 			return tvi.hItem;

 

 		tvi.hItem = GetNextSibling(tvi.hItem);

diff --git a/protocols/IRCG/src/userinfo.cpp b/protocols/IRCG/src/userinfo.cpp
index c5389d8607..ffcdbdc785 100644
--- a/protocols/IRCG/src/userinfo.cpp
+++ b/protocols/IRCG/src/userinfo.cpp
@@ -190,7 +190,7 @@ int __cdecl CIrcProto::OnInitUserInfo(WPARAM wParam, LPARAM lParam)
 {

 	MCONTACT hContact = lParam;

 	char *szProto = GetContactProto(hContact);

-	if (!hContact || !szProto || lstrcmpiA(szProto, m_szModuleName))

+	if (!hContact || !szProto || mir_strcmpi(szProto, m_szModuleName))

 		return 0;

 

 	if (isChatRoom(hContact))

diff --git a/protocols/IRCG/src/windows.cpp b/protocols/IRCG/src/windows.cpp
index 0e48fc7432..136ee34f50 100644
--- a/protocols/IRCG/src/windows.cpp
+++ b/protocols/IRCG/src/windows.cpp
@@ -434,7 +434,7 @@ static int CALLBACK ListViewSort(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSo
 	param->pList->GetItem(&lvm);

 	if (param->iSubItem != 1) {

 		if (mir_tstrlen(temp1) != 0 && mir_tstrlen(temp2) != 0)

-			return lstrcmpi(temp1, temp2);

+			return mir_tstrcmpi(temp1, temp2);

 

 		return (*temp1 == 0) ? 1 : -1;

 	}

@@ -637,7 +637,7 @@ void CQuickDlg::OnOk(CCtrlButton*)
 

 	TCHAR windowname[20];

 	GetWindowText(m_hwnd, windowname, SIZEOF(windowname));

-	if (lstrcmpi(windowname, _T("Miranda IRC")) == 0) {

+	if (mir_tstrcmpi(windowname, _T("Miranda IRC")) == 0) {

 		m_proto->m_serverComboSelection = m_serverCombo.GetCurSel() - 1;

 		m_proto->setDword("ServerComboSelection", m_proto->m_serverComboSelection);

 		m_proto->setString("ServerName", m_proto->m_serverName);

@@ -1171,7 +1171,7 @@ void CManagerDlg::OnApplyModes(CCtrlButton*)
 			else if (GetWindowTextLength(GetDlgItem(m_hwnd, IDC_LIMIT))) {

 				TCHAR temp[15];

 				GetDlgItemText(m_hwnd, IDC_LIMIT, temp, SIZEOF(temp));

-				if (wi->pszLimit && lstrcmpi(wi->pszLimit, temp)) {

+				if (wi->pszLimit && mir_tstrcmpi(wi->pszLimit, temp)) {

 					mir_tstrcat(toadd, _T("l"));

 					appendixadd += _T(" ") + CMString(temp);

 				}