summaryrefslogtreecommitdiff
path: root/src/core/stdmsg
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2015-08-08 21:15:29 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2015-08-08 21:15:29 +0000
commit17da305890a440f7becca5394ae0a8613e8b316c (patch)
tree2f5a5e71f87ff5ea34e8665f266e2ce7c4d95eda /src/core/stdmsg
parent0a73c548544c6d41ad5650cd5a7609f8ea609d26 (diff)
warnings fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@14876 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core/stdmsg')
-rw-r--r--src/core/stdmsg/src/cmdlist.cpp2
-rw-r--r--src/core/stdmsg/src/globals.cpp2
-rw-r--r--src/core/stdmsg/src/msgdialog.cpp2
-rw-r--r--src/core/stdmsg/src/msglog.cpp4
-rw-r--r--src/core/stdmsg/src/msgoptions.cpp4
-rw-r--r--src/core/stdmsg/src/msgs.cpp22
-rw-r--r--src/core/stdmsg/src/srmm.cpp4
-rw-r--r--src/core/stdmsg/src/stdafx.h2
8 files changed, 20 insertions, 22 deletions
diff --git a/src/core/stdmsg/src/cmdlist.cpp b/src/core/stdmsg/src/cmdlist.cpp
index 80e54b6f76..5b02656cf6 100644
--- a/src/core/stdmsg/src/cmdlist.cpp
+++ b/src/core/stdmsg/src/cmdlist.cpp
@@ -27,7 +27,7 @@ static UINT_PTR timerId;
void MessageFailureProcess(TMsgQueue *item, const char* err);
-static VOID CALLBACK MsgTimer(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)
+static VOID CALLBACK MsgTimer(HWND, UINT, UINT_PTR, DWORD dwTime)
{
LIST<TMsgQueue> arTimedOut(1);
{
diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp
index a59b1d9a1a..96c0739145 100644
--- a/src/core/stdmsg/src/globals.cpp
+++ b/src/core/stdmsg/src/globals.cpp
@@ -73,7 +73,7 @@ static int dbaddedevent(WPARAM hContact, LPARAM hDbEvent)
return 0;
}
-static int ackevent(WPARAM wParam, LPARAM lParam)
+static int ackevent(WPARAM, LPARAM lParam)
{
ACKDATA *pAck = (ACKDATA *)lParam;
if (pAck && pAck->type == ACKTYPE_MESSAGE) {
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 5b91776990..f91bafb564 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -66,7 +66,7 @@ static int RTL_Detect(const TCHAR *ptszText)
return 0;
}
-int SendMessageDirect(const TCHAR *szMsg, MCONTACT hContact, char *szProto)
+int SendMessageDirect(const TCHAR *szMsg, MCONTACT hContact, char*)
{
if (hContact == NULL)
return NULL;
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 2b2210d875..c459a50fb8 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -167,7 +167,7 @@ static int AppendToBufferWithRTF(char *&buffer, size_t &cbBufferEnd, size_t &cbB
#define FONT_FORMAT "{\\f%u\\fnil\\fcharset%u %S;}"
-static char *CreateRTFHeader(SrmmWindowData *dat)
+static char *CreateRTFHeader(SrmmWindowData*)
{
HDC hdc = GetDC(NULL);
logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);
@@ -196,7 +196,7 @@ static char *CreateRTFHeader(SrmmWindowData *dat)
}
//mir_free() the return value
-static char *CreateRTFTail(SrmmWindowData *dat)
+static char *CreateRTFTail(SrmmWindowData*)
{
size_t bufferEnd = 0, bufferAlloced = 1024;
char *buffer = (char *)mir_alloc(bufferAlloced);
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 905b7c4061..ea1771a910 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -46,7 +46,7 @@ static const fontOptionsList[] =
{ LPGENT("Other events"), RGB(90, 90, 160), _T("Arial"), 0, -12},
};
-static BYTE MsgDlgGetFontDefaultCharset(const TCHAR* szFont)
+static BYTE MsgDlgGetFontDefaultCharset(const TCHAR*)
{
return DEFAULT_CHARSET;
}
@@ -579,7 +579,7 @@ static int OptInitialise(WPARAM wParam, LPARAM)
return 0;
}
-static int ModernOptInitialise(WPARAM wParam, LPARAM lParam)
+static int ModernOptInitialise(WPARAM wParam, LPARAM)
{
static int iBoldControls[] =
{
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index d4189bcf8d..5436d0d6c6 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -142,7 +142,7 @@ static INT_PTR SendMessageCommand(WPARAM wParam, LPARAM lParam)
return SendMessageCmd(wParam, (char*)lParam, FALSE);
}
-static INT_PTR ReadMessageCommand(WPARAM wParam, LPARAM lParam)
+static INT_PTR ReadMessageCommand(WPARAM, LPARAM lParam)
{
CLISTEVENT *cle = (CLISTEVENT *)lParam;
if (cle)
@@ -310,7 +310,7 @@ static int IconsChanged(WPARAM, LPARAM)
return 0;
}
-static int PrebuildContactMenu(WPARAM hContact, LPARAM lParam)
+static int PrebuildContactMenu(WPARAM hContact, LPARAM)
{
if (hContact) {
bool bEnabled = false;
@@ -482,32 +482,32 @@ STDMETHODIMP_(ULONG) CREOleCallback::Release()
return refCount;
}
-STDMETHODIMP CREOleCallback::ContextSensitiveHelp(BOOL fEnterMode)
+STDMETHODIMP CREOleCallback::ContextSensitiveHelp(BOOL)
{
return S_OK;
}
-STDMETHODIMP CREOleCallback::DeleteObject(LPOLEOBJECT lpoleobj)
+STDMETHODIMP CREOleCallback::DeleteObject(LPOLEOBJECT)
{
return S_OK;
}
-STDMETHODIMP CREOleCallback::GetClipboardData(CHARRANGE * lpchrg, DWORD reco, LPDATAOBJECT * lplpdataobj)
+STDMETHODIMP CREOleCallback::GetClipboardData(CHARRANGE*, DWORD, LPDATAOBJECT*)
{
return E_NOTIMPL;
}
-STDMETHODIMP CREOleCallback::GetContextMenu(WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE * lpchrg, HMENU * lphmenu)
+STDMETHODIMP CREOleCallback::GetContextMenu(WORD, LPOLEOBJECT, CHARRANGE*, HMENU*)
{
return E_INVALIDARG;
}
-STDMETHODIMP CREOleCallback::GetDragDropEffect(BOOL fDrag, DWORD grfKeyState, LPDWORD pdwEffect)
+STDMETHODIMP CREOleCallback::GetDragDropEffect(BOOL, DWORD, LPDWORD)
{
return S_OK;
}
-STDMETHODIMP CREOleCallback::GetInPlaceContext(LPOLEINPLACEFRAME * lplpFrame, LPOLEINPLACEUIWINDOW * lplpDoc, LPOLEINPLACEFRAMEINFO lpFrameInfo)
+STDMETHODIMP CREOleCallback::GetInPlaceContext(LPOLEINPLACEFRAME*, LPOLEINPLACEUIWINDOW*, LPOLEINPLACEFRAMEINFO)
{
return E_INVALIDARG;
}
@@ -523,17 +523,17 @@ STDMETHODIMP CREOleCallback::GetNewStorage(LPSTORAGE * lplpstg)
return pictStg->CreateStorage(szwName, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, lplpstg);
}
-STDMETHODIMP CREOleCallback::QueryAcceptData(LPDATAOBJECT lpdataobj, CLIPFORMAT * lpcfFormat, DWORD reco, BOOL fReally, HGLOBAL hMetaPict)
+STDMETHODIMP CREOleCallback::QueryAcceptData(LPDATAOBJECT, CLIPFORMAT*, DWORD, BOOL, HGLOBAL)
{
return S_OK;
}
-STDMETHODIMP CREOleCallback::QueryInsertObject(LPCLSID lpclsid, LPSTORAGE lpstg, LONG cp)
+STDMETHODIMP CREOleCallback::QueryInsertObject(LPCLSID, LPSTORAGE, LONG)
{
return S_OK;
}
-STDMETHODIMP CREOleCallback::ShowContainerUI(BOOL fShow)
+STDMETHODIMP CREOleCallback::ShowContainerUI(BOOL)
{
return S_OK;
}
diff --git a/src/core/stdmsg/src/srmm.cpp b/src/core/stdmsg/src/srmm.cpp
index ac63fcb764..f1b64445e1 100644
--- a/src/core/stdmsg/src/srmm.cpp
+++ b/src/core/stdmsg/src/srmm.cpp
@@ -41,13 +41,13 @@ PLUGININFOEX pluginInfo = {
{0x657fe89b, 0xd121, 0x40c2, { 0x8a, 0xc9, 0xb9, 0xfa, 0x57, 0x55, 0xb3, 0x0D }} //{657FE89B-D121-40c2-8AC9-B9FA5755B30D}
};
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
{
g_hInst = hinstDLL;
return TRUE;
}
-extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD)
{
return &pluginInfo;
}
diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h
index db3d85499d..41722b55f7 100644
--- a/src/core/stdmsg/src/stdafx.h
+++ b/src/core/stdmsg/src/stdafx.h
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define WIN32_LEAN_AND_MEAN
-#define _CRT_SECURE_NO_WARNINGS
-
#include <windows.h>
#include <windowsx.h>
#include <ole2.h>