From a15cd68f0412e1b211e746a2e4d5682e96f5a113 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 Aug 2015 13:52:01 +0000 Subject: code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@14911 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CryptoPP/cryptopp_10.vcxproj | 12 ++- plugins/CryptoPP/cryptopp_12.vcxproj | 4 - plugins/CryptoPP/cryptopp_14.vcxproj | 4 - plugins/CryptoPP/src/GPGw/gpg_main.cpp | 10 +-- plugins/CryptoPP/src/cpp_rsau.cpp | 6 +- plugins/CryptoPP/src/cpp_rsau.h | 6 +- plugins/CryptoPP/src/utf8.cpp | 4 +- plugins/Exchange/src/emails.h | 2 +- plugins/Exchange/src/exchange.cpp | 4 +- plugins/GmailNotifier/src/main.cpp | 6 +- plugins/GmailNotifier/src/notify.cpp | 2 +- plugins/GmailNotifier/src/utility.cpp | 9 +- plugins/LotusNotify/src/LotusNotify.cpp | 12 ++- plugins/NotifyAnything/src/main.cpp | 2 +- plugins/SkypeStatusChange/src/main.cpp | 4 +- plugins/SkypeStatusChange/src/options.cpp | 14 +-- plugins/Spamotron/src/bayes.cpp | 1 - plugins/Spamotron/src/options.cpp | 3 +- plugins/Spamotron/src/spamotron.cpp | 5 +- plugins/Spamotron/src/utils.cpp | 1 - plugins/StartPosition/src/main.cpp | 2 +- plugins/StartupSilence/src/main.cpp | 52 +++++------ plugins/StartupSilence/src/stdafx.h | 2 +- plugins/StatusChange/src/main.cpp | 8 +- plugins/Weather/src/weather.cpp | 10 +-- plugins/Weather/src/weather_addstn.cpp | 10 +-- plugins/Weather/src/weather_contacts.cpp | 8 +- plugins/Weather/src/weather_data.cpp | 2 +- plugins/Weather/src/weather_info.cpp | 2 +- plugins/Weather/src/weather_ini.cpp | 4 +- plugins/Weather/src/weather_mwin.cpp | 6 +- plugins/Weather/src/weather_svcs.cpp | 14 +-- plugins/Weather/src/weather_update.cpp | 15 ++-- plugins/Weather/src/weather_userinfo.cpp | 2 +- plugins/WebView/src/main.cpp | 4 +- plugins/WebView/src/webview.cpp | 27 +++--- plugins/WebView/src/webview_alerts.cpp | 2 +- plugins/WebView/src/webview_datawnd.cpp | 4 +- plugins/WebView/src/webview_opts.cpp | 2 +- plugins/WebView/src/webview_services.cpp | 16 ++-- plugins/WinterSpeak/src/DialogConfigActive.cpp | 6 +- plugins/WinterSpeak/src/DialogConfigActive.h | 2 +- plugins/WinterSpeak/src/SpeechApi51Lexicon.cpp | 3 +- plugins/WinterSpeak/src/main.cpp | 4 +- plugins/YAMN/src/browser/badconnect.cpp | 3 - plugins/YAMN/src/browser/mailbrowser.cpp | 16 ++-- plugins/YAMN/src/filterplugin.cpp | 2 +- plugins/YAMN/src/mails/mails.cpp | 12 +-- plugins/YAMN/src/main.cpp | 6 +- plugins/YAMN/src/proto/pop3/pop3comm.cpp | 12 +-- plugins/YAMN/src/proto/pop3/pop3opt.cpp | 117 +++++++++++-------------- plugins/YAMN/src/protoplugin.cpp | 2 +- plugins/YAMN/src/services.cpp | 22 ++--- plugins/YAMN/src/yamn.cpp | 2 +- plugins/YARelay/src/main.cpp | 4 +- plugins/YahooGroups/src/YahooGroups.cpp | 4 +- plugins/YahooGroups/src/hooked_events.cpp | 4 +- plugins/YahooGroups/src/list.cpp | 2 +- plugins/YahooGroups/src/list.h | 2 +- plugins/YahooGroups/src/services.cpp | 6 +- plugins/YahooGroups/src/utils.cpp | 24 ++--- plugins/wbOSD/src/events.cpp | 1 - plugins/wbOSD/src/main.cpp | 2 +- plugins/wbOSD/src/wbOSD.cpp | 6 +- 64 files changed, 253 insertions(+), 314 deletions(-) (limited to 'plugins') diff --git a/plugins/CryptoPP/cryptopp_10.vcxproj b/plugins/CryptoPP/cryptopp_10.vcxproj index ad3b93eaef..ad1afc0700 100644 --- a/plugins/CryptoPP/cryptopp_10.vcxproj +++ b/plugins/CryptoPP/cryptopp_10.vcxproj @@ -96,7 +96,8 @@ $(IntDir)$(TargetName).lib Windows false - pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll + + @@ -121,7 +122,8 @@ ws2_32.lib;$(SolutionDir)$(Configuration)64\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).lib Windows - pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll + + @@ -150,7 +152,8 @@ $(IntDir)$(TargetName).lib true Windows - pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll + + @@ -179,7 +182,8 @@ $(IntDir)$(TargetName).lib true Windows - pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll + + diff --git a/plugins/CryptoPP/cryptopp_12.vcxproj b/plugins/CryptoPP/cryptopp_12.vcxproj index 6852cb99c8..257c79c973 100644 --- a/plugins/CryptoPP/cryptopp_12.vcxproj +++ b/plugins/CryptoPP/cryptopp_12.vcxproj @@ -98,7 +98,6 @@ $(IntDir)$(TargetName).lib Windows false - pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll @@ -123,7 +122,6 @@ ws2_32.lib;$(SolutionDir)$(Configuration)64\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).lib Windows - pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll @@ -152,7 +150,6 @@ $(IntDir)$(TargetName).lib true Windows - pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll @@ -181,7 +178,6 @@ $(IntDir)$(TargetName).lib true Windows - pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll diff --git a/plugins/CryptoPP/cryptopp_14.vcxproj b/plugins/CryptoPP/cryptopp_14.vcxproj index d0da144bb1..20cf0206fa 100644 --- a/plugins/CryptoPP/cryptopp_14.vcxproj +++ b/plugins/CryptoPP/cryptopp_14.vcxproj @@ -98,7 +98,6 @@ $(IntDir)$(TargetName).lib Windows false - pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll @@ -123,7 +122,6 @@ ws2_32.lib;$(SolutionDir)$(Configuration)64\Obj\cryptlib\cryptlib.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).lib Windows - pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll @@ -152,7 +150,6 @@ $(IntDir)$(TargetName).lib true Windows - pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll @@ -181,7 +178,6 @@ $(IntDir)$(TargetName).lib true Windows - pgpsdk.dll;pgpsdknl.dll;pgpsdkui.dll diff --git a/plugins/CryptoPP/src/GPGw/gpg_main.cpp b/plugins/CryptoPP/src/GPGw/gpg_main.cpp index fc544ffa52..5bbbc9f5e3 100644 --- a/plugins/CryptoPP/src/GPGw/gpg_main.cpp +++ b/plugins/CryptoPP/src/GPGw/gpg_main.cpp @@ -163,7 +163,6 @@ LPSTR __cdecl _gpg_encrypt(LPCSTR message, LPCSTR keyid) { char buffer[ciphertextsize]; char *encmessage = 0; - int encmessagelen; gpgResult gpgresult; if(strlen(keyid)) @@ -174,7 +173,7 @@ LPSTR __cdecl _gpg_encrypt(LPCSTR message, LPCSTR keyid) if(gpgresult!=gpgSuccess) return 0; - encmessagelen = strlen(buffer)+1; + size_t encmessagelen = strlen(buffer)+1; encmessage = (char *) LocalAlloc(LPTR,encmessagelen); memcpy(encmessage, buffer, encmessagelen); } @@ -192,7 +191,6 @@ LPSTR __cdecl _gpg_decrypt(LPCSTR message) char *storedpassphrase; char passphrase[passphrasesize]; char *decmessage = 0; - int decmessagelen; gpgResult gpgresult; const char *begin = strstr(message, txtbeginpgpmessage); @@ -254,7 +252,7 @@ LPSTR __cdecl _gpg_decrypt(LPCSTR message) memset(passphrase, 0, sizeof(passphrase)); - decmessagelen = strlen(buffer)+1; + size_t decmessagelen = strlen(buffer)+1; decmessage = (char *) LocalAlloc(LPTR,decmessagelen); memcpy(decmessage, buffer, decmessagelen); } @@ -356,7 +354,6 @@ BOOL ShowSelectExecDlg(LPSTR path) BOOL ShowSelectHomeDlg(LPSTR path) { - int i; OPENFILENAME ofn; ofn.lpstrFile = GetEnvValue("GNUPGHOME"); @@ -387,7 +384,8 @@ BOOL ShowSelectHomeDlg(LPSTR path) ofn.lpstrTitle = "Open Public Keyring"; if (!GetOpenFileName(&ofn)) return FALSE; - for(i=strlen(path);i && path[i]!='\\';i--); + int i; + for(i = (int)strlen(path);i && path[i]!='\\';i--); path[i] = 0; return TRUE; diff --git a/plugins/CryptoPP/src/cpp_rsau.cpp b/plugins/CryptoPP/src/cpp_rsau.cpp index b0913219fa..b2bc42d302 100644 --- a/plugins/CryptoPP/src/cpp_rsau.cpp +++ b/plugins/CryptoPP/src/cpp_rsau.cpp @@ -111,7 +111,7 @@ string hash(string& b) return ::hash((PBYTE)b.data(), b.length()); } -string hash(PBYTE b, int l) +string hash(PBYTE b, size_t l) { BYTE h[RSA_KEYSIZE]; RSA_CalculateDigest(h, b, l); @@ -129,7 +129,7 @@ string hash128(LPSTR b) return hash128((PBYTE)b, strlen(b)); } -string hash128(PBYTE b, int l) +string hash128(PBYTE b, size_t l) { BYTE h[RIPEMD128::DIGESTSIZE]; RIPEMD128().CalculateDigest(h, b, l); @@ -147,7 +147,7 @@ string hash256(LPSTR b) return hash256((PBYTE)b, strlen(b)); } -string hash256(PBYTE b, int l) +string hash256(PBYTE b, size_t l) { BYTE h[RIPEMD256::DIGESTSIZE]; RIPEMD256().CalculateDigest(h, b, l); diff --git a/plugins/CryptoPP/src/cpp_rsau.h b/plugins/CryptoPP/src/cpp_rsau.h index bc45a248c5..38ba656f9d 100644 --- a/plugins/CryptoPP/src/cpp_rsau.h +++ b/plugins/CryptoPP/src/cpp_rsau.h @@ -77,15 +77,15 @@ string& un_tlv(string&,int&,int&); int str2int(string&); string hash(string&); -string hash(PBYTE,int); +string hash(PBYTE, size_t); string hash128(string&); string hash128(LPSTR); -string hash128(PBYTE,int); +string hash128(PBYTE, size_t); string hash256(string&); string hash256(LPSTR); -string hash256(PBYTE,int); +string hash256(PBYTE, size_t); Integer BinaryToInteger(const string&); string IntegerToBinary(const Integer&); diff --git a/plugins/CryptoPP/src/utf8.cpp b/plugins/CryptoPP/src/utf8.cpp index e6b9602161..77c13fa3bc 100644 --- a/plugins/CryptoPP/src/utf8.cpp +++ b/plugins/CryptoPP/src/utf8.cpp @@ -45,13 +45,13 @@ LPSTR __cdecl utf8encode(LPCWSTR str) LPWSTR __cdecl utf8decode(LPCSTR str) { - int i, len; + int i; LPSTR p; // LPWSTR wszOut; if (str == NULL) return NULL; - len = strlen(str) + 1; + size_t len = strlen(str) + 1; SAFE_FREE(wszOut); if ((wszOut = (LPWSTR)malloc(len*sizeof(WCHAR))) == NULL) diff --git a/plugins/Exchange/src/emails.h b/plugins/Exchange/src/emails.h index f33e7a510e..6dedbd24ce 100644 --- a/plugins/Exchange/src/emails.h +++ b/plugins/Exchange/src/emails.h @@ -83,7 +83,7 @@ class CExchangeServer{ int Check(int bNoEmailsNotify = FALSE); }; -extern CExchangeServer &exchangeServer; +extern CExchangeServer exchangeServer; int ShowMessage(TCHAR *message, int cUnreadEmails); int ShowPopupMessage(TCHAR *title, TCHAR *message, int cUnreadEmails); diff --git a/plugins/Exchange/src/exchange.cpp b/plugins/Exchange/src/exchange.cpp index 97ef9250bb..d2597ae298 100644 --- a/plugins/Exchange/src/exchange.cpp +++ b/plugins/Exchange/src/exchange.cpp @@ -26,9 +26,7 @@ HICON hiMailIcon = NULL; HWND hEmailsDlg = NULL; int hLangpack=0; -CExchangeServer &exchangeServer = CExchangeServer(); - -//PLUGINLINK *pluginLink; +CExchangeServer exchangeServer; PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), diff --git a/plugins/GmailNotifier/src/main.cpp b/plugins/GmailNotifier/src/main.cpp index a4d3556299..e413c192e3 100644 --- a/plugins/GmailNotifier/src/main.cpp +++ b/plugins/GmailNotifier/src/main.cpp @@ -36,7 +36,7 @@ static PLUGININFOEX pluginInfoEx = { 0x243955e0, 0x75d9, 0x4cc3, { 0x9b, 0x28, 0x6f, 0x9c, 0x5a, 0xf4, 0x53, 0x2d } } }; -INT_PTR GetCaps(WPARAM wParam, LPARAM lParam) +INT_PTR GetCaps(WPARAM wParam, LPARAM) { if (wParam == PFLAGNUM_2 && opt.ShowCustomIcon) return PF2_ONLINE | PF2_LIGHTDND | PF2_SHORTAWAY; @@ -44,7 +44,7 @@ INT_PTR GetCaps(WPARAM wParam, LPARAM lParam) return 0; } -INT_PTR GetStatus(WPARAM wParam, LPARAM lParam) +INT_PTR GetStatus(WPARAM, LPARAM) { return ID_STATUS_ONLINE; } @@ -55,7 +55,7 @@ INT_PTR GetName(WPARAM wParam, LPARAM lParam) return 0; } -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; diff --git a/plugins/GmailNotifier/src/notify.cpp b/plugins/GmailNotifier/src/notify.cpp index 6e16c3a0b0..a4f6c054ea 100644 --- a/plugins/GmailNotifier/src/notify.cpp +++ b/plugins/GmailNotifier/src/notify.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -int OpenBrowser(WPARAM hContact, LPARAM lParam) +int OpenBrowser(WPARAM hContact, LPARAM) { char *proto = GetContactProto(hContact); if (proto && !mir_strcmp(proto, MODULE_NAME)) { diff --git a/plugins/GmailNotifier/src/utility.cpp b/plugins/GmailNotifier/src/utility.cpp index 69ae7536e6..9aa00d8e79 100644 --- a/plugins/GmailNotifier/src/utility.cpp +++ b/plugins/GmailNotifier/src/utility.cpp @@ -42,9 +42,12 @@ BOOL GetBrowser(char *str) strKey = strIE; else if (opt.OpenUsePrg == 0) strKey = strDefault; - else if (!db_get_s(NULL, MODULE_NAME, "OpenUsePrgPath", &dbv)) { - mir_strcpy(str, dbv.pszVal); - db_free(&dbv); + else { + if (!db_get_s(NULL, MODULE_NAME, "OpenUsePrgPath", &dbv)) { + mir_strcpy(str, dbv.pszVal); + db_free(&dbv); + } + else *str = 0; return FALSE; } diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp index e417bcf361..855b12087a 100644 --- a/plugins/LotusNotify/src/LotusNotify.cpp +++ b/plugins/LotusNotify/src/LotusNotify.cpp @@ -574,7 +574,6 @@ void checkthread(void*) STATUS error = NOERROR; char fullpath[255]; DBHANDLE db_handle = NULLHANDLE; /* database handle */ - TCHAR buffer[NSF_INFO_SIZE] = TEXT(""); /* database info buffer */ char UserName[MAXUSERNAME + 1]; HANDLE hTable; @@ -864,10 +863,10 @@ INT_PTR PluginMenuCommand(WPARAM wParam, LPARAM lParam) //window timer callback function, called on timer event -void CALLBACK atTime(HWND hWnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +void CALLBACK atTime(HWND, UINT, UINT_PTR idEvent, DWORD) { log(L"atTime: start"); - BOOL b = KillTimer(hTimerWnd, idEvent); + KillTimer(hTimerWnd, idEvent); if (currentStatus != ID_STATUS_OFFLINE) { //if status lets to check check(); @@ -1497,7 +1496,7 @@ INT_PTR GetName(WPARAM wParam, LPARAM lParam) //gives icon for proto module -INT_PTR TMLoadIcon(WPARAM wParam, LPARAM lParam) +INT_PTR TMLoadIcon(WPARAM wParam, LPARAM) { UINT id; @@ -1770,7 +1769,7 @@ extern "C" int __declspec(dllexport) Unload() return 0; } -extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD) { #ifdef _WIN64 #error LotusNotify.dll cannot work with 64bit Miranda. (Lotus client is 32bit only) @@ -1780,8 +1779,7 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD miranda extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_LOTUSNOTIFY, MIID_PROTOCOL, MIID_LAST }; - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID ) { switch (dwReason) { case DLL_PROCESS_ATTACH: diff --git a/plugins/NotifyAnything/src/main.cpp b/plugins/NotifyAnything/src/main.cpp index 932b307f84..0a4ebeaf0e 100644 --- a/plugins/NotifyAnything/src/main.cpp +++ b/plugins/NotifyAnything/src/main.cpp @@ -971,7 +971,7 @@ void stop_threads() WaitForSingleObject(g_tcp_thread, INFINITE); } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfo; } diff --git a/plugins/SkypeStatusChange/src/main.cpp b/plugins/SkypeStatusChange/src/main.cpp index fab0d1ce7d..ab63f7ba5f 100644 --- a/plugins/SkypeStatusChange/src/main.cpp +++ b/plugins/SkypeStatusChange/src/main.cpp @@ -263,7 +263,7 @@ int SSC_OnPreShutdown(WPARAM/* wParam*/, LPARAM/* lParam*/) /******************************* INSTALLATION PROCEDURES *****************************/ -BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID) { if (fdwReason == DLL_PROCESS_ATTACH) g_hModule = hinstDLL; @@ -271,7 +271,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) return TRUE; } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &g_pluginInfo; } diff --git a/plugins/SkypeStatusChange/src/options.cpp b/plugins/SkypeStatusChange/src/options.cpp index d761a98d86..2949c5913d 100644 --- a/plugins/SkypeStatusChange/src/options.cpp +++ b/plugins/SkypeStatusChange/src/options.cpp @@ -26,7 +26,7 @@ enum ETreeCheckBoxState TCBS_DISABLE_CHECKED = 4, }; -HTREEITEM tree_insert_item(HWND hDlg, HWND hwndTree, TCHAR *pName, HTREEITEM htiParent, ETreeCheckBoxState nState, CTreeItemData *pData) +HTREEITEM tree_insert_item(HWND hwndTree, TCHAR *pName, HTREEITEM htiParent, ETreeCheckBoxState nState, CTreeItemData *pData) { TVINSERTSTRUCT tvi = { 0 }; tvi.hParent = htiParent; @@ -39,7 +39,7 @@ HTREEITEM tree_insert_item(HWND hDlg, HWND hwndTree, TCHAR *pName, HTREEITEM hti return TreeView_InsertItem(hwndTree,&tvi); } -void InitProtocolTree(HWND hDlg,HWND hwndTreeCtrl) +void InitProtocolTree(HWND hwndTreeCtrl) { int cAccounts = 0; PROTOACCOUNT** ppAccount; @@ -55,7 +55,7 @@ void InitProtocolTree(HWND hDlg,HWND hwndTreeCtrl) pItemData->m_pszModule = pAccount->szModuleName; bool bProtocolExcluded = g_Options.IsProtocolExcluded(pAccount->szModuleName); - HTREEITEM hti = tree_insert_item(hDlg,hwndTreeCtrl,pAccount->tszAccountName,TVI_ROOT,((true == bProtocolExcluded) ? TCBS_CHECKED : TCBS_UNCHECKED),pItemData); + HTREEITEM hti = tree_insert_item(hwndTreeCtrl,pAccount->tszAccountName,TVI_ROOT,((true == bProtocolExcluded) ? TCBS_CHECKED : TCBS_UNCHECKED),pItemData); if (hti) { int nStatusBits = CallProtoService(pAccount->szModuleName,PS_GETCAPS,PFLAGNUM_2,0); @@ -78,7 +78,7 @@ void InitProtocolTree(HWND hDlg,HWND hwndTreeCtrl) else nState = TCBS_UNCHECKED; } - tree_insert_item(hDlg,hwndTreeCtrl,TranslateTS(g_aStatusCode[OFFLINE_STATUS_INDEX].m_ptszStatusName),hti,nState,pItemData); + tree_insert_item(hwndTreeCtrl,TranslateTS(g_aStatusCode[OFFLINE_STATUS_INDEX].m_ptszStatusName),hti,nState,pItemData); for(size_t k = 0; k < _countof(g_aStatusCode); ++k) { const CMirandaStatus2SkypeStatus& m2s = g_aStatusCode[k]; unsigned long statusFlags = Proto_Status2Flag(m2s.m_nMirandaStatus); @@ -101,7 +101,7 @@ void InitProtocolTree(HWND hDlg,HWND hwndTreeCtrl) nState = TCBS_UNCHECKED; } - tree_insert_item(hDlg,hwndTreeCtrl,TranslateTS(m2s.m_ptszStatusName),hti,nState,pItemData); + tree_insert_item(hwndTreeCtrl,TranslateTS(m2s.m_ptszStatusName),hti,nState,pItemData); } } @@ -245,7 +245,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hdlg,UINT msg,WPARAM wp,LPARAM lp) HIMAGELIST hImage = get_image_list(); if (hImage) TreeView_SetImageList(hwndTreeCtrl,hImage,TVSIL_STATE); - InitProtocolTree(hdlg,hwndTreeCtrl); + InitProtocolTree(hwndTreeCtrl); } CheckDlgButton(hdlg, IDC_CHECK_SYNCK_STATUS_MSG, (g_Options.GetSyncStatusMsgFlag()) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hdlg, IDC_CHECK_STATUSES, (g_Options.GetSyncStatusStateFlag()) ? BST_CHECKED : BST_UNCHECKED); @@ -303,7 +303,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hdlg,UINT msg,WPARAM wp,LPARAM lp) return FALSE; } -int SSC_OptInitialise(WPARAM wp, LPARAM lp) +int SSC_OptInitialise(WPARAM wp, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 910000000; diff --git a/plugins/Spamotron/src/bayes.cpp b/plugins/Spamotron/src/bayes.cpp index d62df44481..a9587ee991 100644 --- a/plugins/Spamotron/src/bayes.cpp +++ b/plugins/Spamotron/src/bayes.cpp @@ -11,7 +11,6 @@ HANDLE hBayesFolder; int CheckBayes() { - FOLDERSGETDATA fgd = {0}; char bayesdb_fullpath[MAX_PATH]; char bayesdb_tmp[MAX_PATH]; diff --git a/plugins/Spamotron/src/options.cpp b/plugins/Spamotron/src/options.cpp index 3e204e11d0..ff8863bd3b 100644 --- a/plugins/Spamotron/src/options.cpp +++ b/plugins/Spamotron/src/options.cpp @@ -95,7 +95,6 @@ INT_PTR CALLBACK DlgProcOptionsMain(HWND optDlg, UINT msg, WPARAM wParam, LPARAM PROTOACCOUNT **pd; TCHAR pName[256] = {0}; char protoOption[256] = {0}; - char protoName[256] = {0}; HWND hProtocolsList = GetDlgItem(optDlg, IDC_OPT_PROTOCOLS); LVITEM lvi = {0}; LVCOLUMN lvc = {0}; @@ -553,7 +552,7 @@ INT_PTR CALLBACK DlgProcOptionsBayes(HWND optDlg, UINT msg, WPARAM wParam, LPARA extern INT_PTR CALLBACK DlgProcOptionsPopups(HWND optDlg, UINT msg, WPARAM wParam, LPARAM lParam); -int OnOptInitialize(WPARAM wParam, LPARAM lParam) +int OnOptInitialize(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; diff --git a/plugins/Spamotron/src/spamotron.cpp b/plugins/Spamotron/src/spamotron.cpp index 0528c44033..29d76e78a3 100644 --- a/plugins/Spamotron/src/spamotron.cpp +++ b/plugins/Spamotron/src/spamotron.cpp @@ -22,7 +22,7 @@ PLUGININFOEX pluginInfo = { extern int OnOptInitialize(WPARAM wParam, LPARAM lParam); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; @@ -40,7 +40,6 @@ int OnDBEventFilterAdd(WPARAM wParam, LPARAM lParam) MCONTACT hContact = wParam; DBEVENTINFO *dbei = (DBEVENTINFO *)lParam; char *msgblob; - POPUPDATAT ppdp = {0}; char protoOption[256] = {0}; int buflen = MAX_BUFFER_LENGTH; TCHAR buf[MAX_BUFFER_LENGTH]; @@ -502,7 +501,7 @@ void RemoveNotOnListSettings() } } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfo; } diff --git a/plugins/Spamotron/src/utils.cpp b/plugins/Spamotron/src/utils.cpp index c4512e7be8..aa6bb0df29 100644 --- a/plugins/Spamotron/src/utils.cpp +++ b/plugins/Spamotron/src/utils.cpp @@ -161,7 +161,6 @@ int get_response_id(const TCHAR* strvar) const char *error; int erroroffs, rc; TCHAR *_str, *_strvar; - int opts = 0; TCHAR regex[] = _T("^%response([#-_]([0-9]+))?%$"); int ovector[9]; diff --git a/plugins/StartPosition/src/main.cpp b/plugins/StartPosition/src/main.cpp index 910f9ab365..37f8dc5087 100644 --- a/plugins/StartPosition/src/main.cpp +++ b/plugins/StartPosition/src/main.cpp @@ -40,7 +40,7 @@ PLUGININFOEX pluginInfo = { {0x211f6277, 0x6f9b, 0x4b77, {0xa9, 0x39, 0x84, 0xd0, 0x4b, 0x26, 0xb3, 0x8c}} }; -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp index ccdef4917c..0cc5698791 100644 --- a/plugins/StartupSilence/src/main.cpp +++ b/plugins/StartupSilence/src/main.cpp @@ -31,7 +31,6 @@ HANDLE GetIconHandle(char *szIcon); HANDLE hOptionsInitialize; HANDLE hTTBarloaded = NULL; HANDLE Buttons = NULL; -INT_PTR CALLBACK DlgProcOptions(HWND, UINT, WPARAM, LPARAM); int InitializeOptions(WPARAM wParam,LPARAM lParam); int DisablePopup(WPARAM wParam, LPARAM lParam); int ModulesLoaded(WPARAM wParam, LPARAM lParam); @@ -77,13 +76,13 @@ PLUGININFOEX pluginInfo={ {0x7b856b6a, 0xd48f, 0x4f54, {0xb8, 0xd6, 0xc8, 0xd8, 0x6d, 0x2, 0xff, 0xc2}} }; -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfo; } @@ -93,7 +92,7 @@ INT_PTR StartupSilence() InitSettings(); HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded); mir_forkthread((pThreadFunc)AdvSt, NULL); - CreateServiceFunction(SS_SERVICE_NAME, SturtupSilenceEnabled); + CreateServiceFunction(SS_SERVICE_NAME, StartupSilenceEnabled); CreateServiceFunction(SS_SILENCE_CONNECTION, SilenceConnection); IsMenu(); HookEvent(ME_OPT_INITIALISE, InitializeOptions); @@ -115,7 +114,7 @@ extern "C" __declspec(dllexport) int Unload(void) return 0; } -int ModulesLoaded(WPARAM wParam, LPARAM lParam) +int ModulesLoaded(WPARAM, LPARAM) { HookEvent(ME_POPUP_FILTER, DisablePopup); hTTBarloaded = HookEvent(ME_TTB_MODULELOADED, CreateTTButtons); @@ -127,7 +126,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) return 0; } -int DisablePopup(WPARAM wParam, LPARAM lParam) +int DisablePopup(WPARAM wParam, LPARAM) { if (DefEnabled == 1 && DefPopup == 0) //All popups are blocked return 1; @@ -261,7 +260,7 @@ static INT_PTR AdvSt() return 0; } -static INT_PTR SturtupSilenceEnabled(WPARAM wParam, LPARAM lParam) +INT_PTR StartupSilenceEnabled(WPARAM, LPARAM) { db_set_b(NULL, MODULE_NAME, EnabledComp, !Enabled); LoadSettings(); @@ -281,7 +280,7 @@ static INT_PTR SturtupSilenceEnabled(WPARAM wParam, LPARAM lParam) return 0; } -static INT_PTR SilenceConnection(WPARAM wParam, LPARAM lParam) +INT_PTR SilenceConnection(WPARAM wParam, LPARAM) { timer = (BYTE)wParam; return 0; @@ -315,7 +314,7 @@ void UpdateTTB() CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)Buttons, (Enabled == 1 ? 0 : TTBST_PUSHED)); } -static int CreateTTButtons(WPARAM wParam, LPARAM lParam) +static int CreateTTButtons(WPARAM, LPARAM) { TTBButton ttb = { 0 }; ttb.dwFlags = (Enabled == 1 ? 0 : TTBBF_PUSHED) | TTBBF_VISIBLE | TTBBF_ASPUSHBUTTON; @@ -345,26 +344,11 @@ HANDLE GetIconHandle(char *szIcon) return IcoLib_GetIconHandle(szSettingName); } -int InitializeOptions(WPARAM wParam,LPARAM lParam) -{ - OPTIONSDIALOGPAGE odp = { 0 }; - odp.hInstance = hInst; - odp.pszTemplate = MAKEINTRESOURCEA(IDD_SSOPT); - odp.pszGroup = LPGEN("Events");//FIXME: move to...Group? - odp.pszTitle = MENU_NAME; - odp.groupPosition = 910000000; - odp.flags = ODPF_BOLDGROUPS; - odp.pfnDlgProc = DlgProcOptions; - Options_AddPage(wParam, &odp); - return 0; -} - static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { - case WM_INITDIALOG: { + case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); - static BOOL initDlg=FALSE; LoadSettings(); SetDlgItemText(hwndDlg, IDC_HST, mir_a2t(hostname)); CheckDlgButton(hwndDlg, IDC_DELAY, (Enabled == 1) ? BST_CHECKED : BST_UNCHECKED); @@ -387,7 +371,6 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP CheckDlgButton(hwndDlg, IDC_DEFSOUNDS, (DefSound == 1) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_RESTORE, (DefEnabled == 1) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_NONSTATUSES, (NonStatusAllow == 1) ? BST_CHECKED : BST_UNCHECKED); - } break; case WM_COMMAND: @@ -470,9 +453,20 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP break; } break; - case WM_NOTIFY: - case WM_DESTROY: - break; } return FALSE; } + +int InitializeOptions(WPARAM wParam, LPARAM) +{ + OPTIONSDIALOGPAGE odp = { 0 }; + odp.hInstance = hInst; + odp.pszTemplate = MAKEINTRESOURCEA(IDD_SSOPT); + odp.pszGroup = LPGEN("Events");//FIXME: move to...Group? + odp.pszTitle = MENU_NAME; + odp.groupPosition = 910000000; + odp.flags = ODPF_BOLDGROUPS; + odp.pfnDlgProc = DlgProcOptions; + Options_AddPage(wParam, &odp); + return 0; +} diff --git a/plugins/StartupSilence/src/stdafx.h b/plugins/StartupSilence/src/stdafx.h index f7c0c3043a..7ea2fb4367 100644 --- a/plugins/StartupSilence/src/stdafx.h +++ b/plugins/StartupSilence/src/stdafx.h @@ -30,7 +30,7 @@ void IsMenu(); void UpdateMenu(); void UpdateTTB(); -INT_PTR SturtupSilenceEnabled(WPARAM wParam, LPARAM lParam); +INT_PTR StartupSilenceEnabled(WPARAM wParam, LPARAM lParam); INT_PTR SilenceConnection(WPARAM wParam, LPARAM lParam); #define MODULE_NAME "StartupSilence" diff --git a/plugins/StatusChange/src/main.cpp b/plugins/StatusChange/src/main.cpp index 364d43b308..e5e1b035c6 100644 --- a/plugins/StatusChange/src/main.cpp +++ b/plugins/StatusChange/src/main.cpp @@ -43,7 +43,7 @@ void LoadOptions() Options.IfOuttolunch = (BOOL)db_get_b(NULL, PLUGINNAME, "IfOuttolunch", FALSE); } -static int StatusChangeGetMessage(WPARAM wParam, LPARAM hDbEvent) +static int StatusChangeGetMessage(WPARAM, LPARAM hDbEvent) { int status; BOOL read, send, change_status; @@ -310,7 +310,7 @@ static INT_PTR CALLBACK DlgProcStatusChangeOpts(HWND hwndDlg, UINT msg, WPARAM w return FALSE; } -int StatusChangeOptInit(WPARAM wParam, LPARAM lParam) +int StatusChangeOptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; @@ -323,13 +323,13 @@ int StatusChangeOptInit(WPARAM wParam, LPARAM lParam) return 0; } -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfo; } diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp index a4481b2605..749ed697cf 100644 --- a/plugins/Weather/src/weather.cpp +++ b/plugins/Weather/src/weather.cpp @@ -74,18 +74,18 @@ static const PLUGININFOEX pluginInfoEx = {0x6b612a34, 0xdcf2, 0x4e32, {0x85, 0xcf, 0xb6, 0xfd, 0x0, 0x6b, 0x74, 0x5e}} }; -extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfoEx; } -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; } -int WeatherShutdown(WPARAM wParam,LPARAM lParam) +int WeatherShutdown(WPARAM, LPARAM) { KillTimer(NULL, timerId); // kill update timer @@ -101,7 +101,7 @@ int WeatherShutdown(WPARAM wParam,LPARAM lParam) return 0; } -int OnToolbarLoaded(WPARAM wParam, LPARAM lParam) +int OnToolbarLoaded(WPARAM, LPARAM) { TTBButton ttb = { 0 }; ttb.name = LPGEN("Enable/disable auto update"); @@ -117,7 +117,7 @@ int OnToolbarLoaded(WPARAM wParam, LPARAM lParam) // weather protocol initialization function // run after the event ME_SYSTEM_MODULESLOADED occurs -int WeatherInit(WPARAM wParam,LPARAM lParam) +int WeatherInit(WPARAM, LPARAM) { // initialize netlib NetlibInit(); diff --git a/plugins/Weather/src/weather_addstn.cpp b/plugins/Weather/src/weather_addstn.cpp index 85b4be596c..f8d54ad42e 100644 --- a/plugins/Weather/src/weather_addstn.cpp +++ b/plugins/Weather/src/weather_addstn.cpp @@ -32,7 +32,7 @@ static TCHAR name1[256]; // protocol service function for adding a new contact onto contact list // lParam = PROTOSEARCHRESULT -INT_PTR WeatherAddToList(WPARAM wParam, LPARAM lParam) +INT_PTR WeatherAddToList(WPARAM, LPARAM lParam) { PROTOSEARCHRESULT *psr = (PROTOSEARCHRESULT*)lParam; if(!psr || !psr->email.t) @@ -136,7 +136,7 @@ BOOL CheckSearch() { static TCHAR sID[32]; // A timer process for the ID search (threaded) -static void __cdecl BasicSearchTimerProc(LPVOID hWnd) +static void __cdecl BasicSearchTimerProc(LPVOID) { int result; // search only when it's not current updating weather. @@ -152,7 +152,7 @@ static void __cdecl BasicSearchTimerProc(LPVOID hWnd) // the service function for ID search // lParam = ID search string -INT_PTR WeatherBasicSearch(WPARAM wParam, LPARAM lParam) +INT_PTR WeatherBasicSearch(WPARAM, LPARAM lParam) { if (searchId != -1) return 0; //only one search at a time _tcsncpy(sID, ( TCHAR* )lParam, _countof(sID)); @@ -166,7 +166,7 @@ INT_PTR WeatherBasicSearch(WPARAM wParam, LPARAM lParam) // ============ NAME SEARCH ============ // name search timer process (threaded) -static void __cdecl NameSearchTimerProc(LPVOID hWnd) +static void __cdecl NameSearchTimerProc(LPVOID) { // search only when it's not current updating weather. if (CheckSearch()) @@ -180,7 +180,7 @@ static void __cdecl NameSearchTimerProc(LPVOID hWnd) searchId = -1; } -static INT_PTR CALLBACK WeatherSearchAdvancedDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK WeatherSearchAdvancedDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM) { switch (msg) { case WM_INITDIALOG: diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp index 84ced72294..16dcf7d3ce 100644 --- a/plugins/Weather/src/weather_contacts.cpp +++ b/plugins/Weather/src/weather_contacts.cpp @@ -55,7 +55,7 @@ INT_PTR ViewLog(WPARAM wParam, LPARAM lParam) // read complete forecast // wParam = current contact -INT_PTR LoadForecast(WPARAM wParam, LPARAM lParam) +INT_PTR LoadForecast(WPARAM wParam, LPARAM) { TCHAR id[256], loc2[256]; GetStationID(wParam, id, _countof(id)); @@ -73,7 +73,7 @@ INT_PTR LoadForecast(WPARAM wParam, LPARAM lParam) // load weather map // wParam = current contact -INT_PTR WeatherMap(WPARAM wParam, LPARAM lParam) +INT_PTR WeatherMap(WPARAM wParam, LPARAM) { TCHAR id[256], loc2[256]; GetStationID(wParam, id, _countof(id)); @@ -95,7 +95,7 @@ INT_PTR WeatherMap(WPARAM wParam, LPARAM lParam) // show edit settings dialog // wParam = current contact -INT_PTR EditSettings(WPARAM wParam, LPARAM lParam) +INT_PTR EditSettings(WPARAM wParam, LPARAM) { HWND hEditDlg = WindowList_Find(hWindowList, wParam); @@ -426,7 +426,7 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa // when a contact is deleted, make sure some other contact take over the default station // wParam = deleted contact -int ContactDeleted(WPARAM wParam, LPARAM lParam) +int ContactDeleted(WPARAM wParam, LPARAM) { if (!IsMyContact(wParam)) return 0; diff --git a/plugins/Weather/src/weather_data.cpp b/plugins/Weather/src/weather_data.cpp index c49194e720..d9aac9ab94 100644 --- a/plugins/Weather/src/weather_data.cpp +++ b/plugins/Weather/src/weather_data.cpp @@ -424,7 +424,7 @@ int GetWeatherDataFromDB(const char *szSetting, LPARAM lparam) // remove or display the weather information for a contact // hContact - the contact in which the info is going to be removed -void DBDataManage(MCONTACT hContact, WORD Mode, WPARAM wParam, LPARAM lParam) +void DBDataManage(MCONTACT hContact, WORD Mode, WPARAM wParam, LPARAM) { LIST arSettings(10); diff --git a/plugins/Weather/src/weather_info.cpp b/plugins/Weather/src/weather_info.cpp index 7b24cbc804..4e865b42aa 100644 --- a/plugins/Weather/src/weather_info.cpp +++ b/plugins/Weather/src/weather_info.cpp @@ -103,7 +103,7 @@ columns[] = }; -INT_PTR CALLBACK DlgProcINIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK DlgProcINIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM) { switch (msg) { diff --git a/plugins/Weather/src/weather_ini.cpp b/plugins/Weather/src/weather_ini.cpp index 3a55f8554d..946f98cf8f 100644 --- a/plugins/Weather/src/weather_ini.cpp +++ b/plugins/Weather/src/weather_ini.cpp @@ -94,9 +94,7 @@ void WIItemListAdd(WIDATAITEM *DataItem, WIDATA *Data) // name = the string to store in the "name" field void ResetDataItem(WIDATAITEM *Item, const TCHAR *name) { - TCHAR str[] = _T("ID Search - Station Name"); - Item->Name = ( TCHAR* )mir_alloc( sizeof(str)); - mir_tstrcpy(Item->Name, str); + Item->Name = mir_tstrdup(name); Item->Start = _T(""); Item->End = _T(""); Item->Unit = _T(""); diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp index 7d24297c9f..4390e86058 100644 --- a/plugins/Weather/src/weather_mwin.cpp +++ b/plugins/Weather/src/weather_mwin.cpp @@ -291,7 +291,7 @@ void UpdateMwinData(MCONTACT hContact) } -INT_PTR Mwin_MenuClicked(WPARAM wParam,LPARAM lParam) +INT_PTR Mwin_MenuClicked(WPARAM wParam, LPARAM) { BOOL addwnd = WindowList_Find(hMwinWindowList, wParam) == NULL; if (addwnd) @@ -302,7 +302,7 @@ INT_PTR Mwin_MenuClicked(WPARAM wParam,LPARAM lParam) } -int BuildContactMenu(WPARAM wparam,LPARAM lparam) +int BuildContactMenu(WPARAM wparam,LPARAM) { int flags = db_get_dw((MCONTACT)wparam, WEATHERPROTONAME, "mwin", 0) ? CMIF_CHECKED : 0; Menu_ModifyItem(hMwinMenu, NULL, INVALID_HANDLE_VALUE, flags); @@ -310,7 +310,7 @@ int BuildContactMenu(WPARAM wparam,LPARAM lparam) } -int RedrawFrame(WPARAM wParam, LPARAM lParam) +int RedrawFrame(WPARAM, LPARAM) { WindowList_Broadcast(hMwinWindowList, WM_REDRAWWIN, 0, 0); return 0; diff --git a/plugins/Weather/src/weather_svcs.cpp b/plugins/Weather/src/weather_svcs.cpp index 972670128e..09af852326 100644 --- a/plugins/Weather/src/weather_svcs.cpp +++ b/plugins/Weather/src/weather_svcs.cpp @@ -32,7 +32,7 @@ static HGENMENU hEnableDisableMenu; //============ MIRANDA PROTOCOL SERVICES ============ // protocol service function for setting weather protocol status -INT_PTR WeatherSetStatus(WPARAM new_status, LPARAM lParam) +INT_PTR WeatherSetStatus(WPARAM new_status, LPARAM) { new_status = new_status != ID_STATUS_OFFLINE ? ID_STATUS_ONLINE : ID_STATUS_OFFLINE; @@ -51,7 +51,7 @@ INT_PTR WeatherSetStatus(WPARAM new_status, LPARAM lParam) } // get capabilities protocol service function -INT_PTR WeatherGetCaps(WPARAM wParam, LPARAM lParam) +INT_PTR WeatherGetCaps(WPARAM wParam, LPARAM) { INT_PTR ret = 0; @@ -96,13 +96,13 @@ INT_PTR WeatherGetName(WPARAM wParam,LPARAM lParam) } // protocol service function to get the current status of the protocol -INT_PTR WeatherGetStatus(WPARAM wParam,LPARAM lParam) +INT_PTR WeatherGetStatus(WPARAM, LPARAM) { return status; } // protocol service function to get the icon of the protocol -INT_PTR WeatherLoadIcon(WPARAM wParam,LPARAM lParam) +INT_PTR WeatherLoadIcon(WPARAM wParam,LPARAM) { return (LOWORD(wParam) == PLI_PROTOCOL) ? (INT_PTR)CopyIcon(LoadIconEx("main", FALSE)) : 0; } @@ -126,7 +126,7 @@ INT_PTR WeatherGetInfo(WPARAM,LPARAM lParam) static const TCHAR *statusStr[] = { _T("Light"), _T("Fog"), _T("SShower"), _T("Snow"), _T("RShower"), _T("Rain"), _T("PCloudy"), _T("Cloudy"), _T("Sunny"), _T("NA") }; static const WORD statusValue[] = { LIGHT, FOG, SSHOWER, SNOW, RSHOWER, RAIN, PCLOUDY, CLOUDY, SUNNY, NA }; -INT_PTR WeatherGetAvatarInfo(WPARAM wParam, LPARAM lParam) +INT_PTR WeatherGetAvatarInfo(WPARAM, LPARAM lParam) { TCHAR szSearchPath[MAX_PATH], *chop; WORD status; @@ -187,7 +187,7 @@ static void __cdecl WeatherGetAwayMsgThread(void *hContact) else ProtoBroadcastAck(WEATHERPROTONAME, (MCONTACT)hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)1, 0); } -static INT_PTR WeatherGetAwayMsg(WPARAM wParam, LPARAM lParam) +static INT_PTR WeatherGetAwayMsg(WPARAM, LPARAM lParam) { CCSDATA* ccs = (CCSDATA*)lParam; if (ccs == NULL) @@ -258,7 +258,7 @@ INT_PTR EnableDisableCmd(WPARAM wParam,LPARAM lParam) } // update the weather popup menu item when click on it -INT_PTR MenuitemNotifyCmd(WPARAM wParam,LPARAM lParam) +INT_PTR MenuitemNotifyCmd(WPARAM, LPARAM) { UpdatePopupMenu(!opt.UsePopup); return 0; diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp index 97fbfe48d0..78bf4c6a10 100644 --- a/plugins/Weather/src/weather_update.cpp +++ b/plugins/Weather/src/weather_update.cpp @@ -302,7 +302,7 @@ void UpdateAll(BOOL AutoUpdate, BOOL RemoveData) // update a single station // wParam = handle for the weather station that is going to be updated -INT_PTR UpdateSingleStation(WPARAM wParam, LPARAM lParam) +INT_PTR UpdateSingleStation(WPARAM wParam, LPARAM) { if (IsMyContact(wParam)) { // add the station to the end of the update queue @@ -320,7 +320,7 @@ INT_PTR UpdateSingleStation(WPARAM wParam, LPARAM lParam) // update a single station with removing the old data // wParam = handle for the weather station that is going to be updated -INT_PTR UpdateSingleRemove(WPARAM wParam, LPARAM lParam) +INT_PTR UpdateSingleRemove(WPARAM wParam, LPARAM) { if (IsMyContact(wParam)) { // add the station to the end of the update queue, and also remove old data @@ -338,7 +338,7 @@ INT_PTR UpdateSingleRemove(WPARAM wParam, LPARAM lParam) // update all weather thread // this thread update each weather station from the queue -void UpdateThreadProc(LPVOID hWnd) +void UpdateThreadProc(LPVOID) { WaitForSingleObject(hUpdateMutex, INFINITE); if (ThreadRunning) { @@ -359,7 +359,7 @@ void UpdateThreadProc(LPVOID hWnd) } // the "Update All" menu item in main menu -INT_PTR UpdateAllInfo(WPARAM wParam,LPARAM lParam) +INT_PTR UpdateAllInfo(WPARAM, LPARAM) { if (!ThreadRunning) UpdateAll(FALSE, FALSE); @@ -367,7 +367,8 @@ INT_PTR UpdateAllInfo(WPARAM wParam,LPARAM lParam) } // the "Update All" menu item in main menu and remove the old data -INT_PTR UpdateAllRemove(WPARAM wParam,LPARAM lParam) { +INT_PTR UpdateAllRemove(WPARAM, LPARAM) +{ if (!ThreadRunning) UpdateAll(FALSE, TRUE); return 0; @@ -586,7 +587,7 @@ int GetWeatherData(MCONTACT hContact) //============ UPDATE TIMERS ============ // main auto-update timer -void CALLBACK timerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +void CALLBACK timerProc(HWND, UINT, UINT_PTR, DWORD) { // only run if it is not current updating and the auto update option is enabled if ( !ThreadRunning && opt.CAutoUpdate && !Miranda_Terminated() && (opt.NoProtoCondition || status == ID_STATUS_ONLINE)) @@ -595,7 +596,7 @@ void CALLBACK timerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) // temporary timer for first run // when this is run, it kill the old startup timer and create the permenant one above -void CALLBACK timerProc2(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +void CALLBACK timerProc2(HWND, UINT, UINT_PTR, DWORD) { KillTimer(NULL, timerId); ThreadRunning = FALSE; diff --git a/plugins/Weather/src/weather_userinfo.cpp b/plugins/Weather/src/weather_userinfo.cpp index 8e0fc7116f..ba96ef88c7 100644 --- a/plugins/Weather/src/weather_userinfo.cpp +++ b/plugins/Weather/src/weather_userinfo.cpp @@ -132,7 +132,7 @@ INT_PTR CALLBACK DlgProcUIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa //============ BRIEF INFORMATION ============ -static int BriefDlgResizer(HWND hwnd, LPARAM lParam, UTILRESIZECONTROL *urc) +static int BriefDlgResizer(HWND, LPARAM, UTILRESIZECONTROL *urc) { switch (urc->wId) { case IDC_HEADERBAR: diff --git a/plugins/WebView/src/main.cpp b/plugins/WebView/src/main.cpp index cb46486ffe..e0174d74a7 100644 --- a/plugins/WebView/src/main.cpp +++ b/plugins/WebView/src/main.cpp @@ -76,7 +76,7 @@ void ChangeContactStatus(int con_stat) } /*****************************************************************************/ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; @@ -85,7 +85,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /*****************************************************************************/ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST }; -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfoEx; } diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp index 333e501c32..6eba2c8d56 100644 --- a/plugins/WebView/src/webview.cpp +++ b/plugins/WebView/src/webview.cpp @@ -70,7 +70,7 @@ void ChangeMenuItemCountdown() } /*****************************************************************************/ -static int CALLBACK EnumFontsProc(ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX *lpntme, int FontType, LPARAM lParam) +static int CALLBACK EnumFontsProc(ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX*, int, LPARAM lParam) { if (!IsWindow((HWND) lParam)) return FALSE; @@ -113,7 +113,7 @@ void BGclrLoop() } /*****************************************************************************/ -void StartUpdate(void *dummy) +void StartUpdate(void*) { StartUpDelay = 1; Sleep(((db_get_dw(NULL, MODULENAME, START_DELAY_KEY, 0)) * SECOND)); @@ -125,7 +125,7 @@ void StartUpdate(void *dummy) } /*****************************************************************************/ -void ContactLoop(void *dummy) +void ContactLoop(void*) { if (StartUpDelay == 0) { for (MCONTACT hContact = db_find_first(MODULENAME); hContact != NULL; hContact = db_find_next(hContact, MODULENAME)) { @@ -138,7 +138,7 @@ void ContactLoop(void *dummy) } /*****************************************************************************/ -INT_PTR MarkAllReadMenuCommand(WPARAM wParam, LPARAM lParam) +INT_PTR MarkAllReadMenuCommand(WPARAM, LPARAM) { ChangeContactStatus(1); return 0; @@ -164,7 +164,7 @@ void InitialiseGlobals(void) } /*****************************************************************************/ -int Doubleclick(WPARAM wParam, LPARAM lParam) +int Doubleclick(WPARAM wParam, LPARAM) { MCONTACT hContact = wParam; char *szProto = GetContactProto(hContact); @@ -222,7 +222,6 @@ int SendToRichEdit(HWND hWindow, char *truncated, COLORREF rgbText, COLORREF rgb DWORD italic = 0; DWORD underline = 0; - int len = GetWindowTextLength(GetDlgItem(hWindow, IDC_DATA)); SetDlgItemText(hWindow, IDC_DATA, _T("")); CHARFORMAT2 cfFM; @@ -291,7 +290,7 @@ void CALLBACK Countdownfunc(HWND, UINT, UINT_PTR, DWORD) /*****************************************************************************/ -static int OptInitialise(WPARAM wParam, LPARAM lParam) +static int OptInitialise(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; @@ -359,7 +358,7 @@ int ModulesLoaded(WPARAM, LPARAM) } /*****************************************************************************/ -INT_PTR DataWndMenuCommand(WPARAM wParam, LPARAM lParam) +INT_PTR DataWndMenuCommand(WPARAM wParam, LPARAM) { MCONTACT hContact = wParam; HWND hwndDlg = WindowList_Find(hWindowList, hContact); @@ -395,14 +394,14 @@ INT_PTR DataWndMenuCommand(WPARAM wParam, LPARAM lParam) } /*****************************************************************************/ -INT_PTR UpdateAllMenuCommand(WPARAM wParam, LPARAM lParam) +INT_PTR UpdateAllMenuCommand(WPARAM, LPARAM) { mir_forkthread(ContactLoop, NULL); return 0; } /*****************************************************************************/ -INT_PTR AutoUpdateMCmd(WPARAM wParam, LPARAM lParam) +INT_PTR AutoUpdateMCmd(WPARAM, LPARAM) { if (db_get_b(NULL, MODULENAME, DISABLE_AUTOUPDATE_KEY, 0)) db_set_b(NULL, MODULENAME, DISABLE_AUTOUPDATE_KEY, 0); @@ -422,7 +421,7 @@ INT_PTR AddContactMenuCommand(WPARAM, LPARAM) } /*****************************************************************************/ -int OnTopMenuCommand(WPARAM wParam, LPARAM lParam, MCONTACT singlecontact) +int OnTopMenuCommand(WPARAM, LPARAM, MCONTACT singlecontact) { int ontop = 0; int done = 0; @@ -443,7 +442,7 @@ int OnTopMenuCommand(WPARAM wParam, LPARAM lParam, MCONTACT singlecontact) } /*****************************************************************************/ -INT_PTR WebsiteMenuCommand(WPARAM wParam, LPARAM lParam) +INT_PTR WebsiteMenuCommand(WPARAM wParam, LPARAM) { MCONTACT hContact = wParam; ptrT url(db_get_tsa(hContact, MODULENAME, "URL")); @@ -455,7 +454,7 @@ INT_PTR WebsiteMenuCommand(WPARAM wParam, LPARAM lParam) } /*****************************************************************************/ -int UpdateMenuCommand(WPARAM wParam, LPARAM lParam, MCONTACT singlecontact) +int UpdateMenuCommand(WPARAM, LPARAM, MCONTACT singlecontact) { mir_forkthread(GetData, (void*)singlecontact); return 0; @@ -499,7 +498,7 @@ INT_PTR CntAlertMenuCommand(WPARAM wParam, LPARAM) } /*****************************************************************************/ -INT_PTR CountdownMenuCommand(WPARAM wParam, LPARAM lParam) +INT_PTR CountdownMenuCommand(WPARAM, LPARAM) { return 0; } diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp index 4d5cee7b71..20f5e3476a 100644 --- a/plugins/WebView/src/webview_alerts.cpp +++ b/plugins/WebView/src/webview_alerts.cpp @@ -765,7 +765,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn } /*****************************************************************************/ -int DataWndAlertCommand(WPARAM wParam, LPARAM lParam) +int DataWndAlertCommand(WPARAM wParam, LPARAM) { MCONTACT hContact = wParam; if ( WindowList_Find(hWindowList, hContact)) diff --git a/plugins/WebView/src/webview_datawnd.cpp b/plugins/WebView/src/webview_datawnd.cpp index 09bcbd867d..78c8a99581 100644 --- a/plugins/WebView/src/webview_datawnd.cpp +++ b/plugins/WebView/src/webview_datawnd.cpp @@ -462,7 +462,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA /*****************************************************************************/ -int DataDialogResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL * urc) +int DataDialogResize(HWND, LPARAM, UTILRESIZECONTROL *urc) { switch (urc->wId) { case IDC_OPEN_URL: @@ -497,7 +497,7 @@ void SavewinSettings(void) } /*****************************************************************************/ -void ValidatePosition(HWND hwndDlg) +void ValidatePosition(HWND) { RECT r; SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0); diff --git a/plugins/WebView/src/webview_opts.cpp b/plugins/WebView/src/webview_opts.cpp index 68626d4cb1..bc5bab421e 100644 --- a/plugins/WebView/src/webview_opts.cpp +++ b/plugins/WebView/src/webview_opts.cpp @@ -86,7 +86,7 @@ TCHAR* FixButtonText(TCHAR *url, size_t len) } /*****************************************************************************/ -static int CALLBACK EnumFontScriptsProc(ENUMLOGFONTEX * lpelfe, NEWTEXTMETRICEX * lpntme, int FontType, LPARAM lParam) +static int CALLBACK EnumFontScriptsProc(ENUMLOGFONTEX * lpelfe, NEWTEXTMETRICEX*, int, LPARAM lParam) { if (SendMessage((HWND) lParam, CB_FINDSTRINGEXACT, -1, (LPARAM) lpelfe->elfScript) == CB_ERR) { diff --git a/plugins/WebView/src/webview_services.cpp b/plugins/WebView/src/webview_services.cpp index 3bafe7c9b7..d47a621713 100644 --- a/plugins/WebView/src/webview_services.cpp +++ b/plugins/WebView/src/webview_services.cpp @@ -109,7 +109,7 @@ int DBSettingChanged(WPARAM wParam, LPARAM lParam) } /*****************************************************************************/ -int SiteDeleted(WPARAM wParam, LPARAM lParam) +int SiteDeleted(WPARAM wParam, LPARAM) { MCONTACT hContact = wParam; if (mir_strcmp(GetContactProto(hContact), MODULENAME)) @@ -159,7 +159,7 @@ INT_PTR OpenCacheDir(WPARAM, LPARAM) } /*****************************************************************************/ -INT_PTR PingWebsiteMenuCommand(WPARAM wParam, LPARAM lParam) +INT_PTR PingWebsiteMenuCommand(WPARAM wParam, LPARAM) { FILE *pfile = fopen("psite.bat", "r"); if (pfile == NULL) { @@ -233,7 +233,7 @@ INT_PTR GetName(WPARAM wParam, LPARAM lParam) // SetStatus // ======================================================= -INT_PTR SetStatus(WPARAM wParam, LPARAM lParam) +INT_PTR SetStatus(WPARAM wParam, LPARAM) { int oldStatus = bpStatus; @@ -265,7 +265,7 @@ INT_PTR SetStatus(WPARAM wParam, LPARAM lParam) // GetStatus // ======================================================= -INT_PTR GetStatus(WPARAM wParam, LPARAM lParam) +INT_PTR GetStatus(WPARAM, LPARAM) { if (bpStatus == ID_STATUS_ONLINE) return ID_STATUS_ONLINE; @@ -284,7 +284,7 @@ INT_PTR GetStatus(WPARAM wParam, LPARAM lParam) // BPLoadIcon // ======================================================= -INT_PTR BPLoadIcon(WPARAM wParam, LPARAM lParam) +INT_PTR BPLoadIcon(WPARAM wParam, LPARAM) { UINT id; @@ -314,7 +314,7 @@ static void __cdecl BasicSearchTimerProc(void *pszNick) searchId = -1; } -INT_PTR BasicSearch(WPARAM wParam, LPARAM lParam) +INT_PTR BasicSearch(WPARAM, LPARAM lParam) { static TCHAR buf[300]; @@ -333,7 +333,7 @@ INT_PTR BasicSearch(WPARAM wParam, LPARAM lParam) } /*****************************************************************************/ -INT_PTR AddToList(WPARAM wParam, LPARAM lParam) +INT_PTR AddToList(WPARAM, LPARAM lParam) { PROTOSEARCHRESULT *psr = (PROTOSEARCHRESULT *) lParam; DBVARIANT dbv; @@ -460,7 +460,7 @@ INT_PTR GetInfo(WPARAM, LPARAM) } /*****************************************************************************/ -void AckFunc(void *dummy) +void AckFunc(void*) { for (MCONTACT hContact = db_find_first(MODULENAME); hContact != NULL; hContact = db_find_next(hContact, MODULENAME)) ProtoBroadcastAck(MODULENAME, hContact, ACKTYPE_GETINFO, ACKRESULT_SUCCESS, (HANDLE)1, 0); diff --git a/plugins/WinterSpeak/src/DialogConfigActive.cpp b/plugins/WinterSpeak/src/DialogConfigActive.cpp index feec1c51b5..894865c17a 100644 --- a/plugins/WinterSpeak/src/DialogConfigActive.cpp +++ b/plugins/WinterSpeak/src/DialogConfigActive.cpp @@ -96,7 +96,7 @@ void DialogConfigActive::notify(HWND hwndDlg, LPARAM lParam) { switch (((LPNMHDR)lParam)->code) { case CLN_NEWCONTACT: case CLN_LISTREBUILT: - SetAllContactIcons( GetDlgItem(hwndDlg, IDC_ACTIVE_USERS), hwndDlg); + SetAllContactIcons( GetDlgItem(hwndDlg, IDC_ACTIVE_USERS)); //fall through case CLN_CONTACTMOVED: SetListGroupIcons( GetDlgItem(hwndDlg, IDC_ACTIVE_USERS), (HANDLE)SendDlgItemMessage(hwndDlg, IDC_ACTIVE_USERS, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll, NULL); @@ -187,7 +187,7 @@ void DialogConfigActive::load(HWND window) ConfigDatabase::ActiveUsersMap active_users = m_db.getActiveUsers(); this->InitialiseItem(listview, hItemUnknown, active_users[0].message, active_users[0].status); } - this->SetAllContactIcons(listview, window); + this->SetAllContactIcons(listview); this->SetListGroupIcons(GetDlgItem(window, IDC_ACTIVE_USERS), (HANDLE)SendDlgItemMessage(window, IDC_ACTIVE_USERS, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll, NULL); } @@ -249,7 +249,7 @@ void DialogConfigActive::InitialiseItem(HWND hwndList, HANDLE hItem, bool messag SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(3, 2)); } -void DialogConfigActive::SetAllContactIcons(HWND hwndList, HWND window) { +void DialogConfigActive::SetAllContactIcons(HWND hwndList) { ConfigDatabase::ActiveUsersMap active_users = m_db.getActiveUsers(); ConfigDatabase::ActiveUsersMap::const_iterator iter; for (iter = active_users.begin(); iter != active_users.end(); ++iter) diff --git a/plugins/WinterSpeak/src/DialogConfigActive.h b/plugins/WinterSpeak/src/DialogConfigActive.h index d0ece06792..5c65d44840 100644 --- a/plugins/WinterSpeak/src/DialogConfigActive.h +++ b/plugins/WinterSpeak/src/DialogConfigActive.h @@ -34,7 +34,7 @@ class DialogConfigActive : public MirandaDialog void selectAllUsers(HWND window, bool state); void ResetListOptions(HWND listview); void InitialiseItem(HWND hwndList, HANDLE hItem, bool message, bool status); - void SetAllContactIcons(HWND listview, HWND window); + void SetAllContactIcons(HWND listview); void SetIconsForColumn(HWND hwndList, HANDLE hItem, HANDLE hItemAll, int iColumn, int iImage); void SetAllChildIcons(HWND hwndList, HANDLE hFirstItem, int iColumn, int iImage); void SetListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem, int *groupChildCount); diff --git a/plugins/WinterSpeak/src/SpeechApi51Lexicon.cpp b/plugins/WinterSpeak/src/SpeechApi51Lexicon.cpp index a069e7319d..1d9bce89ba 100644 --- a/plugins/WinterSpeak/src/SpeechApi51Lexicon.cpp +++ b/plugins/WinterSpeak/src/SpeechApi51Lexicon.cpp @@ -50,8 +50,7 @@ bool SpeechApi51Lexicon::display() } //------------------------------------------------------------------------------ -INT_PTR CALLBACK SpeechApi51Lexicon::dialogEvent(HWND hwndDlg, UINT uMsg, WPARAM wParam, - LPARAM lParam) +INT_PTR CALLBACK SpeechApi51Lexicon::dialogEvent(HWND, UINT, WPARAM, LPARAM) { return TRUE; diff --git a/plugins/WinterSpeak/src/main.cpp b/plugins/WinterSpeak/src/main.cpp index d8c34eeadd..25852f7b5f 100644 --- a/plugins/WinterSpeak/src/main.cpp +++ b/plugins/WinterSpeak/src/main.cpp @@ -67,7 +67,7 @@ int protocolAck(WPARAM, LPARAM lParam) return 0; } -int dialogOptionsInitialise(WPARAM wParam, LPARAM lParam) +int dialogOptionsInitialise(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = g_hInst; @@ -161,7 +161,7 @@ extern "C" __declspec(dllexport) int Unload(void) return 0; } -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { DisableThreadLibraryCalls(hinstDLL); g_hInst = hinstDLL; diff --git a/plugins/YAMN/src/browser/badconnect.cpp b/plugins/YAMN/src/browser/badconnect.cpp index 42063887ba..7007bed2bf 100644 --- a/plugins/YAMN/src/browser/badconnect.cpp +++ b/plugins/YAMN/src/browser/badconnect.cpp @@ -201,8 +201,6 @@ INT_PTR CALLBACK DlgProcYAMNBadConnection(HWND hDlg, UINT msg, WPARAM wParam, LP break; } case WM_COMMAND: - { - WORD wNotifyCode = HIWORD(wParam); switch (LOWORD(wParam)) { case IDC_BTNOK: @@ -211,7 +209,6 @@ INT_PTR CALLBACK DlgProcYAMNBadConnection(HWND hDlg, UINT msg, WPARAM wParam, LP } break; } - } return 0; } diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp index f3d300ac78..b653415e9f 100644 --- a/plugins/YAMN/src/browser/mailbrowser.cpp +++ b/plugins/YAMN/src/browser/mailbrowser.cpp @@ -122,7 +122,7 @@ void DoMailActions(HWND hDlg, HACCOUNT ActualAccount, struct CMailNumbers *MN, D // ActualAccount- handle of account, whose mails are show // MailNumbers- pointer to structure, in which function stores numbers of mails with some property // returns one of UPDATE_XXX value (not implemented yet) -int ChangeExistingMailStatus(HWND hListView, HACCOUNT ActualAccount, struct CMailNumbers *MN); +int ChangeExistingMailStatus(HWND hListView, HACCOUNT ActualAccount); //Adds new mails to ListView and if any new, shows multi popup (every new message is new popup window created by popup plugin) // hListView- handle of listview window @@ -131,7 +131,7 @@ int ChangeExistingMailStatus(HWND hListView, HACCOUNT ActualAccount, struct CMai // MailNumbers- pointer to structure, in which function stores numbers of mails with some property // nflags- flags what to do when new mail arrives // returns one of UPDATE_XXX value (not implemented yet) -int AddNewMailsToListView(HWND hListView, HACCOUNT ActualAccount, struct CMailNumbers *MailNumbers, DWORD nflags); +int AddNewMailsToListView(HWND hListView, HACCOUNT ActualAccount, DWORD nflags); //Window callback procedure for popup window (created by popup plugin) LRESULT CALLBACK NewMailPopupProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); @@ -401,9 +401,9 @@ int UpdateMails(HWND hDlg, HACCOUNT ActualAccount, DWORD nflags, DWORD nnflags) else RunPopups = FALSE; if (RunMailBrowser) - ChangeExistingMailStatus(GetDlgItem(hDlg, IDC_LISTMAILS), ActualAccount, &MN); + ChangeExistingMailStatus(GetDlgItem(hDlg, IDC_LISTMAILS), ActualAccount); if (RunMailBrowser || RunPopups) - AddNewMailsToListView(hDlg == NULL ? NULL : GetDlgItem(hDlg, IDC_LISTMAILS), ActualAccount, &MN, nflags); + AddNewMailsToListView(hDlg == NULL ? NULL : GetDlgItem(hDlg, IDC_LISTMAILS), ActualAccount, nflags); if (RunMailBrowser) { @@ -452,7 +452,7 @@ int UpdateMails(HWND hDlg, HACCOUNT ActualAccount, DWORD nflags, DWORD nnflags) return 1; } -int ChangeExistingMailStatus(HWND hListView, HACCOUNT ActualAccount, struct CMailNumbers *MN) +int ChangeExistingMailStatus(HWND hListView, HACCOUNT ActualAccount) { int i, in; LVITEMW item; @@ -482,7 +482,7 @@ int ChangeExistingMailStatus(HWND hListView, HACCOUNT ActualAccount, struct CMai } void MimeDateToLocalizedDateTime(char *datein, WCHAR *dateout, int lendateout); -int AddNewMailsToListView(HWND hListView, HACCOUNT ActualAccount, struct CMailNumbers *MN, DWORD nflags) +int AddNewMailsToListView(HWND hListView, HACCOUNT ActualAccount, DWORD nflags) { HYAMNMAIL msgq; POPUPDATAT NewMailPopup = { 0 }; @@ -901,7 +901,6 @@ LRESULT CALLBACK NewMailPopupProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa break; case UM_FREEPLUGINDATA:{ PYAMN_MAILSHOWPARAM mpd = (PYAMN_MAILSHOWPARAM)PUGetPluginData(hWnd); - MCONTACT hContact = 0; if ((mpd) && (INT_PTR)mpd != -1)free(mpd); return FALSE; } @@ -1574,7 +1573,6 @@ INT_PTR CALLBACK DlgProcYAMNShowMessage(HWND hDlg, UINT msg, WPARAM wParam, LPAR if (wParam == SIZE_RESTORED) { HWND hList = GetDlgItem(hDlg, IDC_LISTHEADERS); HWND hEdit = GetDlgItem(hDlg, IDC_EDITBODY); - BOOL changeX = LOWORD(lParam) != HeadSizeX; BOOL isBodyShown = ((PYAMN_MAILSHOWPARAM)(GetWindowLongPtr(hDlg, DWLP_USER)))->mail->Flags & YAMN_MSG_BODYRECEIVED; HeadSizeX = LOWORD(lParam); //((LPRECT)lParam)->right-((LPRECT)lParam)->left; HeadSizeY = HIWORD(lParam); //((LPRECT)lParam)->bottom-((LPRECT)lParam)->top; @@ -2117,7 +2115,7 @@ INT_PTR CALLBACK DlgProcYAMNMailBrowser(HWND hDlg, UINT msg, WPARAM wParam, LPAR case IDC_BTNDEL: { LVITEMW item; - HYAMNMAIL FirstMail = NULL, ActualMail; + HYAMNMAIL ActualMail; HANDLE ThreadRunningEV; DWORD Total = 0; diff --git a/plugins/YAMN/src/filterplugin.cpp b/plugins/YAMN/src/filterplugin.cpp index e6875ccec7..0f5ac0e20a 100644 --- a/plugins/YAMN/src/filterplugin.cpp +++ b/plugins/YAMN/src/filterplugin.cpp @@ -103,7 +103,7 @@ INT_PTR UnregisterFilterPlugin(HYAMNFILTERPLUGIN Plugin) return 1; } -INT_PTR UnregisterFilterPluginSvc(WPARAM wParam,LPARAM lParam) +INT_PTR UnregisterFilterPluginSvc(WPARAM wParam,LPARAM) { HYAMNFILTERPLUGIN Plugin=(HYAMNFILTERPLUGIN)wParam; diff --git a/plugins/YAMN/src/mails/mails.cpp b/plugins/YAMN/src/mails/mails.cpp index 4b8422ac46..e8793757cd 100644 --- a/plugins/YAMN/src/mails/mails.cpp +++ b/plugins/YAMN/src/mails/mails.cpp @@ -199,27 +199,23 @@ INT_PTR LoadMailDataSvc(WPARAM wParam,LPARAM lParam) if (MailVersion != YAMN_MAILDATAVERSION) return NULL; -//now we have all data to memory persisting, so no loading is needed + // now we have all data to memory persisting, so no loading is needed return (INT_PTR)Mail->MailData; } -INT_PTR UnloadMailDataSvc(WPARAM wParam,LPARAM) +INT_PTR UnloadMailDataSvc(WPARAM, LPARAM) { - HYAMNMAIL Mail=(HYAMNMAIL)wParam; - -//now we should delete structure from memory, but it will be made in future YAMN version return 1; } -INT_PTR SaveMailDataSvc(WPARAM wParam,LPARAM lParam) +INT_PTR SaveMailDataSvc(WPARAM, LPARAM lParam) { - HYAMNMAIL Mail=(HYAMNMAIL)wParam; DWORD MailVersion=(DWORD)lParam; if (MailVersion != YAMN_MAILDATAVERSION) return (INT_PTR)-1; -//now we have all data to memory persisting, so no saving is needed + // now we have all data to memory persisting, so no saving is needed return (INT_PTR)0; } diff --git a/plugins/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp index 94175d3259..bfccb134d9 100644 --- a/plugins/YAMN/src/main.cpp +++ b/plugins/YAMN/src/main.cpp @@ -83,7 +83,7 @@ static void GetProfileDirectory(TCHAR *szPath, int cbPath) ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { YAMNVar.hInst = hinstDLL; return TRUE; @@ -91,7 +91,7 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvRe ///////////////////////////////////////////////////////////////////////////////////////// -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfo; } @@ -176,7 +176,7 @@ static IconItem iconList[] = { LPGEN("Connect Fail"), "YAMN_ConnectFail", IDI_BADCONNECT }, }; -static void LoadIcons() +void LoadIcons() { Icon_Register(YAMNVar.hInst, "YAMN", iconList, _countof(iconList)); } diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp index 593f5238de..febfae336b 100644 --- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp @@ -71,7 +71,7 @@ void WINAPI DeleteErrorString(LPVOID String); // len- length of source string // mboxsize- adreess to integer, that receives size of mailbox // mails- adreess to integer, that receives number of mails -void ExtractStat(char *stream, int len, int *mboxsize, int *mails); +void ExtractStat(char *stream, int *mboxsize, int *mails); //Extracts mail ID on mailbox // stream- source string @@ -156,7 +156,7 @@ CPOP3Account::~CPOP3Account() delete InternetQueries; } -HACCOUNT WINAPI CreatePOP3Account(HYAMNPROTOPLUGIN Plugin, DWORD CAccountVersion) +HACCOUNT WINAPI CreatePOP3Account(HYAMNPROTOPLUGIN, DWORD) { //First, we should check whether CAccountVersion matches. //But this is internal plugin, so YAMN's CAccount structure and our CAccount structure are @@ -386,7 +386,7 @@ DWORD WINAPI ReadPOP3Options(HACCOUNT Which, char **Parser, char *End) return 0; } -HYAMNMAIL WINAPI CreatePOP3Mail(HACCOUNT Account, DWORD MailDataVersion) +HYAMNMAIL WINAPI CreatePOP3Mail(HACCOUNT Account, DWORD) { HYAMNMAIL NewMail; //First, we should check whether MAILDATA matches. @@ -642,7 +642,7 @@ DWORD WINAPI SynchroPOP3(struct CheckParam * WhichTemp) DebugLog(DecodeFile,"<--------Account checking-------->\n"); DebugLog(DecodeFile,"\n"); #endif - ExtractStat(DataRX, MyClient->NetClient->Rcv, &mboxsize, &msgs); + ExtractStat(DataRX, &mboxsize, &msgs); #ifdef DEBUG_DECODE DebugLog(DecodeFile,"%d\n",mboxsize); DebugLog(DecodeFile,"%d\n",msgs); @@ -1141,7 +1141,7 @@ void __cdecl DeleteMailsPOP3(void *param) #ifdef DEBUG_DECODE DebugLog(DecodeFile,"\n"); #endif - ExtractStat(DataRX, MyClient->NetClient->Rcv, &mboxsize, &msgs); + ExtractStat(DataRX, &mboxsize, &msgs); #ifdef DEBUG_DECODE DebugLog(DecodeFile,"%d\n",mboxsize); DebugLog(DecodeFile,"%d\n",msgs); @@ -1357,7 +1357,7 @@ void __cdecl DeleteMailsPOP3(void *param) return; } -void ExtractStat(char *stream, int len, int *mboxsize, int *mails) +void ExtractStat(char *stream, int *mboxsize, int *mails) { char *finder = stream; while (WS(finder) || ENDLINE(finder)) finder++; diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp index 6b6393a022..73aa051d53 100644 --- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp @@ -69,7 +69,7 @@ INT_PTR CALLBACK DlgProcYAMNOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam) return FALSE; } -INT_PTR CALLBACK DlgProcPluginOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam) +INT_PTR CALLBACK DlgProcPluginOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM) { switch(msg) { case WM_INITDIALOG: @@ -160,7 +160,7 @@ INT_PTR CALLBACK DlgProcPluginOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam } -int YAMNOptInitSvc(WPARAM wParam,LPARAM lParam) +int YAMNOptInitSvc(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = YAMNVar.hInst; @@ -195,7 +195,7 @@ int YAMNOptInitSvc(WPARAM wParam,LPARAM lParam) //-------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------- -BOOL DlgEnableAccountStatus(HWND hDlg,WPARAM wParam,LPARAM lParam) +BOOL DlgEnableAccountStatus(HWND hDlg, WPARAM wParam, LPARAM) { EnableWindow(GetDlgItem(hDlg,IDC_CHECKST0),(BOOL)wParam); EnableWindow(GetDlgItem(hDlg,IDC_CHECKST1),(BOOL)wParam); @@ -210,7 +210,8 @@ BOOL DlgEnableAccountStatus(HWND hDlg,WPARAM wParam,LPARAM lParam) EnableWindow(GetDlgItem(hDlg,IDC_CHECKST9),(BOOL)wParam); return TRUE; } -BOOL DlgEnableAccountPopup(HWND hDlg,WPARAM wParam,LPARAM lParam) + +BOOL DlgEnableAccountPopup(HWND hDlg, WPARAM wParam, LPARAM) { EnableWindow(GetDlgItem(hDlg,IDC_CHECKPOP),(BOOL)wParam); EnableWindow(GetDlgItem(hDlg,IDC_EDITPOPS),(IsDlgButtonChecked(hDlg,IDC_CHECKPOP)==BST_CHECKED) && wParam); @@ -233,7 +234,7 @@ BOOL DlgEnableAccountPopup(HWND hDlg,WPARAM wParam,LPARAM lParam) return TRUE; } -BOOL DlgEnableAccount(HWND hDlg,WPARAM wParam,LPARAM lParam) +BOOL DlgEnableAccount(HWND hDlg, WPARAM wParam, LPARAM) { EnableWindow(GetDlgItem(hDlg,IDC_CHECK),(BOOL)wParam); EnableWindow(GetDlgItem(hDlg,IDC_EDITSERVER),wParam); @@ -511,7 +512,7 @@ BOOL DlgShowAccount(HWND hDlg,WPARAM wParam,LPARAM lParam) return TRUE; } -BOOL DlgShowAccountColors(HWND hDlg,WPARAM wParam,LPARAM lParam) +BOOL DlgShowAccountColors(HWND hDlg, WPARAM, LPARAM lParam) { HPOP3ACCOUNT ActualAccount=(HPOP3ACCOUNT)lParam; #ifdef DEBUG_SYNCHRO @@ -576,75 +577,61 @@ BOOL DlgSetItemTextW(HWND hDlg,WPARAM wParam,const WCHAR* str) return TRUE; } -INT_PTR CALLBACK DlgProcPOP3AccStatusOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam) +INT_PTR CALLBACK DlgProcPOP3AccStatusOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM) { static HPOP3ACCOUNT ActualAccount; - switch(msg) - { - case WM_INITDIALOG: + switch(msg) { + case WM_INITDIALOG: + ActualAccount=(HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME,(WPARAM)POP3Plugin,(LPARAM)DlgInput); + if (ActualAccount != NULL) { - ActualAccount=(HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME,(WPARAM)POP3Plugin,(LPARAM)DlgInput); - if (ActualAccount != NULL) - { - DlgShowAccountStatus(hDlg,(WPARAM)M_SHOWACTUAL,(LPARAM)ActualAccount); - DlgEnableAccountStatus(hDlg,TRUE,TRUE); - } - else - { - CheckDlgButton(hDlg,IDC_CHECKST0,BST_CHECKED); - CheckDlgButton(hDlg,IDC_CHECKST1,BST_CHECKED); - CheckDlgButton(hDlg,IDC_CHECKST2,BST_CHECKED); - CheckDlgButton(hDlg,IDC_CHECKST3,BST_CHECKED); - CheckDlgButton(hDlg,IDC_CHECKST4,BST_CHECKED); - CheckDlgButton(hDlg,IDC_CHECKST5,BST_CHECKED); - CheckDlgButton(hDlg,IDC_CHECKST6,BST_CHECKED); - CheckDlgButton(hDlg,IDC_CHECKST7,BST_CHECKED); - CheckDlgButton(hDlg,IDC_CHECKST8,BST_CHECKED); - CheckDlgButton(hDlg,IDC_CHECKST9,BST_CHECKED); - } - TranslateDialogDefault(hDlg); - SendMessage(GetParent(hDlg),PSM_UNCHANGED,(WPARAM)hDlg,0); - return TRUE; - break; + DlgShowAccountStatus(hDlg,(WPARAM)M_SHOWACTUAL,(LPARAM)ActualAccount); + DlgEnableAccountStatus(hDlg,TRUE,TRUE); } - case WM_COMMAND: + else { - - WORD wNotifyCode = HIWORD(wParam); - switch(LOWORD(wParam)) - { - case IDOK: - Check0 = (IsDlgButtonChecked(hDlg,IDC_CHECKST0)==BST_CHECKED); - Check1 = (IsDlgButtonChecked(hDlg,IDC_CHECKST1)==BST_CHECKED); - Check2 = (IsDlgButtonChecked(hDlg,IDC_CHECKST2)==BST_CHECKED); - Check3 = (IsDlgButtonChecked(hDlg,IDC_CHECKST3)==BST_CHECKED); - Check4 = (IsDlgButtonChecked(hDlg,IDC_CHECKST4)==BST_CHECKED); - Check5 = (IsDlgButtonChecked(hDlg,IDC_CHECKST5)==BST_CHECKED); - Check6 = (IsDlgButtonChecked(hDlg,IDC_CHECKST6)==BST_CHECKED); - Check7 = (IsDlgButtonChecked(hDlg,IDC_CHECKST7)==BST_CHECKED); - Check8 = (IsDlgButtonChecked(hDlg,IDC_CHECKST8)==BST_CHECKED); - Check9 = (IsDlgButtonChecked(hDlg,IDC_CHECKST9)==BST_CHECKED); - WindowList_BroadcastAsync(YAMNVar.MessageWnds,WM_YAMN_CHANGESTATUSOPTION,0,0); - EndDialog(hDlg,0); - DestroyWindow(hDlg); - break; - - case IDCANCEL: - EndDialog(hDlg,0); - DestroyWindow(hDlg); - break; - - default: - break; - } + CheckDlgButton(hDlg,IDC_CHECKST0,BST_CHECKED); + CheckDlgButton(hDlg,IDC_CHECKST1,BST_CHECKED); + CheckDlgButton(hDlg,IDC_CHECKST2,BST_CHECKED); + CheckDlgButton(hDlg,IDC_CHECKST3,BST_CHECKED); + CheckDlgButton(hDlg,IDC_CHECKST4,BST_CHECKED); + CheckDlgButton(hDlg,IDC_CHECKST5,BST_CHECKED); + CheckDlgButton(hDlg,IDC_CHECKST6,BST_CHECKED); + CheckDlgButton(hDlg,IDC_CHECKST7,BST_CHECKED); + CheckDlgButton(hDlg,IDC_CHECKST8,BST_CHECKED); + CheckDlgButton(hDlg,IDC_CHECKST9,BST_CHECKED); } - default: + TranslateDialogDefault(hDlg); + SendMessage(GetParent(hDlg),PSM_UNCHANGED,(WPARAM)hDlg,0); + return TRUE; + + case WM_COMMAND: + switch(LOWORD(wParam)) { + case IDOK: + Check0 = (IsDlgButtonChecked(hDlg,IDC_CHECKST0)==BST_CHECKED); + Check1 = (IsDlgButtonChecked(hDlg,IDC_CHECKST1)==BST_CHECKED); + Check2 = (IsDlgButtonChecked(hDlg,IDC_CHECKST2)==BST_CHECKED); + Check3 = (IsDlgButtonChecked(hDlg,IDC_CHECKST3)==BST_CHECKED); + Check4 = (IsDlgButtonChecked(hDlg,IDC_CHECKST4)==BST_CHECKED); + Check5 = (IsDlgButtonChecked(hDlg,IDC_CHECKST5)==BST_CHECKED); + Check6 = (IsDlgButtonChecked(hDlg,IDC_CHECKST6)==BST_CHECKED); + Check7 = (IsDlgButtonChecked(hDlg,IDC_CHECKST7)==BST_CHECKED); + Check8 = (IsDlgButtonChecked(hDlg,IDC_CHECKST8)==BST_CHECKED); + Check9 = (IsDlgButtonChecked(hDlg,IDC_CHECKST9)==BST_CHECKED); + WindowList_BroadcastAsync(YAMNVar.MessageWnds,WM_YAMN_CHANGESTATUSOPTION,0,0); + EndDialog(hDlg,0); + DestroyWindow(hDlg); break; + + case IDCANCEL: + EndDialog(hDlg,0); + DestroyWindow(hDlg); + break; + } } return FALSE; } - INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam) { BOOL Changed=FALSE; @@ -1429,7 +1416,7 @@ INT_PTR CALLBACK DlgProcPOP3AccPopup(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPa case PSN_APPLY: { TCHAR Text[MAX_PATH]; - BOOL Translated,NewAcc=FALSE,CheckPopup,CheckPopupW; + BOOL Translated,CheckPopup,CheckPopupW; BOOL CheckNPopup,CheckNPopupW,CheckFPopup,CheckFPopupW; BOOL CheckPopN; UINT Time,TimeN,TimeF; diff --git a/plugins/YAMN/src/protoplugin.cpp b/plugins/YAMN/src/protoplugin.cpp index 785bb40c77..dcede55d82 100644 --- a/plugins/YAMN/src/protoplugin.cpp +++ b/plugins/YAMN/src/protoplugin.cpp @@ -157,7 +157,7 @@ INT_PTR UnregisterProtocolPlugin(HYAMNPROTOPLUGIN Plugin) return 1; } -INT_PTR UnregisterProtocolPluginSvc(WPARAM wParam,LPARAM lParam) +INT_PTR UnregisterProtocolPluginSvc(WPARAM wParam,LPARAM) { HYAMNPROTOPLUGIN Plugin=(HYAMNPROTOPLUGIN)wParam; diff --git a/plugins/YAMN/src/services.cpp b/plugins/YAMN/src/services.cpp index 8a8187f593..d03a8e2c6c 100644 --- a/plugins/YAMN/src/services.cpp +++ b/plugins/YAMN/src/services.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -static INT_PTR Service_GetCaps(WPARAM wParam, LPARAM lParam) +static INT_PTR Service_GetCaps(WPARAM wParam, LPARAM) { if (wParam == PFLAGNUM_4) return PF4_NOCUSTOMAUTH; @@ -20,12 +20,12 @@ static INT_PTR Service_GetCaps(WPARAM wParam, LPARAM lParam) return 0; } -static INT_PTR Service_GetStatus(WPARAM wParam, LPARAM lParam) +static INT_PTR Service_GetStatus(WPARAM, LPARAM) { return YAMN_STATUS; } -static INT_PTR Service_SetStatus(WPARAM wParam, LPARAM lParam) +static INT_PTR Service_SetStatus(WPARAM wParam, LPARAM) { int newstatus = (wParam != ID_STATUS_OFFLINE)?ID_STATUS_ONLINE:ID_STATUS_OFFLINE; if (newstatus != YAMN_STATUS) { @@ -43,7 +43,7 @@ static INT_PTR Service_GetName(WPARAM wParam, LPARAM lParam) return 0; } -static INT_PTR Service_LoadIcon(WPARAM wParam, LPARAM lParam) +static INT_PTR Service_LoadIcon(WPARAM wParam, LPARAM) { if ( LOWORD( wParam ) == PLI_PROTOCOL ) return (INT_PTR)CopyIcon(g_LoadIconEx(0)); // noone cares about other than PLI_PROTOCOL @@ -51,7 +51,7 @@ static INT_PTR Service_LoadIcon(WPARAM wParam, LPARAM lParam) return (INT_PTR)(HICON)NULL; } -INT_PTR ClistContactDoubleclicked(WPARAM wParam, LPARAM lParam) +INT_PTR ClistContactDoubleclicked(WPARAM, LPARAM lParam) { ContactDoubleclicked(((CLISTEVENT*)lParam)->lParam, lParam); return 0; @@ -63,7 +63,7 @@ static int Service_ContactDoubleclicked(WPARAM wParam, LPARAM lParam) return 0; } -static INT_PTR ContactApplication(WPARAM wParam, LPARAM lParam) +static INT_PTR ContactApplication(WPARAM wParam, LPARAM) { char *szProto = GetContactProto(wParam); if ( mir_strcmp(szProto, YAMN_DBMODULE)) @@ -166,7 +166,7 @@ static INT_PTR AccountMailCheck(WPARAM wParam, LPARAM lParam) return 0; } -static INT_PTR ContactMailCheck(WPARAM hContact, LPARAM lParam) +static INT_PTR ContactMailCheck(WPARAM hContact, LPARAM) { char *szProto = GetContactProto(hContact); if ( mir_strcmp(szProto, YAMN_DBMODULE)) @@ -221,11 +221,7 @@ static INT_PTR ContactMailCheck(WPARAM hContact, LPARAM lParam) return 0; } -void MainMenuAccountClicked(WPARAM wParam, LPARAM lParam) -{ -} - -/*static*/ void ContactDoubleclicked(WPARAM wParam, LPARAM lParam) +/*static*/ void ContactDoubleclicked(WPARAM wParam, LPARAM) { char *szProto = GetContactProto(wParam); if ( mir_strcmp(szProto, YAMN_DBMODULE)) @@ -285,8 +281,6 @@ HBITMAP LoadBmpFromIcon(HICON hIcon) bih.biHeight = IconSizeY; bih.biWidth = IconSizeX; - int widthBytes = ((bih.biWidth*bih.biBitCount + 31) >> 5) * 4; - RECT rc; rc.top = rc.left = 0; rc.right = bih.biWidth; diff --git a/plugins/YAMN/src/yamn.cpp b/plugins/YAMN/src/yamn.cpp index a0f761ac46..f68e4068ae 100644 --- a/plugins/YAMN/src/yamn.cpp +++ b/plugins/YAMN/src/yamn.cpp @@ -55,7 +55,7 @@ INT_PTR ForceCheckSvc(WPARAM, LPARAM); //-------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------- -INT_PTR GetFcnPtrSvc(WPARAM wParam, LPARAM lParam) +INT_PTR GetFcnPtrSvc(WPARAM wParam, LPARAM) { register int i; diff --git a/plugins/YARelay/src/main.cpp b/plugins/YARelay/src/main.cpp index 8bcd350b40..76a21de7e0 100644 --- a/plugins/YARelay/src/main.cpp +++ b/plugins/YARelay/src/main.cpp @@ -45,7 +45,7 @@ PLUGININFOEX pluginInfoEx = { {0x1202e6a, 0xc1b3, 0x42e5, {0x83, 0x8a, 0x3e, 0x49, 0x7b, 0x31, 0xf3, 0x8e}} }; -BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst=hinstDLL; return TRUE; @@ -223,7 +223,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM hDBEvent) return 0; } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfoEx; } diff --git a/plugins/YahooGroups/src/YahooGroups.cpp b/plugins/YahooGroups/src/YahooGroups.cpp index d907e2aa75..cf2d09b11c 100644 --- a/plugins/YahooGroups/src/YahooGroups.cpp +++ b/plugins/YahooGroups/src/YahooGroups.cpp @@ -41,7 +41,7 @@ PLUGININFOEX pluginInfo = { {0x2f3fe8b9, 0x7327, 0x4008, {0xa6, 0x0d, 0x93, 0xf0, 0xf4, 0xf7, 0xf0, 0xf1}} }; -extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD) { return &pluginInfo; } @@ -70,7 +70,7 @@ extern "C" int __declspec(dllexport) Unload() return 0; } -bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +bool WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID) { hInstance = hinstDLL; if (fdwReason == DLL_PROCESS_ATTACH) diff --git a/plugins/YahooGroups/src/hooked_events.cpp b/plugins/YahooGroups/src/hooked_events.cpp index bc2341f748..19efd4ffda 100644 --- a/plugins/YahooGroups/src/hooked_events.cpp +++ b/plugins/YahooGroups/src/hooked_events.cpp @@ -40,13 +40,11 @@ int UnhookEvents() return 0; } -int OnModulesLoaded(WPARAM wParam, LPARAM lParam) +int OnModulesLoaded(WPARAM, LPARAM) { int autoMove = db_get_b(NULL, ModuleName, "MoveAutomatically", 0); if (autoMove) - { YahooGroupsMoveService(0,0); - } return 0; } diff --git a/plugins/YahooGroups/src/list.cpp b/plugins/YahooGroups/src/list.cpp index 94b0ac40d4..491867af2d 100644 --- a/plugins/YahooGroups/src/list.cpp +++ b/plugins/YahooGroups/src/list.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h" -CGroupsList &availableGroups = CGroupsList(); +CGroupsList availableGroups; void CGroupsList::Enlarge(int amount) { diff --git a/plugins/YahooGroups/src/list.h b/plugins/YahooGroups/src/list.h index a2931a94ec..87ff6b93a6 100644 --- a/plugins/YahooGroups/src/list.h +++ b/plugins/YahooGroups/src/list.h @@ -48,6 +48,6 @@ class CGroupsList char *operator [](int index); }; -extern CGroupsList &availableGroups; +extern CGroupsList availableGroups; #endif //M_VIUPLOADER_LIST_H \ No newline at end of file diff --git a/plugins/YahooGroups/src/services.cpp b/plugins/YahooGroups/src/services.cpp index 71252f42d5..16e58a2add 100644 --- a/plugins/YahooGroups/src/services.cpp +++ b/plugins/YahooGroups/src/services.cpp @@ -151,7 +151,7 @@ void ProcessContacts(void (*callback)(MCONTACT, char *), char *protocol) callback(hContact, protocol); } -void YahooMoveCallback(MCONTACT hContact, char *unused) +void YahooMoveCallback(MCONTACT hContact, char*) { char protocol[128] = {0}; GetContactProtocol(hContact, protocol, sizeof(protocol)); @@ -180,13 +180,13 @@ void ResetGroupCallback(MCONTACT hContact, char *protocol) } } -INT_PTR YahooGroupsMoveService(WPARAM wParam, LPARAM lParam) +INT_PTR YahooGroupsMoveService(WPARAM, LPARAM) { ProcessContacts(YahooMoveCallback, NULL); return 0; } -INT_PTR YahooGroupsResetService(WPARAM wParam, LPARAM lParam) +INT_PTR YahooGroupsResetService(WPARAM, LPARAM) { ProcessContacts(ResetGroupCallback, NULL); return 0; diff --git a/plugins/YahooGroups/src/utils.cpp b/plugins/YahooGroups/src/utils.cpp index 383d001007..a811bc5e64 100644 --- a/plugins/YahooGroups/src/utils.cpp +++ b/plugins/YahooGroups/src/utils.cpp @@ -226,18 +226,13 @@ TCHAR *GetContactName(MCONTACT hContact, char *szProto) //_debug_message(" contact name %s", ctInfo.pszVal); TCHAR *buffer; if (!ret) - { - buffer = _tcsdup(ctInfo.pszVal); - } + buffer = _tcsdup(ctInfo.pszVal); + mir_free(ctInfo.pszVal); if (!ret) - { - return buffer; - } - else{ - return NULL; - } - return buffer; + return buffer; + + return NULL; } void GetContactProtocol(MCONTACT hContact, char *szProto, int size) @@ -306,12 +301,9 @@ TCHAR *GetContactID(MCONTACT hContact, char *szProto) } mir_free(ctInfo.pszVal); if (!ret) - { - return buffer; - } - else{ - return NULL; - } + return buffer; + + return NULL; } MCONTACT GetContactFromID(TCHAR *szID, char *szProto) diff --git a/plugins/wbOSD/src/events.cpp b/plugins/wbOSD/src/events.cpp index 3861473a9e..6a516beff6 100644 --- a/plugins/wbOSD/src/events.cpp +++ b/plugins/wbOSD/src/events.cpp @@ -99,7 +99,6 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam) int ContactStatusChanged(WPARAM wParam, LPARAM lParam) { MCONTACT hContact = (MCONTACT) wParam; - WORD oldStatus = LOWORD(lParam); WORD newStatus = HIWORD(lParam); DWORD ann=db_get_dw(NULL,THIS_MODULE,"announce", DEFAULT_ANNOUNCE); diff --git a/plugins/wbOSD/src/main.cpp b/plugins/wbOSD/src/main.cpp index daa1fa7e06..1184e615ed 100644 --- a/plugins/wbOSD/src/main.cpp +++ b/plugins/wbOSD/src/main.cpp @@ -72,7 +72,7 @@ extern "C" __declspec(dllexport) int Unload() ///////////////////////////////////////////////////////////////////////////////////////// -BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD, LPVOID) { hI = hinst; return TRUE; diff --git a/plugins/wbOSD/src/wbOSD.cpp b/plugins/wbOSD/src/wbOSD.cpp index 27b1f4db6b..c7a7983a4d 100644 --- a/plugins/wbOSD/src/wbOSD.cpp +++ b/plugins/wbOSD/src/wbOSD.cpp @@ -233,8 +233,6 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM default: return DefWindowProc (hwnd, message, wParam, lParam); } - - return 0; } INT_PTR OSDAnnounce(WPARAM wParam, LPARAM lParam) @@ -243,7 +241,7 @@ INT_PTR OSDAnnounce(WPARAM wParam, LPARAM lParam) return SendMessage(hwnd, WM_USER+1, wParam, lParam); } -int pluginShutDown(WPARAM wparam,LPARAM lparam) +int pluginShutDown(WPARAM, LPARAM) { logmsg("pluginShutDown"); if (hwnd) { @@ -255,7 +253,7 @@ int pluginShutDown(WPARAM wparam,LPARAM lparam) return 0; } -int MainInit(WPARAM wparam,LPARAM lparam) +int MainInit(WPARAM, LPARAM) { logmsg("MainInit"); HookEvent(ME_OPT_INITIALISE,OptionsInit); -- cgit v1.2.3