HCONTACT, part 3

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

3 files changed, 17 insertions, 17 deletions

diff --git a/protocols/Yahoo/src/im.cpp b/protocols/Yahoo/src/im.cpp
index 224c65677b..fc295a4a42 100644
--- a/protocols/Yahoo/src/im.cpp
+++ b/protocols/Yahoo/src/im.cpp
@@ -174,7 +174,7 @@ void __cdecl CYahooProto::im_sendackfail_longmsg(void *hContact)
 int __cdecl CYahooProto::SendMsg(HCONTACT hContact, int flags, const char* pszSrc)

 {

 	if (!m_bLoggedIn) {/* don't send message if we not connected! */

-		ForkThread(&CYahooProto::im_sendackfail, hContact);

+		ForkThread(&CYahooProto::im_sendackfail, (void*)hContact);

 		return 1;

 	}

 

@@ -187,7 +187,7 @@ int __cdecl CYahooProto::SendMsg(HCONTACT hContact, int flags, const char* pszSr
 		msg = mir_utf8encode(pszSrc);

 

 	if (lstrlenA(msg) > 800) {

-		ForkThread(&CYahooProto::im_sendackfail_longmsg, hContact);

+		ForkThread(&CYahooProto::im_sendackfail_longmsg, (void*)hContact);

 		return 1;

 	}

 

@@ -195,7 +195,7 @@ int __cdecl CYahooProto::SendMsg(HCONTACT hContact, int flags, const char* pszSr
 	if (!getString(hContact, YAHOO_LOGINID, &dbv)) {

 		send_msg(dbv.pszVal, getWord(hContact, "yprotoid", 0), msg, 1);

 

-		ForkThread(&CYahooProto::im_sendacksuccess, hContact);

+		ForkThread(&CYahooProto::im_sendacksuccess, (void*)hContact);

 

 		db_free(&dbv);

 		return 1;

@@ -232,7 +232,7 @@ INT_PTR __cdecl CYahooProto::SendNudge(WPARAM wParam, LPARAM lParam)
 	debugLogA("[YAHOO_SENDNUDGE]");

 

 	if (!m_bLoggedIn) {/* don't send nudge if we not connected! */

-		ForkThread(&CYahooProto::im_sendackfail, hContact);

+		ForkThread(&CYahooProto::im_sendackfail, (void*)hContact);

 		return 1;

 	}

 

@@ -241,7 +241,7 @@ INT_PTR __cdecl CYahooProto::SendNudge(WPARAM wParam, LPARAM lParam)
 		send_msg(dbv.pszVal, getWord(hContact, "yprotoid", 0), "<ding>", 0);

 		db_free(&dbv);

 

-		ForkThread(&CYahooProto::im_sendacksuccess, hContact);

+		ForkThread(&CYahooProto::im_sendacksuccess, (void*)hContact);

 		return 1;

 	}

 

diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index b97c79b396..b607385fa0 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -339,7 +339,7 @@ void __cdecl CYahooProto::get_info_thread(void *hContact)
 

 int __cdecl CYahooProto::GetInfo(HCONTACT hContact, int /*infoType*/ )

 {

-	ForkThread(&CYahooProto::get_info_thread, hContact);

+	ForkThread(&CYahooProto::get_info_thread, (void*)hContact);

 	return 0;

 }

 

@@ -591,7 +591,7 @@ HANDLE __cdecl CYahooProto::GetAwayMsg(HCONTACT hContact)
 		if (getWord(hContact, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE)

 			return 0; /* user offline, what Status message? */

 

-		ForkThread(&CYahooProto::get_status_thread, hContact);

+		ForkThread(&CYahooProto::get_status_thread, (void*)hContact);

 		return (HANDLE)1; //Success

 	}

 

diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index 9c5edf2f63..ef7fcfb7c0 100644
--- a/protocols/Yahoo/src/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
@@ -831,36 +831,36 @@ void CYahooProto::ext_contact_added(const char *myid, const char *who, const cha
 	if (msg != NULL)

 		pre.lParam += lstrlenA(msg);

 

-	pCurBlob=(PBYTE)malloc(pre.lParam);

+	pCurBlob = (PBYTE)malloc(pre.lParam);

 	pre.szMessage = (char *)pCurBlob;

 

 	// UIN

-	*( PDWORD )pCurBlob = 0;

-	pCurBlob+=sizeof(DWORD);

+	*(PDWORD)pCurBlob = 0;

+	pCurBlob += sizeof(DWORD);

 

 	// hContact

-	*( PHANDLE )pCurBlob = hContact; 

-	pCurBlob+=sizeof(HANDLE);

+	*(PDWORD)pCurBlob = (DWORD)hContact; 

+	pCurBlob += sizeof(DWORD);

 

 	// NICK

-	lstrcpyA((char *)pCurBlob, nick); 

+	lstrcpyA((char*)pCurBlob, nick); 

 

 	pCurBlob+=lstrlenA((char *)pCurBlob)+1;

 

 	// FIRST

-	lstrcpyA((char *)pCurBlob, (fname != NULL) ? fname : ""); 

+	lstrcpyA((char*)pCurBlob, (fname != NULL) ? fname : ""); 

 	pCurBlob+=lstrlenA((char *)pCurBlob)+1;

 

 	// LAST

-	lstrcpyA((char *)pCurBlob, (lname != NULL) ? lname : ""); 

+	lstrcpyA((char*)pCurBlob, (lname != NULL) ? lname : ""); 

 	pCurBlob+=lstrlenA((char *)pCurBlob)+1;

 

 	// E-mail    

-	lstrcpyA((char *)pCurBlob,who); 

+	lstrcpyA((char*)pCurBlob,who); 

 	pCurBlob+=lstrlenA((char *)pCurBlob)+1;

 

 	// Reason

-	lstrcpyA((char *)pCurBlob, (msg != NULL) ? msg : "");

+	lstrcpyA((char*)pCurBlob, (msg != NULL) ? msg : "");

 

 	ProtoChainRecv(hContact, PSR_AUTH, 0, (LPARAM)&pre);

 }