these conversions aren't needed either

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

2 files changed, 15 insertions, 15 deletions

diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index f36fccd9e2..723af931a5 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
@@ -33,7 +33,7 @@ HANDLE hNetMeeting, hBlockCom, hSendHotMail, hInviteChat, hViewProfile;
 INT_PTR CMsnProto::MsnBlockCommand(WPARAM wParam, LPARAM)

 {

 	if (msnLoggedIn) {

-		MCONTACT hContact = (MCONTACT)wParam;

+		MCONTACT hContact = wParam;

 

 		char tEmail[MSN_MAX_EMAIL_LEN];

 		db_get_static(hContact, m_szModuleName, "e-mail", tEmail, sizeof(tEmail));

@@ -60,7 +60,7 @@ INT_PTR CMsnProto::MsnGotoInbox(WPARAM, LPARAM)
 

 INT_PTR CMsnProto::MsnSendHotmail(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	char szEmail[MSN_MAX_EMAIL_LEN];

 

 	if (MSN_IsMeByContact(hContact, szEmail))

@@ -85,7 +85,7 @@ INT_PTR CMsnProto::MsnSetupAlerts(WPARAM, LPARAM)
 

 INT_PTR CMsnProto::MsnViewProfile(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	char buf[64], *cid;

 

 	if (hContact == NULL)

@@ -127,7 +127,7 @@ INT_PTR CMsnProto::MsnInviteCommand(WPARAM, LPARAM)
 

 int CMsnProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	char szEmail[MSN_MAX_EMAIL_LEN];

 

 	if ( !MSN_IsMyContact(hContact))

@@ -157,7 +157,7 @@ int CMsnProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)
 

 int CMsnProto::OnContactDoubleClicked(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 

 	if (emailEnabled && MSN_IsMeByContact(hContact)) {

 		MsnSendHotmail(wParam, 0);

@@ -374,31 +374,31 @@ static CMsnProto* GetProtoInstanceByHContact(MCONTACT hContact)
 

 static INT_PTR MsnMenuBlockCommand(WPARAM wParam, LPARAM lParam)

 {

-	CMsnProto* ppro = GetProtoInstanceByHContact((MCONTACT)wParam);

+	CMsnProto* ppro = GetProtoInstanceByHContact(wParam);

 	return (ppro) ? ppro->MsnBlockCommand(wParam, lParam) : 0;

 }

 

 static INT_PTR MsnMenuViewProfile(WPARAM wParam, LPARAM lParam)

 {

-	CMsnProto* ppro = GetProtoInstanceByHContact((MCONTACT)wParam);

+	CMsnProto* ppro = GetProtoInstanceByHContact(wParam);

 	return (ppro) ? ppro->MsnViewProfile(wParam, lParam) : 0;

 }

 

 static INT_PTR MsnMenuSendNetMeeting(WPARAM wParam, LPARAM lParam)

 {

-	CMsnProto* ppro = GetProtoInstanceByHContact((MCONTACT)wParam);

+	CMsnProto* ppro = GetProtoInstanceByHContact(wParam);

 	return (ppro) ? ppro->MsnSendNetMeeting(wParam, lParam) : 0;

 }

 

 static INT_PTR MsnMenuSendHotmail(WPARAM wParam, LPARAM lParam)

 {

-	CMsnProto* ppro = GetProtoInstanceByHContact((MCONTACT)wParam);

+	CMsnProto* ppro = GetProtoInstanceByHContact(wParam);

 	return (ppro) ? ppro->MsnSendHotmail(wParam, lParam) : 0;

 }

 

 static int MSN_OnPrebuildContactMenu(WPARAM wParam, LPARAM lParam)

 {

-	CMsnProto* ppro = GetProtoInstanceByHContact((MCONTACT)wParam);

+	CMsnProto* ppro = GetProtoInstanceByHContact(wParam);

 	if (ppro)

 		ppro->OnPrebuildContactMenu(wParam, lParam);

 	else {

diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp
index f19cbc0dec..ec1c2f97b8 100644
--- a/protocols/MSN/src/msn_svcs.cpp
+++ b/protocols/MSN/src/msn_svcs.cpp
@@ -246,7 +246,7 @@ INT_PTR CMsnProto::SendNudge(WPARAM wParam, LPARAM lParam)
 {

 	if (!msnLoggedIn) return 0;

 

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 

 	char tEmail[MSN_MAX_EMAIL_LEN];

 	if (MSN_IsMeByContact(hContact, tEmail)) return 0;

@@ -380,7 +380,7 @@ INT_PTR CMsnProto::SetCurrentMedia(WPARAM wParam, LPARAM lParam)
 

 int CMsnProto::OnContactDeleted(WPARAM wParam, LPARAM lParam)

 {

-	const MCONTACT hContact = (MCONTACT)wParam;

+	const MCONTACT hContact = wParam;

 

 	if (!msnLoggedIn)  //should never happen for MSN contacts

 		return 0;

@@ -424,7 +424,7 @@ int CMsnProto::OnGroupChange(WPARAM wParam,LPARAM lParam)
 {

 	if (!msnLoggedIn || !MyOptions.ManageServer) return 0;

 

-	const MCONTACT hContact = (MCONTACT)wParam;

+	const MCONTACT hContact = wParam;

 	const CLISTGROUPCHANGE* grpchg = (CLISTGROUPCHANGE*)lParam;

 

 	if (hContact == NULL)

@@ -458,7 +458,7 @@ int CMsnProto::OnGroupChange(WPARAM wParam,LPARAM lParam)
 

 int CMsnProto::OnDbSettingChanged(WPARAM wParam,LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	DBCONTACTWRITESETTING* cws = (DBCONTACTWRITESETTING*)lParam;

 

 	if (!msnLoggedIn)

@@ -619,7 +619,7 @@ INT_PTR CMsnProto::GetUnreadEmailCount(WPARAM wParam, LPARAM lParam)
 

 INT_PTR CMsnProto::OnLeaveChat(WPARAM wParam,LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (isChatRoom(hContact) != 0) {

 		DBVARIANT dbv;

 		if (getTString(hContact, "ChatRoomID", &dbv) == 0) {