shameful death of another 'HANDLE'

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

5 files changed, 54 insertions, 51 deletions

diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp
index 1064255630..48f0deb219 100644
--- a/src/modules/clist/clc.cpp
+++ b/src/modules/clist/clc.cpp
@@ -397,7 +397,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 				TCHAR szFullName[512];

 				int i, nameLen, eq;

 				//check name of group and ignore message if just being expanded/collapsed

-				if (cli.pfnFindItem(hwnd, dat, (HANDLE)(groupId | HCONTACT_ISGROUP), &contact, &group, NULL)) {

+				if (cli.pfnFindItem(hwnd, dat, groupId | HCONTACT_ISGROUP, &contact, &group, NULL)) {

 					lstrcpy(szFullName, contact->szText);

 					while (group->parent) {

 						for (i=0; i < group->parent->cl.count; i++)

@@ -459,7 +459,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 			if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN)

 				break;

 			if (dbcws->value.type == DBVT_DELETED || dbcws->value.bVal == 0) {

-				if (cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, NULL, NULL, NULL))

+				if (cli.pfnFindItem(hwnd, dat, wParam, NULL, NULL, NULL))

 					break;

 				cli.pfnAddContactToTree(hwnd, dat, wParam, 1, 1);

 				cli.pfnNotifyNewContact(hwnd, wParam);

@@ -475,7 +475,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 		{

 			WORD iExtraImage[EXTRA_ICON_COUNT];

 			BYTE flags = 0;

-			if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+			if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))

 				memset(iExtraImage, 0xFF, sizeof(iExtraImage));

 			else {

 				memcpy(iExtraImage, contact->iExtraImage, sizeof(iExtraImage));

@@ -485,7 +485,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 			if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !db_get_b(wParam, "CList", "Hidden", 0)) {

 				NMCLISTCONTROL nm;

 				cli.pfnAddContactToTree(hwnd, dat, wParam, 1, 1);

-				if (cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL)) {

+				if (cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL)) {

 					memcpy(contact->iExtraImage, iExtraImage, sizeof(iExtraImage));

 					if (flags & CONTACTF_CHECKED)

 						contact->flags |= CONTACTF_CHECKED;

@@ -522,13 +522,13 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 

 			contact = NULL;

 			group = NULL;

-			if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, &group, NULL)) {

+			if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, &group, NULL)) {

 				if (shouldShow && CallService(MS_DB_CONTACT_IS, wParam, 0)) {

 					if (dat->selection >= 0 && cli.pfnGetRowByIndex(dat, dat->selection, &selcontact, NULL) != -1)

 						hSelItem = (MCONTACT)cli.pfnContactToHItem(selcontact);

 					cli.pfnAddContactToTree(hwnd, dat, wParam, (style & CLS_CONTACTLIST) == 0, 0);

 					recalcScrollBar = 1;

-					cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL);

+					cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL);

 					if (contact) {

 						contact->iImage = (WORD) lParam;

 						cli.pfnNotifyNewContact(hwnd, wParam);

@@ -556,7 +556,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 			}

 			if (hSelItem) {

 				ClcGroup *selgroup;

-				if (cli.pfnFindItem(hwnd, dat, (HANDLE)hSelItem, &selcontact, &selgroup, NULL))

+				if (cli.pfnFindItem(hwnd, dat, hSelItem, &selcontact, &selgroup, NULL))

 					dat->selection = cli.pfnGetRowsPriorTo(&dat->list, selgroup, List_IndexOf((SortedList*)&selgroup->cl, selcontact));

 				else

 					dat->selection = -1;

@@ -566,7 +566,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 		break;

 

 	case INTM_NAMECHANGED:

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))

 			break;

 

 		lstrcpyn(contact->szText, cli.pfnGetContactDisplayName(wParam, 0), SIZEOF(contact->szText));

@@ -575,7 +575,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 		break;

 

 	case INTM_PROTOCHANGED:

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))

 			break;

 

 		contact->proto = GetContactProto(wParam);

@@ -585,7 +585,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 		break;

 

 	case INTM_NOTONLISTCHANGED:

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))

 			break;

 

 		if (contact->type == CLCIT_CONTACT) {

@@ -603,7 +603,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 		break;

 

 	case INTM_APPARENTMODECHANGED:

-		if (cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL)) {

+		if (cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL)) {

 			char *szProto = GetContactProto(wParam);

 			if (szProto == NULL)

 				break;

@@ -625,7 +625,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 		break;

 

 	case INTM_IDLECHANGED:

-		if (cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL)) {

+		if (cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL)) {

 			char *szProto = GetContactProto(wParam);

 			if (szProto == NULL)

 				break;

diff --git a/src/modules/clist/clc.h b/src/modules/clist/clc.h
index 0c1a714fae..179ba84c46 100644
--- a/src/modules/clist/clc.h
+++ b/src/modules/clist/clc.h
@@ -45,7 +45,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 

 /* clcidents.c */

 int       fnGetRowsPriorTo(ClcGroup *group, ClcGroup *subgroup, int contactIndex);

-int       fnFindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);

+int       fnFindItem(HWND hwnd, struct ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);

 int       fnGetRowByIndex(struct ClcData *dat, int testindex, ClcContact **contact, ClcGroup **subgroup);

 HANDLE    fnContactToHItem(ClcContact *contact);

 HANDLE    fnContactToItemHandle(ClcContact *contact, DWORD *nmFlags);

diff --git a/src/modules/clist/clcidents.cpp b/src/modules/clist/clcidents.cpp
index 40584a910d..d4ea6804f9 100644
--- a/src/modules/clist/clcidents.cpp
+++ b/src/modules/clist/clcidents.cpp
@@ -58,11 +58,13 @@ int fnGetRowsPriorTo(ClcGroup *group, ClcGroup *subgroup, int contactIndex)
 		if (group == subgroup && contactIndex == group->scanIndex)

 			return count;

 		count++;

-		if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP) {

-			if (group->cl.items[group->scanIndex]->group == subgroup && contactIndex == -1)

+

+		ClcContact *cc = group->cl.items[group->scanIndex];

+		if (cc->type == CLCIT_GROUP) {

+			if (cc->group == subgroup && contactIndex == -1)

 				return count - 1;

-			if (group->cl.items[group->scanIndex]->group->expanded) {

-				group = group->cl.items[group->scanIndex]->group;

+			if (cc->group->expanded) {

+				group = cc->group;

 				group->scanIndex = 0;

 				continue;

 			}

@@ -72,7 +74,7 @@ int fnGetRowsPriorTo(ClcGroup *group, ClcGroup *subgroup, int contactIndex)
 	return -1;

 }

 

-int fnFindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible)

+int fnFindItem(HWND hwnd, struct ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible)

 {

 	int index = 0;

 	int nowVisible = 1;

@@ -91,17 +93,16 @@ int fnFindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, ClcContact **contac
 					nowVisible = 0;

 					break;

 				}

-				group->scanIndex++;

-				continue;

+			group->scanIndex++;

+			continue;

 		}

 		if (nowVisible)

 			index++;

-		if ((IsHContactGroup(hItem) && group->cl.items[group->scanIndex]->type == CLCIT_GROUP &&

-			 ((unsigned) hItem & ~HCONTACT_ISGROUP) == group->cl.items[group->scanIndex]->groupId) || (IsHContactContact(hItem) &&

-			 group->cl.items[group->scanIndex]->type == CLCIT_CONTACT &&

-			 group->cl.items[group->scanIndex]->hContact == (MCONTACT)hItem) || (IsHContactInfo(hItem) &&

-			 group->cl.items[group->scanIndex]->type == CLCIT_INFO &&

-			 group->cl.items[group->scanIndex]->hContact == (MCONTACT)((UINT_PTR)hItem & ~HCONTACT_ISINFO)))

+

+		ClcContact *cc = group->cl.items[group->scanIndex];

+		if ((IsHContactGroup(dwItem) && cc->type == CLCIT_GROUP && (dwItem & ~HCONTACT_ISGROUP) == cc->groupId) || 

+			 (IsHContactContact(dwItem) && cc->type == CLCIT_CONTACT && cc->hContact == dwItem) ||

+			 (IsHContactInfo(dwItem) && cc->type == CLCIT_INFO && cc->hContact == (dwItem & ~HCONTACT_ISINFO)))

 		{

 			if (isVisible) {

 				if (!nowVisible)

@@ -121,13 +122,13 @@ int fnFindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, ClcContact **contac
 				}

 			}

 			if (contact)

-				*contact = group->cl.items[group->scanIndex];

+				*contact = cc;

 			if (subgroup)

 				*subgroup = group;

 			return 1;

 		}

-		if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP) {

-			group = group->cl.items[group->scanIndex]->group;

+		if (cc->type == CLCIT_GROUP) {

+			group = cc->group;

 			group->scanIndex = 0;

 			nowVisible &= group->expanded;

 			continue;

@@ -158,16 +159,18 @@ int fnGetRowByIndex(struct ClcData *dat, int testindex, ClcContact **contact, Cl
 			group->scanIndex++;

 			continue;

 		}

+

+		ClcContact *cc = group->cl.items[group->scanIndex];

 		if (testindex == index) {

 			if (contact)

-				*contact = group->cl.items[group->scanIndex];

+				*contact = cc;

 			if (subgroup)

 				*subgroup = group;

 			return index;

 		}

 		index++;

-		if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP && group->cl.items[group->scanIndex]->group->expanded) {

-			group = group->cl.items[group->scanIndex]->group;

+		if (cc->type == CLCIT_GROUP && cc->group->expanded) {

+			group = cc->group;

 			group->scanIndex = 0;

 			continue;

 		}

diff --git a/src/modules/clist/clcitems.cpp b/src/modules/clist/clcitems.cpp
index 9e0352f2b7..a1c52bb02f 100644
--- a/src/modules/clist/clcitems.cpp
+++ b/src/modules/clist/clcitems.cpp
@@ -316,7 +316,7 @@ void fnDeleteItemFromTree(HWND hwnd, MCONTACT hItem)
 	struct ClcData *dat = (struct ClcData *) GetWindowLongPtr(hwnd, 0);

 

 	dat->needsResort = 1;

-	if (!cli.pfnFindItem(hwnd, dat, (HANDLE)hItem, &contact, &group, NULL)) {

+	if (!cli.pfnFindItem(hwnd, dat, hItem, &contact, &group, NULL)) {

 		DBVARIANT dbv;

 		int i, nameOffset;

 		if (!IsHContactContact(hItem))

@@ -569,7 +569,7 @@ void fnSortCLC(HWND hwnd, struct ClcData *dat, int useInsertionSort)
 			group->scanIndex++;

 		}

 		if (hSelItem)

-			if (cli.pfnFindItem(hwnd, dat, (HANDLE)hSelItem, &selcontact, &selgroup, NULL))

+			if (cli.pfnFindItem(hwnd, dat, hSelItem, &selcontact, &selgroup, NULL))

 				dat->selection = cli.pfnGetRowsPriorTo(&dat->list, selgroup, List_IndexOf((SortedList*)&selgroup->cl, selcontact));

 

 		cli.pfnRecalcScrollBar(hwnd, dat);

@@ -685,7 +685,7 @@ void fnSaveStateAndRebuildList(HWND hwnd, struct ClcData *dat)
 		if (saveInfo[i].parentId == -1)

 			group = &dat->list;

 		else {

-			if (!cli.pfnFindItem(hwnd, dat, (HANDLE)(saveInfo[i].parentId | HCONTACT_ISGROUP), &contact, NULL, NULL))

+			if (!cli.pfnFindItem(hwnd, dat, saveInfo[i].parentId | HCONTACT_ISGROUP, &contact, NULL, NULL))

 				continue;

 			group = contact->group;

 		}

diff --git a/src/modules/clist/clcmsgs.cpp b/src/modules/clist/clcmsgs.cpp
index 3b4e038170..40ebec9b12 100644
--- a/src/modules/clist/clcmsgs.cpp
+++ b/src/modules/clist/clcmsgs.cpp
@@ -53,13 +53,13 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 		int i;

 		ClcContact *groupContact;

 		ClcGroup *group;

-		CLCINFOITEM *cii = (CLCINFOITEM *) lParam;

+		CLCINFOITEM *cii = (CLCINFOITEM *)lParam;

 		if (cii == NULL || cii->cbSize != sizeof(CLCINFOITEM))

 			return NULL;

 		if (cii->hParentGroup == NULL)

 			group = &dat->list;

 		else {

-			if (!cli.pfnFindItem(hwnd, dat, (HANDLE)((UINT_PTR)cii->hParentGroup | HCONTACT_ISGROUP), &groupContact, NULL, NULL))

+			if (!cli.pfnFindItem(hwnd, dat, int(cii->hParentGroup) | HCONTACT_ISGROUP, &groupContact, NULL, NULL))

 				return NULL;

 			group = groupContact->group;

 		}

@@ -97,7 +97,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 	{

 		ClcContact *contact;

 		ClcGroup *group, *tgroup;

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, &group, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, &group, NULL))

 			break;

 		for (tgroup = group; tgroup; tgroup = tgroup->parent)

 			cli.pfnSetGroupExpand(hwnd, dat, tgroup, 1);

@@ -108,7 +108,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 	case CLM_EXPAND:

 	{

 		ClcContact *contact;

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))

 			break;

 		if (contact->type != CLCIT_GROUP)

 			break;

@@ -117,12 +117,12 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 	}

 

 	case CLM_FINDCONTACT:

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, NULL, NULL, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam, NULL, NULL, NULL))

 			return NULL;

 		return wParam;

 

 	case CLM_FINDGROUP:

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)(wParam | HCONTACT_ISGROUP), NULL, NULL, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam | HCONTACT_ISGROUP, NULL, NULL, NULL))

 			return NULL;

 		return wParam | HCONTACT_ISGROUP;

 

@@ -132,7 +132,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 	case CLM_GETCHECKMARK:

 	{

 		ClcContact *contact;

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))

 			return 0;

 		return (contact->flags & CONTACTF_CHECKED) != 0;

 	}

@@ -146,7 +146,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 	case CLM_GETEXPAND:

 	{

 		ClcContact *contact;

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))

 			return CLE_INVALID;

 		if (contact->type != CLCIT_GROUP)

 			return CLE_INVALID;

@@ -164,7 +164,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 	case CLM_GETEXTRAIMAGE:

 		if (LOWORD(lParam) < dat->extraColumnsCount) {

 			ClcContact *contact;

-			if (cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+			if (cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))

 				return contact->iExtraImage[LOWORD(lParam)];

 		}

 		return EMPTY_EXTRA_ICON;

@@ -190,7 +190,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 	case CLM_GETITEMTEXT:

 	{

 		ClcContact *contact;

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))

 			return 0;

 		lstrcpy((TCHAR*) lParam, contact->szText);

 		return lstrlen(contact->szText);

@@ -199,7 +199,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 	case CLM_GETITEMTYPE:

 	{

 		ClcContact *contact;

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))

 			return CLCIT_INVALID;

 		return contact->type;

 	}

@@ -217,7 +217,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 

 		ClcContact *contact;

 		ClcGroup *group;

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)lParam, &contact, &group, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, lParam, &contact, &group, NULL))

 			return NULL;

 

 		int i = List_IndexOf((SortedList*)&group->cl, contact);

@@ -320,7 +320,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 	{

 		ClcContact *contact;

 		ClcGroup *group, *tgroup;

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, &group, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, &group, NULL))

 			break;

 		for (tgroup = group; tgroup; tgroup = tgroup->parent)

 			cli.pfnSetGroupExpand(hwnd, dat, tgroup, 1);

@@ -353,7 +353,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 	case CLM_SETCHECKMARK:

 	{

 		ClcContact *contact;

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))

 			return 0;

 		if (lParam)

 			contact->flags |= CONTACTF_CHECKED;

@@ -375,7 +375,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 	case CLM_SETEXTRAIMAGE:

 		if ( LOWORD(lParam) < dat->extraColumnsCount) {

 			ClcContact *contact;

-			if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+			if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))

 				return 0;

 

 			contact->iExtraImage[LOWORD(lParam)] = HIWORD(lParam);

@@ -433,7 +433,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 	case CLM_SETITEMTEXT:

 	{

 		ClcContact *contact;

-		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

+		if (!cli.pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))

 			break;

 		lstrcpyn(contact->szText, (TCHAR*)lParam, SIZEOF(contact->szText));

 		cli.pfnSortCLC(hwnd, dat, 1);