From 16585b5ae2a03ce326fdd45610199eb2061bdb7a Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Tue, 31 Mar 2009 05:21:52 +0000
Subject: x64 port

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@449 4f64403b-2f21-0410-a795-97e2b3489a10
---
 metacontacts/meta_services.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'metacontacts/meta_services.c')

diff --git a/metacontacts/meta_services.c b/metacontacts/meta_services.c
index 3676803..c008021 100644
--- a/metacontacts/meta_services.c
+++ b/metacontacts/meta_services.c
@@ -110,13 +110,13 @@ INT_PTR Meta_GetCaps(WPARAM wParam,LPARAM lParam)
 						| PF2_HEAVYDND | PF2_FREECHAT | PF2_OUTTOLUNCH | PF2_ONTHEPHONE;
             break;
         case PFLAG_UNIQUEIDTEXT:
-            ret = (int) Translate("Meta ID");
+            ret = (INT_PTR) Translate("Meta ID");
             break;
         case PFLAG_MAXLENOFMESSAGE:
             ret = 2000;
             break;
         case PFLAG_UNIQUEIDSETTING:
-            ret = (int) META_ID;
+            ret = (INT_PTR) META_ID;
             break;
     }
     return ret;
@@ -288,7 +288,7 @@ INT_PTR MetaFilter_SendMessage(WPARAM wParam,LPARAM lParam)
 		dbei.eventType = EVENTTYPE_MESSAGE;
 		if(ccs->wParam & PREF_RTL) dbei.flags |= DBEF_RTL;
 		if(ccs->wParam & PREF_UTF) dbei.flags |= DBEF_UTF;
-		dbei.cbBlob = strlen((char *)ccs->lParam) + 1;
+		dbei.cbBlob = (DWORD)strlen((char *)ccs->lParam) + 1;
 		if ( ccs->wParam & PREF_UNICODE )
 			dbei.cbBlob *= ( sizeof( wchar_t )+1 );
 		dbei.pBlob = (PBYTE)ccs->lParam;
@@ -393,7 +393,7 @@ INT_PTR Meta_SendMessage(WPARAM wParam,LPARAM lParam)
 			dbei.eventType = EVENTTYPE_MESSAGE;
 			if(ccs->wParam & PREF_RTL) dbei.flags |= DBEF_RTL;
 			if(ccs->wParam & PREF_UTF) dbei.flags |= DBEF_UTF;
-			dbei.cbBlob = strlen((char *)ccs->lParam) + 1;
+			dbei.cbBlob = (DWORD)strlen((char *)ccs->lParam) + 1;
 			if ( ccs->wParam & PREF_UNICODE )
 				dbei.cbBlob *= ( sizeof( wchar_t )+1 );
 			dbei.pBlob = (PBYTE)ccs->lParam;
@@ -404,7 +404,7 @@ INT_PTR Meta_SendMessage(WPARAM wParam,LPARAM lParam)
 		// prevent send filter from adding another copy of this send event to the db
 		ccs->wParam |= PREF_METANODB;
 
-		return (int)(HANDLE)CallContactService(ccs->hContact, szServiceName, ccs->wParam, ccs->lParam);
+		return CallContactService(ccs->hContact, szServiceName, ccs->wParam, ccs->lParam);
 	}
 }
 
@@ -501,7 +501,7 @@ INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
 				if(pre->flags & PREF_RTL) dbei.flags |= DBEF_RTL;
 				if(pre->flags & PREF_UTF) dbei.flags |= DBEF_UTF;
 				dbei.eventType = EVENTTYPE_MESSAGE;
-				dbei.cbBlob = strlen(pre->szMessage) + 1;
+				dbei.cbBlob = (DWORD)strlen(pre->szMessage) + 1;
 				if ( pre->flags & PREF_UNICODE ) {
 					dbei.cbBlob *= ( sizeof( wchar_t )+1 );
 				}
@@ -595,7 +595,7 @@ INT_PTR Meta_RecvMessage(WPARAM wParam, LPARAM lParam)
 	if(pre->flags & PREF_RTL) dbei.flags |= DBEF_RTL;
 	if(pre->flags & PREF_UTF) dbei.flags |= DBEF_UTF;
     dbei.eventType = EVENTTYPE_MESSAGE;
-	dbei.cbBlob = strlen(pre->szMessage) + 1;
+	dbei.cbBlob = (DWORD)strlen(pre->szMessage) + 1;
 	if ( pre->flags & PREF_UNICODE )
 		dbei.cbBlob *= ( sizeof( wchar_t )+1 );
     dbei.pBlob = (PBYTE) pre->szMessage;
@@ -1264,7 +1264,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)
 
 		update.szComponentName = pluginInfo.shortName;
 		update.pbVersion = (BYTE *)CreateVersionString(pluginInfo.version, szVersion);
-		update.cpbVersion = strlen((char *)update.pbVersion);
+		update.cpbVersion = (int)strlen((char *)update.pbVersion);
 		update.szBetaChangelogURL = "https://server.scottellis.com.au/wsvn/mim_plugs/metacontacts/?op=log&rev=0&sc=0&isdir=1";
 
 		update.szUpdateURL = UPDATER_AUTOREGISTER;
@@ -1277,7 +1277,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)
 		update.szBetaVersionURL = "http://www.scottellis.com.au/miranda_plugins/ver_MetaContacts.html";
 		update.pbBetaVersionPrefix = (BYTE *)"MetaContacts Plugin, version ";
 		
-		update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);
+		update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix);
 
 		CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
 	}
@@ -1424,7 +1424,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-static DWORD CALLBACK sttMenuThread( LPVOID param )
+static DWORD CALLBACK sttMenuThread( DWORD_PTR param )
 {
 	HMENU hMenu;
 	TPMPARAMS tpmp;
@@ -1477,7 +1477,7 @@ INT_PTR Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam) {
 
 	} else if(options.menu_function == FT_MENU) {
 		// show contact's context menu
-		QueueUserAPC((PAPCFUNC)sttMenuThread, metaMainThread, (ULONG)hContact);
+		QueueUserAPC(sttMenuThread, metaMainThread, (ULONG_PTR)hContact);
 	} else if(options.menu_function == FT_INFO) {
 		// show user info for subcontact
 		CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)hContact, 0);
-- 
cgit v1.2.3