From 956b40e6c2aa652c33c0cdcde84f81378f59f6ea Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 26 Dec 2012 21:07:17 +0100 Subject: [PATCH] Silence some C4100 warnings Based on TortoiseSVN revision 23718. Signed-off-by: Sven Strickroth --- src/TortoiseGitSetup/CustomActions/CustomActions.cpp | 14 +++++++------- src/TortoiseIDiff/MainWindow.cpp | 8 ++++---- src/TortoiseIDiff/TortoiseIDiff.cpp | 2 +- src/Utils/MiscUI/MyMemDC.h | 2 +- src/Utils/MiscUI/Picture.cpp | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/TortoiseGitSetup/CustomActions/CustomActions.cpp b/src/TortoiseGitSetup/CustomActions/CustomActions.cpp index 71b95b85e..55418b4d1 100644 --- a/src/TortoiseGitSetup/CustomActions/CustomActions.cpp +++ b/src/TortoiseGitSetup/CustomActions/CustomActions.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2003-2008 - TortoiseSVN +// Copyright (C) 2003-2008, 2012 - TortoiseSVN // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -30,15 +30,15 @@ #define TGIT_CACHE_WINDOW_NAME _T("TGitCacheWindow") -BOOL APIENTRY DllMain( HANDLE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved +BOOL APIENTRY DllMain( HANDLE /*hModule*/, + DWORD /*ul_reason_for_call*/, + LPVOID /*lpReserved*/ ) { return TRUE; } -UINT __stdcall TerminateCache(MSIHANDLE hModule) +UINT __stdcall TerminateCache(MSIHANDLE /*hModule*/) { HWND hWnd = FindWindow(TGIT_CACHE_WINDOW_NAME, TGIT_CACHE_WINDOW_NAME); if (hWnd) @@ -62,13 +62,13 @@ UINT __stdcall TerminateCache(MSIHANDLE hModule) return ERROR_SUCCESS; } -UINT __stdcall OpenDonatePage(MSIHANDLE hModule) +UINT __stdcall OpenDonatePage(MSIHANDLE /*hModule*/) { ShellExecute(NULL, _T("open"), _T("https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=GJGTG75GV5PL6&lc=C2&item_name=Donate%20To%20The%20TortoiseGit%20Project¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"), NULL,NULL, SW_SHOW); return ERROR_SUCCESS; } -UINT __stdcall MsgBox(MSIHANDLE hModule) +UINT __stdcall MsgBox(MSIHANDLE /*hModule*/) { MessageBox(NULL, _T("CustomAction \"MsgBox\" running"), _T("Installer"), MB_ICONINFORMATION); return ERROR_SUCCESS; diff --git a/src/TortoiseIDiff/MainWindow.cpp b/src/TortoiseIDiff/MainWindow.cpp index f1b0c85e0..199fb71ae 100644 --- a/src/TortoiseIDiff/MainWindow.cpp +++ b/src/TortoiseIDiff/MainWindow.cpp @@ -604,7 +604,7 @@ void CMainWindow::DrawXorBar(HDC hdc, int x1, int y1, int width, int height) DeleteObject(hbm); } -LRESULT CMainWindow::Splitter_OnLButtonDown(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) +LRESULT CMainWindow::Splitter_OnLButtonDown(HWND hwnd, UINT /*iMsg*/, WPARAM /*wParam*/, LPARAM lParam) { POINT pt; HDC hdc; @@ -660,7 +660,7 @@ void CMainWindow::Splitter_CaptureChanged() bDragMode = false; } -LRESULT CMainWindow::Splitter_OnLButtonUp(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) +LRESULT CMainWindow::Splitter_OnLButtonUp(HWND hwnd, UINT /*iMsg*/, WPARAM /*wParam*/, LPARAM lParam) { HDC hdc; RECT rect; @@ -726,7 +726,7 @@ LRESULT CMainWindow::Splitter_OnLButtonUp(HWND hwnd, UINT iMsg, WPARAM wParam, L return 0; } -LRESULT CMainWindow::Splitter_OnMouseMove(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) +LRESULT CMainWindow::Splitter_OnMouseMove(HWND hwnd, UINT /*iMsg*/, WPARAM wParam, LPARAM lParam) { HDC hdc; RECT rect; @@ -793,7 +793,7 @@ bool CMainWindow::OpenDialog() return (DialogBox(hResource, MAKEINTRESOURCE(IDD_OPEN), *this, (DLGPROC)OpenDlgProc)==IDOK); } -BOOL CALLBACK CMainWindow::OpenDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) +BOOL CALLBACK CMainWindow::OpenDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM /*lParam*/) { switch (message) { diff --git a/src/TortoiseIDiff/TortoiseIDiff.cpp b/src/TortoiseIDiff/TortoiseIDiff.cpp index a4584297d..e55f20af9 100644 --- a/src/TortoiseIDiff/TortoiseIDiff.cpp +++ b/src/TortoiseIDiff/TortoiseIDiff.cpp @@ -35,7 +35,7 @@ HCURSOR curHandDown; int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, - int nCmdShow) + int /*nCmdShow*/) { UNREFERENCED_PARAMETER(hPrevInstance); diff --git a/src/Utils/MiscUI/MyMemDC.h b/src/Utils/MiscUI/MyMemDC.h index 0271df37a..9c13af198 100644 --- a/src/Utils/MiscUI/MyMemDC.h +++ b/src/Utils/MiscUI/MyMemDC.h @@ -130,7 +130,7 @@ class CMyMemDC public: // constructor sets up the memory DC - CMyMemDC(HDC hDC, bool bTempOnly = false, int nOffset = 0) + CMyMemDC(HDC hDC, bool bTempOnly = false) { m_hDC = hDC; m_hOldBitmap = NULL; diff --git a/src/Utils/MiscUI/Picture.cpp b/src/Utils/MiscUI/Picture.cpp index ed417abd1..5431ab451 100644 --- a/src/Utils/MiscUI/Picture.cpp +++ b/src/Utils/MiscUI/Picture.cpp @@ -266,12 +266,12 @@ bool CPicture::Load(tstring sFilePathName) typedef unsigned (__stdcall *FreeImage_GetHeight_t)(void* dib); typedef void (__stdcall *FreeImage_ConvertToRawBits_t)(BYTE *bits, void *dib, int pitch, unsigned bpp, unsigned red_mask, unsigned green_mask, unsigned blue_mask, BOOL topdown); - FreeImage_GetVersion_t FreeImage_GetVersion = NULL; + //FreeImage_GetVersion_t FreeImage_GetVersion = NULL; FreeImage_GetFileType_t FreeImage_GetFileType = NULL; FreeImage_GetFIFFromFilename_t FreeImage_GetFIFFromFilename = NULL; FreeImage_Load_t FreeImage_Load = NULL; FreeImage_Unload_t FreeImage_Unload = NULL; - FreeImage_GetColorType_t FreeImage_GetColorType = NULL; + //FreeImage_GetColorType_t FreeImage_GetColorType = NULL; FreeImage_GetWidth_t FreeImage_GetWidth = NULL; FreeImage_GetHeight_t FreeImage_GetHeight = NULL; FreeImage_ConvertToRawBits_t FreeImage_ConvertToRawBits = NULL; -- 2.11.4.GIT