From c207d9fda896e759a2ffdffc0d46608040c1ac65 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 31 May 2015 19:17:51 +0000 Subject: another bunch of crutches buried in a trash can: PROTOCHAR & PROTOFILEEVENT glory, glory, hallelujah git-svn-id: http://svn.miranda-ng.org/main/trunk@13949 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/src/proto.cpp | 12 +++++------ protocols/AimOscar/src/proto.h | 12 +++++------ protocols/FacebookRM/src/proto.cpp | 12 +++++------ protocols/FacebookRM/src/proto.h | 12 +++++------ protocols/Gadu-Gadu/src/filetransfer.cpp | 12 +++++------ protocols/Gadu-Gadu/src/gg_proto.cpp | 6 +++--- protocols/Gadu-Gadu/src/gg_proto.h | 12 +++++------ protocols/IRCG/src/ircproto.cpp | 4 ++-- protocols/IRCG/src/stdafx.h | 2 +- protocols/IcqOscarJ/src/icq_proto.cpp | 6 +++--- protocols/IcqOscarJ/src/icq_proto.h | 6 +++--- protocols/MSN/src/msn_proto.cpp | 12 +++++------ protocols/MSN/src/msn_proto.h | 12 +++++------ protocols/Sametime/src/files.cpp | 2 +- protocols/Sametime/src/sametime_proto.cpp | 14 ++++++------- protocols/Sametime/src/sametime_proto.h | 18 ++++++++-------- protocols/Sametime/src/sametime_session.cpp | 2 +- protocols/SkypeWeb/src/skype_proto.cpp | 4 ++-- protocols/SkypeWeb/src/skype_proto.h | 6 +++--- protocols/SkypeWeb/src/skype_search.cpp | 2 +- protocols/Tlen/src/tlen.h | 32 ++++++++++++++--------------- protocols/Tlen/src/tlen_svc.cpp | 24 +++++++++++----------- protocols/Tox/src/tox_proto.cpp | 12 +++++------ protocols/Tox/src/tox_proto.h | 18 ++++++++-------- protocols/Tox/src/tox_transfer.cpp | 6 +++--- protocols/VKontakte/src/vk_files.cpp | 4 ++-- protocols/VKontakte/src/vk_proto.cpp | 4 ++-- protocols/VKontakte/src/vk_proto.h | 2 +- protocols/VKontakte/src/vk_search.cpp | 6 +++--- protocols/WhatsApp/src/proto.cpp | 2 +- protocols/WhatsApp/src/proto.h | 2 +- protocols/Yahoo/src/file_transfer.cpp | 8 ++++---- protocols/Yahoo/src/proto.cpp | 2 +- protocols/Yahoo/src/proto.h | 28 ++++++++++++------------- 34 files changed, 159 insertions(+), 159 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/src/proto.cpp b/protocols/AimOscar/src/proto.cpp index c6f52f054a..e12ed362b1 100644 --- a/protocols/AimOscar/src/proto.cpp +++ b/protocols/AimOscar/src/proto.cpp @@ -153,7 +153,7 @@ int __cdecl CAimProto::AuthRequest(MCONTACT hContact, const TCHAR*) //////////////////////////////////////////////////////////////////////////////////////// // FileAllow - starts a file transfer -HANDLE __cdecl CAimProto::FileAllow(MCONTACT, HANDLE hTransfer, const PROTOCHAR* szPath) +HANDLE __cdecl CAimProto::FileAllow(MCONTACT, HANDLE hTransfer, const TCHAR* szPath) { file_transfer *ft = (file_transfer*)hTransfer; if (ft && ft_list.find_by_ft(ft)) @@ -204,7 +204,7 @@ int __cdecl CAimProto::FileCancel(MCONTACT, HANDLE hTransfer) //////////////////////////////////////////////////////////////////////////////////////// // FileDeny - denies a file transfer -int __cdecl CAimProto::FileDeny(MCONTACT, HANDLE hTransfer, const PROTOCHAR* /*szReason*/) +int __cdecl CAimProto::FileDeny(MCONTACT, HANDLE hTransfer, const TCHAR* /*szReason*/) { file_transfer *ft = (file_transfer*)hTransfer; if (!ft_list.find_by_ft(ft)) return 0; @@ -218,7 +218,7 @@ int __cdecl CAimProto::FileDeny(MCONTACT, HANDLE hTransfer, const PROTOCHAR* /*s //////////////////////////////////////////////////////////////////////////////////////// // FileResume - processes file renaming etc -int __cdecl CAimProto::FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename) +int __cdecl CAimProto::FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename) { file_transfer *ft = (file_transfer*)hTransfer; if (!ft_list.find_by_ft(ft)) return 0; @@ -322,7 +322,7 @@ void __cdecl CAimProto::basic_search_ack_success(void* p) mir_free(p); } -HANDLE __cdecl CAimProto::SearchBasic(const PROTOCHAR* szId) +HANDLE __cdecl CAimProto::SearchBasic(const TCHAR* szId) { if (state != 1) return 0; @@ -335,7 +335,7 @@ HANDLE __cdecl CAimProto::SearchBasic(const PROTOCHAR* szId) //////////////////////////////////////////////////////////////////////////////////////// // SearchByEmail - searches the contact by its e-mail -HANDLE __cdecl CAimProto::SearchByEmail(const PROTOCHAR* email) +HANDLE __cdecl CAimProto::SearchByEmail(const TCHAR* email) { // Maximum email size should really be 320, but the char string is limited to 255. if (state != 1 || email == NULL || mir_tstrlen(email) >= 254) @@ -371,7 +371,7 @@ int __cdecl CAimProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre) //////////////////////////////////////////////////////////////////////////////////////// // SendFile - sends a file -HANDLE __cdecl CAimProto::SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles) +HANDLE __cdecl CAimProto::SendFile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** ppszFiles) { if (state != 1) return 0; diff --git a/protocols/AimOscar/src/proto.h b/protocols/AimOscar/src/proto.h index b5e77ed9bc..fc4b9b9c37 100644 --- a/protocols/AimOscar/src/proto.h +++ b/protocols/AimOscar/src/proto.h @@ -32,19 +32,19 @@ struct CAimProto : public PROTO virtual int __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage ); - virtual HANDLE __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath ); + 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 PROTOCHAR* szReason ); - virtual int __cdecl FileResume( HANDLE hTransfer, int* action, const PROTOCHAR** szFilename ); + 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, MCONTACT hContact = NULL ); - virtual HANDLE __cdecl SearchBasic( const PROTOCHAR* id ); - virtual HANDLE __cdecl SearchByEmail( const PROTOCHAR* email ); + virtual HANDLE __cdecl SearchBasic( const TCHAR* id ); + virtual HANDLE __cdecl SearchByEmail( const TCHAR* email ); virtual int __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT* ); - virtual HANDLE __cdecl SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles); + 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 SetStatus( int iNewStatus ); diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index 6f3e29b71c..2f92f63a5c 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -223,7 +223,7 @@ int FacebookProto::SetStatus(int new_status) return 0; } -int FacebookProto::SetAwayMsg(int, const PROTOCHAR *msg) +int FacebookProto::SetAwayMsg(int, const TCHAR *msg) { if (!msg) { last_status_msg_.clear(); @@ -255,7 +255,7 @@ void FacebookProto::SetAwayMsgWorker(void *p) } } -HANDLE FacebookProto::SearchBasic(const PROTOCHAR* id) +HANDLE FacebookProto::SearchBasic(const TCHAR* id) { if (isOffline()) return 0; @@ -265,7 +265,7 @@ HANDLE FacebookProto::SearchBasic(const PROTOCHAR* id) return tid; } -HANDLE FacebookProto::SearchByEmail(const PROTOCHAR* email) +HANDLE FacebookProto::SearchByEmail(const TCHAR* email) { if (isOffline()) return 0; @@ -275,7 +275,7 @@ HANDLE FacebookProto::SearchByEmail(const PROTOCHAR* email) return temail; } -HANDLE FacebookProto::SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName) +HANDLE FacebookProto::SearchByName(const TCHAR* nick, const TCHAR* firstName, const TCHAR* lastName) { TCHAR arg[200]; mir_sntprintf(arg, SIZEOF(arg), _T("%s %s %s"), nick, firstName, lastName); @@ -317,7 +317,7 @@ MCONTACT FacebookProto::AddToList(int flags, PROTOSEARCHRESULT* psr) return hContact; } -int FacebookProto::AuthRequest(MCONTACT hContact, const PROTOCHAR *) +int FacebookProto::AuthRequest(MCONTACT hContact, const TCHAR *) { return RequestFriendship(hContact, NULL); } @@ -334,7 +334,7 @@ int FacebookProto::Authorize(MEVENT hDbEvent) return ApproveFriendship(hContact, NULL); } -int FacebookProto::AuthDeny(MEVENT hDbEvent, const PROTOCHAR *) +int FacebookProto::AuthDeny(MEVENT hDbEvent, const TCHAR *) { if (!hDbEvent || isOffline()) return 1; diff --git a/protocols/FacebookRM/src/proto.h b/protocols/FacebookRM/src/proto.h index f4b4d208de..9ee8f3ab07 100644 --- a/protocols/FacebookRM/src/proto.h +++ b/protocols/FacebookRM/src/proto.h @@ -78,15 +78,15 @@ public: virtual MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr); virtual int __cdecl Authorize(MEVENT hDbEvent); - virtual int __cdecl AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason); - virtual int __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage); + virtual int __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR* szReason); + virtual int __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage); 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 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 int __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*); virtual int __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg); @@ -94,7 +94,7 @@ public: virtual int __cdecl SetStatus(int iNewStatus); virtual HANDLE __cdecl GetAwayMsg(MCONTACT hContact); - virtual int __cdecl SetAwayMsg(int iStatus, const PROTOCHAR* msg); + virtual int __cdecl SetAwayMsg(int iStatus, const TCHAR* msg); virtual int __cdecl UserIsTyping(MCONTACT hContact, int type); diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp index 230784f6c9..23f56f4a5b 100644 --- a/protocols/Gadu-Gadu/src/filetransfer.cpp +++ b/protocols/Gadu-Gadu/src/filetransfer.cpp @@ -658,7 +658,7 @@ void __cdecl GGPROTO::dccmainthread(void*) debugLogA("dccmainthread(): end. DCC Server Thread Ending"); } -HANDLE GGPROTO::dccfileallow(HANDLE hTransfer, const PROTOCHAR* szPath) +HANDLE GGPROTO::dccfileallow(HANDLE hTransfer, const TCHAR* szPath) { struct gg_dcc *dcc = (struct gg_dcc *) hTransfer; char fileName[MAX_PATH], *path = mir_t2a(szPath); @@ -698,7 +698,7 @@ HANDLE GGPROTO::dccfileallow(HANDLE hTransfer, const PROTOCHAR* szPath) return hTransfer; } -HANDLE GGPROTO::dcc7fileallow(HANDLE hTransfer, const PROTOCHAR* szPath) +HANDLE GGPROTO::dcc7fileallow(HANDLE hTransfer, const TCHAR* szPath) { struct gg_dcc7 *dcc7 = (struct gg_dcc7 *) hTransfer; char fileName[MAX_PATH], *path = mir_t2a(szPath); @@ -849,7 +849,7 @@ int GGPROTO::dcc7filecancel(HANDLE hTransfer) //////////////////////////////////////////////////////////// // File receiving allowed -HANDLE GGPROTO::FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath) +HANDLE GGPROTO::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath) { // Check if its proper dcc struct gg_common *c = (struct gg_common *) hTransfer; @@ -881,7 +881,7 @@ int GGPROTO::FileCancel(MCONTACT hContact, HANDLE hTransfer) //////////////////////////////////////////////////////////// // File receiving denied -int GGPROTO::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason) +int GGPROTO::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason) { // Check if its proper dcc struct gg_common *c = (struct gg_common *) hTransfer; @@ -897,7 +897,7 @@ int GGPROTO::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szRe //////////////////////////////////////////////////////////// // Called when received an file -int GGPROTO::RecvFile(MCONTACT hContact, PROTOFILEEVENT* pre) +int GGPROTO::RecvFile(MCONTACT hContact, PROTORECVFILET* pre) { return Proto_RecvFile(hContact, pre); } @@ -905,7 +905,7 @@ int GGPROTO::RecvFile(MCONTACT hContact, PROTOFILEEVENT* pre) //////////////////////////////////////////////////////////// // Called when user sends a file -HANDLE GGPROTO::SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles) +HANDLE GGPROTO::SendFile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** ppszFiles) { char *bslash, *filename; struct gg_dcc *dcc; diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp index 2d0dfd6702..22f4c18ecf 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.cpp +++ b/protocols/Gadu-Gadu/src/gg_proto.cpp @@ -262,7 +262,7 @@ void __cdecl GGPROTO::searchthread(void *) #endif } -HANDLE GGPROTO::SearchBasic(const PROTOCHAR *id) +HANDLE GGPROTO::SearchBasic(const TCHAR *id) { if (!isonline()) return (HANDLE)0; @@ -300,7 +300,7 @@ HANDLE GGPROTO::SearchBasic(const PROTOCHAR *id) ////////////////////////////////////////////////////////// // search by details -HANDLE GGPROTO::SearchByName(const PROTOCHAR *nick, const PROTOCHAR *firstName, const PROTOCHAR *lastName) +HANDLE GGPROTO::SearchByName(const TCHAR *nick, const TCHAR *firstName, const TCHAR *lastName) { // Check if connected and if there's a search data if (!isonline()) @@ -646,7 +646,7 @@ HANDLE GGPROTO::GetAwayMsg(MCONTACT hContact) // when away message is being set // registered as ProtoService PS_SETAWAYMSGT -int GGPROTO::SetAwayMsg(int iStatus, const PROTOCHAR *newMsg) +int GGPROTO::SetAwayMsg(int iStatus, const TCHAR *newMsg) { int status = gg_normalizestatus(iStatus); TCHAR **msgPtr; diff --git a/protocols/Gadu-Gadu/src/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h index b3bc689d46..45a1ec9899 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.h +++ b/protocols/Gadu-Gadu/src/gg_proto.h @@ -136,14 +136,14 @@ struct GGPROTO : public PROTO void __cdecl setavatarthread(void*); /* File transfer functions */ - HANDLE fileallow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath); + HANDLE fileallow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath); int filecancel(MCONTACT hContact, HANDLE hTransfer); - int filedeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason); - int recvfile(MCONTACT hContact, PROTOFILEEVENT* pre); - HANDLE sendfile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles); + int filedeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason); + int recvfile(MCONTACT hContact, PROTORECVFILET* pre); + HANDLE sendfile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** ppszFiles); - HANDLE dccfileallow(HANDLE hTransfer, const PROTOCHAR* szPath); - HANDLE dcc7fileallow(HANDLE hTransfer, const PROTOCHAR* szPath); + HANDLE dccfileallow(HANDLE hTransfer, const TCHAR* szPath); + HANDLE dcc7fileallow(HANDLE hTransfer, const TCHAR* szPath); int dccfiledeny(HANDLE hTransfer); int dcc7filedeny(HANDLE hTransfer); diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index 74af25ec59..c6526f815d 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -480,7 +480,7 @@ DWORD_PTR __cdecl CIrcProto::GetCaps(int type, MCONTACT) struct AckBasicSearchParam { - PROTOCHAR buf[50]; + TCHAR buf[50]; }; void __cdecl CIrcProto::AckBasicSearch(void* param) @@ -494,7 +494,7 @@ void __cdecl CIrcProto::AckBasicSearch(void* param) delete param; } -HANDLE __cdecl CIrcProto::SearchBasic(const PROTOCHAR* szId) +HANDLE __cdecl CIrcProto::SearchBasic(const TCHAR* szId) { if (szId) { if (m_iStatus != ID_STATUS_OFFLINE && m_iStatus != ID_STATUS_CONNECTING && diff --git a/protocols/IRCG/src/stdafx.h b/protocols/IRCG/src/stdafx.h index 1e6c4b683b..506f831ed8 100644 --- a/protocols/IRCG/src/stdafx.h +++ b/protocols/IRCG/src/stdafx.h @@ -219,7 +219,7 @@ struct CIrcProto : public PROTO virtual DWORD_PTR __cdecl GetCaps( int type, MCONTACT hContact = NULL); - virtual HANDLE __cdecl SearchBasic(const PROTOCHAR* id); + virtual HANDLE __cdecl SearchBasic(const TCHAR* id); virtual HANDLE __cdecl SendFile(MCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles); virtual int __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg); diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp index 6a8ec15019..b45c61016b 100644 --- a/protocols/IcqOscarJ/src/icq_proto.cpp +++ b/protocols/IcqOscarJ/src/icq_proto.cpp @@ -732,7 +732,7 @@ void CIcqProto::CheekySearchThread(void*) } -HANDLE __cdecl CIcqProto::SearchBasic(const PROTOCHAR *pszSearch) +HANDLE __cdecl CIcqProto::SearchBasic(const TCHAR *pszSearch) { if (mir_wstrlen(pszSearch) == 0) return 0; @@ -790,7 +790,7 @@ HANDLE __cdecl CIcqProto::SearchBasic(const PROTOCHAR *pszSearch) //////////////////////////////////////////////////////////////////////////////////////// // SearchByEmail - searches the contact by its e-mail -HANDLE __cdecl CIcqProto::SearchByEmail(const PROTOCHAR *email) +HANDLE __cdecl CIcqProto::SearchByEmail(const TCHAR *email) { if (email && icqOnline() && mir_wstrlen(email) > 0) { char *szEmail = tchar_to_ansi(email); @@ -813,7 +813,7 @@ HANDLE __cdecl CIcqProto::SearchByEmail(const PROTOCHAR *email) //////////////////////////////////////////////////////////////////////////////////////// // PS_SearchByName - searches the contact by its first or last name, or by a nickname -HANDLE __cdecl CIcqProto::SearchByName(const PROTOCHAR *nick, const PROTOCHAR *firstName, const PROTOCHAR *lastName) +HANDLE __cdecl CIcqProto::SearchByName(const TCHAR *nick, const TCHAR *firstName, const TCHAR *lastName) { if (icqOnline()) { if (nick || firstName || lastName) { diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h index 085d91cac5..d879d64c3d 100644 --- a/protocols/IcqOscarJ/src/icq_proto.h +++ b/protocols/IcqOscarJ/src/icq_proto.h @@ -70,9 +70,9 @@ struct CIcqProto : public PROTO 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 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); diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index 8fd47fa748..40be291a48 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -442,7 +442,7 @@ void __cdecl CMsnProto::MsnSearchAckThread(void* arg) } -HANDLE __cdecl CMsnProto::SearchBasic(const PROTOCHAR* id) +HANDLE __cdecl CMsnProto::SearchBasic(const TCHAR* id) { if (!msnLoggedIn) return 0; @@ -452,7 +452,7 @@ HANDLE __cdecl CMsnProto::SearchBasic(const PROTOCHAR* id) return email; } -HANDLE __cdecl CMsnProto::SearchByEmail(const PROTOCHAR* email) +HANDLE __cdecl CMsnProto::SearchByEmail(const TCHAR* email) { return SearchBasic(email); } @@ -571,7 +571,7 @@ void __cdecl CMsnProto::MsnFileAckThread(void* arg) } } -HANDLE __cdecl CMsnProto::FileAllow(MCONTACT, HANDLE hTransfer, const PROTOCHAR* szPath) +HANDLE __cdecl CMsnProto::FileAllow(MCONTACT, HANDLE hTransfer, const TCHAR* szPath) { filetransfer* ft = (filetransfer*)hTransfer; @@ -634,7 +634,7 @@ int __cdecl CMsnProto::FileCancel(MCONTACT, HANDLE hTransfer) ///////////////////////////////////////////////////////////////////////////////////////// // MsnFileDeny - rejects the file transfer request -int __cdecl CMsnProto::FileDeny(MCONTACT, HANDLE hTransfer, const PROTOCHAR* /*szReason*/) +int __cdecl CMsnProto::FileDeny(MCONTACT, HANDLE hTransfer, const TCHAR* /*szReason*/) { filetransfer* ft = (filetransfer*)hTransfer; @@ -664,7 +664,7 @@ int __cdecl CMsnProto::FileDeny(MCONTACT, HANDLE hTransfer, const PROTOCHAR* /*s ///////////////////////////////////////////////////////////////////////////////////////// // MsnFileResume - renames a file -int __cdecl CMsnProto::FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename) +int __cdecl CMsnProto::FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename) { filetransfer* ft = (filetransfer*)hTransfer; @@ -847,7 +847,7 @@ int CMsnProto::RecvContacts(MCONTACT hContact, PROTORECVEVENT* pre) ///////////////////////////////////////////////////////////////////////////////////////// // MsnSendFile - initiates a file transfer -HANDLE __cdecl CMsnProto::SendFile(MCONTACT hContact, const PROTOCHAR*, PROTOCHAR** ppszFiles) +HANDLE __cdecl CMsnProto::SendFile(MCONTACT hContact, const TCHAR*, TCHAR** ppszFiles) { if (!msnLoggedIn) return 0; diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h index 13206f0178..08654d0020 100644 --- a/protocols/MSN/src/msn_proto.h +++ b/protocols/MSN/src/msn_proto.h @@ -40,21 +40,21 @@ struct CMsnProto : public PROTO virtual int __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*); virtual int __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage); - virtual HANDLE __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath); + 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 PROTOCHAR* szReason); - virtual int __cdecl FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename); + 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, MCONTACT hContact = NULL); - virtual HANDLE __cdecl SearchBasic(const PROTOCHAR* id); - virtual HANDLE __cdecl SearchByEmail(const PROTOCHAR* email); + virtual HANDLE __cdecl SearchBasic(const TCHAR* id); + virtual HANDLE __cdecl SearchByEmail(const TCHAR* email); virtual int __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*); virtual int __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*); #ifdef OBSOLETE - virtual HANDLE __cdecl SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles); + virtual HANDLE __cdecl SendFile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** ppszFiles); #endif virtual int __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg); virtual int __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList); diff --git a/protocols/Sametime/src/files.cpp b/protocols/Sametime/src/files.cpp index 938753c47c..f3e0a2fa2e 100644 --- a/protocols/Sametime/src/files.cpp +++ b/protocols/Sametime/src/files.cpp @@ -276,7 +276,7 @@ mwFileTransferHandler mwFileTransfer_handler = { mwFileTransfer_clear }; -HANDLE CSametimeProto::SendFilesToUser(MCONTACT hContact, PROTOCHAR** files, const PROTOCHAR* ptszDesc) +HANDLE CSametimeProto::SendFilesToUser(MCONTACT hContact, TCHAR** files, const TCHAR* ptszDesc) { debugLog(_T("CSametimeProto::SendFilesToUser() start")); diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp index 6aa6eb2325..8b3a9f9843 100644 --- a/protocols/Sametime/src/sametime_proto.cpp +++ b/protocols/Sametime/src/sametime_proto.cpp @@ -87,7 +87,7 @@ MCONTACT CSametimeProto::AddToList(int flags, PROTOSEARCHRESULT* psr) return AddSearchedUser(sr, flags & PALF_TEMPORARY); } -HANDLE CSametimeProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath) +HANDLE CSametimeProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath) { debugLog(_T("CSametimeProto::FileAllow() hContact=[%x], szPath=[%s]"), hContact, szPath); char* szPathA = mir_t2a(szPath); @@ -103,14 +103,14 @@ int CSametimeProto::FileCancel(MCONTACT hContact, HANDLE hTransfer) return 0; } -int CSametimeProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason) +int CSametimeProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason) { debugLog(_T("CSametimeProto::FileDeny() hContact=[%x], szReason=[%s]"), hContact, szReason); RejectFileTransfer(hTransfer); return 0; } -int CSametimeProto::FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename) +int CSametimeProto::FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename) { debugLog(_T("CSametimeProto::FileResume() action=[%d]"), &action); return 0; @@ -168,7 +168,7 @@ int CSametimeProto::GetInfo(MCONTACT hContact, int infoType) return 0; } -HANDLE CSametimeProto::SearchBasic(const PROTOCHAR* id) +HANDLE CSametimeProto::SearchBasic(const TCHAR* id) { debugLog(_T("CSametimeProto::SearchBasic() id:len=[%d]"), id == NULL ? -1 : mir_tstrlen(id)); return (HANDLE)SearchForUser(T2Utf(id), FALSE); @@ -192,7 +192,7 @@ HWND CSametimeProto::CreateExtendedSearchUI(HWND owner) } -int CSametimeProto::RecvFile(MCONTACT hContact, PROTOFILEEVENT* pre) +int CSametimeProto::RecvFile(MCONTACT hContact, PROTORECVFILET* pre) { debugLog(_T("CSametimeProto::RecvFile() hContact=[%x]"), hContact); @@ -212,7 +212,7 @@ int CSametimeProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre) return Proto_RecvMessage(hContact, pre); } -HANDLE CSametimeProto::SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles) +HANDLE CSametimeProto::SendFile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** ppszFiles) { debugLog(_T("CSametimeProto::SendFile() hContact=[%x]"), hContact); if (m_iStatus != ID_STATUS_OFFLINE) { @@ -295,7 +295,7 @@ int CSametimeProto::RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt return 0; } -int CSametimeProto::SetAwayMsg(int iStatus, const PROTOCHAR* msg) +int CSametimeProto::SetAwayMsg(int iStatus, const TCHAR* msg) { debugLog(_T("CSametimeProto::SetAwayMsg() iStatus=[%d], msg:len=[%d]"), iStatus, msg == NULL ? -1 : mir_tstrlen(msg)); SetSessionAwayMessage(iStatus, msg); diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h index c2a023317d..b3690b29ee 100644 --- a/protocols/Sametime/src/sametime_proto.h +++ b/protocols/Sametime/src/sametime_proto.h @@ -17,29 +17,29 @@ struct CSametimeProto : public PROTO virtual MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr); - virtual HANDLE __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath); + 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 PROTOCHAR* szReason); - virtual int __cdecl FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename); + 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, MCONTACT hContact = NULL); virtual int __cdecl GetInfo(MCONTACT hContact, int infoType); - virtual HANDLE __cdecl SearchBasic(const PROTOCHAR* id); + virtual HANDLE __cdecl SearchBasic(const TCHAR* id); virtual HWND __cdecl SearchAdvanced(HWND owner); virtual HWND __cdecl CreateExtendedSearchUI(HWND owner); - virtual int __cdecl RecvFile(MCONTACT hContact, PROTOFILEEVENT*); + virtual int __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*); virtual int __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*); - virtual HANDLE __cdecl SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles); + 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 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 SetAwayMsg(int iStatus, const TCHAR* msg); virtual int __cdecl UserIsTyping(MCONTACT hContact, int type); @@ -93,7 +93,7 @@ struct CSametimeProto : public PROTO HANDLE AcceptFileTransfer(MCONTACT hContact, HANDLE hFt, char* save_path); void RejectFileTransfer(HANDLE hFt); void CancelFileTransfer(HANDLE hFt); - HANDLE SendFilesToUser(MCONTACT hContact, PROTOCHAR** files, const PROTOCHAR* pszDesc); + HANDLE SendFilesToUser(MCONTACT hContact, TCHAR** files, const TCHAR* pszDesc); // conference.cpp void InitConference(); @@ -118,7 +118,7 @@ struct CSametimeProto : public PROTO int SetSessionStatus(int status); void UpdateSelfStatus(); int SetIdle(bool idle); - void SetSessionAwayMessage(int status, const PROTOCHAR* msg); + void SetSessionAwayMessage(int status, const TCHAR* msg); WORD GetClientVersion(); WORD GetServerVersion(); INT_PTR __cdecl SessionAnnounce(WPARAM wParam, LPARAM lParam); diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index 20fbdef920..828e8808db 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -315,7 +315,7 @@ int CSametimeProto::SetIdle(bool idle) return 0; } -void CSametimeProto::SetSessionAwayMessage(int status, const PROTOCHAR* msgT) +void CSametimeProto::SetSessionAwayMessage(int status, const TCHAR* msgT) { debugLog(_T("SetSessionAwayMessage() status=[%d], msgT:len=[%d]"), status, msgT == NULL ? -1 : mir_tstrlen(msgT)); diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp index 13b57a8ccd..5241fb00ea 100644 --- a/protocols/SkypeWeb/src/skype_proto.cpp +++ b/protocols/SkypeWeb/src/skype_proto.cpp @@ -144,7 +144,7 @@ int CSkypeProto::Authorize(MEVENT hDbEvent) return 0; } -int CSkypeProto::AuthDeny(MEVENT hDbEvent, const PROTOCHAR*) +int CSkypeProto::AuthDeny(MEVENT hDbEvent, const TCHAR*) { MCONTACT hContact = GetContactFromAuthEvent(hDbEvent); if (hContact == INVALID_CONTACT_ID) @@ -161,7 +161,7 @@ int CSkypeProto::AuthRecv(MCONTACT, PROTORECVEVENT* pre) return Proto_AuthRecv(m_szModuleName, pre); } -int CSkypeProto::AuthRequest(MCONTACT hContact, const PROTOCHAR *szMessage) +int CSkypeProto::AuthRequest(MCONTACT hContact, const TCHAR *szMessage) { if (hContact == INVALID_CONTACT_ID) return 1; diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h index fd2b600bdb..9fa33bd75a 100644 --- a/protocols/SkypeWeb/src/skype_proto.h +++ b/protocols/SkypeWeb/src/skype_proto.h @@ -53,15 +53,15 @@ public: virtual MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr); virtual MCONTACT __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent); - virtual int __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage); + virtual int __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage); virtual int __cdecl Authorize(MEVENT hDbEvent); - virtual int __cdecl AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason); + virtual int __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR* szReason); virtual int __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*); 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 SearchBasic(const TCHAR* id); virtual int __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg); diff --git a/protocols/SkypeWeb/src/skype_search.cpp b/protocols/SkypeWeb/src/skype_search.cpp index c149e45477..5bdd2c138a 100644 --- a/protocols/SkypeWeb/src/skype_search.cpp +++ b/protocols/SkypeWeb/src/skype_search.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . #include "stdafx.h" -HANDLE CSkypeProto::SearchBasic(const PROTOCHAR* id) +HANDLE CSkypeProto::SearchBasic(const TCHAR* id) { ForkThread(&CSkypeProto::SearchBasicThread, (void *)id); return (HANDLE)1; diff --git a/protocols/Tlen/src/tlen.h b/protocols/Tlen/src/tlen.h index 4e6d281214..1923125e1f 100644 --- a/protocols/Tlen/src/tlen.h +++ b/protocols/Tlen/src/tlen.h @@ -213,35 +213,35 @@ struct TlenProtocol : public PROTO // PROTO_INTERFACE //==================================================================================== - virtual MCONTACT __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr ); - virtual MCONTACT __cdecl AddToListByEvent( int flags, int iContact, MEVENT hDbEvent ); + virtual MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr); + virtual MCONTACT __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent); - 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 int __cdecl Authorize(MEVENT hDbEvent); + virtual int __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR* szReason); + virtual int __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*); + virtual int __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage); - virtual HANDLE __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath); - virtual int __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer); - virtual int __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason); - virtual int __cdecl FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename); + 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, 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 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(MCONTACT hContact, PROTORECVEVENT*); - virtual int __cdecl RecvFile(MCONTACT hContact, PROTOFILEEVENT*); + 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(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList); - virtual HANDLE __cdecl SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles); + 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); @@ -250,7 +250,7 @@ struct TlenProtocol : public PROTO 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 SetAwayMsg(int iStatus, const TCHAR* msg); virtual int __cdecl UserIsTyping(MCONTACT hContact, int type); diff --git a/protocols/Tlen/src/tlen_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp index 705b4ca150..005f9af3ab 100644 --- a/protocols/Tlen/src/tlen_svc.cpp +++ b/protocols/Tlen/src/tlen_svc.cpp @@ -85,7 +85,7 @@ void TlenResetSearchQuery(TlenProtocol *proto) { proto->searchID = TlenSerialNext(proto); } -HANDLE TlenProtocol::SearchBasic(const PROTOCHAR* id) +HANDLE TlenProtocol::SearchBasic(const TCHAR* id) { int iqId = 0; if (!isOnline) return 0; @@ -103,7 +103,7 @@ HANDLE TlenProtocol::SearchBasic(const PROTOCHAR* id) return (HANDLE)iqId; } -HANDLE TlenProtocol::SearchByEmail(const PROTOCHAR* email) +HANDLE TlenProtocol::SearchByEmail(const TCHAR* email) { int iqId = 0; @@ -122,7 +122,7 @@ HANDLE TlenProtocol::SearchByEmail(const PROTOCHAR* email) return (HANDLE)iqId; } -HANDLE TlenProtocol::SearchByName(const PROTOCHAR* nickT, const PROTOCHAR* firstNameT, const PROTOCHAR* lastNameT) +HANDLE TlenProtocol::SearchByName(const TCHAR* nickT, const TCHAR* firstNameT, const TCHAR* lastNameT) { if (!isOnline) return 0; @@ -309,7 +309,7 @@ int TlenProtocol::Authorize(MEVENT hDbEvent) return 0; } -int TlenProtocol::AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason) +int TlenProtocol::AuthDeny(MEVENT hDbEvent, const TCHAR* szReason) { if (!isOnline) return 1; @@ -411,7 +411,7 @@ INT_PTR TlenProtocol::GetStatus(WPARAM wParam, LPARAM lParam) return m_iStatus; } -int TlenProtocol::SetAwayMsg(int iStatus, const PROTOCHAR* msg) +int TlenProtocol::SetAwayMsg(int iStatus, const TCHAR* msg) { char **szMsg; char *newModeMsg; @@ -708,12 +708,12 @@ int TlenProtocol::RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt) return 0; } -HANDLE TlenProtocol::FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath) +HANDLE TlenProtocol::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath) { if (!isOnline) return 0; TLEN_FILE_TRANSFER *ft = (TLEN_FILE_TRANSFER *) hTransfer; - ft->szSavePath = mir_strdup(mir_t2a(szPath)); //TODO convert to PROTOCHAR* + ft->szSavePath = mir_strdup(mir_t2a(szPath)); //TODO convert to TCHAR* TLEN_LIST_ITEM *item = TlenListAdd(this, LIST_FILE, ft->iqId); if (item != NULL) { item->ft = ft; @@ -728,7 +728,7 @@ HANDLE TlenProtocol::FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOC return (HANDLE)hTransfer; } -int TlenProtocol::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason) +int TlenProtocol::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason) { if (!isOnline) return 1; @@ -744,7 +744,7 @@ int TlenProtocol::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* return 0; } -int TlenProtocol::FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename) { +int TlenProtocol::FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename) { return 0; } @@ -767,7 +767,7 @@ int TlenProtocol::FileCancel(MCONTACT hContact, HANDLE hTransfer) return 0; } -HANDLE TlenProtocol::SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles) +HANDLE TlenProtocol::SendFile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** ppszFiles) { int i, j; struct _stat statbuf; @@ -846,7 +846,7 @@ int TlenProtocol::RecvMsg(MCONTACT hContact, PROTORECVEVENT* evt) return Proto_RecvMessage(hContact, evt); } -int TlenProtocol::RecvFile(MCONTACT hContact, PROTOFILEEVENT* evt) +int TlenProtocol::RecvFile(MCONTACT hContact, PROTORECVFILET* evt) { return Proto_RecvFile(hContact, evt); } @@ -1176,7 +1176,7 @@ int TlenProtocol::AuthRecv(MCONTACT hContact, PROTORECVEVENT* evt) } // PSS_AUTHREQUEST -int TlenProtocol::AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage) +int TlenProtocol::AuthRequest(MCONTACT hContact, const TCHAR* szMessage) { return 1; } diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp index da29ff9e02..b3e4ff4a7f 100644 --- a/protocols/Tox/src/tox_proto.cpp +++ b/protocols/Tox/src/tox_proto.cpp @@ -91,13 +91,13 @@ int CToxProto::AuthRecv(MCONTACT, PROTORECVEVENT* pre) return Proto_AuthRecv(m_szModuleName, pre); } -int CToxProto::AuthRequest(MCONTACT hContact, const PROTOCHAR *szMessage) +int CToxProto::AuthRequest(MCONTACT hContact, const TCHAR *szMessage) { ptrA reason(mir_utf8encodeW(szMessage)); return OnRequestAuth(hContact, (LPARAM)reason); } -HANDLE CToxProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR *tszPath) +HANDLE CToxProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR *tszPath) { return OnFileAllow(hContact, hTransfer, tszPath); } @@ -107,12 +107,12 @@ int CToxProto::FileCancel(MCONTACT hContact, HANDLE hTransfer) return OnFileCancel(hContact, hTransfer); } -int CToxProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR*) +int CToxProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR*) { return FileCancel(hContact, hTransfer); } -int CToxProto::FileResume(HANDLE hTransfer, int *action, const PROTOCHAR **szFilename) +int CToxProto::FileResume(HANDLE hTransfer, int *action, const TCHAR **szFilename) { return OnFileResume(hTransfer, action, szFilename); } @@ -137,7 +137,7 @@ int CToxProto::SendMsg(MCONTACT hContact, int, const char *msg) return OnSendMessage(hContact, msg); } -HANDLE CToxProto::SendFile(MCONTACT hContact, const PROTOCHAR *msg, PROTOCHAR **ppszFiles) +HANDLE CToxProto::SendFile(MCONTACT hContact, const TCHAR *msg, TCHAR **ppszFiles) { return OnSendFile(hContact, msg, ppszFiles); } @@ -212,7 +212,7 @@ int CToxProto::SetStatus(int iNewStatus) HANDLE CToxProto::GetAwayMsg(MCONTACT) { return 0; } -int CToxProto::SetAwayMsg(int, const PROTOCHAR *msg) +int CToxProto::SetAwayMsg(int, const TCHAR *msg) { if (IsOnline()) { diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h index c92424f11e..481bfabebf 100644 --- a/protocols/Tox/src/tox_proto.h +++ b/protocols/Tox/src/tox_proto.h @@ -25,12 +25,12 @@ public: virtual int __cdecl Authorize(MEVENT hDbEvent); virtual int __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*); - virtual int __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage); + virtual int __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage); - virtual HANDLE __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* tszPath); + virtual HANDLE __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* 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 int __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* tszReason); + virtual int __cdecl FileResume(HANDLE hTransfer, int* action, const TCHAR** tszFilename); virtual DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL); @@ -40,12 +40,12 @@ public: virtual int __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*); virtual int __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg); - virtual HANDLE __cdecl SendFile(MCONTACT hContact, const PROTOCHAR*, PROTOCHAR **ppszFiles); + virtual HANDLE __cdecl SendFile(MCONTACT hContact, const TCHAR*, TCHAR **ppszFiles); virtual int __cdecl SetStatus(int iNewStatus); virtual HANDLE __cdecl GetAwayMsg(MCONTACT hContact); - virtual int __cdecl SetAwayMsg(int iStatus, const PROTOCHAR* msg); + virtual int __cdecl SetAwayMsg(int iStatus, const TCHAR* msg); virtual int __cdecl UserIsTyping(MCONTACT hContact, int type); @@ -222,10 +222,10 @@ private: // transfer - HANDLE OnFileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR *tszPath); - int OnFileResume(HANDLE hTransfer, int *action, const PROTOCHAR **szFilename); + HANDLE OnFileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR *tszPath); + int OnFileResume(HANDLE hTransfer, int *action, const TCHAR **szFilename); int OnFileCancel(MCONTACT hContact, HANDLE hTransfer); - HANDLE OnSendFile(MCONTACT hContact, const PROTOCHAR*, PROTOCHAR **ppszFiles); + HANDLE OnSendFile(MCONTACT hContact, const TCHAR*, TCHAR **ppszFiles); static void OnFileRequest(Tox *tox, uint32_t friendNumber, uint32_t fileNumber, TOX_FILE_CONTROL control, void *arg); static void OnFriendFile(Tox *tox, uint32_t friendNumber, uint32_t fileNumber, uint32_t kind, uint64_t fileSize, const uint8_t *fileName, size_t filenameLength, void *arg); diff --git a/protocols/Tox/src/tox_transfer.cpp b/protocols/Tox/src/tox_transfer.cpp index 2586dcfee4..63495eb883 100644 --- a/protocols/Tox/src/tox_transfer.cpp +++ b/protocols/Tox/src/tox_transfer.cpp @@ -63,7 +63,7 @@ void CToxProto::OnFriendFile(Tox*, uint32_t friendNumber, uint32_t fileNumber, u } // file request is allowed -HANDLE CToxProto::OnFileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR *tszPath) +HANDLE CToxProto::OnFileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR *tszPath) { FileTransferParam *transfer = (FileTransferParam*)hTransfer; transfer->pfts.tszWorkingDir = mir_tstrdup(tszPath); @@ -87,7 +87,7 @@ HANDLE CToxProto::OnFileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCH } // if file is exists -int CToxProto::OnFileResume(HANDLE hTransfer, int *action, const PROTOCHAR **szFilename) +int CToxProto::OnFileResume(HANDLE hTransfer, int *action, const TCHAR **szFilename) { FileTransferParam *transfer = (FileTransferParam*)hTransfer; @@ -182,7 +182,7 @@ void CToxProto::OnDataReceiving(Tox*, uint32_t friendNumber, uint32_t fileNumber /* FILE SENDING */ // outcoming file flow -HANDLE CToxProto::OnSendFile(MCONTACT hContact, const PROTOCHAR*, PROTOCHAR **ppszFiles) +HANDLE CToxProto::OnSendFile(MCONTACT hContact, const TCHAR*, TCHAR **ppszFiles) { int32_t friendNumber = GetToxFriendNumber(hContact); if (friendNumber == UINT32_MAX) diff --git a/protocols/VKontakte/src/vk_files.cpp b/protocols/VKontakte/src/vk_files.cpp index c4d528fc39..180b8999e3 100644 --- a/protocols/VKontakte/src/vk_files.cpp +++ b/protocols/VKontakte/src/vk_files.cpp @@ -17,7 +17,7 @@ along with this program. If not, see . #include "stdafx.h" -CVkFileUploadParam::CVkFileUploadParam(MCONTACT _hContact, const PROTOCHAR* _desc, PROTOCHAR** _files) : +CVkFileUploadParam::CVkFileUploadParam(MCONTACT _hContact, const TCHAR* _desc, TCHAR** _files) : hContact(_hContact), filetype(typeInvalid), atr(NULL), @@ -68,7 +68,7 @@ CVkFileUploadParam::VKFileType CVkFileUploadParam::GetType() return filetype; } -HANDLE CVkProto::SendFile(MCONTACT hContact, const PROTOCHAR *desc, PROTOCHAR **files) +HANDLE CVkProto::SendFile(MCONTACT hContact, const TCHAR *desc, TCHAR **files) { debugLogA("CVkProto::SendFile"); LONG userID = getDword(hContact, "ID", -1); diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index 62cbf1bf7b..7d0f9a52be 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -511,7 +511,7 @@ MCONTACT CVkProto::AddToList(int, PROTOSEARCHRESULT* psr) return hContact; } -int CVkProto::AuthRequest(MCONTACT hContact,const PROTOCHAR* message) +int CVkProto::AuthRequest(MCONTACT hContact,const TCHAR* message) { debugLogA("CVkProto::AuthRequest"); if (!IsOnline()) @@ -582,7 +582,7 @@ int CVkProto::Authorize(MEVENT hDbEvent) return AuthRequest(hContact, NULL); } -int CVkProto::AuthDeny(MEVENT hDbEvent, const PROTOCHAR*) +int CVkProto::AuthDeny(MEVENT hDbEvent, const TCHAR*) { debugLogA("CVkProto::AuthDeny"); if (!IsOnline()) diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h index b244550e72..cd034b1bc9 100644 --- a/protocols/VKontakte/src/vk_proto.h +++ b/protocols/VKontakte/src/vk_proto.h @@ -168,7 +168,7 @@ struct CVkFileUploadParam { VKFileType filetype; int iErrorCode; - CVkFileUploadParam(MCONTACT _hContact, const PROTOCHAR* _desc, PROTOCHAR** _files); + CVkFileUploadParam(MCONTACT _hContact, const TCHAR* _desc, TCHAR** _files); ~CVkFileUploadParam(); VKFileType GetType(); __forceinline bool IsAccess() { return ::_taccess(FileName, 0) == 0; } diff --git a/protocols/VKontakte/src/vk_search.cpp b/protocols/VKontakte/src/vk_search.cpp index 1a07b0e28c..82b806c287 100644 --- a/protocols/VKontakte/src/vk_search.cpp +++ b/protocols/VKontakte/src/vk_search.cpp @@ -17,19 +17,19 @@ along with this program. If not, see . #include "stdafx.h" -HANDLE CVkProto::SearchBasic(const PROTOCHAR* id) +HANDLE CVkProto::SearchBasic(const TCHAR* id) { ForkThread(&CVkProto::SearchBasicThread, (void *)id); return (HANDLE)1; } -HANDLE CVkProto::SearchByEmail(const PROTOCHAR* email) +HANDLE CVkProto::SearchByEmail(const TCHAR* email) { ForkThread(&CVkProto::SearchByMailThread, (void *)email); return (HANDLE)1; } -HANDLE CVkProto::SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName) +HANDLE CVkProto::SearchByName(const TCHAR* nick, const TCHAR* firstName, const TCHAR* lastName) { PROTOSEARCHBYNAME * psr = new (PROTOSEARCHBYNAME); diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp index 2afe107f22..21af7baa4b 100644 --- a/protocols/WhatsApp/src/proto.cpp +++ b/protocols/WhatsApp/src/proto.cpp @@ -202,7 +202,7 @@ void WhatsAppProto::SearchAckThread(void *targ) delete param; } -HANDLE WhatsAppProto::SearchBasic(const PROTOCHAR* id) +HANDLE WhatsAppProto::SearchBasic(const TCHAR* id) { if (isOffline()) return 0; diff --git a/protocols/WhatsApp/src/proto.h b/protocols/WhatsApp/src/proto.h index 78b58ea07b..2c7cf2e97e 100644 --- a/protocols/WhatsApp/src/proto.h +++ b/protocols/WhatsApp/src/proto.h @@ -44,7 +44,7 @@ public: virtual DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL); - virtual HANDLE __cdecl SearchBasic(const PROTOCHAR* id); + virtual HANDLE __cdecl SearchBasic(const TCHAR* id); virtual int __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*); diff --git a/protocols/Yahoo/src/file_transfer.cpp b/protocols/Yahoo/src/file_transfer.cpp index 603d7d6442..f49661869c 100644 --- a/protocols/Yahoo/src/file_transfer.cpp +++ b/protocols/Yahoo/src/file_transfer.cpp @@ -665,7 +665,7 @@ void __cdecl CYahooProto::send_filethread(void *psf) //////////////////////////////////////////////////////////////////////////////////////// // SendFile - sends a file -HANDLE __cdecl CYahooProto::SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles ) +HANDLE __cdecl CYahooProto::SendFile(MCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles) { LOG(("[YahooSendFile]")); @@ -718,7 +718,7 @@ HANDLE __cdecl CYahooProto::SendFile(MCONTACT hContact, const PROTOCHAR* szDescr //////////////////////////////////////////////////////////////////////////////////////// // FileAllow - starts a file transfer -HANDLE __cdecl CYahooProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath) +HANDLE __cdecl CYahooProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath) { y_filetransfer *ft = (y_filetransfer *)hTransfer; @@ -769,7 +769,7 @@ int __cdecl CYahooProto::FileCancel(MCONTACT hContact, HANDLE hTransfer) //////////////////////////////////////////////////////////////////////////////////////// // FileDeny - denies a file transfer -int __cdecl CYahooProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR*) +int __cdecl CYahooProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR*) { /* deny file receive request.. just ignore it! */ y_filetransfer *ft = (y_filetransfer *)hTransfer; @@ -800,7 +800,7 @@ int __cdecl CYahooProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PRO //////////////////////////////////////////////////////////////////////////////////////// // FileResume - processes file renaming etc -int __cdecl CYahooProto::FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename) +int __cdecl CYahooProto::FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename) { y_filetransfer *ft = (y_filetransfer *)hTransfer; diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp index f144d89c9b..7d935a3418 100644 --- a/protocols/Yahoo/src/proto.cpp +++ b/protocols/Yahoo/src/proto.cpp @@ -540,7 +540,7 @@ HANDLE __cdecl CYahooProto::GetAwayMsg(MCONTACT hContact) //////////////////////////////////////////////////////////////////////////////////////// // SetAwayMsg - sets the away status message -int __cdecl CYahooProto::SetAwayMsg(int status, const PROTOCHAR* msg) +int __cdecl CYahooProto::SetAwayMsg(int status, const TCHAR* msg) { char *c = msg && msg[0] ? mir_utf8encodeT(msg) : NULL; diff --git a/protocols/Yahoo/src/proto.h b/protocols/Yahoo/src/proto.h index f1bb3ee42f..a220b3b788 100644 --- a/protocols/Yahoo/src/proto.h +++ b/protocols/Yahoo/src/proto.h @@ -25,37 +25,37 @@ struct CYahooProto : public PROTO // PROTO_INTERFACE //==================================================================================== - virtual MCONTACT __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr ); - virtual MCONTACT __cdecl AddToListByEvent( int flags, int iContact, MEVENT hDbEvent ); + virtual MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr); + virtual MCONTACT __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent); - virtual int __cdecl Authorize( MEVENT hDbEvent ); - virtual int __cdecl AuthDeny( MEVENT hDbEvent, const TCHAR* szReason ); - virtual int __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT* ); - virtual int __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage ); + virtual int __cdecl Authorize(MEVENT hDbEvent); + virtual int __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR *szReason); + virtual int __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*); + virtual int __cdecl AuthRequest(MCONTACT hContact, const TCHAR *szMessage ); - virtual HANDLE __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath ); + 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 PROTOCHAR* szReason ); - virtual int __cdecl FileResume( HANDLE hTransfer, int* action, const PROTOCHAR** szFilename ); + 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, MCONTACT hContact = NULL); virtual int __cdecl GetInfo(MCONTACT hContact, int infoType ); - virtual HANDLE __cdecl SearchBasic( const PROTOCHAR* id ); - virtual HWND __cdecl SearchAdvanced( HWND owner ); - virtual HWND __cdecl CreateExtendedSearchUI( HWND owner ); + virtual HANDLE __cdecl SearchBasic(const TCHAR *id); + virtual HWND __cdecl SearchAdvanced(HWND owner); + virtual HWND __cdecl CreateExtendedSearchUI(HWND owner); virtual int __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*); virtual int __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*); - virtual HANDLE __cdecl SendFile(MCONTACT hContact, const PROTOCHAR *szDescription, PROTOCHAR **ppszFiles); + 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 SetApparentMode(MCONTACT hContact, int mode); virtual int __cdecl SetStatus(int iNewStatus); virtual HANDLE __cdecl GetAwayMsg(MCONTACT hContact); - virtual int __cdecl SetAwayMsg( int m_iStatus, const PROTOCHAR *msg); + virtual int __cdecl SetAwayMsg( int m_iStatus, const TCHAR *msg); virtual INT_PTR __cdecl GetMyAwayMsg(WPARAM wParam, LPARAM lParam); virtual int __cdecl UserIsTyping(MCONTACT hContact, int type); -- cgit v1.2.3