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/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 +- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'protocols/Sametime') 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)); -- cgit v1.2.3