final switch to the typed icolib api

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

6 files changed, 81 insertions, 81 deletions

diff --git a/protocols/YAMN/src/account.cpp b/protocols/YAMN/src/account.cpp
index d1de8b8e4c..f45dcfadcd 100644
--- a/protocols/YAMN/src/account.cpp
+++ b/protocols/YAMN/src/account.cpp
@@ -1084,7 +1084,7 @@ INT_PTR DeleteAccountSvc(WPARAM wParam,LPARAM lParam)
 

 //1. set stop signal 

 	StopSignalFcn(Which);

-	WindowList_BroadcastAsync(YAMNVar.MessageWnds,WM_YAMN_STOPACCOUNT,(WPARAM)Which,(LPARAM)0);

+	WindowList_BroadcastAsync(YAMNVar.MessageWnds,WM_YAMN_STOPACCOUNT,(WPARAM)Which,0);

 	if (Plugin->Fcn->StopAccountFcnPtr!=NULL)

 		Plugin->Fcn->StopAccountFcnPtr(Which);

 

@@ -1141,7 +1141,7 @@ DWORD WINAPI DeleteAccountInBackground(LPVOID Value)
 {

 	HACCOUNT Which=(HACCOUNT)Value;

 	WaitForSingleObject(Which->UsingThreads->Event,INFINITE);

-	CallService(MS_YAMN_DELETEPLUGINACCOUNT,(WPARAM)Which,(LPARAM)0);

+	CallService(MS_YAMN_DELETEPLUGINACCOUNT,(WPARAM)Which,0);

 	return 0;

 }

 

@@ -1161,7 +1161,7 @@ int StopAccounts(HYAMNPROTOPLUGIN Plugin)
 	{

 //2. set stop signal 

 		StopSignalFcn(Finder);

-		WindowList_BroadcastAsync(YAMNVar.MessageWnds,WM_YAMN_STOPACCOUNT,(WPARAM)Finder,(LPARAM)0);

+		WindowList_BroadcastAsync(YAMNVar.MessageWnds,WM_YAMN_STOPACCOUNT,(WPARAM)Finder,0);

 		if (Plugin->Fcn->StopAccountFcnPtr!=NULL)

 			Plugin->Fcn->StopAccountFcnPtr(Finder);

 	}

@@ -1233,7 +1233,7 @@ int DeleteAccounts(HYAMNPROTOPLUGIN Plugin)
 	for (Finder=Plugin->FirstAccount;Finder!=NULL;)

 	{

 		HACCOUNT Next = Finder->Next;

-		DeletePluginAccountSvc((WPARAM)Finder,(LPARAM)0);

+		DeletePluginAccountSvc((WPARAM)Finder,0);

 		Finder = Next;

 	}

 

@@ -1279,7 +1279,7 @@ void WINAPI SetStatusFcn(HACCOUNT Which,TCHAR *Value)
 	DebugLog(SynchroFile,"\tSetStatus:AccountStatusCS-cs enter\n");

 #endif

 	lstrcpy(Which->Status,Value);

-	WindowList_BroadcastAsync(YAMNVar.MessageWnds,WM_YAMN_CHANGESTATUS,(WPARAM)Which,(LPARAM)0);

+	WindowList_BroadcastAsync(YAMNVar.MessageWnds,WM_YAMN_CHANGESTATUS,(WPARAM)Which,0);

 #ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"\tSetStatus:AccountStatusCS-cs done\n");

 #endif

diff --git a/protocols/YAMN/src/browser/badconnect.cpp b/protocols/YAMN/src/browser/badconnect.cpp
index 785508d066..6f11151ee3 100644
--- a/protocols/YAMN/src/browser/badconnect.cpp
+++ b/protocols/YAMN/src/browser/badconnect.cpp
@@ -26,7 +26,7 @@ LRESULT CALLBACK BadConnectPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lPa
 

 				ZeroMemory(&si,sizeof(si));

 				si.cb=sizeof(si);

-				ActualAccount=(HACCOUNT)CallService(MS_POPUP_GETCONTACT,(WPARAM)hWnd,(LPARAM)0);

+				ActualAccount=(HACCOUNT)CallService(MS_POPUP_GETCONTACT,(WPARAM)hWnd,0);

 #ifdef DEBUG_SYNCHRO

 				DebugLog(SynchroFile,"PopUpProc:LEFTCLICK:ActualAccountSO-read wait\n");

 #endif

diff --git a/protocols/YAMN/src/browser/mailbrowser.cpp b/protocols/YAMN/src/browser/mailbrowser.cpp
index 15b24d0356..4f1f5593d6 100644
--- a/protocols/YAMN/src/browser/mailbrowser.cpp
+++ b/protocols/YAMN/src/browser/mailbrowser.cpp
@@ -340,7 +340,7 @@ int UpdateMails(HWND hDlg,HACCOUNT ActualAccount,DWORD nflags,DWORD nnflags)
 		#ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"UpdateMails:ActualAccountSO-read wait failed\n");

 		#endif

-		PostMessage(hDlg,WM_DESTROY,(WPARAM)0,(LPARAM)0);

+		PostMessage(hDlg,WM_DESTROY,0,0);

 

 		return UPDATE_FAIL;

 	}

@@ -359,7 +359,7 @@ int UpdateMails(HWND hDlg,HACCOUNT ActualAccount,DWORD nflags,DWORD nnflags)
 		#endif

 		ReadDoneFcn(ActualAccount->AccountAccessSO);

 

-		PostMessage(hDlg,WM_DESTROY,(WPARAM)0,(LPARAM)0);

+		PostMessage(hDlg,WM_DESTROY,0,0);

 		return UPDATE_FAIL;

 	}

 	#ifdef DEBUG_SYNCHRO

@@ -422,7 +422,7 @@ int UpdateMails(HWND hDlg,HACCOUNT ActualAccount,DWORD nflags,DWORD nnflags)
 

 		sprintf(TitleStrA,Translate(MAILBROWSERTITLE),ActualAccount->Name,MN.Real.DisplayUC+MN.Virtual.DisplayUC,MN.Real.Display+MN.Virtual.Display);

 		MultiByteToWideChar(CP_ACP,MB_USEGLYPHCHARS,TitleStrA,-1,TitleStrW,(int)strlen(TitleStrA)+1);

-		SendMessageW(hDlg,WM_SETTEXT,(WPARAM)0,(LPARAM)TitleStrW);

+		SendMessageW(hDlg,WM_SETTEXT,0,(LPARAM)TitleStrW);

 		delete[] TitleStrA;

 		delete[] TitleStrW;

 	}

@@ -588,7 +588,7 @@ int AddNewMailsToListView(HWND hListView,HACCOUNT ActualAccount,struct CMailNumb
 		{

 			item.iSubItem=0;

 			item.pszText=FromStr;

-			item.iItem=SendMessageW(hListView,LVM_INSERTITEMW,(WPARAM)0,(LPARAM)&item);

+			item.iItem=SendMessageW(hListView,LVM_INSERTITEMW,0,(LPARAM)&item);

 

 			item.iSubItem=1;

 			item.pszText=(NULL!=UnicodeHeader.Subject ? UnicodeHeader.Subject : (WCHAR*)L"");

@@ -723,7 +723,7 @@ void DoMailActions(HWND hDlg,HACCOUNT ActualAccount,struct CMailNumbers *MN,DWOR
 	if ((MN->Real.BrowserUC+MN->Virtual.BrowserUC==0) && (hDlg!=NULL))

 	{

 		if (!IsWindowVisible(hDlg) && !(nflags & YAMN_ACC_MSG))

-			PostMessage(hDlg,WM_DESTROY,(WPARAM)0,(LPARAM)0);				//destroy window if no new mail and window is not visible

+			PostMessage(hDlg,WM_DESTROY,0,0);				//destroy window if no new mail and window is not visible

 		if (nnflags & YAMN_ACC_MSG)											//if no new mail and msg should be executed

 		{

 			SetForegroundWindow(hDlg);

@@ -733,7 +733,7 @@ void DoMailActions(HWND hDlg,HACCOUNT ActualAccount,struct CMailNumbers *MN,DWOR
 	else 

 		if (hDlg!=NULL)								//else insert icon and set window if new mails

 		{

-			SendMessageW(GetDlgItem(hDlg,IDC_LISTMAILS),LVM_SCROLL,(WPARAM)0,(LPARAM)0x7ffffff);

+			SendMessageW(GetDlgItem(hDlg,IDC_LISTMAILS),LVM_SCROLL,0,(LPARAM)0x7ffffff);

 

 			if ((nflags & YAMN_ACC_ICO) && (MN->Real.SysTrayUC+MN->Virtual.SysTrayUC))

 			{

@@ -864,7 +864,7 @@ LRESULT CALLBACK NewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam
 				} else {

 					DBVARIANT dbv;

 

-					hContact=(HANDLE)CallService(MS_POPUP_GETCONTACT,(WPARAM)hWnd,(LPARAM)0);

+					hContact=(HANDLE)CallService(MS_POPUP_GETCONTACT,(WPARAM)hWnd,0);

 

 					if (!DBGetContactSetting((HANDLE) hContact,YAMN_DBMODULE,"Id",&dbv)) 

 					{

@@ -932,7 +932,7 @@ LRESULT CALLBACK NewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam
 			HANDLE hContact;

 			DBVARIANT dbv;

 

-			hContact=(HANDLE)CallService(MS_POPUP_GETCONTACT,(WPARAM)hWnd,(LPARAM)0);

+			hContact=(HANDLE)CallService(MS_POPUP_GETCONTACT,(WPARAM)hWnd,0);

 

 			if (!DBGetContactSetting((HANDLE) hContact,YAMN_DBMODULE,"Id",&dbv)) 

 			{

@@ -965,7 +965,7 @@ LRESULT CALLBACK NoNewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lPar
 				HANDLE hContact;

 				DBVARIANT dbv;

 

-				hContact=(HANDLE)CallService(MS_POPUP_GETCONTACT,(WPARAM)hWnd,(LPARAM)0);

+				hContact=(HANDLE)CallService(MS_POPUP_GETCONTACT,(WPARAM)hWnd,0);

 

 				if (!DBGetContactSetting((HANDLE) hContact,YAMN_DBMODULE,"Id",&dbv)) 

 				{

@@ -1032,7 +1032,7 @@ LRESULT CALLBACK NoNewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lPar
 			HANDLE hContact;

 			DBVARIANT dbv;

 

-			hContact=(HANDLE)CallService(MS_POPUP_GETCONTACT,(WPARAM)hWnd,(LPARAM)0);

+			hContact=(HANDLE)CallService(MS_POPUP_GETCONTACT,(WPARAM)hWnd,0);

 

 			if (!DBGetContactSetting((HANDLE) hContact,YAMN_DBMODULE,"Id",&dbv)) 

 			{

@@ -1343,7 +1343,7 @@ INT_PTR CALLBACK DlgProcYAMNShowMessage(HWND hDlg,UINT msg,WPARAM wParam,LPARAM
 

 			LVCOLUMNW lvc0={LVCF_FMT | LVCF_TEXT | LVCF_WIDTH,LVCFMT_LEFT,130,iHeaderW,0,0};

 			LVCOLUMNW lvc1={LVCF_FMT | LVCF_TEXT | LVCF_WIDTH,LVCFMT_LEFT,400,iValueW,0,0};

-			SendMessageW(hListView,LVM_INSERTCOLUMNW,(WPARAM)0,(LPARAM)&lvc0);

+			SendMessageW(hListView,LVM_INSERTCOLUMNW,0,(LPARAM)&lvc0);

 			SendMessageW(hListView,LVM_INSERTCOLUMNW,(WPARAM)1,(LPARAM)&lvc1);

 			if (NULL!=iHeaderW)

 				delete[] iHeaderW;

@@ -1430,7 +1430,7 @@ INT_PTR CALLBACK DlgProcYAMNShowMessage(HWND hDlg,UINT msg,WPARAM wParam,LPARAM
 						item.iItem++;

 						item.pszText=0;

 					}

-					item.iItem=SendMessageW(hListView,LVM_INSERTITEMW,(WPARAM)0,(LPARAM)&item);

+					item.iItem=SendMessageW(hListView,LVM_INSERTITEMW,0,(LPARAM)&item);

 					item.iSubItem=1;

 					item.pszText=str2?split[i]:0;

 					SendMessageW(hListView,LVM_SETITEMTEXTW,(WPARAM)item.iItem,(LPARAM)&item);

@@ -1466,7 +1466,7 @@ INT_PTR CALLBACK DlgProcYAMNShowMessage(HWND hDlg,UINT msg,WPARAM wParam,LPARAM
 					}

 				}

 				if (!bodyDecoded)ConvertStringToUnicode(localBody?localBody:body,MailParam->mail->MailData->CP,&bodyDecoded);

-				SendMessageW(hEdit,WM_SETTEXT,(WPARAM)0,(LPARAM)bodyDecoded);

+				SendMessageW(hEdit,WM_SETTEXT,0,(LPARAM)bodyDecoded);

 				delete[] bodyDecoded;

 				if (localBody) delete[] localBody;

 				SetFocus(hEdit);

@@ -1496,7 +1496,7 @@ INT_PTR CALLBACK DlgProcYAMNShowMessage(HWND hDlg,UINT msg,WPARAM wParam,LPARAM
 			else wsprintfW(title,L"none");

 			if (Subj) delete[] Subj;

 			if (From) delete[] From;

-			SendMessageW(hDlg,WM_SETTEXT,(WPARAM)0,(LPARAM)title);

+			SendMessageW(hDlg,WM_SETTEXT,0,(LPARAM)title);

 			delete[] title;

 			// turn on redrawing

 			SendMessage(hListView, WM_SETREDRAW, 1, 0);

@@ -1725,16 +1725,16 @@ INT_PTR CALLBACK DlgProcYAMNMailBrowser(HWND hDlg,UINT msg,WPARAM wParam,LPARAM
 			DebugLog(SynchroFile,"MailBrowser:INIT:ActualAccountSO-read enter\n");

 			#endif

 

-			SendMessageW(GetDlgItem(hDlg,IDC_BTNAPP),WM_SETTEXT,(WPARAM)0,(LPARAM)TranslateW(L"Run application"));

-			SendMessageW(GetDlgItem(hDlg,IDC_BTNDEL),WM_SETTEXT,(WPARAM)0,(LPARAM)TranslateW(L"Delete selected"));

-			SendMessageW(GetDlgItem(hDlg,IDC_BTNCHECKALL),WM_SETTEXT,(WPARAM)0,(LPARAM)TranslateW(L"Select All"));

-			SendMessageW(GetDlgItem(hDlg,IDC_BTNOK),WM_SETTEXT,(WPARAM)0,(LPARAM)TranslateW(L"OK"));

+			SendMessageW(GetDlgItem(hDlg,IDC_BTNAPP),WM_SETTEXT,0,(LPARAM)TranslateW(L"Run application"));

+			SendMessageW(GetDlgItem(hDlg,IDC_BTNDEL),WM_SETTEXT,0,(LPARAM)TranslateW(L"Delete selected"));

+			SendMessageW(GetDlgItem(hDlg,IDC_BTNCHECKALL),WM_SETTEXT,0,(LPARAM)TranslateW(L"Select All"));

+			SendMessageW(GetDlgItem(hDlg,IDC_BTNOK),WM_SETTEXT,0,(LPARAM)TranslateW(L"OK"));

 

 			LVCOLUMNW lvc0={LVCF_FMT | LVCF_TEXT | LVCF_WIDTH,LVCFMT_LEFT,FromWidth,TranslateW(L"From"),0,0};

 			LVCOLUMNW lvc1={LVCF_FMT | LVCF_TEXT | LVCF_WIDTH,LVCFMT_LEFT,SubjectWidth,TranslateW(L"Subject"),0,0};

 			LVCOLUMNW lvc2={LVCF_FMT | LVCF_TEXT | LVCF_WIDTH,LVCFMT_LEFT,SizeWidth,TranslateW(L"Size"),0,0};

 			LVCOLUMNW lvc3={LVCF_FMT | LVCF_TEXT | LVCF_WIDTH,LVCFMT_LEFT,SizeDate,TranslateW(L"Date"),0,0};

-			SendMessageW(GetDlgItem(hDlg,IDC_LISTMAILS),LVM_INSERTCOLUMNW,(WPARAM)0,(LPARAM)&lvc0);

+			SendMessageW(GetDlgItem(hDlg,IDC_LISTMAILS),LVM_INSERTCOLUMNW,0,(LPARAM)&lvc0);

 			SendMessageW(GetDlgItem(hDlg,IDC_LISTMAILS),LVM_INSERTCOLUMNW,(WPARAM)1,(LPARAM)&lvc1);

 			SendMessageW(GetDlgItem(hDlg,IDC_LISTMAILS),LVM_INSERTCOLUMNW,(WPARAM)2,(LPARAM)&lvc2);

 			SendMessageW(GetDlgItem(hDlg,IDC_LISTMAILS),LVM_INSERTCOLUMNW,(WPARAM)3,(LPARAM)&lvc3);

diff --git a/protocols/YAMN/src/main.cpp b/protocols/YAMN/src/main.cpp
index 916c80cc32..0d05534f3c 100644
--- a/protocols/YAMN/src/main.cpp
+++ b/protocols/YAMN/src/main.cpp
@@ -291,12 +291,12 @@ HICON WINAPI g_LoadIconEx( int idx, bool big )
 {

 	if ( idx >= SIZEOF(iconList))

 		return NULL;

-	return ( HICON )CallService(MS_SKIN2_GETICON, big, (LPARAM)iconList[idx].szName);

+	return Skin_GetIcon(iconList[idx].szName, big);

 }

 

 void WINAPI g_ReleaseIcon( HICON hIcon )

 {

-	if ( hIcon ) CallService(MS_SKIN2_RELEASEICON, (WPARAM)hIcon, 0);

+	if ( hIcon ) Skin_ReleaseIcon(hIcon);

 }

 

 static void LoadPlugins()

diff --git a/protocols/YAMN/src/proto/pop3/pop3comm.cpp b/protocols/YAMN/src/proto/pop3/pop3comm.cpp
index 954f1b5860..d5b229f78c 100644
--- a/protocols/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3comm.cpp
@@ -190,7 +190,7 @@ int RegisterPOP3Plugin(WPARAM,LPARAM)
 {

 

 	//Get YAMN variables we can use

-	if (NULL==(pYAMNVar=(PYAMN_VARIABLES)CallService(MS_YAMN_GETVARIABLES,(WPARAM)YAMN_VARIABLESVERSION,(LPARAM)0)))

+	if (NULL==(pYAMNVar=(PYAMN_VARIABLES)CallService(MS_YAMN_GETVARIABLES,(WPARAM)YAMN_VARIABLESVERSION,0)))

 		return 0;

 

 	//We have to get pointers to YAMN exported functions: allocate structure and fill it

@@ -201,27 +201,27 @@ int RegisterPOP3Plugin(WPARAM,LPARAM)
 	if (NULL==(hNetLib=RegisterNLClient("YAMN-POP3")))

 		{UnLoadPOP3(0); return 0;}

 

-	pYAMNFcn->SetProtocolPluginFcnImportFcn=(YAMN_SETPROTOCOLPLUGINFCNIMPORTFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SETPROTOCOLPLUGINFCNIMPORTID,(LPARAM)0);

-	pYAMNFcn->WaitToWriteFcn=(YAMN_WAITTOWRITEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_WAITTOWRITEID,(LPARAM)0);

-	pYAMNFcn->WriteDoneFcn=(YAMN_WRITEDONEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_WRITEDONEID,(LPARAM)0);

-	pYAMNFcn->WaitToReadFcn=(YAMN_WAITTOREADFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_WAITTOREADID,(LPARAM)0);

-	pYAMNFcn->ReadDoneFcn=(YAMN_READDONEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_READDONEID,(LPARAM)0);

-	pYAMNFcn->SCGetNumberFcn=(YAMN_SCMANAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SCGETNUMBERID,(LPARAM)0);

-	pYAMNFcn->SCIncFcn=(YAMN_SCMANAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SCINCID,(LPARAM)0);

-	pYAMNFcn->SCDecFcn=(YAMN_SCMANAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SCDECID,(LPARAM)0);

-	pYAMNFcn->SetStatusFcn=(YAMN_SETSTATUSFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SETSTATUSID,(LPARAM)0);

-	pYAMNFcn->GetStatusFcn=(YAMN_GETSTATUSFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_GETSTATUSID,(LPARAM)0);

+	pYAMNFcn->SetProtocolPluginFcnImportFcn=(YAMN_SETPROTOCOLPLUGINFCNIMPORTFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SETPROTOCOLPLUGINFCNIMPORTID,0);

+	pYAMNFcn->WaitToWriteFcn=(YAMN_WAITTOWRITEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_WAITTOWRITEID,0);

+	pYAMNFcn->WriteDoneFcn=(YAMN_WRITEDONEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_WRITEDONEID,0);

+	pYAMNFcn->WaitToReadFcn=(YAMN_WAITTOREADFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_WAITTOREADID,0);

+	pYAMNFcn->ReadDoneFcn=(YAMN_READDONEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_READDONEID,0);

+	pYAMNFcn->SCGetNumberFcn=(YAMN_SCMANAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SCGETNUMBERID,0);

+	pYAMNFcn->SCIncFcn=(YAMN_SCMANAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SCINCID,0);

+	pYAMNFcn->SCDecFcn=(YAMN_SCMANAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SCDECID,0);

+	pYAMNFcn->SetStatusFcn=(YAMN_SETSTATUSFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SETSTATUSID,0);

+	pYAMNFcn->GetStatusFcn=(YAMN_GETSTATUSFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_GETSTATUSID,0);

 

 	if (NULL==(pYAMNMailFcn=new struct MailExportedFcns))

 		{UnLoadPOP3(0); return 0;}

 

-	pYAMNMailFcn->SynchroMessagesFcn=(YAMN_SYNCHROMIMEMSGSFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SYNCHROMIMEMSGSID,(LPARAM)0);

-	pYAMNMailFcn->TranslateHeaderFcn=(YAMN_TRANSLATEHEADERFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_TRANSLATEHEADERID,(LPARAM)0);

-	pYAMNMailFcn->AppendQueueFcn=(YAMN_APPENDQUEUEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_APPENDQUEUEID,(LPARAM)0);

-	pYAMNMailFcn->DeleteMessagesToEndFcn=(YAMN_DELETEMIMEQUEUEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_DELETEMIMEQUEUEID,(LPARAM)0);

-	pYAMNMailFcn->DeleteMessageFromQueueFcn=(YAMN_DELETEMIMEMESSAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_DELETEMIMEMESSAGEID,(LPARAM)0);

-	pYAMNMailFcn->FindMessageByIDFcn=(YAMN_FINDMIMEMESSAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_FINDMIMEMESSAGEID,(LPARAM)0);

-	pYAMNMailFcn->CreateNewDeleteQueueFcn=(YAMN_CREATENEWDELETEQUEUEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_CREATENEWDELETEQUEUEID,(LPARAM)0);

+	pYAMNMailFcn->SynchroMessagesFcn=(YAMN_SYNCHROMIMEMSGSFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SYNCHROMIMEMSGSID,0);

+	pYAMNMailFcn->TranslateHeaderFcn=(YAMN_TRANSLATEHEADERFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_TRANSLATEHEADERID,0);

+	pYAMNMailFcn->AppendQueueFcn=(YAMN_APPENDQUEUEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_APPENDQUEUEID,0);

+	pYAMNMailFcn->DeleteMessagesToEndFcn=(YAMN_DELETEMIMEQUEUEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_DELETEMIMEQUEUEID,0);

+	pYAMNMailFcn->DeleteMessageFromQueueFcn=(YAMN_DELETEMIMEMESSAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_DELETEMIMEMESSAGEID,0);

+	pYAMNMailFcn->FindMessageByIDFcn=(YAMN_FINDMIMEMESSAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_FINDMIMEMESSAGEID,0);

+	pYAMNMailFcn->CreateNewDeleteQueueFcn=(YAMN_CREATENEWDELETEQUEUEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_CREATENEWDELETEQUEUEID,0);

 

 	//set static variable

 	if (CPOP3Account::AccountWriterSO==NULL) {

@@ -249,17 +249,17 @@ int RegisterPOP3Plugin(WPARAM,LPARAM)
 	switch(CallService(MS_YAMN_READACCOUNTS,(WPARAM)POP3Plugin,(LPARAM)FileName)) {

 		case EACC_FILEVERSION:

 			MessageBox(NULL,TranslateT("Found new version of account book, not compatible with this version of YAMN."),TranslateT("YAMN (internal POP3) read error"),MB_OK);

-			CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,(LPARAM)0);

+			CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,0);

 			FileName = NULL;

 			return 0;

 		case EACC_FILECOMPATIBILITY:

 			MessageBox(NULL,TranslateT("Error reading account file. Account file corrupted."),TranslateT("YAMN (internal POP3) read error"),MB_OK);

-			CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,(LPARAM)0);

+			CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,0);

 			FileName = NULL;

 			return 0;

 		case EACC_ALLOC:

 			MessageBox(NULL,TranslateT("Memory allocation error while data reading"),TranslateT("YAMN (internal POP3) read error"),MB_OK);

-			CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,(LPARAM)0);

+			CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,0);

 			FileName = NULL;

 			return 0;

 		case EACC_SYSTEM:

@@ -268,7 +268,7 @@ int RegisterPOP3Plugin(WPARAM,LPARAM)
 				TCHAR temp[1024] = {0};

 				mir_sntprintf(temp, SIZEOF(temp), _T("%s\n%s"),TranslateT("Reading file error. File already in use?"),FileName);

 				MessageBox(NULL,temp,TranslateT("YAMN (internal POP3) read error"),MB_OK);

-				CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,(LPARAM)0);

+				CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,0);

 				FileName = NULL;

 				return 0;

 			}

@@ -333,7 +333,7 @@ DWORD WINAPI UnLoadPOP3(void *)
 	if (pYAMNFcn) {

 		delete pYAMNFcn; pYAMNFcn = NULL;}

 	if (FileName) {

-		CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,(LPARAM)0); FileName = NULL;}

+		CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,0); FileName = NULL;}

 

 	#ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"UnLoadPOP3:done\n");

diff --git a/protocols/YAMN/src/proto/pop3/pop3opt.cpp b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
index 1a265a0800..c730b4b3fc 100644
--- a/protocols/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
@@ -94,7 +94,7 @@ INT_PTR CALLBACK DlgProcPluginOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam
 	

 					if (CB_ERR==(index=SendMessage(hCombo,CB_GETCURSEL,0,0)))

 						break;

-					id=SendMessage(hCombo,CB_GETITEMDATA,(WPARAM)index,(LPARAM)0);

+					id=SendMessage(hCombo,CB_GETITEMDATA,(WPARAM)index,0);

 					EnterCriticalSection(&PluginRegCS);

 					for (PParser=FirstProtoPlugin;PParser!=NULL;PParser=PParser->Next)

 						if (id==(INT_PTR)PParser->Plugin)

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

 

 			LeaveCriticalSection(&PluginRegCS);

-			SendDlgItemMessage(hDlg,IDC_COMBOPLUGINS,CB_SETCURSEL,(WPARAM)0,(LPARAM)0);

-			SendMessage(hDlg,WM_COMMAND,MAKELONG(IDC_COMBOPLUGINS,CBN_SELCHANGE),(LPARAM)NULL);

+			SendDlgItemMessage(hDlg,IDC_COMBOPLUGINS,CB_SETCURSEL,0,0);

+			SendMessage(hDlg,WM_COMMAND,MAKELONG(IDC_COMBOPLUGINS,CBN_SELCHANGE),0);

 			break;

 		}

 		else { //delete all items in combobox

-			int cbn=SendDlgItemMessage(hDlg,IDC_COMBOPLUGINS,CB_GETCOUNT,(WPARAM)0,(LPARAM)0);

+			int cbn=SendDlgItemMessage(hDlg,IDC_COMBOPLUGINS,CB_GETCOUNT,0,0);

 			for (int i=0;i<cbn;i++)

-				SendDlgItemMessage(hDlg,IDC_COMBOPLUGINS,CB_DELETESTRING,(WPARAM)0,(LPARAM)0);

+				SendDlgItemMessage(hDlg,IDC_COMBOPLUGINS,CB_DELETESTRING,0,0);

 			break;

 		}

 	}

@@ -401,11 +401,11 @@ BOOL DlgShowAccount(HWND hDlg,WPARAM wParam,LPARAM lParam)
 		for (i=0;i<=CPLENSUPP;i++)

 			if ((i<CPLENSUPP) && (CodePageNamesSupp[i].CP==ActualAccount->CP))

 			{

-				SendMessage(GetDlgItem(hDlg,IDC_COMBOCP),CB_SETCURSEL,(WPARAM)i,(LPARAM)0);

+				SendMessage(GetDlgItem(hDlg,IDC_COMBOCP),CB_SETCURSEL,(WPARAM)i,0);

 				break;

 			}

 		if (i==CPLENSUPP)

-			SendMessage(GetDlgItem(hDlg,IDC_COMBOCP),CB_SETCURSEL,(WPARAM)CPDEFINDEX,(LPARAM)0);

+			SendMessage(GetDlgItem(hDlg,IDC_COMBOCP),CB_SETCURSEL,(WPARAM)CPDEFINDEX,0);

 

 		CheckDlgButton(hDlg,IDC_CHECK,ActualAccount->Flags & YAMN_ACC_ENA ? BST_CHECKED : BST_UNCHECKED); 

 		CheckDlgButton(hDlg,IDC_CHECKSND,ActualAccount->NewMailN.Flags & YAMN_ACC_SND ? BST_CHECKED : BST_UNCHECKED); 

@@ -463,19 +463,19 @@ BOOL DlgShowAccount(HWND hDlg,WPARAM wParam,LPARAM lParam)
 	}				       

 	else			            //default

 	{

-		DlgSetItemText(hDlg,(WPARAM)IDC_EDITSERVER,(LPARAM)NULL);

-		DlgSetItemText(hDlg,(WPARAM)IDC_EDITNAME,(LPARAM)NULL);

-		DlgSetItemText(hDlg,(WPARAM)IDC_EDITLOGIN,(LPARAM)NULL);

-		DlgSetItemText(hDlg,(WPARAM)IDC_EDITPASS,(LPARAM)NULL);

-		DlgSetItemText(hDlg,(WPARAM)IDC_EDITAPP,(LPARAM)NULL);

-		DlgSetItemText(hDlg,(WPARAM)IDC_EDITAPPPARAM,(LPARAM)NULL);

-		DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,(LPARAM)NULL);

+		DlgSetItemText(hDlg,(WPARAM)IDC_EDITSERVER,0);

+		DlgSetItemText(hDlg,(WPARAM)IDC_EDITNAME,0);

+		DlgSetItemText(hDlg,(WPARAM)IDC_EDITLOGIN,0);

+		DlgSetItemText(hDlg,(WPARAM)IDC_EDITPASS,0);

+		DlgSetItemText(hDlg,(WPARAM)IDC_EDITAPP,0);

+		DlgSetItemText(hDlg,(WPARAM)IDC_EDITAPPPARAM,0);

+		DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,0);

 		SetDlgItemInt(hDlg,IDC_EDITPORT,110,FALSE);

 		SetDlgItemInt(hDlg,IDC_EDITINTERVAL,30,FALSE);

 		SetDlgItemInt(hDlg,IDC_EDITPOPS,0,FALSE);

 		SetDlgItemInt(hDlg,IDC_EDITNPOPS,0,FALSE);

 		SetDlgItemInt(hDlg,IDC_EDITFPOPS,0,FALSE);

-		SendMessage(GetDlgItem(hDlg,IDC_COMBOCP),CB_SETCURSEL,(WPARAM)CPDEFINDEX,(LPARAM)0);

+		SendMessage(GetDlgItem(hDlg,IDC_COMBOCP),CB_SETCURSEL,(WPARAM)CPDEFINDEX,0);

 		CheckDlgButton(hDlg,IDC_CHECK,BST_CHECKED);

 		CheckDlgButton(hDlg,IDC_CHECKSND,BST_CHECKED);

 		CheckDlgButton(hDlg,IDC_CHECKMSG,BST_UNCHECKED);

@@ -628,7 +628,7 @@ INT_PTR CALLBACK DlgProcPOP3AccStatusOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM
 					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,(WPARAM)0,(LPARAM)0);

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

 					EndDialog(hDlg,0);

 					DestroyWindow(hDlg);

 					break;

@@ -693,7 +693,7 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPara
 				SendDlgItemMessage(hDlg,IDC_COMBOCP,CB_ADDSTRING,0,(LPARAM)(info.CodePageName+7));

 			}

 

-			SendMessage(GetDlgItem(hDlg,IDC_COMBOCP),CB_SETCURSEL,(WPARAM)CPDEFINDEX,(LPARAM)0);

+			SendMessage(GetDlgItem(hDlg,IDC_COMBOCP),CB_SETCURSEL,(WPARAM)CPDEFINDEX,0);

 			ActualAccount=NULL;			

 			TranslateDialogDefault(hDlg);

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

@@ -703,7 +703,7 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPara
 		case WM_SHOWWINDOW:

 			if ( wParam == FALSE) {

 				WindowList_Remove(pYAMNVar->MessageWnds,hDlg);

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

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

 			}

 			else WindowList_Add(pYAMNVar->MessageWnds,hDlg,NULL);

 			return TRUE;

@@ -736,7 +736,7 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPara
 				switch( HIWORD(wParam)) {

 				case CBN_EDITCHANGE :

 					ActualAccount=NULL;

-					DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,(LPARAM)NULL);

+					DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,0);

 							

 					if (GetDlgItemTextA(hDlg,IDC_COMBOACCOUNT,DlgInput,sizeof(DlgInput)))

 						DlgEnableAccount(hDlg,(WPARAM)TRUE,(LPARAM)FALSE);

@@ -747,7 +747,7 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPara
 				case CBN_KILLFOCUS:

 					GetDlgItemTextA(hDlg,IDC_COMBOACCOUNT,DlgInput,sizeof(DlgInput));

 					if (NULL==(ActualAccount=(HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME,(WPARAM)POP3Plugin,(LPARAM)DlgInput))) {

-						DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,(LPARAM)NULL);

+						DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,0);

 						EnableWindow(GetDlgItem(hDlg,IDC_BTNDEL),FALSE);

 						if (lstrlenA(DlgInput))

 							DlgEnableAccount(hDlg,(WPARAM)TRUE,(LPARAM)TRUE);

@@ -766,7 +766,7 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPara
 						SendDlgItemMessageA(hDlg,IDC_COMBOACCOUNT,CB_GETLBTEXT,(WPARAM)Result,(LPARAM)DlgInput);

 							

 					if ((Result==CB_ERR) || (NULL==(ActualAccount=(HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME,(WPARAM)POP3Plugin,(LPARAM)DlgInput)))) {

-						DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,(LPARAM)NULL);

+						DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,0);

 						EnableWindow(GetDlgItem(hDlg,IDC_BTNDEL),FALSE);

 					}

 					else {

@@ -853,7 +853,7 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPara
 				break;

 

 			case IDC_BTNADD:

-				DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,(LPARAM)NULL);

+				DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,0);

 				DlgShowAccount(hDlg,(WPARAM)M_SHOWDEFAULT,0);

 				DlgEnableAccount(hDlg,(WPARAM)TRUE,(LPARAM)TRUE);

 				EnableWindow(GetDlgItem(hDlg,IDC_BTNDEL),FALSE);

@@ -915,7 +915,7 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPara
 				//We can consider our account as deleted.

 

 				SendDlgItemMessage(hDlg,IDC_COMBOACCOUNT,CB_DELETESTRING,(WPARAM)Result,0);

-				DlgSetItemText(hDlg,(WPARAM)IDC_COMBOACCOUNT,(LPARAM)NULL);

+				DlgSetItemText(hDlg,(WPARAM)IDC_COMBOACCOUNT,0);

 				DlgEnableAccount(hDlg,(WPARAM)FALSE,0);

 				DlgShowAccount(hDlg,(WPARAM)M_SHOWDEFAULT,0);

 				break;

@@ -1149,13 +1149,13 @@ INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPara
 																

 					EnableWindow(GetDlgItem(hDlg,IDC_BTNDEL),TRUE);

 							

-					DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,(LPARAM)NULL);

+					DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,0);

 

-					index = SendDlgItemMessage(hDlg,IDC_COMBOACCOUNT,CB_GETCURSEL,(WPARAM)0,(LPARAM)0);

+					index = SendDlgItemMessage(hDlg,IDC_COMBOACCOUNT,CB_GETCURSEL,0,0);

 

 					HPOP3ACCOUNT temp = ActualAccount;

 								

-					SendDlgItemMessage(hDlg,IDC_COMBOACCOUNT,CB_RESETCONTENT,0,(LPARAM)0);

+					SendDlgItemMessage(hDlg,IDC_COMBOACCOUNT,CB_RESETCONTENT,0,0);

 					if (POP3Plugin->FirstAccount!=NULL)

 						for (ActualAccount=(HPOP3ACCOUNT)POP3Plugin->FirstAccount;ActualAccount!=NULL;ActualAccount=(HPOP3ACCOUNT)ActualAccount->Next)

 							if (ActualAccount->Name!=NULL)

@@ -1218,15 +1218,15 @@ INT_PTR CALLBACK DlgProcPOP3AccPopup(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPa
 			if ((BOOL)wParam==FALSE)

 			{

 				WindowList_Remove(pYAMNVar->MessageWnds,hDlg);

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

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

 			}

 			else

 			{

 				WindowList_Add(pYAMNVar->MessageWnds,hDlg,NULL);

 

-				int index = SendDlgItemMessage(hDlg,IDC_COMBOACCOUNT,CB_GETCURSEL,(WPARAM)0,(LPARAM)0);

+				int index = SendDlgItemMessage(hDlg,IDC_COMBOACCOUNT,CB_GETCURSEL,0,0);

 				HPOP3ACCOUNT temp = ActualAccount;

-				SendDlgItemMessage(hDlg,IDC_COMBOACCOUNT,CB_RESETCONTENT,0,(LPARAM)0);

+				SendDlgItemMessage(hDlg,IDC_COMBOACCOUNT,CB_RESETCONTENT,0,0);

 

 				if (POP3Plugin->FirstAccount!=NULL)

 					for (ActualAccount=(HPOP3ACCOUNT)POP3Plugin->FirstAccount;ActualAccount!=NULL;ActualAccount=(HPOP3ACCOUNT)ActualAccount->Next)

@@ -1265,7 +1265,7 @@ INT_PTR CALLBACK DlgProcPOP3AccPopup(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPa
 							GetDlgItemTextA(hDlg,IDC_COMBOACCOUNT,DlgInput,sizeof(DlgInput));

 							if (NULL==(ActualAccount=(HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME,(WPARAM)POP3Plugin,(LPARAM)DlgInput)))

 							{

-								DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,(LPARAM)NULL);

+								DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,0);

 								if (lstrlenA(DlgInput))

 									DlgEnableAccountPopup(hDlg,(WPARAM)TRUE,(LPARAM)TRUE);

 								else

@@ -1283,7 +1283,7 @@ INT_PTR CALLBACK DlgProcPOP3AccPopup(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPa
 								SendDlgItemMessageA(hDlg,IDC_COMBOACCOUNT,CB_GETLBTEXT,(WPARAM)Result,(LPARAM)DlgInput);

 							if ((Result==CB_ERR) || (NULL==(ActualAccount=(HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME,(WPARAM)POP3Plugin,(LPARAM)DlgInput))))

 							{

-								DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,(LPARAM)NULL);

+								DlgSetItemText(hDlg,(WPARAM)IDC_STTIMELEFT,0);

 							}

 							else

 							{