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 --- plugins/YAPP/src/notify_imp.cpp | 66 +++++++++++++++++++---------------- plugins/YAPP/src/options.cpp | 2 +- plugins/YAPP/src/services.cpp | 18 +++++----- plugins/YAPP/src/yapp.cpp | 10 +++--- plugins/YAPP/src/yapp_history_dlg.cpp | 2 +- 5 files changed, 52 insertions(+), 46 deletions(-) (limited to 'plugins/YAPP') diff --git a/plugins/YAPP/src/notify_imp.cpp b/plugins/YAPP/src/notify_imp.cpp index aad282b1b4..a1b020dd18 100644 --- a/plugins/YAPP/src/notify_imp.cpp +++ b/plugins/YAPP/src/notify_imp.cpp @@ -4,7 +4,8 @@ HANDLE hhkShow=0, hhkUpdate=0, hhkRemove=0; //struct -int Popup2Show(WPARAM wParam, LPARAM lParam) { +int Popup2Show(WPARAM, LPARAM lParam) +{ HANDLE hNotify = (HANDLE)lParam; @@ -16,49 +17,53 @@ int Popup2Show(WPARAM wParam, LPARAM lParam) { return 0; } -INT_PTR svcPopup2Show(WPARAM wParam, LPARAM lParam) { - return Popup2Show(wParam, lParam); +INT_PTR svcPopup2Show(WPARAM wParam, LPARAM lParam) +{ + return Popup2Show(wParam, lParam); } -int Popup2Update(WPARAM wParam, LPARAM lParam) { +int Popup2Update(WPARAM, LPARAM lParam) +{ HANDLE hNotify = (HANDLE)lParam; PostMPMessage(MUM_NMUPDATE, (WPARAM)hNotify, 0); return 0; } -int AvatarChanged(WPARAM wParam, LPARAM lParam) { +int AvatarChanged(WPARAM, LPARAM) +{ PostMPMessage(MUM_NMAVATAR, 0, 0); return 0; } - -INT_PTR svcPopup2Update(WPARAM wParam, LPARAM lParam) { - return Popup2Update(wParam, lParam); +INT_PTR svcPopup2Update(WPARAM wParam, LPARAM lParam) +{ + return Popup2Update(wParam, lParam); } -int Popup2Remove(WPARAM wParam, LPARAM lParam) { +int Popup2Remove(WPARAM, LPARAM lParam) +{ HANDLE hNotify = (HANDLE)lParam; PostMPMessage(MUM_NMREMOVE, (WPARAM)hNotify, 0); return 0; } -INT_PTR svcPopup2Remove(WPARAM wParam, LPARAM lParam) { - return Popup2Remove(wParam, lParam); +INT_PTR svcPopup2Remove(WPARAM wParam, LPARAM lParam) +{ + return Popup2Remove(wParam, lParam); } -INT_PTR svcPopup2DefaultActions(WPARAM wParam, LPARAM lParam) +INT_PTR svcPopup2DefaultActions(WPARAM wParam, LPARAM) { //PopupWindow *wnd = (PopupWindow *)MNotifyGetDWord((HANDLE)lParam, "Popup2/data", (DWORD)NULL); //if (!wnd) return 0; - switch (wParam) - { - case 0: + switch (wParam) { + case 0: { // send message //if (wnd->lchContact) CallServiceSync(MS_MSG_SENDMESSAGE, (WPARAM)wnd->lchContact, 0); //SendMessage(wnd->lchMain, UM_DESTROYPOPUP, 0, 0); break; } - case 1: + case 1: { // dismiss popup //SendMessage(wnd->lchMain, UM_DESTROYPOPUP, 0, 0); break; @@ -67,13 +72,12 @@ INT_PTR svcPopup2DefaultActions(WPARAM wParam, LPARAM lParam) return 0; } -INT_PTR CALLBACK DlgProcPopups(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK DlgProcPopups(HWND hwnd, UINT msg, WPARAM, LPARAM lParam) { -/* To change options use MNotifySet*(hNotify, ....) Apply/Cancel is implemented in notify.dll */ + /* To change options use MNotifySet*(hNotify, ....) Apply/Cancel is implemented in notify.dll */ HANDLE hNotify = (HANDLE)GetWindowLongPtr(hwnd, GWLP_USERDATA); - switch (msg) - { - case WM_USER+100: + switch (msg) { + case WM_USER + 100: { // This will be extendet to handle array of handles for multiselect lParam // will be HANDLE * and wParam wil; store amount of handles passed @@ -82,21 +86,21 @@ INT_PTR CALLBACK DlgProcPopups(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return TRUE; } - case WM_COMMAND: - // This in different from Miranda options! - SendMessage(GetParent(GetParent(hwnd)), PSM_CHANGED, 0, 0); - break; + case WM_COMMAND: + // This in different from Miranda options! + SendMessage(GetParent(GetParent(hwnd)), PSM_CHANGED, 0, 0); + break; } return FALSE; } -int NotifyOptionsInitialize(WPARAM wParam,LPARAM lParam) +int NotifyOptionsInitialize(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY); odp.pszTitle = LPGEN("YAPP Popups"); - odp.flags=ODPF_BOLDGROUPS; + odp.flags = ODPF_BOLDGROUPS; odp.pfnDlgProc = DlgProcPopups; CallService(MS_NOTIFY_OPT_ADDPAGE, wParam, (LPARAM)&odp); return 0; @@ -105,7 +109,7 @@ int NotifyOptionsInitialize(WPARAM wParam,LPARAM lParam) HANDLE hEventNotifyOptInit, hEventNotifyModulesLoaded; HANDLE hAvChangeEvent; -int NotifyModulesLoaded(WPARAM wParam,LPARAM lParam) +int NotifyModulesLoaded(WPARAM, LPARAM) { hEventNotifyOptInit = HookEvent(ME_NOTIFY_OPT_INITIALISE, NotifyOptionsInitialize); hAvChangeEvent = HookEvent(ME_AV_AVATARCHANGED, AvatarChanged); @@ -113,7 +117,8 @@ int NotifyModulesLoaded(WPARAM wParam,LPARAM lParam) } HANDLE hServicesNotify[4]; -void InitNotify() { +void InitNotify() +{ hhkShow = HookEvent(ME_NOTIFY_SHOW, Popup2Show); hhkUpdate = HookEvent(ME_NOTIFY_UPDATE, Popup2Update); hhkRemove = HookEvent(ME_NOTIFY_REMOVE, Popup2Remove); @@ -127,7 +132,8 @@ void InitNotify() { hEventNotifyModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, NotifyModulesLoaded); } -void DeinitNotify() { +void DeinitNotify() +{ UnhookEvent(hhkShow); UnhookEvent(hhkUpdate); UnhookEvent(hhkRemove); diff --git a/plugins/YAPP/src/options.cpp b/plugins/YAPP/src/options.cpp index 90284668a1..ef7a83f2ee 100644 --- a/plugins/YAPP/src/options.cpp +++ b/plugins/YAPP/src/options.cpp @@ -471,7 +471,7 @@ static INT_PTR CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam return 0; } -int OptInit(WPARAM wParam, LPARAM lParam) +int OptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.flags = ODPF_BOLDGROUPS; diff --git a/plugins/YAPP/src/services.cpp b/plugins/YAPP/src/services.cpp index 64363b252c..bcee759527 100644 --- a/plugins/YAPP/src/services.cpp +++ b/plugins/YAPP/src/services.cpp @@ -40,7 +40,7 @@ void StripBBCodesInPlace(wchar_t *text) } } -static INT_PTR CreatePopup(WPARAM wParam, LPARAM lParam) +static INT_PTR CreatePopup(WPARAM wParam, LPARAM) { if (bShutdown) return -1; @@ -81,7 +81,7 @@ static INT_PTR CreatePopup(WPARAM wParam, LPARAM lParam) return 0; } -static INT_PTR CreatePopupW(WPARAM wParam, LPARAM lParam) +static INT_PTR CreatePopupW(WPARAM wParam, LPARAM) { if (bShutdown) return -1; @@ -159,7 +159,7 @@ void ShowPopup(PopupData &pd_in) else PostMPMessage(MUM_CREATEPOPUP, 0, (LPARAM)pd_out); } -static INT_PTR GetContact(WPARAM wParam, LPARAM lParam) +static INT_PTR GetContact(WPARAM wParam, LPARAM) { HWND hwndPop = (HWND)wParam; MCONTACT hContact; @@ -175,7 +175,7 @@ static INT_PTR GetContact(WPARAM wParam, LPARAM lParam) return (INT_PTR)hContact; } -static INT_PTR GetOpaque(WPARAM wParam, LPARAM lParam) +static INT_PTR GetOpaque(WPARAM wParam, LPARAM) { HWND hwndPop = (HWND)wParam; void *data = 0; @@ -207,7 +207,7 @@ void UpdateMenu() CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hTTButton, isEnabled ? TTBST_PUSHED : 0); } -INT_PTR PopupQuery(WPARAM wParam, LPARAM lParam) +INT_PTR PopupQuery(WPARAM wParam, LPARAM) { switch(wParam) { case PUQS_ENABLEPOPUPS: @@ -235,7 +235,7 @@ INT_PTR PopupQuery(WPARAM wParam, LPARAM lParam) return 0; } -static INT_PTR TogglePopups(WPARAM wParam, LPARAM lParam) +static INT_PTR TogglePopups(WPARAM, LPARAM) { BYTE val = db_get_b(0, "Popup", "ModuleIsEnabled", 1); db_set_b(0, "Popup", "ModuleIsEnabled", !val); @@ -314,7 +314,7 @@ static INT_PTR ShowMessageW(WPARAM wParam, LPARAM lParam) //=====Popup/ShowHistory -INT_PTR Popup_ShowHistory(WPARAM wParam, LPARAM lParam) +INT_PTR Popup_ShowHistory(WPARAM, LPARAM) { if (!hHistoryWindow) hHistoryWindow = CreateDialog(hInst, MAKEINTRESOURCE(IDD_LST_HISTORY), NULL, DlgProcHistLst); @@ -325,7 +325,7 @@ INT_PTR Popup_ShowHistory(WPARAM wParam, LPARAM lParam) LIST arClasses(3); -static INT_PTR RegisterPopupClass(WPARAM wParam, LPARAM lParam) +static INT_PTR RegisterPopupClass(WPARAM, LPARAM lParam) { POPUPCLASS *pc = (POPUPCLASS*)mir_alloc( sizeof(POPUPCLASS)); memcpy(pc, (PVOID)lParam, sizeof(POPUPCLASS)); @@ -356,7 +356,7 @@ static void FreePopupClass(POPUPCLASS *pc) mir_free(pc); } -static INT_PTR UnregisterPopupClass(WPARAM wParam, LPARAM lParam) +static INT_PTR UnregisterPopupClass(WPARAM, LPARAM lParam) { POPUPCLASS *pc = (POPUPCLASS*)lParam; if (pc == NULL) diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp index 5d20b88e62..a5e8575c6f 100644 --- a/plugins/YAPP/src/yapp.cpp +++ b/plugins/YAPP/src/yapp.cpp @@ -42,18 +42,18 @@ PLUGININFOEX pluginInfo={ {0xefd15f16, 0x7ae4, 0x40d7, {0xa8, 0xe3, 0xa4, 0x11, 0xed, 0x74, 0x7b, 0xd5}} }; -BOOL WINAPI DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) +BOOL WINAPI DllMain(HMODULE hModule, DWORD, LPVOID) { hInst = hModule; return TRUE; } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfo; } -int ReloadFont(WPARAM wParam, LPARAM lParam) +int ReloadFont(WPARAM, LPARAM) { LOGFONT log_font; if (hFontFirstLine) DeleteObject(hFontFirstLine); @@ -185,7 +185,7 @@ void InitMenuItems(void) hMenuItem = Menu_AddMainMenuItem(&mi); } -int ModulesLoaded(WPARAM wParam, LPARAM lParam) +int ModulesLoaded(WPARAM, LPARAM) { MNotifyGetLink(); @@ -203,7 +203,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) return 0; } -int PreShutdown(WPARAM wParam, LPARAM lParam) +int PreShutdown(WPARAM, LPARAM) { bShutdown = true; DeinitMessagePump(); diff --git a/plugins/YAPP/src/yapp_history_dlg.cpp b/plugins/YAPP/src/yapp_history_dlg.cpp index 640e5c5020..b8173a6f67 100644 --- a/plugins/YAPP/src/yapp_history_dlg.cpp +++ b/plugins/YAPP/src/yapp_history_dlg.cpp @@ -401,7 +401,7 @@ void AddEventsCustomControl(HWND hWnd, int renderer, TCHAR *filter, SIG_MATCHESF } } -void AddEventsDefault(HWND hWnd, int renderer, TCHAR *filter, SIG_MATCHESFILTER MatchesFilter) +void AddEventsDefault(HWND hWnd, int, TCHAR *filter, SIG_MATCHESFILTER MatchesFilter) { HWND hHistoryList = GetDlgItem(hWnd, IDC_LST_HISTORY); TCHAR buffer[1024]; -- cgit v1.2.3