From ff3788bdcbd90769aa860814fb8a4a6b09a1e8a7 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 24 Apr 2015 19:59:35 +0000 Subject: Alarms - warning fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@13105 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Alarms/src/alarm_win.cpp | 4 ++-- plugins/Alarms/src/alarmlist.cpp | 6 ++--- plugins/Alarms/src/alarms.cpp | 48 +++++----------------------------------- plugins/Alarms/src/frame.cpp | 5 ++--- plugins/Alarms/src/icons.cpp | 2 +- plugins/Alarms/src/options.cpp | 6 ++--- plugins/Alarms/src/stdafx.h | 1 - 7 files changed, 16 insertions(+), 56 deletions(-) (limited to 'plugins') diff --git a/plugins/Alarms/src/alarm_win.cpp b/plugins/Alarms/src/alarm_win.cpp index cd4d691845..9cabb6b70d 100644 --- a/plugins/Alarms/src/alarm_win.cpp +++ b/plugins/Alarms/src/alarm_win.cpp @@ -342,7 +342,7 @@ INT_PTR CALLBACK DlgProcAlarm(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar return FALSE; } -int ReloadFonts(WPARAM wParam, LPARAM lParam) +int ReloadFonts(WPARAM, LPARAM) { LOGFONT log_font; title_font_colour = CallService(MS_FONT_GETT, (WPARAM)&title_font_id, (LPARAM)&log_font); @@ -361,7 +361,7 @@ int ReloadFonts(WPARAM wParam, LPARAM lParam) return 0; } -int AlarmWinModulesLoaded(WPARAM wParam, LPARAM lParam) +int AlarmWinModulesLoaded(WPARAM, LPARAM) { title_font_id.cbSize = sizeof(FontIDT); _tcscpy(title_font_id.group, LPGENT("Alarms")); diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp index acbcfef543..41ae865577 100644 --- a/plugins/Alarms/src/alarmlist.cpp +++ b/plugins/Alarms/src/alarmlist.cpp @@ -634,12 +634,12 @@ void CheckAlarms() { } -VOID CALLBACK TimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) { +VOID CALLBACK TimerProc(HWND, UINT, UINT_PTR, DWORD) { CheckAlarms(); } -INT_PTR AddAlarmService(WPARAM wParam, LPARAM lParam) +INT_PTR AddAlarmService(WPARAM, LPARAM lParam) { ALARMINFO *alarm_info = (ALARMINFO *)lParam; ALARM alarm = {0}; @@ -659,7 +659,7 @@ INT_PTR AddAlarmService(WPARAM wParam, LPARAM lParam) return 0; } -int IdleChanged(WPARAM wParam, LPARAM lParam) +int IdleChanged(WPARAM, LPARAM lParam) { is_idle = (lParam & IDF_ISIDLE); return 0; diff --git a/plugins/Alarms/src/alarms.cpp b/plugins/Alarms/src/alarms.cpp index 9144031f2a..0465421ff2 100644 --- a/plugins/Alarms/src/alarms.cpp +++ b/plugins/Alarms/src/alarms.cpp @@ -38,13 +38,13 @@ PLUGININFOEX pluginInfo = { {0x4dd7762b, 0xd612, 0x4f84, {0xaa, 0x86, 0x6, 0x8f, 0x17, 0x85, 0x9b, 0x6d}} }; -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; } @@ -85,43 +85,6 @@ void ShowPopup(MCONTACT hContact, const TCHAR *msg) } } -static int PluginSendMessage(WPARAM wParam,LPARAM lParam) -{ - CallContactService(wParam,PSS_MESSAGE,0,lParam); - return 0; -} - -static int PluginMessageReceived(WPARAM wParam,LPARAM lParam) -{ - CCSDATA *pccsd = (CCSDATA *)lParam; - PROTORECVEVENT *ppre = ( PROTORECVEVENT * )pccsd->lParam; - TCHAR response[256]; - - TCHAR msg[1024], buff[1024]; - - if (_tcsncmp(ppre->tszMessage, szGamePrefix, _tcslen(szGamePrefix))) - return CallService(MS_PROTO_CHAINRECV, wParam, lParam ); - - _tcsncpy(msg, ppre->tszMessage + _tcslen(szGamePrefix),SIZEOF(msg)); - - TCHAR *savedMsg = ppre->tszMessage; - - if (!_tcscmp(msg, _T(" ffw"))) { - _tcsncpy_s(buff, _T("Fast forward!"), _TRUNCATE); - - HWND hWnd = FindWindow(0, _T("Windows Media Player")); - PostMessage(hWnd, WM_COMMAND, WMP_NEXT, 0); - } else - mir_sntprintf(buff, SIZEOF(buff), TranslateT("Unknown command issued: \"%s\""), msg); - - ShowPopup(pccsd->hContact, buff); - - _tcsncpy(response, buff, SIZEOF(response)); - PluginSendMessage((WPARAM)pccsd->hContact, (LPARAM)response); - - return 0; -} - HBITMAP LoadBmpFromIcon(int IdRes) { HICON hIcon = LoadIcon(hInst,MAKEINTRESOURCE(IdRes)); @@ -136,7 +99,6 @@ HBITMAP LoadBmpFromIcon(int IdRes) bih.biCompression = BI_RGB; bih.biHeight = 16; bih.biWidth = 20; - int widthBytes = ((bih.biWidth*bih.biBitCount + 31) >> 5) * 4; rc.top = rc.left = 0; rc.right = bih.biWidth; rc.bottom = bih.biHeight; @@ -158,7 +120,7 @@ HBITMAP LoadBmpFromIcon(int IdRes) return hBmp; } -static int InitTopToolbarButton(WPARAM wParam, LPARAM lParam) +static int InitTopToolbarButton(WPARAM, LPARAM) { TTBButton ttb = { sizeof(ttb) }; ttb.hIconUp = LoadIcon(hInst, MAKEINTRESOURCE(IDI_TBUP)); @@ -170,7 +132,7 @@ static int InitTopToolbarButton(WPARAM wParam, LPARAM lParam) return 0; } -static int MainInit(WPARAM wparam,LPARAM lparam) +static int MainInit(WPARAM, LPARAM) { // TopToolbar support HookEvent(ME_TTB_MODULELOADED, InitTopToolbarButton); @@ -179,7 +141,7 @@ static int MainInit(WPARAM wparam,LPARAM lparam) return 0; } -static int MainDeInit(WPARAM wParam, LPARAM lParam) +static int MainDeInit(WPARAM, LPARAM) { DeinitFrames(); DeinitList(); diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp index 6c22768090..794d31aa58 100644 --- a/plugins/Alarms/src/frame.cpp +++ b/plugins/Alarms/src/frame.cpp @@ -240,7 +240,6 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar SetWindowPos(GetParent(hwnd), 0, 0, 0, rp_window.right - rp_window.left, height, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); } else if (ServiceExists(MS_CLIST_FRAMES_ADDFRAME) && frame_id != -1) { - int flags = CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS, MAKEWPARAM(FO_FLAGS, frame_id), 0); CallService(MS_CLIST_FRAMES_SETFRAMEOPTIONS, MAKEWPARAM(FO_HEIGHT, frame_id), (LPARAM)(count * itemheight)); CallService(MS_CLIST_FRAMES_UPDATEFRAME, (WPARAM)frame_id, (LPARAM)(FU_TBREDRAW | FU_FMREDRAW | FU_FMPOS)); } @@ -435,7 +434,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return DefWindowProc(hwnd, msg, wParam, lParam); } -int ReloadFont(WPARAM wParam, LPARAM lParam) +int ReloadFont(WPARAM, LPARAM) { DeleteObject(hFont); @@ -483,7 +482,7 @@ void SetReminderFrameVisible(bool visible) ShowWindow(hwnd_frame, visible ? SW_SHOW : SW_HIDE); } -INT_PTR ShowHideMenuFunc(WPARAM wParam, LPARAM lParam) +INT_PTR ShowHideMenuFunc(WPARAM, LPARAM) { if (ReminderFrameVisible()) SendMessage(hwnd_frame, WM_CLOSE, 0, 0); diff --git a/plugins/Alarms/src/icons.cpp b/plugins/Alarms/src/icons.cpp index 655ec171a4..df812194ad 100644 --- a/plugins/Alarms/src/icons.cpp +++ b/plugins/Alarms/src/icons.cpp @@ -12,7 +12,7 @@ static IconItem iconList[] = { LPGEN("Menu: Show/Hide reminders"), "alarms_menu_showhide", IDI_MAINMENU } }; -int ReloadIcons(WPARAM wParam, LPARAM lParam) +int ReloadIcons(WPARAM, LPARAM) { hIconMenuSet = Skin_GetIcon("alarms_menu_set"); hIconList1 = Skin_GetIcon("alarms_list1"); diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp index 4b5fc36af7..ec040a3833 100644 --- a/plugins/Alarms/src/options.cpp +++ b/plugins/Alarms/src/options.cpp @@ -710,7 +710,7 @@ void AddMenuItem() /////////////////////// // create menu item -int OptionsModulesLoaded(WPARAM wParam, LPARAM lParam) +int OptionsModulesLoaded(WPARAM, LPARAM) { CreateServiceFunction(MODULE "/NewAlarm", NewAlarmMenuFunc); @@ -1133,7 +1133,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA } -int OptInit(WPARAM wParam,LPARAM lParam) +int OptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = -790000000; @@ -1181,7 +1181,7 @@ void SaveOptions() db_set_dw(0, MODULE, "ReminderPeriod", options.reminder_period); } -INT_PTR NewAlarmMenuFunc(WPARAM wParam, LPARAM lParam) +INT_PTR NewAlarmMenuFunc(WPARAM, LPARAM) { ALARM *new_alarm = new ALARM; memset(new_alarm, 0, sizeof(ALARM)); diff --git a/plugins/Alarms/src/stdafx.h b/plugins/Alarms/src/stdafx.h index 78cfb91ed3..32d0eab2d1 100644 --- a/plugins/Alarms/src/stdafx.h +++ b/plugins/Alarms/src/stdafx.h @@ -2,7 +2,6 @@ #define _COMMON_INC -#define _WIN32_WINNT 0x0500 #define _WIN32_IE 0x0400 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -- cgit v1.2.3