summaryrefslogtreecommitdiff
path: root/plugins/Ping/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Ping/src')
-rw-r--r--plugins/Ping/src/icmp.cpp2
-rw-r--r--plugins/Ping/src/log.cpp2
-rw-r--r--plugins/Ping/src/menu.cpp2
-rw-r--r--plugins/Ping/src/options.cpp4
-rw-r--r--plugins/Ping/src/ping.cpp8
-rw-r--r--plugins/Ping/src/pinggraph.cpp2
-rw-r--r--plugins/Ping/src/pinglist.cpp12
-rw-r--r--plugins/Ping/src/pingthread.cpp16
-rw-r--r--plugins/Ping/src/rawping.cpp2
-rw-r--r--plugins/Ping/src/stdafx.cxx (renamed from plugins/Ping/src/stdafx.cpp)2
-rw-r--r--plugins/Ping/src/stdafx.h (renamed from plugins/Ping/src/common.h)6
-rw-r--r--plugins/Ping/src/utils.cpp12
12 files changed, 32 insertions, 38 deletions
diff --git a/plugins/Ping/src/icmp.cpp b/plugins/Ping/src/icmp.cpp
index 88d7dfcf87..c8b8fbdb21 100644
--- a/plugins/Ping/src/icmp.cpp
+++ b/plugins/Ping/src/icmp.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
char data[] = "AAAABBBBCCCCDDDDEEEEFFFFGGGGHHH";
ICMP *ICMP::instance = 0;
diff --git a/plugins/Ping/src/log.cpp b/plugins/Ping/src/log.cpp
index c6cc40a66f..cce8d2e61c 100644
--- a/plugins/Ping/src/log.cpp
+++ b/plugins/Ping/src/log.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
INT_PTR Log(WPARAM wParam, LPARAM) {
diff --git a/plugins/Ping/src/menu.cpp b/plugins/Ping/src/menu.cpp
index ad5a466e62..dfbf76cbaa 100644
--- a/plugins/Ping/src/menu.cpp
+++ b/plugins/Ping/src/menu.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
HANDLE hMenuDisable, hMenuGraph, hMenuEdit;
HANDLE hEventMenuBuild;
diff --git a/plugins/Ping/src/options.cpp b/plugins/Ping/src/options.cpp
index ad5d93ee68..467bd008bb 100644
--- a/plugins/Ping/src/options.cpp
+++ b/plugins/Ping/src/options.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
PingOptions options;
@@ -164,7 +164,7 @@ PINGLIST temp_list;
PINGADDRESS add_edit_addr;
// host edit
-INT_PTR CALLBACK DlgProcDestEdit(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
+INT_PTR CALLBACK DlgProcDestEdit(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM) {
switch (msg) {
case WM_INITDIALOG:
TranslateDialogDefault(hwndDlg);
diff --git a/plugins/Ping/src/ping.cpp b/plugins/Ping/src/ping.cpp
index 261b959ada..c179d52a12 100644
--- a/plugins/Ping/src/ping.cpp
+++ b/plugins/Ping/src/ping.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
CLIST_INTERFACE *pcli;
HINSTANCE hInst;
@@ -24,13 +24,13 @@ PLUGININFOEX pluginInfo = {
{ 0x760ea901, 0xc0c2, 0x446c, { 0x80, 0x29, 0x94, 0xc3, 0xbc, 0x47, 0xc4, 0x5e } }
};
-extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+extern "C" 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;
}
@@ -66,7 +66,7 @@ void CreatePluginServices()
}
-int OnShutdown(WPARAM wParam, LPARAM lParam) {
+int OnShutdown(WPARAM, LPARAM) {
graphs_cleanup();
UnhookEvent(hFillListEvent);
diff --git a/plugins/Ping/src/pinggraph.cpp b/plugins/Ping/src/pinggraph.cpp
index 8e0b7d0846..00e0402f53 100644
--- a/plugins/Ping/src/pinggraph.cpp
+++ b/plugins/Ping/src/pinggraph.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
HistoryMap history_map;
diff --git a/plugins/Ping/src/pinglist.cpp b/plugins/Ping/src/pinglist.cpp
index 51aa6f73a3..c08d279610 100644
--- a/plugins/Ping/src/pinglist.cpp
+++ b/plugins/Ping/src/pinglist.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
PINGLIST list_items;
mir_cs list_cs;
@@ -183,7 +183,7 @@ void read_ping_addresses()
}
-INT_PTR LoadPingList(WPARAM wParam, LPARAM lParam)
+INT_PTR LoadPingList(WPARAM, LPARAM)
{
mir_cslock lck(list_cs);
read_ping_addresses();
@@ -193,7 +193,7 @@ INT_PTR LoadPingList(WPARAM wParam, LPARAM lParam)
// wParam is zero
// lParam is zero
-INT_PTR SavePingList(WPARAM wParam, LPARAM lParam)
+INT_PTR SavePingList(WPARAM, LPARAM)
{
mir_cslock lck(list_cs);
write_ping_addresses();
@@ -203,7 +203,7 @@ INT_PTR SavePingList(WPARAM wParam, LPARAM lParam)
// wParam is address of a PINGLIST structure to replace the current one
// lParam is zero
-INT_PTR SetPingList(WPARAM wParam, LPARAM lParam)
+INT_PTR SetPingList(WPARAM wParam, LPARAM)
{
PINGLIST *pli = (PINGLIST *)wParam;
@@ -216,7 +216,7 @@ INT_PTR SetPingList(WPARAM wParam, LPARAM lParam)
// wParam is address of a PINGLIST structure to replace the current one
// lParam is zero
-INT_PTR SetAndSavePingList(WPARAM wParam, LPARAM lParam)
+INT_PTR SetAndSavePingList(WPARAM wParam, LPARAM)
{
PINGLIST *pli = (PINGLIST *)wParam;
@@ -231,7 +231,7 @@ INT_PTR SetAndSavePingList(WPARAM wParam, LPARAM lParam)
return 0;
}
-INT_PTR ClearPingList(WPARAM wParam, LPARAM lParam)
+INT_PTR ClearPingList(WPARAM, LPARAM)
{
mir_cslock lck(list_cs);
list_items.clear();
diff --git a/plugins/Ping/src/pingthread.cpp b/plugins/Ping/src/pingthread.cpp
index 859383a892..c9b6e87421 100644
--- a/plugins/Ping/src/pingthread.cpp
+++ b/plugins/Ping/src/pingthread.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
int upCount, total = 0;
@@ -75,7 +75,7 @@ void SetProtoStatus(TCHAR *pszLabel, char *pszProto, int if_status, int new_stat
}
}
-void __cdecl sttCheckStatusThreadProc(void *vp)
+void __cdecl sttCheckStatusThreadProc(void*)
{
clock_t start_t = clock(), end_t;
while (!get_thread_finished())
@@ -258,7 +258,7 @@ bool FrameIsFloating() {
return (CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS, MAKEWPARAM(FO_FLOATING, frame_id), 0) != 0);
}
-int FillList(WPARAM wParam, LPARAM lParam) {
+int FillList(WPARAM, LPARAM) {
if (options.logging)
CallService(PLUG "/Log", (WPARAM)_T("ping address list reload"), 0);
@@ -293,7 +293,7 @@ int FillList(WPARAM wParam, LPARAM lParam) {
return 0;
}
-INT_PTR PingPlugShowWindow(WPARAM wParam, LPARAM lParam)
+INT_PTR PingPlugShowWindow(WPARAM, LPARAM)
{
if (hpwnd)
{
@@ -307,10 +307,10 @@ INT_PTR PingPlugShowWindow(WPARAM wParam, LPARAM lParam)
#define TIMER_ID 11042
void CALLBACK TimerProc(
- HWND hwnd, // handle to window
- UINT uMsg, // WM_TIMER message
- UINT_PTR idEvent, // timer identifier
- DWORD dwTime // current system time
+ HWND , // handle to window
+ UINT, // WM_TIMER message
+ UINT_PTR, // timer identifier
+ DWORD // current system time
)
{
if (frame_id != -1 && ServiceExists(MS_CLIST_FRAMES_ADDFRAME))
diff --git a/plugins/Ping/src/rawping.cpp b/plugins/Ping/src/rawping.cpp
index aad13b220e..2382aa9030 100644
--- a/plugins/Ping/src/rawping.cpp
+++ b/plugins/Ping/src/rawping.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
USHORT ip_checksum(USHORT* buffer, int size)
{
diff --git a/plugins/Ping/src/stdafx.cpp b/plugins/Ping/src/stdafx.cxx
index c5fe5abaad..6fb37564b7 100644
--- a/plugins/Ping/src/stdafx.cpp
+++ b/plugins/Ping/src/stdafx.cxx
@@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "common.h" \ No newline at end of file
+#include "stdafx.h" \ No newline at end of file
diff --git a/plugins/Ping/src/common.h b/plugins/Ping/src/stdafx.h
index 0329e3491e..bfa39fbd0c 100644
--- a/plugins/Ping/src/common.h
+++ b/plugins/Ping/src/stdafx.h
@@ -1,7 +1,3 @@
-#ifndef _COMMON_H
-#define _COMMON_H
-
-#define _CRT_SECURE_NO_DEPRECATE
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <windows.h>
@@ -133,5 +129,3 @@ extern mir_cs thread_finished_cs, list_changed_cs, data_list_cs;
extern PINGLIST data_list;
int ReloadIcons(WPARAM, LPARAM);
-
-#endif
diff --git a/plugins/Ping/src/utils.cpp b/plugins/Ping/src/utils.cpp
index 3040e69270..5421275577 100644
--- a/plugins/Ping/src/utils.cpp
+++ b/plugins/Ping/src/utils.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "stdafx.h"
LRESULT CALLBACK NullWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
@@ -134,7 +134,7 @@ INT_PTR PluginPing(WPARAM, LPARAM lParam)
return 0;
}
-INT_PTR PingDisableAll(WPARAM wParam, LPARAM lParam) {
+INT_PTR PingDisableAll(WPARAM, LPARAM) {
PINGLIST pl;
CallService(PLUG "/GetPingList", 0, (LPARAM)&pl);
for (pinglist_it i = pl.begin(); i != pl.end(); ++i) {
@@ -145,7 +145,7 @@ INT_PTR PingDisableAll(WPARAM wParam, LPARAM lParam) {
return 0;
}
-INT_PTR PingEnableAll(WPARAM wParam, LPARAM lParam) {
+INT_PTR PingEnableAll(WPARAM, LPARAM) {
PINGLIST pl;
CallService(PLUG "/GetPingList", 0, (LPARAM)&pl);
for (pinglist_it i = pl.begin(); i != pl.end(); ++i) {
@@ -158,7 +158,7 @@ INT_PTR PingEnableAll(WPARAM wParam, LPARAM lParam) {
}
-INT_PTR ToggleEnabled(WPARAM wParam, LPARAM lParam) {
+INT_PTR ToggleEnabled(WPARAM wParam, LPARAM) {
int retval = 0;
PINGLIST pl;
CallService(PLUG "/GetPingList", 0, (LPARAM)&pl);
@@ -178,7 +178,7 @@ INT_PTR ToggleEnabled(WPARAM wParam, LPARAM lParam) {
return 0;
}
-INT_PTR EditContact(WPARAM wParam, LPARAM lParam)
+INT_PTR EditContact(WPARAM wParam, LPARAM)
{
PINGLIST pl;
HWND hwndList = pcli->hwndContactList;
@@ -200,7 +200,7 @@ INT_PTR EditContact(WPARAM wParam, LPARAM lParam)
return 1;
}
-INT_PTR DblClick(WPARAM wParam, LPARAM lParam) {
+INT_PTR DblClick(WPARAM wParam, LPARAM) {
PINGLIST pl;
CallService(PLUG "/GetPingList", 0, (LPARAM)&pl);
for (pinglist_it i = pl.begin(); i != pl.end(); ++i) {