Merge MinGW differences

1 files changed, 163 insertions, 3 deletions

diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
index 028734585..bd023bf5f 100644
--- a/winsup/w32api/include/commctrl.h
+++ b/winsup/w32api/include/commctrl.h
@@ -72,6 +72,14 @@ extern "C" {
 #define CCS_NOMOVEX 130
 #define CCS_RIGHT 131
 #endif
+#define ACS_CENTER	0x0001
+#define ACS_TRANSPARENT	0x0002
+#define ACS_AUTOPLAY	0x0004
+#define ACS_TIMER	0x0008
+#define PGS_VERT	0x00000000
+#define PGS_HORZ	0x00000001
+#define PGS_AUTOSCROLL	0x00000002
+#define PGS_DRAGNDROP	0x00000004
 #define CMB_MASKED	2
 #define MINSYSCOMMAND	SC_SIZE
 #define SBT_OWNERDRAW	0x1000
@@ -153,6 +161,13 @@ extern "C" {
 #define HDI_DI_SETITEM	64
 #define HDI_ORDER	128
 #endif
+#define CBES_EX_NOEDITIMAGE	0x00000001
+#define CBES_EX_NOEDITIMAGEINDENT	0x00000002
+#define CBES_EX_PATHWORDBREAKPROC	0x00000004
+#if (_WIN32_IE >= 0x0400)
+#define CBES_EX_NOSIZELIMIT	0x00000008
+#define CBES_EX_CASESENSITIVE	0x00000010
+#endif /* _WIN32_IE >= 0x0400 */
 #if (_WIN32_IE >= 0x0500)
 #define HDI_FILTER	256
 #endif
@@ -231,6 +246,11 @@ extern "C" {
 #define TBSTYLE_LIST 4096
 #define TBSTYLE_CUSTOMERASE 8192
 #endif
+#if (_WIN32_IE >= 0x0400)
+#define TBSTYLE_REGISTERDROP	0x4000
+#define TBSTYLE_TRANSPARENT	0x8000
+#define TBSTYLE_EX_DRAWDDARROWS	0x00000001
+#endif /* _WIN32_IE >= 0x0400 */
 #define TB_ENABLEBUTTON	(WM_USER+1)
 #define TB_CHECKBUTTON	(WM_USER+2)
 #define TB_PRESSBUTTON	(WM_USER+3)
@@ -307,7 +327,9 @@ extern "C" {
 #define TBBF_LARGE 1
 #define TB_GETBITMAPFLAGS	(WM_USER+41)
 #if _WIN32_IE >= 0x400
-#define TB_SETBUTTONINFO    (WM_USER+66)
+#define TB_SETBUTTONINFO	(WM_USER+66)
+#define TB_SETEXTENDEDSTYLE	(WM_USER+84)
+#define TB_GETEXTENDEDSTYLE	(WM_USER+85)
 #endif
 #define TBN_GETBUTTONINFOA	(TBN_FIRST-0)
 #define TBN_GETBUTTONINFOW	(TBN_FIRST-20)
@@ -322,6 +344,12 @@ extern "C" {
 #define TBN_CUSTHELP	(TBN_FIRST-9)
 #define TTS_ALWAYSTIP	1
 #define TTS_NOPREFIX	2
+#if( _WIN32_IE >= 0x0500 )
+#define TTS_NOANIMATE	0x10
+#define TTS_NOFADE	0x20
+#define TTS_BALLOON	0x40
+#define TTS_CLOSE	0x80
+#endif /* _WIN32_IE >= 0x0500 */
 #define TTF_IDISHWND	1
 #define TTF_CENTERTIP	2
 #define TTF_RTLREADING	4
@@ -387,6 +415,9 @@ extern "C" {
 #define UDS_ARROWKEYS	32
 #define UDS_HORZ	64
 #define UDS_NOTHOUSANDS	128
+#if ( _WIN32_IE >= 0x0300 )
+#define UDS_HOTTRACK	0x0100
+#endif /* _WIN32_IE >= 0x0300 */
 #define UDM_SETRANGE	(WM_USER+101)
 #define UDM_GETRANGE	(WM_USER+102)
 #define UDM_SETPOS	(WM_USER+103)
@@ -413,6 +444,9 @@ extern "C" {
 #define SBT_NOBORDERS	256
 #define SBT_POPOUT	512
 #define SBT_RTLREADING	1024
+#if( _WIN32_IE >= 0x0400 )
+#define SBT_TOOLTIPS	0x0800
+#endif /* _WIN32_IE >= 0x0400 */
 #define TBS_AUTOTICKS	1
 #define TBS_VERT	2
 #define TBS_HORZ	0
@@ -425,6 +459,8 @@ 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 >= 0x400
 #define TBIF_BYINDEX -2147483648
 #define TBIF_COMMAND 32
@@ -521,6 +557,10 @@ 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
@@ -557,7 +597,19 @@ extern "C" {
 #define LVS_EX_TWOCLICKACTIVATE 128
 #define LVSICF_NOINVALIDATEALL	0x00000001
 #define LVSICF_NOSCROLL	0x00000002
-#endif
+#if( _WIN32_IE >= 0x0400 )
+#define LVS_EX_FLATSB	0x00000100
+#define LVS_EX_REGIONAL	0x00000200
+#define LVS_EX_INFOTIP	0x00000400
+#define LVS_EX_UNDERLINEHOT	0x00000800
+#define LVS_EX_UNDERLINECOLD	0x00001000
+#define LVS_EX_MULTIWORKAREAS	0x00002000
+#endif /* _WIN32_IE >=0x0400 */
+#if( _WIN32_IE >= 0x0500 )
+#define LVS_EX_LABELTIP	0x00004000
+#define LVS_EX_BORDERSELECT	0x00008000
+#endif  /* _WIN32_IE >= 0x0500 */
+#endif  /* _WIN32_IE >= 0x0300 */
 #define LVSIL_NORMAL	0
 #define LVSIL_SMALL	1
 #define LVSIL_STATE	2
@@ -721,6 +773,11 @@ extern "C" {
 #define LVN_SETDISPINFOA	(LVN_FIRST-51)
 #define LVN_SETDISPINFOW	(LVN_FIRST-78)
 #define LVN_KEYDOWN	(LVN_FIRST-55)
+#if (_WIN32_IE >= 0x0400)
+#define LVKF_ALT	0x0001
+#define LVKF_CONTROL	0x0002
+#define LVKF_SHIFT	0x0004
+#endif
 #define TVS_HASBUTTONS	1
 #define TVS_HASLINES	2
 #define TVS_LINESATROOT	4
@@ -740,6 +797,9 @@ extern "C" {
 #define TVS_NOSCROLL 8192
 #define TVS_SINGLEEXPAND 1024
 #endif
+#if( _WIN32_IE >= 0x0500 )
+#define TVS_NOHSCROLL	0x8000
+#endif /* _WIN32_IE >= 0x0500 */
 #define TVIF_TEXT	1
 #define TVIF_IMAGE	2
 #define TVIF_PARAM	4
@@ -747,6 +807,9 @@ extern "C" {
 #define TVIF_HANDLE	16
 #define TVIF_SELECTEDIMAGE	32
 #define TVIF_CHILDREN	64
+#if (_WIN32_IE >= 0x0400)
+#define TVIF_INTEGRAL	0x0080
+#endif /* _WIN32_IE >= 0x0400 */
 #define TVIS_FOCUSED	1
 #define TVIS_SELECTED	2
 #define TVIS_CUT	4
@@ -881,8 +944,15 @@ extern "C" {
 #define TCS_BOTTOM	2
 #define TCS_RIGHT	2
 #define TCS_VERTICAL	128
+#define TCS_SCROLLOPPOSITE	0x0001
 #define TCS_HOTTRACK	0x0040
+#define TCS_MULTISELECT	0x0004
 #endif
+#if( _WIN32_IE >= 0x0400 )
+#define TCS_FLATBUTTONS	0x0008
+#define TCS_EX_FLATSEPARATORS	0x00000001
+#define TCS_EX_REGISTERDROP	0x00000002
+#endif /* _WIN32_IE >= 0x0400 */
 #define TCIF_TEXT	1
 #define TCIF_IMAGE	2
 #define TCIF_RTLREADING	4
@@ -913,6 +983,7 @@ extern "C" {
 #define TCM_SETTOOLTIPS	(TCM_FIRST+46)
 #define TCM_GETCURFOCUS	(TCM_FIRST+47)
 #define TCM_SETCURFOCUS	(TCM_FIRST+48)
+#define TCM_GETEXTENDEDSTYLE    (TCM_FIRST + 53)
 #define TCN_KEYDOWN	TCN_FIRST
 #define TCN_SELCHANGE	(TCN_FIRST-1)
 #define TCN_SELCHANGING	(TCN_FIRST-2)
@@ -970,10 +1041,18 @@ extern "C" {
 #define DTS_TIMEFORMAT 9
 #define DTS_APPCANPARSE 16
 #define DTS_RIGHTALIGN 32
+#if ( _WIN32_IE >= 0x500 )
+#define DTS_SHORTDATECENTURYFORMAT	0x000C
+#endif /* _WIN32_IE >= 0x500 */
 #define MCS_DAYSTATE 1
 #define MCS_MULTISELECT 2
 #define MCS_WEEKNUMBERS 4
-#define MCS_NOTODAY 8
+#if (_WIN32_IE >= 0x0400)
+#define MCS_NOTODAYCIRCLE	0x0008
+#define MCS_NOTODAY	0x0010
+#else /* _WIN32_IE >= 0x0400 */
+#define MCS_NOTODAY	0x0008
+#endif /* _WIN32_IE >= 0x0400 */
 #define DTM_GETSYSTEMTIME 0x1001
 #define DTM_SETSYSTEMTIME 0x1002
 #define DTM_GETRANGE 0x1003
@@ -1146,6 +1225,26 @@ extern "C" {
 #else
 #define RB_GETBANDINFO (WM_USER+5)
 #endif /* _WIN32_IE >= 0x0400 */
+#define CBEM_INSERTITEMA	(WM_USER + 1)
+#define CBEM_SETIMAGELIST	(WM_USER + 2)
+#define CBEM_GETIMAGELIST	(WM_USER + 3)
+#define CBEM_GETITEMA	(WM_USER + 4)
+#define CBEM_SETITEMA	(WM_USER + 5)
+#define CBEM_DELETEITEM	CB_DELETESTRING
+#define CBEM_GETCOMBOCONTROL	(WM_USER + 6)
+#define CBEM_GETEDITCONTROL	(WM_USER + 7)
+#define CBEM_SETEXSTYLE	(WM_USER + 8)
+#define CBEM_GETEXSTYLE	(WM_USER + 9)
+#if (_WIN32_IE >= 0x0400)
+#define CBEM_SETEXTENDEDSTYLE	(WM_USER + 14)
+#define CBEM_GETEXTENDEDSTYLE	(WM_USER + 9)
+#define CBEM_SETUNICODEFORMAT	CCM_SETUNICODEFORMAT
+#define CBEM_GETUNICODEFORMAT	CCM_GETUNICODEFORMAT
+#endif /* _WIN32_IE >= 0x0400 */
+#define CBEM_HASEDITCHANGED	(WM_USER + 10)
+#define CBEM_INSERTITEMW	(WM_USER + 11)
+#define CBEM_SETITEMW	(WM_USER + 12)
+#define CBEM_GETITEMW	(WM_USER + 13)
 
 #ifndef RC_INVOKED
 typedef struct _COLORMAP {
@@ -1322,6 +1421,19 @@ typedef struct tagNMTVCUSTOMDRAW {
     int          iLevel;
 #endif
 } NMTVCUSTOMDRAW, *LPNMTVCUSTOMDRAW;
+#if (_WIN32_IE >= 0x400)
+typedef struct tagNMITEMACTIVATE {
+	NMHDR hdr;
+	int iItem;
+	int iSubItem;
+	UINT uNewState;
+	UINT uOldState;
+	UINT uChanged;
+	POINT ptAction;
+	LPARAM lParam;
+	UINT uKeyFlags;
+} NMITEMACTIVATE, *LPNMITEMACTIVATE;
+#endif /* _WIN32_IE >= 0x0400 */
 typedef struct tagTBADDBITMAP {
 	HINSTANCE hInst;
 	UINT nID;
@@ -1562,10 +1674,45 @@ typedef struct tagTVITEMW {
 #define _TV_ITEMW tagTVITEMW
 #define TV_ITEMW TVITEMW
 #define LPTV_ITEMW LPTVITEMW
+#if (_WIN32_IE >= 0x0400)
+typedef struct tagTVITEMEXA {
+	UINT mask;
+	HTREEITEM hItem;
+	UINT state;
+	UINT stateMask;
+	LPSTR pszText;
+	int cchTextMax;
+	int iImage;
+	int iSelectedImage;
+	int cChildren;
+	LPARAM lParam;
+	int iIntegral;
+} TVITEMEXA, *LPTVITEMEXA;
+typedef struct tagTVITEMEXW {
+	UINT mask;
+	HTREEITEM hItem;
+	UINT state;
+	UINT stateMask;
+	LPWSTR pszText;
+	int cchTextMax;
+	int iImage;
+	int iSelectedImage;
+	int cChildren;
+	LPARAM lParam;
+	int iIntegral;
+} TVITEMEXW, *LPTVITEMEXW;
+#endif /* _WIN32_IE >= 0x0400 */
 typedef struct tagTVINSERTSTRUCTA {
 	HTREEITEM hParent;
 	HTREEITEM hInsertAfter;
+#if (_WIN32_IE >= 0x0400)
+	_ANONYMOUS_UNION union {
+	TVITEMEXA itemex;
 	TV_ITEMA item;
+	} DUMMYUNIONNAME;
+#else
+	TV_ITEMA item;
+#endif
 } TVINSERTSTRUCTA,*LPTVINSERTSTRUCTA;
 #define _TV_INSERTSTRUCTA tagTVINSERTSTRUCTA
 #define TV_INSERTSTRUCTA TVINSERTSTRUCTA
@@ -1573,7 +1720,14 @@ typedef struct tagTVINSERTSTRUCTA {
 typedef struct tagTVINSERTSTRUCTW {
 	HTREEITEM hParent;
 	HTREEITEM hInsertAfter;
+#if (_WIN32_IE >= 0x0400)
+	_ANONYMOUS_UNION union {
+	  TVITEMEXW itemex;
+	  TV_ITEMW  item;
+	} DUMMYUNIONNAME;
+#else
 	TV_ITEMW item;
+#endif
 } TVINSERTSTRUCTW,*LPTVINSERTSTRUCTW;
 #define _TV_INSERTSTRUCTW tagTVINSERTSTRUCTW
 #define TV_INSERTSTRUCTW TVINSERTSTRUCTW
@@ -2119,6 +2273,9 @@ typedef TTHITTESTINFOW TTHITTESTINFO,*LPHITTESTINFO;
 typedef TOOLTIPTEXTW TOOLTIPTEXT,*LPTOOLTIPTEXT;
 typedef TV_ITEMW TV_ITEM,*LPTV_ITEM;
 typedef TVITEMW TVITEM,*LPTVITEM;
+#if (_WIN32_IE >= 0x0400)
+typedef TVITEMEXW TVITEMEX,*LPTVITEMEX;
+#endif
 typedef TV_INSERTSTRUCTW TV_INSERTSTRUCT,*LPTV_INSERTSTRUCT;
 typedef TVINSERTSTRUCTW TVINSERTSTRUCT,*LPTVINSERTSTRUCT;
 typedef NM_TREEVIEWW NM_TREEVIEW,*LPNM_TREEVIEW;
@@ -2257,6 +2414,9 @@ typedef TTHITTESTINFOA TTHITTESTINFO,*LPHITTESTINFO;
 typedef TOOLTIPTEXTA TOOLTIPTEXT,*LPTOOLTIPTEXT;
 typedef TV_ITEMA TV_ITEM,*LPTV_ITEM;
 typedef TVITEMA TVITEM,*LPTVITEM;
+#if (_WIN32_IE >= 0x0400)
+typedef TVITEMEXA TVITEMEX,*LPTVITEMEX;
+#endif
 typedef TV_INSERTSTRUCTA TV_INSERTSTRUCT,*LPTV_INSERTSTRUCT;
 typedef TVINSERTSTRUCTA TVINSERTSTRUCT,*LPTVINSERTSTRUCT;
 typedef NM_TREEVIEWA NM_TREEVIEW,*LPNM_TREEVIEW;