diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 12:49:22 +0000 | 
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 12:49:22 +0000 | 
| commit | b280d2eae93fb22b4fdb45218d8a06287a97030e (patch) | |
| tree | f4e0d9921a57bafdb608a55a107bad3408b8f909 /plugins/Variables | |
| parent | 159b565b390687258ee65a3b66596e118752063c (diff) | |
replace _tcscmp to mir_tstrcmp
git-svn-id: http://svn.miranda-ng.org/main/trunk@13753 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Variables')
| -rw-r--r-- | plugins/Variables/src/contact.cpp | 18 | ||||
| -rw-r--r-- | plugins/Variables/src/help.cpp | 10 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_alias.cpp | 4 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_miranda.cpp | 8 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_str.cpp | 8 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_system.cpp | 8 | ||||
| -rw-r--r-- | plugins/Variables/src/parse_variables.cpp | 4 | ||||
| -rw-r--r-- | plugins/Variables/src/tokenregister.cpp | 2 | 
8 files changed, 31 insertions, 31 deletions
| diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp index 40b0bf6f3c..38b9a6296b 100644 --- a/plugins/Variables/src/contact.cpp +++ b/plugins/Variables/src/contact.cpp @@ -95,7 +95,7 @@ BYTE getContactInfoType(TCHAR* type)  		return 0;
  	for (int i=0; i < SIZEOF(builtinCnfs); i++ )
 -		if (!_tcscmp( builtinCnfs[i].str, type ))
 +		if (!mir_tstrcmp( builtinCnfs[i].str, type ))
  			return builtinCnfs[i].cnfCode;
  	return 0;
 @@ -215,7 +215,7 @@ int getContactFromString(CONTACTSINFO *ci)  	{
  		mir_cslock lck(csContactCache);
  		for (int i=0; i < cacheSize; i++) {
 -			if ((!_tcscmp(cce[i].tszContact, tszContact)) && (ci->flags == cce[i].flags)) {
 +			if ((!mir_tstrcmp(cce[i].tszContact, tszContact)) && (ci->flags == cce[i].flags)) {
  				/* found in cache */
  				ci->hContacts = (MCONTACT*)mir_alloc(sizeof(MCONTACT));
  				if (ci->hContacts == NULL)
 @@ -270,7 +270,7 @@ int getContactFromString(CONTACTSINFO *ci)  		if ((ci->flags & CI_UNIQUEID) && (!bMatch)) {
  			szFind = getContactInfoT(CNF_UNIQUEID, hContact);
  			if (szFind != NULL) {
 -				if (!_tcscmp(tszContact, szFind))
 +				if (!mir_tstrcmp(tszContact, szFind))
  					bMatch = TRUE;
  				mir_free(szFind);
  			}
 @@ -279,7 +279,7 @@ int getContactFromString(CONTACTSINFO *ci)  		if ((ci->flags & CI_NICK) && (!bMatch)) {
  			szFind = getContactInfoT(CNF_NICK, hContact);
  			if (szFind != NULL) {
 -				if (!_tcscmp(tszContact, szFind))
 +				if (!mir_tstrcmp(tszContact, szFind))
  					bMatch = TRUE;
  				mir_free(szFind);
  			}
 @@ -288,7 +288,7 @@ int getContactFromString(CONTACTSINFO *ci)  		if ((ci->flags & CI_LISTNAME) && (!bMatch)) {
  			szFind = getContactInfoT(CNF_DISPLAY, hContact);
  			if (szFind != NULL) {
 -				if (!_tcscmp(tszContact, szFind))
 +				if (!mir_tstrcmp(tszContact, szFind))
  					bMatch = TRUE;
  				mir_free(szFind);
  			}
 @@ -297,7 +297,7 @@ int getContactFromString(CONTACTSINFO *ci)  		if ((ci->flags & CI_FIRSTNAME) && (!bMatch)) {
  			szFind = getContactInfoT(CNF_FIRSTNAME, hContact);
  			if (szFind != NULL) {
 -				if (!_tcscmp(tszContact, szFind))
 +				if (!mir_tstrcmp(tszContact, szFind))
  					bMatch = TRUE;
  				mir_free(szFind);
  			}
 @@ -306,7 +306,7 @@ int getContactFromString(CONTACTSINFO *ci)  		if ((ci->flags & CI_LASTNAME) && (!bMatch)) {
  			szFind = getContactInfoT(CNF_LASTNAME, hContact);
  			if (szFind != NULL) {
 -				if (!_tcscmp(tszContact, szFind))
 +				if (!mir_tstrcmp(tszContact, szFind))
  					bMatch = TRUE;
  				mir_free(szFind);
  			}
 @@ -315,7 +315,7 @@ int getContactFromString(CONTACTSINFO *ci)  		if ((ci->flags & CI_EMAIL) && (!bMatch)) {
  			szFind = getContactInfoT(CNF_EMAIL, hContact);
  			if (szFind != NULL) {
 -				if (!_tcscmp(tszContact, szFind))
 +				if (!mir_tstrcmp(tszContact, szFind))
  					bMatch = TRUE;
  				mir_free(szFind);
  			}
 @@ -324,7 +324,7 @@ int getContactFromString(CONTACTSINFO *ci)  		if ((ci->flags & CI_CNFINFO) && (!bMatch)) {
  			szFind = getContactInfoT((BYTE)(ci->flags&~(CI_CNFINFO|CI_TCHAR)), hContact);
  			if (szFind != NULL) {
 -				if (!_tcscmp(tszContact, szFind))
 +				if (!mir_tstrcmp(tszContact, szFind))
  					bMatch = TRUE;
  				mir_free(szFind);
  			}
 diff --git a/plugins/Variables/src/help.cpp b/plugins/Variables/src/help.cpp index 49f3de4fa7..100b599a1d 100644 --- a/plugins/Variables/src/help.cpp +++ b/plugins/Variables/src/help.cpp @@ -347,14 +347,14 @@ static int CALLBACK compareTokenHelp(LPARAM lParam1, LPARAM lParam2, LPARAM lPar  	if (cat1 == NULL || cat2 == NULL)  		return 0; -	int res = _tcscmp(cat1, cat2); +	int res = mir_tstrcmp(cat1, cat2);  	if (res != 0)  		return res;  	if (tr1->tszTokenString == NULL || tr2->tszTokenString == NULL)  		return 0; -	return _tcscmp(tr1->tszTokenString, tr2->tszTokenString); +	return mir_tstrcmp(tr1->tszTokenString, tr2->tszTokenString);  }  static BOOL CALLBACK processTokenListMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) @@ -387,14 +387,14 @@ static BOOL CALLBACK processTokenListMessage(HWND hwndDlg, UINT msg, WPARAM wPar  					continue;  				else if (hdd != NULL) { -					if (!_tcscmp(tr->tszTokenString, SUBJECT)) { +					if (!mir_tstrcmp(tr->tszTokenString, SUBJECT)) {  						if (hdd->vhs->flags&VHF_HIDESUBJECTTOKEN)  							continue;  						if (hdd->vhs->szSubjectDesc != NULL)  							tszHelpDesc = mir_a2t(hdd->vhs->szSubjectDesc);  					} -					if (!_tcscmp(tr->tszTokenString, MIR_EXTRATEXT)) { +					if (!mir_tstrcmp(tr->tszTokenString, MIR_EXTRATEXT)) {  						if (hdd->vhs->flags & VHF_HIDEEXTRATEXTTOKEN)  							continue; @@ -719,7 +719,7 @@ static INT_PTR CALLBACK inputDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM  				TCHAR *newString = variables_parsedup(string, extraText, (MCONTACT)SendMessage(GetParent(hwndDlg), VARM_GETSUBJECT, 0, 0));  				if (newString != NULL) {  					TCHAR *oldString = Hlp_GetDlgItemText(hwndDlg, IDC_RESULT); -					if (oldString == NULL || _tcscmp(oldString, newString)) +					if (oldString == NULL || mir_tstrcmp(oldString, newString))  						SetDlgItemText(hwndDlg, IDC_RESULT, newString);  					mir_free(newString); diff --git a/plugins/Variables/src/parse_alias.cpp b/plugins/Variables/src/parse_alias.cpp index 87256051f5..057ac88d5a 100644 --- a/plugins/Variables/src/parse_alias.cpp +++ b/plugins/Variables/src/parse_alias.cpp @@ -37,7 +37,7 @@ static ALIASREGISTER *searchAliasRegister(TCHAR *szAlias)  	mir_cslock lck(csAliasRegister);
  	for (int i = 0; i < arAliases.getCount(); i++)
 -	if (!_tcscmp(arAliases[i]->szAlias, szAlias))
 +	if (!mir_tstrcmp(arAliases[i]->szAlias, szAlias))
  		return arAliases[i];
  	return NULL;
 @@ -95,7 +95,7 @@ static int addToAliasRegister(TCHAR *szAlias, unsigned int argc, TCHAR** argv, T  	mir_cslock lck(csAliasRegister);
  	for (int i = 0; i < arAliases.getCount(); i++) {
  		ALIASREGISTER *p = arAliases[i];
 -		if (_tcscmp(p->szAlias, szAlias))
 +		if (mir_tstrcmp(p->szAlias, szAlias))
  			continue;
  		mir_free(p->szTranslation);
 diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp index e0efa6e192..5a682f1fa2 100644 --- a/plugins/Variables/src/parse_miranda.cpp +++ b/plugins/Variables/src/parse_miranda.cpp @@ -420,21 +420,21 @@ static TCHAR* parseProtoInfo(ARGUMENTSINFO *ai)  	TCHAR *tszRes = NULL;
  	ptrA szProto(mir_t2a(ai->targv[1]));
 -	if (!_tcscmp(ai->targv[2], _T(STR_PINAME)))
 +	if (!mir_tstrcmp(ai->targv[2], _T(STR_PINAME)))
  		tszRes = Hlp_GetProtocolName(szProto);
 -	else if (!_tcscmp(ai->targv[2], _T(STR_PIUIDTEXT))) {
 +	else if (!mir_tstrcmp(ai->targv[2], _T(STR_PIUIDTEXT))) {
  		if (!ProtoServiceExists(szProto, PS_GETCAPS))
  			return NULL;
  		szRes = (char *)CallProtoService(szProto, PS_GETCAPS, (WPARAM)PFLAG_UNIQUEIDTEXT, 0);
  	}
 -	else if (!_tcscmp(ai->targv[2], _T(STR_PIUIDSETTING))) {
 +	else if (!mir_tstrcmp(ai->targv[2], _T(STR_PIUIDSETTING))) {
  		if (!ProtoServiceExists(szProto, PS_GETCAPS))
  			return NULL;
  		szRes = (char *)CallProtoService(szProto, PS_GETCAPS, (WPARAM)PFLAG_UNIQUEIDSETTING, 0);
  	}
 -	else if (!_tcscmp(ai->targv[2], _T(STR_PINICK))) {
 +	else if (!mir_tstrcmp(ai->targv[2], _T(STR_PINICK))) {
  		CONTACTINFO ci;
  		ci.cbSize = sizeof(CONTACTINFO);
  		ci.dwFlag = CNF_DISPLAY | CNF_UNICODE;
 diff --git a/plugins/Variables/src/parse_str.cpp b/plugins/Variables/src/parse_str.cpp index cd61ae483d..225ed37751 100644 --- a/plugins/Variables/src/parse_str.cpp +++ b/plugins/Variables/src/parse_str.cpp @@ -106,7 +106,7 @@ static TCHAR *parseFixeol(ARGUMENTSINFO *ai)  		return NULL;
  	TCHAR *cur = ai->targv[1];
 -	while (_tcscmp(cur, _T("\r\n")) && *cur != '\n' && *cur != 0)
 +	while (mir_tstrcmp(cur, _T("\r\n")) && *cur != '\n' && *cur != 0)
  		cur++;
  	if (*cur == '\0')
 @@ -500,7 +500,7 @@ static TCHAR *parseStrcmp(ARGUMENTSINFO *ai)  	if (ai->argc != 3)
  		return NULL;
 -	if (_tcscmp(ai->targv[1], ai->targv[2]))
 +	if (mir_tstrcmp(ai->targv[1], ai->targv[2]))
  		ai->flags |= AIF_FALSE;
  	return mir_tstrdup(_T(""));
 @@ -513,7 +513,7 @@ static TCHAR *parseStrmcmp(ARGUMENTSINFO *ai)  	ai->flags |= AIF_FALSE;
  	for (unsigned i = 2; i < ai->argc; i++) {
 -		if (!_tcscmp(ai->targv[1], ai->targv[i])) {
 +		if (!mir_tstrcmp(ai->targv[1], ai->targv[i])) {
  			ai->flags &= ~AIF_FALSE;
  			break;
  		}
 @@ -625,7 +625,7 @@ static TCHAR *parseSwitch(ARGUMENTSINFO *ai)  		return NULL;
  	for (unsigned i = 2; i < ai->argc; i += 2)
 -	if (!_tcscmp(ai->targv[1], ai->targv[i]))
 +	if (!mir_tstrcmp(ai->targv[1], ai->targv[i]))
  		return mir_tstrdup(ai->targv[i + 1]);
  	return NULL;
 diff --git a/plugins/Variables/src/parse_system.cpp b/plugins/Variables/src/parse_system.cpp index 35ba4e21df..1298f73464 100644 --- a/plugins/Variables/src/parse_system.cpp +++ b/plugins/Variables/src/parse_system.cpp @@ -466,13 +466,13 @@ static TCHAR *parseRegistryValue(ARGUMENTSINFO *ai)  	*cur = 0;
  	HKEY hKey;
 -	if (!_tcscmp(key, _T("HKEY_CLASSES_ROOT")))
 +	if (!mir_tstrcmp(key, _T("HKEY_CLASSES_ROOT")))
  		hKey = HKEY_CLASSES_ROOT;
 -	else if (!_tcscmp(key, _T("HKEY_CURRENT_USER")))
 +	else if (!mir_tstrcmp(key, _T("HKEY_CURRENT_USER")))
  		hKey = HKEY_CURRENT_USER;
 -	else if (!_tcscmp(key, _T("HKEY_LOCAL_MACHINE")))
 +	else if (!mir_tstrcmp(key, _T("HKEY_LOCAL_MACHINE")))
  		hKey = HKEY_LOCAL_MACHINE;
 -	else if (!_tcscmp(key, _T("HKEY_USERS")))
 +	else if (!mir_tstrcmp(key, _T("HKEY_USERS")))
  		hKey = HKEY_USERS;
  	else {
  		mir_free(key);
 diff --git a/plugins/Variables/src/parse_variables.cpp b/plugins/Variables/src/parse_variables.cpp index ea5a833786..82460fbb70 100644 --- a/plugins/Variables/src/parse_variables.cpp +++ b/plugins/Variables/src/parse_variables.cpp @@ -31,7 +31,7 @@ static int addToVariablesRegister(TCHAR *szName, TCHAR *szText)  	mir_cslock lck(csVarRegister);
  	for (int i = 0; i < vrCount; i++) {
 -		if ((!_tcscmp(vr[i].szName, szName))) {
 +		if ((!mir_tstrcmp(vr[i].szName, szName))) {
  			mir_free(vr[i].szText);
  			vr[i].szText = mir_tstrdup(szText);
  			return 0;
 @@ -55,7 +55,7 @@ static TCHAR *searchVariableRegister(TCHAR *szName)  	mir_cslock lck(csVarRegister);
  	for (int i = 0; i < vrCount; i++)
 -		if ((!_tcscmp(vr[i].szName, szName)))
 +		if ((!mir_tstrcmp(vr[i].szName, szName)))
  			return mir_tstrdup(vr[i].szText);
  	return NULL;
 diff --git a/plugins/Variables/src/tokenregister.cpp b/plugins/Variables/src/tokenregister.cpp index 6bfb84ad4a..7998c6dbb2 100644 --- a/plugins/Variables/src/tokenregister.cpp +++ b/plugins/Variables/src/tokenregister.cpp @@ -122,7 +122,7 @@ INT_PTR registerToken(WPARAM wParam, LPARAM lParam)  	memcpy(&tre->tr, newVr, newVr->cbSize);
  	tre->nameHash = hash;
 -	if (!_tcscmp(newVr->tszTokenString, _T("alias")))
 +	if (!mir_tstrcmp(newVr->tszTokenString, _T("alias")))
  		log_debugA("alias");
  	if (!(newVr->flags & TRF_PARSEFUNC) && newVr->szService != NULL)
 | 
