1 files changed, 19 insertions, 19 deletions

diff --git a/meta2/proto.cpp b/meta2/proto.cpp
index a6f81f7..f008683 100644
--- a/meta2/proto.cpp
+++ b/meta2/proto.cpp
@@ -7,7 +7,7 @@
 

 bool firstSetOnline = true;

 DWORD status = ID_STATUS_OFFLINE;

-DWORD setStatusTimerId = 0;

+UINT_PTR setStatusTimerId = 0;

 

 DWORD next_meta_id = 1;

 

@@ -21,8 +21,8 @@ HANDLE NewMetaContact() {
 }

 

 

-int GetCaps(WPARAM wParam,LPARAM lParam) {

-	int ret = 0;

+INT_PTR GetCaps(WPARAM wParam,LPARAM lParam) {

+	INT_PTR ret = 0;

     switch (wParam) {

         case PFLAGNUM_1:

 			ret = PF1_NUMERICUSERID | PF1_IM | PF1_MODEMSGRECV | PF1_FILESEND;

@@ -43,19 +43,19 @@ int 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 = 2048;

             break;

         case PFLAG_UNIQUEIDSETTING:

-            ret = (int) META_ID;

+            ret = (INT_PTR) META_ID;

             break;

     }

     return ret;

 }

 

-int GetName(WPARAM wParam,LPARAM lParam) {

+INT_PTR GetName(WPARAM wParam,LPARAM lParam) {

 	char *name = (char *)Translate(MODULE);

 	size_t size = min(strlen(name),wParam-1);	// copy only the first size bytes.

 	if(strncpy((char *)lParam,name,size)==NULL)

@@ -64,7 +64,7 @@ int GetName(WPARAM wParam,LPARAM lParam) {
 	return 0;

 }

 

-int LoadIcon(WPARAM wParam,LPARAM lParam) {

+INT_PTR LoadIcon(WPARAM wParam,LPARAM lParam) {

 	

 	UINT id;

     switch (wParam & 0xFFFF)

@@ -88,7 +88,7 @@ int LoadIcon(WPARAM wParam,LPARAM lParam) {
 	return 0;

 }

 

-int ProtoGetInfo(WPARAM wParam,LPARAM lParam) {

+INT_PTR ProtoGetInfo(WPARAM wParam,LPARAM lParam) {

 	CCSDATA *ccs = ( CCSDATA* )lParam;

 

 	ccs->hContact = Meta_GetActive(ccs->hContact);

@@ -104,7 +104,7 @@ int ProtoGetInfo(WPARAM wParam,LPARAM lParam) {
 	return 1;

 }

 

-int ProtoGetAwayMsg(WPARAM wParam, LPARAM lParam) {

+INT_PTR ProtoGetAwayMsg(WPARAM wParam, LPARAM lParam) {

 	CCSDATA *ccs = ( CCSDATA* )lParam;

 

 	ccs->hContact = Meta_GetMostOnlineSupporting(ccs->hContact, PFLAGNUM_1, PF1_MODEMSGRECV);

@@ -129,7 +129,7 @@ void CALLBACK SetStatusProc(HWND hWnd, UINT msg, UINT_PTR id, DWORD dw)
 	KillTimer(0, setStatusTimerId);

 }

 

-int SetStatus(WPARAM wParam,LPARAM lParam)

+INT_PTR SetStatus(WPARAM wParam,LPARAM lParam)

 {

 	// firstSetOnline starts out true - used to delay metacontact's 'onlineness' to prevent double status notifications on startup

 	if(status == ID_STATUS_OFFLINE && firstSetOnline) {

@@ -145,11 +145,11 @@ int SetStatus(WPARAM wParam,LPARAM lParam)
 	return 0;

 }

 

-int GetStatus(WPARAM wParam,LPARAM lParam) {

+INT_PTR GetStatus(WPARAM wParam,LPARAM lParam) {

 	return status;

 }

 

-int ProtoSendMessage(WPARAM wParam, LPARAM lParam) {

+INT_PTR ProtoSendMessage(WPARAM wParam, LPARAM lParam) {

     CCSDATA *ccs = (CCSDATA *) lParam;

     char *message = (char *)ccs->lParam;

 	int flags = ccs->wParam;

@@ -183,7 +183,7 @@ int ProtoSendMessage(WPARAM wParam, LPARAM lParam) {
 		ccs->lParam = (LPARAM)buff;

 	}

 

-	int ret = (int)CallContactService(hSendTo, szServiceName, ccs->wParam, ccs->lParam);

+	INT_PTR ret = (INT_PTR)CallContactService(hSendTo, szServiceName, ccs->wParam, ccs->lParam);

 	if(buff) { // undo our utf8 conversion changes

 		ccs->lParam = (LPARAM)message;

 		delete[] buff;

@@ -191,7 +191,7 @@ int ProtoSendMessage(WPARAM wParam, LPARAM lParam) {
 	return ret;

 }

 

-int ProtoSendMessageW(WPARAM wParam, LPARAM lParam) {

+INT_PTR ProtoSendMessageW(WPARAM wParam, LPARAM lParam) {

     CCSDATA *ccs = (CCSDATA *) lParam;

 	if(!(ccs->wParam & PREF_UTF))

 		ccs->wParam |= PREF_UNICODE;

@@ -199,7 +199,7 @@ int ProtoSendMessageW(WPARAM wParam, LPARAM lParam) {
 	return ProtoSendMessage(wParam, lParam);

 }

 

-int ProtoRecvMessage(WPARAM wParam, LPARAM lParam) {

+INT_PTR ProtoRecvMessage(WPARAM wParam, LPARAM lParam) {

     CCSDATA *ccs = (CCSDATA *) lParam;

     PROTORECVEVENT *pre = (PROTORECVEVENT *) ccs->lParam;

 

@@ -257,7 +257,7 @@ int RedirectACKs(WPARAM wParam, LPARAM lParam)
 	return ProtoBroadcastAck(MODULE, hMeta, ack->type, ack->result, ack->hProcess, ack->lParam);

 }

 

-int ProtoGetAvatarInfo(WPARAM wParam, LPARAM lParam) {

+INT_PTR ProtoGetAvatarInfo(WPARAM wParam, LPARAM lParam) {

     PROTO_AVATAR_INFORMATION *AI = (PROTO_AVATAR_INFORMATION *) lParam;

 

 	HANDLE hMeta = AI->hContact;

@@ -276,7 +276,7 @@ int ProtoGetAvatarInfo(WPARAM wParam, LPARAM lParam) {
 	return GAIR_NOAVATAR; // fail

 }

 

-int ProtoFileSend(WPARAM wParam, LPARAM lParam) {

+INT_PTR ProtoFileSend(WPARAM wParam, LPARAM lParam) {

     CCSDATA *ccs = (CCSDATA *) lParam;

 	HANDLE hMeta = ccs->hContact;

 

@@ -291,7 +291,7 @@ int ProtoFileSend(WPARAM wParam, LPARAM lParam) {
 	return 0; // fail

 }

 

-int ProtoUserIsTyping(WPARAM wParam, LPARAM lParam) {

+INT_PTR ProtoUserIsTyping(WPARAM wParam, LPARAM lParam) {

 	HANDLE hMeta = (HANDLE)wParam;

 	// find the most online contact supporting typing notifications, according to priorities

 	HANDLE most_online = (HANDLE)Meta_GetMostOnlineSupporting(hMeta, PFLAGNUM_4, PF4_SUPPORTTYPING);

@@ -319,7 +319,7 @@ int EventContactIsTyping(WPARAM wParam, LPARAM lParam) {
 	return 0;

 }

 

-int SendNudge(WPARAM wParam,LPARAM lParam)

+INT_PTR SendNudge(WPARAM wParam,LPARAM lParam)

 {

 	HANDLE hMeta = (HANDLE)wParam,

 		hSubContact = Meta_GetActive(hMeta);