From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 20:47:51 +0000 Subject: HCONTACT is not needed anymore git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IRCG/src/ircproto.cpp | 52 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'protocols/IRCG/src/ircproto.cpp') 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; } -- cgit v1.2.3