1 files changed, 7 insertions, 8 deletions

diff --git a/meta2/api.cpp b/meta2/api.cpp
index 4eae79c..b64b23f 100644
--- a/meta2/api.cpp
+++ b/meta2/api.cpp
@@ -26,7 +26,7 @@ INT_PTR MetaAPI_GetDefault(WPARAM wParam, LPARAM lParam) {
 	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;

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

 

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

 }

@@ -78,7 +78,7 @@ INT_PTR MetaAPI_GetNumContacts(WPARAM wParam, LPARAM lParam) {
 //returns a handle to the specified subcontact

 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();

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

 	return 0;

 }

 

@@ -130,8 +130,8 @@ INT_PTR MetaAPI_SetDefaultContact(WPARAM wParam, LPARAM lParam) {
 //returns 0 on success

 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)) 

+	unsigned contact_num = (unsigned)lParam;

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

 		return 1;

 	

 	HANDLE hSub = metaMap[hMeta][contact_num].handle();

@@ -219,7 +219,7 @@ INT_PTR 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_PTR MetaAPI_GetProtoName(WPARAM wParam, LPARAM lParam) {

-	return (int)MODULE;

+	return (INT_PTR)MODULE;

 }

 

 // added 0.9.5.0 (22/3/05)

@@ -227,7 +227,7 @@ INT_PTR MetaAPI_GetProtoName(WPARAM wParam, LPARAM lParam) {
 // lParam=0

 // convert a given contact into a metacontact

 INT_PTR MetaAPI_ConvertToMeta(WPARAM wParam, LPARAM lParam) {

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

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

 }

 

 // added 0.9.5.0 (22/3/05)

@@ -255,13 +255,12 @@ INT_PTR MetaAPI_RemoveFromMeta(WPARAM wParam, LPARAM lParam) {
 // should be called once in your 'onmodulesloaded' event handler

 bool meta_group_hack_disabled = false;	

 INT_PTR MetaAPI_DisableHiddenGroup(WPARAM wParam, LPARAM lParam) {

-	meta_group_hack_disabled = (BOOL)wParam;

+	meta_group_hack_disabled = wParam != 0;

 	return 0;

 }

 

 int ModulesLoadedAPI(WPARAM wParam, LPARAM lParam) {

 	HANDLE hContact = (HANDLE)CallService( MS_DB_CONTACT_FINDFIRST, 0, 0);

-	char *proto;

 	HANDLE hMeta;

 	while(hContact != NULL) {

 		DWORD id = DBGetContactSettingDword(hContact, MODULE, "ParentMetaID", (DWORD)-1);