shameful death of another 'HANDLE'

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

2 files changed, 12 insertions, 13 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 61d4d48e4c..dd50b18885 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -1,20 +1,20 @@
 {

   Miranda IM: the free IM client for Microsoft* Windows*

-  

+

   Copyright 2000-2008 Miranda ICQ/IM project,

   all portions of this codebase are copyrighted to the people

   listed in contributors.txt.

-  

+

   This program is free software; you can redistribute it and/or

   modify it under the terms of the GNU General Public License

   as published by the Free Software Foundation; either version 2

   of the License, or (at your option) any later version.

-  

+

   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.

-  

+

   You should have received a copy of the GNU General Public License

   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

@@ -197,7 +197,7 @@ type
     needsResort           :int;

     filterSearch          :int;

   end;

-  

+

   PtrayIconInfo_t = ^trayIconInfo_t;

   trayIconInfo_t = record

     id          : int;

@@ -328,9 +328,8 @@ type
   (* clcidents.c *)

     pfnGetRowsPriorTo      : function (var group:ClcGroup; var subgroup:ClcGroup;

                              contactIndex:int):int; cdecl;

-    pfnFindItem            : function (hwnd:HWND; var dat:ClcData; hItem:THANDLE;

-                             var contact:PClcContact; var subgroup:PClcGroup; 

-                             var isVisible:int):int; cdecl;

+    pfnFindItem            : function (hwnd:HWND; var dat:ClcData; dwItem:DWORD;

+                             var contact:PClcContact; var subgroup:PClcGroup; var isVisible:int):int; cdecl;

     pfnGetRowByIndex       : function (var dat:ClcData; testindex:int;

                              var contact:PClcContact; var subgroup:PClcGroup):int; cdecl;

     pfnContactToHItem      : function (var contact:ClcContact):THANDLE;cdecl;

@@ -431,7 +430,7 @@ type
     pfnContactListWndProc:function(hwnd:HWND; msg:uint; wParam:WPARAM; lParam:LPARAM):int; stdcall;

 

     pfnCluiProtocolStatusChanged : procedure (status:int; szProto:PAnsiChar); cdecl;

-    pfnDrawMenuItem              : procedure (_para1:PDRAWITEMSTRUCT; _para2:HICON; 

+    pfnDrawMenuItem              : procedure (_para1:PDRAWITEMSTRUCT; _para2:HICON;

                                    _para3:HICON); cdecl;

     pfnLoadCluiGlobalOpts        : procedure ; cdecl;

     pfnInvalidateRect            : function (hwnd:HWND; var lpRect:TRECT; bErase:BOOL):BOOL; cdecl;

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