diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Clist_modern/src/hdr/modern_clc.h | 2 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/hdr/modern_commonprototypes.h | 2 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clc.cpp | 10 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clcidents.cpp | 19 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clcitems.cpp | 4 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clcmsgs.cpp | 6 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clc.cpp | 8 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clc.h | 2 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clcidents.cpp | 16 | ||||
| -rw-r--r-- | plugins/Clist_mw/src/clcitems.cpp | 6 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/clc.cpp | 6 | 
11 files changed, 39 insertions, 42 deletions
| diff --git a/plugins/Clist_modern/src/hdr/modern_clc.h b/plugins/Clist_modern/src/hdr/modern_clc.h index c9cc59fd75..e84b1f1779 100644 --- a/plugins/Clist_modern/src/hdr/modern_clc.h +++ b/plugins/Clist_modern/src/hdr/modern_clc.h @@ -396,7 +396,7 @@ void    ClcOptionsChanged(void);  //clcidents.c
  int     cliGetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex);
 -int     FindItem(HWND hwnd, ClcData *dat, MCONTACT hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible, BOOL isIgnoreSubcontacts);
 +int     FindItem(HWND hwnd, ClcData *dat, DWORD hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible, BOOL isIgnoreSubcontacts);
  int     cliGetRowByIndex(ClcData *dat,int testindex,ClcContact **contact,ClcGroup **subgroup);
  HANDLE  ContactToHItem(ClcContact *contact);
  HANDLE  ContactToItemHandle(ClcContact *contact,DWORD *nmFlags);
 diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h index 4d2c7d4cb7..65b08b6443 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h +++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h @@ -297,7 +297,7 @@ LRESULT CALLBACK cli_ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wPara  int     cliShowHide(WPARAM wParam, LPARAM lParam);
  BOOL    CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect,BOOL bErase );
  int     cliCompareContacts(const ClcContact *contact1,const ClcContact *contact2);
 -int     cliFindItem(HWND hwnd, ClcData *dat, HANDLE hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);
 +int     cliFindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);
  int     cliTrayCalcChanged(const char *szChangedProto, int averageMode, int netProtoCount);
  int     cliTrayIconPauseAutoHide(WPARAM wParam, LPARAM lParam);
  void    cliCluiProtocolStatusChanged(int status,const char * proto);
 diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index 74817ffe3f..94553b3c8a 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -1470,7 +1470,7 @@ static LRESULT clcOnIntmGroupChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM w  	BYTE flags = 0;
  	ClcContact *contact;
 -	if (!pcli->pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))
 +	if (!pcli->pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))
  		memset(iExtraImage, 0xFF, sizeof(iExtraImage));
  	else {
  		memcpy(iExtraImage, contact->iExtraImage, sizeof(iExtraImage));
 @@ -1480,7 +1480,7 @@ static LRESULT clcOnIntmGroupChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM w  	if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !db_get_b(wParam, "CList", "Hidden", 0)) {
  		NMCLISTCONTROL nm;
  		pcli->pfnAddContactToTree(hwnd, dat, wParam, 1, 1);
 -		if (pcli->pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL)) {
 +		if (pcli->pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL)) {
  			memcpy(contact->iExtraImage, iExtraImage, sizeof(iExtraImage));
  			if (flags & CONTACTF_CHECKED)
  				contact->flags |= CONTACTF_CHECKED;
 @@ -1528,14 +1528,14 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wP  	// XXX CLVM changed - this means an offline msg is flashing, so the contact should be shown
 -	if (!pcli->pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, &group, NULL)) {
 +	if (!pcli->pfnFindItem(hwnd, dat, wParam, &contact, &group, NULL)) {
  		if (shouldShow && CallService(MS_DB_CONTACT_IS, wParam, 0)) {
  			if (dat->selection >= 0 && pcli->pfnGetRowByIndex(dat, dat->selection, &selcontact, NULL) != -1)
  				hSelItem = (MCONTACT)pcli->pfnContactToHItem(selcontact);
  			pcli->pfnAddContactToTree(hwnd, dat, wParam, (style & CLS_CONTACTLIST) == 0, 0);
  			recalcScrollBar = 1;
  			needRepaint = TRUE;
 -			pcli->pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL);
 +			pcli->pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL);
  			if (contact) {
  				contact->iImage = lParam;
  				contact->image_is_special = image_is_special;
 @@ -1577,7 +1577,7 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wP  	if (hSelItem) {
  		ClcGroup *selgroup;
 -		if (pcli->pfnFindItem(hwnd, dat, (HANDLE)hSelItem, &selcontact, &selgroup, NULL))
 +		if (pcli->pfnFindItem(hwnd, dat, hSelItem, &selcontact, &selgroup, NULL))
  			dat->selection = pcli->pfnGetRowsPriorTo(&dat->list, selgroup, List_IndexOf(( SortedList* )&selgroup->cl, selcontact));
  		else
  			dat->selection = -1;
 diff --git a/plugins/Clist_modern/src/modern_clcidents.cpp b/plugins/Clist_modern/src/modern_clcidents.cpp index 93c5c3a9eb..e59870b5f3 100644 --- a/plugins/Clist_modern/src/modern_clcidents.cpp +++ b/plugins/Clist_modern/src/modern_clcidents.cpp @@ -104,12 +104,12 @@ int cliGetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex)  	return -1;
  }
 -int cliFindItem(HWND hwnd, ClcData *dat, HANDLE hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible)
 +int cliFindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible)
  {
 -	return FindItem(hwnd, dat, (MCONTACT)hItem, contact, subgroup, isVisible, FALSE);
 +	return FindItem(hwnd, dat, dwItem, contact, subgroup, isVisible, FALSE);
  }
 -int FindItem(HWND hwnd, ClcData *dat, MCONTACT hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible, BOOL isIgnoreSubcontacts)
 +int FindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible, BOOL isIgnoreSubcontacts)
  {
  	int index = 0, i;
  	int nowVisible = 1;
 @@ -138,9 +138,9 @@ int FindItem(HWND hwnd, ClcData *dat, MCONTACT hItem, ClcContact **contact, ClcG  			continue;
  		}
  		if (nowVisible) index++;
 -		if ((IsHContactGroup(hItem) && group->cl.items[group->scanIndex]->type == CLCIT_GROUP && ((UINT_PTR)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 == hItem)  ||
 -			(IsHContactInfo(hItem) && group->cl.items[group->scanIndex]->type == CLCIT_INFO && group->cl.items[group->scanIndex]->hContact == (MCONTACT)((UINT_PTR)hItem&~HCONTACT_ISINFO)))
 +		if ((IsHContactGroup(dwItem) && group->cl.items[group->scanIndex]->type == CLCIT_GROUP && (dwItem & ~HCONTACT_ISGROUP) == group->cl.items[group->scanIndex]->groupId)  ||
 +			 (IsHContactContact(dwItem) && group->cl.items[group->scanIndex]->type == CLCIT_CONTACT && group->cl.items[group->scanIndex]->hContact == dwItem) ||
 +			 (IsHContactInfo(dwItem) && group->cl.items[group->scanIndex]->type == CLCIT_INFO && group->cl.items[group->scanIndex]->hContact == (dwItem & ~HCONTACT_ISINFO)))
  		{
  			if (isVisible) {
  				if (!nowVisible) *isVisible = 0;
 @@ -161,14 +161,11 @@ int FindItem(HWND hwnd, ClcData *dat, MCONTACT hItem, ClcContact **contact, ClcG  			return 1;
  		}
 -		if (!isIgnoreSubcontacts &&
 -			IsHContactContact(hItem)  &&
 -			group->cl.items[group->scanIndex]->type == CLCIT_CONTACT  &&
 -			group->cl.items[group->scanIndex]->SubAllocated > 0)
 +		if (!isIgnoreSubcontacts && IsHContactContact(dwItem) && group->cl.items[group->scanIndex]->type == CLCIT_CONTACT && group->cl.items[group->scanIndex]->SubAllocated > 0)
  		{
  			for (i=0; i < group->cl.items[group->scanIndex]->SubAllocated; i++)
  			{
 -				if (group->cl.items[group->scanIndex]->subcontacts[i].hContact == hItem)
 +				if (group->cl.items[group->scanIndex]->subcontacts[i].hContact == dwItem)
  				{
  #ifdef _DEBUG
  					if (IsBadWritePtr(&group->cl.items[group->scanIndex]->subcontacts[i], sizeof(ClcContact)))
 diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp index 782ac49787..66c970a140 100644 --- a/plugins/Clist_modern/src/modern_clcitems.cpp +++ b/plugins/Clist_modern/src/modern_clcitems.cpp @@ -314,7 +314,7 @@ int RestoreSelection(ClcData *dat, MCONTACT hSelected)  	ClcContact *selcontact = NULL;
  	ClcGroup *selgroup = NULL;
 -	if (!hSelected || !pcli->pfnFindItem(dat->hWnd, dat, (HANDLE)hSelected, &selcontact, &selgroup, NULL)) {
 +	if (!hSelected || !pcli->pfnFindItem(dat->hWnd, dat, hSelected, &selcontact, &selgroup, NULL)) {
  		dat->selection = -1;
  		return dat->selection;
  	}
 @@ -579,7 +579,7 @@ void cli_SaveStateAndRebuildList(HWND hwnd, ClcData *dat)  		if (savedInfo[i].parentId == -1)
  			group = &dat->list;
  		else {
 -			if (!pcli->pfnFindItem(hwnd, dat, HANDLE(savedInfo[i].parentId | HCONTACT_ISGROUP), &contact, NULL, NULL))
 +			if (!pcli->pfnFindItem(hwnd, dat, savedInfo[i].parentId | HCONTACT_ISGROUP, &contact, NULL, NULL))
  				continue;
  			group = contact->group;
  		}
 diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp index 910776628d..5a65694d73 100644 --- a/plugins/Clist_modern/src/modern_clcmsgs.cpp +++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp @@ -108,7 +108,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wPara  		{
  			int i;
  			if (wParam != CLGN_ROOT) {
 -				if (!pcli->pfnFindItem(hwnd, dat, (HANDLE)lParam, &contact, &group, NULL))
 +				if (!pcli->pfnFindItem(hwnd, dat, lParam, &contact, &group, NULL))
  					return NULL;
  				i = List_IndexOf((SortedList*)&group->cl,contact);
  				if (i < 0) return 0;
 @@ -183,7 +183,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wPara  			ClcGroup *tgroup;
  			int index = -1;
  			int mainindex = -1;
 -			if (!pcli->pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, &group, NULL))
 +			if (!pcli->pfnFindItem(hwnd, dat, wParam, &contact, &group, NULL))
  				break;
  			for (tgroup = group; tgroup; tgroup = tgroup->parent)
  				pcli->pfnSetGroupExpand(hwnd, dat, tgroup, 1);
 @@ -217,7 +217,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wPara  		if (LOWORD(lParam) >= dat->extraColumnsCount)
  			return 0;
 -		if (!pcli->pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))
 +		if (!pcli->pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))
  			return 0;
  		contact->iExtraImage[LOWORD(lParam)] = HIWORD(lParam);
 diff --git a/plugins/Clist_mw/src/clc.cpp b/plugins/Clist_mw/src/clc.cpp index a4459348af..e0fe218ebb 100644 --- a/plugins/Clist_mw/src/clc.cpp +++ b/plugins/Clist_mw/src/clc.cpp @@ -162,14 +162,14 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L  		ClcContact *contact;
  		ClcGroup *group;
 -		if (!FindItem(hwnd, dat, (HANDLE)wParam, &contact, &group, NULL)) {
 +		if (!FindItem(hwnd, dat, wParam, &contact, &group, NULL)) {
  			if (shouldShow && CallService(MS_DB_CONTACT_IS, wParam, 0)) {
  				if (dat->selection>=0 && GetRowByIndex(dat,dat->selection,&selcontact,NULL) != -1)
  					hSelItem = (MCONTACT)pcli->pfnContactToHItem(selcontact);
  				AddContactToTree(hwnd, dat, wParam, 0, 0);
  				needsResort = 1;
  				recalcScrollBar = 1;
 -				FindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL);
 +				FindItem(hwnd, dat, wParam, &contact, NULL, NULL);
  				if (contact) {
  					contact->iImage = (WORD)lParam;
  					pcli->pfnNotifyNewContact(hwnd, wParam);
 @@ -201,7 +201,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L  		}	}
  		if (hSelItem) {
  			ClcGroup *selgroup;
 -			if ( FindItem(hwnd, dat, (HANDLE)hSelItem,&selcontact,&selgroup,NULL))
 +			if ( FindItem(hwnd, dat, hSelItem, &selcontact, &selgroup, NULL))
  				dat->selection = GetRowsPriorTo(&dat->list,selgroup,List_IndexOf((SortedList*)&selgroup->cl, selcontact));
  			else
  				dat->selection = -1;
 @@ -220,7 +220,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L  		ClcContact *contact;
  		ClcGroup *group;
 -		if (FindItem(hwnd, dat, (HANDLE)wParam, &contact, &group, NULL) && contact != NULL) {
 +		if (FindItem(hwnd, dat, wParam, &contact, &group, NULL) && contact != NULL) {
  			contact->flags  &=  ~CONTACTF_STATUSMSG;
  			if (!db_get_ts(wParam, "CList", "StatusMsg", &dbv)) {
  				int j;
 diff --git a/plugins/Clist_mw/src/clc.h b/plugins/Clist_mw/src/clc.h index 841fb25576..efc13fd87d 100644 --- a/plugins/Clist_mw/src/clc.h +++ b/plugins/Clist_mw/src/clc.h @@ -81,7 +81,7 @@ struct ClcData : public ClcDataBase  //clcidents.c
  int GetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex);
 -int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, struct ClcContact **contact, ClcGroup **subgroup, int *isVisible);
 +int FindItem(HWND hwnd, struct ClcData *dat, DWORD dwItem, struct ClcContact **contact, ClcGroup **subgroup, int *isVisible);
  int GetRowByIndex(struct ClcData *dat,int testindex,struct ClcContact **contact,ClcGroup **subgroup);
  void ClearRowByIndexCache();
 diff --git a/plugins/Clist_mw/src/clcidents.cpp b/plugins/Clist_mw/src/clcidents.cpp index 967e13abd3..c74a2d8bfb 100644 --- a/plugins/Clist_mw/src/clcidents.cpp +++ b/plugins/Clist_mw/src/clcidents.cpp @@ -143,7 +143,7 @@ void SetClcContactCacheItem(struct ClcData *dat, MCONTACT hContact, void *contac  	}
  }
 -int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, struct ClcContact **contact, ClcGroup **subgroup, int *isVisible)
 +int FindItem(HWND hwnd, struct ClcData *dat, DWORD dwItem, struct ClcContact **contact, ClcGroup **subgroup, int *isVisible)
  {
  	int index = 0, i;
  	int nowVisible = 1;
 @@ -151,15 +151,15 @@ int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, struct ClcContact **c  	group->scanIndex = 0;
 -	if (isVisible == NULL && hItem != NULL && subgroup == NULL && !IsHContactGroup(hItem) && !IsHContactInfo(hItem)) {
 +	if (isVisible == NULL && dwItem != NULL && subgroup == NULL && !IsHContactGroup(dwItem) && !IsHContactInfo(dwItem)) {
  		//try use cache
 -		ClcCacheEntry *cacheEntry = GetCLCFullCacheEntry(dat, (MCONTACT)hItem);
 +		ClcCacheEntry *cacheEntry = GetCLCFullCacheEntry(dat, dwItem);
  		if (cacheEntry != NULL) {
  			if (cacheEntry->ClcContact == NULL) {
  				int *isv = {0};
  				void *z = {0};
  				int ret;
 -				ret = FindItem(hwnd,dat,hItem,(struct ClcContact ** )&z,(struct  ClcGroup** )&isv,NULL);
 +				ret = FindItem(hwnd,dat,dwItem,(struct ClcContact ** )&z,(struct  ClcGroup** )&isv,NULL);
  				if (ret == 0) {return 0;}
  				cacheEntry->ClcContact = (void *)z;
  			}
 @@ -193,9 +193,9 @@ int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, struct ClcContact **c  			continue;
  		}
  		if (nowVisible) index++;
 -		if ((IsHContactGroup(hItem) && group->cl.items[group->scanIndex]->type == CLCIT_GROUP && ((UINT_PTR)hItem & ~HCONTACT_ISGROUP) == group->cl.items[group->scanIndex]->groupId) ||
 -			 (IsHContactContact(hItem) && group->cl.items[group->scanIndex]->type == CLCIT_CONTACT && (HANDLE)group->cl.items[group->scanIndex]->hContact == hItem) ||
 -			 (IsHContactInfo(hItem) && group->cl.items[group->scanIndex]->type == CLCIT_INFO && (HANDLE)group->cl.items[group->scanIndex]->hContact == (HANDLE)((UINT_PTR)hItem & ~HCONTACT_ISINFO)))
 +		if ((IsHContactGroup(dwItem) && group->cl.items[group->scanIndex]->type == CLCIT_GROUP && (dwItem & ~HCONTACT_ISGROUP) == group->cl.items[group->scanIndex]->groupId) ||
 +			 (IsHContactContact(dwItem) && group->cl.items[group->scanIndex]->type == CLCIT_CONTACT && group->cl.items[group->scanIndex]->hContact == dwItem) ||
 +			 (IsHContactInfo(dwItem) && group->cl.items[group->scanIndex]->type == CLCIT_INFO && group->cl.items[group->scanIndex]->hContact == (dwItem & ~HCONTACT_ISINFO)))
  		{
  			if (isVisible) {
  				if ( !nowVisible) *isVisible = 0;
 @@ -216,7 +216,7 @@ int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, struct ClcContact **c  		if (group->cl.items[group->scanIndex]->type == CLCIT_CONTACT &&
  			group->cl.items[group->scanIndex]->SubAllocated>0)
  			for (i = 1; i<=group->cl.items[group->scanIndex]->SubAllocated; i++)
 -				if (IsHContactContact(hItem)  && group->cl.items[group->scanIndex]->subcontacts[i-1].hContact == (MCONTACT)hItem) {
 +				if (IsHContactContact(dwItem)  && group->cl.items[group->scanIndex]->subcontacts[i-1].hContact == dwItem) {
  					if (contact) *contact = &group->cl.items[group->scanIndex]->subcontacts[i-1];
  					if (subgroup) *subgroup = group;
  					return 1;
 diff --git a/plugins/Clist_mw/src/clcitems.cpp b/plugins/Clist_mw/src/clcitems.cpp index 93359b6deb..5bccc89885 100644 --- a/plugins/Clist_mw/src/clcitems.cpp +++ b/plugins/Clist_mw/src/clcitems.cpp @@ -184,7 +184,7 @@ static struct ClcContact* AddContactToGroup(struct ClcData *dat,ClcGroup *group,  void AddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline)
  {
 -	if ( FindItem(hwnd,dat,(HANDLE)hContact,NULL,NULL,NULL) == 1)
 +	if (FindItem(hwnd, dat, hContact, NULL, NULL, NULL) == 1)
  		return;
  	ClcCacheEntry *cacheEntry = GetContactFullCacheEntry(hContact);
 @@ -283,7 +283,7 @@ void DeleteItemFromTree(HWND hwnd, MCONTACT hItem)  	ClearRowByIndexCache();
  	dat->needsResort = 1;
 -	if ( !FindItem(hwnd,dat,(HANDLE)hItem,&contact,&group,NULL)) {
 +	if (!FindItem(hwnd, dat, hItem, &contact, &group, NULL)) {
  		DBVARIANT dbv;
  		int i,nameOffset;
  		if ( !IsHContactContact(hItem)) return;
 @@ -653,7 +653,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat)  	for (i = 0;i<savedInfoCount;i++) {
  		if (savedInfo[i].parentId == -1) group = &dat->list;
  		else {
 -			if (!FindItem(hwnd, dat, (HANDLE)(savedInfo[i].parentId | HCONTACT_ISGROUP), &contact, NULL, NULL))
 +			if (!FindItem(hwnd, dat, savedInfo[i].parentId | HCONTACT_ISGROUP, &contact, NULL, NULL))
  				continue;
  			group = contact->group;
  		}
 diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp index 283f86f11b..9f3f15c3bf 100644 --- a/plugins/Clist_nicer/src/clc.cpp +++ b/plugins/Clist_nicer/src/clc.cpp @@ -364,7 +364,7 @@ LBL_Def:  		}
  		if (hSelItem) {
  			ClcGroup *selgroup;
 -			if (pcli->pfnFindItem(hwnd, dat, (HANDLE)hSelItem, &selcontact, &selgroup, NULL))
 +			if (pcli->pfnFindItem(hwnd, dat, hSelItem, &selcontact, &selgroup, NULL))
  				dat->selection = pcli->pfnGetRowsPriorTo(&dat->list, selgroup, List_IndexOf((SortedList*)& selgroup->cl, selcontact));
  			else
  				dat->selection = -1;
 @@ -378,7 +378,7 @@ LBL_Def:  		goto LBL_Def;
  	case INTM_METACHANGED:
 -		if (!pcli->pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))
 +		if (!pcli->pfnFindItem(hwnd, dat, wParam, &contact, NULL, NULL))
  			break;
  		if (contact->bIsMeta && cfg::dat.bMetaAvail && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) {
 @@ -388,7 +388,7 @@ LBL_Def:  			if (contact->pExtra) {
  				TExtraCache *pSub = cfg::getCache(contact->hSubContact, contact->metaProto);
  				ClcContact *subContact;
 -				if (!pcli->pfnFindItem(hwnd, dat, (HANDLE)contact->hSubContact, &subContact, NULL, NULL))
 +				if (!pcli->pfnFindItem(hwnd, dat, contact->hSubContact, &subContact, NULL, NULL))
  					break;
  				contact->pExtra->proto_status_item = GetProtocolStatusItem(contact->metaProto);
 | 
