code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@14911 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

10 files changed, 83 insertions, 111 deletions

diff --git a/plugins/YAMN/src/browser/badconnect.cpp b/plugins/YAMN/src/browser/badconnect.cpp
index 42063887ba..7007bed2bf 100644
--- a/plugins/YAMN/src/browser/badconnect.cpp
+++ b/plugins/YAMN/src/browser/badconnect.cpp
@@ -201,8 +201,6 @@ INT_PTR CALLBACK DlgProcYAMNBadConnection(HWND hDlg, UINT msg, WPARAM wParam, LP
 			break;

 		}

 	case WM_COMMAND:

-	{

-		WORD wNotifyCode = HIWORD(wParam);

 		switch (LOWORD(wParam))

 		{

 		case IDC_BTNOK:

@@ -211,7 +209,6 @@ INT_PTR CALLBACK DlgProcYAMNBadConnection(HWND hDlg, UINT msg, WPARAM wParam, LP
 		}

 		break;

 	}

-	}

 	return 0;

 }

 

diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp
index f3d300ac78..b653415e9f 100644
--- a/plugins/YAMN/src/browser/mailbrowser.cpp
+++ b/plugins/YAMN/src/browser/mailbrowser.cpp
@@ -122,7 +122,7 @@ void DoMailActions(HWND hDlg, HACCOUNT ActualAccount, struct CMailNumbers *MN, D
 // ActualAccount- handle of account, whose mails are show
 // MailNumbers- pointer to structure, in which function stores numbers of mails with some property
 // returns one of UPDATE_XXX value (not implemented yet)
-int ChangeExistingMailStatus(HWND hListView, HACCOUNT ActualAccount, struct CMailNumbers *MN);
+int ChangeExistingMailStatus(HWND hListView, HACCOUNT ActualAccount);
 
 //Adds new mails to ListView and if any new, shows multi popup (every new message is new popup window created by popup plugin)
 // hListView- handle of listview window
@@ -131,7 +131,7 @@ int ChangeExistingMailStatus(HWND hListView, HACCOUNT ActualAccount, struct CMai
 // MailNumbers- pointer to structure, in which function stores numbers of mails with some property
 // nflags- flags what to do when new mail arrives
 // returns one of UPDATE_XXX value (not implemented yet)
-int AddNewMailsToListView(HWND hListView, HACCOUNT ActualAccount, struct CMailNumbers *MailNumbers, DWORD nflags);
+int AddNewMailsToListView(HWND hListView, HACCOUNT ActualAccount, DWORD nflags);
 
 //Window callback procedure for popup window (created by popup plugin)
 LRESULT CALLBACK NewMailPopupProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
@@ -401,9 +401,9 @@ int UpdateMails(HWND hDlg, HACCOUNT ActualAccount, DWORD nflags, DWORD nnflags)
 	else	RunPopups = FALSE;
 
 	if (RunMailBrowser)
-		ChangeExistingMailStatus(GetDlgItem(hDlg, IDC_LISTMAILS), ActualAccount, &MN);
+		ChangeExistingMailStatus(GetDlgItem(hDlg, IDC_LISTMAILS), ActualAccount);
 	if (RunMailBrowser || RunPopups)
-		AddNewMailsToListView(hDlg == NULL ? NULL : GetDlgItem(hDlg, IDC_LISTMAILS), ActualAccount, &MN, nflags);
+		AddNewMailsToListView(hDlg == NULL ? NULL : GetDlgItem(hDlg, IDC_LISTMAILS), ActualAccount, nflags);
 
 	if (RunMailBrowser)
 	{
@@ -452,7 +452,7 @@ int UpdateMails(HWND hDlg, HACCOUNT ActualAccount, DWORD nflags, DWORD nnflags)
 	return 1;
 }
 
-int ChangeExistingMailStatus(HWND hListView, HACCOUNT ActualAccount, struct CMailNumbers *MN)
+int ChangeExistingMailStatus(HWND hListView, HACCOUNT ActualAccount)
 {
 	int i, in;
 	LVITEMW item;
@@ -482,7 +482,7 @@ int ChangeExistingMailStatus(HWND hListView, HACCOUNT ActualAccount, struct CMai
 }
 
 void MimeDateToLocalizedDateTime(char *datein, WCHAR *dateout, int lendateout);
-int AddNewMailsToListView(HWND hListView, HACCOUNT ActualAccount, struct CMailNumbers *MN, DWORD nflags)
+int AddNewMailsToListView(HWND hListView, HACCOUNT ActualAccount, DWORD nflags)
 {
 	HYAMNMAIL msgq;
 	POPUPDATAT NewMailPopup = { 0 };
@@ -901,7 +901,6 @@ LRESULT CALLBACK NewMailPopupProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 		break;
 	case UM_FREEPLUGINDATA:{
 		PYAMN_MAILSHOWPARAM mpd = (PYAMN_MAILSHOWPARAM)PUGetPluginData(hWnd);
-		MCONTACT hContact = 0;
 		if ((mpd) && (INT_PTR)mpd != -1)free(mpd);
 		return FALSE;
 	}
@@ -1574,7 +1573,6 @@ INT_PTR CALLBACK DlgProcYAMNShowMessage(HWND hDlg, UINT msg, WPARAM wParam, LPAR
 		if (wParam == SIZE_RESTORED) {
 			HWND hList = GetDlgItem(hDlg, IDC_LISTHEADERS);
 			HWND hEdit = GetDlgItem(hDlg, IDC_EDITBODY);
-			BOOL changeX = LOWORD(lParam) != HeadSizeX;
 			BOOL isBodyShown = ((PYAMN_MAILSHOWPARAM)(GetWindowLongPtr(hDlg, DWLP_USER)))->mail->Flags & YAMN_MSG_BODYRECEIVED;
 			HeadSizeX = LOWORD(lParam);	//((LPRECT)lParam)->right-((LPRECT)lParam)->left;
 			HeadSizeY = HIWORD(lParam);	//((LPRECT)lParam)->bottom-((LPRECT)lParam)->top;
@@ -2117,7 +2115,7 @@ INT_PTR CALLBACK DlgProcYAMNMailBrowser(HWND hDlg, UINT msg, WPARAM wParam, LPAR
 		case IDC_BTNDEL:
 		{
 			LVITEMW item;
-			HYAMNMAIL FirstMail = NULL, ActualMail;
+			HYAMNMAIL ActualMail;
 			HANDLE ThreadRunningEV;
 			DWORD Total = 0;
 
diff --git a/plugins/YAMN/src/filterplugin.cpp b/plugins/YAMN/src/filterplugin.cpp
index e6875ccec7..0f5ac0e20a 100644
--- a/plugins/YAMN/src/filterplugin.cpp
+++ b/plugins/YAMN/src/filterplugin.cpp
@@ -103,7 +103,7 @@ INT_PTR UnregisterFilterPlugin(HYAMNFILTERPLUGIN Plugin)
 	return 1;

 }

 

-INT_PTR UnregisterFilterPluginSvc(WPARAM wParam,LPARAM lParam)

+INT_PTR UnregisterFilterPluginSvc(WPARAM wParam,LPARAM)

 {

 	HYAMNFILTERPLUGIN Plugin=(HYAMNFILTERPLUGIN)wParam;

 

diff --git a/plugins/YAMN/src/mails/mails.cpp b/plugins/YAMN/src/mails/mails.cpp
index 4b8422ac46..e8793757cd 100644
--- a/plugins/YAMN/src/mails/mails.cpp
+++ b/plugins/YAMN/src/mails/mails.cpp
@@ -199,27 +199,23 @@ INT_PTR LoadMailDataSvc(WPARAM wParam,LPARAM lParam)
 	if (MailVersion != YAMN_MAILDATAVERSION)

 		return NULL;

 

-//now we have all data to memory persisting, so no loading is needed

+	// now we have all data to memory persisting, so no loading is needed

 	return (INT_PTR)Mail->MailData;

 }

 

-INT_PTR UnloadMailDataSvc(WPARAM wParam,LPARAM)

+INT_PTR UnloadMailDataSvc(WPARAM, LPARAM)

 {

-	HYAMNMAIL Mail=(HYAMNMAIL)wParam;

-

-//now we should delete structure from memory, but it will be made in future YAMN version

 	return 1;

 }

 

-INT_PTR SaveMailDataSvc(WPARAM wParam,LPARAM lParam)

+INT_PTR SaveMailDataSvc(WPARAM, LPARAM lParam)

 {

-	HYAMNMAIL Mail=(HYAMNMAIL)wParam;

 	DWORD MailVersion=(DWORD)lParam;

 

 	if (MailVersion != YAMN_MAILDATAVERSION)

 		return (INT_PTR)-1;

 

-//now we have all data to memory persisting, so no saving is needed

+	// now we have all data to memory persisting, so no saving is needed

 	return (INT_PTR)0;

 }

 

diff --git a/plugins/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp
index 94175d3259..bfccb134d9 100644
--- a/plugins/YAMN/src/main.cpp
+++ b/plugins/YAMN/src/main.cpp
@@ -83,7 +83,7 @@ static void GetProfileDirectory(TCHAR *szPath, int cbPath)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)
 {
 	YAMNVar.hInst = hinstDLL;
 	return TRUE;
@@ -91,7 +91,7 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvRe
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
 	return &pluginInfo;
 }
@@ -176,7 +176,7 @@ static IconItem iconList[] =
 	{ LPGEN("Connect Fail"),       "YAMN_ConnectFail", IDI_BADCONNECT },
 };
 
-static void LoadIcons()
+void LoadIcons()
 {
 	Icon_Register(YAMNVar.hInst, "YAMN", iconList, _countof(iconList));
 }
diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
index 593f5238de..febfae336b 100644
--- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
@@ -71,7 +71,7 @@ void WINAPI DeleteErrorString(LPVOID String);
 // len- length of source string

 // mboxsize- adreess to integer, that receives size of mailbox

 // mails- adreess to integer, that receives number of mails

-void ExtractStat(char *stream, int len, int *mboxsize, int *mails);

+void ExtractStat(char *stream, int *mboxsize, int *mails);

 

 //Extracts mail ID on mailbox

 // stream- source string

@@ -156,7 +156,7 @@ CPOP3Account::~CPOP3Account()
 		delete InternetQueries;

 }

 

-HACCOUNT WINAPI CreatePOP3Account(HYAMNPROTOPLUGIN Plugin, DWORD CAccountVersion)

+HACCOUNT WINAPI CreatePOP3Account(HYAMNPROTOPLUGIN, DWORD)

 {

 	//First, we should check whether CAccountVersion matches.

 	//But this is internal plugin, so YAMN's CAccount structure and our CAccount structure are

@@ -386,7 +386,7 @@ DWORD WINAPI ReadPOP3Options(HACCOUNT Which, char **Parser, char *End)
 	return 0;

 }

 

-HYAMNMAIL WINAPI CreatePOP3Mail(HACCOUNT Account, DWORD MailDataVersion)

+HYAMNMAIL WINAPI CreatePOP3Mail(HACCOUNT Account, DWORD)

 {

 	HYAMNMAIL NewMail;

 	//First, we should check whether MAILDATA matches.

@@ -642,7 +642,7 @@ DWORD WINAPI SynchroPOP3(struct CheckParam * WhichTemp)
 		DebugLog(DecodeFile,"<--------Account checking-------->\n");

 		DebugLog(DecodeFile,"<Extracting stat>\n");

 #endif

-		ExtractStat(DataRX, MyClient->NetClient->Rcv, &mboxsize, &msgs);

+		ExtractStat(DataRX, &mboxsize, &msgs);

 #ifdef DEBUG_DECODE

 		DebugLog(DecodeFile,"<MailBoxSize>%d</MailBoxSize>\n",mboxsize);

 		DebugLog(DecodeFile,"<Msgs>%d</Msgs>\n",msgs);

@@ -1141,7 +1141,7 @@ void __cdecl DeleteMailsPOP3(void *param)
 #ifdef DEBUG_DECODE

 			DebugLog(DecodeFile,"<Extracting stat>\n");

 #endif

-			ExtractStat(DataRX, MyClient->NetClient->Rcv, &mboxsize, &msgs);

+			ExtractStat(DataRX, &mboxsize, &msgs);

 #ifdef DEBUG_DECODE

 			DebugLog(DecodeFile,"<MailBoxSize>%d</MailBoxSize>\n",mboxsize);

 			DebugLog(DecodeFile,"<Msgs>%d</Msgs>\n",msgs);

@@ -1357,7 +1357,7 @@ void __cdecl DeleteMailsPOP3(void *param)
 	return;

 }

 

-void ExtractStat(char *stream, int len, int *mboxsize, int *mails)

+void ExtractStat(char *stream, int *mboxsize, int *mails)

 {

 	char *finder = stream;

 	while (WS(finder) || ENDLINE(finder)) finder++;

diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
index 6b6393a022..73aa051d53 100644
--- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
@@ -69,7 +69,7 @@ INT_PTR CALLBACK DlgProcYAMNOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam)
 	return FALSE;

 }

 

-INT_PTR CALLBACK DlgProcPluginOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam)

+INT_PTR CALLBACK DlgProcPluginOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM)

 {

 	switch(msg) {

 	case WM_INITDIALOG:

@@ -160,7 +160,7 @@ INT_PTR CALLBACK DlgProcPluginOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam
 }

 

 

-int YAMNOptInitSvc(WPARAM wParam,LPARAM lParam)

+int YAMNOptInitSvc(WPARAM wParam, LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = YAMNVar.hInst;

@@ -195,7 +195,7 @@ int YAMNOptInitSvc(WPARAM wParam,LPARAM lParam)
 

 //--------------------------------------------------------------------------------------------------

 //--------------------------------------------------------------------------------------------------

-BOOL DlgEnableAccountStatus(HWND hDlg,WPARAM wParam,LPARAM lParam)

+BOOL DlgEnableAccountStatus(HWND hDlg, WPARAM wParam, LPARAM)

 {

 	EnableWindow(GetDlgItem(hDlg,IDC_CHECKST0),(BOOL)wParam);

 	EnableWindow(GetDlgItem(hDlg,IDC_CHECKST1),(BOOL)wParam);

@@ -210,7 +210,8 @@ BOOL DlgEnableAccountStatus(HWND hDlg,WPARAM wParam,LPARAM lParam)
 	EnableWindow(GetDlgItem(hDlg,IDC_CHECKST9),(BOOL)wParam);

 	return TRUE;

 }

-BOOL DlgEnableAccountPopup(HWND hDlg,WPARAM wParam,LPARAM lParam)

+

+BOOL DlgEnableAccountPopup(HWND hDlg, WPARAM wParam, LPARAM)

 {

 	EnableWindow(GetDlgItem(hDlg,IDC_CHECKPOP),(BOOL)wParam);

 	EnableWindow(GetDlgItem(hDlg,IDC_EDITPOPS),(IsDlgButtonChecked(hDlg,IDC_CHECKPOP)==BST_CHECKED) && wParam);

@@ -233,7 +234,7 @@ BOOL DlgEnableAccountPopup(HWND hDlg,WPARAM wParam,LPARAM lParam)
 	return TRUE;

 }

 

-BOOL DlgEnableAccount(HWND hDlg,WPARAM wParam,LPARAM lParam)

+BOOL DlgEnableAccount(HWND hDlg, WPARAM wParam, LPARAM)

 {

 	EnableWindow(GetDlgItem(hDlg,IDC_CHECK),(BOOL)wParam);

 	EnableWindow(GetDlgItem(hDlg,IDC_EDITSERVER),wParam);

@@ -511,7 +512,7 @@ BOOL DlgShowAccount(HWND hDlg,WPARAM wParam,LPARAM lParam)
 	return TRUE;

 }

 

-BOOL DlgShowAccountColors(HWND hDlg,WPARAM wParam,LPARAM lParam)

+BOOL DlgShowAccountColors(HWND hDlg, WPARAM, LPARAM lParam)

 {

 	HPOP3ACCOUNT ActualAccount=(HPOP3ACCOUNT)lParam;

 #ifdef DEBUG_SYNCHRO

@@ -576,75 +577,61 @@ BOOL DlgSetItemTextW(HWND hDlg,WPARAM wParam,const WCHAR* str)
 	return TRUE;

 }

 

-INT_PTR CALLBACK DlgProcPOP3AccStatusOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam)

+INT_PTR CALLBACK DlgProcPOP3AccStatusOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM)

 {

 	static HPOP3ACCOUNT ActualAccount;

-	switch(msg)

-	{

-		case WM_INITDIALOG:

+	switch(msg) {

+	case WM_INITDIALOG:

+		ActualAccount=(HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME,(WPARAM)POP3Plugin,(LPARAM)DlgInput);

+		if (ActualAccount != NULL)

 		{

-			ActualAccount=(HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME,(WPARAM)POP3Plugin,(LPARAM)DlgInput);

-			if (ActualAccount != NULL)

-			{

-				DlgShowAccountStatus(hDlg,(WPARAM)M_SHOWACTUAL,(LPARAM)ActualAccount);

-				DlgEnableAccountStatus(hDlg,TRUE,TRUE);

-			}

-			else

-			{

-				CheckDlgButton(hDlg,IDC_CHECKST0,BST_CHECKED);

-				CheckDlgButton(hDlg,IDC_CHECKST1,BST_CHECKED);

-				CheckDlgButton(hDlg,IDC_CHECKST2,BST_CHECKED);

-				CheckDlgButton(hDlg,IDC_CHECKST3,BST_CHECKED);

-				CheckDlgButton(hDlg,IDC_CHECKST4,BST_CHECKED);

-				CheckDlgButton(hDlg,IDC_CHECKST5,BST_CHECKED);

-				CheckDlgButton(hDlg,IDC_CHECKST6,BST_CHECKED);

-				CheckDlgButton(hDlg,IDC_CHECKST7,BST_CHECKED);

-				CheckDlgButton(hDlg,IDC_CHECKST8,BST_CHECKED);

-				CheckDlgButton(hDlg,IDC_CHECKST9,BST_CHECKED);

-			}

-			TranslateDialogDefault(hDlg);

-			SendMessage(GetParent(hDlg),PSM_UNCHANGED,(WPARAM)hDlg,0);

-			return TRUE;

-			break;

+			DlgShowAccountStatus(hDlg,(WPARAM)M_SHOWACTUAL,(LPARAM)ActualAccount);

+			DlgEnableAccountStatus(hDlg,TRUE,TRUE);

 		}

-		case WM_COMMAND:

+		else

 		{

-		

-			WORD wNotifyCode = HIWORD(wParam);

-			switch(LOWORD(wParam))

-			{

-				case IDOK:

-					Check0 = (IsDlgButtonChecked(hDlg,IDC_CHECKST0)==BST_CHECKED);

-					Check1 = (IsDlgButtonChecked(hDlg,IDC_CHECKST1)==BST_CHECKED);

-					Check2 = (IsDlgButtonChecked(hDlg,IDC_CHECKST2)==BST_CHECKED);

-					Check3 = (IsDlgButtonChecked(hDlg,IDC_CHECKST3)==BST_CHECKED);

-					Check4 = (IsDlgButtonChecked(hDlg,IDC_CHECKST4)==BST_CHECKED);

-					Check5 = (IsDlgButtonChecked(hDlg,IDC_CHECKST5)==BST_CHECKED);

-					Check6 = (IsDlgButtonChecked(hDlg,IDC_CHECKST6)==BST_CHECKED);

-					Check7 = (IsDlgButtonChecked(hDlg,IDC_CHECKST7)==BST_CHECKED);

-					Check8 = (IsDlgButtonChecked(hDlg,IDC_CHECKST8)==BST_CHECKED);

-					Check9 = (IsDlgButtonChecked(hDlg,IDC_CHECKST9)==BST_CHECKED);

-					WindowList_BroadcastAsync(YAMNVar.MessageWnds,WM_YAMN_CHANGESTATUSOPTION,0,0);

-					EndDialog(hDlg,0);

-					DestroyWindow(hDlg);

-					break;

-				

-				case IDCANCEL:

-					EndDialog(hDlg,0);

-					DestroyWindow(hDlg);

-					break;

-				

-				default:

-                        break;

-			}

+			CheckDlgButton(hDlg,IDC_CHECKST0,BST_CHECKED);

+			CheckDlgButton(hDlg,IDC_CHECKST1,BST_CHECKED);

+			CheckDlgButton(hDlg,IDC_CHECKST2,BST_CHECKED);

+			CheckDlgButton(hDlg,IDC_CHECKST3,BST_CHECKED);

+			CheckDlgButton(hDlg,IDC_CHECKST4,BST_CHECKED);

+			CheckDlgButton(hDlg,IDC_CHECKST5,BST_CHECKED);

+			CheckDlgButton(hDlg,IDC_CHECKST6,BST_CHECKED);

+			CheckDlgButton(hDlg,IDC_CHECKST7,BST_CHECKED);

+			CheckDlgButton(hDlg,IDC_CHECKST8,BST_CHECKED);

+			CheckDlgButton(hDlg,IDC_CHECKST9,BST_CHECKED);

 		}

-		default:

+		TranslateDialogDefault(hDlg);

+		SendMessage(GetParent(hDlg),PSM_UNCHANGED,(WPARAM)hDlg,0);

+		return TRUE;

+

+	case WM_COMMAND:

+		switch(LOWORD(wParam)) {

+		case IDOK:

+			Check0 = (IsDlgButtonChecked(hDlg,IDC_CHECKST0)==BST_CHECKED);

+			Check1 = (IsDlgButtonChecked(hDlg,IDC_CHECKST1)==BST_CHECKED);

+			Check2 = (IsDlgButtonChecked(hDlg,IDC_CHECKST2)==BST_CHECKED);

+			Check3 = (IsDlgButtonChecked(hDlg,IDC_CHECKST3)==BST_CHECKED);

+			Check4 = (IsDlgButtonChecked(hDlg,IDC_CHECKST4)==BST_CHECKED);

+			Check5 = (IsDlgButtonChecked(hDlg,IDC_CHECKST5)==BST_CHECKED);

+			Check6 = (IsDlgButtonChecked(hDlg,IDC_CHECKST6)==BST_CHECKED);

+			Check7 = (IsDlgButtonChecked(hDlg,IDC_CHECKST7)==BST_CHECKED);

+			Check8 = (IsDlgButtonChecked(hDlg,IDC_CHECKST8)==BST_CHECKED);

+			Check9 = (IsDlgButtonChecked(hDlg,IDC_CHECKST9)==BST_CHECKED);

+			WindowList_BroadcastAsync(YAMNVar.MessageWnds,WM_YAMN_CHANGESTATUSOPTION,0,0);

+			EndDialog(hDlg,0);

+			DestroyWindow(hDlg);

 			break;

+

+		case IDCANCEL:

+			EndDialog(hDlg,0);

+			DestroyWindow(hDlg);

+			break;

+		}

 	}

 	return FALSE;

 }

 

-

 INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam)

 {

 	BOOL Changed=FALSE;

@@ -1429,7 +1416,7 @@ INT_PTR CALLBACK DlgProcPOP3AccPopup(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPa
 						case PSN_APPLY:

 						{

 							TCHAR Text[MAX_PATH];

-							BOOL Translated,NewAcc=FALSE,CheckPopup,CheckPopupW;

+							BOOL Translated,CheckPopup,CheckPopupW;

 							BOOL CheckNPopup,CheckNPopupW,CheckFPopup,CheckFPopupW;

 							BOOL CheckPopN;

 							UINT Time,TimeN,TimeF;

diff --git a/plugins/YAMN/src/protoplugin.cpp b/plugins/YAMN/src/protoplugin.cpp
index 785bb40c77..dcede55d82 100644
--- a/plugins/YAMN/src/protoplugin.cpp
+++ b/plugins/YAMN/src/protoplugin.cpp
@@ -157,7 +157,7 @@ INT_PTR UnregisterProtocolPlugin(HYAMNPROTOPLUGIN Plugin)
 	return 1;

 }

 

-INT_PTR UnregisterProtocolPluginSvc(WPARAM wParam,LPARAM lParam)

+INT_PTR UnregisterProtocolPluginSvc(WPARAM wParam,LPARAM)

 {

 	HYAMNPROTOPLUGIN Plugin=(HYAMNPROTOPLUGIN)wParam;

 

diff --git a/plugins/YAMN/src/services.cpp b/plugins/YAMN/src/services.cpp
index 8a8187f593..d03a8e2c6c 100644
--- a/plugins/YAMN/src/services.cpp
+++ b/plugins/YAMN/src/services.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"

 

-static INT_PTR Service_GetCaps(WPARAM wParam, LPARAM lParam)

+static INT_PTR Service_GetCaps(WPARAM wParam, LPARAM)

 {

 	if (wParam == PFLAGNUM_4)

 		return PF4_NOCUSTOMAUTH;

@@ -20,12 +20,12 @@ static INT_PTR Service_GetCaps(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR Service_GetStatus(WPARAM wParam, LPARAM lParam)

+static INT_PTR Service_GetStatus(WPARAM, LPARAM)

 {

 	return YAMN_STATUS;	

 }

 

-static INT_PTR Service_SetStatus(WPARAM wParam, LPARAM lParam)

+static INT_PTR Service_SetStatus(WPARAM wParam, LPARAM)

 {	

 	int newstatus = (wParam != ID_STATUS_OFFLINE)?ID_STATUS_ONLINE:ID_STATUS_OFFLINE;

 	if (newstatus != YAMN_STATUS) {

@@ -43,7 +43,7 @@ static INT_PTR Service_GetName(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR Service_LoadIcon(WPARAM wParam, LPARAM lParam)

+static INT_PTR Service_LoadIcon(WPARAM wParam, LPARAM)

 {

 	if ( LOWORD( wParam ) == PLI_PROTOCOL )

 		return (INT_PTR)CopyIcon(g_LoadIconEx(0)); // noone cares about other than PLI_PROTOCOL

@@ -51,7 +51,7 @@ static INT_PTR Service_LoadIcon(WPARAM wParam, LPARAM lParam)
 	return (INT_PTR)(HICON)NULL;

 }

  

-INT_PTR ClistContactDoubleclicked(WPARAM wParam, LPARAM lParam)

+INT_PTR ClistContactDoubleclicked(WPARAM, LPARAM lParam)

 {

 	ContactDoubleclicked(((CLISTEVENT*)lParam)->lParam, lParam);

 	return 0;

@@ -63,7 +63,7 @@ static int Service_ContactDoubleclicked(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR ContactApplication(WPARAM wParam, LPARAM lParam)

+static INT_PTR ContactApplication(WPARAM wParam, LPARAM)

 {

 	char *szProto = GetContactProto(wParam);

 	if ( mir_strcmp(szProto, YAMN_DBMODULE))

@@ -166,7 +166,7 @@ static INT_PTR AccountMailCheck(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR ContactMailCheck(WPARAM hContact, LPARAM lParam)

+static INT_PTR ContactMailCheck(WPARAM hContact, LPARAM)

 {

 	char *szProto = GetContactProto(hContact);

 	if ( mir_strcmp(szProto, YAMN_DBMODULE))

@@ -221,11 +221,7 @@ static INT_PTR ContactMailCheck(WPARAM hContact, LPARAM lParam)
 	return 0;

 }

 

-void MainMenuAccountClicked(WPARAM wParam, LPARAM lParam) 

-{

-}

-

-/*static*/ void ContactDoubleclicked(WPARAM wParam, LPARAM lParam)

+/*static*/ void ContactDoubleclicked(WPARAM wParam, LPARAM)

 {

 	char *szProto = GetContactProto(wParam);

 	if ( mir_strcmp(szProto, YAMN_DBMODULE))

@@ -285,8 +281,6 @@ HBITMAP LoadBmpFromIcon(HICON hIcon)
 	bih.biHeight = IconSizeY;

 	bih.biWidth = IconSizeX; 

 	

-	int widthBytes = ((bih.biWidth*bih.biBitCount + 31) >> 5) * 4;

-

 	RECT rc;

 	rc.top = rc.left = 0;

 	rc.right = bih.biWidth;

diff --git a/plugins/YAMN/src/yamn.cpp b/plugins/YAMN/src/yamn.cpp
index a0f761ac46..f68e4068ae 100644
--- a/plugins/YAMN/src/yamn.cpp
+++ b/plugins/YAMN/src/yamn.cpp
@@ -55,7 +55,7 @@ INT_PTR ForceCheckSvc(WPARAM, LPARAM);
 //--------------------------------------------------------------------------------------------------

 //--------------------------------------------------------------------------------------------------

 

-INT_PTR GetFcnPtrSvc(WPARAM wParam, LPARAM lParam)

+INT_PTR GetFcnPtrSvc(WPARAM wParam, LPARAM)

 {

 	register int i;