- HANDLE hContact => HCONTACT

- GCF_* prefix was added to chat constants to avoid name conflicts

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

16 files changed, 157 insertions, 159 deletions

diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp
index d223f59307..c07c11441c 100644
--- a/src/modules/clist/clc.cpp
+++ b/src/modules/clist/clc.cpp
@@ -78,7 +78,7 @@ static int ClcSettingChanged(WPARAM wParam, LPARAM lParam)
 

 	if (!strcmp(cws->szModule, "CList")) {

 		if (!strcmp(cws->szSetting, "MyHandle")) {

-			cli.pfnInvalidateDisplayNameCacheEntry((HANDLE)wParam);

+			cli.pfnInvalidateDisplayNameCacheEntry((HCONTACT)wParam);

 			cli.pfnClcBroadcast(INTM_NAMECHANGED, wParam, lParam);

 		}

 		else if (!strcmp(cws->szSetting, "Group"))

@@ -93,7 +93,7 @@ static int ClcSettingChanged(WPARAM wParam, LPARAM lParam)
 			cli.pfnClcBroadcast(INTM_NAMEORDERCHANGED, 0, 0);

 	}

 	else {

-		char *szProto = GetContactProto((HANDLE)wParam);

+		char *szProto = GetContactProto((HCONTACT)wParam);

 		if (szProto != NULL) {

 			if (!strcmp(cws->szModule, "Protocol") && !strcmp(cws->szSetting, "p"))

 				cli.pfnClcBroadcast(INTM_PROTOCHANGED, wParam, lParam);

@@ -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, (HCONTACT)(groupId | HCONTACT_ISGROUP), &contact, &group, NULL)) {

 					lstrcpy(szFullName, contact->szText);

 					while (group->parent) {

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

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

 

 	case INTM_CONTACTADDED:

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

-		cli.pfnNotifyNewContact(hwnd, (HANDLE)wParam);

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

+		cli.pfnNotifyNewContact(hwnd, (HCONTACT)wParam);

 		SortClcByTimer(hwnd);

 		break;

 

 	case INTM_CONTACTDELETED:

-		cli.pfnDeleteItemFromTree(hwnd, (HANDLE)wParam);

+		cli.pfnDeleteItemFromTree(hwnd, (HCONTACT)wParam);

 		SortClcByTimer(hwnd);

 		break;

 

@@ -459,12 +459,12 @@ 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, (HCONTACT)wParam, NULL, NULL, NULL))

 					break;

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

-				cli.pfnNotifyNewContact(hwnd, (HANDLE)wParam);

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

+				cli.pfnNotifyNewContact(hwnd, (HCONTACT)wParam);

 			}

-			else cli.pfnDeleteItemFromTree(hwnd, (HANDLE)wParam);

+			else cli.pfnDeleteItemFromTree(hwnd, (HCONTACT)wParam);

 

 			dat->needsResort = 1;

 			SortClcByTimer(hwnd);

@@ -475,17 +475,17 @@ 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, (HCONTACT)wParam, &contact, NULL, NULL))

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

 			else {

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

 				flags = contact->flags;

 			}

-			cli.pfnDeleteItemFromTree(hwnd, (HANDLE)wParam);

-			if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !db_get_b((HANDLE)wParam, "CList", "Hidden", 0)) {

+			cli.pfnDeleteItemFromTree(hwnd, (HCONTACT)wParam);

+			if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !db_get_b((HCONTACT)wParam, "CList", "Hidden", 0)) {

 				NMCLISTCONTROL nm;

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

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

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

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

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

 					if (flags & CONTACTF_CHECKED)

 						contact->flags |= CONTACTF_CHECKED;

@@ -506,32 +506,32 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 		{

 			int recalcScrollBar = 0, shouldShow;

 			WORD status;

-			HANDLE hSelItem = NULL;

+			HCONTACT hSelItem = NULL;

 			ClcContact *selcontact = NULL;

 

-			char *szProto = GetContactProto((HANDLE)wParam);

+			char *szProto = GetContactProto((HCONTACT)wParam);

 			if (szProto == NULL)

 				status = ID_STATUS_OFFLINE;

 			else

-				status = db_get_w((HANDLE)wParam, szProto, "Status", ID_STATUS_OFFLINE);

+				status = db_get_w((HCONTACT)wParam, szProto, "Status", ID_STATUS_OFFLINE);

 

 			// this means an offline msg is flashing, so the contact should be shown

 			DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE);

-			shouldShow = (style & CLS_SHOWHIDDEN || !db_get_b((HANDLE)wParam, "CList", "Hidden", 0))

+			shouldShow = (style & CLS_SHOWHIDDEN || !db_get_b((HCONTACT)wParam, "CList", "Hidden", 0))

 				&& (!cli.pfnIsHiddenMode(dat, status) || CallService(MS_CLIST_GETCONTACTICON, wParam, 0) != lParam);

 

 			contact = NULL;

 			group = NULL;

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

+			if (!cli.pfnFindItem(hwnd, dat, (HCONTACT)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 = cli.pfnContactToHItem(selcontact);

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

+						hSelItem = (HCONTACT)cli.pfnContactToHItem(selcontact);

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

 					recalcScrollBar = 1;

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

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

 					if (contact) {

 						contact->iImage = (WORD) lParam;

-						cli.pfnNotifyNewContact(hwnd, (HANDLE)wParam);

+						cli.pfnNotifyNewContact(hwnd, (HCONTACT)wParam);

 						dat->needsResort = 1;

 					}

 				}

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

 				if (!shouldShow && !(style & CLS_NOHIDEOFFLINE) && (style & CLS_HIDEOFFLINE || group->hideOffline)) {

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

-						hSelItem = cli.pfnContactToHItem(selcontact);

+						hSelItem = (HCONTACT)cli.pfnContactToHItem(selcontact);

 					cli.pfnRemoveItemFromGroup(hwnd, group, contact, (style & CLS_CONTACTLIST) == 0);

 					recalcScrollBar = 1;

 				}

@@ -566,26 +566,26 @@ 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, (HCONTACT)wParam, &contact, NULL, NULL))

 			break;

 

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

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

 		dat->needsResort = 1;

 		SortClcByTimer(hwnd);

 		break;

 

 	case INTM_PROTOCHANGED:

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

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

 			break;

 

-		contact->proto = GetContactProto((HANDLE)wParam);

-		cli.pfnInvalidateDisplayNameCacheEntry((HANDLE)wParam);

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

+		contact->proto = GetContactProto((HCONTACT)wParam);

+		cli.pfnInvalidateDisplayNameCacheEntry((HCONTACT)wParam);

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

 		SortClcByTimer(hwnd);

 		break;

 

 	case INTM_NOTONLISTCHANGED:

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

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

 			break;

 

 		if (contact->type == CLCIT_CONTACT) {

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

 

 	case INTM_APPARENTMODECHANGED:

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

-			char *szProto = GetContactProto((HANDLE)wParam);

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

+			char *szProto = GetContactProto((HCONTACT)wParam);

 			if (szProto == NULL)

 				break;

 

-			WORD apparentMode = db_get_w((HANDLE)wParam, szProto, "ApparentMode", 0);

+			WORD apparentMode = db_get_w((HCONTACT)wParam, szProto, "ApparentMode", 0);

 			contact->flags &= ~(CONTACTF_INVISTO | CONTACTF_VISTO);

 			if (apparentMode == ID_STATUS_OFFLINE)

 				contact->flags |= CONTACTF_INVISTO;

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

 

 	case INTM_IDLECHANGED:

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

-			char *szProto = GetContactProto((HANDLE)wParam);

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

+			char *szProto = GetContactProto((HCONTACT)wParam);

 			if (szProto == NULL)

 				break;

 			contact->flags &= ~CONTACTF_IDLE;

-			if (db_get_dw((HANDLE)wParam, szProto, "IdleTS", 0))

+			if (db_get_dw((HCONTACT)wParam, szProto, "IdleTS", 0))

 				contact->flags |= CONTACTF_IDLE;

 

 			cli.pfnInvalidateRect(hwnd, NULL, FALSE);

diff --git a/src/modules/clist/clc.h b/src/modules/clist/clc.h
index 4732800a42..b95e072656 100644
--- a/src/modules/clist/clc.h
+++ b/src/modules/clist/clc.h
@@ -44,11 +44,11 @@ HMENU  fnBuildGroupPopupMenu(ClcGroup* group);
 LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 

 /* 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    fnGetRowByIndex(struct ClcData *dat, int testindex, ClcContact **contact, ClcGroup **subgroup);

-HANDLE fnContactToHItem(ClcContact* contact);

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

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

+int       fnFindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, 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);

 

 /* clcitems.c */

 ClcGroup* fnAddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers);

@@ -58,9 +58,9 @@ void fnFreeContact(ClcContact *p);
 void fnFreeGroup(ClcGroup *group);

 int  fnAddInfoItemToGroup(ClcGroup *group, int flags, const TCHAR *pszText);

 int  fnAddItemToGroup(ClcGroup *group, int iAboveItem);

-void fnAddContactToTree(HWND hwnd, struct ClcData *dat, HANDLE hContact, int updateTotalCount, int checkHideOffline);

-int  fnAddContactToGroup(struct ClcData *dat, ClcGroup *group, HANDLE hContact);

-void fnDeleteItemFromTree(HWND hwnd, HANDLE hItem);

+void fnAddContactToTree(HWND hwnd, struct ClcData *dat, HCONTACT hContact, int updateTotalCount, int checkHideOffline);

+int  fnAddContactToGroup(struct ClcData *dat, ClcGroup *group, HCONTACT hContact);

+void fnDeleteItemFromTree(HWND hwnd, HCONTACT hItem);

 void fnRebuildEntireList(HWND hwnd, struct ClcData *dat);

 int  fnGetGroupContentsCount(ClcGroup *group, int visibleOnly);

 void fnSortCLC(HWND hwnd, struct ClcData *dat, int useInsertionSort);

@@ -86,7 +86,7 @@ int   fnGetDropTargetInformation(HWND hwnd, struct ClcData *dat, POINT pt);
 int   fnClcStatusToPf2(int status);

 int   fnIsHiddenMode(struct ClcData *dat, int status);

 void  fnHideInfoTip(HWND hwnd, struct ClcData *dat);

-void  fnNotifyNewContact(HWND hwnd, HANDLE hContact);

+void  fnNotifyNewContact(HWND hwnd, HCONTACT hContact);

 DWORD fnGetDefaultExStyle(void);

 void  fnGetSetting(int i, LOGFONT* lf, COLORREF* colour);

 void  fnGetDefaultFontSetting(int i, LOGFONT* lf, COLORREF* colour);

@@ -120,12 +120,12 @@ void     RebuildMenuOrder(void);
 INT_PTR  MenuProcessCommand(WPARAM wParam, LPARAM lParam);

 

 /* clistsettings.c */

-TCHAR* fnGetContactDisplayName(HANDLE hContact, int mode);

+TCHAR* fnGetContactDisplayName(HCONTACT hContact, int mode);

 void   fnGetDefaultFontSetting(int i, LOGFONT* lf, COLORREF * colour);

-void   fnInvalidateDisplayNameCacheEntry(HANDLE hContact);

+void   fnInvalidateDisplayNameCacheEntry(HCONTACT hContact);

 

-ClcCacheEntry* fnGetCacheEntry(HANDLE hContact);

-ClcCacheEntry* fnCreateCacheItem (HANDLE hContact);

+ClcCacheEntry* fnGetCacheEntry(HCONTACT hContact);

+ClcCacheEntry* fnCreateCacheItem (HCONTACT hContact);

 void fnCheckCacheItem(ClcCacheEntry *p);

 void fnFreeCacheItem(ClcCacheEntry *p);

 

@@ -137,21 +137,21 @@ void   fnUnregisterFileDropping (HWND hwnd);
 

 /* clistevents.c */

 struct CListEvent* fnAddEvent(CLISTEVENT *cle);

-CLISTEVENT* fnGetEvent(HANDLE hContact, int idx);

+CLISTEVENT* fnGetEvent(HCONTACT hContact, int idx);

 

 struct CListEvent* fnCreateEvent(void);

 void fnFreeEvent(struct CListEvent* p);

 

-int   fnEventsProcessContactDoubleClick(HANDLE hContact);

+int   fnEventsProcessContactDoubleClick(HCONTACT hContact);

 int   fnEventsProcessTrayDoubleClick(int);

 int   fnGetImlIconIndex(HICON hIcon);

-int   fnRemoveEvent(HANDLE hContact, HANDLE dbEvent);

+int   fnRemoveEvent(HCONTACT hContact, HANDLE dbEvent);

 

 /* clistmod.c */

-int    fnGetContactIcon(HANDLE hContact);

-int    fnIconFromStatusMode(const char *szProto, int status, HANDLE hContact);

+int    fnGetContactIcon(HCONTACT hContact);

+int    fnIconFromStatusMode(const char *szProto, int status, HCONTACT hContact);

 int    fnShowHide(WPARAM wParam, LPARAM lParam);

-HICON  fnGetIconFromStatusMode(HANDLE hContact, const char *szProto, int status);

+HICON  fnGetIconFromStatusMode(HCONTACT hContact, const char *szProto, int status);

 TCHAR* fnGetStatusModeDescription(int wParam, int lParam);

 int    fnGetWindowVisibleState(HWND hWnd, int iStepX, int iStepY);

 

@@ -186,7 +186,7 @@ void fnCluiProtocolStatusChanged(int, const char*);
 void fnDrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon);

 

 /* contact.c */

-void fnChangeContactIcon (HANDLE hContact, int iIcon, int add);

+void fnChangeContactIcon (HCONTACT hContact, int iIcon, int add);

 void fnLoadContactTree (void);

 int  fnCompareContacts (const ClcContact *contact1, const ClcContact *contact2);

 void fnSortContacts (void);

diff --git a/src/modules/clist/clcfiledrop.cpp b/src/modules/clist/clcfiledrop.cpp
index 7f610710fd..2c79cafb7e 100644
--- a/src/modules/clist/clcfiledrop.cpp
+++ b/src/modules/clist/clcfiledrop.cpp
@@ -70,7 +70,7 @@ ULONG CDropTarget::Release(void)
 	return InterlockedDecrement(&refCount);

 }

 

-static HANDLE HContactFromPoint(HWND hwnd, struct ClcData *dat, int x, int y, int *hitLine)

+static HCONTACT HContactFromPoint(HWND hwnd, struct ClcData *dat, int x, int y, int *hitLine)

 {

 	DWORD hitFlags;

 	ClcContact *contact;

@@ -98,7 +98,7 @@ HRESULT CDropTarget::DragOver(DWORD /*grfKeyState*/, POINTL pt, DWORD * pdwEffec
 	struct ClcData *dat;

 	RECT clRect;

 	int hit;

-	HANDLE hContact;

+	HCONTACT hContact;

 

 	if (pDropTargetHelper && hwndCurrentDrag)

 		pDropTargetHelper->DragOver((POINT*)&pt, *pdwEffect);

@@ -207,7 +207,6 @@ HRESULT CDropTarget::Drop(IDataObject * pDataObj, DWORD /*fKeyState*/, POINTL pt
 	HDROP hDrop;

 	POINT shortPt;

 	struct ClcData *dat;

-	HANDLE hContact;

 

 	if (pDropTargetHelper && hwndCurrentDrag)

 		pDropTargetHelper->Drop(pDataObj, (POINT*)&pt, *pdwEffect);

@@ -221,7 +220,7 @@ HRESULT CDropTarget::Drop(IDataObject * pDataObj, DWORD /*fKeyState*/, POINTL pt
 	shortPt.x = pt.x;

 	shortPt.y = pt.y;

 	ScreenToClient(hwndCurrentDrag, &shortPt);

-	hContact = HContactFromPoint(hwndCurrentDrag, dat, shortPt.x, shortPt.y, NULL);

+	HCONTACT hContact = HContactFromPoint(hwndCurrentDrag, dat, shortPt.x, shortPt.y, NULL);

 	if (hContact != NULL) {

 		TCHAR **ppFiles = NULL;

 		TCHAR szFilename[MAX_PATH];

diff --git a/src/modules/clist/clcidents.cpp b/src/modules/clist/clcidents.cpp
index 72279117ab..5ec0b48600 100644
--- a/src/modules/clist/clcidents.cpp
+++ b/src/modules/clist/clcidents.cpp
@@ -176,20 +176,20 @@ int fnGetRowByIndex(struct ClcData *dat, int testindex, ClcContact **contact, Cl
 	return -1;

 }

 

-HANDLE fnContactToHItem(ClcContact * contact)

+HANDLE fnContactToHItem(ClcContact *contact)

 {

 	switch (contact->type) {

 	case CLCIT_CONTACT:

 		return contact->hContact;

 	case CLCIT_GROUP:

-		return (HANDLE) (contact->groupId | HCONTACT_ISGROUP);

+		return (HCONTACT)(contact->groupId | HCONTACT_ISGROUP);

 	case CLCIT_INFO:

-		return (HANDLE) ((UINT_PTR) contact->hContact | HCONTACT_ISINFO);

+		return (HCONTACT)((UINT_PTR)contact->hContact | HCONTACT_ISINFO);

 	}

 	return NULL;

 }

 

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

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

 {

 	switch (contact->type) {

 	case CLCIT_CONTACT:

@@ -197,11 +197,11 @@ HANDLE fnContactToItemHandle(ClcContact * contact, DWORD * nmFlags)
 	case CLCIT_GROUP:

 		if (nmFlags)

 			*nmFlags |= CLNF_ISGROUP;

-		return (HANDLE) contact->groupId;

+		return (HCONTACT)contact->groupId;

 	case CLCIT_INFO:

 		if (nmFlags)

 			*nmFlags |= CLNF_ISINFO;

-		return (HANDLE) ((UINT_PTR) contact->hContact | HCONTACT_ISINFO);

+		return (HCONTACT)((UINT_PTR)contact->hContact | HCONTACT_ISINFO);

 	}

 	return NULL;

 }

diff --git a/src/modules/clist/clcitems.cpp b/src/modules/clist/clcitems.cpp
index 8e4eb13939..0a66b5933e 100644
--- a/src/modules/clist/clcitems.cpp
+++ b/src/modules/clist/clcitems.cpp
@@ -108,7 +108,7 @@ ClcGroup* fnAddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD
 			group->totalMembers = 0;

 			if (flags != (DWORD) - 1 && pNextField == NULL && calcTotalMembers) {

 				DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE);

-				for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+				for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 					ClcCacheEntry *cache = cli.pfnGetCacheEntry(hContact);

 					if (!lstrcmp(cache->tszGroup, szName) && (style & CLS_SHOWHIDDEN || !cache->bIsHidden))

 						group->totalMembers++;

@@ -164,12 +164,12 @@ int fnAddInfoItemToGroup(ClcGroup *group, int flags, const TCHAR *pszText)
 		++iInfoItemUniqueHandle;

 	group->cl.items[i]->type = CLCIT_INFO;

 	group->cl.items[i]->flags = (BYTE) flags;

-	group->cl.items[i]->hContact = (HANDLE)++ iInfoItemUniqueHandle;

+	group->cl.items[i]->hContact = (HCONTACT)++iInfoItemUniqueHandle;

 	lstrcpyn(group->cl.items[i]->szText, pszText, SIZEOF(group->cl.items[i]->szText));

 	return i;

 }

 

-int fnAddContactToGroup(struct ClcData *dat, ClcGroup *group, HANDLE hContact)

+int fnAddContactToGroup(struct ClcData *dat, ClcGroup *group, HCONTACT hContact)

 {

 	int i, index = -1;

 

@@ -212,7 +212,7 @@ int fnAddContactToGroup(struct ClcData *dat, ClcGroup *group, HANDLE hContact)
 	return i;

 }

 

-void fnAddContactToTree(HWND hwnd, struct ClcData *dat, HANDLE hContact, int updateTotalCount, int checkHideOffline)

+void fnAddContactToTree(HWND hwnd, struct ClcData *dat, HCONTACT hContact, int updateTotalCount, int checkHideOffline)

 {

 	ClcGroup *group;

 	DBVARIANT dbv;

@@ -309,7 +309,7 @@ ClcGroup* fnRemoveItemFromGroup(HWND hwnd, ClcGroup *group, ClcContact *contact,
 	return group;

 }

 

-void fnDeleteItemFromTree(HWND hwnd, HANDLE hItem)

+void fnDeleteItemFromTree(HWND hwnd, HCONTACT hItem)

 {

 	ClcContact *contact;

 	ClcGroup *group;

@@ -363,7 +363,7 @@ void fnRebuildEntireList(HWND hwnd, struct ClcData *dat)
 		cli.pfnAddGroup(hwnd, dat, szGroupName, groupFlags, i, 0);

 	}

 

-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 		if (style & CLS_SHOWHIDDEN || !db_get_b(hContact, "CList", "Hidden", 0)) {

 			DBVARIANT dbv;

 			if (db_get_ts(hContact, "CList", "Group", &dbv))

@@ -545,13 +545,13 @@ void fnSortCLC(HWND hwnd, struct ClcData *dat, int useInsertionSort)
 {

 	ClcContact *selcontact;

 	ClcGroup *group = &dat->list, *selgroup;

-	HANDLE hSelItem;

+	HCONTACT hSelItem;

 

 	if (dat->needsResort) {

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

 			hSelItem = NULL;

 		else

-			hSelItem = cli.pfnContactToHItem(selcontact);

+			hSelItem = (HCONTACT)cli.pfnContactToHItem(selcontact);

 		group->scanIndex = 0;

 		SortGroup(dat, group, useInsertionSort);

 		for (;;) {

@@ -580,7 +580,7 @@ void fnSortCLC(HWND hwnd, struct ClcData *dat, int useInsertionSort)
 

 struct SavedContactState_t

 {

-	HANDLE hContact;

+	HCONTACT hContact;

 	WORD iExtraImage[EXTRA_ICON_COUNT];

 	int checked;

 };

@@ -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, (HCONTACT)(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 6845cd02e1..f1cc63ed18 100644
--- a/src/modules/clist/clcmsgs.cpp
+++ b/src/modules/clist/clcmsgs.cpp
@@ -31,7 +31,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 {

 	switch (msg) {

 	case CLM_ADDCONTACT:

-		cli.pfnAddContactToTree(hwnd, dat, (HANDLE)wParam, 1, 0);

+		cli.pfnAddContactToTree(hwnd, dat, (HCONTACT)wParam, 1, 0);

 		cli.pfnRecalcScrollBar(hwnd, dat);

 		cli.pfnSortCLC(hwnd, dat, 1);

 		break;

@@ -55,12 +55,12 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR
 		ClcGroup *group;

 		CLCINFOITEM *cii = (CLCINFOITEM *) lParam;

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

-			return (LRESULT)(HANDLE) NULL;

+			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))

-				return (LRESULT)(HANDLE) NULL;

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

+				return NULL;

 			group = groupContact->group;

 		}

 		if (msg == CLM_ADDINFOITEMA)

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

 

 	case CLM_DELETEITEM:

-		cli.pfnDeleteItemFromTree(hwnd, (HANDLE)wParam);

+		cli.pfnDeleteItemFromTree(hwnd, (HCONTACT)wParam);

 		cli.pfnSortCLC(hwnd, dat, 1);

 		cli.pfnRecalcScrollBar(hwnd, dat);

 		break;

@@ -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, (HCONTACT)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, (HCONTACT)wParam, &contact, NULL, NULL))

 			break;

 		if (contact->type != CLCIT_GROUP)

 			break;

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

 

 	case CLM_FINDCONTACT:

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

-			return (LRESULT)(HANDLE) NULL;

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

+			return NULL;

 		return wParam;

 

 	case CLM_FINDGROUP:

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

-			return (LRESULT)(HANDLE) NULL;

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

+			return NULL;

 		return wParam | HCONTACT_ISGROUP;

 

 	case CLM_GETBKCOLOR:

@@ -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, (HCONTACT)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, (HCONTACT)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, (HCONTACT)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, (HCONTACT)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, (HCONTACT)wParam, &contact, NULL, NULL))

 			return CLCIT_INVALID;

 		return contact->type;

 	}

@@ -217,14 +217,14 @@ 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, (HCONTACT)lParam, &contact, &group, NULL))

 			return NULL;

 

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

 		switch (wParam) {

 		case CLGN_CHILD:

 			if (contact->type != CLCIT_GROUP)

-				return (LRESULT)(HANDLE) NULL;

+				return NULL;

 			group = contact->group;

 			if (group->cl.count == 0)

 				return NULL;

@@ -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, (HCONTACT)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, (HCONTACT)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, (HCONTACT)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, (HCONTACT)wParam, &contact, NULL, NULL))

 			break;

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

 		cli.pfnSortCLC(hwnd, dat, 1);

diff --git a/src/modules/clist/clcutils.cpp b/src/modules/clist/clcutils.cpp
index b87fc9cfa5..49946868c7 100644
--- a/src/modules/clist/clcutils.cpp
+++ b/src/modules/clist/clcutils.cpp
@@ -633,7 +633,7 @@ void fnHideInfoTip(HWND, struct ClcData *dat)
 	NotifyEventHooks(hHideInfoTipEvent, 0, (LPARAM) & it);

 }

 

-void fnNotifyNewContact(HWND hwnd, HANDLE hContact)

+void fnNotifyNewContact(HWND hwnd, HCONTACT hContact)

 {

 	NMCLISTCONTROL nm;

 	nm.hdr.code = CLN_NEWCONTACT;

diff --git a/src/modules/clist/clistevents.cpp b/src/modules/clist/clistevents.cpp
index 3407be16df..2347021133 100644
--- a/src/modules/clist/clistevents.cpp
+++ b/src/modules/clist/clistevents.cpp
@@ -200,7 +200,7 @@ struct CListEvent* fnAddEvent(CLISTEVENT *cle)
 

 // Removes an event from the contact list's queue

 // Returns 0 if the event was successfully removed, or nonzero if the event was not found

-int fnRemoveEvent(HANDLE hContact, HANDLE dbEvent)

+int fnRemoveEvent(HCONTACT hContact, HANDLE dbEvent)

 {

 	int i;

 	char *szProto;

@@ -257,7 +257,7 @@ int fnRemoveEvent(HANDLE hContact, HANDLE dbEvent)
 	return 0;

 }

 

-CLISTEVENT* fnGetEvent(HANDLE hContact, int idx)

+CLISTEVENT* fnGetEvent(HCONTACT hContact, int idx)

 {

 	if (hContact == INVALID_HANDLE_VALUE) {

 		if (idx >= cli.events.count)

@@ -272,7 +272,7 @@ CLISTEVENT* fnGetEvent(HANDLE hContact, int idx)
 	return NULL;

 }

 

-int fnEventsProcessContactDoubleClick(HANDLE hContact)

+int fnEventsProcessContactDoubleClick(HCONTACT hContact)

 {

 	for (int i=0; i < cli.events.count; i++) {

 		if (cli.events.items[i]->cle.hContact == hContact) {

@@ -290,7 +290,8 @@ int fnEventsProcessTrayDoubleClick(int index)
 {

 	BOOL click_in_first_icon = FALSE;

 	if (cli.events.count) {

-		HANDLE hContact, hDbEvent;

+		HCONTACT hContact;

+		HANDLE hDbEvent;

 		int eventIndex = 0;

 		cli.pfnLockTray();

 		if (cli.trayIconCount>1 && index>0) {

@@ -369,8 +370,8 @@ static int RemoveEventsForContact(WPARAM wParam, LPARAM)
 

 	for (; cli.events.count > 0;) {

 		for (hit = 0, j = 0; j < cli.events.count; j++) {

-			if (cli.events.items[j]->cle.hContact == (HANDLE)wParam) {

-				cli.pfnRemoveEvent((HANDLE)wParam, cli.events.items[j]->cle.hDbEvent);

+			if (cli.events.items[j]->cle.hContact == (HCONTACT)wParam) {

+				cli.pfnRemoveEvent((HCONTACT)wParam, cli.events.items[j]->cle.hDbEvent);

 				hit = 1;

 			}

 		}

@@ -383,8 +384,8 @@ static int RemoveEventsForContact(WPARAM wParam, LPARAM)
 

 static int CListEventSettingsChanged(WPARAM wParam, LPARAM lParam)

 {

-	HANDLE hContact = (HANDLE)wParam;

-	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *) lParam;

+	HCONTACT hContact = (HCONTACT)wParam;

+	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;

 	if (hContact == NULL && cws && cws->szModule && cws->szSetting && strcmp(cws->szModule, "CList") == 0) {

 		if (strcmp(cws->szSetting, "DisableTrayFlash") == 0)

 			disableTrayFlash = (int)cws->value.bVal;

@@ -398,8 +399,8 @@ static int CListEventSettingsChanged(WPARAM wParam, LPARAM lParam)
 

 INT_PTR AddEventSyncStub(WPARAM wParam, LPARAM lParam) { return CallServiceSync(MS_CLIST_ADDEVENT"_SYNC", wParam, lParam); }

 INT_PTR AddEventStub(WPARAM, LPARAM lParam) { return cli.pfnAddEvent((CLISTEVENT*)lParam) == NULL; }

-INT_PTR RemoveEventStub(WPARAM wParam, LPARAM lParam) { return cli.pfnRemoveEvent((HANDLE)wParam, (HANDLE)lParam); }

-INT_PTR GetEventStub(WPARAM wParam, LPARAM lParam) { return (INT_PTR)cli.pfnGetEvent((HANDLE)wParam, (int)lParam); }

+INT_PTR RemoveEventStub(WPARAM wParam, LPARAM lParam) { return cli.pfnRemoveEvent((HCONTACT)wParam, (HANDLE)lParam); }

+INT_PTR GetEventStub(WPARAM wParam, LPARAM lParam) { return (INT_PTR)cli.pfnGetEvent((HCONTACT)wParam, (int)lParam); }

 

 int InitCListEvents(void)

 {

diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp
index 387d3b565c..08c81d6a3d 100644
--- a/src/modules/clist/clistmenus.cpp
+++ b/src/modules/clist/clistmenus.cpp
@@ -320,7 +320,7 @@ static INT_PTR AddContactMenuItem(WPARAM, LPARAM lParam)
 

 static INT_PTR BuildContactMenu(WPARAM wParam, LPARAM)

 {

-	HANDLE hContact = (HANDLE)wParam;

+	HCONTACT hContact = (HCONTACT)wParam;

 	NotifyEventHooks(hPreBuildContactMenuEvent, (WPARAM)hContact, 0);

 

 	char *szProto = GetContactProto(hContact);

diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp
index 3cd0e45693..5f2ae798be 100644
--- a/src/modules/clist/clistmod.cpp
+++ b/src/modules/clist/clistmod.cpp
@@ -139,8 +139,8 @@ static int ProtocolAck(WPARAM, LPARAM lParam)
 	if ((int)ack->hProcess < ID_STATUS_ONLINE && ack->lParam >= ID_STATUS_ONLINE) {

 		DWORD caps = (DWORD)CallProtoServiceInt(NULL,ack->szModule, PS_GETCAPS, PFLAGNUM_1, 0);

 		if (caps & PF1_SERVERCLIST) {

-			for (HANDLE hContact = db_find_first(ack->szModule); hContact; ) {

-				HANDLE hNext = db_find_next(hContact, ack->szModule);

+			for (HCONTACT hContact = db_find_first(ack->szModule); hContact; ) {

+				HCONTACT hNext = db_find_next(hContact, ack->szModule);

 				if (db_get_b(hContact, "CList", "Delete", 0))

 					CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);

 				hContact = hNext;

@@ -152,12 +152,12 @@ static int ProtocolAck(WPARAM, LPARAM lParam)
 	return 0;

 }

 

-HICON fnGetIconFromStatusMode(HANDLE hContact, const char *szProto, int status)

+HICON fnGetIconFromStatusMode(HCONTACT hContact, const char *szProto, int status)

 {

 	return ImageList_GetIcon(hCListImages, cli.pfnIconFromStatusMode(szProto, status, hContact), ILD_NORMAL);

 }

 

-int fnIconFromStatusMode(const char *szProto, int status, HANDLE)

+int fnIconFromStatusMode(const char *szProto, int status, HCONTACT)

 {

 	int index, i;

 

@@ -176,7 +176,7 @@ int fnIconFromStatusMode(const char *szProto, int status, HANDLE)
 	return 1;

 }

 

-int fnGetContactIcon(HANDLE hContact)

+int fnGetContactIcon(HCONTACT hContact)

 {

 	char *szProto = GetContactProto(hContact);

 	return cli.pfnIconFromStatusMode(szProto,

@@ -185,7 +185,7 @@ int fnGetContactIcon(HANDLE hContact)
 

 static INT_PTR GetContactIcon(WPARAM wParam, LPARAM)

 {

-	return cli.pfnGetContactIcon((HANDLE)wParam);

+	return cli.pfnGetContactIcon((HCONTACT)wParam);

 }

 

 static void AddProtoIconIndex(PROTOACCOUNT* pa)

@@ -245,7 +245,7 @@ static int ContactListAccountsChanged(WPARAM eventCode, LPARAM lParam)
 static INT_PTR ContactDoubleClicked(WPARAM wParam, LPARAM)

 {

 	// Try to process event myself

-	if (cli.pfnEventsProcessContactDoubleClick((HANDLE)wParam) == 0)

+	if (cli.pfnEventsProcessContactDoubleClick((HCONTACT)wParam) == 0)

 		return 0;

 

 	// Allow third-party plugins to process a dblclick

@@ -253,7 +253,7 @@ static INT_PTR ContactDoubleClicked(WPARAM wParam, LPARAM)
 		return 0;

 

 	// Otherwise try to execute the default action

-	TryProcessDoubleClick((HANDLE)wParam);

+	TryProcessDoubleClick((HCONTACT)wParam);

 	return 0;

 }

 

@@ -425,7 +425,7 @@ extern int sortByStatus, sortByProto;
 

 static INT_PTR CompareContacts(WPARAM wParam, LPARAM lParam)

 {

-	HANDLE a = (HANDLE)wParam, b = (HANDLE) lParam;

+	HCONTACT a = (HCONTACT)wParam, b = (HCONTACT)lParam;

 	TCHAR namea[128], *nameb;

 	int statusa, statusb;

 	char *szProto1, *szProto2;

@@ -433,8 +433,8 @@ static INT_PTR CompareContacts(WPARAM wParam, LPARAM lParam)
 

 	szProto1 = GetContactProto(a);

 	szProto2 = GetContactProto(b);

-	statusa = db_get_w((HANDLE) a, SAFESTRING(szProto1), "Status", ID_STATUS_OFFLINE);

-	statusb = db_get_w((HANDLE) b, SAFESTRING(szProto2), "Status", ID_STATUS_OFFLINE);

+	statusa = db_get_w(a, SAFESTRING(szProto1), "Status", ID_STATUS_OFFLINE);

+	statusb = db_get_w(b, SAFESTRING(szProto2), "Status", ID_STATUS_OFFLINE);

 

 	if (sortByProto) {

 		/* deal with statuses, online contacts have to go above offline */

@@ -533,8 +533,8 @@ void UnloadContactListModule()
 		return;

 

 	//remove transitory contacts

-	for (HANDLE hContact = db_find_first(); hContact != NULL; ) {

-		HANDLE hNext = db_find_next(hContact);

+	for (HCONTACT hContact = db_find_first(); hContact != NULL; ) {

+		HCONTACT hNext = db_find_next(hContact);

 		if (db_get_b(hContact, "CList", "NotOnList", 0))

 			CallService(MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0);

 		hContact = hNext;

diff --git a/src/modules/clist/clistsettings.cpp b/src/modules/clist/clistsettings.cpp
index 89ee1d5f75..bf11aa6e95 100644
--- a/src/modules/clist/clistsettings.cpp
+++ b/src/modules/clist/clistsettings.cpp
@@ -54,7 +54,7 @@ void FreeDisplayNameCache(void)
 

 // default handlers for the cache item creation and destruction

 

-ClcCacheEntry* fnCreateCacheItem(HANDLE hContact)

+ClcCacheEntry* fnCreateCacheItem(HCONTACT hContact)

 {

 	ClcCacheEntry* p = (ClcCacheEntry*)mir_calloc(sizeof(ClcCacheEntry));

 	if (p == NULL)

@@ -86,14 +86,14 @@ void fnFreeCacheItem(ClcCacheEntry *p)
 	p->bIsHidden = -1;

 }

 

-ClcCacheEntry* fnGetCacheEntry(HANDLE hContact)

+ClcCacheEntry* fnGetCacheEntry(HCONTACT hContact)

 {

 	ClcCacheEntry *p;

 	int idx;

 	if (!List_GetIndex(clistCache, &hContact, &idx)) {

 		if ((p = cli.pfnCreateCacheItem(hContact)) != NULL) {

 			List_Insert(clistCache, p, idx);

-			cli.pfnInvalidateDisplayNameCacheEntry(p);

+			cli.pfnInvalidateDisplayNameCacheEntry((HCONTACT)p);

 		}

 	}

 	else p = (ClcCacheEntry*)clistCache->items[idx];

@@ -102,7 +102,7 @@ ClcCacheEntry* fnGetCacheEntry(HANDLE hContact)
 	return p;

 }

 

-void fnInvalidateDisplayNameCacheEntry(HANDLE hContact)

+void fnInvalidateDisplayNameCacheEntry(HCONTACT hContact)

 {

 	if (hContact == INVALID_HANDLE_VALUE) {

 		FreeDisplayNameCache();

@@ -116,7 +116,7 @@ void fnInvalidateDisplayNameCacheEntry(HANDLE hContact)
 	}

 }

 

-TCHAR* fnGetContactDisplayName(HANDLE hContact, int mode)

+TCHAR* fnGetContactDisplayName(HCONTACT hContact, int mode)

 {

 	ClcCacheEntry *cacheEntry = NULL;

 

@@ -160,7 +160,7 @@ INT_PTR GetContactDisplayName(WPARAM wParam, LPARAM lParam)
 {

 	static char retVal[200];

 	ClcCacheEntry *cacheEntry = NULL;

-	HANDLE hContact = (HANDLE)wParam;

+	HCONTACT hContact = (HCONTACT)wParam;

 

 	if (lParam & GCDNF_UNICODE)

 		return (INT_PTR)cli.pfnGetContactDisplayName(hContact, lParam & ~GCDNF_UNICODE);

@@ -209,13 +209,13 @@ INT_PTR GetContactDisplayName(WPARAM wParam, LPARAM lParam)
 

 INT_PTR InvalidateDisplayName(WPARAM wParam, LPARAM)

 {

-	cli.pfnInvalidateDisplayNameCacheEntry((HANDLE)wParam);

+	cli.pfnInvalidateDisplayNameCacheEntry((HCONTACT)wParam);

 	return 0;

 }

 

 int ContactAdded(WPARAM wParam, LPARAM)

 {

-	cli.pfnChangeContactIcon((HANDLE)wParam, cli.pfnIconFromStatusMode(GetContactProto((HANDLE)wParam), ID_STATUS_OFFLINE, NULL), 1);

+	cli.pfnChangeContactIcon((HCONTACT)wParam, cli.pfnIconFromStatusMode(GetContactProto((HCONTACT)wParam), ID_STATUS_OFFLINE, NULL), 1);

 	cli.pfnSortContacts();

 	return 0;

 }

@@ -230,7 +230,7 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 {

 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *) lParam;

 	DBVARIANT dbv;

-	HANDLE hContact = (HANDLE)wParam;

+	HCONTACT hContact = (HCONTACT)wParam;

 

 	// Early exit

 	if (hContact == NULL)

@@ -270,7 +270,7 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 	if (!strcmp(cws->szModule, "CList")) {

 		if (!strcmp(cws->szSetting, "Hidden")) {

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

-				char *szProto = GetContactProto((HANDLE)wParam);

+				char *szProto = GetContactProto((HCONTACT)wParam);

 				cli.pfnChangeContactIcon(hContact, cli.pfnIconFromStatusMode(szProto, szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), hContact), 1);

 			}

 			else

diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp
index 559e9b2b13..ce1996d89e 100644
--- a/src/modules/clist/clui.cpp
+++ b/src/modules/clist/clui.cpp
@@ -134,7 +134,7 @@ static INT_PTR CALLBACK AskForConfirmationDlgProc(HWND hWnd, UINT msg, WPARAM wP
 			TCHAR szFinal[256];

 

 			GetDlgItemText(hWnd, IDC_TOPLINE, szFormat, SIZEOF(szFormat));

-			mir_sntprintf(szFinal, SIZEOF(szFinal), szFormat, cli.pfnGetContactDisplayName((HANDLE)lParam, 0));

+			mir_sntprintf(szFinal, SIZEOF(szFinal), szFormat, cli.pfnGetContactDisplayName((HCONTACT)lParam, 0));

 			SetDlgItemText(hWnd, IDC_TOPLINE, szFinal);

 		}

 		SetFocus( GetDlgItem(hWnd, IDNO));

@@ -185,7 +185,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam)
 	// Delete contact

 	case IDYES:

 		{

-			char *szProto = GetContactProto((HANDLE)wParam);

+			char *szProto = GetContactProto((HCONTACT)wParam);

 			if (szProto != NULL) {

 				// Check if protocol uses server side lists

 				DWORD caps;

@@ -197,7 +197,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam)
 					status = CallProtoServiceInt(NULL,szProto, PS_GETSTATUS, 0, 0);

 					if (status == ID_STATUS_OFFLINE || (status >= ID_STATUS_CONNECTING && status < ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES)) {

 						// Set a flag so we remember to delete the contact when the protocol goes online the next time

-						db_set_b((HANDLE)wParam, "CList", "Delete", 1);

+						db_set_b((HCONTACT)wParam, "CList", "Delete", 1);

 						MessageBox(NULL,

 							TranslateT("This contact is on an instant messaging system which stores its contact list on a central server. The contact will be removed from the server and from your contact list when you next connect to that network."),

 							TranslateT("Delete contact"), MB_ICONINFORMATION | MB_OK);

@@ -212,7 +212,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam)
 

 	// Archive contact

 	case IDC_HIDE:

-		db_set_b((HANDLE)wParam, "CList", "Hidden", 1);

+		db_set_b((HCONTACT)wParam, "CList", "Hidden", 1);

 		break;

 	}

 

@@ -815,7 +815,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 

 			case CLN_NEWCONTACT:

 				if (nmc != NULL)

-					cli.pfnSetAllExtraIcons(nmc->hItem);

+					cli.pfnSetAllExtraIcons((HCONTACT)nmc->hItem);

 				return TRUE;

 

 			case CLN_LISTREBUILT:

@@ -869,7 +869,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 					if (hItem) {

 						if (hitFlags & CLCHT_ONITEMEXTRA) {

 							if (!IsHContactGroup(hItem) && !IsHContactInfo(hItem))

-								if ( cli.pfnGetCacheEntry(nmc->hItem))

+								if (cli.pfnGetCacheEntry((HCONTACT)nmc->hItem))

 									NotifyEventHooks(hEventExtraClick, (WPARAM)nmc->hItem, nmc->iColumn+1);

 						}

 						break;

diff --git a/src/modules/clist/contact.cpp b/src/modules/clist/contact.cpp
index 4a7be77ba1..92f7f5deda 100644
--- a/src/modules/clist/contact.cpp
+++ b/src/modules/clist/contact.cpp
@@ -45,7 +45,7 @@ static const struct {
 	{ID_STATUS_ONTHEPHONE, 150},

 	{ID_STATUS_OUTTOLUNCH, 425}};

 

-static int GetContactStatus(HANDLE hContact)

+static int GetContactStatus(HCONTACT hContact)

 {

 	char *szProto = GetContactProto(hContact);

 	if (szProto == NULL)

@@ -53,7 +53,7 @@ static int GetContactStatus(HANDLE hContact)
 	return db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);

 }

 

-void fnChangeContactIcon(HANDLE hContact, int iIcon, int add)

+void fnChangeContactIcon(HCONTACT hContact, int iIcon, int add)

 {

 	CallService(add ? MS_CLUI_CONTACTADDED : MS_CLUI_CONTACTSETICON, (WPARAM) hContact, iIcon);

 	NotifyEventHooks(hContactIconChangedEvent, (WPARAM) hContact, iIcon);

@@ -78,7 +78,7 @@ void fnLoadContactTree(void)
 	}

 

 	int hideOffline = db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT);

-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 		int status = GetContactStatus(hContact);

 		if ((!hideOffline || status != ID_STATUS_OFFLINE) && !db_get_b(hContact, "CList", "Hidden", 0))

 			cli.pfnChangeContactIcon(hContact, cli.pfnIconFromStatusMode(GetContactProto(hContact), status, hContact), 1);

@@ -90,13 +90,13 @@ void fnLoadContactTree(void)
 

 int fnCompareContacts(const ClcContact* c1, const ClcContact* c2)

 {

-	HANDLE a = c1->hContact, b = c2->hContact;

+	HCONTACT a = c1->hContact, b = c2->hContact;

 	TCHAR namea[128], *nameb;

 	int statusa, statusb;

 	int rc;

 

-	statusa = db_get_w((HANDLE) a, c1->proto, "Status", ID_STATUS_OFFLINE);

-	statusb = db_get_w((HANDLE) b, c2->proto, "Status", ID_STATUS_OFFLINE);

+	statusa = db_get_w(a, c1->proto, "Status", ID_STATUS_OFFLINE);

+	statusb = db_get_w(b, c2->proto, "Status", ID_STATUS_OFFLINE);

 

 	if (sortByProto) {

 		/* deal with statuses, online contacts have to go above offline */

@@ -111,17 +111,15 @@ int fnCompareContacts(const ClcContact* c1, const ClcContact* c2)
 	}

 

 	if (sortByStatus) {

-		int ordera, orderb;

-		ordera = GetStatusModeOrdering(statusa);

-		orderb = GetStatusModeOrdering(statusb);

+		int ordera = GetStatusModeOrdering(statusa);

+		int orderb = GetStatusModeOrdering(statusb);

 		if (ordera != orderb)

 			return ordera - orderb;

 	}

 	else {

 		//one is offline: offline goes below online

-		if ((statusa == ID_STATUS_OFFLINE) != (statusb == ID_STATUS_OFFLINE)) {

+		if ((statusa == ID_STATUS_OFFLINE) != (statusb == ID_STATUS_OFFLINE))

 			return 2 * (statusa == ID_STATUS_OFFLINE) - 1;

-		}

 	}

 

 	nameb = cli.pfnGetContactDisplayName(a, 0);

@@ -146,13 +144,13 @@ INT_PTR ContactChangeGroup(WPARAM wParam, LPARAM lParam)
 

 	CallService(MS_CLUI_CONTACTDELETED, wParam, 0);

 	if ((HANDLE) lParam == NULL)

-		db_unset((HANDLE)wParam, "CList", "Group");

+		db_unset((HCONTACT)wParam, "CList", "Group");

 	else {

 		grpChg.pszNewName = cli.pfnGetGroupName(lParam, NULL);

-		db_set_ts((HANDLE)wParam, "CList", "Group", grpChg.pszNewName);

+		db_set_ts((HCONTACT)wParam, "CList", "Group", grpChg.pszNewName);

 	}

 	CallService(MS_CLUI_CONTACTADDED, wParam,

-		cli.pfnIconFromStatusMode(GetContactProto((HANDLE)wParam), GetContactStatus((HANDLE)wParam), (HANDLE)wParam));

+		cli.pfnIconFromStatusMode(GetContactProto((HCONTACT)wParam), GetContactStatus((HCONTACT)wParam), (HCONTACT)wParam));

 

 	NotifyEventHooks(hGroupChangeEvent, wParam, (LPARAM)&grpChg);

 	return 0;

diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp
index be411350a5..c453635fce 100644
--- a/src/modules/clist/genmenu.cpp
+++ b/src/modules/clist/genmenu.cpp
@@ -1096,7 +1096,7 @@ int RegisterAllIconsInIconLib()
 	return 0;

 }

 

-int TryProcessDoubleClick(HANDLE hContact)

+int TryProcessDoubleClick(HCONTACT hContact)

 {

 	int iMenuID = GetMenuObjbyId((int)hContactMenuObject);

 	if (iMenuID != -1) {

diff --git a/src/modules/clist/groups.cpp b/src/modules/clist/groups.cpp
index b6162fc17e..123ee33692 100644
--- a/src/modules/clist/groups.cpp
+++ b/src/modules/clist/groups.cpp
@@ -178,7 +178,7 @@ static INT_PTR DeleteGroup(WPARAM wParam, LPARAM)
 	int i;

 	char str[33];

 	DBVARIANT dbv;

-	HANDLE hContact;

+	HCONTACT hContact;

 	TCHAR name[256], szNewParent[256], *pszLastBackslash;

 

 	//get the name

@@ -292,7 +292,7 @@ static int RenameGroupWithMove(int groupId, const TCHAR *szName, int move)
 	db_set_ts(NULL, "CListGroups", idstr, str);

 

 	//must rename setting in all child contacts too

-	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

 		ClcCacheEntry *cache = cli.pfnGetCacheEntry(hContact);

 		if (!lstrcmp(cache->tszGroup, oldName)) {

 			db_set_ts(hContact, "CList", "Group", szName);

diff --git a/src/modules/clist/movetogroup.cpp b/src/modules/clist/movetogroup.cpp
index 00d6817fb8..3c3dc12ef2 100644
--- a/src/modules/clist/movetogroup.cpp
+++ b/src/modules/clist/movetogroup.cpp
@@ -101,7 +101,7 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM)
 		CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)lphGroupsItems[i], 0);

 	lphGroupsItems.destroy();

 

-	ptrT szContactGroup( db_get_tsa((HANDLE)wParam, "CList", "Group"));

+	ptrT szContactGroup(db_get_tsa((HCONTACT)wParam, "CList", "Group"));

 

 	int pos = 1000;