From 6b0bc1b4525f8fac9bcda33e602bea02a918156c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 12 Apr 2015 15:43:59 +0000 Subject: compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@12779 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/skype_avatars.cpp | 2 +- protocols/SkypeWeb/src/skype_chatrooms.cpp | 8 +++--- protocols/SkypeWeb/src/skype_proto.cpp | 40 ------------------------------ protocols/SkypeWeb/src/skype_proto.h | 32 +++--------------------- 4 files changed, 9 insertions(+), 73 deletions(-) diff --git a/protocols/SkypeWeb/src/skype_avatars.cpp b/protocols/SkypeWeb/src/skype_avatars.cpp index 3f003b9a5e..d6383878ad 100644 --- a/protocols/SkypeWeb/src/skype_avatars.cpp +++ b/protocols/SkypeWeb/src/skype_avatars.cpp @@ -159,7 +159,7 @@ void CSkypeProto::SetAvatarUrl(MCONTACT hContact, CMString &tszUrl) } } -INT_PTR CSkypeProto::SvcSetMyAvatar(WPARAM wParam, LPARAM lParam) +INT_PTR CSkypeProto::SvcSetMyAvatar(WPARAM, LPARAM lParam) { TCHAR *path = (TCHAR*)lParam; TCHAR avatarPath[MAX_PATH]; diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp index 29be01d500..e3e835ddb1 100644 --- a/protocols/SkypeWeb/src/skype_chatrooms.cpp +++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp @@ -131,7 +131,7 @@ void CSkypeProto::StartChatRoom(MCONTACT hChatRoom, bool showWindow) } -int CSkypeProto::OnGroupChatMenuHook(MCONTACT, LPARAM lParam) +int CSkypeProto::OnGroupChatMenuHook(WPARAM, LPARAM lParam) { GCMENUITEMS *gcmi = (GCMENUITEMS*)lParam; if (stricmp(gcmi->pszModule, m_szModuleName) != 0) @@ -141,7 +141,7 @@ int CSkypeProto::OnGroupChatMenuHook(MCONTACT, LPARAM lParam) return 0; } -INT_PTR CSkypeProto::OnJoinChatRoom(MCONTACT hContact, LPARAM) +INT_PTR CSkypeProto::OnJoinChatRoom(WPARAM hContact, LPARAM) { if (hContact) { @@ -149,7 +149,7 @@ INT_PTR CSkypeProto::OnJoinChatRoom(MCONTACT hContact, LPARAM) return 0; } -INT_PTR CSkypeProto::OnLeaveChatRoom(MCONTACT hContact, LPARAM) +INT_PTR CSkypeProto::OnLeaveChatRoom(WPARAM hContact, LPARAM) { if (hContact) { @@ -167,7 +167,7 @@ void CSkypeProto::OnChatEvent(JSONNODE *node) ptrA from(mir_t2a(ptrT(json_as_string(json_get(node, "from"))))); ptrT composeTime(json_as_string(json_get(node, "composetime"))); - time_t timestamp = IsoToUnixTime(composeTime); + //time_t timestamp = IsoToUnixTime(composeTime); ptrA content(mir_t2a(ptrT(json_as_string(json_get(node, "content"))))); //int emoteOffset = json_as_int(json_get(node, "skypeemoteoffset")); diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp index 4fa7b6adfc..aa041f1019 100644 --- a/protocols/SkypeWeb/src/skype_proto.cpp +++ b/protocols/SkypeWeb/src/skype_proto.cpp @@ -125,56 +125,22 @@ int CSkypeProto::AuthRecv(MCONTACT, PROTORECVEVENT* pre) return Proto_AuthRecv(m_szModuleName, pre); } -int CSkypeProto::AuthRequest(MCONTACT hContact, const PROTOCHAR *szMessage) { return 0; } - -HANDLE CSkypeProto::ChangeInfo(int, void*) { return 0; } - -HANDLE CSkypeProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* tszPath) { return 0; } - -int CSkypeProto::FileCancel(MCONTACT hContact, HANDLE hTransfer) { return 0; } - -int CSkypeProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* tszReason) { return 0; } - -int CSkypeProto::FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** tszFilename) { return 0; } - int CSkypeProto::GetInfo(MCONTACT hContact, int) { PushRequest(new GetProfileRequest(ptrA(getStringA("TokenSecret")), ptrA(db_get_sa(hContact, m_szModuleName, SKYPE_SETTINGS_ID))), &CSkypeProto::LoadProfile); return 0; } -HANDLE CSkypeProto::SearchByEmail(const PROTOCHAR*) { return 0; } - -HANDLE CSkypeProto::SearchByName(const PROTOCHAR*, const PROTOCHAR*, const PROTOCHAR*) { return 0; } - -HWND CSkypeProto::SearchAdvanced(HWND owner) { return 0; } - -HWND CSkypeProto::CreateExtendedSearchUI(HWND owner) { return 0; } - int CSkypeProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre) { return SaveMessageToDb(hContact, pre); } -int CSkypeProto::RecvContacts(MCONTACT, PROTORECVEVENT*) { return 0; } - -int CSkypeProto::RecvFile(MCONTACT hContact, PROTOFILEEVENT *pre) { return 0; } - -int CSkypeProto::RecvUrl(MCONTACT, PROTORECVEVENT*) { return 0; } - -int CSkypeProto::SendContacts(MCONTACT, int, int, MCONTACT*) { return 0; } - -HANDLE CSkypeProto::SendFile(MCONTACT hContact, const PROTOCHAR *szDescription, PROTOCHAR **ppszFiles) { return 0; } - int CSkypeProto::SendMsg(MCONTACT hContact, int flags, const char *msg) { return OnSendMessage(hContact, flags, msg); } -int CSkypeProto::SendUrl(MCONTACT, int, const char*) { return 0; } - -int CSkypeProto::SetApparentMode(MCONTACT, int) { return 0; } - int CSkypeProto::SetStatus(int iNewStatus) { if (iNewStatus == m_iDesiredStatus) @@ -237,12 +203,6 @@ int CSkypeProto::SetStatus(int iNewStatus) return 0; } -HANDLE CSkypeProto::GetAwayMsg(MCONTACT) { return 0; } - -int CSkypeProto::RecvAwayMsg(MCONTACT, int, PROTORECVEVENT*) { return 0; } - -int CSkypeProto::SetAwayMsg(int, const PROTOCHAR *msg) { return 0; } - int CSkypeProto::UserIsTyping(MCONTACT hContact, int type) { ptrA regToken(getStringA("registrationToken")); diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h index 4b43992e03..180bfdc8f2 100644 --- a/protocols/SkypeWeb/src/skype_proto.h +++ b/protocols/SkypeWeb/src/skype_proto.h @@ -42,41 +42,17 @@ public: virtual int __cdecl Authorize(MEVENT hDbEvent); virtual int __cdecl AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason); virtual int __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*); - virtual int __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage); - - virtual HANDLE __cdecl ChangeInfo(int iInfoType, void* pInfoData); - - virtual HANDLE __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* tszPath); - virtual int __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer); - virtual int __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* tszReason); - virtual int __cdecl FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** tszFilename); 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); - virtual HANDLE __cdecl SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName); - virtual HWND __cdecl SearchAdvanced(HWND owner); - virtual HWND __cdecl CreateExtendedSearchUI(HWND owner); - - virtual int __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre); - virtual int __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*); - virtual int __cdecl RecvFile(MCONTACT hContact, PROTOFILEEVENT*); - virtual int __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*); - - virtual int __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList); - virtual HANDLE __cdecl SendFile(MCONTACT hContact, const PROTOCHAR *szDescription, PROTOCHAR **ppszFiles); + + virtual int __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre); 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(MCONTACT hContact, int mode); virtual int __cdecl SetStatus(int iNewStatus); - virtual HANDLE __cdecl GetAwayMsg(MCONTACT hContact); - virtual int __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt); - virtual int __cdecl SetAwayMsg(int iStatus, const PROTOCHAR* msg); - virtual int __cdecl UserIsTyping(MCONTACT hContact, int type); virtual int __cdecl OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam); @@ -243,8 +219,8 @@ private: void StartChatRoom(MCONTACT hChatRoom, bool showWindow = false); - INT_PTR __cdecl OnJoinChatRoom(MCONTACT hContact, LPARAM); - INT_PTR __cdecl OnLeaveChatRoom(MCONTACT hContact, LPARAM); + INT_PTR __cdecl OnJoinChatRoom(WPARAM hContact, LPARAM); + INT_PTR __cdecl OnLeaveChatRoom(WPARAM hContact, LPARAM); void OnChatEvent(JSONNODE *node); -- cgit v1.2.3