From f9c9f7a27456f98ac84f27add1c2aea5bd99a35c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 08:42:33 +0000 Subject: more HCONTACT git-svn-id: http://svn.miranda-ng.org/main/trunk@8079 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/VKontakte/src/vk_proto.cpp | 4 +-- protocols/VKontakte/src/vk_proto.h | 64 +++++++++++++++++------------------ protocols/VKontakte/src/vk_thread.cpp | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) (limited to 'protocols/VKontakte') diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index 2a0bfb0a90..3e52d04e5f 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -273,7 +273,7 @@ HANDLE CVkProto::SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, return 0; } -HANDLE CVkProto::AddToList(int flags, PROTOSEARCHRESULT* psr) +HCONTACT CVkProto::AddToList(int flags, PROTOSEARCHRESULT* psr) { return NULL; } @@ -300,7 +300,7 @@ int CVkProto::UserIsTyping(HCONTACT hContact, int type) return 0; } -HANDLE CVkProto::AddToListByEvent(int flags,int iContact,HANDLE hDbEvent) +HCONTACT CVkProto::AddToListByEvent(int flags,int iContact,HANDLE hDbEvent) { return NULL; } diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h index 7d247b2776..6d5eec5f1a 100644 --- a/protocols/VKontakte/src/vk_proto.h +++ b/protocols/VKontakte/src/vk_proto.h @@ -116,50 +116,50 @@ struct CVkProto : public PROTO // PROTO_INTERFACE //==================================================================================== - virtual HANDLE __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr); - virtual HANDLE __cdecl AddToListByEvent(int flags, int iContact, HANDLE hDbEvent); + virtual HCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr); + virtual HCONTACT __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 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 HANDLE __cdecl ChangeInfo(int iInfoType, void* pInfoData); + 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 int __cdecl FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename); + 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 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 int __cdecl GetInfo(HCONTACT hContact, int infoType); - virtual HANDLE __cdecl SearchBasic(const TCHAR *id); - virtual HANDLE __cdecl SearchByEmail(const TCHAR *email); - virtual HANDLE __cdecl SearchByName(const TCHAR *nick, const TCHAR *firstName, const TCHAR *lastName); - virtual HWND __cdecl SearchAdvanced(HWND owner); - virtual HWND __cdecl CreateExtendedSearchUI(HWND owner); + virtual HANDLE __cdecl SearchBasic(const TCHAR *id); + virtual HANDLE __cdecl SearchByEmail(const TCHAR *email); + virtual HANDLE __cdecl SearchByName(const TCHAR *nick, const TCHAR *firstName, const TCHAR *lastName); + 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(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 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(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 SetApparentMode(HCONTACT hContact, int mode); - virtual int __cdecl SetStatus(int iNewStatus); + virtual int __cdecl SetApparentMode(HCONTACT 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 int __cdecl SetAwayMsg(int m_iStatus, const TCHAR *msg); + virtual HANDLE __cdecl GetAwayMsg(HCONTACT hContact); + virtual int __cdecl RecvAwayMsg(HCONTACT 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(HCONTACT hContact, int type); - virtual int __cdecl OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam); + virtual int __cdecl OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam); //==== Events ======================================================================== diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp index cac5aee537..c8d729f540 100644 --- a/protocols/VKontakte/src/vk_thread.cpp +++ b/protocols/VKontakte/src/vk_thread.cpp @@ -313,7 +313,7 @@ void CVkProto::OnReceiveFriends(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq if (bCleanContacts) for (HCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) if (!isChatRoom(hContact)) - arContacts.insert(hContact); + arContacts.insert((HANDLE)hContact); for (int i = 0; (pInfo = json_at(pResponse, i)) != NULL; i++) { ptrT szValue(json_as_string(json_get(pInfo, "uid"))); -- cgit v1.2.3