From 33953cc6a0fab6a91af293c6838f8a46dd7922da Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 14:42:51 +0000 Subject: HCONTACT, part 3 git-svn-id: http://svn.miranda-ng.org/main/trunk@8081 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_commands.cpp | 2 +- protocols/MSN/src/msn_misc.cpp | 14 +++++++------- protocols/MSN/src/msn_proto.cpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'protocols/MSN/src') diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp index 9cdce62c55..56dc3e9807 100644 --- a/protocols/MSN/src/msn_commands.cpp +++ b/protocols/MSN/src/msn_commands.cpp @@ -496,7 +496,7 @@ void CMsnProto::MSN_ReceiveMessage(ThreadData* info, char* cmdString, char* para } else if (!_strnicmp(tContentType, "text/x-msnmsgr-datacast", 23)) { if (info->mJoinedContactsWLID.getCount()) { - HANDLE tContact; + HCONTACT tContact; if (info->mChatID[0]) { GC_INFO gci = { 0 }; diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp index 4e2a8bfb0e..704adaf6f4 100644 --- a/protocols/MSN/src/msn_misc.cpp +++ b/protocols/MSN/src/msn_misc.cpp @@ -106,13 +106,13 @@ void CMsnProto::MSN_AddAuthRequest(const char *email, const char *nick, const ch char* pCurBlob = (char*)alloca(pre.lParam); pre.szMessage = pCurBlob; - *(PDWORD)pCurBlob = 0; pCurBlob += sizeof(DWORD); // UID - *(PHANDLE)pCurBlob = hContact; pCurBlob += sizeof(HANDLE); // Contact Handle - strcpy(pCurBlob, nick); pCurBlob += nicklen + 1; // Nickname - *pCurBlob = '\0'; pCurBlob++; // First Name - *pCurBlob = '\0'; pCurBlob++; // Last Name - strcpy(pCurBlob, email); pCurBlob += emaillen + 1; // E-mail - strcpy(pCurBlob, reason); // Reason + *(PDWORD)pCurBlob = 0; pCurBlob += sizeof(DWORD); // UID + *(PDWORD)pCurBlob = (DWORD)hContact; pCurBlob += sizeof(DWORD); // Contact Handle + strcpy(pCurBlob, nick); pCurBlob += nicklen + 1; // Nickname + *pCurBlob = '\0'; pCurBlob++; // First Name + *pCurBlob = '\0'; pCurBlob++; // Last Name + strcpy(pCurBlob, email); pCurBlob += emaillen + 1; // E-mail + strcpy(pCurBlob, reason); // Reason ProtoChainRecv(hContact, PSR_AUTH, 0, (LPARAM)&pre); } diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index 8ce3a13620..7f4ad25621 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -846,7 +846,7 @@ void CMsnProto::MsnFakeAck(void* arg) Sleep(150); tParam->proto->ProtoBroadcastAck(tParam->hContact, ACKTYPE_MESSAGE, tParam->msg ? ACKRESULT_FAILED : ACKRESULT_SUCCESS, - (HCONTACT)tParam->id, LPARAM(tParam->msg)); + (HANDLE)tParam->id, LPARAM(tParam->msg)); delete tParam; } -- cgit v1.2.3