another bunch of useless conversions died

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

6 files changed, 31 insertions, 31 deletions

diff --git a/protocols/SkypeClassic/src/contacts.cpp b/protocols/SkypeClassic/src/contacts.cpp
index ecc6902397..bfcd4a4319 100644
--- a/protocols/SkypeClassic/src/contacts.cpp
+++ b/protocols/SkypeClassic/src/contacts.cpp
@@ -314,7 +314,7 @@ MCONTACT find_contact(char *name)
 	// already on list?

 	for (MCONTACT hContact = db_find_first(); hContact != NULL; hContact=db_find_next(hContact)) 

 	{

-		char *szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0 );

+		char *szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, hContact, 0 );

 		if (szProto!=NULL && !strcmp(szProto, SKYPE_PROTONAME) &&	db_get_b(hContact, SKYPE_PROTONAME, "ChatRoom", 0)==0)	

 		{

 			if (db_get_s(hContact, SKYPE_PROTONAME, SKYPE_NAME, &dbv)) continue;

@@ -335,7 +335,7 @@ MCONTACT find_contactT(TCHAR *name)
 	// already on list?

 	for (MCONTACT hContact=db_find_first(); hContact != NULL; hContact=db_find_next(hContact)) 

 	{

-		char *szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0 );

+		char *szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, hContact, 0 );

 		if (szProto!=NULL && !strcmp(szProto, SKYPE_PROTONAME) &&	db_get_b(hContact, SKYPE_PROTONAME, "ChatRoom", 0)==0)	

 		{

 			if (db_get_ts(hContact, SKYPE_PROTONAME, SKYPE_NAME, &dbv)) continue;

@@ -367,9 +367,9 @@ MCONTACT add_contact(char *name, DWORD flags)
 	LOG(("add_contact: Adding %s", name));

 	hContact=(MCONTACT)CallServiceSync(MS_DB_CONTACT_ADD, 0, 0);

 	if (hContact) {

-		if (CallServiceSync(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact,(LPARAM)SKYPE_PROTONAME)!=0) {

+		if (CallServiceSync(MS_PROTO_ADDTOCONTACT, hContact,(LPARAM)SKYPE_PROTONAME)!=0) {

 			LOG(("add_contact: Ouch! MS_PROTO_ADDTOCONTACT failed for some reason"));

-			CallServiceSync(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);

+			CallServiceSync(MS_DB_CONTACT_DELETE, hContact, 0);

 			return NULL;

 		}

 		if (name[0]) db_set_s(hContact, SKYPE_PROTONAME, SKYPE_NAME, name);

@@ -393,7 +393,7 @@ void logoff_contacts(BOOL bCleanup) {
 

 	LOG(("logoff_contacts: Logging off contacts."));

 	for (hContact=db_find_first();hContact != NULL;hContact=db_find_next(hContact)) {

-		szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0 );

+		szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, hContact, 0 );

 		if (szProto!=NULL && !strcmp(szProto, SKYPE_PROTONAME))

 		{

 			if (db_get_w(hContact, SKYPE_PROTONAME, "Status", ID_STATUS_OFFLINE)!=ID_STATUS_OFFLINE)

diff --git a/protocols/SkypeClassic/src/gchat.cpp b/protocols/SkypeClassic/src/gchat.cpp
index 9e746244b6..64055d18c0 100644
--- a/protocols/SkypeClassic/src/gchat.cpp
+++ b/protocols/SkypeClassic/src/gchat.cpp
@@ -172,7 +172,7 @@ MCONTACT find_chat(LPCTSTR chatname) {
 	DBVARIANT dbv;

 

 	for (hContact=db_find_first();hContact != NULL;hContact=db_find_next(hContact)) {

-		szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0 );

+		szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, hContact, 0 );

 		if (szProto!=NULL && !strcmp(szProto, SKYPE_PROTONAME) &&

 			db_get_b(hContact, SKYPE_PROTONAME, "ChatRoom", 0)==1)

 		{

@@ -194,7 +194,7 @@ MCONTACT find_chatA(char *chatname) {
 	DBVARIANT dbv;

 

 	for (hContact=db_find_first();hContact != NULL;hContact=db_find_next(hContact)) {

-		szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0 );

+		szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, hContact, 0 );

 		if (szProto!=NULL && !strcmp(szProto, SKYPE_PROTONAME) &&

 			db_get_b(hContact, SKYPE_PROTONAME, "ChatRoom", 0)==1)

 		{

@@ -494,7 +494,7 @@ void InviteUser(const TCHAR *szChatId)
     

 	// generate a list of contact

 	while (hContact) {

-		char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact,0 );

+		char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, hContact,0 );

 		if (szProto && !strcmp(SKYPE_PROTONAME, szProto) &&

 			!db_get_b(hContact, SKYPE_PROTONAME, "ChatRoom", 0) &&

 			 db_get_w(hContact, SKYPE_PROTONAME, "Status", ID_STATUS_OFFLINE)!=ID_STATUS_OFFLINE) 

@@ -508,7 +508,7 @@ void InviteUser(const TCHAR *szChatId)
 			}

             if (!alreadyInSession)

 				AppendMenu(tMenu, MF_STRING, (UINT_PTR)hContact, 

-					(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR));

+					(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR));

         }

 		hContact = db_find_next(hContact);

 	}

@@ -622,7 +622,7 @@ int GCEventHook(WPARAM wParam,LPARAM lParam) {
 				}

 				// Delete Chatroom from Contact list, as we don't need it anymore...?

 				if (hContact = find_chat(gc->szChatName))

-					CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0); 

+					CallService(MS_DB_CONTACT_DELETE, hContact, 0); 

 				RemChat(gc->szChatName);

 

 				break;

@@ -692,7 +692,7 @@ int GCEventHook(WPARAM wParam,LPARAM lParam) {
 				break;

 			case GC_USER_PRIVMESS: {

 				MCONTACT hContact = find_contactT(gch->ptszUID);

-				if (hContact) CallService(MS_MSG_SENDMESSAGE, (WPARAM)hContact, 0);

+				if (hContact) CallService(MS_MSG_SENDMESSAGE, hContact, 0);

 				break;

 

 			}

@@ -717,8 +717,8 @@ int GCEventHook(WPARAM wParam,LPARAM lParam) {
 				MCONTACT hContact = find_contactT(gch->ptszUID);

 

 				switch(gch->dwData) {

-				case 10:CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)hContact, 0); break;

-				case 20:CallService(MS_HISTORY_SHOWCONTACTHISTORY, (WPARAM)hContact, 0); break;

+				case 10:CallService(MS_USERINFO_SHOWDIALOG, hContact, 0); break;

+				case 20:CallService(MS_HISTORY_SHOWCONTACTHISTORY, hContact, 0); break;

 				case 30: KickUser(hContact, gch); break;

 				case 110: KillChatSession(gch->pDest); break;

 				}

diff --git a/protocols/SkypeClassic/src/skype.cpp b/protocols/SkypeClassic/src/skype.cpp
index 5acdb42d43..1310b0bc60 100644
--- a/protocols/SkypeClassic/src/skype.cpp
+++ b/protocols/SkypeClassic/src/skype.cpp
@@ -1288,7 +1288,7 @@ void FetchMessageThread(fetchmsg_arg *pargs) {
 				TYP_MSGLENTRY *pme;

 

 				LOG(("FetchMessageThread Adding event"));

-				if (!(dbei.szModule=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0)))

+				if (!(dbei.szModule=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, hContact, 0)))

 					dbei.szModule=SKYPE_PROTONAME;

 				dbei.cbBlob=msglen;

 				if (pre.flags & PREF_UNICODE)

@@ -1366,7 +1366,7 @@ void FetchMessageThreadSync(fetchmsg_arg *pargs) {
 		{

 			MCONTACT hContact;

 			if ((int)(hContact = (MCONTACT)CallService (MS_DB_EVENT_GETCONTACT, (WPARAM)pMsgEntry->hEvent, 0)) != -1)

-				CallService (MS_DB_EVENT_MARKREAD, (WPARAM)hContact, (LPARAM)hDBEvent);

+				CallService (MS_DB_EVENT_MARKREAD, hContact, (LPARAM)hDBEvent);

 		}

 		*/

 		free (pargs);

@@ -1445,7 +1445,7 @@ MCONTACT GetCallerContact(char *szSkypeMsg)
 MCONTACT GetMetaHandle(DWORD dwId)

 {

 	for (MCONTACT hContact=db_find_first(); hContact != NULL; hContact=db_find_next(hContact)) {

-		char *szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0 );

+		char *szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, hContact, 0 );

 		if (szProto!=NULL && !strcmp(szProto, "MetaContacts") &&

 			db_get_dw(hContact, "MetaContacts", "MetaID", MAXDWORD)==dwId)

 			return hContact;

@@ -1559,7 +1559,7 @@ void RingThread(char *szSkypeMsg) {
 			unsigned int popupBackColor, popupTextColor;

 			int popupTimeSec;

 			POPUPDATAT InCallPopup;

-			TCHAR * lpzContactName = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)hContact,GCDNF_TCHAR);

+			TCHAR * lpzContactName = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,hContact,GCDNF_TCHAR);

 

 			popupTimeSec = db_get_dw(NULL, SKYPE_PROTONAME, "popupTimeSec", 4);

 			popupTextColor = db_get_dw(NULL, SKYPE_PROTONAME, "popupTextColor", GetSysColor(COLOR_WINDOWTEXT));

@@ -1589,7 +1589,7 @@ void RingThread(char *szSkypeMsg) {
 		dbei.flags=DBEF_READ;

 		cle.hContact=hContact;

 		cle.hDbEvent=db_event_add(hContact, &dbei);

-		_snprintf(toolTip,sizeof(toolTip),Translate("Incoming call from %s"),(char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)hContact,0));

+		_snprintf(toolTip,sizeof(toolTip),Translate("Incoming call from %s"),(char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,hContact,0));

 		cle.pszTooltip=toolTip;

 		CallServiceSync(MS_CLIST_ADDEVENT,0,(LPARAM)&cle);

 	} 

@@ -1649,7 +1649,7 @@ void EndCallThread(char *szSkypeMsg) {
 				db_event_get(hDbEvent, &dbei);

 					if (!(dbei.flags&(DBEF_SENT|DBEF_READ)) && dbei.eventType==EVENTTYPE_CALL) {

 					db_event_markRead(hContact,hDbEvent);

-					CallService(MS_CLIST_REMOVEEVENT,(WPARAM)hContact,(LPARAM)hDbEvent);

+					CallService(MS_CLIST_REMOVEEVENT,hContact,(LPARAM)hDbEvent);

 				}

 				if (dbei.pBlob) free(dbei.pBlob);

 				hDbEvent=db_event_next(hDbEvent);

@@ -1658,10 +1658,10 @@ void EndCallThread(char *szSkypeMsg) {
 

 		if (!db_get_s(hContact, SKYPE_PROTONAME, "SkypeOutNr", &dbv)) {

 			db_free(&dbv);

-			if (!strcmp((char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0), SKYPE_PROTONAME) && 

+			if (!strcmp((char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, hContact, 0), SKYPE_PROTONAME) && 

 				db_get_b(hContact, "CList", "NotOnList", 0)

 			   )

-					CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);

+					CallService(MS_DB_CONTACT_DELETE, hContact, 0);

 		}

 	}

 	free(szSkypeMsg);

@@ -1842,7 +1842,7 @@ LONG APIENTRY WndProc(HWND hWndDlg, UINT message, UINT wParam, LONG lParam)
 										LPARAM lTyping = PROTOTYPE_CONTACTTYPING_OFF;

 

 										if (!strcmp(p, "PURPLE_TYPING")) lTyping=PROTOTYPE_CONTACTTYPING_INFINITE;

-										CallService(MS_PROTO_CONTACTISTYPING, (WPARAM)hContact, lTyping);

+										CallService(MS_PROTO_CONTACTISTYPING, hContact, lTyping);

 										break;

 									}

 								}

@@ -2048,7 +2048,7 @@ LONG APIENTRY WndProc(HWND hWndDlg, UINT message, UINT wParam, LONG lParam)
 				} else { // BUDDYSTATUS:

 					flag=0;

 					switch(atoi(ptr+12)) {

-						case 1: if (hContact=find_contact(nick)) CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0); break;

+						case 1: if (hContact=find_contact(nick)) CallService(MS_DB_CONTACT_DELETE, hContact, 0); break;

 						case 0: break;

 						case 2: flag=PALF_TEMPORARY;

 						case 3: add_contact(nick, flag); 

@@ -2922,7 +2922,7 @@ void CleanupNicknames(char *dummy) {
 

 	LOG(("CleanupNicknames Cleaning up..."));

 	for (hContact=db_find_first();hContact != NULL;hContact=db_find_next(hContact)) {

-		szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0 );

+		szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, hContact, 0 );

 		if (szProto!=NULL && !strcmp(szProto, SKYPE_PROTONAME) &&

 			db_get_b(hContact, SKYPE_PROTONAME, "ChatRoom", 0)==0)	

 		{

@@ -3052,7 +3052,7 @@ int AnySkypeusers(void)
 

 	for ( ;; ) {

 		memset(&pdi,0,sizeof(pdi));

-		CallService(MS_DB_CONTACT_ENUMSETTINGS,(WPARAM)hContact,(LPARAM)&cns);

+		CallService(MS_DB_CONTACT_ENUMSETTINGS,hContact,(LPARAM)&cns);

 		// Upgrade Protocol settings to new string

 		if (pdi.szSettings) {

 			int i;

@@ -3063,7 +3063,7 @@ int AnySkypeusers(void)
 					cws.szModule=SKYPE_PROTONAME;

 					cws.szSetting=pdi.szSettings[i];

 					cws.value=dbv;

-					if (!CallService(MS_DB_CONTACT_WRITESETTING,(WPARAM)hContact,(LPARAM)&cws))

+					if (!CallService(MS_DB_CONTACT_WRITESETTING,hContact,(LPARAM)&cws))

 						db_unset(hContact,OldName,pdi.szSettings[i]);

 					db_free(&dbv);

 				}		

diff --git a/protocols/SkypeClassic/src/skypeapi.cpp b/protocols/SkypeClassic/src/skypeapi.cpp
index 1534a3530a..b5bd939172 100644
--- a/protocols/SkypeClassic/src/skypeapi.cpp
+++ b/protocols/SkypeClassic/src/skypeapi.cpp
@@ -782,7 +782,7 @@ static INT_PTR CALLBACK DialDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 								OUTPUTA(ptr);

 								free(ptr);

 							}

-							if (TempAdded) CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);

+							if (TempAdded) CallService(MS_DB_CONTACT_DELETE, hContact, 0);

 						}

 						free(msg);

 					}

@@ -816,7 +816,7 @@ static INT_PTR CALLBACK CallstatDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
 

 				// Check, if another call is in progress

 				for (hContact=db_find_first();hContact != NULL;hContact=db_find_next(hContact)) {

-					char *szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0 );

+					char *szProto = (char*)CallService( MS_PROTO_GETCONTACTBASEPROTO, hContact, 0 );

 					if (szProto != NULL && !strcmp(szProto, SKYPE_PROTONAME) && hContact != (MCONTACT)lParam &&

 						db_get_b(hContact, SKYPE_PROTONAME, "ChatRoom", 0) == 0 &&

 						!db_get_s(hContact, SKYPE_PROTONAME, "CallId", &dbv2)) 

@@ -831,7 +831,7 @@ static INT_PTR CALLBACK CallstatDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
 				if (dbv2.pszVal)

 				{

 					char buf[256], buf2[256];

-					char *szOtherCaller=(char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)hContact,0);

+					char *szOtherCaller=(char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,hContact,0);

 

 					Utils_RestoreWindowPosition(hwndDlg, NULL, SKYPE_PROTONAME, "CALLSTATdlg");

 					TranslateDialogDefault(hwndDlg);

diff --git a/protocols/SkypeClassic/src/skypeopt.cpp b/protocols/SkypeClassic/src/skypeopt.cpp
index 42e4f79423..a149fdaf74 100644
--- a/protocols/SkypeClassic/src/skypeopt.cpp
+++ b/protocols/SkypeClassic/src/skypeopt.cpp
@@ -163,7 +163,7 @@ INT_PTR CALLBACK OptPopupDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 					TCHAR * lpzContactName;

 

 					hContact = db_find_first();

-					lpzContactName = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)hContact,GCDNF_TCHAR);

+					lpzContactName = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,hContact,GCDNF_TCHAR);

 					InCallPopup.lchContact = hContact;

 					InCallPopup.lchIcon = LoadIcon(hInst,MAKEINTRESOURCE(IDI_CALL));

 					InCallPopup.colorBack = ! popupWindowColor ? popupBackColor : GetSysColor(COLOR_BTNFACE);

diff --git a/protocols/SkypeClassic/src/voiceservice.cpp b/protocols/SkypeClassic/src/voiceservice.cpp
index f5e97f3a53..dd49772d2a 100644
--- a/protocols/SkypeClassic/src/voiceservice.cpp
+++ b/protocols/SkypeClassic/src/voiceservice.cpp
@@ -45,7 +45,7 @@ static MCONTACT FindContactByCallId(char *callId)
 	MCONTACT hContact;

 	int iCmpRes;

 	for (hContact = db_find_first(); hContact != NULL; hContact = db_find_next(hContact)) {

-		char *szProto = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

+		char *szProto = (char*) CallService(MS_PROTO_GETCONTACTBASEPROTO, hContact, 0);

 

 		DBVARIANT dbv;

 		if (szProto != NULL