shameful death of another 'HANDLE'

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

1 files changed, 4 insertions, 4 deletions

diff --git a/include/m_clistint.h b/include/m_clistint.h
index f959efef13..307d7fd0f2 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -33,9 +33,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define HCONTACT_ISGROUP    0x80000000

 #define HCONTACT_ISINFO     0xFFFF0000

-#define IsHContactGroup(h)  (((UINT_PTR)(h)^HCONTACT_ISGROUP)<(HCONTACT_ISGROUP^HCONTACT_ISINFO))

-#define IsHContactInfo(h)   (((UINT_PTR)(h)&HCONTACT_ISINFO) == HCONTACT_ISINFO)

-#define IsHContactContact(h) (((UINT_PTR)(h)&HCONTACT_ISGROUP) == 0)

+#define IsHContactGroup(h)  (((DWORD)(h)^HCONTACT_ISGROUP)<(HCONTACT_ISGROUP^HCONTACT_ISINFO))

+#define IsHContactInfo(h)   (((DWORD)(h)&HCONTACT_ISINFO) == HCONTACT_ISINFO)

+#define IsHContactContact(h) (((DWORD)(h)&HCONTACT_ISGROUP) == 0)

 

 #ifndef EXTRA_ICON_COUNT

 #define EXTRA_ICON_COUNT 10

@@ -275,7 +275,7 @@ typedef struct
 

 	/* clcidents.c */

 	int    (*pfnGetRowsPriorTo)(ClcGroup *group, ClcGroup *subgroup, int contactIndex);

-	int    (*pfnFindItem)(HWND hwnd, struct ClcData *dat, HANDLE hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);

+	int    (*pfnFindItem)(HWND hwnd, struct ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);

 	int    (*pfnGetRowByIndex)(struct ClcData *dat, int testindex, ClcContact **contact, ClcGroup **subgroup);

 	HANDLE (*pfnContactToHItem)(ClcContact *contact);

 	HANDLE (*pfnContactToItemHandle)(ClcContact *contact, DWORD *nmFlags);