- added ME_FILEDLG_CANCELED & ME_FILEDLG_SUCCEEDED events to support async file selection dialog;

- return value of MS_FILE_SENDFILE* services changed: now it returns a dialog handle;
- code cleaning

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

18 files changed, 54 insertions, 50 deletions

diff --git a/plugins/AVS/src/poll.cpp b/plugins/AVS/src/poll.cpp
index a7faa9007c..d017ef3aa3 100644
--- a/plugins/AVS/src/poll.cpp
+++ b/plugins/AVS/src/poll.cpp
@@ -211,7 +211,7 @@ int FetchAvatarFor(MCONTACT hContact, char *szProto)
 

 	if (szProto != NULL && PollProtocolCanHaveAvatar(szProto) && PollContactCanHaveAvatar(hContact, szProto)) {

 		// Can have avatar, but must request it?

-		if ((g_AvatarHistoryAvail && CallService(MS_AVATARHISTORY_ENABLED, (WPARAM) hContact, 0))

+		if ((g_AvatarHistoryAvail && CallService(MS_AVATARHISTORY_ENABLED, hContact, 0))

 			 || (PollCheckProtocol(szProto) && PollCheckContact(hContact, szProto))) 

 		{

 			// Request it

diff --git a/plugins/AutoShutdown/src/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp
index f5a31ace20..1f3fad458e 100644
--- a/plugins/AutoShutdown/src/settingsdlg.cpp
+++ b/plugins/AutoShutdown/src/settingsdlg.cpp
@@ -166,7 +166,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR
 				EnableWindow(GetDlgItem(hwndDlg,IDC_EDIT_MESSAGE),FALSE);

 			}

 			/* check if proto is installed that supports file transfers and check if a file transfer dialog is available */

-			if ((!AnyProtoHasCaps(PF1_FILESEND) && !AnyProtoHasCaps(PF1_FILERECV)) || !ServiceExists(MS_FILE_SENDFILE)) {  /* no srfile present? */

+			if (!AnyProtoHasCaps(PF1_FILESEND) && !AnyProtoHasCaps(PF1_FILERECV)) {  /* no srfile present? */

 				CheckDlgButton(hwndDlg,IDC_CHECK_FILETRANSFER,FALSE);

 				EnableWindow(GetDlgItem(hwndDlg,IDC_CHECK_FILETRANSFER),FALSE);

 			}

diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp
index bb6efe76f7..64d37517cb 100644
--- a/plugins/BasicHistory/src/EventList.cpp
+++ b/plugins/BasicHistory/src/EventList.cpp
@@ -344,7 +344,7 @@ void EventList::InitNames()
 {

 	TCHAR str[200];

 	if (hContact) {

-		_tcscpy_s(contactName, 256, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM) hContact, GCDNF_TCHAR ));

+		_tcscpy_s(contactName, 256, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR ));

 		mir_sntprintf(str,200,TranslateT("History for %s"),contactName);

 	}

 	else {

@@ -390,7 +390,7 @@ void EventList::AddGroup(const EventIndex& ev)
 std::wstring EventList::GetContactName()

 {

 	if (hContact)

-		return (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM) hContact, GCDNF_TCHAR );

+		return (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR );

 

 	return TranslateT("System");

 }

diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp
index 202f25e69c..9c712ad8c1 100644
--- a/plugins/BasicHistory/src/Options.cpp
+++ b/plugins/BasicHistory/src/Options.cpp
@@ -1588,7 +1588,7 @@ void SaveList(HWND hwnd, MCONTACT hSystem, TaskOptions* to)
 		to->isSystem = SendMessage(hwnd, CLM_GETCHECKMARK, (WPARAM)hSystem, 0) != 0;

 

 	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

-		HANDLE hItem = (HANDLE) SendMessage(hwnd, CLM_FINDCONTACT, (WPARAM) hContact, 0);

+		HANDLE hItem = (HANDLE) SendMessage(hwnd, CLM_FINDCONTACT, hContact, 0);

 		if (hItem && SendMessage(hwnd, CLM_GETCHECKMARK, (WPARAM) hItem, 0))

 			to->contacts.push_back(hContact);

 	} 

diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp
index 2cc5b4400f..866c319b88 100644
--- a/plugins/CmdLine/src/mimcmd_handlers.cpp
+++ b/plugins/CmdLine/src/mimcmd_handlers.cpp
@@ -1760,8 +1760,8 @@ DWORD WINAPI OpenMessageWindowThread(void *data)
 	MCONTACT hContact = (MCONTACT) data;

 	if (hContact)

 	{

-		CallServiceSync(MS_MSG_SENDMESSAGE, (WPARAM) hContact, 0);

-		CallServiceSync("SRMsg/LaunchMessageWindow", (WPARAM) hContact, 0);

+		CallServiceSync(MS_MSG_SENDMESSAGE, hContact, 0);

+		CallServiceSync("SRMsg/LaunchMessageWindow", hContact, 0);

 	}

 	

 	return 0;

@@ -2149,7 +2149,7 @@ void HandleIgnoreCommand(PCommand command, TArgument *argv, int argc, PReply rep
 

 			if (hContact)

 			{

-				CallService(block ? MS_IGNORE_IGNORE : MS_IGNORE_UNIGNORE, (WPARAM) hContact, IGNOREEVENT_ALL);

+				CallService(block ? MS_IGNORE_IGNORE : MS_IGNORE_UNIGNORE, hContact, IGNOREEVENT_ALL);

 			}

 		}

 

diff --git a/plugins/CmdLine/src/utils.cpp b/plugins/CmdLine/src/utils.cpp
index a4d8a43251..4c5336eaaf 100644
--- a/plugins/CmdLine/src/utils.cpp
+++ b/plugins/CmdLine/src/utils.cpp
@@ -337,7 +337,7 @@ MCONTACT GetContactFromID(TCHAR *szID, char *szProto)
 		GetContactProto(hContact, cProtocol, sizeof(cProtocol));

 		TCHAR *szHandle = GetContactID(hContact, cProtocol);

 

-		tmp = (char *) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM) hContact, 0);

+		tmp = (char *) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, 0);

 		STRNCPY(dispName, tmp, sizeof(dispName));

 

 		if ((szHandle) && ((_tcsicmp(szHandle, szID) == 0) || (_tcsicmp(dispName, szID) == 0)) && ((szProto == NULL) || (_stricmp(szProto, cProtocol) == 0)))

diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp
index 1dc0c2bb16..0f86c1779a 100644
--- a/plugins/MirandaG15/src/CAppletManager.cpp
+++ b/plugins/MirandaG15/src/CAppletManager.cpp
@@ -806,7 +806,7 @@ void CAppletManager::SendTypingNotification(MCONTACT hContact,bool bEnable)
         && !db_get_b(NULL, "SRMsg", "UnknownTyping", 1))

         return;

     // End user check

-	CallService(MS_PROTO_SELFISTYPING, (WPARAM) hContact, bEnable?PROTOTYPE_SELFTYPING_ON:PROTOTYPE_SELFTYPING_OFF);

+	CallService(MS_PROTO_SELFISTYPING, hContact, bEnable ? PROTOTYPE_SELFTYPING_ON : PROTOTYPE_SELFTYPING_OFF);

 }

 

 //************************************************************************

diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp
index 82c92f15cb..ba355b9895 100644
--- a/plugins/QuickContacts/src/quickcontacts.cpp
+++ b/plugins/QuickContacts/src/quickcontacts.cpp
@@ -432,7 +432,7 @@ void LoadContacts(HWND hwndDlg, BOOL show_all)
 		}

 

 		// Make contact name

-		TCHAR *tmp = (TCHAR *) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM) hContact, GCDNF_TCHAR);

+		TCHAR *tmp = (TCHAR *) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR);

 		lstrcpyn(contact->szname, tmp, SIZEOF(contact->szname));

 

 		PROTOACCOUNT *acc = ProtoGetAccount(pszProto);

@@ -476,7 +476,7 @@ void EnableButtons(HWND hwndDlg, MCONTACT hContact)
 		// Is a meta?

 		if (ServiceExists(MS_MC_GETMOSTONLINECONTACT)) 

 		{

-			MCONTACT hSub = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM) hContact, 0);

+			MCONTACT hSub = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, hContact, 0);

 			if (hSub != NULL)

 				hContact = hSub;

 		}

@@ -499,7 +499,7 @@ void EnableButtons(HWND hwndDlg, MCONTACT hContact)
 		EnableWindow(GetDlgItem(hwndDlg, IDC_HISTORY), TRUE);

 		EnableWindow(GetDlgItem(hwndDlg, IDC_MENU), TRUE);

 

-		HICON ico = ImageList_GetIcon(hIml, CallService(MS_CLIST_GETCONTACTICON, (WPARAM) hContact, 0), ILD_IMAGE);

+		HICON ico = ImageList_GetIcon(hIml, CallService(MS_CLIST_GETCONTACTICON, hContact, 0), ILD_IMAGE);

 		SendMessage(GetDlgItem(hwndDlg, IDC_ICO), STM_SETICON, (WPARAM) ico, 0);

 	}

 }

@@ -844,9 +844,9 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				if (hContact == NULL)

 					break;

 

-				CallService(MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM) hContact, 0);

+				CallService(MS_CLIST_CONTACTDOUBLECLICKED, hContact, 0);

 

-				db_set_dw(NULL, MODULE_NAME, "LastSentTo", (DWORD) hContact);

+				db_set_dw(NULL, MODULE_NAME, "LastSentTo", hContact);

 				SendMessage(hwndDlg, WM_CLOSE, 0, 0);

 			}

 			break;

@@ -864,9 +864,9 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				if (!IsWindowEnabled(GetDlgItem(hwndDlg, IDC_MESSAGE)))

 					break;

 

-				CallService(MS_MSG_SENDMESSAGET, (WPARAM) hContact, 0);

+				CallService(MS_MSG_SENDMESSAGET, hContact, 0);

 

-				db_set_dw(NULL, MODULE_NAME, "LastSentTo", (DWORD) hContact);

+				db_set_dw(NULL, MODULE_NAME, "LastSentTo", hContact);

 				SendMessage(hwndDlg, WM_CLOSE, 0, 0);

 				break;

 			}

@@ -892,8 +892,9 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 				db_set_dw(NULL, MODULE_NAME, "LastSentTo", (DWORD) hContact);

 				SendMessage(hwndDlg, WM_CLOSE, 0, 0);

-				break;

 			}

+			break;

+

 		case HOTKEY_FILE:

 		case IDC_FILE:

 			{

@@ -909,12 +910,13 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				if (!IsWindowEnabled(GetDlgItem(hwndDlg, IDC_FILE)))

 					break;

 

-				CallService(MS_FILE_SENDFILE, (WPARAM) hContact, 0);

+				CallService(MS_FILE_SENDFILE, hContact, 0);

 

-				db_set_dw(NULL, MODULE_NAME, "LastSentTo", (DWORD) hContact);

+				db_set_dw(NULL, MODULE_NAME, "LastSentTo", hContact);

 				SendMessage(hwndDlg, WM_CLOSE, 0, 0);

-				break;

 			}

+			break;

+

 		case HOTKEY_URL:

 		case IDC_URL:

 			{

@@ -930,12 +932,13 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				if (!IsWindowEnabled(GetDlgItem(hwndDlg, IDC_URL)))

 					break;

 

-				CallService(MS_URL_SENDURL, (WPARAM) hContact, 0);

+				CallService(MS_URL_SENDURL, hContact, 0);

 

-				db_set_dw(NULL, MODULE_NAME, "LastSentTo", (DWORD) hContact);

+				db_set_dw(NULL, MODULE_NAME, "LastSentTo", hContact);

 				SendMessage(hwndDlg, WM_CLOSE, 0, 0);

-				break;

 			}

+			break;

+

 		case HOTKEY_INFO:

 		case IDC_USERINFO:

 			{

@@ -951,12 +954,13 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				if (!IsWindowEnabled(GetDlgItem(hwndDlg, IDC_USERINFO)))

 					break;

 

-				CallService(MS_USERINFO_SHOWDIALOG, (WPARAM) hContact, 0);

+				CallService(MS_USERINFO_SHOWDIALOG, hContact, 0);

 

-				db_set_dw(NULL, MODULE_NAME, "LastSentTo", (DWORD) hContact);

+				db_set_dw(NULL, MODULE_NAME, "LastSentTo", hContact);

 				SendMessage(hwndDlg, WM_CLOSE, 0, 0);

-				break;

 			}

+			break;

+

 		case HOTKEY_HISTORY:

 		case IDC_HISTORY:

 			{

@@ -972,12 +976,13 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				if (!IsWindowEnabled(GetDlgItem(hwndDlg, IDC_HISTORY)))

 					break;

 

-				CallService(MS_HISTORY_SHOWCONTACTHISTORY, (WPARAM) hContact, 0);

+				CallService(MS_HISTORY_SHOWCONTACTHISTORY, hContact, 0);

 

-				db_set_dw(NULL, MODULE_NAME, "LastSentTo", (DWORD) hContact);

+				db_set_dw(NULL, MODULE_NAME, "LastSentTo", hContact);

 				SendMessage(hwndDlg, WM_CLOSE, 0, 0);

-				break;

 			}

+			break;

+

 		case HOTKEY_MENU:

 		case IDC_MENU:

 			{

@@ -995,7 +1000,7 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 				RECT rc;

 				GetWindowRect(GetDlgItem(hwndDlg, IDC_MENU), &rc);

-				HMENU hMenu = (HMENU) CallService(MS_CLIST_MENUBUILDCONTACT, (WPARAM) hContact, 0);

+				HMENU hMenu = (HMENU) CallService(MS_CLIST_MENUBUILDCONTACT, hContact, 0);

 				int ret = TrackPopupMenu(hMenu, TPM_TOPALIGN|TPM_RIGHTBUTTON|TPM_RETURNCMD, rc.left, rc.bottom, 0, hwndDlg, NULL);

 				DestroyMenu(hMenu);

 

@@ -1006,8 +1011,9 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				}

 

 				db_set_dw(NULL, MODULE_NAME, "LastSentTo", (DWORD) hContact);

-				break;

 			}

+			break;

+

 		case HOTKEY_ALL_CONTACTS:

 		case IDC_SHOW_ALL_CONTACTS:

 			{

@@ -1034,8 +1040,6 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 				// Return selection

 				CheckText(hEdit, sztext);

-

-				break;

 			}

 		}

 		break;

diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index 2b9a150689..cb5212c82e 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -292,7 +292,7 @@ static void RestoreUnreadMessageAlerts(void)
 				else {

 					cle.hContact = hContact;

 					cle.hDbEvent = hDbEvent;

-					mir_sntprintf(toolTip, SIZEOF(toolTip), TranslateT("Message from %s"), (char*) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM) hContact, GCDNF_TCHAR));

+					mir_sntprintf(toolTip, SIZEOF(toolTip), TranslateT("Message from %s"), CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR));

 					CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)& cle);

 				}

 			}

diff --git a/plugins/SpellChecker/src/utils.cpp b/plugins/SpellChecker/src/utils.cpp
index 3b740f6372..028d76c8e7 100644
--- a/plugins/SpellChecker/src/utils.cpp
+++ b/plugins/SpellChecker/src/utils.cpp
@@ -729,7 +729,7 @@ void GetUserProtoLanguageSetting(Dialog *dlg, MCONTACT hContact, char *group, ch
 
 	int caps = (isProtocol ? CallProtoService(group, PS_GETCAPS, PFLAGNUM_4, 0) : 0);
 	if (caps & PF4_INFOSETTINGSVC)
-		rc = CallProtoService(group, PS_GETINFOSETTING, (WPARAM) hContact, (LPARAM) &cgs);
+		rc = CallProtoService(group, PS_GETINFOSETTING, hContact, (LPARAM) &cgs);
 	else {
 		rc = CallService(MS_DB_CONTACT_GETSETTING_STR_EX, hContact, (LPARAM)&cgs);
 		if (rc == CALLSERVICE_NOTFOUND)
diff --git a/plugins/StopSpamMod/src/utilities.cpp b/plugins/StopSpamMod/src/utilities.cpp
index db12bee1a7..a2e3a22b6b 100755
--- a/plugins/StopSpamMod/src/utilities.cpp
+++ b/plugins/StopSpamMod/src/utilities.cpp
@@ -264,7 +264,7 @@ void LogSpamToFile(MCONTACT hContact, tstring message)
 

 	// Name, UID and Protocol Log line

 	LogProtocol=DBGetContactSettingStringPAN(hContact,"Protocol","p",_T(""));

-	LogContactName=(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM) hContact, GCDNF_TCHAR);

+	LogContactName=(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR);

 	LogContactId=(LogProtocol==_T(""))?_T(""):GetContactUid(hContact,LogProtocol);

 	// Name, UID  and Protocol Log line

 

@@ -380,7 +380,7 @@ void HistoryLogFunc(MCONTACT hContact, std::string message)
 		std::string msg = message;

 		msg.append("\n");

 		msg.append("Protocol: ").append(GetContactProto(hContact)).append(" Contact: ");

-		msg.append(toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM) hContact, GCDNF_TCHAR))).append(" ID: ");

+		msg.append(toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR))).append(" ID: ");

 		msg.append(toUTF8(GetContactUid(hContact,toUTF16(GetContactProto(hContact)))));

 		HistoryLog(NULL, (char*)msg.c_str(), EVENTTYPE_MESSAGE, DBEF_READ);

 	}

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index ed9860f02f..6ffbed423c 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1830,13 +1830,13 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 						switch (mim_hotkey_check) {

 						case TABSRMM_HK_SETUSERPREFS:

-							CallService(MS_TABMSG_SETUSERPREFS, (WPARAM)dat->hContact, 0);

+							CallService(MS_TABMSG_SETUSERPREFS, dat->hContact, 0);

 							return(_dlgReturn(hwndDlg, 1));

 						case TABSRMM_HK_NUDGE:

 							SendNudge(dat);

 							return(_dlgReturn(hwndDlg, 1));

 						case TABSRMM_HK_SENDFILE:

-							CallService(MS_FILE_SENDFILE, (WPARAM)dat->hContact, 0);

+							CallService(MS_FILE_SENDFILE, dat->hContact, 0);

 							return(_dlgReturn(hwndDlg, 1));

 						case TABSRMM_HK_QUOTEMSG:

 							SendMessage(hwndDlg, WM_COMMAND, IDC_QUOTE, 0);

diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp
index 4e81ce3b10..03a8d69c75 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.cpp
+++ b/plugins/TooltipNotify/src/TooltipNotify.cpp
@@ -791,7 +791,7 @@ void CTooltipNotify::LoadList(HWND hwndDlg, HANDLE hItemNew, HANDLE hItemUnknown
 		SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM) hItemUnknown, 1);

 

 	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

-		HANDLE hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM) hContact, 0);

+		HANDLE hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0);

 		if (hItem && !db_get_b(hContact, MODULENAME, CONTACT_IGNORE_TTNOTIFY, m_sOptions.bIgnoreNew))

 			SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM) hItem, 1);

 	}

@@ -806,7 +806,7 @@ void CTooltipNotify::SaveList(HWND hwndDlg, HANDLE hItemNew, HANDLE hItemUnknown
 		m_sOptions.bIgnoreUnknown = (BYTE) (SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM) hItemUnknown, 0) ? 0 : 1);

 

 	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

-		HANDLE hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM) hContact, 0);

+		HANDLE hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0);

 		if (hItem) {

 			BYTE bChecked = (BYTE) (SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM) hItem, 0));

 			db_set_b(hContact, MODULENAME, CONTACT_IGNORE_TTNOTIFY, bChecked ? 0 : 1);

diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp
index f24496beeb..bdbb776594 100644
--- a/plugins/UserInfoEx/src/mir_db.cpp
+++ b/plugins/UserInfoEx/src/mir_db.cpp
@@ -91,7 +91,7 @@ LPSTR	Proto(MCONTACT hContact)
 {

 	if (hContact) {

 		INT_PTR result;

-		result = CallService(MS_PROTO_GETCONTACTBASEACCOUNT, (WPARAM) hContact, NULL);

+		result = CallService(MS_PROTO_GETCONTACTBASEACCOUNT, hContact, NULL);

 		return (LPSTR) ((result == CALLSERVICE_NOTFOUND) ? NULL : result);

 	}

 	return NULL;

@@ -123,7 +123,7 @@ MCONTACT Add()
  **/

 BYTE Delete(MCONTACT hContact)

 {

-	return CallService(MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0) != 0;

+	return CallService(MS_DB_CONTACT_DELETE, hContact, 0) != 0;

 }

 

 /**

diff --git a/plugins/Utils/mir_buffer.h b/plugins/Utils/mir_buffer.h
index 77e8832f7d..45c8af0e20 100644
--- a/plugins/Utils/mir_buffer.h
+++ b/plugins/Utils/mir_buffer.h
@@ -463,7 +463,7 @@ static void ReplaceVars(Buffer<TCHAR> *buffer, MCONTACT hContact, TCHAR **variab
 				size_t foundLen = i - j + 1;

 				if (foundLen == 9 && _tcsncmp(&buffer->str[j], _T("%contact%"), 9) == 0)

 				{

-					buffer->replace(j, i + 1, (TCHAR *) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM) hContact, GCDNF_TCHAR));

+					buffer->replace(j, i + 1, (TCHAR *) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR));

 				}

 				else if (foundLen == 6 && _tcsncmp(&buffer->str[j], _T("%date%"), 6) == 0)

 				{

diff --git a/plugins/WebView/src/webview_opts.cpp b/plugins/WebView/src/webview_opts.cpp
index fe02eb5d21..d15e771219 100644
--- a/plugins/WebView/src/webview_opts.cpp
+++ b/plugins/WebView/src/webview_opts.cpp
@@ -722,7 +722,7 @@ INT_PTR CALLBACK DlgProcAlertOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 

 				//if alerts is unticked delete the cache

 				if (!(IsDlgButtonChecked(hwndDlg, IDC_ENABLE_ALERTS)))

-					SiteDeleted((WPARAM) hContact, 0);

+					SiteDeleted(hContact, 0);

 

 				if (eventIndex == 0) // string present

 					if (!(GetWindowTextLength(GetDlgItem(hwndDlg, IDC_ALERT_STRING))))

diff --git a/plugins/WebView/src/webview_services.cpp b/plugins/WebView/src/webview_services.cpp
index 7c73059b64..0289f0a096 100644
--- a/plugins/WebView/src/webview_services.cpp
+++ b/plugins/WebView/src/webview_services.cpp
@@ -367,8 +367,8 @@ INT_PTR AddToList(WPARAM wParam, LPARAM lParam)
 	if (psr->cbSize != sizeof(PROTOSEARCHRESULT))

 		return NULL;

 

-	MCONTACT hContact = (MCONTACT) CallService(MS_DB_CONTACT_ADD, 0, 0);

-	CallService(MS_PROTO_ADDTOCONTACT, (WPARAM) hContact, (LPARAM) MODULENAME);

+	MCONTACT hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);

+	CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)MODULENAME);

 

 	/////////write to db

 	db_set_b(hContact, MODULENAME, ON_TOP_KEY, 0);

diff --git a/plugins/WhenWasIt/src/notifiers.cpp b/plugins/WhenWasIt/src/notifiers.cpp
index 1e0dbd1e8a..f6282045a3 100644
--- a/plugins/WhenWasIt/src/notifiers.cpp
+++ b/plugins/WhenWasIt/src/notifiers.cpp
@@ -67,7 +67,7 @@ TCHAR *BuildDABText(int dab, TCHAR *name, TCHAR *text, int size)
 int PopupNotifyBirthday(MCONTACT hContact, int dtb, int age)

 {

 	if (commonData.bIgnoreSubcontacts) {

-		MCONTACT hMetacontact = (MCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM) hContact, 0);

+		MCONTACT hMetacontact = (MCONTACT)CallService(MS_MC_GETMETACONTACT, hContact, 0);

 		if ((hMetacontact) && (hMetacontact != hContact)) //not main metacontact

 			return 0;

 	}

@@ -110,7 +110,7 @@ int PopupNotifyBirthday(MCONTACT hContact, int dtb, int age)
 int PopupNotifyMissedBirthday(MCONTACT hContact, int dab, int age)

 {

 	if (commonData.bIgnoreSubcontacts) {

-		MCONTACT hMetacontact = (MCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM) hContact, 0);

+		MCONTACT hMetacontact = (MCONTACT)CallService(MS_MC_GETMETACONTACT, hContact, 0);

 		if (hMetacontact && hMetacontact != hContact) //not main metacontact

 			return 0;

 	}