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/TipperYM/src/bitmap_func.cpp | 1 + plugins/TipperYM/src/message_pump.cpp | 10 +++++----- plugins/TipperYM/src/mir_smileys.cpp | 16 ++++++++-------- plugins/TipperYM/src/mir_smileys.h | 8 ++++---- plugins/TipperYM/src/options.cpp | 4 ++-- plugins/TipperYM/src/popwin.cpp | 8 ++++---- plugins/TipperYM/src/tipper.cpp | 12 ++++++------ plugins/TipperYM/src/translations.cpp | 2 +- 8 files changed, 31 insertions(+), 30 deletions(-) (limited to 'plugins/TipperYM/src') diff --git a/plugins/TipperYM/src/bitmap_func.cpp b/plugins/TipperYM/src/bitmap_func.cpp index 41235c0f07..0483556753 100644 --- a/plugins/TipperYM/src/bitmap_func.cpp +++ b/plugins/TipperYM/src/bitmap_func.cpp @@ -178,6 +178,7 @@ void CreateFromBitmaps(bool bServiceTip) rcWidth = opt.iSidebarWidth; rcHeight = skin.iHeight; } + else rcWidth = rcHeight = 0; // bitmap size iBmpWidth = fii->FI_GetWidth(fib); diff --git a/plugins/TipperYM/src/message_pump.cpp b/plugins/TipperYM/src/message_pump.cpp index 07fd28ea3e..fa9f32515d 100644 --- a/plugins/TipperYM/src/message_pump.cpp +++ b/plugins/TipperYM/src/message_pump.cpp @@ -34,7 +34,7 @@ __inline bool IsContactTooltip(CLCINFOTIPEX *clc) return !(clc->szProto || clc->swzText); } -void CALLBACK TimerProcWaitForContent(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +void CALLBACK TimerProcWaitForContent(HWND, UINT, UINT_PTR, DWORD) { KillTimer(0, WaitForContentTimerID); WaitForContentTimerID = 0; @@ -99,7 +99,7 @@ bool NeedWaitForContent(CLCINFOTIPEX *clcitex) return bNeedWait; } -unsigned int CALLBACK MessagePumpThread(void *param) +unsigned int CALLBACK MessagePumpThread(void*) { HWND hwndTip = NULL; CLCINFOTIPEX *clcitex = NULL; @@ -304,7 +304,7 @@ int HideTipHook(WPARAM wParam, LPARAM lParam) return 0; } -int ProtoAck(WPARAM wParam, LPARAM lParam) +int ProtoAck(WPARAM, LPARAM lParam) { ACKDATA *ack = (ACKDATA*)lParam; if ((ack==NULL) || (ack->result != ACKRESULT_SUCCESS)) @@ -321,13 +321,13 @@ int ProtoAck(WPARAM wParam, LPARAM lParam) return 0; } -int AvatarChanged(WPARAM hContact, LPARAM lParam) +int AvatarChanged(WPARAM hContact, LPARAM) { PostMPMessage(MUM_GOTAVATAR, hContact, 0); return 0; } -int FramesShowSBTip(WPARAM wParam, LPARAM lParam) +int FramesShowSBTip(WPARAM wParam, LPARAM) { if (opt.bStatusBarTips) { diff --git a/plugins/TipperYM/src/mir_smileys.cpp b/plugins/TipperYM/src/mir_smileys.cpp index 19b963e0de..3aeafcb697 100644 --- a/plugins/TipperYM/src/mir_smileys.cpp +++ b/plugins/TipperYM/src/mir_smileys.cpp @@ -66,13 +66,13 @@ void Smileys_FreeParse(SMILEYPARSEINFO parseInfo) // Similar to DrawText win32 api function // Pass uFormat | DT_CALCRECT to calc rectangle to be returned by lpRect // parseInfo is optional (pass NULL and it will be calculated and deleted inside function -int Smileys_DrawText(HDC hDC, LPCTSTR lpString, int nCount, LPRECT lpRect, UINT uFormat, const char *protocol, SMILEYPARSEINFO parseInfo) +int Smileys_DrawText(HDC hDC, LPCTSTR lpString, int nCount, LPRECT lpRect, UINT uFormat, SMILEYPARSEINFO parseInfo) { if (nCount == -1) nCount = (int)mir_tstrlen(lpString); if (uFormat & DT_CALCRECT) { - SIZE text_size = GetTextSize(hDC, lpString, parseInfo, uFormat, parseInfo->max_height, (lpRect->right - lpRect->left)); + SIZE text_size = GetTextSize(hDC, lpString, parseInfo, uFormat, (lpRect->right - lpRect->left)); lpRect->bottom = text_size.cy; if (text_size.cx < lpRect->right - lpRect->left) { @@ -91,7 +91,7 @@ int Smileys_DrawText(HDC hDC, LPCTSTR lpString, int nCount, LPRECT lpRect, UINT return DrawText(hDC, lpString, nCount, lpRect, uFormat); RECT rc = *lpRect; - SIZE text_size = GetTextSize(hDC, lpString, parseInfo, uFormat, parseInfo->max_height, (lpRect->right - lpRect->left)); + SIZE text_size = GetTextSize(hDC, lpString, parseInfo, uFormat, (lpRect->right - lpRect->left)); if (text_size.cx < rc.right - rc.left) { if (uFormat & DT_RIGHT) @@ -100,11 +100,11 @@ int Smileys_DrawText(HDC hDC, LPCTSTR lpString, int nCount, LPRECT lpRect, UINT rc.right = rc.left + text_size.cx; } - DrawTextSmiley(hDC, rc, lpString, nCount, parseInfo, uFormat, parseInfo->max_height); + DrawTextSmiley(hDC, rc, lpString, nCount, parseInfo, uFormat); return text_size.cy; } -SIZE GetTextSize(HDC hdcMem, const TCHAR *szText, SMILEYPARSEINFO info, UINT uTextFormat, int max_smiley_height, int max_width) +SIZE GetTextSize(HDC hdcMem, const TCHAR *szText, SMILEYPARSEINFO info, UINT uTextFormat, int max_width) { SIZE text_size = { 0 }; int text_height; @@ -178,7 +178,7 @@ SIZE GetTextSize(HDC hdcMem, const TCHAR *szText, SMILEYPARSEINFO info, UINT uTe return text_size; } -void DrawTextSmiley(HDC hdcMem, RECT free_rc, const TCHAR *szText, int len, SMILEYPARSEINFO info, UINT uTextFormat, int max_smiley_height) +void DrawTextSmiley(HDC hdcMem, RECT free_rc, const TCHAR *szText, int len, SMILEYPARSEINFO info, UINT uTextFormat) { if (szText == NULL) return; @@ -423,13 +423,13 @@ SortedList *ReplaceSmileys(const TCHAR *text, int text_size, const char *protoco return plText; } -int DrawTextExt(HDC hdc, LPCTSTR lpString, int nCount, LPRECT lpRect, UINT uFormat, LPCSTR lpProto, SMILEYPARSEINFO spi) +int DrawTextExt(HDC hdc, LPCTSTR lpString, int nCount, LPRECT lpRect, UINT uFormat, SMILEYPARSEINFO spi) { if ((opt.iSmileyAddFlags & SMILEYADD_ENABLE) && spi != NULL) { if (opt.iSmileyAddFlags & SMILEYADD_RESIZE) uFormat |= DT_RESIZE_SMILEYS; - return Smileys_DrawText(hdc, lpString, nCount, lpRect, uFormat, lpProto, spi); + return Smileys_DrawText(hdc, lpString, nCount, lpRect, uFormat, spi); } if (uFormat & DT_CALCRECT) diff --git a/plugins/TipperYM/src/mir_smileys.h b/plugins/TipperYM/src/mir_smileys.h index 5f78ac8f09..04d6256331 100644 --- a/plugins/TipperYM/src/mir_smileys.h +++ b/plugins/TipperYM/src/mir_smileys.h @@ -60,11 +60,11 @@ SMILEYPARSEINFO Smileys_PreParse(LPCTSTR lpString, int nCount, const char *proto void Smileys_FreeParse(SMILEYPARSEINFO parseInfo); SortedList *ReplaceSmileys(const TCHAR *text, int text_size, const char *protocol, int *max_smiley_height); -SIZE GetTextSize(HDC hdcMem, const TCHAR *szText, SMILEYPARSEINFO info, UINT uTextFormat, int max_smiley_height, int max_width); -void DrawTextSmiley(HDC hdcMem, RECT free_rc, const TCHAR *szText, int len, SMILEYPARSEINFO info, UINT uTextFormat, int max_smiley_height); +SIZE GetTextSize(HDC hdcMem, const TCHAR *szText, SMILEYPARSEINFO info, UINT uTextFormat, int max_width); +void DrawTextSmiley(HDC hdcMem, RECT free_rc, const TCHAR *szText, int len, SMILEYPARSEINFO info, UINT uTextFormat); void DestroySmileyList(SortedList* p_list); -int Smileys_DrawText(HDC hDC, LPCTSTR lpString, int nCount, LPRECT lpRect, UINT uFormat, const char *protocol, SMILEYPARSEINFO parseInfo); -int DrawTextExt(HDC hdc, LPCTSTR lpString, int nCount, LPRECT lpRect, UINT uFormat, LPCSTR lpProto, SMILEYPARSEINFO spi); +int Smileys_DrawText(HDC hDC, LPCTSTR lpString, int nCount, LPRECT lpRect, UINT uFormat, SMILEYPARSEINFO parseInfo); +int DrawTextExt(HDC hdc, LPCTSTR lpString, int nCount, LPRECT lpRect, UINT uFormat, SMILEYPARSEINFO spi); #endif // __MIR_SMILEYS_H__ diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp index 7dd3896f19..fe719e5d90 100644 --- a/plugins/TipperYM/src/options.cpp +++ b/plugins/TipperYM/src/options.cpp @@ -1876,7 +1876,7 @@ INT_PTR CALLBACK DlgProcOptsSkin(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l return FALSE; } -INT_PTR CALLBACK DlgProcFavouriteContacts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK DlgProcFavouriteContacts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM) { switch (msg) { case WM_INITDIALOG: @@ -2130,7 +2130,7 @@ INT_PTR CALLBACK DlgProcOptsTraytip(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA return FALSE; } -int OptInit(WPARAM wParam, LPARAM lParam) +int OptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.flags = ODPF_BOLDGROUPS; diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp index 4c0fd2000a..15b6f6f7f9 100644 --- a/plugins/TipperYM/src/popwin.cpp +++ b/plugins/TipperYM/src/popwin.cpp @@ -583,7 +583,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa tr.top = opt.iPadding; tr.bottom = tr.top + pwd->iTitleHeight - opt.iPadding; UINT uTextFormat = DT_TOP | DT_LEFT | DT_WORDBREAK | DT_WORD_ELLIPSIS | DT_END_ELLIPSIS | DT_NOPREFIX; - DrawTextExt(hdc, pwd->swzTitle, -1, &tr, uTextFormat, NULL, pwd->spiTitle); + DrawTextExt(hdc, pwd->swzTitle, -1, &tr, uTextFormat, pwd->spiTitle); } } @@ -694,7 +694,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa DrawIconExAlpha(hdc, opt.iPadding, tr.top + (pwd->rows[i].iValueHeight - 16) / 2, pwd->rows[i].hIcon, 16, 16, 0, NULL, DI_NORMAL, false); UINT uFormat = opt.iValueValign | opt.iValueHalign | DT_WORDBREAK | DT_WORD_ELLIPSIS | DT_END_ELLIPSIS | DT_NOPREFIX; - DrawTextExt(hdc, pwd->rows[i].swzValue, -1, &tr, uFormat, NULL, pwd->rows[i].spi); + DrawTextExt(hdc, pwd->rows[i].swzValue, -1, &tr, uFormat, pwd->rows[i].spi); } } @@ -1149,7 +1149,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa smr.right -= opt.iPadding; if (hFontTitle) SelectObject(hdc, (HGDIOBJ)hFontTitle); - DrawTextExt(hdc, pwd->swzTitle, -1, &smr, DT_CALCRECT | DT_LEFT | DT_WORDBREAK | DT_END_ELLIPSIS | DT_NOPREFIX, NULL, pwd->spiTitle); + DrawTextExt(hdc, pwd->swzTitle, -1, &smr, DT_CALCRECT | DT_LEFT | DT_WORDBREAK | DT_END_ELLIPSIS | DT_NOPREFIX, pwd->spiTitle); iWidth += opt.iPadding + opt.iTitleIndent + smr.right; pwd->iTitleHeight = opt.iPadding + smr.bottom; @@ -1221,7 +1221,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa bStatusMsg = true; } - DrawTextExt(hdc, pwd->rows[i].swzValue, -1, &smr, DT_CALCRECT | DT_LEFT | DT_WORDBREAK | DT_END_ELLIPSIS | DT_NOPREFIX, NULL, pwd->rows[i].spi); + DrawTextExt(hdc, pwd->rows[i].swzValue, -1, &smr, DT_CALCRECT | DT_LEFT | DT_WORDBREAK | DT_END_ELLIPSIS | DT_NOPREFIX, pwd->rows[i].spi); } else smr.left = smr.right = 0; diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp index 1b5bfa2547..67218d0e40 100644 --- a/plugins/TipperYM/src/tipper.cpp +++ b/plugins/TipperYM/src/tipper.cpp @@ -54,18 +54,18 @@ PLUGININFOEX pluginInfoEx = {0x8392df1d, 0x9090, 0x4f8e, {0x9d, 0xf6, 0x2f, 0xe0, 0x58, 0xed, 0xd8, 0x00}} }; -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 &pluginInfoEx; } -int ReloadFont(WPARAM wParam, LPARAM lParam) +int ReloadFont(WPARAM, LPARAM) { LOGFONT logFont; if (hFontTitle) DeleteObject(hFontTitle); @@ -91,7 +91,7 @@ int ReloadFont(WPARAM wParam, LPARAM lParam) } // hack to hide tip when clist hides from timeout -int SettingChanged(WPARAM hContact, LPARAM lParam) +int SettingChanged(WPARAM, LPARAM lParam) { DBCONTACTWRITESETTING *dcws = (DBCONTACTWRITESETTING *)lParam; if (mir_strcmp(dcws->szModule, "CList") != 0 || mir_strcmp(dcws->szSetting, "State") != 0) @@ -115,7 +115,7 @@ int EventDeleted(WPARAM wParam, LPARAM lParam) return 0; } -int ReloadSkinFolder(WPARAM wParam, LPARAM lParam) +int ReloadSkinFolder(WPARAM, LPARAM) { FoldersGetCustomPathT(hSkinFolder, SKIN_FOLDER, _countof(SKIN_FOLDER), _T(DEFAULT_SKIN_FOLDER)); return 0; @@ -270,7 +270,7 @@ int ModulesLoaded(WPARAM, LPARAM) return 0; } -int Shutdown(WPARAM wParam, LPARAM lParam) +int Shutdown(WPARAM, LPARAM) { if (hFramesSBShow) UnhookEvent(hFramesSBShow); if (hFramesSBHide) UnhookEvent(hFramesSBHide); diff --git a/plugins/TipperYM/src/translations.cpp b/plugins/TipperYM/src/translations.cpp index aee33a5dc8..7fe285ac0f 100644 --- a/plugins/TipperYM/src/translations.cpp +++ b/plugins/TipperYM/src/translations.cpp @@ -671,7 +671,7 @@ TCHAR *ByteToLanguage(MCONTACT hContact, const char *szModuleName, const char *s return 0; } -INT_PTR ServiceAddTranslation(WPARAM wParam, LPARAM lParam) +INT_PTR ServiceAddTranslation(WPARAM, LPARAM lParam) { if (!lParam) return 1; -- cgit v1.2.3