1 files changed, 28 insertions, 4 deletions
diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
index 4ad2e9c2d..697c32878 100644
--- a/winsup/w32api/include/commctrl.h
+++ b/winsup/w32api/include/commctrl.h
@@ -1612,20 +1612,30 @@ typedef struct {
 	UINT nIDNew;
 	int nButtons;
 } TBREPLACEBITMAP,*LPTBREPLACEBITMAP;
-typedef struct tagTBNOTIFYA {
+typedef struct tagNMTOOLBARA {
 	NMHDR hdr;
 	int iItem;
 	TBBUTTON tbButton;
 	int cchText;
 	LPSTR pszText;
-} TBNOTIFYA,*LPTBNOTIFYA;
-typedef struct tagTBNOTIFYW {
+#if (_WIN32_IE >= 0x500)
+	RECT    rcButton;
+#endif
+} NMTOOLBARA, *LPNMTOOLBARA;
+#define TBNOTIFYA NMTOOLBARA
+#define LPTBNOTIFYA LPNMTOOLBARA
+typedef struct tagNMTOOLBARW {
 	NMHDR hdr;
 	int iItem;
 	TBBUTTON tbButton;
 	int cchText;
 	LPWSTR pszText;
-} TBNOTIFYW,*LPTBNOTIFYW;
+#if (_WIN32_IE >= 0x500)
+	RECT    rcButton;
+#endif
+} NMTOOLBARW, *LPNMTOOLBARW;
+#define TBNOTIFYW NMTOOLBARW
+#define LPTBNOTIFYW LPNMTOOLBARW
 typedef struct tagTOOLINFOA {
 	UINT cbSize;
 	UINT uFlags;
@@ -2147,6 +2157,16 @@ typedef struct tagNMRBAUTOSIZE {
 	RECT rcTarget;
 	RECT rcActual;
 } NMRBAUTOSIZE,*LPNMRBAUTOSIZE;
+#if (_WIN32_IE >= 0x0500)
+typedef struct tagNMREBARCHEVRON {
+	NMHDR hdr;
+	UINT uBand;
+	UINT wID;
+	LPARAM lParam;
+	RECT rc;
+	LPARAM lParamNM;
+} NMREBARCHEVRON, *LPNMREBARCHEVRON;
+#endif
 typedef struct _RB_HITTESTINFO {
 	POINT pt;
 	UINT flags;
@@ -2518,6 +2538,8 @@ typedef NMTREEVIEWW NMTREEVIEW,*LPNMTREEVIEW;
 #endif
 #define TBNOTIFY TBNOTIFYW
 #define LPTBNOTIFY LPTBNOTIFYW
+#define NMTOOLBAR NMTOOLBARW
+#define LPNMTOOLBAR LPNMTOOLBARW
 #define TOOLTIPS_CLASS TOOLTIPS_CLASSW
 #define TTM_ADDTOOL	TTM_ADDTOOLW
 #define TTM_DELTOOL	TTM_DELTOOLW
@@ -2682,6 +2704,8 @@ typedef NMTREEVIEWA NMTREEVIEW,*LPNMTREEVIEW;
 #endif
 #define TBNOTIFY TBNOTIFYA
 #define LPTBNOTIFY LPTBNOTIFYA
+#define NMTOOLBAR NMTOOLBARA
+#define LPNMTOOLBAR LPNMTOOLBARA
 #define TTM_ADDTOOL	TTM_ADDTOOLA
 #define TTM_DELTOOL	TTM_DELTOOLA
 #define TTM_NEWTOOLRECT	TTM_NEWTOOLRECTA