Change a few types to match you-know-who's declarations.

include/commctrl.h

@@ -1676,10 +1676,10 @@ typedef struct
 #define TVIF_INTEGRAL         0x0080
 #define TVIF_DI_SETITEM		  0x1000
 
-#define TVI_ROOT              0xffff0000      /* -65536 */
-#define TVI_FIRST             0xffff0001      /* -65535 */
-#define TVI_LAST              0xffff0002      /* -65534 */
-#define TVI_SORT              0xffff0003      /* -65533 */
+#define TVI_ROOT              ((HTREEITEM)0xffff0000)     /* -65536 */
+#define TVI_FIRST             ((HTREEITEM)0xffff0001)     /* -65535 */
+#define TVI_LAST              ((HTREEITEM)0xffff0002)     /* -65534 */
+#define TVI_SORT              ((HTREEITEM)0xffff0003)     /* -65533 */
 
 #define TVIS_FOCUSED          0x0001
 #define TVIS_SELECTED         0x0002
@@ -1748,7 +1748,7 @@ typedef struct
 #define TVC_BYKEYBOARD        0x02
 
 
-typedef HANDLE32 HTREEITEM;
+typedef struct _TREEITEM *HTREEITEM;
 
 typedef struct {
       UINT32 mask;

include/treeview.h

@@ -31,10 +31,10 @@ typedef struct {
 	int iLevel;			/* indentation level:0=root level */
 	COLORREF clrText;
 	
-	int parent;	    /* handle to parent or 0 if at root*/
-	int firstChild;     /* handle to first child or 0 if no child*/
-	int sibling;        /* handle to next item in list, 0 if last */
-	int upsibling;      /* handle to previous item in list, 0 if first */
+	HTREEITEM parent;	    /* handle to parent or 0 if at root*/
+	HTREEITEM firstChild;     /* handle to first child or 0 if no child*/
+	HTREEITEM sibling;        /* handle to next item in list, 0 if last */
+	HTREEITEM upsibling;      /* handle to previous item in list, 0 if first */
 	int visible;
     RECT32 rect;
 	RECT32 text;
@@ -49,7 +49,7 @@ typedef struct tagTREEVIEW_INFO
 	INT32	Timer;
     UINT32  uNumItems;	/* number of valid TREEVIEW_ITEMs */
     UINT32	uNumPtrsAlloced; 
-    UINT32	uMaxHandle;	/* needed for delete_item */
+    HTREEITEM	uMaxHandle;	/* needed for delete_item */
     HTREEITEM 	TopRootItem;	/* handle to first item in treeview */
 	INT32	cdmode;		/* last custom draw setting */