HCONTACT is not needed anymore

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

11 files changed, 118 insertions, 118 deletions

diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp
index 54ade38cac..ff021ea86e 100644
--- a/protocols/IRCG/src/clist.cpp
+++ b/protocols/IRCG/src/clist.cpp
@@ -24,13 +24,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 BOOL CIrcProto::CList_AddDCCChat(const CMString& name, const CMString& hostmask, unsigned long adr, int port)

 {

-	HCONTACT hContact;

+	MCONTACT hContact;

 	TCHAR szNick[256];

 	char szService[256];

 	bool bFlag = false;

 

 	CONTACT usertemp = { (TCHAR*)name.c_str(), NULL, NULL, false, false, true };

-	HCONTACT hc = CList_FindContact(&usertemp);

+	MCONTACT hc = CList_FindContact(&usertemp);

 	if (hc && db_get_b(hc, "CList", "NotOnList", 0) == 0 && db_get_b(hc, "CList", "Hidden", 0) == 0)

 		bFlag = true;

 

@@ -80,12 +80,12 @@ BOOL CIrcProto::CList_AddDCCChat(const CMString& name, const CMString& hostmask,
 	return TRUE;

 }

 

-HCONTACT CIrcProto::CList_AddContact(CONTACT *user, bool InList, bool SetOnline)

+MCONTACT CIrcProto::CList_AddContact(CONTACT *user, bool InList, bool SetOnline)

 {

 	if (user->name == NULL)

 		return 0;

 

-	HCONTACT hContact = CList_FindContact(user);

+	MCONTACT hContact = CList_FindContact(user);

 	if (hContact) {

 		if (InList)

 			db_unset(hContact, "CList", "NotOnList");

@@ -97,7 +97,7 @@ HCONTACT CIrcProto::CList_AddContact(CONTACT *user, bool InList, bool SetOnline)
 	}

 

 	// here we create a new one since no one is to be found

-	hContact = (HCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);

+	hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);

 	if (hContact) {

 		CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)m_szModuleName);

 

@@ -116,9 +116,9 @@ HCONTACT CIrcProto::CList_AddContact(CONTACT *user, bool InList, bool SetOnline)
 	return false;

 }

 

-HCONTACT CIrcProto::CList_SetOffline(CONTACT *user)

+MCONTACT CIrcProto::CList_SetOffline(CONTACT *user)

 {

-	HCONTACT hContact = CList_FindContact(user);

+	MCONTACT hContact = CList_FindContact(user);

 	if (hContact) {

 		DBVARIANT dbv;

 		if (!getTString(hContact, "Default", &dbv)) {

@@ -140,7 +140,7 @@ bool CIrcProto::CList_SetAllOffline(BYTE ChatsToo)
 

 	DisconnectAllDCCSessions(false);

 

-	for (HCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

+	for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

 		if (isChatRoom(hContact))

 			continue;

 

@@ -160,7 +160,7 @@ bool CIrcProto::CList_SetAllOffline(BYTE ChatsToo)
 	return true;

 }

 

-HCONTACT CIrcProto::CList_FindContact(CONTACT *user)

+MCONTACT CIrcProto::CList_FindContact(CONTACT *user)

 {

 	if (!user || !user->name)

 		return 0;

@@ -168,11 +168,11 @@ HCONTACT CIrcProto::CList_FindContact(CONTACT *user)
 	TCHAR* lowercasename = mir_tstrdup(user->name);

 	CharLower(lowercasename);

 

-	for (HCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

+	for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

 		if (isChatRoom(hContact))

 			continue;

 

-		HCONTACT  hContact_temp = NULL;

+		MCONTACT  hContact_temp = NULL;

 		ptrT DBNick(getTStringA(hContact, "Nick"));

 		ptrT DBUser(getTStringA(hContact, "UUser"));

 		ptrT DBHost(getTStringA(hContact, "UHost"));

@@ -183,7 +183,7 @@ HCONTACT CIrcProto::CList_FindContact(CONTACT *user)
 			CharLower(DBWildcard);

 		if (IsChannel(user->name)) {

 			if (DBDefault && !lstrcmpi(DBDefault, user->name))

-				hContact_temp = (HCONTACT)-1;

+				hContact_temp = (MCONTACT)-1;

 		}

 		else if (user->ExactNick && DBNick && !lstrcmpi(DBNick, user->name))

 			hContact_temp = hContact;

@@ -208,7 +208,7 @@ HCONTACT CIrcProto::CList_FindContact(CONTACT *user)
 

 		if (hContact_temp != NULL) {

 			mir_free(lowercasename);

-			if (hContact_temp != (HCONTACT)-1)

+			if (hContact_temp != (MCONTACT)-1)

 				return hContact_temp;

 			return 0;

 		}

diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index 41556d434e..52d4b03d20 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -140,7 +140,7 @@ VOID CALLBACK OnlineNotifTimerProc(HWND, UINT, UINT_PTR idEvent, DWORD)
 

 	if (name.IsEmpty() && name2.IsEmpty()) {

 		DBVARIANT dbv;

-		for (HCONTACT hContact = db_find_first(ppro->m_szModuleName); hContact; hContact = db_find_next(hContact, ppro->m_szModuleName)) {

+		for (MCONTACT hContact = db_find_first(ppro->m_szModuleName); hContact; hContact = db_find_next(hContact, ppro->m_szModuleName)) {

 			if (ppro->isChatRoom(hContact))

 				continue;

 

@@ -215,7 +215,7 @@ VOID CALLBACK OnlineNotifTimerProc(HWND, UINT, UINT_PTR idEvent, DWORD)
 		ppro->SetChatTimer(ppro->OnlineNotifTimer, ppro->m_onlineNotificationTime * 1000, OnlineNotifTimerProc);

 }

 

-int CIrcProto::AddOutgoingMessageToDB(HCONTACT hContact, TCHAR* msg)

+int CIrcProto::AddOutgoingMessageToDB(MCONTACT hContact, TCHAR* msg)

 {

 	if (m_iStatus == ID_STATUS_OFFLINE || m_iStatus == ID_STATUS_CONNECTING)

 		return 0;

@@ -582,7 +582,7 @@ bool CIrcProto::OnIrc_NICK(const CIrcMessage* pmsg)
 		DoEvent(GC_EVENT_CHUID, NULL, pmsg->prefix.sNick.c_str(), pmsg->parameters[0].c_str(), NULL, NULL, NULL, true, false);

 

 		struct CONTACT user = { (TCHAR*)pmsg->prefix.sNick.c_str(), (TCHAR*)pmsg->prefix.sUser.c_str(), (TCHAR*)pmsg->prefix.sHost.c_str(), false, false, false };

-		HCONTACT hContact = CList_FindContact(&user);

+		MCONTACT hContact = CList_FindContact(&user);

 		if (hContact) {

 			if (getWord(hContact, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE)

 				setWord(hContact, "Status", ID_STATUS_ONLINE);

@@ -696,12 +696,12 @@ bool CIrcProto::OnIrc_PRIVMSG(const CIrcMessage* pmsg)
 				return true;

 

 			if ((m_ignore && IsIgnored(pmsg->prefix.sNick, pmsg->prefix.sUser, pmsg->prefix.sHost, 'q'))) {

-				HCONTACT hContact = CList_FindContact(&user);

+				MCONTACT hContact = CList_FindContact(&user);

 				if (!hContact || (hContact && db_get_b(hContact, "CList", "Hidden", 0) == 1))

 					return true;

 			}

 

-			HCONTACT hContact = CList_AddContact(&user, false, true);

+			MCONTACT hContact = CList_AddContact(&user, false, true);

 

 			PROTORECVEVENT pre = { 0 };

 			pre.timestamp = (DWORD)time(NULL);

@@ -1066,7 +1066,7 @@ bool CIrcProto::IsCTCP(const CIrcMessage* pmsg)
 			// incoming chat request

 			if (bIsChat) {

 				CONTACT user = { (TCHAR*)pmsg->prefix.sNick.c_str(), 0, 0, false, false, true };

-				HCONTACT hContact = CList_FindContact(&user);

+				MCONTACT hContact = CList_FindContact(&user);

 

 				// check if it should be ignored

 				if (m_DCCChatIgnore == 1 ||

@@ -1139,7 +1139,7 @@ bool CIrcProto::IsCTCP(const CIrcMessage* pmsg)
 					if (!CList_FindContact(&user))

 						return true;

 

-					HCONTACT hContact = CList_AddContact(&user, false, true);

+					MCONTACT hContact = CList_AddContact(&user, false, true);

 					if (hContact) {

 						DCCINFO* di = new DCCINFO;

 						di->hContact = hContact;

@@ -1188,7 +1188,7 @@ bool CIrcProto::IsCTCP(const CIrcMessage* pmsg)
 		//if we got incoming CTCP Version for contact in CList - then write its as MirVer for that contact!

 		if (pmsg->m_bIncoming && command == _T("version")) {

 			struct CONTACT user = { (TCHAR*)pmsg->prefix.sNick.c_str(), (TCHAR*)pmsg->prefix.sUser.c_str(), (TCHAR*)pmsg->prefix.sHost.c_str(), false, false, false };

-			HCONTACT hContact = CList_FindContact(&user);

+			MCONTACT hContact = CList_FindContact(&user);

 			if (hContact)

 				setTString(hContact, "MirVer", DoColorCodes(GetWordAddress(mess.c_str(), 1), TRUE, FALSE));

 		}

@@ -1688,7 +1688,7 @@ bool CIrcProto::OnIrc_WHOIS_END(const CIrcMessage* pmsg)
 {

 	if (pmsg->m_bIncoming && pmsg->parameters.getCount() > 1 && m_manualWhoisCount < 1) {

 		CONTACT user = { (TCHAR*)pmsg->parameters[1].c_str(), NULL, NULL, false, false, true };

-		HCONTACT hContact = CList_FindContact(&user);

+		MCONTACT hContact = CList_FindContact(&user);

 		if (hContact)

 			ProtoBroadcastAck(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)1, (LPARAM)WhoisAwayReply.c_str());

 	}

@@ -1767,7 +1767,7 @@ bool CIrcProto::OnIrc_WHOIS_NO_USER(const CIrcMessage* pmsg)
 			m_whoisDlg->ShowMessageNoUser(pmsg);

 

 		CONTACT user = { (TCHAR*)pmsg->parameters[1].c_str(), NULL, NULL, false, false, false };

-		HCONTACT hContact = CList_FindContact(&user);

+		MCONTACT hContact = CList_FindContact(&user);

 		if (hContact) {

 			AddOutgoingMessageToDB(hContact, (TCHAR*)((CMString)_T("> ") + pmsg->parameters[2] + (CMString)_T(": ") + pmsg->parameters[1]).c_str());

 

@@ -1949,7 +1949,7 @@ bool CIrcProto::OnIrc_WHO_END(const CIrcMessage* pmsg)
 			const TCHAR* p1 = UserList;

 			m_whoReply = _T("");

 			CONTACT user = { (TCHAR*)pmsg->parameters[1].c_str(), NULL, NULL, false, true, false };

-			HCONTACT hContact = CList_FindContact(&user);

+			MCONTACT hContact = CList_FindContact(&user);

 

 			if (hContact && getByte(hContact, "AdvancedMode", 0) == 1) {

 				ptrT DBHost(getTStringA(hContact, "UHost"));

@@ -2118,7 +2118,7 @@ bool CIrcProto::OnIrc_USERHOST_REPLY(const CIrcMessage* pmsg)
 						finduser.host = (TCHAR*)host.c_str();

 						finduser.user = (TCHAR*)user.c_str();

 

-						HCONTACT hContact = CList_FindContact(&finduser);

+						MCONTACT hContact = CList_FindContact(&finduser);

 						if (hContact && getByte(hContact, "AdvancedMode", 0) == 0) {

 							setWord(hContact, "Status", awaystatus == '-' ? ID_STATUS_AWAY : ID_STATUS_ONLINE);

 							setTString(hContact, "User", user.c_str());

diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp
index fbc43f7cec..1ad5c203bf 100644
--- a/protocols/IRCG/src/input.cpp
+++ b/protocols/IRCG/src/input.cpp
@@ -212,7 +212,7 @@ static void __stdcall sttSetTimerOff(void* _pro)
 	ppro->KillChatTimer(ppro->OnlineNotifTimer3);

 }

 

-BOOL CIrcProto::DoHardcodedCommand(CMString text, TCHAR* window, HCONTACT hContact)

+BOOL CIrcProto::DoHardcodedCommand(CMString text, TCHAR* window, MCONTACT hContact)

 {

 	TCHAR temp[30];

 	lstrcpyn(temp, GetWord(text.c_str(), 0).c_str(), 29);

@@ -555,7 +555,7 @@ BOOL CIrcProto::DoHardcodedCommand(CMString text, TCHAR* window, HCONTACT hConta
 			return true;

 

 		CONTACT user = { (TCHAR*)one.c_str(), NULL, NULL, false, false, false };

-		HCONTACT hContact2 = CList_AddContact(&user, false, false);

+		MCONTACT hContact2 = CList_AddContact(&user, false, false);

 		if (hContact2) {

 			if (getByte(hContact, "AdvancedMode", 0) == 0)

 				DoUserhostWithReason(1, (_T("S") + one).c_str(), true, one.c_str());

@@ -628,7 +628,7 @@ BOOL CIrcProto::DoHardcodedCommand(CMString text, TCHAR* window, HCONTACT hConta
 

 			if (ulAdr) {

 				CONTACT user = { (TCHAR*)two.c_str(), NULL, NULL, false, false, true };

-				HCONTACT hContact = CList_AddContact(&user, false, false);

+				MCONTACT hContact = CList_AddContact(&user, false, false);

 				if (hContact) {

 					CMString s;

 

@@ -679,7 +679,7 @@ BOOL CIrcProto::DoHardcodedCommand(CMString text, TCHAR* window, HCONTACT hConta
 			if (ulAdr) {

 				CMString contact = two;  contact += _T(DCCSTRING);

 				CONTACT user = { (TCHAR*)contact.c_str(), NULL, NULL, false, false, true };

-				HCONTACT hContact = CList_AddContact(&user, false, false);

+				MCONTACT hContact = CList_AddContact(&user, false, false);

 				setByte(hContact, "DCC", 1);

 

 				int iPort = 0;

@@ -805,7 +805,7 @@ bool CIrcProto::PostIrcMessage(const TCHAR* fmt, ...)
 	return PostIrcMessageWnd(NULL, NULL, szBuf);

 }

 

-bool CIrcProto::PostIrcMessageWnd(TCHAR* window, HCONTACT hContact, const TCHAR* szBuf)

+bool CIrcProto::PostIrcMessageWnd(TCHAR* window, MCONTACT hContact, const TCHAR* szBuf)

 {

 	DBVARIANT dbv;

 	TCHAR windowname[256];

diff --git a/protocols/IRCG/src/irc.h b/protocols/IRCG/src/irc.h
index 6a024ad099..bb6f6d7a70 100644
--- a/protocols/IRCG/src/irc.h
+++ b/protocols/IRCG/src/irc.h
@@ -214,23 +214,23 @@ struct CIrcProto : public PROTO<CIrcProto>
 

 				// Protocol interface

 

-	virtual	HCONTACT  __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr );

-	virtual	HCONTACT  __cdecl AddToListByEvent( int flags, int iContact, HANDLE hDbEvent );

+	virtual	MCONTACT  __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr );

+	virtual	MCONTACT  __cdecl AddToListByEvent( int flags, int iContact, HANDLE hDbEvent );

 

 	virtual	int       __cdecl Authorize(HANDLE hDbEvent);

 	virtual	int       __cdecl AuthDeny(HANDLE hDbEvent, const TCHAR* szReason);

-	virtual	int       __cdecl AuthRecv(HCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl AuthRequest(HCONTACT hContact, const TCHAR *szMessage);

+	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const TCHAR *szMessage);

 

 	virtual	HANDLE    __cdecl ChangeInfo( int iInfoType, void *pInfoData);

 

-	virtual	HANDLE    __cdecl FileAllow(HCONTACT hContact, HANDLE hTransfer, const TCHAR *szPath);

-	virtual	int       __cdecl FileCancel(HCONTACT hContact, HANDLE hTransfer );

-	virtual	int       __cdecl FileDeny(HCONTACT hContact, HANDLE hTransfer, const TCHAR *szReason);

+	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR *szPath);

+	virtual	int       __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer );

+	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR *szReason);

 	virtual	int       __cdecl FileResume( HANDLE hTransfer, int *action, const TCHAR **szFilename);

 

-	virtual	DWORD_PTR __cdecl GetCaps( int type, HCONTACT hContact = NULL);

-	virtual	int       __cdecl GetInfo(HCONTACT hContact, int infoType);

+	virtual	DWORD_PTR __cdecl GetCaps( int type, MCONTACT hContact = NULL);

+	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType);

 

 	virtual	HANDLE    __cdecl SearchBasic(const PROTOCHAR* id);

 	virtual	HANDLE    __cdecl SearchByEmail(const PROTOCHAR* email);

@@ -238,24 +238,24 @@ struct CIrcProto : public PROTO<CIrcProto>
 	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

 	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

-	virtual	int       __cdecl RecvContacts(HCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvFile(HCONTACT hContact, PROTORECVFILET*);

-	virtual	int       __cdecl RecvMsg(HCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvUrl(HCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*);

+	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);

 

-	virtual	int       __cdecl SendContacts(HCONTACT hContact, int flags, int nContacts, HCONTACT *hContactsList);

-	virtual	HANDLE    __cdecl SendFile(HCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles);

-	virtual	int       __cdecl SendMsg(HCONTACT hContact, int flags, const char* msg);

-	virtual	int       __cdecl SendUrl(HCONTACT hContact, int flags, const char* url);

+	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

+	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles);

+	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);

+	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char* url);

 

-	virtual	int       __cdecl SetApparentMode(HCONTACT hContact, int mode);

+	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);

 	virtual	int       __cdecl SetStatus(int iNewStatus);

 

-	virtual	HANDLE    __cdecl GetAwayMsg(HCONTACT hContact);

-	virtual	int       __cdecl RecvAwayMsg(HCONTACT hContact, int mode, PROTORECVEVENT *evt);

+	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

+	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT *evt);

 	virtual	int       __cdecl SetAwayMsg(int m_iStatus, const TCHAR *msg);

 

-	virtual	int       __cdecl UserIsTyping(HCONTACT hContact, int type);

+	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type);

 

 	virtual	int       __cdecl OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam);

 

@@ -389,18 +389,18 @@ struct CIrcProto : public PROTO<CIrcProto>
 	CDlgBase::CreateParam OptCreateAccount, OptCreateConn, OptCreateIgnore, OptCreateOther;

 

 	//clist.cpp

-	HCONTACT CList_AddContact(CONTACT *user, bool InList, bool SetOnline);

+	MCONTACT CList_AddContact(CONTACT *user, bool InList, bool SetOnline);

 	bool     CList_SetAllOffline(BYTE ChatsToo);

-	HCONTACT CList_SetOffline(CONTACT *user);

+	MCONTACT CList_SetOffline(CONTACT *user);

 

 	bool     CList_AddEvent(CONTACT *user, HICON Icon, HANDLE event, const char *tooltip, int type ) ;

-	HCONTACT CList_FindContact(CONTACT *user);

+	MCONTACT CList_FindContact(CONTACT *user);

 	BOOL     CList_AddDCCChat(const CMString &name, const CMString &hostmask, unsigned long adr, int port) ;

 

 	//commandmonitor.cpp

 	UINT_PTR IdentTimer, InitTimer, KeepAliveTimer, OnlineNotifTimer, OnlineNotifTimer3;

 

-	int  AddOutgoingMessageToDB(HCONTACT hContact, TCHAR *msg);

+	int  AddOutgoingMessageToDB(MCONTACT hContact, TCHAR *msg);

 	bool DoOnConnect(const CIrcMessage *pmsg);

 	int  DoPerform(const char *event);

 	void __cdecl ResolveIPThread(void *di);

@@ -412,10 +412,10 @@ struct CIrcProto : public PROTO<CIrcProto>
 

 	//input.cpp

 	CMString DoAlias( const TCHAR *text, TCHAR *window);

-	BOOL     DoHardcodedCommand(CMString text, TCHAR *window, HCONTACT hContact);

+	BOOL     DoHardcodedCommand(CMString text, TCHAR *window, MCONTACT hContact);

 	CMString DoIdentifiers(CMString text, const TCHAR *window);

 	void     FormatMsg(CMString &text);

-	bool     PostIrcMessageWnd(TCHAR *pszWindow, HCONTACT hContact, const TCHAR *szBuf);

+	bool     PostIrcMessageWnd(TCHAR *pszWindow, MCONTACT hContact, const TCHAR *szBuf);

 	bool     PostIrcMessage(const TCHAR *fmt, ...);

 

 	// irclib.cpp

@@ -501,12 +501,12 @@ struct CIrcProto : public PROTO<CIrcProto>
 	////////////////////////////////////////////////////////////////////////////////////////

 	// former CIrcSession class

 

-	void AddDCCSession(HCONTACT hContact, CDccSession* dcc);

+	void AddDCCSession(MCONTACT hContact, CDccSession* dcc);

 	void AddDCCSession(DCCINFO*  pdci, CDccSession* dcc);

-	void RemoveDCCSession(HCONTACT hContact);

+	void RemoveDCCSession(MCONTACT hContact);

 	void RemoveDCCSession(DCCINFO*  pdci);

 

-	CDccSession* FindDCCSession(HCONTACT hContact);

+	CDccSession* FindDCCSession(MCONTACT hContact);

 	CDccSession* FindDCCSession(DCCINFO* pdci);

 	CDccSession* FindDCCSendByPort(int iPort);

 	CDccSession* FindDCCRecvByPortAndName(int iPort, const TCHAR* szName);

diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp
index b1e97a4212..901834c7e1 100644
--- a/protocols/IRCG/src/irclib.cpp
+++ b/protocols/IRCG/src/irclib.cpp
@@ -457,7 +457,7 @@ void __cdecl CIrcProto::ThreadProc(void*)
 	m_info.Reset();

 }

 

-void CIrcProto::AddDCCSession(HCONTACT, CDccSession* dcc)

+void CIrcProto::AddDCCSession(MCONTACT, CDccSession* dcc)

 {

 	EnterCriticalSection(&m_dcc);

 

@@ -479,7 +479,7 @@ void CIrcProto::AddDCCSession(DCCINFO*, CDccSession* dcc)
 	LeaveCriticalSection(&m_dcc);

 }

 

-void CIrcProto::RemoveDCCSession(HCONTACT hContact)

+void CIrcProto::RemoveDCCSession(MCONTACT hContact)

 {

 	EnterCriticalSection(&m_dcc);

 

@@ -505,7 +505,7 @@ void CIrcProto::RemoveDCCSession(DCCINFO* pdci)
 	LeaveCriticalSection(&m_dcc);

 }

 

-CDccSession* CIrcProto::FindDCCSession(HCONTACT hContact)

+CDccSession* CIrcProto::FindDCCSession(MCONTACT hContact)

 {

 	EnterCriticalSection(&m_dcc);

 

diff --git a/protocols/IRCG/src/irclib.h b/protocols/IRCG/src/irclib.h
index d0efcd6fcf..4fc6c9bff5 100644
--- a/protocols/IRCG/src/irclib.h
+++ b/protocols/IRCG/src/irclib.h
@@ -48,7 +48,7 @@ struct DCCINFO : public MZeroedObject
 	CMString sFile;

 	CMString sFileAndPath;

 	CMString sHostmask;

-	HCONTACT hContact;

+	MCONTACT hContact;

 	CMString sContactName;

 };

 

diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index a74fe449da..de66eb369b 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -318,7 +318,7 @@ int CIrcProto::OnModulesLoaded(WPARAM, LPARAM)
 ////////////////////////////////////////////////////////////////////////////////////////

 // AddToList - adds a contact to the contact list

 

-HCONTACT __cdecl CIrcProto::AddToList(int, PROTOSEARCHRESULT* psr)

+MCONTACT __cdecl CIrcProto::AddToList(int, PROTOSEARCHRESULT* psr)

 {

 	if (m_iStatus == ID_STATUS_OFFLINE || m_iStatus == ID_STATUS_CONNECTING)

 		return 0;

@@ -327,7 +327,7 @@ HCONTACT __cdecl CIrcProto::AddToList(int, PROTOSEARCHRESULT* psr)
 	id = psr->flags & PSR_UNICODE ? mir_u2t((wchar_t*)id) : mir_a2t((char*)id);

 

 	CONTACT user = { id, NULL, NULL, true, false, false };

-	HCONTACT hContact = CList_AddContact(&user, true, false);

+	MCONTACT hContact = CList_AddContact(&user, true, false);

 

 	if (hContact) {

 		DBVARIANT dbv1;

@@ -359,7 +359,7 @@ HCONTACT __cdecl CIrcProto::AddToList(int, PROTOSEARCHRESULT* psr)
 ////////////////////////////////////////////////////////////////////////////////////////

 // AddToList - adds a contact to the contact list

 

-HCONTACT __cdecl CIrcProto::AddToListByEvent(int, int, HANDLE)

+MCONTACT __cdecl CIrcProto::AddToListByEvent(int, int, HANDLE)

 {

 	return NULL;

 }

@@ -383,7 +383,7 @@ int __cdecl CIrcProto::AuthDeny(HANDLE, const TCHAR*)
 ////////////////////////////////////////////////////////////////////////////////////////

 // PSR_AUTH

 

-int __cdecl CIrcProto::AuthRecv(HCONTACT, PROTORECVEVENT*)

+int __cdecl CIrcProto::AuthRecv(MCONTACT, PROTORECVEVENT*)

 {

 	return 1;

 }

@@ -391,7 +391,7 @@ int __cdecl CIrcProto::AuthRecv(HCONTACT, PROTORECVEVENT*)
 ////////////////////////////////////////////////////////////////////////////////////////

 // PSS_AUTHREQUEST

 

-int __cdecl CIrcProto::AuthRequest(HCONTACT, const TCHAR*)

+int __cdecl CIrcProto::AuthRequest(MCONTACT, const TCHAR*)

 {

 	return 1;

 }

@@ -407,7 +407,7 @@ HANDLE __cdecl CIrcProto::ChangeInfo(int, void*)
 ////////////////////////////////////////////////////////////////////////////////////////

 // FileAllow - starts a file transfer

 

-HANDLE __cdecl CIrcProto::FileAllow(HCONTACT, HANDLE hTransfer, const TCHAR* szPath)

+HANDLE __cdecl CIrcProto::FileAllow(MCONTACT, HANDLE hTransfer, const TCHAR* szPath)

 {

 	DCCINFO* di = (DCCINFO*)hTransfer;

 

@@ -428,7 +428,7 @@ HANDLE __cdecl CIrcProto::FileAllow(HCONTACT, HANDLE hTransfer, const TCHAR* szP
 ////////////////////////////////////////////////////////////////////////////////////////

 // FileCancel - cancels a file transfer

 

-int __cdecl CIrcProto::FileCancel(HCONTACT, HANDLE hTransfer)

+int __cdecl CIrcProto::FileCancel(MCONTACT, HANDLE hTransfer)

 {

 	DCCINFO* di = (DCCINFO*)hTransfer;

 

@@ -444,7 +444,7 @@ int __cdecl CIrcProto::FileCancel(HCONTACT, HANDLE hTransfer)
 ////////////////////////////////////////////////////////////////////////////////////////

 // FileDeny - denies a file transfer

 

-int __cdecl CIrcProto::FileDeny(HCONTACT, HANDLE hTransfer, const TCHAR*)

+int __cdecl CIrcProto::FileDeny(MCONTACT, HANDLE hTransfer, const TCHAR*)

 {

 	DCCINFO* di = (DCCINFO*)hTransfer;

 	delete di;

@@ -500,7 +500,7 @@ int __cdecl CIrcProto::FileResume(HANDLE hTransfer, int* action, const TCHAR** s
 ////////////////////////////////////////////////////////////////////////////////////////

 // GetCaps - return protocol capabilities bits

 

-DWORD_PTR __cdecl CIrcProto::GetCaps(int type, HCONTACT)

+DWORD_PTR __cdecl CIrcProto::GetCaps(int type, MCONTACT)

 {

 	switch (type) {

 	case PFLAGNUM_1:

@@ -531,7 +531,7 @@ DWORD_PTR __cdecl CIrcProto::GetCaps(int type, HCONTACT)
 ////////////////////////////////////////////////////////////////////////////////////////

 // GetInfo - retrieves a contact info

 

-int __cdecl CIrcProto::GetInfo(HCONTACT, int)

+int __cdecl CIrcProto::GetInfo(MCONTACT, int)

 {

 	return 1;

 }

@@ -599,7 +599,7 @@ HWND __cdecl CIrcProto::SearchAdvanced(HWND)
 ////////////////////////////////////////////////////////////////////////////////////////

 // RecvContacts

 

-int __cdecl CIrcProto::RecvContacts(HCONTACT, PROTORECVEVENT*)

+int __cdecl CIrcProto::RecvContacts(MCONTACT, PROTORECVEVENT*)

 {

 	return 1;

 }

@@ -607,7 +607,7 @@ int __cdecl CIrcProto::RecvContacts(HCONTACT, PROTORECVEVENT*)
 ////////////////////////////////////////////////////////////////////////////////////////

 // RecvFile

 

-int __cdecl CIrcProto::RecvFile(HCONTACT hContact, PROTORECVFILET* evt)

+int __cdecl CIrcProto::RecvFile(MCONTACT hContact, PROTORECVFILET* evt)

 {

 	return Proto_RecvFile(hContact, evt);

 }

@@ -615,7 +615,7 @@ int __cdecl CIrcProto::RecvFile(HCONTACT hContact, PROTORECVFILET* evt)
 ////////////////////////////////////////////////////////////////////////////////////////

 // RecvMsg

 

-int __cdecl CIrcProto::RecvMsg(HCONTACT hContact, PROTORECVEVENT* evt)

+int __cdecl CIrcProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* evt)

 {

 	return Proto_RecvMessage(hContact, evt);

 }

@@ -623,7 +623,7 @@ int __cdecl CIrcProto::RecvMsg(HCONTACT hContact, PROTORECVEVENT* evt)
 ////////////////////////////////////////////////////////////////////////////////////////

 // RecvUrl

 

-int __cdecl CIrcProto::RecvUrl(HCONTACT, PROTORECVEVENT*)

+int __cdecl CIrcProto::RecvUrl(MCONTACT, PROTORECVEVENT*)

 {

 	return 1;

 }

@@ -631,7 +631,7 @@ int __cdecl CIrcProto::RecvUrl(HCONTACT, PROTORECVEVENT*)
 ////////////////////////////////////////////////////////////////////////////////////////

 // SendContacts

 

-int __cdecl CIrcProto::SendContacts(HCONTACT, int, int, HCONTACT*)

+int __cdecl CIrcProto::SendContacts(MCONTACT, int, int, MCONTACT*)

 {

 	return 1;

 }

@@ -639,7 +639,7 @@ int __cdecl CIrcProto::SendContacts(HCONTACT, int, int, HCONTACT*)
 ////////////////////////////////////////////////////////////////////////////////////////

 // SendFile - sends a file

 

-HANDLE __cdecl CIrcProto::SendFile(HCONTACT hContact, const TCHAR*, TCHAR** ppszFiles)

+HANDLE __cdecl CIrcProto::SendFile(MCONTACT hContact, const TCHAR*, TCHAR** ppszFiles)

 {

 	DCCINFO* dci = NULL;

 	int iPort = 0;

@@ -780,22 +780,22 @@ HANDLE __cdecl CIrcProto::SendFile(HCONTACT hContact, const TCHAR*, TCHAR** ppsz
 

 struct TFakeAckParam

 {

-	__inline TFakeAckParam(HCONTACT _hContact, int _msgid) :

+	__inline TFakeAckParam(MCONTACT _hContact, int _msgid) :

 		hContact(_hContact), msgid(_msgid)

 		{}

 

-	HCONTACT hContact;

+	MCONTACT hContact;

 	int    msgid;

 };

 

 void __cdecl CIrcProto::AckMessageFail(void *info)

 {

-	ProtoBroadcastAck((HCONTACT)info, ACKTYPE_MESSAGE, ACKRESULT_FAILED, NULL, (LPARAM)Translate("The protocol is not online"));

+	ProtoBroadcastAck((MCONTACT)info, ACKTYPE_MESSAGE, ACKRESULT_FAILED, NULL, (LPARAM)Translate("The protocol is not online"));

 }

 

 void __cdecl CIrcProto::AckMessageFailDcc(void *info)

 {

-	ProtoBroadcastAck((HCONTACT)info, ACKTYPE_MESSAGE, ACKRESULT_FAILED, NULL, (LPARAM)Translate("The dcc chat connection is not active"));

+	ProtoBroadcastAck((MCONTACT)info, ACKTYPE_MESSAGE, ACKRESULT_FAILED, NULL, (LPARAM)Translate("The dcc chat connection is not active"));

 }

 

 void __cdecl CIrcProto::AckMessageSuccess(void *info)

@@ -805,7 +805,7 @@ void __cdecl CIrcProto::AckMessageSuccess(void *info)
 	delete param;

 }

 

-int __cdecl CIrcProto::SendMsg(HCONTACT hContact, int flags, const char* pszSrc)

+int __cdecl CIrcProto::SendMsg(MCONTACT hContact, int flags, const char* pszSrc)

 {

 	BYTE bDcc = getByte(hContact, "DCC", 0);

 	WORD wStatus = getWord(hContact, "Status", ID_STATUS_OFFLINE);

@@ -846,7 +846,7 @@ int __cdecl CIrcProto::SendMsg(HCONTACT hContact, int flags, const char* pszSrc)
 ////////////////////////////////////////////////////////////////////////////////////////

 // SendUrl

 

-int __cdecl CIrcProto::SendUrl(HCONTACT, int, const char*)

+int __cdecl CIrcProto::SendUrl(MCONTACT, int, const char*)

 {

 	return 1;

 }

@@ -854,7 +854,7 @@ int __cdecl CIrcProto::SendUrl(HCONTACT, int, const char*)
 ////////////////////////////////////////////////////////////////////////////////////////

 // SetApparentMode - sets the visibility status

 

-int __cdecl CIrcProto::SetApparentMode(HCONTACT, int)

+int __cdecl CIrcProto::SetApparentMode(MCONTACT, int)

 {

 	return 0;

 }

@@ -936,7 +936,7 @@ int CIrcProto::SetStatusInternal(int iNewStatus, bool bIsInternal)
 ////////////////////////////////////////////////////////////////////////////////////////

 // GetAwayMsg - returns a contact's away message

 

-HANDLE __cdecl CIrcProto::GetAwayMsg(HCONTACT hContact)

+HANDLE __cdecl CIrcProto::GetAwayMsg(MCONTACT hContact)

 {

 	WhoisAwayReply = _T("");

 	DBVARIANT dbv;

@@ -963,7 +963,7 @@ HANDLE __cdecl CIrcProto::GetAwayMsg(HCONTACT hContact)
 ////////////////////////////////////////////////////////////////////////////////////////

 // PSR_AWAYMSG

 

-int __cdecl CIrcProto::RecvAwayMsg(HCONTACT, int, PROTORECVEVENT*)

+int __cdecl CIrcProto::RecvAwayMsg(MCONTACT, int, PROTORECVEVENT*)

 {

 	return 1;

 }

@@ -998,7 +998,7 @@ int __cdecl CIrcProto::SetAwayMsg(int status, const TCHAR* msg)
 /////////////////////////////////////////////////////////////////////////////////////////

 // UserIsTyping - sends a UTN notification

 

-int __cdecl CIrcProto::UserIsTyping(HCONTACT, int)

+int __cdecl CIrcProto::UserIsTyping(MCONTACT, int)

 {

 	return 0;

 }

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index 8e82c02da0..647ece9070 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -90,7 +90,7 @@ void CIrcProto::InitMainMenus(void)
 static HGENMENU hUMenuChanSettings, hUMenuWhois, hUMenuDisconnect, hUMenuIgnore;

 static HANDLE hMenuChanSettings, hMenuWhois, hMenuDisconnect, hMenuIgnore;

 

-static CIrcProto* IrcGetInstanceByHContact(HCONTACT hContact)

+static CIrcProto* IrcGetInstanceByHContact(MCONTACT hContact)

 {

 	char* szProto = GetContactProto(hContact);

 	if (szProto == NULL)

@@ -105,25 +105,25 @@ static CIrcProto* IrcGetInstanceByHContact(HCONTACT hContact)
 

 static INT_PTR IrcMenuChanSettings(WPARAM wParam, LPARAM lParam)

 {

-	CIrcProto *ppro = IrcGetInstanceByHContact((HCONTACT)wParam);

+	CIrcProto *ppro = IrcGetInstanceByHContact((MCONTACT)wParam);

 	return (ppro) ? ppro->OnMenuChanSettings(wParam, lParam) : 0;

 }

 

 static INT_PTR IrcMenuWhois(WPARAM wParam, LPARAM lParam)

 {

-	CIrcProto *ppro = IrcGetInstanceByHContact((HCONTACT)wParam);

+	CIrcProto *ppro = IrcGetInstanceByHContact((MCONTACT)wParam);

 	return (ppro) ? ppro->OnMenuWhois(wParam, lParam) : 0;

 }

 

 static INT_PTR IrcMenuDisconnect(WPARAM wParam, LPARAM lParam)

 {

-	CIrcProto *ppro = IrcGetInstanceByHContact((HCONTACT)wParam);

+	CIrcProto *ppro = IrcGetInstanceByHContact((MCONTACT)wParam);

 	return (ppro) ? ppro->OnMenuDisconnect(wParam, lParam) : 0;

 }

 

 static INT_PTR IrcMenuIgnore(WPARAM wParam, LPARAM lParam)

 {

-	CIrcProto *ppro = IrcGetInstanceByHContact((HCONTACT)wParam);

+	CIrcProto *ppro = IrcGetInstanceByHContact((MCONTACT)wParam);

 	return (ppro) ? ppro->OnMenuIgnore(wParam, lParam) : 0;

 }

 

@@ -134,7 +134,7 @@ int IrcPrebuildContactMenu(WPARAM wParam, LPARAM lParam)
 	Menu_ShowItem(hUMenuDisconnect, false);

 	Menu_ShowItem(hUMenuIgnore, false);

 

-	CIrcProto *ppro = IrcGetInstanceByHContact((HCONTACT)wParam);

+	CIrcProto *ppro = IrcGetInstanceByHContact((MCONTACT)wParam);

 	return (ppro) ? ppro->OnMenuPreBuild(wParam, lParam) : 0;

 }

 

@@ -213,7 +213,7 @@ INT_PTR __cdecl CIrcProto::OnDoubleclicked(WPARAM, LPARAM lParam)
 

 int __cdecl CIrcProto::OnContactDeleted(WPARAM wp, LPARAM)

 {

-	HCONTACT hContact = (HCONTACT)wp;

+	MCONTACT hContact = (MCONTACT)wp;

 	if (!hContact)

 		return 0;

 

@@ -233,9 +233,9 @@ int __cdecl CIrcProto::OnContactDeleted(WPARAM wp, LPARAM)
 				PostIrcMessage(_T("/PART %s %s"), dbv.ptszVal, m_userInfo);

 		}

 		else {

-			BYTE bDCC = getByte((HCONTACT)wp, "DCC", 0);

+			BYTE bDCC = getByte((MCONTACT)wp, "DCC", 0);

 			if (bDCC) {

-				CDccSession* dcc = FindDCCSession((HCONTACT)wp);

+				CDccSession* dcc = FindDCCSession((MCONTACT)wp);

 				if (dcc)

 					dcc->Disconnect();

 			}

@@ -252,8 +252,8 @@ INT_PTR __cdecl CIrcProto::OnJoinChat(WPARAM wp, LPARAM)
 		return 0;

 

 	DBVARIANT dbv;

-	if (!getTString((HCONTACT)wp, "Nick", &dbv)) {

-		if (getByte((HCONTACT)wp, "ChatRoom", 0) == GCW_CHATROOM)

+	if (!getTString((MCONTACT)wp, "Nick", &dbv)) {

+		if (getByte((MCONTACT)wp, "ChatRoom", 0) == GCW_CHATROOM)

 			PostIrcMessage(_T("/JOIN %s"), dbv.ptszVal);

 		db_free(&dbv);

 	}

@@ -266,8 +266,8 @@ INT_PTR __cdecl CIrcProto::OnLeaveChat(WPARAM wp, LPARAM)
 		return 0;

 

 	DBVARIANT dbv;

-	if (!getTString((HCONTACT)wp, "Nick", &dbv)) {

-		if (getByte((HCONTACT)wp, "ChatRoom", 0) == GCW_CHATROOM) {

+	if (!getTString((MCONTACT)wp, "Nick", &dbv)) {

+		if (getByte((MCONTACT)wp, "ChatRoom", 0) == GCW_CHATROOM) {

 			PostIrcMessage(_T("/PART %s %s"), dbv.ptszVal, m_userInfo);

 

 			CMString S = MakeWndID(dbv.ptszVal);

@@ -285,7 +285,7 @@ INT_PTR __cdecl CIrcProto::OnMenuChanSettings(WPARAM wp, LPARAM)
 	if (!wp)

 		return 0;

 

-	HCONTACT hContact = (HCONTACT)wp;

+	MCONTACT hContact = (MCONTACT)wp;

 	DBVARIANT dbv;

 	if (!getTString(hContact, "Nick", &dbv)) {

 		PostIrcMessageWnd(dbv.ptszVal, NULL, _T("/CHANNELMANAGER"));

@@ -301,7 +301,7 @@ INT_PTR __cdecl CIrcProto::OnMenuWhois(WPARAM wp, LPARAM)
 

 	DBVARIANT dbv;

 

-	if (!getTString((HCONTACT)wp, "Nick", &dbv)) {

+	if (!getTString((MCONTACT)wp, "Nick", &dbv)) {

 		PostIrcMessage(_T("/WHOIS %s %s"), dbv.ptszVal, dbv.ptszVal);

 		db_free(&dbv);

 	}

@@ -310,7 +310,7 @@ INT_PTR __cdecl CIrcProto::OnMenuWhois(WPARAM wp, LPARAM)
 

 INT_PTR __cdecl CIrcProto::OnMenuDisconnect(WPARAM wp, LPARAM)

 {

-	CDccSession* dcc = FindDCCSession((HCONTACT)wp);

+	CDccSession* dcc = FindDCCSession((MCONTACT)wp);

 	if (dcc)

 		dcc->Disconnect();

 	return 0;

@@ -321,7 +321,7 @@ INT_PTR __cdecl CIrcProto::OnMenuIgnore(WPARAM wp, LPARAM)
 	if (!wp)

 		return 0;

 

-	HCONTACT hContact = (HCONTACT)wp;

+	MCONTACT hContact = (MCONTACT)wp;

 	DBVARIANT dbv;

 	if (!getTString(hContact, "Nick", &dbv)) {

 		if (!isChatRoom(hContact)) {

@@ -865,7 +865,7 @@ int __cdecl CIrcProto::GCMenuHook(WPARAM, LPARAM lParam)
 

 			if (gcmi->Type == MENU_ON_NICKLIST) {

 				CONTACT user = { (TCHAR*)gcmi->pszUID, NULL, NULL, false, false, false };

-				HCONTACT hContact = CList_FindContact(&user);

+				MCONTACT hContact = CList_FindContact(&user);

 

 				gcmi->nItems = SIZEOF(nickItems);

 				gcmi->Item = nickItems;

@@ -934,7 +934,7 @@ int __cdecl CIrcProto::OnPreShutdown(WPARAM, LPARAM)
 int __cdecl CIrcProto::OnMenuPreBuild(WPARAM wParam, LPARAM)

 {

 	DBVARIANT dbv;

-	HCONTACT hContact = (HCONTACT)wParam;

+	MCONTACT hContact = (MCONTACT)wParam;

 	if (hContact == NULL)

 		return 0;

 

@@ -978,7 +978,7 @@ int __cdecl CIrcProto::OnMenuPreBuild(WPARAM wParam, LPARAM)
 

 int __cdecl CIrcProto::OnDbSettingChanged(WPARAM wParam, LPARAM lParam)

 {

-	HCONTACT hContact = (HCONTACT)wParam;

+	MCONTACT hContact = (MCONTACT)wParam;

 	if (hContact == NULL || !IsConnected())

 		return 0;

 

diff --git a/protocols/IRCG/src/ui_utils.cpp b/protocols/IRCG/src/ui_utils.cpp
index a62a7fbc5d..feb85074f1 100644
--- a/protocols/IRCG/src/ui_utils.cpp
+++ b/protocols/IRCG/src/ui_utils.cpp
@@ -629,7 +629,7 @@ BOOL CCtrlClc::OnNotify(int, NMHDR *pnmh)
 	return FALSE;

 }

 

-void CCtrlClc::AddContact(HCONTACT hContact)

+void CCtrlClc::AddContact(MCONTACT hContact)

 {	SendMessage(m_hwnd, CLM_ADDCONTACT, (WPARAM)hContact, 0);

 }

 

@@ -661,7 +661,7 @@ void CCtrlClc::Expand(HANDLE hItem, DWORD flags)
 {	SendMessage(m_hwnd, CLM_EXPAND, (WPARAM)hItem, flags);

 }

 

-HANDLE CCtrlClc::FindContact(HCONTACT hContact)

+HANDLE CCtrlClc::FindContact(MCONTACT hContact)

 {	return (HANDLE)SendMessage(m_hwnd, CLM_FINDCONTACT, (WPARAM)hContact, 0);

 }

 

diff --git a/protocols/IRCG/src/ui_utils.h b/protocols/IRCG/src/ui_utils.h
index c42ea6a668..ef70439f61 100644
--- a/protocols/IRCG/src/ui_utils.h
+++ b/protocols/IRCG/src/ui_utils.h
@@ -409,7 +409,7 @@ class CCtrlClc: public CCtrlBase
 public:

 	CCtrlClc( CDlgBase* dlg, int ctrlId );

 

-	void AddContact(HCONTACT hContact);

+	void AddContact(MCONTACT hContact);

 	void AddGroup(HANDLE hGroup);

 	void AutoRebuild();

 	void DeleteItem(HANDLE hItem);

@@ -417,7 +417,7 @@ public:
 	void EndEditLabel(bool save);

 	void EnsureVisible(HANDLE hItem, bool partialOk);

 	void Expand(HANDLE hItem, DWORD flags);

-	HANDLE FindContact(HCONTACT hContact);

+	HANDLE FindContact(MCONTACT hContact);

 	HANDLE FindGroup(HANDLE hGroup);

 	COLORREF GetBkColor();

 	bool GetCheck(HANDLE hItem);

diff --git a/protocols/IRCG/src/userinfo.cpp b/protocols/IRCG/src/userinfo.cpp
index dc4a5c8b14..246e6be8e1 100644
--- a/protocols/IRCG/src/userinfo.cpp
+++ b/protocols/IRCG/src/userinfo.cpp
@@ -26,13 +26,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 struct UserDetailsDlgProcParam

 {

-	UserDetailsDlgProcParam(CIrcProto* _pro, HCONTACT _info) :

+	UserDetailsDlgProcParam(CIrcProto* _pro, MCONTACT _info) :

 		ppro(_pro),

 		hContact(_info)

 	{}

 

 	CIrcProto *ppro;

-	HCONTACT hContact;

+	MCONTACT hContact;

 };

 

 #define STR_BASIC LPGEN("Faster! Searches the network for an exact match of the nickname only. The hostmask is optional and provides further security if used. Wildcards (? and *) are allowed.")

@@ -45,7 +45,7 @@ INT_PTR CALLBACK UserDetailsDlgProc(HWND m_hwnd, UINT msg, WPARAM wParam, LPARAM
 	UserDetailsDlgProcParam *p = (UserDetailsDlgProcParam*)GetWindowLongPtr(m_hwnd, GWLP_USERDATA);

 	switch (msg) {

 	case WM_INITDIALOG:

-		p = new UserDetailsDlgProcParam(NULL, (HCONTACT)lParam);

+		p = new UserDetailsDlgProcParam(NULL, (MCONTACT)lParam);

 		SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LPARAM)p);

 		break;

 

@@ -188,7 +188,7 @@ INT_PTR CALLBACK UserDetailsDlgProc(HWND m_hwnd, UINT msg, WPARAM wParam, LPARAM
 

 int __cdecl CIrcProto::OnInitUserInfo(WPARAM wParam, LPARAM lParam)

 {

-	HCONTACT hContact = (HCONTACT)lParam;

+	MCONTACT hContact = (MCONTACT)lParam;

 	char *szProto = GetContactProto(hContact);

 	if (!hContact || !szProto || lstrcmpiA(szProto, m_szModuleName))

 		return 0;