these conversions aren't needed either

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

14 files changed, 60 insertions, 60 deletions

diff --git a/src/core/stdaway/awaymsg.cpp b/src/core/stdaway/awaymsg.cpp
index c7df74e5a8..e52709a35f 100644
--- a/src/core/stdaway/awaymsg.cpp
+++ b/src/core/stdaway/awaymsg.cpp
@@ -46,7 +46,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wP
 			dat = (AwayMsgDlgData*)mir_alloc(sizeof(AwayMsgDlgData));

 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)dat);

 

-			dat->hContact = (MCONTACT)lParam;

+			dat->hContact = lParam;

 			dat->hAwayMsgEvent = HookEventMessage(ME_PROTO_ACK, hwndDlg, HM_AWAYMSG);

 			dat->hSeq = (HANDLE)CallContactService(dat->hContact, PSS_GETAWAYMSG, 0, 0);

 			WindowList_Add(hWindowList, hwndDlg, dat->hContact);

@@ -77,7 +77,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wP
 				ack.result = ACKRESULT_SUCCESS;

 				SendMessage(hwndDlg, HM_AWAYMSG, 0, (LPARAM)&ack);

 			}

-			Utils_RestoreWindowPosition(hwndDlg, (MCONTACT)lParam, "SRAway", "AwayMsgDlg");

+			Utils_RestoreWindowPosition(hwndDlg, lParam, "SRAway", "AwayMsgDlg");

 			return TRUE;

 

 		case HM_AWAYMSG:

@@ -123,7 +123,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wP
 static INT_PTR GetMessageCommand(WPARAM wParam, LPARAM)

 {

 	HWND hwnd;

-	if (hwnd = WindowList_Find(hWindowList, (MCONTACT)wParam)) {

+	if (hwnd = WindowList_Find(hWindowList, wParam)) {

 		SetForegroundWindow(hwnd);

 		SetFocus(hwnd);

 	}

@@ -134,15 +134,15 @@ static INT_PTR GetMessageCommand(WPARAM wParam, LPARAM)
 static int AwayMsgPreBuildMenu(WPARAM wParam, LPARAM)

 {

 	TCHAR str[128];

-	char *szProto = GetContactProto((MCONTACT)wParam);

+	char *szProto = GetContactProto(wParam);

 

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.flags = CMIM_FLAGS | CMIF_NOTOFFLINE | CMIF_HIDDEN | CMIF_TCHAR;

 

 	if (szProto != NULL) {

-		int chatRoom = szProto ? db_get_b((MCONTACT)wParam, szProto, "ChatRoom", 0) : 0;

+		int chatRoom = szProto ? db_get_b(wParam, szProto, "ChatRoom", 0) : 0;

 		if ( !chatRoom) {

-			int status = db_get_w((MCONTACT)wParam, szProto, "Status", ID_STATUS_OFFLINE);

+			int status = db_get_w(wParam, szProto, "Status", ID_STATUS_OFFLINE);

 			mir_sntprintf(str, SIZEOF(str), TranslateT("Re&ad %s message"), pcli->pfnGetStatusModeDescription(status, 0));

 			mi.ptszName = str;

 			if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGRECV) {

diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index ee90165e6c..65a3b8cb61 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -28,7 +28,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 	switch (msg) {

 	case WM_USER + 1:

 		{

-			MCONTACT hContact = (MCONTACT)wParam;

+			MCONTACT hContact = wParam;

 			DBCONTACTWRITESETTING *ws = (DBCONTACTWRITESETTING *) lParam;

 			if (hContact == NULL && ws != NULL && ws->szModule != NULL && ws->szSetting != NULL && 

 				 lstrcmpiA(ws->szModule, "CList") == 0 && lstrcmpiA(ws->szSetting, "UseGroups") == 0 && IsWindowVisible(hwndDlg))

diff --git a/src/core/stdemail/email.cpp b/src/core/stdemail/email.cpp
index 9c8f1eeafe..9cd254783d 100644
--- a/src/core/stdemail/email.cpp
+++ b/src/core/stdemail/email.cpp
@@ -35,9 +35,9 @@ void SendEmailThread(void *szUrl)
 static INT_PTR SendEMailCommand(WPARAM wParam, LPARAM lParam)

 {

 	DBVARIANT dbv;

-	char *szProto = GetContactProto((MCONTACT)wParam);

-	if (szProto == NULL || db_get_s((MCONTACT)wParam, szProto, "e-mail", &dbv)) {

-		if (db_get_s((MCONTACT)wParam, "UserInfo", "Mye-mail0", &dbv)) {

+	char *szProto = GetContactProto(wParam);

+	if (szProto == NULL || db_get_s(wParam, szProto, "e-mail", &dbv)) {

+		if (db_get_s(wParam, "UserInfo", "Mye-mail0", &dbv)) {

 			MessageBox((HWND)lParam, TranslateT("User has not registered an e-mail address"), TranslateT("Send e-mail"), MB_OK);

 			return 1;

 		}

@@ -54,9 +54,9 @@ static int EMailPreBuildMenu(WPARAM wParam, LPARAM)
 {

 	bool bEnabled = true;

 	DBVARIANT dbv = { 0 };

-	char *szProto = GetContactProto((MCONTACT)wParam);

-	if (szProto == NULL || db_get_s((MCONTACT)wParam, szProto, "e-mail", &dbv))

-		if (db_get_s((MCONTACT)wParam, "UserInfo", "Mye-mail0", &dbv))

+	char *szProto = GetContactProto(wParam);

+	if (szProto == NULL || db_get_s(wParam, szProto, "e-mail", &dbv))

+		if (db_get_s(wParam, "UserInfo", "Mye-mail0", &dbv))

 			bEnabled = false;

 

 	Menu_ShowItem(hEMailMenuItem, bEnabled);

diff --git a/src/core/stdfile/file.cpp b/src/core/stdfile/file.cpp
index 9bc353b73d..19dcf2f27c 100644
--- a/src/core/stdfile/file.cpp
+++ b/src/core/stdfile/file.cpp
@@ -62,7 +62,7 @@ TCHAR *GetContactID(MCONTACT hContact)
 static INT_PTR SendFileCommand(WPARAM wParam, LPARAM)

 {

 	struct FileSendData fsd;

-	fsd.hContact = (MCONTACT)wParam;

+	fsd.hContact = wParam;

 	fsd.ppFiles = NULL;

 	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_FILESEND), NULL, DlgProcSendFile, (LPARAM)&fsd);

 	return 0;

@@ -71,7 +71,7 @@ static INT_PTR SendFileCommand(WPARAM wParam, LPARAM)
 static INT_PTR SendSpecificFiles(WPARAM wParam, LPARAM lParam)

 {

 	FileSendData fsd;

-	fsd.hContact = (MCONTACT)wParam;

+	fsd.hContact = wParam;

 

 	char** ppFiles = (char**)lParam;

 	int count = 0;

@@ -92,7 +92,7 @@ static INT_PTR SendSpecificFiles(WPARAM wParam, LPARAM lParam)
 static INT_PTR SendSpecificFilesT(WPARAM wParam, LPARAM lParam)

 {

 	FileSendData fsd;

-	fsd.hContact = (MCONTACT)wParam;

+	fsd.hContact = wParam;

 	fsd.ppFiles = (const TCHAR**)lParam;

 	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_FILESEND), NULL, DlgProcSendFile, (LPARAM)&fsd);

 	return 0;

@@ -101,7 +101,7 @@ static INT_PTR SendSpecificFilesT(WPARAM wParam, LPARAM lParam)
 static INT_PTR GetReceivedFilesFolder(WPARAM wParam, LPARAM lParam)

 {

 	TCHAR buf[MAX_PATH];

-	GetContactReceivedFilesDir((MCONTACT)wParam, buf, MAX_PATH, TRUE);

+	GetContactReceivedFilesDir(wParam, buf, MAX_PATH, TRUE);

 	char* dir = mir_t2a(buf);

 	lstrcpynA((char*)lParam, dir, MAX_PATH);

 	mir_free(dir);

@@ -148,7 +148,7 @@ static int FileEventAdded(WPARAM wParam, LPARAM lParam)
 	if (dbei.flags & (DBEF_SENT|DBEF_READ) || dbei.eventType != EVENTTYPE_FILE || dwSignature == 0)

 		return 0;

 

-	PushFileEvent((MCONTACT)wParam, (HANDLE)lParam, 0);

+	PushFileEvent(wParam, (HANDLE)lParam, 0);

 	return 0;

 }

 

@@ -303,12 +303,12 @@ static void RemoveUnreadFileEvents(void)
 static int SRFilePreBuildMenu(WPARAM wParam, LPARAM)

 {

 	bool bEnabled = false;

-	char *szProto = GetContactProto((MCONTACT)wParam);

+	char *szProto = GetContactProto(wParam);

 	if (szProto != NULL) {

 		if ( CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_FILESEND) {

 			if ( CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_OFFLINEFILES)

 				bEnabled = true;

-			else if (db_get_w((MCONTACT)wParam, szProto, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE)

+			else if (db_get_w(wParam, szProto, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE)

 				bEnabled = true;

 		}

 	}

diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp
index 71af89163b..fb90ce71ff 100644
--- a/src/core/stdmsg/src/globals.cpp
+++ b/src/core/stdmsg/src/globals.cpp
@@ -121,7 +121,7 @@ void ReloadGlobals()
 

 static int dbaddedevent(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (hContact) {

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

 		if (h)

@@ -144,7 +144,7 @@ static int ackevent(WPARAM wParam, LPARAM lParam)
 

 int AvatarChanged(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

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

 	if (h) SendMessage(h, HM_AVATARACK, wParam, lParam);

 	return 0;

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 23a16cc783..7c84d5239e 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1308,7 +1308,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		break;

 

 	case HM_DBEVENTADDED:

-		if ((MCONTACT)wParam == dat->hContact) {

+		if (wParam == dat->hContact) {

 			HANDLE hDbEvent = (HANDLE)lParam;

 			if (dat->hDbEventFirst == NULL)

 				dat->hDbEventFirst = hDbEvent;

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index c448ec70f5..83312cb914 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -59,7 +59,7 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam)
 

 	CallServiceSync(MS_CLIST_REMOVEEVENT, wParam, (LPARAM) 1);

 	/* does a window for the contact exist? */

-	HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, (MCONTACT)wParam);

+	HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, wParam);

 	if (hwnd) {

 		if (!db_get_b(NULL, SRMMMOD, SRMSGSET_DONOTSTEALFOCUS, SRMSGDEFSET_DONOTSTEALFOCUS)) {

 			ShowWindow(hwnd, SW_RESTORE);

@@ -78,10 +78,10 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam)
 	/* new message */

 	SkinPlaySound("AlertMsg");

 

-	char *szProto = GetContactProto((MCONTACT)wParam);

+	char *szProto = GetContactProto(wParam);

 	if (szProto && (g_dat.openFlags & SRMMStatusToPf2(CallProtoService(szProto, PS_GETSTATUS, 0, 0)))) {

 		NewMessageWindowLParam newData = { 0 };

-		newData.hContact = (MCONTACT)wParam;

+		newData.hContact = wParam;

 		newData.noActivate = db_get_b(NULL, SRMMMOD, SRMSGSET_DONOTSTEALFOCUS, SRMSGDEFSET_DONOTSTEALFOCUS);

 		CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_MSG), NULL, DlgProcMessage, (LPARAM)&newData);

 		return 0;

@@ -89,12 +89,12 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam)
 

 	TCHAR toolTip[256], *contactName;

 	CLISTEVENT cle = { sizeof(cle) };

-	cle.hContact = (MCONTACT)wParam;

+	cle.hContact = wParam;

 	cle.hDbEvent = (HANDLE)lParam;

 	cle.flags = CLEF_TCHAR;

 	cle.hIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);

 	cle.pszService = "SRMsg/ReadMessage";

-	contactName = pcli->pfnGetContactDisplayName((MCONTACT)wParam, 0);

+	contactName = pcli->pfnGetContactDisplayName(wParam, 0);

 	mir_sntprintf(toolTip, SIZEOF(toolTip), TranslateT("Message from %s"), contactName);

 	cle.ptszTooltip = toolTip;

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

@@ -135,12 +135,12 @@ INT_PTR SendMessageCmd(MCONTACT hContact, char* msg, int isWchar)
 

 static INT_PTR SendMessageCommand_W(WPARAM wParam, LPARAM lParam)

 {

-	return SendMessageCmd((MCONTACT)wParam, (char*)lParam, TRUE);

+	return SendMessageCmd(wParam, (char*)lParam, TRUE);

 }

 

 static INT_PTR SendMessageCommand(WPARAM wParam, LPARAM lParam)

 {

-	return SendMessageCmd((MCONTACT)wParam, (char*)lParam, FALSE);

+	return SendMessageCmd(wParam, (char*)lParam, FALSE);

 }

 

 static INT_PTR ReadMessageCommand(WPARAM wParam, LPARAM lParam)

@@ -159,12 +159,12 @@ static int TypingMessage(WPARAM wParam, LPARAM lParam)
 

 	SkinPlaySound((lParam) ? "TNStart" : "TNStop");

 

-	HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, (MCONTACT)wParam);

+	HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, wParam);

 	if (hwnd)

 		SendMessage(hwnd, DM_TYPING, 0, lParam);

 	else if (lParam && (g_dat.flags & SMF_SHOWTYPINGTRAY)) {

 		TCHAR szTip[256];

-		mir_sntprintf(szTip, SIZEOF(szTip), TranslateT("%s is typing a message"), pcli->pfnGetContactDisplayName((MCONTACT)wParam, 0));

+		mir_sntprintf(szTip, SIZEOF(szTip), TranslateT("%s is typing a message"), pcli->pfnGetContactDisplayName(wParam, 0));

 

 		if (ServiceExists(MS_CLIST_SYSTRAY_NOTIFY) && !(g_dat.flags&SMF_SHOWTYPINGCLIST)) {

 			MIRANDASYSTRAYNOTIFY tn = { sizeof(tn) };

@@ -177,7 +177,7 @@ static int TypingMessage(WPARAM wParam, LPARAM lParam)
 		}

 		else {

 			CLISTEVENT cle = { sizeof(cle) };

-			cle.hContact = (MCONTACT)wParam;

+			cle.hContact = wParam;

 			cle.hDbEvent = (HANDLE)1;

 			cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR;

 			cle.hIcon = LoadSkinnedIcon( SKINICON_OTHER_TYPING );

@@ -194,7 +194,7 @@ static int TypingMessage(WPARAM wParam, LPARAM lParam)
 static int MessageSettingChanged(WPARAM wParam, LPARAM lParam)

 {

 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *) lParam;

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 

 	if (cws->szModule == NULL) return 0;

 

@@ -204,7 +204,7 @@ static int MessageSettingChanged(WPARAM wParam, LPARAM lParam)
 		if (cws->szSetting && !strcmp(cws->szSetting, "Timezone"))

 			WindowList_Broadcast(g_dat.hMessageWindowList, DM_NEWTIMEZONE, (WPARAM) cws, 0);

 		else {

-			char *szProto = GetContactProto((MCONTACT)wParam);

+			char *szProto = GetContactProto(wParam);

 			if (szProto && !strcmp(cws->szModule, szProto))

 				WindowList_Broadcast(g_dat.hMessageWindowList, DM_UPDATETITLE, (WPARAM) cws, 0);

 		}

@@ -215,7 +215,7 @@ static int MessageSettingChanged(WPARAM wParam, LPARAM lParam)
 static int ContactDeleted(WPARAM wParam, LPARAM lParam)

 {

 	HWND hwnd;

-	if (hwnd = WindowList_Find(g_dat.hMessageWindowList, (MCONTACT)wParam))

+	if (hwnd = WindowList_Find(g_dat.hMessageWindowList, wParam))

 		SendMessage(hwnd, WM_CLOSE, 0, 0);

 

 	return 0;

@@ -315,7 +315,7 @@ static int IconsChanged(WPARAM, LPARAM)
 

 static int PrebuildContactMenu(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (hContact) {

 		bool bEnabled = false;

 		char *szProto = GetContactProto(hContact);

@@ -346,7 +346,7 @@ static INT_PTR GetWindowClass(WPARAM wParam, LPARAM lParam)
 

 static INT_PTR SetStatusText(WPARAM wParam, LPARAM lParam)

 {

-	HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, (MCONTACT)wParam);

+	HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, wParam);

 	if (hwnd == NULL)

 		return 1;

 

diff --git a/src/core/stdmsg/src/statusicon.cpp b/src/core/stdmsg/src/statusicon.cpp
index e969085c22..bd813201cf 100644
--- a/src/core/stdmsg/src/statusicon.cpp
+++ b/src/core/stdmsg/src/statusicon.cpp
@@ -26,7 +26,7 @@ HANDLE hHookIconPressedEvt;
 

 static int OnSrmmIconChanged(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (hContact == NULL)

 		WindowList_Broadcast(g_dat.hMessageWindowList, DM_STATUSICONCHANGE, 0, 0);

 	else {

diff --git a/src/core/stduihist/history.cpp b/src/core/stduihist/history.cpp
index 6f88f3200d..13c08b692a 100644
--- a/src/core/stduihist/history.cpp
+++ b/src/core/stduihist/history.cpp
@@ -206,7 +206,7 @@ static INT_PTR CALLBACK DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)lParam);

-		hContact = (MCONTACT)lParam;

+		hContact = lParam;

 		WindowList_Add(hWindowList, hwndDlg, hContact);

 		Utils_RestoreWindowPosition(hwndDlg, hContact, "History", "");

 		{

@@ -376,7 +376,7 @@ static INT_PTR CALLBACK DlgProcHistoryFind(HWND hwndDlg, UINT msg, WPARAM wParam
 

 static INT_PTR UserHistoryCommand(WPARAM wParam, LPARAM)

 {

-	HWND hwnd = WindowList_Find(hWindowList, (MCONTACT)wParam);

+	HWND hwnd = WindowList_Find(hWindowList, wParam);

 	if (hwnd) {

 		SetForegroundWindow(hwnd);

 		SetFocus(hwnd);

@@ -388,7 +388,7 @@ static INT_PTR UserHistoryCommand(WPARAM wParam, LPARAM)
 

 static int HistoryContactDelete(WPARAM wParam, LPARAM)

 {

-	HWND hwnd = WindowList_Find(hWindowList, (MCONTACT)wParam);

+	HWND hwnd = WindowList_Find(hWindowList, wParam);

 	if (hwnd != NULL)

 		DestroyWindow(hwnd);

 	return 0;

diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp
index 4fbd2bbf6c..5473c6a596 100644
--- a/src/core/stdurl/url.cpp
+++ b/src/core/stdurl/url.cpp
@@ -49,11 +49,11 @@ static int UrlEventAdded(WPARAM wParam, LPARAM lParam)
 	SkinPlaySound("RecvUrl");

 

 	TCHAR szTooltip[256];

-	mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("URL from %s"), pcli->pfnGetContactDisplayName((MCONTACT)wParam, 0));

+	mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("URL from %s"), pcli->pfnGetContactDisplayName(wParam, 0));

 

 	CLISTEVENT cle = { sizeof(cle) };

 	cle.flags = CLEF_TCHAR;

-	cle.hContact = (MCONTACT)wParam;

+	cle.hContact = wParam;

 	cle.hDbEvent = (HANDLE)lParam;

 	cle.hIcon = LoadSkinIcon(SKINICON_EVENT_URL);

 	cle.pszService = "SRUrl/ReadUrl";

@@ -97,7 +97,7 @@ static void RestoreUnreadUrlAlerts(void)
 static int ContactSettingChanged(WPARAM wParam, LPARAM lParam)

 {

 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;

-	char *szProto = GetContactProto((MCONTACT)wParam);

+	char *szProto = GetContactProto(wParam);

 	if (lstrcmpA(cws->szModule, "CList") && (szProto == NULL || lstrcmpA(cws->szModule, szProto)))

 		return 0;

 

@@ -108,7 +108,7 @@ static int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 static int SRUrlPreBuildMenu(WPARAM wParam, LPARAM)

 {

 	bool bEnabled = false;

-	char *szProto = GetContactProto((MCONTACT)wParam);

+	char *szProto = GetContactProto(wParam);

 	if (szProto != NULL)

 		if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_URLSEND)

 			bEnabled = true;

@@ -147,7 +147,7 @@ static int SRUrlShutdown(WPARAM, LPARAM)
 

 int UrlContactDeleted(WPARAM wParam, LPARAM)

 {

-	HWND h = WindowList_Find(hUrlWindowList, (MCONTACT)wParam);

+	HWND h = WindowList_Find(hUrlWindowList, wParam);

 	if (h)

 		SendMessage(h, WM_CLOSE, 0, 0);

 

diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp
index c541825d9f..89ea13b76b 100644
--- a/src/core/stdurl/urldialogs.cpp
+++ b/src/core/stdurl/urldialogs.cpp
@@ -467,7 +467,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_LIMITTEXT, 450, 0);

 		dat = (struct UrlSendData*)mir_alloc(sizeof(struct UrlSendData));

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)dat);

-		dat->hContact = (MCONTACT)lParam;

+		dat->hContact = lParam;

 		dat->hAckEvent = NULL;

 		dat->hSendId = NULL;

 		dat->sendBuffer = NULL;

diff --git a/src/core/stduserinfo/stdinfo.cpp b/src/core/stduserinfo/stdinfo.cpp
index 4e65815d98..218d58a0ca 100644
--- a/src/core/stduserinfo/stdinfo.cpp
+++ b/src/core/stduserinfo/stdinfo.cpp
@@ -244,7 +244,7 @@ static INT_PTR CALLBACK LocationDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L
 		TranslateDialogDefault(hwndDlg);

 		SetTimer(hwndDlg, 1, 1000, NULL);

 

-		tmi.prepareList((MCONTACT)lParam, GetDlgItem(hwndDlg, IDC_TIMEZONESELECT), TZF_PLF_CB);

+		tmi.prepareList(lParam, GetDlgItem(hwndDlg, IDC_TIMEZONESELECT), TZF_PLF_CB);

 		SendMessage(hwndDlg, WM_TIMER, 0, 0);

 		break;

 

@@ -522,7 +522,7 @@ static INT_PTR CALLBACK NotesDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			hFont = CreateFontIndirect(&lf);

 			SendDlgItemMessage(hwndDlg, IDC_ABOUT, WM_SETFONT, (WPARAM) hFont, MAKELPARAM(TRUE, 0));

 

-			if (!db_get_s((MCONTACT)lParam, "UserInfo", "MyNotes", &dbv)) {

+			if (!db_get_s(lParam, "UserInfo", "MyNotes", &dbv)) {

 				SetDlgItemTextA(hwndDlg, IDC_MYNOTES, dbv.pszVal);

 				db_free(&dbv);

 			}

@@ -579,7 +579,7 @@ int DetailsInit(WPARAM wParam, LPARAM lParam)
 	if (lParam == NULL)

 		return 0;

 

-	if (GetContactProto((MCONTACT)lParam) == 0)

+	if (GetContactProto(lParam) == 0)

 		return 0;

 

 	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

diff --git a/src/core/stduserinfo/userinfo.cpp b/src/core/stduserinfo/userinfo.cpp
index 61248a0751..04b3353627 100644
--- a/src/core/stduserinfo/userinfo.cpp
+++ b/src/core/stduserinfo/userinfo.cpp
@@ -95,7 +95,7 @@ static int PageSortProc(OPTIONSDIALOGPAGE *item1, OPTIONSDIALOGPAGE *item2)
 static INT_PTR ShowDetailsDialogCommand(WPARAM wParam, LPARAM)

 {

 	HWND hwnd;

-	if (hwnd = WindowList_Find(hWindowList, (MCONTACT)wParam)) {

+	if (hwnd = WindowList_Find(hWindowList, wParam)) {

 		SetForegroundWindow(hwnd);

 		SetFocus(hwnd);

 		return 0;

@@ -222,7 +222,7 @@ static void CreateDetailsPageWindow(HWND hwndDlg, DetailsData *dat, DetailsPageD
 

 static int UserInfoContactDelete(WPARAM wParam, LPARAM)

 {

-	HWND hwnd = WindowList_Find(hWindowList, (MCONTACT)wParam);

+	HWND hwnd = WindowList_Find(hWindowList, wParam);

 	if (hwnd != NULL)

 		DestroyWindow(hwnd);

 	return 0;

diff --git a/src/core/stduseronline/useronline.cpp b/src/core/stduseronline/useronline.cpp
index 188999dcfe..1093f380db 100644
--- a/src/core/stduseronline/useronline.cpp
+++ b/src/core/stduseronline/useronline.cpp
@@ -38,17 +38,17 @@ static int UserOnlineSettingChanged(WPARAM wParam, LPARAM lParam)
 		return 0;

 

 	int newStatus = cws->value.wVal;

-	int oldStatus = db_get_w((MCONTACT)wParam, "UserOnline", "OldStatus", ID_STATUS_OFFLINE);

-	db_set_w((MCONTACT)wParam, "UserOnline", "OldStatus", (WORD)newStatus);

+	int oldStatus = db_get_w(wParam, "UserOnline", "OldStatus", ID_STATUS_OFFLINE);

+	db_set_w(wParam, "UserOnline", "OldStatus", (WORD)newStatus);

 	if (CallService(MS_IGNORE_ISIGNORED, wParam, IGNOREEVENT_USERONLINE)) return 0;

-	if (db_get_b((MCONTACT)wParam, "CList", "Hidden", 0)) return 0;

+	if (db_get_b(wParam, "CList", "Hidden", 0)) return 0;

     if (newStatus == ID_STATUS_OFFLINE && oldStatus != ID_STATUS_OFFLINE) {

        // Remove the event from the queue if it exists since they are now offline

-		 int lastEvent = (int)db_get_dw((MCONTACT)wParam, "UserOnline", "LastEvent", 0);

+		 int lastEvent = (int)db_get_dw(wParam, "UserOnline", "LastEvent", 0);

 

        if (lastEvent) {

            CallService(MS_CLIST_REMOVEEVENT, wParam, (LPARAM)lastEvent);

-			  db_set_dw((MCONTACT)wParam, "UserOnline", "LastEvent", 0);

+			  db_set_dw(wParam, "UserOnline", "LastEvent", 0);

        }

     }

 	if ((newStatus == ID_STATUS_ONLINE || newStatus == ID_STATUS_FREECHAT) &&

@@ -63,11 +63,11 @@ static int UserOnlineSettingChanged(WPARAM wParam, LPARAM lParam)
 				ZeroMemory(&cle, sizeof(cle));

 				cle.cbSize = sizeof(cle);

 				cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR;

-				cle.hContact = (MCONTACT)wParam;

+				cle.hContact = wParam;

 				cle.hDbEvent = (HANDLE)(uniqueEventId++);

 				cle.hIcon = LoadSkinIcon(SKINICON_OTHER_USERONLINE, false);

 				cle.pszService = "UserOnline/Description";

-				mir_sntprintf(tooltip, SIZEOF(tooltip), TranslateT("%s is online"), pcli->pfnGetContactDisplayName((MCONTACT)wParam, 0));

+				mir_sntprintf(tooltip, SIZEOF(tooltip), TranslateT("%s is online"), pcli->pfnGetContactDisplayName(wParam, 0));

 				cle.ptszTooltip = tooltip;

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

 				IcoLib_ReleaseIcon(cle.hIcon, 0);