From 2548065ebc5da2a8778cd4f49343b847773ee174 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 Aug 2015 15:39:23 +0000 Subject: 'unreferenced formal parameter' warnings fixed git-svn-id: http://svn.miranda-ng.org/main/trunk@14913 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Tlen/src/stdafx.h | 6 -- protocols/Tlen/src/tlen.cpp | 22 +++---- protocols/Tlen/src/tlen_advsearch.cpp | 4 +- protocols/Tlen/src/tlen_file.cpp | 4 +- protocols/Tlen/src/tlen_list.cpp | 2 +- protocols/Tlen/src/tlen_muc.cpp | 6 +- protocols/Tlen/src/tlen_p2p_new.cpp | 4 -- protocols/Tlen/src/tlen_presence.cpp | 2 +- protocols/Tlen/src/tlen_svc.cpp | 105 ++++++++++++++-------------------- protocols/Tlen/src/tlen_thread.cpp | 7 +-- protocols/Tlen/src/tlen_voice.cpp | 6 +- 11 files changed, 66 insertions(+), 102 deletions(-) (limited to 'protocols/Tlen/src') diff --git a/protocols/Tlen/src/stdafx.h b/protocols/Tlen/src/stdafx.h index b0bf31b044..7e7f4bc3f2 100644 --- a/protocols/Tlen/src/stdafx.h +++ b/protocols/Tlen/src/stdafx.h @@ -231,14 +231,8 @@ struct TlenProtocol : public PROTO 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 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 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); virtual int __cdecl SetApparentMode(MCONTACT hContact, int mode); virtual int __cdecl SetStatus(int iNewStatus); diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp index 5c74b77123..97f6d9f981 100644 --- a/protocols/Tlen/src/tlen.cpp +++ b/protocols/Tlen/src/tlen.cpp @@ -55,17 +55,13 @@ PLUGININFOEX pluginInfo = { // Main tlen server connection thread global variables -BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hModule, DWORD, LPVOID) { -#ifdef _DEBUG - _CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); -#endif - hInst = hModule; return TRUE; } -extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD) { return &pluginInfo; } @@ -111,7 +107,7 @@ static void TlenRegisterIcons() Icon_Register(hInst, "Protocols/Tlen", iconList, _countof(iconList), "TLEN"); } -int TlenProtocol::PrebuildContactMenu(WPARAM hContact, LPARAM lParam) +int TlenProtocol::PrebuildContactMenu(WPARAM hContact, LPARAM) { if (hContact != NULL && isOnline) { DBVARIANT dbv; @@ -136,7 +132,7 @@ int TlenProtocol::PrebuildContactMenu(WPARAM hContact, LPARAM lParam) return 0; } -INT_PTR TlenProtocol::ContactMenuHandleRequestAuth(WPARAM hContact, LPARAM lParam) +INT_PTR TlenProtocol::ContactMenuHandleRequestAuth(WPARAM hContact, LPARAM) { if (hContact != NULL && isOnline) { DBVARIANT dbv; @@ -148,7 +144,7 @@ INT_PTR TlenProtocol::ContactMenuHandleRequestAuth(WPARAM hContact, LPARAM lPara return 0; } -INT_PTR TlenProtocol::ContactMenuHandleGrantAuth(WPARAM hContact, LPARAM lParam) +INT_PTR TlenProtocol::ContactMenuHandleGrantAuth(WPARAM hContact, LPARAM) { if (hContact != NULL && isOnline) { DBVARIANT dbv; @@ -160,14 +156,14 @@ INT_PTR TlenProtocol::ContactMenuHandleGrantAuth(WPARAM hContact, LPARAM lParam) return 0; } -INT_PTR TlenProtocol::ContactMenuHandleSendPicture(WPARAM hContact, LPARAM lParam) +INT_PTR TlenProtocol::ContactMenuHandleSendPicture(WPARAM hContact, LPARAM) { if (hContact != NULL && isOnline) SendPicture(this, hContact); return 0; } -INT_PTR TlenProtocol::MenuHandleInbox(WPARAM wParam, LPARAM lParam) +INT_PTR TlenProtocol::MenuHandleInbox(WPARAM, LPARAM) { char szFileName[ MAX_PATH ]; DBVARIANT dbv; @@ -231,7 +227,7 @@ INT_PTR TlenProtocol::MenuHandleInbox(WPARAM wParam, LPARAM lParam) return 0; } -int TlenProtocol::OnModulesLoaded(WPARAM wParam, LPARAM lParam) +int TlenProtocol::OnModulesLoaded(WPARAM, LPARAM) { char str[128]; /* Set all contacts to offline */ @@ -252,7 +248,7 @@ int TlenProtocol::OnModulesLoaded(WPARAM wParam, LPARAM lParam) } -int TlenProtocol::PreShutdown(WPARAM wParam, LPARAM lParam) +int TlenProtocol::PreShutdown(WPARAM, LPARAM) { debugLogA("TLEN TlenPreShutdown"); return 0; diff --git a/protocols/Tlen/src/tlen_advsearch.cpp b/protocols/Tlen/src/tlen_advsearch.cpp index 3ae4f313c9..ad3bcc323e 100644 --- a/protocols/Tlen/src/tlen_advsearch.cpp +++ b/protocols/Tlen/src/tlen_advsearch.cpp @@ -39,7 +39,7 @@ static void InitComboBox(HWND hwndCombo, TLEN_FIELD_MAP *fieldMap) } } -INT_PTR CALLBACK TlenAdvSearchDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK TlenAdvSearchDlgProc(HWND hwndDlg, UINT msg, WPARAM, LPARAM) { switch(msg) { case WM_INITDIALOG: @@ -89,7 +89,7 @@ static void FetchCombo(HWND hwndDlg, UINT idCtrl, char *fieldName, char **str, i } } -char *TlenAdvSearchCreateQuery(HWND hwndDlg, int iqId) +char *TlenAdvSearchCreateQuery(HWND hwndDlg, int) { char *str; int strSize; diff --git a/protocols/Tlen/src/tlen_file.cpp b/protocols/Tlen/src/tlen_file.cpp index 7d5e2713e6..20de8dafee 100644 --- a/protocols/Tlen/src/tlen_file.cpp +++ b/protocols/Tlen/src/tlen_file.cpp @@ -150,7 +150,7 @@ static void TlenFileReceiveParse(TLEN_FILE_TRANSFER *ft) } } -static void TlenFileReceivingConnection(HANDLE hConnection, DWORD dwRemoteIP, void * pExtra) +static void TlenFileReceivingConnection(HANDLE hConnection, DWORD, void * pExtra) { TlenProtocol *proto = (TlenProtocol *)pExtra; TLEN_FILE_TRANSFER *ft = TlenP2PEstablishIncomingConnection(proto, hConnection, LIST_FILE, TRUE); @@ -386,7 +386,7 @@ static void TlenFileSendParse(TLEN_FILE_TRANSFER *ft) } } -static void TlenFileSendingConnection(HANDLE hConnection, DWORD dwRemoteIP, void * pExtra) +static void TlenFileSendingConnection(HANDLE hConnection, DWORD, void * pExtra) { HANDLE slisten; TlenProtocol *proto = (TlenProtocol *)pExtra; diff --git a/protocols/Tlen/src/tlen_list.cpp b/protocols/Tlen/src/tlen_list.cpp index f44811537e..03bad29a52 100644 --- a/protocols/Tlen/src/tlen_list.cpp +++ b/protocols/Tlen/src/tlen_list.cpp @@ -202,7 +202,7 @@ void TlenListRemoveByIndex(TlenProtocol *proto, int index) } } -void TlenListAddResource(TlenProtocol *proto, TLEN_LIST list, const char *jid, int status, const char *statusMessage) +void TlenListAddResource(TlenProtocol *proto, TLEN_LIST list, const char *jid, int, const char *statusMessage) { int i; diff --git a/protocols/Tlen/src/tlen_muc.cpp b/protocols/Tlen/src/tlen_muc.cpp index 2f16316620..888d71c5a1 100644 --- a/protocols/Tlen/src/tlen_muc.cpp +++ b/protocols/Tlen/src/tlen_muc.cpp @@ -91,7 +91,7 @@ static char *getDisplayName(TlenProtocol *proto, const char *id) return mir_strdup(id); } -int TlenMUCRecvInvitation(TlenProtocol *proto, const char *roomId, const char *roomName, const char *from, const char *reason) +int TlenMUCRecvInvitation(TlenProtocol *proto, const char *roomId, const char*, const char *from, const char*) { int ignore, ask, groupChatPolicy; if (roomId == NULL) return 1; @@ -216,7 +216,7 @@ static int TlenMUCSendQuery(TlenProtocol *proto, int type, const char *parent, i return 0; } -INT_PTR TlenProtocol::MUCMenuHandleMUC(WPARAM wParam, LPARAM lParam) +INT_PTR TlenProtocol::MUCMenuHandleMUC(WPARAM, LPARAM) { if (!isOnline) return 1; @@ -225,7 +225,7 @@ INT_PTR TlenProtocol::MUCMenuHandleMUC(WPARAM wParam, LPARAM lParam) return 0; } -INT_PTR TlenProtocol::MUCContactMenuHandleMUC(WPARAM wParam, LPARAM lParam) +INT_PTR TlenProtocol::MUCContactMenuHandleMUC(WPARAM wParam, LPARAM) { MCONTACT hContact; DBVARIANT dbv; diff --git a/protocols/Tlen/src/tlen_p2p_new.cpp b/protocols/Tlen/src/tlen_p2p_new.cpp index f796b62ff0..7c7c7ecd50 100644 --- a/protocols/Tlen/src/tlen_p2p_new.cpp +++ b/protocols/Tlen/src/tlen_p2p_new.cpp @@ -299,10 +299,6 @@ void __cdecl TlenProcessP2P(XmlNode *node, ThreadData *info) { /* ks - key size (in bytes) */ /* mi - p2p connection id */ char *n = TlenXmlGetAttrValue(dcng, "n"); // n - name (file_send) - char *k = TlenXmlGetAttrValue(dcng, "k"); // k - ??? - char *v = TlenXmlGetAttrValue(dcng, "v"); // v - ??? - char *ck = TlenXmlGetAttrValue(dcng, "ck"); // ck - aes key - char *iv = TlenXmlGetAttrValue(dcng, "iv"); // iv - aes initial vector if (!mir_strcmp(n, "file_send")) { if ((item=TlenListGetItemPtr(info->proto, LIST_FILE, id)) != NULL) { item->id2 = mir_strdup(id2); diff --git a/protocols/Tlen/src/tlen_presence.cpp b/protocols/Tlen/src/tlen_presence.cpp index ccbcab9beb..56e4fc9e10 100644 --- a/protocols/Tlen/src/tlen_presence.cpp +++ b/protocols/Tlen/src/tlen_presence.cpp @@ -194,7 +194,7 @@ void setOwnStatusOnCList(TlenProtocol *proto, int status, char *statusMsg) } } -static void TlenSendPresenceTo(TlenProtocol *proto, int status, char *to) +static void TlenSendPresenceTo(TlenProtocol *proto, int status, char*) { char *showBody, *statusMsg, *presenceType; char *ptr = NULL; diff --git a/protocols/Tlen/src/tlen_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp index 71e12493e8..5108cba8cc 100644 --- a/protocols/Tlen/src/tlen_svc.cpp +++ b/protocols/Tlen/src/tlen_svc.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "tlen_avatar.h" #include "tlen_file.h" -DWORD_PTR TlenProtocol::GetCaps(int type, MCONTACT hContact) +DWORD_PTR TlenProtocol::GetCaps(int type, MCONTACT) { switch(type) { case PFLAGNUM_1: @@ -222,7 +222,7 @@ MCONTACT TlenProtocol::AddToList(int flags, PROTOSEARCHRESULT *psr) return AddToListByJID(this, jsr->jid, flags);// wParam is flag e.g. PALF_TEMPORARY } -MCONTACT TlenProtocol::AddToListByEvent(int flags, int iContact, MEVENT hDbEvent) +MCONTACT TlenProtocol::AddToListByEvent(int flags, int, MEVENT hDbEvent) { DBEVENTINFO dbei = { sizeof(dbei) }; if ((dbei.cbBlob = db_event_getBlobSize(hDbEvent)) == (DWORD)(-1)) @@ -309,7 +309,7 @@ int TlenProtocol::Authorize(MEVENT hDbEvent) return 0; } -int TlenProtocol::AuthDeny(MEVENT hDbEvent, const TCHAR* szReason) +int TlenProtocol::AuthDeny(MEVENT hDbEvent, const TCHAR*) { if (!isOnline) return 1; @@ -406,7 +406,7 @@ int TlenProtocol::SetStatus(int iNewStatus) return 0; } -INT_PTR TlenProtocol::GetStatus(WPARAM wParam, LPARAM lParam) +INT_PTR TlenProtocol::GetStatus(WPARAM, LPARAM) { return m_iStatus; } @@ -466,7 +466,7 @@ int TlenProtocol::SetAwayMsg(int iStatus, const TCHAR* msg) return 0; } -int TlenProtocol::GetInfo(MCONTACT hContact, int infoType) +int TlenProtocol::GetInfo(MCONTACT hContact, int) { DBVARIANT dbv; int iqId; @@ -590,7 +590,7 @@ static void __cdecl TlenGetAwayMsgThread(void *ptr) delete data; } -INT_PTR TlenProtocol::SendAlert(WPARAM hContact, LPARAM lParam) +INT_PTR TlenProtocol::SendAlert(WPARAM hContact, LPARAM) { DBVARIANT dbv; if (isOnline && !db_get(hContact, m_szModuleName, "jid", &dbv)) { @@ -705,12 +705,12 @@ HANDLE TlenProtocol::GetAwayMsg(MCONTACT hContact) return (HANDLE)1; } -int TlenProtocol::RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt) +int TlenProtocol::RecvAwayMsg(MCONTACT, int, PROTORECVEVENT*) { return 0; } -HANDLE TlenProtocol::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath) +HANDLE TlenProtocol::FileAllow(MCONTACT, HANDLE hTransfer, const TCHAR* szPath) { if (!isOnline) return 0; @@ -730,7 +730,7 @@ HANDLE TlenProtocol::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* return (HANDLE)hTransfer; } -int TlenProtocol::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason) +int TlenProtocol::FileDeny(MCONTACT, HANDLE hTransfer, const TCHAR*) { if (!isOnline) return 1; @@ -746,11 +746,12 @@ int TlenProtocol::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szR return 0; } -int TlenProtocol::FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename) { +int TlenProtocol::FileResume(HANDLE, int*, const TCHAR**) +{ return 0; } -int TlenProtocol::FileCancel(MCONTACT hContact, HANDLE hTransfer) +int TlenProtocol::FileCancel(MCONTACT, HANDLE hTransfer) { TLEN_FILE_TRANSFER *ft = (TLEN_FILE_TRANSFER *) hTransfer; debugLogA("Invoking FileCancel()"); @@ -835,29 +836,6 @@ HANDLE TlenProtocol::SendFile(MCONTACT hContact, const TCHAR* szDescription, TCH return (HANDLE) ft; } -int TlenProtocol::SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList){ - return 0; -} - -int TlenProtocol::SendUrl(MCONTACT hContact, int flags, const char* urlt){ - return 0; -} - -int TlenProtocol::RecvMsg(MCONTACT hContact, PROTORECVEVENT* evt) -{ - return Proto_RecvMessage(hContact, evt); -} - -int TlenProtocol::RecvFile(MCONTACT hContact, PROTORECVFILET* evt) -{ - return Proto_RecvFile(hContact, evt); -} - -int TlenProtocol::RecvUrl(MCONTACT hContact, PROTORECVEVENT*) -{ - return 0; -} - static char* settingToChar( DBCONTACTWRITESETTING* cws ) { switch( cws->value.type ) { @@ -1002,7 +980,7 @@ int TlenProtocol::TlenDbSettingChanged(WPARAM wParam, LPARAM lParam) return 0; } -int TlenProtocol::TlenContactDeleted(WPARAM wParam, LPARAM lParam) +int TlenProtocol::TlenContactDeleted(WPARAM wParam, LPARAM) { if (!isOnline) // should never happen return 0; @@ -1063,14 +1041,14 @@ INT_PTR TlenProtocol::GetMyAvatar(WPARAM wParam, LPARAM lParam) return 0; } -static INT_PTR CALLBACK TlenChangeAvatarDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam ) +static INT_PTR CALLBACK TlenChangeAvatarDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM) { - switch ( msg ) { + switch (msg) { case WM_INITDIALOG: - TranslateDialogDefault( hwndDlg ); + TranslateDialogDefault(hwndDlg); { HICON hIcon = GetIcolibIcon(IDI_TLEN); - SendMessage(hwndDlg, WM_SETICON, (WPARAM) ICON_BIG, (LPARAM) hIcon); + SendMessage(hwndDlg, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hIcon); ReleaseIcolibIcon(hIcon); } CheckDlgButton(hwndDlg, IDC_PUBLICAVATAR, BST_CHECKED); @@ -1092,32 +1070,33 @@ static INT_PTR CALLBACK TlenChangeAvatarDlgProc( HWND hwndDlg, UINT msg, WPARAM return 0; } -INT_PTR TlenProtocol::SetMyAvatar(WPARAM wParam, LPARAM lParam) +INT_PTR TlenProtocol::SetMyAvatar(WPARAM, LPARAM lParam) { - if (!isOnline){ + if (!isOnline) { PUShowMessageT(TranslateT("You need to be connected to Tlen account to set avatar."), SM_WARNING); return 1; } - TCHAR* szFileName = ( TCHAR* )lParam; - TCHAR tFileName[ MAX_PATH ]; + TCHAR* szFileName = (TCHAR*)lParam; + TCHAR tFileName[MAX_PATH]; if (szFileName != NULL) { - int result = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_USER_CHANGEAVATAR), NULL, TlenChangeAvatarDlgProc, (LPARAM) NULL); + int result = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_USER_CHANGEAVATAR), NULL, TlenChangeAvatarDlgProc, (LPARAM)NULL); TlenGetAvatarFileName(this, NULL, tFileName, MAX_PATH); - if ( CopyFile( szFileName, tFileName, FALSE ) == FALSE ) + if (CopyFile(szFileName, tFileName, FALSE) == FALSE) return 1; char* tFileNameA = mir_t2a(tFileName); //TODO - drop io.h - int fileIn = open( tFileNameA, O_RDWR | O_BINARY, S_IREAD | S_IWRITE ); - if ( fileIn != -1 ) { + int fileIn = open(tFileNameA, O_RDWR | O_BINARY, S_IREAD | S_IWRITE); + if (fileIn != -1) { long dwPngSize = filelength(fileIn); BYTE* pResult = (BYTE *)mir_alloc(dwPngSize); if (pResult != NULL) { - read( fileIn, pResult, dwPngSize ); - close( fileIn ); + read(fileIn, pResult, dwPngSize); + close(fileIn); TlenUploadAvatar(this, pResult, dwPngSize, (result & 0x10000) != 0); mir_free(pResult); } - } else debugLogA("SetMyAvatar open error"); + } + else debugLogA("SetMyAvatar open error"); mir_free(tFileName); mir_free(tFileNameA); } @@ -1132,7 +1111,7 @@ INT_PTR TlenProtocol::GetAvatarCaps(WPARAM wParam, LPARAM lParam) case AF_MAXSIZE: { POINT* size = (POINT*)lParam; - if ( size ) + if (size) size->x = size->y = 64; } return 0; @@ -1156,7 +1135,7 @@ INT_PTR TlenProtocol::GetAvatarCaps(WPARAM wParam, LPARAM lParam) int TlenProtocol::OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam) { //TlenProtocol *proto = (TlenProtocol *)ptr; - switch( iEventType ) { + switch (iEventType) { case EV_PROTO_ONLOAD: return OnModulesLoaded(0, 0); case EV_PROTO_ONOPTIONS: return OptionsInit(wParam, lParam); case EV_PROTO_ONEXIT: return PreShutdown(0, 0); @@ -1169,33 +1148,33 @@ int TlenProtocol::OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lPara extern INT_PTR CALLBACK TlenAccMgrUIDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); -INT_PTR TlenProtocol::AccMgrUI(WPARAM wParam, LPARAM lParam) +INT_PTR TlenProtocol::AccMgrUI(WPARAM, LPARAM lParam) { return (INT_PTR)CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_ACCMGRUI), (HWND)lParam, TlenAccMgrUIDlgProc, (LPARAM)this); } void TlenInitServicesVTbl(TlenProtocol *proto) { - proto->CreateProtoService(PS_GETNAME, &TlenProtocol::GetName); + proto->CreateProtoService(PS_GETNAME, &TlenProtocol::GetName); proto->CreateProtoService(PS_GETAVATARINFO, &TlenProtocol::GetAvatarInfo); - proto->CreateProtoService(PS_SEND_NUDGE, &TlenProtocol::SendAlert); - proto->CreateProtoService(PS_GETAVATARCAPS, &TlenProtocol::GetAvatarCaps); - proto->CreateProtoService(PS_SETMYAVATAR, &TlenProtocol::SetMyAvatar); - proto->CreateProtoService(PS_GETMYAVATAR, &TlenProtocol::GetMyAvatar); - proto->CreateProtoService(PS_GETSTATUS, &TlenProtocol::GetStatus); + proto->CreateProtoService(PS_SEND_NUDGE, &TlenProtocol::SendAlert); + proto->CreateProtoService(PS_GETAVATARCAPS, &TlenProtocol::GetAvatarCaps); + proto->CreateProtoService(PS_SETMYAVATAR, &TlenProtocol::SetMyAvatar); + proto->CreateProtoService(PS_GETMYAVATAR, &TlenProtocol::GetMyAvatar); + proto->CreateProtoService(PS_GETSTATUS, &TlenProtocol::GetStatus); proto->CreateProtoService(PS_CREATEACCMGRUI, &TlenProtocol::AccMgrUI); } -TlenProtocol::TlenProtocol( const char *aProtoName, const TCHAR *aUserName) : - PROTO(aProtoName, aUserName) +TlenProtocol::TlenProtocol(const char *aProtoName, const TCHAR *aUserName) : +PROTO(aProtoName, aUserName) { TlenInitServicesVTbl(this); hTlenNudge = CreateProtoEvent("/Nudge"); - HookProtoEvent(ME_OPT_INITIALISE, &TlenProtocol::OptionsInit); + HookProtoEvent(ME_OPT_INITIALISE, &TlenProtocol::OptionsInit); HookProtoEvent(ME_DB_CONTACT_SETTINGCHANGED, &TlenProtocol::TlenDbSettingChanged); - HookProtoEvent(ME_DB_CONTACT_DELETED, &TlenProtocol::TlenContactDeleted); + HookProtoEvent(ME_DB_CONTACT_DELETED, &TlenProtocol::TlenContactDeleted); HookProtoEvent(ME_CLIST_PREBUILDCONTACTMENU, &TlenProtocol::PrebuildContactMenu); DBVARIANT dbv; diff --git a/protocols/Tlen/src/tlen_thread.cpp b/protocols/Tlen/src/tlen_thread.cpp index f3f027388a..6803b74876 100644 --- a/protocols/Tlen/src/tlen_thread.cpp +++ b/protocols/Tlen/src/tlen_thread.cpp @@ -57,7 +57,7 @@ static void TlenProcessV(XmlNode *node, ThreadData *info); static void TlenProcessAvatar(XmlNode* node, ThreadData *info); static void TlenProcessCipher(XmlNode *node, ThreadData *info); -static VOID NTAPI TlenDummyApcFunc(ULONG_PTR param) +static VOID NTAPI TlenDummyApcFunc(ULONG_PTR) { return; } @@ -511,9 +511,8 @@ static void TlenProcessProtocol(XmlNode *node, ThreadData *info) } -static void TlenProcessCipher(XmlNode *node, ThreadData *info) +static void TlenProcessCipher(XmlNode*, ThreadData *info) { - char *type=TlenXmlGetAttrValue(node, "type"); info->useAES = TRUE; TlenSend(info->proto, ""); TlenSendAuth(info->proto); @@ -1119,7 +1118,7 @@ static void TlenProcessN(XmlNode *node, ThreadData *info) /* * Presence is chat rooms */ -static void TlenProcessP(XmlNode *node, ThreadData *info) +static void TlenProcessP(XmlNode *node, ThreadData*) { char *f, *a, *k; XmlNode *sNode, *xNode, *iNode, *kNode; diff --git a/protocols/Tlen/src/tlen_voice.cpp b/protocols/Tlen/src/tlen_voice.cpp index cfad2223d9..e0a5f48a7f 100644 --- a/protocols/Tlen/src/tlen_voice.cpp +++ b/protocols/Tlen/src/tlen_voice.cpp @@ -45,7 +45,7 @@ static void TlenVoiceReceiveParse(TLEN_FILE_TRANSFER *ft); static void TlenVoiceSendParse(TLEN_FILE_TRANSFER *ft); static void TlenVoiceReceivingConnection(HANDLE hNewConnection, DWORD dwRemoteIP, void * pExtra); -static void CALLBACK TlenVoicePlaybackCallback(HWAVEOUT hwo, UINT uMsg, DWORD* dwInstance, DWORD dwParam1, DWORD dwParam2) +static void CALLBACK TlenVoicePlaybackCallback(HWAVEOUT hwo, UINT uMsg, DWORD* dwInstance, DWORD dwParam1, DWORD) { if (uMsg == WOM_DONE) { TLEN_VOICE_CONTROL *control = (TLEN_VOICE_CONTROL *)dwInstance; @@ -360,7 +360,7 @@ void __cdecl TlenVoiceReceiveThread(TLEN_FILE_TRANSFER *ft) TlenP2PFreeFileTransfer(ft); } -static void TlenVoiceReceivingConnection(HANDLE hConnection, DWORD dwRemoteIP, void * pExtra) +static void TlenVoiceReceivingConnection(HANDLE hConnection, DWORD, void * pExtra) { HANDLE slisten; TlenProtocol *proto = (TlenProtocol *)pExtra; @@ -673,7 +673,7 @@ int TlenVoiceCancelAll(TlenProtocol *proto) return 0; } -INT_PTR TlenProtocol::VoiceContactMenuHandleVoice(WPARAM wParam, LPARAM lParam) +INT_PTR TlenProtocol::VoiceContactMenuHandleVoice(WPARAM wParam, LPARAM) { if (!isOnline) return 1; -- cgit v1.2.3