From 2cc4fb3b11adc55fe67b09667cacd21f367c72e5 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Thu, 21 Feb 2013 06:29:02 +0000 Subject: small cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@3656 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/protocols/protoint.cpp | 104 ++++++++++++++++++++++++------------- 1 file changed, 69 insertions(+), 35 deletions(-) (limited to 'src/modules/protocols/protoint.cpp') diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp index ecc93265df..8146754c9d 100644 --- a/src/modules/protocols/protoint.cpp +++ b/src/modules/protocols/protoint.cpp @@ -54,28 +54,34 @@ INT_PTR __fastcall MyCallProtoService(const char *szModule, const char *szServic struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE { HANDLE __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr) - { return (HANDLE)MyCallProtoService(m_szModuleName, PS_ADDTOLIST, flags, (LPARAM)psr); + { + return (HANDLE)MyCallProtoService(m_szModuleName, PS_ADDTOLIST, flags, (LPARAM)psr); } HANDLE __cdecl AddToListByEvent(int flags, int iContact, HANDLE hDbEvent) - { return (HANDLE)MyCallProtoService(m_szModuleName, PS_ADDTOLISTBYEVENT, MAKELONG(flags, iContact), (LPARAM)hDbEvent); + { + return (HANDLE)MyCallProtoService(m_szModuleName, PS_ADDTOLISTBYEVENT, MAKELONG(flags, iContact), (LPARAM)hDbEvent); } int __cdecl Authorize(HANDLE hContact) - { return (int)MyCallProtoService(m_szModuleName, PS_AUTHALLOW, (WPARAM)hContact, 0); + { + return (int)MyCallProtoService(m_szModuleName, PS_AUTHALLOW, (WPARAM)hContact, 0); } int __cdecl AuthDeny(HANDLE hContact, const TCHAR* szReason) - { return (int)MyCallProtoService(m_szModuleName, PS_AUTHDENY, (WPARAM)hContact, (LPARAM)StrConvA(szReason)); + { + return (int)MyCallProtoService(m_szModuleName, PS_AUTHDENY, (WPARAM)hContact, (LPARAM)StrConvA(szReason)); } int __cdecl AuthRecv(HANDLE hContact, PROTORECVEVENT* evt) - { CCSDATA ccs = { hContact, PSR_AUTH, 0, (LPARAM)evt }; + { + CCSDATA ccs = { hContact, PSR_AUTH, 0, (LPARAM)evt }; return (int)MyCallProtoService(m_szModuleName, PSR_AUTH, 0, (LPARAM)&ccs); } int __cdecl AuthRequest(HANDLE hContact, const TCHAR* szMessage) - { CCSDATA ccs = { hContact, PSS_AUTHREQUEST, 0, (LPARAM)szMessage }; + { + CCSDATA ccs = { hContact, PSS_AUTHREQUEST, 0, (LPARAM)szMessage }; ccs.lParam = (LPARAM)mir_t2a(szMessage); int res = (int)MyCallProtoService(m_szModuleName, PSS_AUTHREQUEST, 0, (LPARAM)&ccs); mir_free((char*)ccs.lParam); @@ -83,11 +89,13 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE } HANDLE __cdecl ChangeInfo(int iInfoType, void* pInfoData) - { return (HANDLE)MyCallProtoService(m_szModuleName, PS_CHANGEINFO, iInfoType, (LPARAM)pInfoData); + { + return (HANDLE)MyCallProtoService(m_szModuleName, PS_CHANGEINFO, iInfoType, (LPARAM)pInfoData); } HANDLE __cdecl FileAllow(HANDLE hContact, HANDLE hTransfer, const PROTOCHAR* szPath) - { CCSDATA ccs = { hContact, PSS_FILEALLOW, (WPARAM)hTransfer, (LPARAM)szPath }; + { + CCSDATA ccs = { hContact, PSS_FILEALLOW, (WPARAM)hTransfer, (LPARAM)szPath }; ccs.lParam = (LPARAM)mir_t2a(szPath); HANDLE res = (HANDLE)MyCallProtoService(m_szModuleName, PSS_FILEALLOW, 0, (LPARAM)&ccs); @@ -96,12 +104,14 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE } int __cdecl FileCancel(HANDLE hContact, HANDLE hTransfer) - { CCSDATA ccs = { hContact, PSS_FILECANCEL, (WPARAM)hTransfer, 0 }; + { + CCSDATA ccs = { hContact, PSS_FILECANCEL, (WPARAM)hTransfer, 0 }; return (int)MyCallProtoService(m_szModuleName, PSS_FILECANCEL, 0, (LPARAM)&ccs); } int __cdecl FileDeny(HANDLE hContact, HANDLE hTransfer, const PROTOCHAR* szReason) - { CCSDATA ccs = { hContact, PSS_FILEDENY, (WPARAM)hTransfer, (LPARAM)szReason }; + { + CCSDATA ccs = { hContact, PSS_FILEDENY, (WPARAM)hTransfer, (LPARAM)szReason }; ccs.lParam = (LPARAM)mir_t2a(szReason); int res = (int)MyCallProtoService(m_szModuleName, PSS_FILEDENY, 0, (LPARAM)&ccs); @@ -110,7 +120,8 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE } int __cdecl FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename) - { PROTOFILERESUME pfr = { *action, *szFilename }; + { + PROTOFILERESUME pfr = { *action, *szFilename }; pfr.szFilename = (PROTOCHAR*)mir_t2a(pfr.szFilename); int res = (int)MyCallProtoService(m_szModuleName, PS_FILERESUME, (WPARAM)hTransfer, (LPARAM)&pfr); @@ -121,28 +132,34 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE } DWORD_PTR __cdecl GetCaps(int type, HANDLE hContact) - { return (DWORD_PTR)MyCallProtoService(m_szModuleName, PS_GETCAPS, type, (LPARAM)hContact); + { + return (DWORD_PTR)MyCallProtoService(m_szModuleName, PS_GETCAPS, type, (LPARAM)hContact); } HICON __cdecl GetIcon(int iconIndex) - { return (HICON)MyCallProtoService(m_szModuleName, PS_LOADICON, iconIndex, 0); + { + return (HICON)MyCallProtoService(m_szModuleName, PS_LOADICON, iconIndex, 0); } int __cdecl GetInfo(HANDLE hContact, int flags) - { CCSDATA ccs = { hContact, PSS_GETINFO, flags, 0 }; + { + CCSDATA ccs = { hContact, PSS_GETINFO, flags, 0 }; return MyCallProtoService(m_szModuleName, PSS_GETINFO, 0, (LPARAM)&ccs); } HANDLE __cdecl SearchBasic(const PROTOCHAR* id) - { return (HANDLE)MyCallProtoService(m_szModuleName, PS_BASICSEARCH, 0, (LPARAM)StrConvA(id)); + { + return (HANDLE)MyCallProtoService(m_szModuleName, PS_BASICSEARCH, 0, (LPARAM)StrConvA(id)); } HANDLE __cdecl SearchByEmail(const PROTOCHAR* email) - { return (HANDLE)MyCallProtoService(m_szModuleName, PS_SEARCHBYEMAIL, 0, (LPARAM)StrConvA(email)); + { + return (HANDLE)MyCallProtoService(m_szModuleName, PS_SEARCHBYEMAIL, 0, (LPARAM)StrConvA(email)); } HANDLE __cdecl SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName) - { PROTOSEARCHBYNAME psn; + { + PROTOSEARCHBYNAME psn; psn.pszNick = (PROTOCHAR*)mir_t2a(nick); psn.pszFirstName = (PROTOCHAR*)mir_t2a(firstName); @@ -156,42 +173,50 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE } HWND __cdecl SearchAdvanced(HWND owner) - { return (HWND)MyCallProtoService(m_szModuleName, PS_SEARCHBYADVANCED, 0, (LPARAM)owner); + { + return (HWND)MyCallProtoService(m_szModuleName, PS_SEARCHBYADVANCED, 0, (LPARAM)owner); } HWND __cdecl CreateExtendedSearchUI(HWND owner) - { return (HWND)MyCallProtoService(m_szModuleName, PS_CREATEADVSEARCHUI, 0, (LPARAM)owner); + { + return (HWND)MyCallProtoService(m_szModuleName, PS_CREATEADVSEARCHUI, 0, (LPARAM)owner); } int __cdecl RecvContacts(HANDLE hContact, PROTORECVEVENT* evt) - { CCSDATA ccs = { hContact, PSR_CONTACTS, 0, (LPARAM)evt }; + { + CCSDATA ccs = { hContact, PSR_CONTACTS, 0, (LPARAM)evt }; return (int)MyCallProtoService(m_szModuleName, PSR_CONTACTS, 0, (LPARAM)&ccs); } int __cdecl RecvFile(HANDLE hContact, PROTOFILEEVENT* evt) - { CCSDATA ccs = { hContact, PSR_FILE, 0, (LPARAM)evt }; + { + CCSDATA ccs = { hContact, PSR_FILE, 0, (LPARAM)evt }; return MyCallProtoService(m_szModuleName, PSR_FILE, 0, (LPARAM)&ccs); } int __cdecl RecvMsg(HANDLE hContact, PROTORECVEVENT* evt) - { CCSDATA ccs = { hContact, PSR_MESSAGE, 0, (LPARAM)evt }; + { + CCSDATA ccs = { hContact, PSR_MESSAGE, 0, (LPARAM)evt }; return (int)MyCallProtoService(m_szModuleName, PSR_MESSAGE, 0, (LPARAM)&ccs); } int __cdecl RecvUrl(HANDLE hContact, PROTORECVEVENT* evt) - { CCSDATA ccs = { hContact, PSR_URL, 0, (LPARAM)evt }; + { + CCSDATA ccs = { hContact, PSR_URL, 0, (LPARAM)evt }; return (int)MyCallProtoService(m_szModuleName, PSR_URL, 0, (LPARAM)&ccs); } int __cdecl SendContacts(HANDLE hContact, int flags, int nContacts, HANDLE* hContactsList) - { CCSDATA ccs = { hContact, PSS_CONTACTS, MAKEWPARAM(flags, nContacts), (LPARAM)hContactsList }; + { + CCSDATA ccs = { hContact, PSS_CONTACTS, MAKEWPARAM(flags, nContacts), (LPARAM)hContactsList }; return (int)MyCallProtoService(m_szModuleName, PSS_CONTACTS, 0, (LPARAM)&ccs); } HANDLE __cdecl SendFile(HANDLE hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles) - { CCSDATA ccs = { hContact, PSS_FILE, (WPARAM)szDescription, (LPARAM)ppszFiles }; + { + CCSDATA ccs = { hContact, PSS_FILE, (WPARAM)szDescription, (LPARAM)ppszFiles }; - ccs.wParam = (WPARAM)mir_t2a(szDescription); + ccs.wParam = (WPARAM)mir_t2a(szDescription); ccs.lParam = (LPARAM)Proto_FilesMatrixA(ppszFiles); HANDLE res = (HANDLE)MyCallProtoService(m_szModuleName, PSS_FILE, 0, (LPARAM)&ccs); if (res == 0) FreeFilesMatrix((TCHAR***)&ccs.lParam); @@ -200,45 +225,54 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE } int __cdecl SendMsg(HANDLE hContact, int flags, const char* msg) - { CCSDATA ccs = { hContact, PSS_MESSAGE, flags, (LPARAM)msg }; + { + CCSDATA ccs = { hContact, PSS_MESSAGE, flags, (LPARAM)msg }; return (int)MyCallProtoService(m_szModuleName, PSS_MESSAGE, 0, (LPARAM)&ccs); } int __cdecl SendUrl(HANDLE hContact, int flags, const char* url) - { CCSDATA ccs = { hContact, PSS_URL, flags, (LPARAM)url }; + { + CCSDATA ccs = { hContact, PSS_URL, flags, (LPARAM)url }; return (int)MyCallProtoService(m_szModuleName, PSS_URL, 0, (LPARAM)&ccs); } int __cdecl SetApparentMode(HANDLE hContact, int mode) - { CCSDATA ccs = { hContact, PSS_SETAPPARENTMODE, mode, 0 }; + { + CCSDATA ccs = { hContact, PSS_SETAPPARENTMODE, mode, 0 }; return (int)MyCallProtoService(m_szModuleName, PSS_SETAPPARENTMODE, 0, (LPARAM)&ccs); } int __cdecl SetStatus(int iNewStatus) - { return (int)MyCallProtoService(m_szModuleName, PS_SETSTATUS, iNewStatus, 0); + { + return (int)MyCallProtoService(m_szModuleName, PS_SETSTATUS, iNewStatus, 0); } HANDLE __cdecl GetAwayMsg(HANDLE hContact) - { CCSDATA ccs = { hContact, PSS_GETAWAYMSG, 0, 0 }; + { + CCSDATA ccs = { hContact, PSS_GETAWAYMSG, 0, 0 }; return (HANDLE)MyCallProtoService(m_szModuleName, PSS_GETAWAYMSG, 0, (LPARAM)&ccs); } int __cdecl RecvAwayMsg(HANDLE hContact, int statusMode, PROTORECVEVENT* evt) - { CCSDATA ccs = { hContact, PSR_AWAYMSG, statusMode, (LPARAM)evt }; + { + CCSDATA ccs = { hContact, PSR_AWAYMSG, statusMode, (LPARAM)evt }; return (int)MyCallProtoService(m_szModuleName, PSR_AWAYMSG, 0, (LPARAM)&ccs); } int __cdecl SendAwayMsg(HANDLE hContact, HANDLE hProcess, const char* msg) - { CCSDATA ccs = { hContact, PSS_AWAYMSG, (WPARAM)hProcess, (LPARAM)msg }; + { + CCSDATA ccs = { hContact, PSS_AWAYMSG, (WPARAM)hProcess, (LPARAM)msg }; return (int)MyCallProtoService(m_szModuleName, PSS_AWAYMSG, 0, (LPARAM)&ccs); } int __cdecl SetAwayMsg(int iStatus, const TCHAR* msg) - { return (int)MyCallProtoService(m_szModuleName, PS_SETAWAYMSG, iStatus, (LPARAM)StrConvA(msg)); + { + return (int)MyCallProtoService(m_szModuleName, PS_SETAWAYMSG, iStatus, (LPARAM)StrConvA(msg)); } int __cdecl UserIsTyping(HANDLE hContact, int type) - { CCSDATA ccs = { hContact, PSS_USERISTYPING, (WPARAM)hContact, type }; + { + CCSDATA ccs = { hContact, PSS_USERISTYPING, (WPARAM)hContact, type }; return MyCallProtoService(m_szModuleName, PSS_USERISTYPING, 0, (LPARAM)&ccs); } -- cgit v1.2.3