fix for the endless recursion in uinfoex

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

5 files changed, 18 insertions, 35 deletions

diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 71901c8e7f..a23222e798 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -1463,22 +1463,13 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 					break;

 			}

 

-			if (

-				!mir_stricmp(pdbcws->szSetting, SET_CONTACT_MYHANDLE) ||

-				!mir_stricmp(pdbcws->szSetting, SET_CONTACT_NICK)

-			 )

-			{

+			if ( !lstrcmpA(pdbcws->szSetting, SET_CONTACT_MYHANDLE) || !lstrcmpA(pdbcws->szSetting, SET_CONTACT_NICK)) {

 				// force the update of all propertysheetpages

 				DlgProc(hDlg, PSM_FORCECHANGED, NULL, NULL);

 				// update the windowtitle

 				DlgProc(hDlg, HM_SETWINDOWTITLE, NULL, lParam);

 			}

-			else if (

-				!mir_stricmp(pdbcws->szModule, USERINFO) ||

-				!mir_stricmp(pdbcws->szModule, pPs->pszProto) ||

-				!mir_stricmp(pdbcws->szModule, MOD_MBIRTHDAY)

-			 )

-			{

+			else if ( !lstrcmpA(pdbcws->szModule, USERINFO) || !lstrcmpA(pdbcws->szModule, pPs->pszProto) || !lstrcmpA(pdbcws->szModule, MOD_MBIRTHDAY)) {

 				// force the update of all propertysheetpages

 				DlgProc(hDlg, PSM_FORCECHANGED, NULL, NULL);

 			}

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
index 537fb0d8c8..d2474d2ac0 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
@@ -524,7 +524,7 @@ BOOLEAN CExImContactBase::isHandle(HANDLE hContact)
 

 	// compare protocols

 	pszProto = DB::Contact::Proto(hContact);

-	if (pszProto == NULL || (INT_PTR)pszProto == CALLSERVICE_NOTFOUND || mir_stricmp(pszProto, _pszProto))

+	if (pszProto == NULL || (INT_PTR)pszProto == CALLSERVICE_NOTFOUND || lstrcmpA(pszProto, _pszProto))

 		return FALSE;

 

 	// compare uids

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index 0f29f08c25..faa5478d61 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -198,26 +198,17 @@ TiXmlElement* CExImContactXML::CreateXmlElement()
  **/

 INT CExImContactXML::ExportContact(DB::CEnumList* pModules)

 {

-	if (_pXmlFile->_wExport & EXPORT_DATA) 

-	{

-		if (pModules) 

-		{

+	if (_pXmlFile->_wExport & EXPORT_DATA) {

+		if (pModules) {

 			INT i;

 			LPSTR p;

 

-			for (i = 0; i < pModules->getCount(); i++)

-			{

+			for (i = 0; i < pModules->getCount(); i++) {

 				p = (*pModules)[i];

-

-				/*Filter/

-				if (mir_stricmp(p, "Protocol") && !DB::Module::IsMeta(p))*/

-				{

-					ExportModule(p);

-				}

+				ExportModule(p);

 			}

 		}

-		else 

-		{

+		else {

 			ExportModule(USERINFO);

 			ExportModule(MOD_MBIRTHDAY);

 		}

@@ -225,9 +216,7 @@ INT CExImContactXML::ExportContact(DB::CEnumList* pModules)
 	

 	// export contact's events

 	if (_pXmlFile->_wExport & EXPORT_HISTORY)

-	{

 		ExportEvents();

-	}

 

 	return ERROR_OK;

 }

@@ -530,9 +519,10 @@ BOOLEAN CExImContactXML::ExportEvents()
 						xmlEvent->LinkEndChild(xmlText);

 

 						// find module

-						for (xmlModule = _xmlNode->FirstChild(); xmlModule != NULL; xmlModule = xmlModule->NextSibling()) {

-							if (!mir_stricmp(((TiXmlElement*)xmlModule)->Attribute("key"), dbei.szModule)) break;

-						}

+						for (xmlModule = _xmlNode->FirstChild(); xmlModule != NULL; xmlModule = xmlModule->NextSibling())

+							if (!mir_stricmp(((TiXmlElement*)xmlModule)->Attribute("key"), dbei.szModule))

+								break;

+

 						// create new module

 						if (!xmlModule) {

 							xmlModule = _xmlNode->InsertEndChild(TiXmlElement(XKEY_MOD));

@@ -583,8 +573,10 @@ VOID CExImContactXML::CountKeys(DWORD &numSettings, DWORD &numEvents)
 		for (xkey = xmod->FirstChild();

 			xkey != NULL;

 			xkey = xkey->NextSibling()) {

-			if (!mir_stricmp(xkey->Value(), XKEY_SET)) numSettings++;

-			else numEvents++;

+			if (!mir_stricmp(xkey->Value(), XKEY_SET))

+				numSettings++;

+			else

+				numEvents++;

 		}

 	}

 }

diff --git a/plugins/UserInfoEx/src/psp_about.cpp b/plugins/UserInfoEx/src/psp_about.cpp
index 0e8362848e..2b1605c292 100644
--- a/plugins/UserInfoEx/src/psp_about.cpp
+++ b/plugins/UserInfoEx/src/psp_about.cpp
@@ -55,7 +55,7 @@ INT_PTR CALLBACK PSPProcEdit(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam,
 				PSGetBoldFont(hDlg, hBoldFont);

 				SendDlgItemMessage(hDlg, IDC_PAGETITLE, WM_SETFONT, (WPARAM)hBoldFont, 0);

 

-				if (!mir_stricmp(pszSetting, SET_CONTACT_MYNOTES))

+				if ( !lstrcmpA(pszSetting, SET_CONTACT_MYNOTES))

 					SetDlgItemText(hDlg, IDC_PAGETITLE, LPGENT("My Notes:"));

 				else

 					SetDlgItemText(hDlg, IDC_PAGETITLE, LPGENT("About:"));

diff --git a/plugins/UserInfoEx/src/svc_gender.cpp b/plugins/UserInfoEx/src/svc_gender.cpp
index f849569644..cf820a1ba4 100644
--- a/plugins/UserInfoEx/src/svc_gender.cpp
+++ b/plugins/UserInfoEx/src/svc_gender.cpp
@@ -100,7 +100,7 @@ static INT OnCListApplyIcons(HANDLE hContact, LPARAM)
  **/

 static INT OnContactSettingChanged(HANDLE hContact, DBCONTACTWRITESETTING* pdbcws)

 {

-	if (hContact && pdbcws && (pdbcws->value.type <= DBVT_BYTE) && !mir_stricmp(pdbcws->szSetting, SET_CONTACT_GENDER))

+	if (hContact && pdbcws && (pdbcws->value.type <= DBVT_BYTE) && !lstrcmpA(pdbcws->szSetting, SET_CONTACT_GENDER))

 		OnCListApplyIcons(hContact, 0);

 

 	return 0;