x64 port

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@445 4f64403b-2f21-0410-a795-97e2b3489a10

1 files changed, 24 insertions, 24 deletions

diff --git a/meta2/api.cpp b/meta2/api.cpp
index 6988215..4eae79c 100644
--- a/meta2/api.cpp
+++ b/meta2/api.cpp
@@ -13,33 +13,33 @@ void FireSubcontactsChanged(HANDLE hMeta) {
 //wParam=(HANDLE)hSubContact

 //lParam=0

 //returns a handle to the parent metacontact, or null if this contact is not a subcontact

-int MetaAPI_GetMeta(WPARAM wParam, LPARAM lParam) {

-	return (int)(HANDLE)DBGetContactSettingDword((HANDLE)wParam, MODULE, "Handle", 0);

+INT_PTR MetaAPI_GetMeta(WPARAM wParam, LPARAM lParam) {

+	return (INT_PTR)(HANDLE)DBGetContactSettingDword((HANDLE)wParam, MODULE, "Handle", 0);

 }

 

 //gets the handle for the default contact

 //wParam=(HANDLE)hMetaContact

 //lParam=0

 //returns a handle to the default contact, or null on failure

-int MetaAPI_GetDefault(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_GetDefault(WPARAM wParam, LPARAM lParam) {

 	HANDLE hMeta = (HANDLE)wParam;

 	if(metaMap.exists(hMeta) == false || metaMap[hMeta].size() == 0) return 0;

 	

 	int def = DBGetContactSettingByte(hMeta, MODULE, "Default", -1);

 	if(def < 0 || def >= metaMap[hMeta].size()) return 0;

 

-	return (int)metaMap[hMeta][def].handle();

+	return (INT_PTR)metaMap[hMeta][def].handle();

 }

 

 //gets the contact number for the default contact

 //wParam=(HANDLE)hMetaContact

 //lParam=0

 //returns an int contact number, or -1 on failure

-int MetaAPI_GetDefaultNum(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_GetDefaultNum(WPARAM wParam, LPARAM lParam) {

 	HANDLE hMeta = (HANDLE)wParam;

 	if(metaMap.exists(hMeta) == false || metaMap[hMeta].size() == 0) return -1;

 

-	int def = DBGetContactSettingByte(hMeta, MODULE, "Default", -1);

+	INT_PTR def = DBGetContactSettingByte(hMeta, MODULE, "Default", -1);

 	if(def < 0 || def >= metaMap[hMeta].size()) return -1;

 	return def;

 }

@@ -48,8 +48,8 @@ int MetaAPI_GetDefaultNum(WPARAM wParam, LPARAM lParam) {
 //wParam=(HANDLE)hMetaContact

 //lParam=0

 //returns a handle to the 'most online' contact

-int MetaAPI_GetMostOnline(WPARAM wParam, LPARAM lParam) {

-	return (int)Meta_GetMostOnline((HANDLE)wParam);

+INT_PTR MetaAPI_GetMostOnline(WPARAM wParam, LPARAM lParam) {

+	return (INT_PTR)Meta_GetMostOnline((HANDLE)wParam);

 }

 

 //gets the handle for the 'active' messaging contact (the one new messages will be sent to,

@@ -58,15 +58,15 @@ int MetaAPI_GetMostOnline(WPARAM wParam, LPARAM lParam) {
 //lParam=0

 //returns a handle to the 'most online' contact

 //added with meta2 (2007/10/4)

-int MetaAPI_GetActiveContact(WPARAM wParam, LPARAM lParam) {

-	return (int)Meta_GetActive((HANDLE)wParam);

+INT_PTR MetaAPI_GetActiveContact(WPARAM wParam, LPARAM lParam) {

+	return (INT_PTR)Meta_GetActive((HANDLE)wParam);

 }

 

 //gets the number of subcontacts for a metacontact

 //wParam=(HANDLE)hMetaContact

 //lParam=0

 //returns an int representing the number of subcontacts for the given metacontact, or -1 on failure

-int MetaAPI_GetNumContacts(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_GetNumContacts(WPARAM wParam, LPARAM lParam) {

 	HANDLE hMeta = (HANDLE)wParam;

 	if(metaMap.exists(hMeta)) return metaMap[hMeta].size();

 	return -1;

@@ -76,7 +76,7 @@ int MetaAPI_GetNumContacts(WPARAM wParam, LPARAM lParam) {
 //wParam=(HANDLE)hMetaContact

 //lParam=(int)contact number

 //returns a handle to the specified subcontact

-int MetaAPI_GetContact(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_GetContact(WPARAM wParam, LPARAM lParam) {

 	HANDLE hMeta = (HANDLE)wParam;

 	if(metaMap.exists(hMeta) && lParam >= 0 && metaMap[hMeta].size() > lParam) return (int)metaMap[hMeta][lParam].handle();

 	return 0;

@@ -86,7 +86,7 @@ int MetaAPI_GetContact(WPARAM wParam, LPARAM lParam) {
 //wParam=(HANDLE)hMetaContact

 //lParam=(int)contact number

 //returns 0 on success

-int MetaAPI_SetDefaultContactNum(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_SetDefaultContactNum(WPARAM wParam, LPARAM lParam) {

 	HANDLE hMeta = (HANDLE)wParam;

 	DWORD num_contacts = metaMap.exists(hMeta) ? metaMap[hMeta].size() : -1;

 	if(num_contacts < 0)

@@ -106,7 +106,7 @@ int MetaAPI_SetDefaultContactNum(WPARAM wParam, LPARAM lParam) {
 //wParam=(HANDLE)hMetaContact

 //lParam=(HANDLE)hSubcontact

 //returns 0 on success

-int MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam) {

 	HANDLE hMeta = (HANDLE)wParam, hSub = (HANDLE)lParam;

 	HANDLE hMetaFromSub = (HANDLE)DBGetContactSettingDword(hSub, MODULE, "Handle", 0);

 	if(hMetaFromSub != hMeta || metaMap.exists(hMeta) == false) 

@@ -128,7 +128,7 @@ int MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam) {
 //wParam=(HANDLE)hMetaContact

 //lParam=(int)contact number

 //returns 0 on success

-int MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam) {

 	HANDLE hMeta = (HANDLE)wParam;

 	int contact_num = (int)lParam;

 	if(!hMeta || metaMap.exists(hMeta) == false || contact_num < 0 || contact_num >= metaMap[hMeta].size() || DBGetContactSettingByte(hMeta, MODULE, "ForceDefault", 0)) 

@@ -149,7 +149,7 @@ int MetaAPI_ForceSendContactNum(WPARAM wParam, LPARAM lParam) {
 //wParam=(HANDLE)hMetaContact

 //lParam=(HANDLE)hSubcontact

 //returns 0 on success (will fail if 'force default' is in effect)

-int MetaAPI_ForceSendContact(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_ForceSendContact(WPARAM wParam, LPARAM lParam) {

 	HANDLE hMeta = (HANDLE)wParam, hSub = (HANDLE)lParam;

 	HANDLE hMetaFromSub = (HANDLE)DBGetContactSettingDword(hSub, MODULE, "Handle", 0);

 	if(!hSub || !hMeta || hMetaFromSub != hMeta || !metaMap.exists(hMeta) || metaMap[hMeta].index_of(hSub) == -1 || DBGetContactSettingByte(hMeta, MODULE, "ForceDefault", 0)) 

@@ -165,7 +165,7 @@ int MetaAPI_ForceSendContact(WPARAM wParam, LPARAM lParam) {
 //wParam=(HANDLE)hMetaContact

 //lParam=0

 //returns 0 on success (will fail if 'force default' is in effect)

-int MetaAPI_UnforceSendContact(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_UnforceSendContact(WPARAM wParam, LPARAM lParam) {

 	if(DBGetContactSettingByte((HANDLE)wParam, MODULE, "ForceDefault", 0) == 0)

 		return 1;

 

@@ -182,7 +182,7 @@ int MetaAPI_UnforceSendContact(WPARAM wParam, LPARAM lParam) {
 //wParam=(HANDLE)hMetaContact

 //lParam=0

 //returns 1(true) or 0(false) representing new state of 'force default'

-int MetaAPI_ForceDefault(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_ForceDefault(WPARAM wParam, LPARAM lParam) {

 	int old_state = DBGetContactSettingByte((HANDLE)wParam, MODULE, "ForceDefault", 0);

 	DBWriteContactSettingByte((HANDLE)wParam, MODULE, "ForceDefault", old_state ? 0 : 1);

 	return old_state ? 0 : 1;

@@ -194,7 +194,7 @@ int MetaAPI_ForceDefault(WPARAM wParam, LPARAM lParam) {
 // if lparam supplied, the contact_number of the contatct 'in force' will be copied to the address it points to,

 // or if none is in force, the value (DWORD)-1 will be copied

 // (v0.8.0.8+ returns 1 if 'force default' is true with *lParam == default contact number, else returns 0 with *lParam as above)

-int MetaAPI_GetForceState(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_GetForceState(WPARAM wParam, LPARAM lParam) {

 	HANDLE hMeta = (HANDLE)wParam;

 	HANDLE hContact;

 	

@@ -218,7 +218,7 @@ int MetaAPI_GetForceState(WPARAM wParam, LPARAM lParam) {
 

 // method to get protocol name - used to be sure you're dealing with a "real" metacontacts plugin :)

 // wParam=lParam=0

-int MetaAPI_GetProtoName(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_GetProtoName(WPARAM wParam, LPARAM lParam) {

 	return (int)MODULE;

 }

 

@@ -226,7 +226,7 @@ int MetaAPI_GetProtoName(WPARAM wParam, LPARAM lParam) {
 // wParam=(HANDLE)hContact

 // lParam=0

 // convert a given contact into a metacontact

-int MetaAPI_ConvertToMeta(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_ConvertToMeta(WPARAM wParam, LPARAM lParam) {

 	return (int)Meta_Convert((HANDLE)wParam);

 }

 

@@ -234,7 +234,7 @@ int MetaAPI_ConvertToMeta(WPARAM wParam, LPARAM lParam) {
 // wParam=(HANDLE)hContact

 // lParam=(HANDLE)hMeta

 // add an existing contact to a metacontact

-int MetaAPI_AddToMeta(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_AddToMeta(WPARAM wParam, LPARAM lParam) {

 	Meta_Assign((HANDLE)wParam, (HANDLE)lParam);

 	return 0;

 }

@@ -243,7 +243,7 @@ int MetaAPI_AddToMeta(WPARAM wParam, LPARAM lParam) {
 // wParam=0

 // lParam=(HANDLE)hContact

 // remove a contact from a metacontact

-int MetaAPI_RemoveFromMeta(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_RemoveFromMeta(WPARAM wParam, LPARAM lParam) {

 	Meta_Remove((HANDLE)lParam);

 	return 0;

 }

@@ -254,7 +254,7 @@ int MetaAPI_RemoveFromMeta(WPARAM wParam, LPARAM lParam) {
 // enable/disable the 'hidden group hack' - for clists that support subcontact hiding using 'IsSubcontact' setting

 // should be called once in your 'onmodulesloaded' event handler

 bool meta_group_hack_disabled = false;	

-int MetaAPI_DisableHiddenGroup(WPARAM wParam, LPARAM lParam) {

+INT_PTR MetaAPI_DisableHiddenGroup(WPARAM wParam, LPARAM lParam) {

 	meta_group_hack_disabled = (BOOL)wParam;

 	return 0;

 }