HCONTACT is not needed anymore

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

16 files changed, 110 insertions, 110 deletions

diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp
index f087f87039..b2f3bad3fb 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((HCONTACT)wParam);

+			cli.pfnInvalidateDisplayNameCacheEntry((MCONTACT)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((HCONTACT)wParam);

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

 		if (szProto != NULL) {

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

 				cli.pfnClcBroadcast(INTM_PROTOCHANGED, wParam, lParam);

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

 

 	case INTM_CONTACTADDED:

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

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

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

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

 		SortClcByTimer(hwnd);

 		break;

 

 	case INTM_CONTACTDELETED:

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

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

 		SortClcByTimer(hwnd);

 		break;

 

@@ -461,10 +461,10 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 			if (dbcws->value.type == DBVT_DELETED || dbcws->value.bVal == 0) {

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

 					break;

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

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

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

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

 			}

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

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

 

 			dat->needsResort = 1;

 			SortClcByTimer(hwnd);

@@ -481,10 +481,10 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 				memcpy(iExtraImage, contact->iExtraImage, sizeof(iExtraImage));

 				flags = contact->flags;

 			}

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

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

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

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

 				NMCLISTCONTROL nm;

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

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

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

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

 					if (flags & CONTACTF_CHECKED)

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

 			int recalcScrollBar = 0, shouldShow;

 			WORD status;

-			HCONTACT hSelItem = NULL;

+			MCONTACT hSelItem = NULL;

 			ClcContact *selcontact = NULL;

 

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

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

 			if (szProto == NULL)

 				status = ID_STATUS_OFFLINE;

 			else

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

+				status = db_get_w((MCONTACT)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((HCONTACT)wParam, "CList", "Hidden", 0))

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

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

 

 			contact = NULL;

@@ -525,13 +525,13 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 			if (!cli.pfnFindItem(hwnd, dat, (HANDLE)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 = (HCONTACT)cli.pfnContactToHItem(selcontact);

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

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

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

 					recalcScrollBar = 1;

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

 					if (contact) {

 						contact->iImage = (WORD) lParam;

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

+						cli.pfnNotifyNewContact(hwnd, (MCONTACT)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 = (HCONTACT)cli.pfnContactToHItem(selcontact);

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

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

 					recalcScrollBar = 1;

 				}

@@ -569,7 +569,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

 			break;

 

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

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

 		dat->needsResort = 1;

 		SortClcByTimer(hwnd);

 		break;

@@ -578,9 +578,9 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 		if (!cli.pfnFindItem(hwnd, dat, (HANDLE)wParam, &contact, NULL, NULL))

 			break;

 

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

-		cli.pfnInvalidateDisplayNameCacheEntry((HCONTACT)wParam);

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

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

+		cli.pfnInvalidateDisplayNameCacheEntry((MCONTACT)wParam);

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

 		SortClcByTimer(hwnd);

 		break;

 

@@ -604,11 +604,11 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 

 	case INTM_APPARENTMODECHANGED:

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

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

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

 			if (szProto == NULL)

 				break;

 

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

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

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

 			if (apparentMode == ID_STATUS_OFFLINE)

 				contact->flags |= CONTACTF_INVISTO;

@@ -626,11 +626,11 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
 

 	case INTM_IDLECHANGED:

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

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

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

 			if (szProto == NULL)

 				break;

 			contact->flags &= ~CONTACTF_IDLE;

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

+			if (db_get_dw((MCONTACT)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 b95e072656..0c1a714fae 100644
--- a/src/modules/clist/clc.h
+++ b/src/modules/clist/clc.h
@@ -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, HCONTACT hContact, int updateTotalCount, int checkHideOffline);

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

-void fnDeleteItemFromTree(HWND hwnd, HCONTACT hItem);

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

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

+void fnDeleteItemFromTree(HWND hwnd, MCONTACT 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, HCONTACT hContact);

+void  fnNotifyNewContact(HWND hwnd, MCONTACT 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(HCONTACT hContact, int mode);

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

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

-void   fnInvalidateDisplayNameCacheEntry(HCONTACT hContact);

+void   fnInvalidateDisplayNameCacheEntry(MCONTACT hContact);

 

-ClcCacheEntry* fnGetCacheEntry(HCONTACT hContact);

-ClcCacheEntry* fnCreateCacheItem (HCONTACT hContact);

+ClcCacheEntry* fnGetCacheEntry(MCONTACT hContact);

+ClcCacheEntry* fnCreateCacheItem (MCONTACT 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(HCONTACT hContact, int idx);

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

 

 struct CListEvent* fnCreateEvent(void);

 void fnFreeEvent(struct CListEvent* p);

 

-int   fnEventsProcessContactDoubleClick(HCONTACT hContact);

+int   fnEventsProcessContactDoubleClick(MCONTACT hContact);

 int   fnEventsProcessTrayDoubleClick(int);

 int   fnGetImlIconIndex(HICON hIcon);

-int   fnRemoveEvent(HCONTACT hContact, HANDLE dbEvent);

+int   fnRemoveEvent(MCONTACT hContact, HANDLE dbEvent);

 

 /* clistmod.c */

-int    fnGetContactIcon(HCONTACT hContact);

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

+int    fnGetContactIcon(MCONTACT hContact);

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

 int    fnShowHide(WPARAM wParam, LPARAM lParam);

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

+HICON  fnGetIconFromStatusMode(MCONTACT 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 (HCONTACT hContact, int iIcon, int add);

+void fnChangeContactIcon (MCONTACT 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 2c79cafb7e..9cb9e01f03 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 HCONTACT HContactFromPoint(HWND hwnd, struct ClcData *dat, int x, int y, int *hitLine)

+static MCONTACT 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;

-	HCONTACT hContact;

+	MCONTACT hContact;

 

 	if (pDropTargetHelper && hwndCurrentDrag)

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

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

 	shortPt.y = pt.y;

 	ScreenToClient(hwndCurrentDrag, &shortPt);

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

+	MCONTACT 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 7165d61b48..40584a910d 100644
--- a/src/modules/clist/clcidents.cpp
+++ b/src/modules/clist/clcidents.cpp
@@ -99,9 +99,9 @@ int fnFindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, ClcContact **contac
 		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 == (HCONTACT)hItem) || (IsHContactInfo(hItem) &&

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

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

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

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

 		{

 			if (isVisible) {

 				if (!nowVisible)

diff --git a/src/modules/clist/clcitems.cpp b/src/modules/clist/clcitems.cpp
index 690de3c4cb..9587d3f94f 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 (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+				for (MCONTACT 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 = (HCONTACT)++iInfoItemUniqueHandle;

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

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

 	return i;

 }

 

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

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

 {

 	int i, index = -1;

 

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

 }

 

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

+void fnAddContactToTree(HWND hwnd, struct ClcData *dat, MCONTACT 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, HCONTACT hItem)

+void fnDeleteItemFromTree(HWND hwnd, MCONTACT 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 (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (MCONTACT 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;

-	HCONTACT hSelItem;

+	MCONTACT hSelItem;

 

 	if (dat->needsResort) {

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

 			hSelItem = NULL;

 		else

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

+			hSelItem = (MCONTACT)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

 {

-	HCONTACT hContact;

+	MCONTACT hContact;

 	WORD iExtraImage[EXTRA_ICON_COUNT];

 	int checked;

 };

diff --git a/src/modules/clist/clcmsgs.cpp b/src/modules/clist/clcmsgs.cpp
index 9ce6f5c3a9..2f839b934d 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, (HCONTACT)wParam, 1, 0);

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

 		cli.pfnRecalcScrollBar(hwnd, dat);

 		cli.pfnSortCLC(hwnd, dat, 1);

 		break;

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

 

 	case CLM_DELETEITEM:

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

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

 		cli.pfnSortCLC(hwnd, dat, 1);

 		cli.pfnRecalcScrollBar(hwnd, dat);

 		break;

diff --git a/src/modules/clist/clcutils.cpp b/src/modules/clist/clcutils.cpp
index d5cb14fdbf..470936f9e4 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, HCONTACT hContact)

+void fnNotifyNewContact(HWND hwnd, MCONTACT hContact)

 {

 	NMCLISTCONTROL nm;

 	nm.hdr.code = CLN_NEWCONTACT;

diff --git a/src/modules/clist/clistevents.cpp b/src/modules/clist/clistevents.cpp
index 4acefdf247..6a99a46180 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(HCONTACT hContact, HANDLE dbEvent)

+int fnRemoveEvent(MCONTACT hContact, HANDLE dbEvent)

 {

 	int i;

 	char *szProto;

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

 }

 

-CLISTEVENT* fnGetEvent(HCONTACT hContact, int idx)

+CLISTEVENT* fnGetEvent(MCONTACT hContact, int idx)

 {

-	if (hContact == (HCONTACT)INVALID_HANDLE_VALUE) {

+	if (hContact == INVALID_CONTACT_ID) {

 		if (idx >= cli.events.count)

 			return NULL;

 		return &cli.events.items[idx]->cle;

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

 }

 

-int fnEventsProcessContactDoubleClick(HCONTACT hContact)

+int fnEventsProcessContactDoubleClick(MCONTACT hContact)

 {

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

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

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

 	BOOL click_in_first_icon = FALSE;

 	if (cli.events.count) {

-		HCONTACT hContact;

+		MCONTACT hContact;

 		HANDLE hDbEvent;

 		int eventIndex = 0;

 		cli.pfnLockTray();

@@ -370,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 == (HCONTACT)wParam) {

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

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

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

 				hit = 1;

 			}

 		}

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

 static int CListEventSettingsChanged(WPARAM wParam, LPARAM lParam)

 {

-	HCONTACT hContact = (HCONTACT)wParam;

+	MCONTACT hContact = (MCONTACT)wParam;

 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;

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

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

@@ -399,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((HCONTACT)wParam, (HANDLE)lParam); }

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

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

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

 

 int InitCListEvents(void)

 {

diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp
index 08c81d6a3d..1adf39e438 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)

 {

-	HCONTACT hContact = (HCONTACT)wParam;

+	MCONTACT hContact = (MCONTACT)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 5f2ae798be..28f011e93c 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 (HCONTACT hContact = db_find_first(ack->szModule); hContact; ) {

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

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

+				MCONTACT 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(HCONTACT hContact, const char *szProto, int status)

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

 {

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

 }

 

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

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

 {

 	int index, i;

 

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

 }

 

-int fnGetContactIcon(HCONTACT hContact)

+int fnGetContactIcon(MCONTACT hContact)

 {

 	char *szProto = GetContactProto(hContact);

 	return cli.pfnIconFromStatusMode(szProto,

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

 static INT_PTR GetContactIcon(WPARAM wParam, LPARAM)

 {

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

+	return cli.pfnGetContactIcon((MCONTACT)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((HCONTACT)wParam) == 0)

+	if (cli.pfnEventsProcessContactDoubleClick((MCONTACT)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((HCONTACT)wParam);

+	TryProcessDoubleClick((MCONTACT)wParam);

 	return 0;

 }

 

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

 static INT_PTR CompareContacts(WPARAM wParam, LPARAM lParam)

 {

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

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

 	TCHAR namea[128], *nameb;

 	int statusa, statusb;

 	char *szProto1, *szProto2;

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

 

 	//remove transitory contacts

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

-		HCONTACT hNext = db_find_next(hContact);

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

+		MCONTACT 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 7e23fb67bc..90930e092a 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(HCONTACT hContact)

+ClcCacheEntry* fnCreateCacheItem(MCONTACT hContact)

 {

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

 	if (p == NULL)

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

 }

 

-ClcCacheEntry* fnGetCacheEntry(HCONTACT hContact)

+ClcCacheEntry* fnGetCacheEntry(MCONTACT hContact)

 {

 	ClcCacheEntry *p;

 	int idx;

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

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

 			List_Insert(clistCache, p, idx);

-			cli.pfnInvalidateDisplayNameCacheEntry((HCONTACT)p);

+			cli.pfnInvalidateDisplayNameCacheEntry((MCONTACT)p);

 		}

 	}

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

@@ -102,9 +102,9 @@ ClcCacheEntry* fnGetCacheEntry(HCONTACT hContact)
 	return p;

 }

 

-void fnInvalidateDisplayNameCacheEntry(HCONTACT hContact)

+void fnInvalidateDisplayNameCacheEntry(MCONTACT hContact)

 {

-	if (hContact == (HCONTACT)INVALID_HANDLE_VALUE) {

+	if (hContact == INVALID_CONTACT_ID) {

 		FreeDisplayNameCache();

 		InitDisplayNameCache();

 		SendMessage(cli.hwndContactTree, CLM_AUTOREBUILD, 0, 0);

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

 }

 

-TCHAR* fnGetContactDisplayName(HCONTACT hContact, int mode)

+TCHAR* fnGetContactDisplayName(MCONTACT hContact, int mode)

 {

 	ClcCacheEntry *cacheEntry = NULL;

 

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

 	static char retVal[200];

 	ClcCacheEntry *cacheEntry = NULL;

-	HCONTACT hContact = (HCONTACT)wParam;

+	MCONTACT hContact = (MCONTACT)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((HCONTACT)wParam);

+	cli.pfnInvalidateDisplayNameCacheEntry((MCONTACT)wParam);

 	return 0;

 }

 

 int ContactAdded(WPARAM wParam, LPARAM)

 {

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

+	cli.pfnChangeContactIcon((MCONTACT)wParam, cli.pfnIconFromStatusMode(GetContactProto((MCONTACT)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;

-	HCONTACT hContact = (HCONTACT)wParam;

+	MCONTACT hContact = (MCONTACT)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((HCONTACT)wParam);

+				char *szProto = GetContactProto((MCONTACT)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 4683169736..a5d760cfad 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((HCONTACT)lParam, 0));

+			mir_sntprintf(szFinal, SIZEOF(szFinal), szFormat, cli.pfnGetContactDisplayName((MCONTACT)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((HCONTACT)wParam);

+			char *szProto = GetContactProto((MCONTACT)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((HCONTACT)wParam, "CList", "Delete", 1);

+						db_set_b((MCONTACT)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((HCONTACT)wParam, "CList", "Hidden", 1);

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

 		break;

 	}

 

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

 {

 	ADDCONTACTSTRUCT acs = { 0 };

-	acs.hContact = (HCONTACT)wParam;

+	acs.hContact = (MCONTACT)wParam;

 	acs.handleType = HANDLE_CONTACT;

 	acs.szProto = "";

 	CallService(MS_ADDCONTACT_SHOW, NULL, (LPARAM)&acs);

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

 			case CLN_NEWCONTACT:

 				if (nmc != NULL)

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

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

 				return TRUE;

 

 			case CLN_LISTREBUILT:

@@ -867,7 +867,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((HCONTACT)nmc->hItem))

+								if (cli.pfnGetCacheEntry((MCONTACT)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 92f7f5deda..be856535aa 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(HCONTACT hContact)

+static int GetContactStatus(MCONTACT hContact)

 {

 	char *szProto = GetContactProto(hContact);

 	if (szProto == NULL)

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

 }

 

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

+void fnChangeContactIcon(MCONTACT 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 (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (MCONTACT 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,7 +90,7 @@ void fnLoadContactTree(void)
 

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

 {

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

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

 	TCHAR namea[128], *nameb;

 	int statusa, statusb;

 	int rc;

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

 	CallService(MS_CLUI_CONTACTDELETED, wParam, 0);

 	if ((HANDLE) lParam == NULL)

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

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

 	else {

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

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

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

 	}

 	CallService(MS_CLUI_CONTACTADDED, wParam,

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

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

 

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

 	return 0;

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

 }

 

-int TryProcessDoubleClick(HCONTACT hContact)

+int TryProcessDoubleClick(MCONTACT hContact)

 {

 	int iMenuID = GetMenuObjbyId((int)hContactMenuObject);

 	if (iMenuID != -1) {

diff --git a/src/modules/clist/groups.cpp b/src/modules/clist/groups.cpp
index 123ee33692..3799770865 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;

-	HCONTACT hContact;

+	MCONTACT 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 (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (MCONTACT 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 3c3dc12ef2..3193dc6a20 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((HCONTACT)wParam, "CList", "Group"));

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

 

 	int pos = 1000;