fix for 64-bit issues & warnings

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

5 files changed, 11 insertions, 11 deletions

diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index bb57d1b3ee..67dec9e9cd 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -283,7 +283,7 @@ MCONTACT CVkProto::FindChat(LONG dwUserid)
 bool CVkProto::CheckMid(LIST<void> &lList, int guid)

 {

 	for (int i = lList.getCount() - 1; i >= 0; i--)

-		if ((int)lList[i] == guid) {

+		if ((INT_PTR)lList[i] == guid) {

 			lList.remove(i);

 			return true;

 		}

@@ -549,7 +549,7 @@ void CVkProto::ApplyCookies(AsyncHttpRequest *pReq)
 

 void __cdecl CVkProto::DBAddAuthRequestThread(void *p)

 {

-	MCONTACT hContact = (MCONTACT)p;

+	MCONTACT hContact = (UINT_PTR)p;

 	if (hContact == NULL || hContact == INVALID_CONTACT_ID || !IsOnline())

 		return;

 

@@ -696,7 +696,7 @@ void CVkProto::SetMirVer(MCONTACT hContact, int platform)
 void CVkProto::ContactTypingThread(void *p)

 {

 	debugLogA("CVkProto::ContactTypingThread");

-	MCONTACT hContact = (MCONTACT)p;

+	MCONTACT hContact = (UINT_PTR)p;

 	CallService(MS_PROTO_CONTACTISTYPING, hContact, 5);

 	Sleep(5500);

 	CallService(MS_PROTO_CONTACTISTYPING, hContact);

diff --git a/protocols/VKontakte/src/vk_avatars.cpp b/protocols/VKontakte/src/vk_avatars.cpp
index d11bfa8258..9ce6447f36 100644
--- a/protocols/VKontakte/src/vk_avatars.cpp
+++ b/protocols/VKontakte/src/vk_avatars.cpp
@@ -23,19 +23,19 @@ void CVkProto::OnReceiveAvatar(NETLIBHTTPREQUEST *reply, AsyncHttpRequest* pReq)
 		return;

 

 	PROTO_AVATAR_INFORMATION ai = { 0 };

-	GetAvatarFileName((MCONTACT)pReq->pUserInfo, ai.filename, _countof(ai.filename));

+	GetAvatarFileName((UINT_PTR)pReq->pUserInfo, ai.filename, _countof(ai.filename));

 	ai.format = ProtoGetBufferFormat(reply->pData);

 

 	FILE *out = _tfopen(ai.filename, _T("wb"));

 	if (out == NULL) {

-		ProtoBroadcastAck((MCONTACT)pReq->pUserInfo, ACKTYPE_AVATAR, ACKRESULT_FAILED, &ai);

+		ProtoBroadcastAck((UINT_PTR)pReq->pUserInfo, ACKTYPE_AVATAR, ACKRESULT_FAILED, &ai);

 		return;

 	}

 

 	fwrite(reply->pData, 1, reply->dataLength, out);

 	fclose(out);

-	setByte((MCONTACT)pReq->pUserInfo, "NeedNewAvatar", 0);

-	ProtoBroadcastAck((MCONTACT)pReq->pUserInfo, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai);

+	setByte((UINT_PTR)pReq->pUserInfo, "NeedNewAvatar", 0);

+	ProtoBroadcastAck((UINT_PTR)pReq->pUserInfo, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai);

 }

 

 INT_PTR CVkProto::SvcGetAvatarCaps(WPARAM wParam, LPARAM lParam)

diff --git a/protocols/VKontakte/src/vk_captcha.cpp b/protocols/VKontakte/src/vk_captcha.cpp
index 8b98806e67..4067a4e392 100644
--- a/protocols/VKontakte/src/vk_captcha.cpp
+++ b/protocols/VKontakte/src/vk_captcha.cpp
@@ -48,7 +48,7 @@ static INT_PTR CALLBACK CaptchaFormDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 		case IDC_WHITERECT:

 		case IDC_INSTRUCTION:

 		case IDC_TITLE:

-			return (BOOL)GetStockObject(WHITE_BRUSH);

+			return (INT_PTR)GetStockObject(WHITE_BRUSH);

 		}

 		return NULL;

 

diff --git a/protocols/VKontakte/src/vk_files.cpp b/protocols/VKontakte/src/vk_files.cpp
index 0f1cf72577..a64c8680df 100644
--- a/protocols/VKontakte/src/vk_files.cpp
+++ b/protocols/VKontakte/src/vk_files.cpp
@@ -372,7 +372,7 @@ void CVkProto::OnReciveUploadFile(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pR
 		<< TCHAR_PARAM("attachment", Attachment)

 		<< VER_API;

 	pMsgReq->AddHeader("Content-Type", "application/x-www-form-urlencoded");

-	pMsgReq->pUserInfo = new CVkSendMsgParam(fup->hContact, -1, (int)pReq->pUserInfo);

+	pMsgReq->pUserInfo = new CVkSendMsgParam(fup->hContact, -1, (INT_PTR)pReq->pUserInfo);

 	

 	Push(pMsgReq);

 }
\ No newline at end of file
diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp
index e490908188..672ec3c9e3 100644
--- a/protocols/VKontakte/src/vk_thread.cpp
+++ b/protocols/VKontakte/src/vk_thread.cpp
@@ -453,7 +453,7 @@ void CVkProto::OnReceiveUserInfo(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe
 	

 	if (jnResponse["freeoffline"].as_bool())

 		for (int i = 0; i < arContacts.getCount(); i++) {

-			hContact = (MCONTACT)arContacts[i];

+			hContact = (UINT_PTR)arContacts[i];

 			LONG userID = getDword(hContact, "ID", -1);

 			if (userID == m_myUserId || userID == VK_FEED_USER)

 				continue;

@@ -544,7 +544,7 @@ void CVkProto::OnReceiveFriends(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq
 

 	if (bCleanContacts)

 		for (int i = 0; i < arContacts.getCount(); i++) {

-			MCONTACT hContact = (MCONTACT)arContacts[i];

+			MCONTACT hContact = (UINT_PTR)arContacts[i];

 			LONG userID = getDword(hContact, "ID", -1);

 			if (userID == m_myUserId || userID == VK_FEED_USER)

 				continue;