From 9c8e399b431a9b0995efd24752a47efbe6e84ade Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 24 Feb 2014 12:27:21 +0000
Subject: - added ME_FILEDLG_CANCELED & ME_FILEDLG_SUCCEEDED events to support
 async file selection dialog; - return value of MS_FILE_SENDFILE* services
 changed: now it returns a dialog handle; - code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@8253 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/chat/clist.cpp        | 2 +-
 src/modules/clist/clcfiledrop.cpp | 2 +-
 src/modules/clist/clcitems.cpp    | 2 +-
 src/modules/clist/clistmod.cpp    | 2 +-
 src/modules/clist/contact.cpp     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/chat/clist.cpp b/src/modules/chat/clist.cpp
index 85d6720dfe..d548d8db2c 100644
--- a/src/modules/chat/clist.cpp
+++ b/src/modules/chat/clist.cpp
@@ -219,7 +219,7 @@ BOOL AddEvent(MCONTACT hContact, HICON hIcon, HANDLE hEvent, int type, TCHAR* fm
 	cle.ptszTooltip = TranslateTS(szBuf);
 	if (type) {
 		if (!CallService(MS_CLIST_GETEVENT, hContact, 0))
-			CallService(MS_CLIST_ADDEVENT, (WPARAM) hContact, (LPARAM) &cle);
+			CallService(MS_CLIST_ADDEVENT, hContact, (LPARAM)&cle);
 	}
 	else {
 		if (CallService(MS_CLIST_GETEVENT, hContact, 0))
diff --git a/src/modules/clist/clcfiledrop.cpp b/src/modules/clist/clcfiledrop.cpp
index 9cb9e01f03..57945bbedf 100644
--- a/src/modules/clist/clcfiledrop.cpp
+++ b/src/modules/clist/clcfiledrop.cpp
@@ -233,7 +233,7 @@ HRESULT CDropTarget::Drop(IDataObject * pDataObj, DWORD /*fKeyState*/, POINTL pt
 			AddToFileList(&ppFiles, &totalCount, szFilename);
 		}
 
-		if (!CallService(MS_FILE_SENDSPECIFICFILEST, (WPARAM) hContact, (LPARAM) ppFiles))
+		if (!CallService(MS_FILE_SENDSPECIFICFILEST, hContact, (LPARAM)ppFiles))
 			*pdwEffect = DROPEFFECT_COPY;
 
 		for (i=0; ppFiles[i]; i++)
diff --git a/src/modules/clist/clcitems.cpp b/src/modules/clist/clcitems.cpp
index a1c52bb02f..291f4aa64e 100644
--- a/src/modules/clist/clcitems.cpp
+++ b/src/modules/clist/clcitems.cpp
@@ -186,7 +186,7 @@ int fnAddContactToGroup(struct ClcData *dat, ClcGroup *group, MCONTACT hContact)
 	i = cli.pfnAddItemToGroup(group, index + 1);
 	char *szProto = GetContactProto(hContact);
 	group->cl.items[i]->type = CLCIT_CONTACT;
-	group->cl.items[i]->iImage = CallService(MS_CLIST_GETCONTACTICON, (WPARAM) hContact, 0);
+	group->cl.items[i]->iImage = CallService(MS_CLIST_GETCONTACTICON, hContact, 0);
 	group->cl.items[i]->hContact = hContact;
 	group->cl.items[i]->proto = szProto;
 	if (szProto != NULL && !cli.pfnIsHiddenMode(dat, db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE)))
diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp
index 7fb4d55709..cd5059ceca 100644
--- a/src/modules/clist/clistmod.cpp
+++ b/src/modules/clist/clistmod.cpp
@@ -536,7 +536,7 @@ void UnloadContactListModule()
 	for (MCONTACT hContact = db_find_first(); hContact != NULL; ) {
 		MCONTACT hNext = db_find_next(hContact);
 		if (db_get_b(hContact, "CList", "NotOnList", 0))
-			CallService(MS_DB_CONTACT_DELETE, (WPARAM) hContact, 0);
+			CallService(MS_DB_CONTACT_DELETE, hContact, 0);
 		hContact = hNext;
 	}
 	ImageList_Destroy(hCListImages);
diff --git a/src/modules/clist/contact.cpp b/src/modules/clist/contact.cpp
index 7931c1d7d1..0baab503ee 100644
--- a/src/modules/clist/contact.cpp
+++ b/src/modules/clist/contact.cpp
@@ -55,8 +55,8 @@ static int GetContactStatus(MCONTACT hContact)
 
 void fnChangeContactIcon(MCONTACT hContact, int iIcon, int add)
 {
-	CallService(add ? MS_CLUI_CONTACTADDED : MS_CLUI_CONTACTSETICON, (WPARAM) hContact, iIcon);
-	NotifyEventHooks(hContactIconChangedEvent, (WPARAM) hContact, iIcon);
+	CallService(add ? MS_CLUI_CONTACTADDED : MS_CLUI_CONTACTSETICON, hContact, iIcon);
+	NotifyEventHooks(hContactIconChangedEvent, hContact, iIcon);
 }
 
 int GetStatusModeOrdering(int statusMode)
-- 
cgit v1.2.3