another bunch of useless conversions died

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

19 files changed, 31 insertions, 31 deletions

diff --git a/src/core/stdauth/authdialogs.cpp b/src/core/stdauth/authdialogs.cpp
index 27a5c64107..d4584ceef9 100644
--- a/src/core/stdauth/authdialogs.cpp
+++ b/src/core/stdauth/authdialogs.cpp
@@ -119,7 +119,7 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 		case IDC_DETAILS:

 		{

 			MCONTACT hContact = (MCONTACT)GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_DETAILS), GWLP_USERDATA);

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

+			CallService(MS_USERINFO_SHOWDIALOG, hContact, 0);

 			break;

 		}

 

diff --git a/src/core/stdfile/filerecvdlg.cpp b/src/core/stdfile/filerecvdlg.cpp
index f2f19d5ded..8688fa6882 100644
--- a/src/core/stdfile/filerecvdlg.cpp
+++ b/src/core/stdfile/filerecvdlg.cpp
@@ -152,7 +152,7 @@ void GetContactReceivedFilesDir(MCONTACT hContact, TCHAR *szDir, int cchDir, BOO
 		REPLACEVARSDATA dat = { 0 };

 		REPLACEVARSARRAY rvaVarsToReplace[4];

 		rvaVarsToReplace[0].lptzKey = _T("nick");

-		rvaVarsToReplace[0].lptzValue = mir_tstrdup((TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR));

+		rvaVarsToReplace[0].lptzValue = mir_tstrdup((TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR));

 		rvaVarsToReplace[1].lptzKey = _T("userid");

 		rvaVarsToReplace[1].lptzValue = GetContactID(hContact);

 		rvaVarsToReplace[2].lptzKey = _T("proto");

diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp
index a56ee6f898..eb63672e11 100644
--- a/src/core/stdmsg/src/globals.cpp
+++ b/src/core/stdmsg/src/globals.cpp
@@ -124,7 +124,7 @@ static int dbaddedevent(WPARAM hContact, LPARAM lParam)
 	if (hContact) {

 		HWND h = WindowList_Find(g_dat.hMessageWindowList, hContact);

 		if (h)

-			SendMessage(h, HM_DBEVENTADDED, (WPARAM)hContact, lParam);

+			SendMessage(h, HM_DBEVENTADDED, hContact, lParam);

 	}

 	return 0;

 }

diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 21728424bb..10cd22a428 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -465,7 +465,7 @@ static void SaveList(HWND hwndDlg, HANDLE hItemNew, HANDLE hItemUnknown)
 		db_set_b(NULL, SRMMMOD, SRMSGSET_TYPINGUNKNOWN, (BYTE) (SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM) hItemUnknown, 0) ? 1 : 0));

 

 	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_set_b(hContact, SRMMMOD, SRMSGSET_TYPING, (BYTE) (SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM) hItem, 0) ? 1 : 0));

 	}

diff --git a/src/core/stdmsg/src/statusicon.cpp b/src/core/stdmsg/src/statusicon.cpp
index 935af689ec..6e5e530bc7 100644
--- a/src/core/stdmsg/src/statusicon.cpp
+++ b/src/core/stdmsg/src/statusicon.cpp
@@ -68,7 +68,7 @@ void CheckIconClick(MCONTACT hContact, HWND hwndFrom, POINT pt, RECT r, int gap,
 	sicd.szModule = sid->szModule;

 	sicd.flags = click_flags;

 

-	NotifyEventHooks(hHookIconPressedEvt, (WPARAM)hContact, (LPARAM)&sicd);

+	NotifyEventHooks(hHookIconPressedEvt, hContact, (LPARAM)&sicd);

 }

 

 HANDLE hServiceIcon[3];

diff --git a/src/core/stduserinfo/stdinfo.cpp b/src/core/stduserinfo/stdinfo.cpp
index 218d58a0ca..50741b8eab 100644
--- a/src/core/stduserinfo/stdinfo.cpp
+++ b/src/core/stduserinfo/stdinfo.cpp
@@ -40,7 +40,7 @@ static int Proto_GetContactInfoSetting(MCONTACT hContact, const char *szProto, c
 	DBCONTACTGETSETTING cgs = {szModule, szSetting, dbv};

 	dbv->type = (BYTE)nType;

 

-	return CallProtoService(szProto, PS_GETINFOSETTING, (WPARAM)hContact, (LPARAM)&cgs);

+	return CallProtoService(szProto, PS_GETINFOSETTING, hContact, (LPARAM)&cgs);

 }

 

 static void Proto_FreeInfoVariant(DBVARIANT *dbv)

diff --git a/src/modules/addcontact/addcontact.cpp b/src/modules/addcontact/addcontact.cpp
index c9cee416f5..3d43920642 100644
--- a/src/modules/addcontact/addcontact.cpp
+++ b/src/modules/addcontact/addcontact.cpp
@@ -176,7 +176,7 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp
 				int item = SendDlgItemMessage(hdlg, IDC_GROUP, CB_GETCURSEL, 0, 0);

 				if (item > 0) {

 					item = SendDlgItemMessage(hdlg, IDC_GROUP, CB_GETITEMDATA, item, 0);

-					CallService(MS_CLIST_CONTACTCHANGEGROUP, (WPARAM)hContact, item);

+					CallService(MS_CLIST_CONTACTCHANGEGROUP, hContact, item);

 				}

 

 				db_unset(hContact, "CList", "NotOnList");

@@ -196,7 +196,7 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp
 				}

 

 				if (IsDlgButtonChecked(hdlg, IDC_OPEN_WINDOW))

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

+					CallService(MS_CLIST_CONTACTDOUBLECLICKED, hContact, 0);

 			}

 			// fall through

 		case IDCANCEL:

diff --git a/src/modules/chat/clist.cpp b/src/modules/chat/clist.cpp
index 64af00ea2c..85d6720dfe 100644
--- a/src/modules/chat/clist.cpp
+++ b/src/modules/chat/clist.cpp
@@ -59,7 +59,7 @@ MCONTACT AddRoom(const char *pszModule, const TCHAR *pszRoom, const TCHAR *pszDi
 	if ((hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0)) == NULL)

 		return NULL;

 

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

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

 	if (pszGroup && lstrlen(pszGroup) > 0)

 		db_set_ts(hContact, "CList", "Group", pszGroup);

 	else

@@ -121,7 +121,7 @@ int RoomDoubleclicked(WPARAM hContact, LPARAM lParam)
 		// is the "toggle visibility option set, so we need to close the window?

 		if (si->hWnd != NULL &&

 			 db_get_b(NULL, CHAT_MODULE, "ToggleVisibility", 0) == 1 &&

-			 !CallService(MS_CLIST_GETEVENT, (WPARAM)hContact, 0) &&

+			 !CallService(MS_CLIST_GETEVENT, hContact, 0) &&

 			 IsWindowVisible(si->hWnd) && !IsIconic(si->hWnd))

 		{

 			if (ci.OnDblClickSession)

@@ -218,13 +218,13 @@ BOOL AddEvent(MCONTACT hContact, HICON hIcon, HANDLE hEvent, int type, TCHAR* fm
 	cle.pszService = "GChat/DblClickEvent" ;

 	cle.ptszTooltip = TranslateTS(szBuf);

 	if (type) {

-		if (!CallService(MS_CLIST_GETEVENT, (WPARAM)hContact, 0))

+		if (!CallService(MS_CLIST_GETEVENT, hContact, 0))

 			CallService(MS_CLIST_ADDEVENT, (WPARAM) hContact, (LPARAM) &cle);

 	}

 	else {

-		if (CallService(MS_CLIST_GETEVENT, (WPARAM)hContact, 0))

-			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM)GC_FAKE_EVENT);

-		CallService(MS_CLIST_ADDEVENT, (WPARAM)hContact, (LPARAM)&cle);

+		if (CallService(MS_CLIST_GETEVENT, hContact, 0))

+			CallService(MS_CLIST_REMOVEEVENT, hContact, (LPARAM)GC_FAKE_EVENT);

+		CallService(MS_CLIST_ADDEVENT, hContact, (LPARAM)&cle);

 	}

 	return TRUE;

 }

diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp
index 2f845d065e..7fb4d55709 100644
--- a/src/modules/clist/clistmod.cpp
+++ b/src/modules/clist/clistmod.cpp
@@ -142,7 +142,7 @@ static int ProtocolAck(WPARAM, LPARAM lParam)
 			for (MCONTACT hContact = db_find_first(ack->szModule); hContact; ) {

 				MCONTACT hNext = db_find_next(hContact, ack->szModule);

 				if (db_get_b(hContact, "CList", "Delete", 0))

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

+					CallService(MS_DB_CONTACT_DELETE, hContact, 0);

 				hContact = hNext;

 			}

 		}

diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp
index ad3657ab55..cad7cb1950 100644
--- a/src/modules/clist/genmenu.cpp
+++ b/src/modules/clist/genmenu.cpp
@@ -1100,7 +1100,7 @@ int TryProcessDoubleClick(MCONTACT hContact)
 {

 	int iMenuID = GetMenuObjbyId((int)hContactMenuObject);

 	if (iMenuID != -1) {

-		NotifyEventHooks(hPreBuildContactMenuEvent, (WPARAM)hContact, 0);

+		NotifyEventHooks(hPreBuildContactMenuEvent, hContact, 0);

 

 		PMO_IntMenuItem pimi = (PMO_IntMenuItem)MO_GetDefaultMenuItem((WPARAM)g_menus[ iMenuID ]->m_items.first, 0);

 		if (pimi != NULL) {

diff --git a/src/modules/clist/groups.cpp b/src/modules/clist/groups.cpp
index 3799770865..f80dd51820 100644
--- a/src/modules/clist/groups.cpp
+++ b/src/modules/clist/groups.cpp
@@ -227,7 +227,7 @@ static INT_PTR DeleteGroup(WPARAM wParam, LPARAM)
 			db_unset(hContact, "CList", "Group");

 			grpChg.pszNewName = NULL;

 		}

-		NotifyEventHooks(hGroupChangeEvent, (WPARAM)hContact, (LPARAM)&grpChg);

+		NotifyEventHooks(hGroupChangeEvent, hContact, (LPARAM)&grpChg);

 	}

 	//shuffle list of groups up to fill gap

 	for (i = wParam - 1;; i++) {

diff --git a/src/modules/extraicons/BaseExtraIcon.cpp b/src/modules/extraicons/BaseExtraIcon.cpp
index 56631313e3..0d3106972c 100644
--- a/src/modules/extraicons/BaseExtraIcon.cpp
+++ b/src/modules/extraicons/BaseExtraIcon.cpp
@@ -68,7 +68,7 @@ void BaseExtraIcon::setDescIcon(const char *icon)
 void BaseExtraIcon::onClick(MCONTACT hContact)

 {

 	if (OnClick != NULL)

-		OnClick((WPARAM)hContact, (LPARAM)ConvertToClistSlot(slot), onClickParam);

+		OnClick(hContact, (LPARAM)ConvertToClistSlot(slot), onClickParam);

 }

 

 int BaseExtraIcon::ClistSetExtraIcon(MCONTACT hContact, HANDLE hImage)

diff --git a/src/modules/extraicons/CallbackExtraIcon.cpp b/src/modules/extraicons/CallbackExtraIcon.cpp
index 73badf0fc9..5963b38e2b 100644
--- a/src/modules/extraicons/CallbackExtraIcon.cpp
+++ b/src/modules/extraicons/CallbackExtraIcon.cpp
@@ -58,7 +58,7 @@ void CallbackExtraIcon::applyIcon(MCONTACT hContact)
 	if (needToRebuild)

 		rebuildIcons();

 

-	ApplyIcon((WPARAM)hContact, 0);

+	ApplyIcon(hContact, 0);

 }

 

 int CallbackExtraIcon::setIcon(int id, MCONTACT hContact, HANDLE icon)

diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp
index 037c97e142..389b8a1e07 100644
--- a/src/modules/extraicons/extraicons.cpp
+++ b/src/modules/extraicons/extraicons.cpp
@@ -91,7 +91,7 @@ int Clist_SetExtraIcon(MCONTACT hContact, int slot, HANDLE hImage)
 	if (icol == -1)

 		return -1;

 

-	HANDLE hItem = (HANDLE)SendMessage(cli.hwndContactTree, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+	HANDLE hItem = (HANDLE)SendMessage(cli.hwndContactTree, CLM_FINDCONTACT, hContact, 0);

 	if (hItem == 0)

 		return -1;

 

@@ -332,7 +332,7 @@ void fnSetAllExtraIcons(MCONTACT hContact)
 		if (pdnce == NULL)

 			continue;

 

-		NotifyEventHooks(hEventExtraImageApplying, (WPARAM)hContact, 0);

+		NotifyEventHooks(hEventExtraImageApplying, hContact, 0);

 		if (hcontgiven) break;

 		Sleep(0);

 	}

diff --git a/src/modules/findadd/searchresults.cpp b/src/modules/findadd/searchresults.cpp
index ed608a13e9..6f2b78ce8d 100644
--- a/src/modules/findadd/searchresults.cpp
+++ b/src/modules/findadd/searchresults.cpp
@@ -378,13 +378,13 @@ void ShowMoreOptionsMenu(HWND hwndDlg, int x, int y)
 		case IDC_DETAILS:

 		{

 			MCONTACT hContact = (MCONTACT)CallProtoServiceInt(NULL, lsr->szProto, PS_ADDTOLIST, PALF_TEMPORARY, (LPARAM)&lsr->psr);

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

+			CallService(MS_USERINFO_SHOWDIALOG, hContact, 0);

 			break;

 		}

 		case IDC_SENDMESSAGE:

 		{

 			MCONTACT hContact = (MCONTACT)CallProtoServiceInt(NULL, lsr->szProto, PS_ADDTOLIST, PALF_TEMPORARY, (LPARAM)&lsr->psr);

-			CallService(MS_MSG_SENDMESSAGE, (WPARAM)hContact, (LPARAM)(const char*)NULL);

+			CallService(MS_MSG_SENDMESSAGE, hContact, (LPARAM)(const char*)NULL);

 			break;

 		}

 	}

diff --git a/src/modules/ignore/ignore.cpp b/src/modules/ignore/ignore.cpp
index 75f79fbd57..0c1c4a6766 100644
--- a/src/modules/ignore/ignore.cpp
+++ b/src/modules/ignore/ignore.cpp
@@ -170,7 +170,7 @@ static void SaveItemMask(HWND hwndList, MCONTACT hContact, HANDLE hItem, const c
 static void SetAllContactIcons(HWND hwndList)

 {

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

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

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

 		if (hItem && SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(IGNOREEVENT_MAX, 0)) == EMPTY_EXTRA_ICON) {

 			DWORD proto1Caps, proto4Caps;

 			char *szProto = GetContactProto(hContact);

@@ -297,7 +297,7 @@ static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM
 			switch (((LPNMHDR)lParam)->code) {

 			case PSN_APPLY:

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

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

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

 					if (hItem) SaveItemMask( GetDlgItem(hwndDlg, IDC_LIST), hContact, hItem, "Mask1");

 					if (SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0))

 						db_unset(hContact, "CList", "Hidden");

@@ -404,7 +404,7 @@ static int IgnoreAddedNotify(WPARAM, LPARAM lParam)
 	DBEVENTINFO *dbei = (DBEVENTINFO*)lParam;

 	if (dbei && dbei->eventType == EVENTTYPE_ADDED && dbei->pBlob != NULL) {

 		MCONTACT hContact = DbGetAuthEventContact(dbei);

-		if (CallService(MS_DB_CONTACT_IS, (WPARAM)hContact, 0) && IsIgnored((WPARAM)hContact, IGNOREEVENT_YOUWEREADDED))

+		if (CallService(MS_DB_CONTACT_IS, hContact, 0) && IsIgnored(hContact, IGNOREEVENT_YOUWEREADDED))

 			return 1;

 	}

 	return 0;

diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp
index a1b7ab0469..5ea1f1c371 100644
--- a/src/modules/protocols/protoint.cpp
+++ b/src/modules/protocols/protoint.cpp
@@ -260,7 +260,7 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE
 

 	int __cdecl UserIsTyping(MCONTACT hContact, int type)

 	{

-		CCSDATA ccs = { hContact, PSS_USERISTYPING, (WPARAM)hContact, type };

+		CCSDATA ccs = { hContact, PSS_USERISTYPING, hContact, type };

 		return ProtoCallService(m_szModuleName, PSS_USERISTYPING, 0, (LPARAM)&ccs);

 	}

 

diff --git a/src/modules/utils/path.cpp b/src/modules/utils/path.cpp
index 3520a749b0..c67a297b8c 100644
--- a/src/modules/utils/path.cpp
+++ b/src/modules/utils/path.cpp
@@ -116,7 +116,7 @@ static __forceinline char *mir_a2x(char *, char *s) { return mir_strdup(s); }
 

 static __forceinline char *GetContactNickX(char *, MCONTACT hContact)

 {

-	return mir_strdup((char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, 0));

+	return mir_strdup((char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, 0));

 }

 

 static __forceinline char *GetContactIDX(char *, MCONTACT hContact)

@@ -203,7 +203,7 @@ static __forceinline TCHAR *mir_a2x(TCHAR *, char *s) { return mir_a2t(s); }
 

 static __forceinline TCHAR *GetContactNickX(TCHAR *, MCONTACT hContact)

 {

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

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

 }

 

 static __forceinline TCHAR *GetContactIDX(TCHAR *, MCONTACT hContact)

diff --git a/src/modules/visibility/visibility.cpp b/src/modules/visibility/visibility.cpp
index d9043ee9e3..479c476835 100644
--- a/src/modules/visibility/visibility.cpp
+++ b/src/modules/visibility/visibility.cpp
@@ -108,7 +108,7 @@ static void ResetListOptions(HWND hwndList)
 static void SetAllContactIcons(HWND hwndList)

 {

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

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

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

 		if (hItem == NULL)

 			continue;

 

@@ -245,7 +245,7 @@ static INT_PTR CALLBACK DlgProcVisibilityOpts(HWND hwndDlg, UINT msg, WPARAM, LP
 		case 0:

 			if (((LPNMHDR)lParam)->code == PSN_APPLY) {

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

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

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

 					if (hItem == NULL)

 						continue;