2003-08-25 Filip Navara <xnavara@volny.cz>

	* include/commctrl.h (ILCF_*): Add defines.
	(ILD_*): Ditto.
	(HDS_*); Ditto.
	(IPN_FIRST, IPN_LAST): Cast to UINT.
	(SBN_FIRST, SBN_LAST): Add defines.
	(PGN_*): Ditto.
	(HDF_JUSTIFYMASK): Fix typo.
	(HDM_*): Add defines.
	(HICF_*): Ditto.
	(I_INDENTCALLBACK,I_IMAGENONE): Ditto.
	(TBSTATE_MARKED): Add define.
	(TBSTYLE_EX_*): Add defines.
	(TBCDRF_*): Ditto.
	(IDB_HIST_SMALL_COLOR,IDB_HIST_LARGE_COLOR): Ditto.
	(TB_*): Ditto.
	(TBN_*): Ditto.
	(TBNRF_*): Ditto.
	(TTF_*): Ditto.
	(TBCD_*): Ditto.
	(TBDDRET_*): Ditto.
	(TBIMHT_*): Ditto.
	(TTM_*): Ditto.
	(UDM_*): Ditto.
	(TBIF_BYINDEX): Define as hex constant.
	(CDIS_*): Add defines.
	(CDDS_SUBITEM): Add define.
	(LVIF_*): Add defines.
	(LVM_*): Ditto.
	(LVGIT_UNFOLDED): Add define.
	(TVM_): Add defines.
	(TVE_EXPANDPARTIAL): Add define.
	(TVGN_LASTVISIBLE): Ditto.
	(TVN_*): Add defines.
	(TVNRET_*): Add defines.
	(TCIF_STATE): Add define.
	(NM_TOOLTIPSCREATED): Ditto.
	(CCM_*): Add defines.
	(INFOTIPSIZE): Add numeric value.
	(ODT_LISTVIEW): Ditto.
	(MCM_GETMAXTODAYWIDTH): Ditto.
	(MCHT_*): Add defines.
	(UDM_SETRANGE32,UDM_GETRANGE32): Define in terms of WM_USER.
	(PGF_*): Add defines.
	(PGM_*): Ditto.
	(TBINSERTMARK): Add structure.
	(LPIMAGEINFO) Add typedef.
	(LPHDHITTESTINFO): Ditto.
	(NMLVGETINFOTIP[AW]: Add structures.
	(NMTBCUSTOMDRAW): Add structure.
	(TTTOOLINFOA_V*_SIZE): Add macros.
	(TTTOOLINFOW_V1_SIZE): Ditto.
	(IMAGELISTDRAWPARAMS): Add new members for WXP.
	(LVITEM[AW]: Ditto.
	(TCITEM[AW]):Ditto.
	(CCSIZEOF_STRUCT): Correct macro definition.
	(ListView_*): Add new macros.
	(HIMAGELIST): Correct typedef.
	(HTREEITEM): Ditto.

2003-08-25   Danny Smith <dannysmith@users.sourceforge.net>

	* commctrl.h (TC_HITTESTINFO): Remove. Add defines for
	TCHITTESTINFO for backward compatibility.
	(TC_ITEM[AW]): Rename to TCITEM[AW]. Add defines for backward
	compatibility.

1 files changed, 539 insertions, 66 deletions

diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
index 0126e52..0804be5 100644
--- a/winsup/w32api/include/commctrl.h
+++ b/winsup/w32api/include/commctrl.h
@@ -215,6 +215,13 @@ extern "C" {
 #define ILC_COLORDDB 254
 #define ILC_MASK 1
 #define ILC_PALETTE 2048
+#define ILCF_MOVE 0
+#define ILCF_SWAP 1
+#define ILS_NORMAL 0
+#define ILS_GLOW 1
+#define ILS_SHADOW 2
+#define ILS_SATURATE 4
+#define ILS_ALPHA 8
 #define ILD_BLEND25 2
 #define ILD_BLEND50 4
 #define ILD_SELECTED 4
@@ -223,9 +230,23 @@ extern "C" {
 #define ILD_MASK 16
 #define ILD_NORMAL 0
 #define ILD_TRANSPARENT 1
+#define ILD_IMAGE 0x0020
+#define ILD_ROP 0x0040
+#define ILD_OVERLAYMASK 0x0F00
+#define ILD_PRESERVEALPHA 0x1000
+#define ILD_SCALE 0x2000
+#define ILD_DPISCALE 0x4000
 #define HDS_HORZ	0
 #define HDS_BUTTONS	2
 #define HDS_HIDDEN	8
+#if (_WIN32_IE > 0x0300)
+#define HDS_HOTTRACK	4
+#define HDS_DRAGDROP	0x0040
+#define HDS_FULLDRAG	0x0080
+#endif /* _WIN32_IE > 0x0300 */
+#if (_WIN32_IE >= 0x0500)
+#define HDS_FILTERBAR	0x0100
+#endif /* _WIN32_IE >= 0x0500 */
 #define NM_FIRST	0
 #define NM_LAST	((UINT)-99)
 #define LVN_FIRST	((UINT)-100)
@@ -257,9 +278,15 @@ extern "C" {
 #define CBEN_LAST	((UINT)-830)
 #endif /* _WIN32_IE */
 #if (_WIN32_IE >= 0x0400)
-#define IPN_FIRST	(-860)
-#define IPN_LAST	(-879)
+#define IPN_FIRST	((UINT)-860)
+#define IPN_LAST	((UINT)-879)
 #define IPN_FIELDCHANGED	(IPN_FIRST-0)
+#define SBN_FIRST	((UINT)-880U)
+#define SBN_LAST	((UINT)-899U)
+#define PGN_FIRST	((UINT)-900U)
+#define PGN_LAST	((UINT)-950U)
+#define PGN_SCROLL	(PGN_FIRST-1)
+#define PGN_CALCSIZE	(PGN_FIRST-2)
 #endif /* _WIN32_IE >= 0x0400 */
 #define HDI_WIDTH	1
 #define HDI_HEIGHT	1
@@ -289,7 +316,7 @@ extern "C" {
 #define HDF_LEFT	0
 #define HDF_RIGHT	1
 #define HDF_CENTER	2
-#define HDF_JUSTIFYMASK3
+#define HDF_JUSTIFYMASK	3
 #define HDF_RTLREADING	4
 #define HDF_OWNERDRAW	0x8000
 #define HDF_STRING	0x4000
@@ -309,9 +336,17 @@ extern "C" {
 #define HDM_LAYOUT	(HDM_FIRST+5)
 #if (_WIN32_IE >= 0x0300)
 #define HDM_GETITEMRECT (HDM_FIRST+7)
+#define HDM_SETIMAGELIST	(HDM_FIRST+8)
+#define HDM_GETIMAGELIST	(HDM_FIRST+9)
 #define HDM_ORDERTOINDEX	(HDM_FIRST+15)
+#define HDM_CREATEDRAGIMAGE	(HDM_FIRST+16)
 #define HDM_GETORDERARRAY	(HDM_FIRST+17)
 #define HDM_SETORDERARRAY	(HDM_FIRST+18)
+#define HDM_SETHOTDIVIDER	(HDM_FIRST+19)
+#endif
+#if (_WIN32_IE >= 0x0400)
+#define HDM_GETUNICODEFORMAT	CCM_GETUNICODEFORMAT
+#define HDM_SETUNICODEFORMAT	CCM_SETUNICODEFORMAT
 #endif
 #define HHT_NOWHERE	1
 #define HHT_ONHEADER	2
@@ -344,12 +379,28 @@ extern "C" {
 #define HDN_GETDISPINFOA (HDN_FIRST-9)
 #define HDN_GETDISPINFOW (HDN_FIRST-29)
 #endif
+#if (_WIN32_IE >= 0x0400)
+#define HICF_OTHER 0x00
+#define HICF_MOUSE 0x01
+#define HICF_ARROWKEYS 0x02
+#define HICF_ACCELERATOR 0x04
+#define HICF_DUPACCEL 0x08
+#define HICF_ENTERING 0x10
+#define HICF_LEAVING 0x20
+#define HICF_RESELECT 0x40
+#define HICF_LMOUSE 0x80
+#define HICF_TOGGLEDROPDOWN 0x100
+#endif /* _WIN32_IE >= 0x0400 */
 #define IPM_CLEARADDRESS	(WM_USER+100)
 #define IPM_SETADDRESS	(WM_USER+101)
 #define IPM_GETADDRESS	(WM_USER+102)
 #define IPM_SETRANGE	(WM_USER+103)
 #define IPM_SETFOCUS	(WM_USER+104)
 #define IPM_ISBLANK	(WM_USER+105)
+#if (_WIN32_IE >= 0x0500)
+#define I_INDENTCALLBACK (-1)
+#define I_IMAGENONE (-2)
+#endif
 #define CMB_MASKED 2
 #define TBSTATE_CHECKED	1
 #define TBSTATE_PRESSED	2
@@ -357,6 +408,9 @@ extern "C" {
 #define TBSTATE_HIDDEN	8
 #define TBSTATE_INDETERMINATE	16
 #define TBSTATE_WRAP	32
+#if (_WIN32_IE >= 0x0400)
+#define TBSTATE_MARKED	0x0080
+#endif
 #define TBSTYLE_BUTTON	0
 #define TBSTYLE_SEP	1
 #define TBSTYLE_CHECK	2
@@ -382,6 +436,13 @@ extern "C" {
 #define TBSTYLE_TRANSPARENT	0x8000
 #define TBSTYLE_EX_DRAWDDARROWS	0x00000001
 #endif /* _WIN32_IE >= 0x0400 */
+#if (_WIN32_IE >= 0x0501)
+#define TBSTYLE_EX_MIXEDBUTTONS 8
+#define TBSTYLE_EX_HIDECLIPPEDBUTTONS 16
+#endif /* _WIN32_IE >= 0x0501 */
+#if (_WIN32_WINNT >= _WXP)
+#define TBSTYLE_EX_DOUBLEBUFFER	0x80
+#endif /* _WIN32_WINNT >= _WXP */
 #if (_WIN32_IE >= 0x0500)
 #define BTNS_BUTTON	TBSTYLE_BUTTON
 #define BTNS_SEP	TBSTYLE_SEP
@@ -396,11 +457,22 @@ extern "C" {
 #if _WIN32_IE >= 0x0501
 #define BTNS_SHOWTEXT	0x0040
 #endif
+#if (_WIN32_IE >= 0x0400)
+#define TBCDRF_NOEDGES	0x10000
+#define TBCDRF_HILITEHOTTRACK	0x20000
+#define TBCDRF_NOOFFSET	0x40000
+#define TBCDRF_NOMARK	0x80000
+#define TBCDRF_NOETCHEDEFFECT	0x100000
+#endif /* _WIN32_IE >= 0x0400 */
 #define HINST_COMMCTRL	((HINSTANCE)-1)
 #define IDB_STD_SMALL_COLOR	0
 #define IDB_STD_LARGE_COLOR	1
 #define IDB_VIEW_SMALL_COLOR	4
 #define IDB_VIEW_LARGE_COLOR	5
+#if (_WIN32_IE >= 0x0300)
+#define IDB_HIST_SMALL_COLOR	8
+#define IDB_HIST_LARGE_COLOR	9
+#endif
 #define STD_CUT	0
 #define STD_COPY	1
 #define STD_PASTE	2
@@ -438,11 +510,19 @@ extern "C" {
 #define TB_ISBUTTONPRESSED	(WM_USER+11)
 #define TB_ISBUTTONHIDDEN	(WM_USER+12)
 #define TB_ISBUTTONINDETERMINATE	(WM_USER+13)
+#if (_WIN32_IE >= 0x0400)
+#define TB_ISBUTTONHIGHLIGHTED	(WM_USER+14)
+#endif
 #define TB_SETSTATE	(WM_USER+17)
 #define TB_GETSTATE	(WM_USER+18)
 #define TB_ADDBITMAP	(WM_USER+19)
+#if (_WIN32_IE >= 0x0400)
+#define TB_ADDBUTTONSA	(WM_USER+20)
+#define TB_INSERTBUTTONA	(WM_USER+21)
+#else
 #define TB_ADDBUTTONS	(WM_USER+20)
 #define TB_INSERTBUTTON	(WM_USER+21)
+#endif
 #define TB_DELETEBUTTON	(WM_USER+22)
 #define TB_GETBUTTON	(WM_USER+23)
 #define TB_BUTTONCOUNT	(WM_USER+24)
@@ -471,15 +551,59 @@ extern "C" {
 #define TB_REPLACEBITMAP	(WM_USER+46)
 #define TB_GETBUTTONSIZE	(WM_USER+58)
 #define TB_SETBUTTONWIDTH	(WM_USER+59)
+#if (_WIN32_IE >= 0x0300)
+#define TB_SETINDENT	(WM_USER+47)
+#define TB_SETIMAGELIST	(WM_USER+48)
+#define TB_GETIMAGELIST	(WM_USER+49)
+#define TB_LOADIMAGES	(WM_USER+50)
+#define TB_GETRECT	(WM_USER+51)
+#define TB_SETHOTIMAGELIST	(WM_USER+52)
+#define TB_GETHOTIMAGELIST	(WM_USER+53)
+#define TB_SETDISABLEDIMAGELIST (WM_USER+54)
+#define TB_GETDISABLEDIMAGELIST	(WM_USER+55)
+#define TB_SETSTYLE	(WM_USER+56)
+#define TB_GETSTYLE	(WM_USER+57)
+#define TB_GETBUTTONSIZE	(WM_USER+58)
+#define TB_SETBUTTONWIDTH	(WM_USER+59)
+#define TB_SETMAXTEXTROWS	(WM_USER+60)
+#define TB_GETTEXTROWS	(WM_USER+61)
+#endif
 #if _WIN32_IE >= 0x400
-#define TB_SETBUTTONINFO	(WM_USER+66)
+#define TB_GETOBJECT	(WM_USER+62)
+#define TB_GETBUTTONINFOW	(WM_USER+63)
+#define TB_SETBUTTONINFOW	(WM_USER+64)
+#define TB_GETBUTTONINFOA	(WM_USER+65)
+#define TB_SETBUTTONINFOA	(WM_USER+66)
+#define TB_INSERTBUTTONW	(WM_USER+67)
+#define TB_ADDBUTTONSW	(WM_USER+68)
+#define TB_HITTEST	(WM_USER+69)
 #define TB_SETEXTENDEDSTYLE	(WM_USER+84)
 #define TB_GETEXTENDEDSTYLE	(WM_USER+85)
 #define TB_SETDRAWTEXTFLAGS	(WM_USER+70)
+#define TB_GETHOTITEM	(WM_USER+71)
+#define TB_SETHOTITEM	(WM_USER+72)
+#define TB_SETANCHORHIGHLIGHT	(WM_USER+73)
+#define TB_GETANCHORHIGHLIGHT	(WM_USER+74)
+#define TB_MAPACCELERATORA	(WM_USER+78)
+#define TB_GETINSERTMARK	(WM_USER+79)
+#define TB_SETINSERTMARK	(WM_USER+80)
+#define TB_INSERTMARKHITTEST	(WM_USER+81)
+#define TB_MOVEBUTTON		(WM_USER+82)
+#define TB_GETMAXSIZE		(WM_USER+83)
+#define TB_SETEXTENDEDSTYLE	(WM_USER+84)
+#define TB_GETEXTENDEDSTYLE	(WM_USER+85)
+#define TB_GETPADDING		(WM_USER+86)
+#define TB_SETPADDING		(WM_USER+87)
+#define TB_SETINSERTMARKCOLOR	(WM_USER+88)
+#define TB_GETINSERTMARKCOLOR	(WM_USER+89)
+#define TB_MAPACCELERATORW	(WM_USER+90)
+#define TB_SETCOLORSCHEME	CCM_SETCOLORSCHEME
+#define TB_GETCOLORSCHEME	CCM_GETCOLORSCHEME
+#define TB_SETUNICODEFORMAT	CCM_SETUNICODEFORMAT
+#define TB_GETUNICODEFORMAT	CCM_GETUNICODEFORMAT
 #endif
 #define TBBF_LARGE 1
 #define TBN_GETBUTTONINFOA	(TBN_FIRST-0)
-#define TBN_GETBUTTONINFOW	(TBN_FIRST-20)
 #define TBN_BEGINDRAG	(TBN_FIRST-1)
 #define TBN_ENDDRAG	(TBN_FIRST-2)
 #define TBN_BEGINADJUST	(TBN_FIRST-3)
@@ -489,6 +613,29 @@ extern "C" {
 #define TBN_QUERYDELETE	(TBN_FIRST-7)
 #define TBN_TOOLBARCHANGE	(TBN_FIRST-8)
 #define TBN_CUSTHELP	(TBN_FIRST-9)
+#if (_WIN32_IE >= 0x0300)
+#define TBN_DROPDOWN	(TBN_FIRST-10)
+#endif
+#if (_WIN32_IE >= 0x0400)
+#define TBN_HOTITEMCHANGE	(TBN_FIRST-13)
+#define TBN_DRAGOUT	(TBN_FIRST-14)
+#define TBN_DELETINGBUTTON	(TBN_FIRST-15)
+#define TBN_GETDISPINFOA	(TBN_FIRST-16)
+#define TBN_GETDISPINFOW	(TBN_FIRST-17)
+#define TBN_GETINFOTIPA	(TBN_FIRST-18)
+#define TBN_GETINFOTIPW	(TBN_FIRST-19)
+#define TBN_GETBUTTONINFOW	(TBN_FIRST-20)
+#endif
+#if (_WIN32_IE >= 0x0500)
+#define TBN_RESTORE	(TBN_FIRST-21)
+#define TBN_SAVE	(TBN_FIRST-22)
+#define TBN_INITCUSTOMIZE	(TBN_FIRST-23)
+#define TBNRF_HIDEHELP	1
+#define TBNRF_ENDCUSTOMIZE	2
+#define TBNF_IMAGE	1
+#define TBNF_TEXT	2
+#define TBNF_DI_SETITEM	0x10000000
+#endif /* _WIN32_IE >= 0x0500 */
 #define TTS_ALWAYSTIP	1
 #define TTS_NOPREFIX	2
 #if( _WIN32_IE >= 0x0500 )
@@ -501,6 +648,25 @@ extern "C" {
 #define TTF_CENTERTIP	2
 #define TTF_RTLREADING	4
 #define TTF_SUBCLASS	16
+#if (_WIN32_IE >= 0x0300)
+#define TTF_TRACK 0x0020
+#define TTF_ABSOLUTE 0x0080
+#define TTF_TRANSPARENT 0x0100
+#if (_WIN32_IE >= 0x0501)
+#define TTF_PARSELINKS 0x1000
+#endif
+#define TTF_DI_SETITEM 0x8000
+#define TBCD_TICS 1
+#define TBCD_THUMB 2
+#define TBCD_CHANNEL 3
+#endif /* _WIN32_IE >= 0x0300 */
+#if (_WIN32_IE >= 0x0400)
+#define TBDDRET_DEFAULT 0
+#define TBDDRET_NODEFAULT 1
+#define TBDDRET_TREATPRESSED 2
+#define TBIMHT_AFTER 1
+#define TBIMHT_BACKGROUND 2
+#endif
 #define TTDT_AUTOMATIC	0
 #define TTDT_RESHOW	1
 #define TTDT_AUTOPOP	2
@@ -524,7 +690,7 @@ extern "C" {
 #define TTM_GETTEXTW	(WM_USER+56)
 #define TTM_UPDATETIPTEXTA	(WM_USER+12)
 #define TTM_UPDATETIPTEXTW	(WM_USER+57)
-#define TTM_GETTOOLCOUNT	(WM_USER +13)
+#define TTM_GETTOOLCOUNT	(WM_USER+13)
 #define TTM_ENUMTOOLSA	(WM_USER+14)
 #define TTM_ENUMTOOLSW	(WM_USER+58)
 #define TTM_GETCURRENTTOOLA	(WM_USER+15)
@@ -546,6 +712,10 @@ extern "C" {
 #endif /* _WIN32_IE */
 #if (_WIN32_IE >= 0x0400)			/* IE4.0 ??? */
 #define TTM_UPDATE		    (WM_USER+29)
+#define TTM_GETBUBBLESIZE	(WM_USER+30)
+#define TTM_ADJUSTRECT	(WM_USER+31)
+#define TTM_SETTITLEA	(WM_USER+32)
+#define TTM_SETTITLEW	(WM_USER+33)
 #endif
 #define TTN_GETDISPINFOA    (TTN_FIRST - 0)
 #define TTN_GETDISPINFOW    (TTN_FIRST - 10)
@@ -577,6 +747,16 @@ extern "C" {
 #define UDM_GETACCEL	(WM_USER+108)
 #define UDM_SETBASE	(WM_USER+109)
 #define UDM_GETBASE	(WM_USER+110)
+#if (_WIN32_IE >= 0x0400)
+#define UDM_SETRANGE32	(WM_USER+111)
+#define UDM_GETRANGE32	(WM_USER+112)
+#define UDM_SETPOS32	(WM_USER+113)
+#define UDM_GETPOS32	(WM_USER+114)
+#endif
+#if (_WIN32_IE >= 0x0500)
+#define UDM_SETUNICODEFORMAT	CCM_SETUNICODEFORMAT
+#define UDM_GETUNICODEFORMAT	CCM_GETUNICODEFORMAT
+#endif
 #define SB_SETTEXTA	(WM_USER+1)
 #define SB_SETTEXTW	(WM_USER+11)
 #define SB_GETTEXTA	(WM_USER+2)
@@ -595,6 +775,7 @@ extern "C" {
 #define SBT_RTLREADING	1024
 #if( _WIN32_IE >= 0x0400 )
 #define SBT_TOOLTIPS	0x0800
+#define SBN_SIMPLEMODECHANGE	(SBN_FIRST)
 #endif /* _WIN32_IE >= 0x0400 */
 #define TBS_AUTOTICKS	1
 #define TBS_VERT	2
@@ -608,10 +789,21 @@ extern "C" {
 #define TBS_ENABLESELRANGE	32
 #define TBS_FIXEDLENGTH	64
 #define TBS_NOTHUMB	128
-#define TBS_TOOLTIPS    0x0100
-#define TBS_REVERSED    0x0200
+#if (_WIN32_IE >= 0x0300)
+#define TBS_TOOLTIPS 0x0100
+#define TBTS_TOP 0
+#define TBTS_LEFT 1
+#define TBTS_BOTTOM 2
+#define TBTS_RIGHT 3
+#endif
+#if (_WIN32_IE >= 0x0500)
+#define TBS_REVERSED 0x0200
+#endif
+#if (_WIN32_IE >= 0x0501)
+#define TBS_DOWNISLEFT 0x0400
+#endif
 #if _WIN32_IE >= 0x400
-#define TBIF_BYINDEX -2147483648
+#define TBIF_BYINDEX 0x80000000
 #define TBIF_COMMAND 32
 #define TBIF_IMAGE 1
 #define TBIF_LPARAM 16
@@ -713,12 +905,6 @@ extern "C" {
 #define LVS_NOCOLUMNHEADER	0x4000
 #define LVS_NOSORTHEADER	0x8000
 #if (_WIN32_IE >= 0x0300)
-#define HDS_HOTTRACK	0x0004
-#define HDS_DRAGDROP	0x0040
-#define HDS_FULLDRAG	0x0080
-#define HDS_FILTERBAR	0x0100
-/* FIXME: missing CDIS_INDETERMINATE,CDIS_MARKED,
- CDDS_SUBITEM, CDRF_NOTIFYSUBITEMDRAW */
 #define CDIS_CHECKED 8
 #define CDIS_DEFAULT 32
 #define CDIS_DISABLED 4
@@ -726,6 +912,11 @@ extern "C" {
 #define CDIS_GRAYED 2
 #define CDIS_HOT 64
 #define CDIS_SELECTED 1
+#define CDIS_MARKED 128
+#define CDIS_INDETERMINATE 256
+#if (_WIN32_WINNT >= _WXP)
+#define CDIS_SHOWKEYBOARDCUES 512
+#endif
 #define CDDS_POSTERASE 4
 #define CDDS_POSTPAINT 2
 #define CDDS_PREERASE 3
@@ -735,6 +926,10 @@ extern "C" {
 #define CDDS_ITEMPOSTPAINT 65538
 #define CDDS_ITEMPREERASE 65539
 #define CDDS_ITEMPREPAINT 65537
+#if (_WIN32_IE >= 0x0400)
+#define CDDS_SUBITEM 0x20000
+#endif
+/* FIXME: missing CDRF_NOTIFYSUBITEMDRAW */
 #define CDRF_DODEFAULT 0
 #define CDRF_NOTIFYITEMDRAW 32
 #define CDRF_NOTIFYITEMERASE 128
@@ -791,6 +986,14 @@ extern "C" {
 #define LVIF_IMAGE	2
 #define LVIF_PARAM	4
 #define LVIF_STATE	8
+#if (_WIN32_IE >= 0x0300)
+#define LVIF_INDENT 16
+#define LVIF_NORECOMPUTE 2048
+#endif
+#if (_WIN32_WINNT >= _WXP)
+#define LVIF_GROUPID 128
+#define LVIF_COLUMNS 256
+#endif
 #define LVIS_FOCUSED	1
 #define LVIS_SELECTED	2
 #define LVIS_CUT	4
@@ -815,7 +1018,17 @@ extern "C" {
 #define LVM_SETBKIMAGEW	(LVM_FIRST + 138)
 #define LVM_GETBKIMAGEA	(LVM_FIRST + 69)
 #define LVM_GETBKIMAGEW	(LVM_FIRST + 139)
-#endif /* _WIN32_IE >=0x0400 */
+#define LV_MAX_WORKAREAS	16
+#define LVM_SETWORKAREAS	(LVM_FIRST+65)
+#define LVM_GETWORKAREAS	(LVM_FIRST+70)
+#define LVM_GETNUMBEROFWORKAREAS	(LVM_FIRST+73)
+#define LVM_GETSELECTIONMARK	(LVM_FIRST+66)
+#define LVM_SETSELECTIONMARK	(LVM_FIRST+67)
+#define LVM_SETHOVERTIME	(LVM_FIRST+71)
+#define LVM_GETHOVERTIME	(LVM_FIRST+72)
+#define LVM_SETTOOLTIPS	(LVM_FIRST+74)
+#define LVM_GETTOOLTIPS	(LVM_FIRST+78)
+#endif /* _WIN32_IE >= 0x0400 */
 #define LVNI_ALL	0
 #define LVNI_FOCUSED	1
 #define LVNI_SELECTED	2
@@ -949,9 +1162,12 @@ extern "C" {
 #define LVN_SETDISPINFOW	(LVN_FIRST-78)
 #define LVN_KEYDOWN	(LVN_FIRST-55)
 #if (_WIN32_IE >= 0x0400)
+#define LVN_GETINFOTIPA	(LVN_FIRST-57)
+#define LVN_GETINFOTIPW	(LVN_FIRST-58)
 #define LVKF_ALT	0x0001
 #define LVKF_CONTROL	0x0002
 #define LVKF_SHIFT	0x0004
+#define LVGIT_UNFOLDED  1
 #endif
 #define TVS_HASBUTTONS	1
 #define TVS_HASLINES	2
@@ -1046,11 +1262,21 @@ extern "C" {
 #define TVM_SETITEMHEIGHT (TV_FIRST+27)
 #define TVM_SETSCROLLTIME (TV_FIRST+33)
 #define TVM_SETTEXTCOLOR (TV_FIRST+30)
+#define TVM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT
+#define TVM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT
+#endif
+#if (_WIN32_IE >= 0x0500)
+#define TVM_GETITEMSTATE (TV_FIRST+39)
+#define TVM_SETLINECOLOR (TV_FIRST+40)
+#define TVM_GETLINECOLOR (TV_FIRST+41)
 #endif
 #define TVE_COLLAPSE	1
 #define TVE_EXPAND	2
 #define TVE_TOGGLE	3
 #define TVE_COLLAPSERESET	0x8000
+#if (_WIN32_IE >= 0x0300)
+#define TVE_EXPANDPARTIAL	0x4000
+#endif
 #define TVC_UNKNOWN	0
 #define TVC_BYMOUSE	1
 #define TVC_BYKEYBOARD	2
@@ -1064,6 +1290,9 @@ extern "C" {
 #define TVGN_PREVIOUSVISIBLE	7
 #define TVGN_DROPHILITE	8
 #define TVGN_CARET	9
+#if (_WIN32_IE >= 0x0400)
+#define TVGN_LASTVISIBLE	10
+#endif
 #define TVN_SELCHANGINGA	(TVN_FIRST-1)
 #define TVN_SELCHANGINGW	(TVN_FIRST-50)
 #define TVN_SELCHANGEDA	(TVN_FIRST-2)
@@ -1087,6 +1316,14 @@ extern "C" {
 #define TVN_ENDLABELEDITA	(TVN_FIRST-11)
 #define TVN_ENDLABELEDITW	(TVN_FIRST-60)
 #define TVN_KEYDOWN	(TVN_FIRST-12)
+#if (_WIN32_IE >= 0x0400)
+#define TVN_GETINFOTIPA	(TVN_FIRST-13)
+#define TVN_GETINFOTIPW	(TVN_FIRST-14)
+#define TVN_SINGLEEXPAND	(TVN_FIRST-15)
+#define TVNRET_DEFAULT 0
+#define TVNRET_SKIPOLD 1
+#define TVNRET_SKIPNEW 2
+#endif /* _WIN32_IE >= 0x0400 */
 #define TVIF_DI_SETITEM	0x1000
 #define TVHT_NOWHERE	1
 #define TVHT_ONITEMICON	2
@@ -1134,6 +1371,9 @@ extern "C" {
 #define TCIF_IMAGE	2
 #define TCIF_RTLREADING	4
 #define TCIF_PARAM	8
+#if (_WIN32_IE >= 0x0400)
+#define TCIF_STATE	16
+#endif
 #define TCM_FIRST	0x1300
 #define TCM_GETIMAGELIST	(TCM_FIRST+2)
 #define TCM_SETIMAGELIST	(TCM_FIRST+3)
@@ -1188,13 +1428,23 @@ extern "C" {
 #define NM_RELEASEDCAPTURE (NM_FIRST-16)
 #define NM_SETCURSOR (NM_FIRST-17)
 #define NM_CHAR (NM_FIRST-18)
+#define NM_TOOLTIPSCREATED (NM_FIRST-19)
 #define SBARS_SIZEGRIP 256
+#define CCM_FIRST 0x2000
+#define CCM_LAST (CCM_FIRST+0x200)
 #define CCM_SETBKCOLOR 8193
 #define CCM_SETCOLORSCHEME 8194
 #define CCM_GETCOLORSCHEME 8195
 #define CCM_GETDROPTARGET 8196
 #define CCM_SETUNICODEFORMAT 8197
 #define CCM_GETUNICODEFORMAT 8198
+#define CCM_SETVERSION 0x2007
+#define CCM_GETVERSION 0x2008
+#define CCM_SETNOTIFYWINDOW 0x2009
+#if (_WIN32_WINNT >= _WXP)
+#define CCM_SETWINDOWTHEME 0x200b
+#define CCM_DPISCALE 0x200c
+#endif 
 #define ICC_LISTVIEW_CLASSES 1
 #define ICC_TREEVIEW_CLASSES 2
 #define ICC_BAR_CLASSES	4
@@ -1211,7 +1461,7 @@ extern "C" {
 #define ICC_INTERNET_CLASSES 2048
 #define ICC_PAGESCROLLER_CLASS 4096
 #define ICC_NATIVEFNTCTL_CLASS 8192
-#define INFOTIPSIZE
+#define INFOTIPSIZE 1024
 #endif /* _WIN32_IE */
 #define GDTR_MIN 1
 #define GDTR_MAX 2
@@ -1281,12 +1531,13 @@ extern "C" {
 #define MCM_SETRANGE 0x1012
 #define MCM_GETMONTHDELTA 0x1013
 #define MCM_SETMONTHDELTA 0x1014
+#define MCM_GETMAXTODAYWIDTH 0x1015
 #define MCN_SELCHANGE	  ((UINT)-749)
 #define MCN_GETDAYSTATE	((UINT)-747)
 #define MCN_SELECT		((UINT)-746)
 #define ODT_HEADER 100
 #define ODT_TAB 101
-#define ODT_LISTVIEW
+#define ODT_LISTVIEW 102
 #define SB_SETBKCOLOR	0x2001
 #if (_WIN32_IE >= 0x0300)
 #define SB_ISSIMPLE 1038
@@ -1297,6 +1548,25 @@ extern "C" {
 #define MCSC_MONTHBK 4
 #define MCSC_TRAILINGTEXT 5
 #endif
+#if (_WIN32_IE >= 0x0400)
+#define MCHT_TITLE 0x10000
+#define MCHT_CALENDAR 0x20000
+#define MCHT_TODAYLINK 0x30000
+#define MCHT_NEXT 0x1000000
+#define MCHT_PREV 0x2000000
+#define MCHT_NOWHERE 0x00
+#define MCHT_TITLEBK (MCHT_TITLE)
+#define MCHT_TITLEMONTH (MCHT_TITLE | 0x0001)
+#define MCHT_TITLEYEAR (MCHT_TITLE | 0x0002)
+#define MCHT_TITLEBTNNEXT (MCHT_TITLE | MCHT_NEXT | 0x0003)
+#define MCHT_TITLEBTNPREV (MCHT_TITLE | MCHT_PREV | 0x0003)
+#define MCHT_CALENDARBK (MCHT_CALENDAR)
+#define MCHT_CALENDARDATE (MCHT_CALENDAR | 0x0001)
+#define MCHT_CALENDARDATENEXT (MCHT_CALENDARDATE | MCHT_NEXT)
+#define MCHT_CALENDARDATEPREV (MCHT_CALENDARDATE | MCHT_PREV)
+#define MCHT_CALENDARDAY (MCHT_CALENDAR | 0x0002)
+#define MCHT_CALENDARWEEKNUM (MCHT_CALENDAR | 0x0003)
+#endif /* _WIN32_IE >= 0x0400 */
 #define RBS_TOOLTIPS 256
 #define RBS_VARHEIGHT 512
 #define RBS_BANDBORDERS 1024
@@ -1344,8 +1614,6 @@ extern "C" {
 #endif
 #endif /* _WIN32_IE */
 #if (_WIN32_IE >= 0x0400)
-#define UDM_SETRANGE32	1135
-#define UDM_GETRANGE32	1136
 #define SB_SETICON 1039
 #define SB_SETTIPTEXTA	1040
 #define SB_SETTIPTEXTW	1041
@@ -1354,6 +1622,37 @@ extern "C" {
 #define SB_GETICON	1044
 #define SB_SETUNICODEFORMAT	0x2005
 #define SB_GETUNICODEFORMAT	0x2006
+#define PGF_INVISIBLE 0
+#define PGF_NORMAL 1
+#define PGF_GRAYED 2
+#define PGF_DEPRESSED 4
+#define PGF_HOT 8
+#define PGB_TOPORLEFT 0
+#define PGB_BOTTOMORRIGHT 1
+#define PGF_SCROLLUP 1
+#define PGF_SCROLLDOWN 2
+#define PGF_SCROLLLEFT 4
+#define PGF_SCROLLRIGHT 8
+#define PGK_SHIFT 1
+#define PGK_CONTROL 2
+#define PGK_MENU 4
+#define PGF_CALCWIDTH 1
+#define PGF_CALCHEIGHT 2
+#define PGM_FIRST 0x1400
+#define PGM_SETCHILD (PGM_FIRST+1)
+#define PGM_RECALCSIZE (PGM_FIRST+2)
+#define PGM_FORWARDMOUSE (PGM_FIRST+3)
+#define PGM_SETBKCOLOR (PGM_FIRST+4)
+#define PGM_GETBKCOLOR (PGM_FIRST+5)
+#define PGM_SETBORDER (PGM_FIRST+6)
+#define PGM_GETBORDER (PGM_FIRST+7)
+#define PGM_SETPOS (PGM_FIRST+8)
+#define PGM_GETPOS (PGM_FIRST+9)
+#define PGM_SETBUTTONSIZE (PGM_FIRST+10)
+#define PGM_GETBUTTONSIZE (PGM_FIRST+11)
+#define PGM_GETBUTTONSTATE (PGM_FIRST+12)
+#define PGM_GETDROPTARGET CCM_GETDROPTARGET
+
 #define RBS_REGISTERDROP 4096
 #define RBS_AUTOSIZE 8192
 #define RBS_VERTICALGRIPPER 16384
@@ -1487,7 +1786,76 @@ typedef struct tagNMIPADDRESS{
 	int iField;
 	int iValue;
 } NMIPADDRESS, *LPNMIPADDRESS;
-#endif /*_WIN32_IE >= 0x0400*/
+typedef struct tagLVKEYDOWN {
+	NMHDR hdr;
+	WORD wVKey;
+	UINT flags;
+} NMLVKEYDOWN, *LPNMLVKEYDOWN;
+typedef struct {
+	NMHDR hdr;
+	DWORD dwFlag;
+	int iWidth;
+	int iHeight;
+} NMPGCALCSIZE, *LPNMPGCALCSIZE;
+typedef struct {
+	NMHDR hdr;
+	BOOL fwKeys;
+	RECT rcParent;
+	int iDir;
+	int iXpos;
+	int iYpos;
+	int iScroll;
+} NMPGSCROLL, *LPNMPGSCROLL;
+typedef struct tagNMSELCHANGE {
+	NMHDR nmhdr;
+	SYSTEMTIME stSelStart;
+	SYSTEMTIME stSelEnd;
+} NMSELCHANGE, *LPNMSELCHANGE;
+typedef struct tagNMTBHOTITEM {
+	NMHDR hdr;
+	int idOld;
+	int idNew;
+	DWORD dwFlags;
+} NMTBHOTITEM, *LPNMTBHOTITEM;
+typedef struct {
+	NMHDR hdr;
+	DWORD dwMask;
+	int idCommand;
+	DWORD_PTR lParam;
+	int iImage;
+	LPSTR pszText;
+	int cchText;
+} NMTBDISPINFOA, *LPNMTBDISPINFOA;
+typedef struct {
+	NMHDR hdr;
+	DWORD dwMask;
+	int idCommand;
+	DWORD_PTR lParam;
+	int iImage;
+	LPWSTR pszText;
+	int cchText;
+} NMTBDISPINFOW, *LPNMTBDISPINFOW;
+typedef struct tagNMMOUSE {
+	NMHDR hdr;
+	DWORD_PTR dwItemSpec;
+	DWORD_PTR dwItemData;
+	POINT pt;
+	LPARAM dwHitInfo;
+} NMMOUSE, *LPNMMOUSE;
+#endif /*_WIN32_IE >= 0x0400 */
+#if (_WIN32_IE >= 0x0401)
+typedef struct tagNMTOOLTIPSCREATED
+{
+	NMHDR hdr;
+	HWND hwndToolTips;
+} NMTOOLTIPSCREATED, *LPNMTOOLTIPSCREATED;
+#endif
+typedef struct tagNMDATETIMECHANGE
+{
+	NMHDR nmhdr;
+	DWORD dwFlags;
+	SYSTEMTIME st;
+} NMDATETIMECHANGE, *LPNMDATETIMECHANGE;
 typedef struct {
 	NMHDR hdr;
 	BOOL fChanged;
@@ -1546,6 +1914,10 @@ typedef struct {
 	LPWSTR pszText;
 	int cchText;
 } TBBUTTONINFOW, *LPTBBUTTONINFOW;
+typedef struct {
+	int iButton;
+	DWORD dwFlags;
+} TBINSERTMARK, *LPTBINSERTMARK;
 typedef struct tagLVBKIMAGEA {
 	ULONG ulFlags;              
 	HBITMAP hbm;
@@ -1581,8 +1953,8 @@ typedef struct _IMAGEINFO {
 	int Unused1;
 	int Unused2;
 	RECT rcImage;
-} IMAGEINFO;
-DECLARE_HANDLE(HIMAGELIST);
+} IMAGEINFO, *LPIMAGEINFO;
+typedef struct _IMAGELIST *HIMAGELIST;
 typedef struct _HDITEMA {
 	UINT mask;
 	int cxy;
@@ -1630,7 +2002,7 @@ typedef struct _HD_HITTESTINFO {
 	POINT pt;
 	UINT flags;
 	int iItem;
-} HD_HITTESTINFO;
+} HD_HITTESTINFO, *LPHDHITTESTINFO;
 typedef struct _HD_NOTIFYA {
 	NMHDR hdr;
 	int iItem;
@@ -1702,6 +2074,28 @@ typedef struct tagNMLVCUSTOMDRAW {
     int          iSubItem;
 #endif
 } NMLVCUSTOMDRAW, *LPNMLVCUSTOMDRAW;
+#if (_WIN32_IE >= 0x0400)
+typedef struct tagNMLVGETINFOTIPA
+{
+	NMHDR hdr;
+	DWORD dwFlags;
+	LPSTR pszText;
+	int cchTextMax;
+	int iItem;
+	int iSubItem;
+	LPARAM lParam;
+} NMLVGETINFOTIPA, *LPNMLVGETINFOTIPA;
+typedef struct tagNMLVGETINFOTIPW
+{
+	NMHDR hdr;
+	DWORD dwFlags;
+	LPWSTR pszText;
+	int cchTextMax;
+	int iItem;
+	int iSubItem;
+	LPARAM lParam;
+} NMLVGETINFOTIPW, *LPNMLVGETINFOTIPW;
+#endif /* _WIN32_IE >= 0x0400 */
 typedef struct tagNMTVCUSTOMDRAW {
     NMCUSTOMDRAW nmcd;
     COLORREF     clrText;
@@ -1711,6 +2105,24 @@ typedef struct tagNMTVCUSTOMDRAW {
 #endif
 } NMTVCUSTOMDRAW, *LPNMTVCUSTOMDRAW;
 #if (_WIN32_IE >= 0x400)
+typedef struct _NMTBCUSTOMDRAW {
+	NMCUSTOMDRAW nmcd;
+	HBRUSH hbrMonoDither;
+	HBRUSH hbrLines;
+	HPEN hpenLines;
+	COLORREF clrText;
+	COLORREF clrMark;
+	COLORREF clrTextHighlight;
+	COLORREF clrBtnFace;
+	COLORREF clrBtnHighlight;
+	COLORREF clrHighlightHotTrack;
+	RECT rcText;
+	int nStringBkMode;
+	int nHLStringBkMode;
+#if (_WIN32_WINNT >= _WXP)
+	int iListGap;
+#endif
+} NMTBCUSTOMDRAW, * LPNMTBCUSTOMDRAW;
 typedef struct tagNMITEMACTIVATE {
 	NMHDR hdr;
 	int iItem;
@@ -1779,7 +2191,12 @@ typedef struct tagTOOLINFOA {
 #if (_WIN32_IE >= 0x0300)
 	LPARAM lParam;
 #endif
-} TOOLINFOA,*PTOOLINFOA,*LPTOOLINFOA;
+} TTTOOLINFOA,*LPTTTOOLINFOA,*PTOOLINFOA;
+#define TOOLINFOA TTTOOLINFOA
+#define LPTOOLINFOA LPTTTOOLINFOA
+#define TTTOOLINFOA_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpszText)
+#define TTTOOLINFOA_V2_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lParam)
+#define TTTOOLINFOA_V3_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpReserved)
 typedef struct tagTOOLINFOW {
 	UINT cbSize;
 	UINT uFlags;
@@ -1791,17 +2208,24 @@ typedef struct tagTOOLINFOW {
 #if (_WIN32_IE >= 0x0300)
 	LPARAM lParam;
 #endif
-} TOOLINFOW,*PTOOLINFOW,*LPTOOLINFOW;
+} TTTOOLINFOW,*LPTTTOOLINFOW,*PTOOLINFOW;
+#define TOOLINFOW TTTOOLINFOW
+#define LPTOOLINFOW LPTTTOOLINFOW
+#define TTTOOLINFOW_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpszText)
+#define TTTOOLINFOW_V2_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lParam)
+#define TTTOOLINFOW_V3_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpReserved)
 typedef struct _TT_HITTESTINFOA {
 	HWND hwnd;
 	POINT pt;
 	TOOLINFOA ti;
-} TTHITTESTINFOA,*LPHITTESTINFOA;
+} TTHITTESTINFOA,*LPTTHITTESTINFOA;
+#define LPHITTESTINFOA    LPTTHITTESTINFOA
 typedef struct _TT_HITTESTINFOW {
 	HWND hwnd;
 	POINT pt;
 	TOOLINFOW ti;
-} TTHITTESTINFOW,*LPHITTESTINFOW;
+} TTHITTESTINFOW,*LPTTHITTESTINFOW;
+#define LPHITTESTINFOW    LPTTHITTESTINFOW
 typedef struct tagNMTTDISPINFOA {
 	NMHDR hdr;
 	LPSTR lpszText;
@@ -1851,6 +2275,11 @@ typedef struct _LVITEMA {
 #if (_WIN32_IE >= 0x0300)
 	int iIndent;
 #endif
+#if (_WIN32_WINNT >= _WXP)
+	int iGroupId;
+	UINT cColumns;
+	PUINT puColumns;
+#endif
 } LVITEMA, FAR *LPLVITEMA;
 #define _LV_ITEMA _LVITEMA
 #define LV_ITEMA LVITEMA
@@ -1867,6 +2296,11 @@ typedef struct _LVITEMW {
 #if (_WIN32_IE >= 0x0300)
 	int iIndent;
 #endif
+#if (_WIN32_WINNT >= _WXP)
+	int iGroupId;
+	UINT cColumns;
+	PUINT puColumns;
+#endif
 } LVITEMW, FAR *LPLVITEMW;
 #define _LV_ITEMW _LVITEMW
 #define LV_ITEMW LVITEMW
@@ -1895,7 +2329,7 @@ typedef struct _LVHITTESTINFO {
 #if (_WIN32_IE >= 0x0300)
 	int iSubItem;
 #endif
-} LVHITTESTINFO;
+} LVHITTESTINFO, FAR *LPLVHITTESTINFO;
 #define _LV_HITTESTINFO _LVHITTESTINFO
 #define LV_HITTESTINFO LVHITTESTINFO
 typedef struct _LVCOLUMNA {
@@ -1964,7 +2398,7 @@ typedef struct tagNMLVCACHEHINT {
 	int iTo;
 } NMLVCACHEHINT, *PNMLVCACHEHINT;
 #define NM_CACHEHINT NMLVCACHEHINT
-DECLARE_HANDLE(HTREEITEM);
+typedef struct _TREEITEM *HTREEITEM;
 typedef struct tagTVITEMA {
 	UINT mask;
 	HTREEITEM hItem;
@@ -2123,28 +2557,42 @@ typedef struct _TC_ITEMHEADERW {
 	int cchTextMax;
 	int iImage;
 } TC_ITEMHEADERW;
-typedef struct _TC_ITEMA {
+typedef struct tagTCITEMA {
 	UINT mask;
-	UINT lpReserved1;
-	UINT lpReserved2;
+#if (_WIN32_IE >= 0x0300)
+	DWORD dwState;
+	DWORD dwStateMask;
+#else
+ 	UINT lpReserved1;
+ 	UINT lpReserved2;
+#endif
 	LPSTR pszText;
 	int cchTextMax;
 	int iImage;
 	LPARAM lParam;
-} TC_ITEMA;
-typedef struct _TC_ITEMW {
+} TCITEMA, *LPTCITEMA;
+#define TC_ITEMA TCITEMA
+typedef struct tagTCITEMW {
 	UINT mask;
-	UINT lpReserved1;
-	UINT lpReserved2;
+#if (_WIN32_IE >= 0x0300)
+	DWORD dwState;
+	DWORD dwStateMask;
+#else
+ 	UINT lpReserved1;
+ 	UINT lpReserved2;
+#endif
 	LPWSTR pszText;
 	int cchTextMax;
 	int iImage;
 	LPARAM lParam;
-} TC_ITEMW;
-typedef struct _TC_HITTESTINFO {
+} TCITEMW, *LPTCITEMW;
+#define TC_ITEMW TCITEMW
+typedef struct tagTCHITTESTINFO {
 	POINT pt;
 	UINT flags;
-} TC_HITTESTINFO,*LPTC_HITTESTINFO;
+} TCHITTESTINFO, *LPTCHITTESTINFO;
+#define TC_HITTESTINFO TCHITTESTINFO
+#define LPTC_HITTESTINFO LPTCHITTESTINFO
 typedef struct _TC_KEYDOWN {
 	NMHDR hdr;
 	WORD wVKey;
@@ -2165,24 +2613,6 @@ typedef struct tagCOLORSCHEME {
 	COLORREF clrBtnHighlight;
 	COLORREF clrBtnShadow;
 } COLORSCHEME,*LPCOLORSCHEME;
-typedef struct tagTCITEM {
-	UINT mask;
-#if (_WIN32_IE >= 0x0300)
-	DWORD dwState;
-	DWORD dwStateMask;
-#else
-	UINT lpReserved1;
-	UINT lpReserved2;
-#endif
-#ifdef UNICODE
-	LPWSTR pszText;
-#else
-	LPSTR pszText;
-#endif
-	int cchTextMax;
-	int iImage;
-	LPARAM lParam;
-} TCITEM,*LPTCITEM;
 typedef struct tagMCHITTESTINFO {
 	UINT cbSize;
 	POINT pt;
@@ -2254,12 +2684,7 @@ typedef REBARBANDINFOA const *LPCREBARBANDINFOA;
 typedef REBARBANDINFOW const *LPCREBARBANDINFOW;
 #define REBARBANDINFOA_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOA,wID)
 #define REBARBANDINFOW_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOW, wID)
-
 #if (_WIN32_IE >= 0x0300)
-typedef struct tagTCHITTESTINFO {
-	POINT pt;
-	UINT flags;
-} TCHITTESTINFO,*LPTCHITTESTINFO;
 typedef struct tagIMAGELISTDRAWPARAMS {
 	DWORD cbSize;
 	HIMAGELIST himl;
@@ -2275,6 +2700,11 @@ typedef struct tagIMAGELISTDRAWPARAMS {
 	COLORREF rgbFg;
 	UINT fStyle;
 	DWORD dwRop;
+#if (_WIN32_WINNT >= _WXP)
+	DWORD fState;
+	DWORD Frame;
+	COLORREF crEffect;
+#endif
 } IMAGELISTDRAWPARAMS,*LPIMAGELISTDRAWPARAMS;
 #endif /* (_WIN32_IE >= 0x0300) */
 #if (_WIN32_IE >= 0x0400)
@@ -2320,7 +2750,7 @@ typedef struct _RB_HITTESTINFO {
 #define INDEXTOSTATEIMAGEMASK(i) ((i)<<12)
 #define HANDLE_WM_NOTIFY(h,w,l,f) (f)((h),(int)(w),(NMHDR*)(l))
 #define FORWARD_WM_NOTIFY(h,i,p,f) (LRESULT)(f)((h),WM_NOTIFY,(WPARAM)(int)(i),(LPARAM)(NMHDR*)(p))
-#define CCSIZEOF_STRUCT(n,m) (((int)((PBYTE)(&((s*)0)->m)-((PBYTE)((s*)0))))+sizeof(((s*)0)->m))
+#define CCSIZEOF_STRUCT(s,m) (((int)((PBYTE)(&((s*)0)->m)-((PBYTE)((s*)0))))+sizeof(((s*)0)->m))
 #define MAKEIPADDRESS(b1,b2,b3,b4) ((LPARAM)(((DWORD)(b1)<<24)+((DWORD)(b2)<<16)+((DWORD)(b3)<<8)+((DWORD)(b4))))
 #define MAKEIPRANGE(low,high) ((LPARAM)(WORD)(((BYTE)(high)<<8)+(BYTE)(low)))
 #define FIRST_IPADDRESS(a) ((a>>24) & 0xff)
@@ -2590,6 +3020,15 @@ WINBOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*);
 #define ListView_GetBkImage(h,plvbki) (BOOL)SNDMSG((h), LVM_GETBKIMAGE, 0, (LPARAM)(plvbki))
 #define ListView_SetBkImage(h, plvbki) (BOOL)SNDMSG((h), LVM_SETBKIMAGE, 0, (LPARAM)(plvbki))
 #define ListView_SetExtendedListViewStyleEx(w,m,s) (DWORD)SNDMSG((w),LVM_SETEXTENDEDLISTVIEWSTYLE,(m),(s))
+#define ListView_SetWorkAreas(w,n,r) (BOOL)SNDMSG((w),LVM_SETWORKAREAS,(WPARAM)(n),(LPARAM)(RECT *)(r))
+#define ListView_GetWorkAreas(w,n,r) (BOOL)SNDMSG((w),LVM_GETWORKAREAS,(WPARAM)(n),(LPARAM)(RECT *)(r))
+#define ListView_GetNumberOfWorkAreas(w,n) (BOOL)SNDMSG((w),LVM_GETNUMBEROFWORKAREAS,0,(LPARAM)(UINT *)(pnWorkAreas))
+#define ListView_SetHoverTime(w,t) (DWORD)SNDMSG((w),LVM_SETHOVERTIME,0,(LPARAM)(t))
+#define ListView_GetHoverTime(w) (DWORD)SNDMSG((w),LVM_GETHOVERTIME,0,0)
+#define ListView_GetSelectionMark(w) (INT)SNDMSG((w),LVM_GETSELECTIONMARK,0,0)
+#define ListView_SetSelectionMark(w,i) (INT)SNDMSG((w),LVM_SETSELECTIONMARK,0,(LPARAM)(i))
+#define ListView_SetToolTips(w,n) (HWND)SNDMSG((w),LVM_SETTOOLTIPS,(WPARAM)(n),0)
+#define ListView_GetToolTips(w) (HWND)SNDMSG((w),LVM_GETTOOLTIPS,0,0)
 #define TabCtrl_HighlightItem(hwnd, i, fHighlight) SNDMSG((hwnd), TCM_HIGHLIGHTITEM, (WPARAM)i, (LPARAM)MAKELONG (fHighlight, 0))
 #define TabCtrl_SetExtendedStyle(hwnd, dw) SNDMSG((hwnd), TCM_SETEXTENDEDSTYLE, 0, dw)
 #define TabCtrl_GetExtendedStyle(hwnd) SNDMSG((hwnd), TCM_GETEXTENDEDSTYLE, 0, 0)
@@ -2605,12 +3044,18 @@ WINBOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*);
 #define TreeView_SetItemHeight(w,h) (int)SNDMSG((w),TVM_SETITEMHEIGHT,(WPARAM)(h),0)
 #define TreeView_SetScrollTime(w,t) (UINT)SNDMSG((w),TVM_SETSCROLLTIME,(WPARAM)(UINT)(t),0)
 #define TreeView_SetTextColor(w,c) (COLORREF)SNDMSG((w),TVM_SETTEXTCOLOR,0,(LPARAM)(c))
+#define TreeView_SetInsertMark(w,i,a) (BOOL)SNDMSG((w),TVM_SETINSERTMARK,(WPARAM)(a),(LPARAM)(i))
+#define TreeView_SetUnicodeFormat(w,u) (BOOL)SNDMSG((w),TVM_SETUNICODEFORMAT,(WPARAM)(u),0)
+#define TreeView_GetUnicodeFormat(w) (BOOL)SNDMSG((w),TVM_GETUNICODEFORMAT,0,0)
+#endif
+#if (_WIN32_IE >= 0x0500)
+#define TreeView_GetItemState(w,i,m) (UINT)SNDMSG((w),TVM_GETITEMSTATE,(WPARAM)(i),(LPARAM)(m))
 #endif
 
 #ifdef UNICODE
 typedef HDITEMW HDITEM;
 typedef TOOLINFOW TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
-typedef TTHITTESTINFOW TTHITTESTINFO,*LPHITTESTINFO;
+typedef TTHITTESTINFOW TTHITTESTINFO,*LPHITTESTINFO,*LPTTHITTESTINFO;
 typedef TOOLTIPTEXTW TOOLTIPTEXT,*LPTOOLTIPTEXT;
 typedef NMTTDISPINFOW NMTTDISPINFO, *LPNMTTDISPINFO;
 typedef TV_ITEMW TV_ITEM,*LPTV_ITEM;
@@ -2667,8 +3112,16 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
 #define TB_ADDSTRING TB_ADDSTRINGW
 #define TBN_GETBUTTONINFO TBN_GETBUTTONINFOW
 #if _WIN32_IE >= 0x400
+#define TB_GETBUTTONINFO TB_GETBUTTONINFOW
+#define TB_SETBUTTONINFO TB_SETBUTTONINFOW
+#define TB_INSERTBUTTON TB_INSERTBUTTONW
+#define TB_ADDBUTTONS TB_ADDBUTTONSW
+#define TB_MAPACCELERATOR TB_MAPACCELERATORW
 #define TBBUTTONINFO TBBUTTONINFOW
 #define LPTBBUTTONINFO LPTBBUTTONINFOW
+#define TBN_GETDISPINFO TBN_GETDISPINFOW
+#define NMTBDISPINFO NMTBDISPINFOW
+#define LPNMTBDISPINFO LPNMTBDISPINFOW
 #endif
 #define TBNOTIFY TBNOTIFYW
 #define LPTBNOTIFY LPTBNOTIFYW
@@ -2703,6 +3156,7 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
 #define LVM_INSERTITEM LVM_INSERTITEMW
 #define LV_FINDINFO LV_FINDINFOW
 #define LVFINDINFO LVFINDINFOW
+#define LPFINDINFO LPFINDINFOW
 #define LVM_FINDITEM LVM_FINDITEMW
 #define LVM_GETSTRINGWIDTH LVM_GETSTRINGWIDTHW
 #define LVM_EDITLABEL LVM_EDITLABELW
@@ -2718,6 +3172,9 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
 #define LVN_ENDLABELEDIT LVN_ENDLABELEDITW
 #define LVN_GETDISPINFO LVN_GETDISPINFOW
 #define LVN_SETDISPINFO LVN_SETDISPINFOW
+#define LVN_GETINFOTIP LVN_GETINFOTIPW
+#define NMLVGETINFOTIP NMLVGETINFOTIPW
+#define LPNMLVGETINFOTIP LPNMLVGETINFOTIPW
 #define LV_DISPINFO LV_DISPINFOW
 #define NMLVDISPINFO NMLVDISPINFOW
 #define TVM_INSERTITEM TVM_INSERTITEMW
@@ -2741,6 +3198,8 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
 #define TVN_ENDLABELEDIT TVN_ENDLABELEDITW
 #define TC_ITEMHEADER TC_ITEMHEADERW
 #define TC_ITEM TC_ITEMW
+#define TCITEM TCITEMW
+#define LPTCITEM LPTCITEMW
 #define TCM_GETITEM TCM_GETITEMW
 #define TCM_SETITEM TCM_SETITEMW
 #define TCM_INSERTITEM TCM_INSERTITEMW
@@ -2760,7 +3219,7 @@ typedef REBARBANDINFOW REBARBANDINFO,*LPREBARBANDINFO;
 #else /* UNICODE */
 typedef HDITEMA HDITEM;
 typedef TOOLINFOA TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
-typedef TTHITTESTINFOA TTHITTESTINFO,*LPHITTESTINFO;
+typedef TTHITTESTINFOA TTHITTESTINFO,*LPHITTESTINFO,*LPTTHITTESTINFO;
 typedef TOOLTIPTEXTA TOOLTIPTEXT,*LPTOOLTIPTEXT;
 typedef NMTTDISPINFOA NMTTDISPINFO, *LPNMTTDISPINFO;
 typedef TV_ITEMA TV_ITEM,*LPTV_ITEM;
@@ -2785,6 +3244,11 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
 #define LPNMCBEENDEDIT	LPNMCBEENDEDITA
 #define PNMCBEENDEDIT	PNMCBEENDEDITA
 #if _WIN32_IE >= 0x0400
+#define TB_GETBUTTONINFO TB_GETBUTTONINFOA
+#define TB_SETBUTTONINFO TB_SETBUTTONINFOA
+#define TB_INSERTBUTTON TB_INSERTBUTTONA
+#define TB_ADDBUTTONS TB_ADDBUTTONSA
+#define TB_MAPACCELERATOR TB_MAPACCELERATORA
 #define NMCOMBOBOXEX	NMCOMBOBOXEXA
 #define PNMCOMBOBOXEX	PNMCOMBOBOXEXA
 #define CBEN_DRAGBEGIN	CBEN_DRAGBEGINA
@@ -2792,6 +3256,9 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
 #define NMCBEDRAGBEGIN	NMCBEDRAGBEGINA
 #define LPNMCBEDRAGBEGIN	LPNMCBEDRAGBEGINA
 #define PNMCBEDRAGBEGIN	PNMCBEDRAGBEGINA
+#define TBN_GETDISPINFO TBN_GETDISPINFOA
+#define NMTBDISPINFO NMTBDISPINFOA
+#define LPNMTBDISPINFO LPNMTBDISPINFOA
 #endif /* _WIN32_IE >= 0x0400 */
 #define SB_GETTEXT	SB_GETTEXTA
 #define SB_SETTEXT	SB_SETTEXTA
@@ -2853,6 +3320,7 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
 #define LVM_INSERTITEM LVM_INSERTITEMA
 #define LV_FINDINFO LV_FINDINFOA
 #define LVFINDINFO LVFINDINFOA
+#define LPFINDINFO LPFINDINFOA
 #define LVM_FINDITEM LVM_FINDITEMA
 #define LVM_GETSTRINGWIDTH LVM_GETSTRINGWIDTHA
 #define LVM_EDITLABEL LVM_EDITLABELA
@@ -2868,6 +3336,9 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
 #define LVN_ENDLABELEDIT LVN_ENDLABELEDITA
 #define LVN_GETDISPINFO LVN_GETDISPINFOA
 #define LVN_SETDISPINFO LVN_SETDISPINFOA
+#define LVN_GETINFOTIP LVN_GETINFOTIPA
+#define NMLVGETINFOTIP NMLVGETINFOTIPA
+#define LPNMLVGETINFOTIP LPNMLVGETINFOTIPA
 #define LV_DISPINFO LV_DISPINFOA
 #define NMLVDISPINFO NMLVDISPINFOA
 #define TVM_INSERTITEM TVM_INSERTITEMA
@@ -2891,6 +3362,8 @@ typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
 #define TVN_ENDLABELEDIT TVN_ENDLABELEDITA
 #define TC_ITEMHEADER TC_ITEMHEADERA
 #define TC_ITEM TC_ITEMA
+#define TCITEM TCITEMA
+#define LPTCITEM LPTCITEMA
 #define TCM_GETITEM TCM_GETITEMA
 #define TCM_SETITEM TCM_SETITEMA
 #define TCM_INSERTITEM TCM_INSERTITEMA