* include/shellapi.h: (CommandLineToArgvW): Add WINAPI declaration.

	* include/winbase.h: (GetFileAttributesExW): Fix typo.
	* include/wingdi.h: (StartDocA): Change LPDOCINFOA to DOCINFOA*.
	(StartDocB): Chage LNPDOCINFOB to DOCINFOB*.
	Thanks To: Kent Tamura  <tkent@users.sourceforge.net>
	* include/winnt.h: (GetFiberData): Add __inline assembler coding.
	(GetCurrentFiber): Ditto.
	Thanks to: Andy Younger  <AndyY@redlemon.com>
	* include/windef.h: (HMONITOR_DECLARED): New definition to stop
	DirectX 8 from complaining.
	Thanks to: Sigbj�rn Lund Olsen  <mosikos@online.no>
        * include/commctrl.h Updated TreeView and ListView defines and macros.
        * include/winuser.h (MB_SERVICE_NOTIFICATION): Correct value for NT4
	and above.

8 files changed, 238 insertions, 40 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 4dd53bbf9..b2cc332ce 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,4 +1,29 @@
 
+2001-04-08  Earnie Boyd  <earnie@users.sourceforge.net>
+
+	* include/shellapi.h: (CommandLineToArgvW): Add WINAPI declaration.
+	* include/winbase.h: (GetFileAttributesExW): Fix typo.
+	* include/wingdi.h: (StartDocA): Change LPDOCINFOA to DOCINFOA*.
+	(StartDocB): Chage LNPDOCINFOB to DOCINFOB*.
+	Thanks To: Kent Tamura  <tkent@users.sourceforge.net>
+
+	* include/winnt.h: (GetFiberData): Add __inline assembler coding.
+	(GetCurrentFiber): Ditto.
+	Thanks to: Andy Younger  <AndyY@redlemon.com>
+
+	* include/windef.h: (HMONITOR_DECLARED): New definition to stop
+	DirectX 8 from complaining.
+	Thanks to: Sigbjørn Lund Olsen  <mosikos@online.no>
+
+2001-04-08  Michael Soderstrom <ichaelsoderstro@hotmail.com>
+
+        * include/commctrl.h Updated TreeView and ListView defines and macros.
+
+2001-04-08  Danny Smith <dannysmith@users.sourceforge.net>
+
+        * include/winuser.h (MB_SERVICE_NOTIFICATION): Correct value for NT4
+	and above.
+
 2001-03-30  Earnie Boyd  <earnie@users.sourceforge.net>
 	* include/winuser.h (VK_KANA): New definition.
 	Thanks to: "Harold Hunt" <huntharo@msu.edu>
diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
index 5762b6f8b..fa3024e9a 100644
--- a/winsup/w32api/include/commctrl.h
+++ b/winsup/w32api/include/commctrl.h
@@ -178,6 +178,7 @@ extern "C" {
 #define HDM_SETITEMW	(HDM_FIRST+12)
 #define HDM_LAYOUT	(HDM_FIRST+5)
 #if (_WIN32_IE >= 0x0300)
+#define HDM_GETITEMRECT (HDM_FIRST+7)
 #define HDM_SETORDERARRAY	(HDM_FIRST+18)
 #endif
 #define HHT_NOWHERE	1
@@ -221,6 +222,11 @@ extern "C" {
 #define TBSTYLE_WRAPABLE	512
 #define TBSTYPE_FLAT	0x0800
 #define TBSTYLE_ALTDRAG	1024
+#if (_WIN32_IE >= 0x0300)
+#define TBSTYLE_FLAT 2048
+#define TBSTYLE_LIST 4096
+#define TBSTYLE_CUSTOMERASE 8192
+#endif
 #define TB_ENABLEBUTTON	(WM_USER+1)
 #define TB_CHECKBUTTON	(WM_USER+2)
 #define TB_PRESSBUTTON	(WM_USER+3)
@@ -497,10 +503,20 @@ extern "C" {
 #define LVS_OWNERDRAWFIXED	0x400
 #define LVS_NOCOLUMNHEADER	0x4000
 #define LVS_NOSORTHEADER	0x8000
+#if (_WIN32_IE >= 0x0300)
+#define LVS_OWNERDATA 4096
+#define LVS_EX_CHECKBOXES 4
+#define LVS_EX_FULLROWSELECT 32
+#define LVS_EX_GRIDLINES 1
+#define LVS_EX_HEADERDRAGDROP 16
+#define LVS_EX_ONECLICKACTIVATE 64
+#define LVS_EX_SUBITEMIMAGES 2
+#define LVS_EX_TRACKSELECT 8
+#define LVS_EX_TWOCLICKACTIVATE 128
+#endif
 #define LVSIL_NORMAL	0
 #define LVSIL_SMALL	1
 #define LVSIL_STATE	2
-#define LVS_OWNERDATA 4096
 #define LVM_GETBKCOLOR	LVM_FIRST
 #define LVM_SETBKCOLOR	(LVM_FIRST+1)
 #define LVM_GETIMAGELIST	(LVM_FIRST+2)
@@ -620,6 +636,21 @@ extern "C" {
 #define LVM_GETITEMSPACING	(LVM_FIRST+51)
 #define LVM_GETISEARCHSTRINGA	(LVM_FIRST+52)
 #define LVM_GETISEARCHSTRINGW	(LVM_FIRST+117)
+#if (_WIN32_IE >= 0x0300)
+#define LVM_APPROXIMATEVIEWRECT (LVM_FIRST+64)
+#define LVM_SETEXTENDEDLISTVIEWSTYLE (LVM_FIRST+54)
+#define LVM_GETEXTENDEDLISTVIEWSTYLE (LVM_FIRST+55)
+#define LVM_SETCOLUMNORDERARRAY (LVM_FIRST+58)
+#define LVM_GETCOLUMNORDERARRAY (LVM_FIRST+59)
+#define LVM_GETHEADER (LVM_FIRST+31)
+#define LVM_GETHOTCURSOR (LVM_FIRST+63)
+#define LVM_GETHOTITEM (LVM_FIRST+61)
+#define LVM_GETSUBITEMRECT (LVM_FIRST+56)
+#define LVM_SETHOTCURSOR (LVM_FIRST+62)
+#define LVM_SETHOTITEM (LVM_FIRST+60)
+#define LVM_SETICONSPACING (LVM_FIRST+53)
+#define LVM_SUBITEMHITTEST (LVM_FIRST+57)
+#endif
 #define LVN_ITEMCHANGING	LVN_FIRST
 #define LVN_ITEMCHANGED	(LVN_FIRST-1)
 #define LVN_INSERTITEM	(LVN_FIRST-2)
@@ -643,6 +674,19 @@ extern "C" {
 #define TVS_EDITLABELS	8
 #define TVS_DISABLEDRAGDROP	16
 #define TVS_SHOWSELALWAYS	32
+#if (_WIN32_IE >= 0x0300)
+#define TVS_CHECKBOXES 256
+#define TVS_NOTOOLTIPS 128
+#define TVS_RTLREADING 64
+#define TVS_TRACKSELECT 512
+#endif
+#if (_WIN32_IE >= 0x0400)
+#define TVS_FULLROWSELECT 4096
+#define TVS_INFOTIP 2048
+#define TVS_NONEVENHEIGHT 16384
+#define TVS_NOSCROLL 8192
+#define TVS_SINGLEEXPAND 1024
+#endif
 #define TVIF_TEXT	1
 #define TVIF_IMAGE	2
 #define TVIF_PARAM	4
@@ -695,6 +739,21 @@ extern "C" {
 #define TVM_ENDEDITLABELNOW	(TV_FIRST+22)
 #define TVM_GETISEARCHSTRINGA	(TV_FIRST+23)
 #define TVM_GETISEARCHSTRINGW	(TV_FIRST+64)
+#if (_WIN32_IE >= 0x0300)
+#define TVM_GETTOOLTIPS (TV_FIRST+25)
+#define TVM_SETTOOLTIPS (TV_FIRST+24)
+#endif
+#if (_WIN32_IE >= 0x0400)
+#define TVM_GETBKCOLOR (TV_FIRST+31)
+#define TVM_GETINSERTMARKCOLOR (TV_FIRST+38)
+#define TVM_GETITEMHEIGHT (TV_FIRST+28)
+#define TVM_GETTEXTCOLOR (TV_FIRST+32)
+#define TVM_SETBKCOLOR (TV_FIRST+29)
+#define TVM_SETINSERTMARK (TV_FIRST+26)
+#define TVM_SETINSERTMARKCOLOR (TV_FIRST+37)
+#define TVM_SETITEMHEIGHT (TV_FIRST+27)
+#define TVM_SETTEXTCOLOR (TV_FIRST+30)
+#endif
 #define TVE_COLLAPSE	1
 #define TVE_EXPAND	2
 #define TVE_TOGGLE	3
@@ -1240,7 +1299,7 @@ typedef struct _NM_UPDOWN {
 	int iPos;
 	int iDelta;
 } NM_UPDOWN,*LPNM_UPDOWN;
-typedef struct _LV_ITEMA {
+typedef struct _LVITEMA {
 	UINT mask;
 	int iItem;
 	int iSubItem;
@@ -1250,8 +1309,13 @@ typedef struct _LV_ITEMA {
 	int cchTextMax;
 	int iImage;
 	LPARAM lParam;
-} LV_ITEMA;
-typedef struct _LV_ITEMW {
+#if (_WIN32_IE >= 0x0300)
+	int iIndent;
+#endif
+} LVITEMA, FAR *LPLVITEMA;
+#define _LV_ITEMA _LVITEMA
+#define LV_ITEMA LVITEMA
+typedef struct _LVITEMW {
 	UINT mask;
 	int iItem;
 	int iSubItem;
@@ -1261,42 +1325,65 @@ typedef struct _LV_ITEMW {
 	int cchTextMax;
 	int iImage;
 	LPARAM lParam;
-} LV_ITEMW;
-typedef struct _LV_FINDINFOA {
+#if (_WIN32_IE >= 0x0300)
+	int iIndent;
+#endif
+} LVITEMW, FAR *LPLVITEMW;
+#define _LV_ITEMW _LVITEMW
+#define LV_ITEMW LVITEMW
+typedef struct tagLVFINDINFOA {
 	UINT flags;
 	LPCSTR psz;
 	LPARAM lParam;
 	POINT pt;
 	UINT vkDirection;
-} LV_FINDINFOA;
-typedef struct _LV_FINDINFOW {
+} LVFINDINFOA, FAR* LPFINDINFOA;
+#define _LV_FINDINFOA tagLVFINDINFOA
+#define LV_FINDINFOA LVFINDINFOA
+typedef struct tagLVFINDINFOW {
 	UINT flags;
 	LPCWSTR psz;
 	LPARAM lParam;
 	POINT pt;
 	UINT vkDirection;
-} LV_FINDINFOW;
-typedef struct _LV_HITTESTINFO {
+} LVFINDINFOW, FAR* LPFINDINFOW;
+#define _LV_FINDINFOW tagLVFINDINFOW
+#define LV_FINDINFOW LVFINDINFOW
+typedef struct _LVHITTESTINFO {
 	POINT pt;
 	UINT flags;
 	int iItem;
-} LV_HITTESTINFO;
-typedef struct _LV_COLUMNA {
+} LVHITTESTINFO;
+#define _LV_HITTESTINFO _LVHITTESTINFO
+#define LV_HITTESTINFO LVHITTESTINFO
+typedef struct _LVCOLUMNA {
 	UINT mask;
 	int fmt;
 	int cx;
 	LPSTR pszText;
 	int cchTextMax;
 	int iSubItem;
-} LV_COLUMNA;
-typedef struct _LV_COLUMNW {
+#if (_WIN32_IE >= 0x0300)
+	int iImage;
+	int iOrder;
+#endif
+} LVCOLUMNA, FAR *LPLVCOLUMNA;
+#define _LV_COLUMNA _LVCOLUMNA
+#define LV_COLUMNA LVCOLUMNA
+typedef struct _LVCOLUMNW {
 	UINT mask;
 	int fmt;
 	int cx;
 	LPWSTR pszText;
 	int cchTextMax;
 	int iSubItem;
-} LV_COLUMNW;
+#if (_WIN32_IE >= 0x0300)
+	int iImage;
+	int iOrder;
+#endif
+} LVCOLUMNW, FAR *LPLVCOLUMNW;
+#define _LV_COLUMNW _LVCOLUMNW
+#define LV_COLUMNW LVCOLUMNW
 typedef int(CALLBACK *PFNLVCOMPARE)(LPARAM,LPARAM,LPARAM);
 typedef struct _NM_LISTVIEW {
 	NMHDR hdr;
@@ -1308,21 +1395,25 @@ typedef struct _NM_LISTVIEW {
 	POINT ptAction;
 	LPARAM lParam;
 } NM_LISTVIEW,*LPNM_LISTVIEW;
-typedef struct _LV_DISPINFOA {
+typedef struct tagNMLVDISPINFOA {
 	NMHDR hdr;
 	LV_ITEMA item;
-} LV_DISPINFOA;
-typedef struct _LV_DISPINFOW {
+} NMLVDISPINFOA, FAR *LPNMLVDISPINFOA;
+#define _LV_DISPINFOA tagNMLVDISPINFOA
+#define LV_DISPINFOA NMLVDISPINFOA
+typedef struct tagNMLVDISPINFOW {
 	NMHDR hdr;
 	LV_ITEMW item;
-} LV_DISPINFOW;
+} NMLVDISPINFOW, FAR *LPNMLVDISPINFOW;
+#define _LV_DISPINFOW tagNMLVDISPINFOW
+#define LV_DISPINFOW NMLVDISPINFOW
 typedef struct _LV_KEYDOWN {
 	NMHDR hdr;
 	WORD wVKey;
 	UINT flags;
 } LV_KEYDOWN;
 DECLARE_HANDLE(HTREEITEM);
-typedef struct _TV_ITEMA {
+typedef struct tagTVITEMA {
 	UINT mask;
 	HTREEITEM hItem;
 	UINT state;
@@ -1333,8 +1424,11 @@ typedef struct _TV_ITEMA {
 	int iSelectedImage;
 	int cChildren;
 	LPARAM lParam;
-} TV_ITEMA,*LPTV_ITEMA;
-typedef struct _TV_ITEMW {
+} TVITEMA,*LPTVITEMA;
+#define _TV_ITEMA tagTVITEMA
+#define TV_ITEMA TVITEMA
+#define LPTV_ITEMA LPTVITEMA
+typedef struct tagTVITEMW {
 	UINT mask;
 	HTREEITEM hItem;
 	UINT state;
@@ -1345,17 +1439,26 @@ typedef struct _TV_ITEMW {
 	int iSelectedImage;
 	int cChildren;
 	LPARAM lParam;
-} TV_ITEMW,*LPTV_ITEMW;
-typedef struct _TV_INSERTSTRUCTA {
+} TVITEMW,*LPTVITEMW;
+#define _TV_ITEMW tagTVITEMW
+#define TV_ITEMW TVITEMW
+#define LPTV_ITEMW LPTVITEMW
+typedef struct tagTVINSERTSTRUCTA {
 	HTREEITEM hParent;
 	HTREEITEM hInsertAfter;
 	TV_ITEMA item;
-} TV_INSERTSTRUCTA,*LPTV_INSERTSTRUCTA;
-typedef struct _TV_INSERTSTRUCTW {
+} TVINSERTSTRUCTA,*LPTVINSERTSTRUCTA;
+#define _TV_INSERTSTRUCTA tagTVINSERTSTRUCTA
+#define TV_INSERTSTRUCTA TVINSERTSTRUCTA
+#define LPTV_INSERTSTRUCTA LPTVINSERTSTRUCTA
+typedef struct tagTVINSERTSTRUCTW {
 	HTREEITEM hParent;
 	HTREEITEM hInsertAfter;
 	TV_ITEMW item;
-} TV_INSERTSTRUCTW,*LPTV_INSERTSTRUCTW;
+} TVINSERTSTRUCTW,*LPTVINSERTSTRUCTW;
+#define _TV_INSERTSTRUCTW tagTVINSERTSTRUCTW
+#define TV_INSERTSTRUCTW TVINSERTSTRUCTW
+#define LPTV_INSERTSTRUCTW LPTVINSERTSTRUCTW
 typedef struct _TV_HITTESTINFO {
 	POINT pt;
 	UINT flags;
@@ -1367,20 +1470,26 @@ typedef struct _TV_SORTCB {
 	PFNTVCOMPARE lpfnCompare;
 	LPARAM lParam;
 } TV_SORTCB,*LPTV_SORTCB;
-typedef struct _NM_TREEVIEWA {
+typedef struct tagNMTREEVIEWA {
 	NMHDR hdr;
 	UINT action;
 	TV_ITEMA itemOld;
 	TV_ITEMA itemNew;
 	POINT ptDrag;
-} NM_TREEVIEWA,*LPNM_TREEVIEWA;
-typedef struct _NM_TREEVIEWW {
+} NMTREEVIEWA,*LPNMTREEVIEWA;
+#define _NM_TREEVIEWA tagNMTREEVIEWA
+#define NM_TREEVIEWA NMTREEVIEWA
+#define LPNM_TREEVIEWA LPNMTREEVIEWA
+typedef struct tagNMTREEVIEWW {
 	NMHDR hdr;
 	UINT action;
 	TV_ITEMW itemOld;
 	TV_ITEMW itemNew;
 	POINT ptDrag;
-} NM_TREEVIEWW,*LPNM_TREEVIEWW;
+} NMTREEVIEWW,*LPNMTREEVIEWW;
+#define _NM_TREEVIEWW tagNMTREEVIEWW
+#define NM_TREEVIEWW NMTREEVIEWW
+#define LPNM_TREEVIEWW LPNMTREEVIEWW
 typedef struct _TV_DISPINFOA {
 	NMHDR hdr;
 	TV_ITEMA item;
@@ -1629,6 +1738,7 @@ void WINAPI GetEffectiveClientRect(HWND,LPRECT,LPINT);
 #define Header_SetItem(w,i,phdi) (BOOL)SendMessage((w),HDM_SETITEM,(WPARAM)(int)(i),(LPARAM)(const HD_ITEM*)(phdi))
 #define Header_Layout(w,l) (BOOL)SendMessage((w),HDM_LAYOUT,0,(LPARAM)(HD_LAYOUT*)(l))
 #if (_WIN32_IE >= 0x0300)
+#define Header_GetItemRect(w,i,r) (BOOL)SendMessage((w),HDM_GETITEMRECT,(WPARAM)(i),(LPARAM)(r))
 #define Header_SetOrderArray(w,l,a) (BOOL)SendMessage((w),HDM_SETORDERARRAY,(WPARAM)(l),(LPARAM)(a))
 #endif
 int WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP);
@@ -1747,7 +1857,6 @@ int WINAPI LBItemFromPt(HWND,POINT,BOOL);
 	SendMessage((w),LVM_SETITEMPOSITION32,i,(LPARAM)&p);\
 }
 #define ListView_GetSelectedCount(w) (UINT)SendMessage((w),LVM_GETSELECTEDCOUNT,0,0)
-
 BOOL WINAPI MakeDragList(HWND);
 void WINAPI MenuHelp(UINT,WPARAM,LPARAM,HMENU,HINSTANCE,HWND,PUINT);
 #define MonthCal_GetColor(hwnd,icolor) SendMessage(hwnd,MCM_GETCOLOR,(WPARAM)icolor,(LPARAM)0)
@@ -1833,13 +1942,27 @@ BOOL WINAPI _TrackMouseEvent(LPTRACKMOUSEEVENT);
 #define TreeView_SortChildrenCB(w,s,r) (BOOL)SendMessage((w),TVM_SORTCHILDRENCB,r,(LPARAM)(LPTV_SORTCB)(s))
 #define TreeView_EndEditLabelNow(w,f) (BOOL)SendMessage((w),TVM_ENDEDITLABELNOW,f,0)
 #define TreeView_GetISearchString(w,s) (BOOL)SendMessage((w),TVM_GETISEARCHSTRING,0,(LPARAM)s)
-
 #if (_WIN32_IE >= 0x0300)
+#define ListView_ApproximateViewRect(w,iw,ih,i) (DWORD)SendMessage((w),LVM_APPROXIMATEVIEWRECT,(i),MAKELPARAM((iw),(ih)))
+#define ListView_SetExtendedListViewStyle(w,s) (DWORD)SendMessage((w),LVM_SETEXTENDEDLISTVIEWSTYLE,0,(s))
+#define ListView_GetExtendedListViewStyle(w) (DWORD)SendMessage((w),LVM_GETEXTENDEDLISTVIEWSTYLE,0,0)
+#define ListView_SetColumnOrderArray(w,i,a) (BOOL)SendMessage((w),LVM_SETCOLUMNORDERARRAY,(WPARAM)(i),(LPARAM)(LPINT)(a))
+#define ListView_GetColumnOrderArray(w,i,a) (BOOL)SendMessage((w),LVM_GETCOLUMNORDERARRAY,(WPARAM)(i),(LPARAM)(LPINT)(a))
+#define ListView_GetHeader(w) (HWND)SendMessage((w),LVM_GETHEADER,0,0)
+#define ListView_GetHotCursor(w) (HCURSOR)SendMessage((w),LVM_GETHOTCURSOR,0,0)
+#define ListView_GetHotItem(w) (INT)SendMessage((w),LVM_GETHOTITEM,0,0)
+#define ListView_GetSubItemRect(w,i,is,c,p) (BOOL)SendMessage((w),LVM_GETSUBITEMRECT,(WPARAM)(int)(i),((p)?(((LPRECT)(p))->left=(c),(((LPRECT)(p))->top=(is)),(LPARAM)(LPRECT)(p)):0))
+#define ListView_SetHotCursor(w,c) (HCURSOR)SendMessage((w),LVM_SETHOTCURSOR,0,(LPARAM)(c))
+#define ListView_SetHotItem(w,i) (int)SendMessage((w),LVM_SETHOTITEM,(WPARAM)(i),0)
+#define ListView_SetIconSpacing(w,x,y) (DWORD)SendMessage((w),LVM_SETICONSPACING,0,MAKELONG(x,y))
+#define ListView_SubItemHitTest(w,p) (int)SendMessage((w),LVM_SUBITEMHITTEST,0,(LPARAM)(LPLVHITTESTINFO)(p))
 WINBOOL WINAPI ImageList_SetImageCount(HIMAGELIST,UINT);
 WINBOOL WINAPI ImageList_Copy(HIMAGELIST,int,HIMAGELIST,int,UINT);
 WINBOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*);
 #define TabCtrl_SetMinTabWidth(hwnd, x) SendMessage((hwnd), TCM_SETMINTABWIDTH, 0, x)
 #define TabCtrl_DeselectAll(hwnd, fExcludeFocus) SendMessage((hwnd), TCM_DESELECTALL, fExcludeFocus, 0)
+#define TreeView_GetToolTips(w) (HWND)SendMessage((w),TVM_GETTOOLTIPS,0,0)
+#define TreeView_SetToolTips(w,wt) (HWND)SendMessage((w),TVM_SETTOOLTIPS,(WPARAM)(wt),0)
 #endif
 #if (_WIN32_IE >= 0x0400)
 #define TabCtrl_HighlightItem(hwnd, i, fHighlight) SendMessage((hwnd), TCM_HIGHLIGHTITEM, (WPARAM)i, (LPARAM)MAKELONG (fHighlight, 0))
@@ -1847,6 +1970,14 @@ WINBOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*);
 #define TabCtrl_GetExtendedStyle(hwnd) SendMessage((hwnd), TCM_GETEXTENDEDSTYLE, 0, 0)
 #define TabCtrl_SetUnicodeFormat(hwnd, fUnicode) SendMessage((hwnd), TCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0)
 #define TabCtrl_GetUnicodeFormat(hwnd) SendMessage((hwnd), TCM_GETUNICODEFORMAT, 0, 0)
+#define TreeView_GetBkColor(w) (COLORREF)SendMessage((w),TVM_GETBKCOLOR,0,0)
+#define TreeView_GetInsertMarkColor(w) (COLORREF)SendMessage((w),TVM_GETINSERTMARKCOLOR,0,0)
+#define TreeView_GetItemHeight(w) (int)SendMessage((w),TVM_GETITEMHEIGHT,0,0)
+#define TreeView_GetTextColor(w) (COLORREF)SendMessage((w),TVM_GETTEXTCOLOR,0,0)
+#define TreeView_SetBkColor(w,c) (COLORREF)SendMessage((w),TVM_SETBKCOLOR,0,(LPARAM)(c))
+#define TreeView_SetInsertMarkColor(w,c) (COLORREF)SendMessage((w),TVM_SETINSERTMARKCOLOR,0,(LPARAM)(c))
+#define TreeView_SetItemHeight(w,h) (int)SendMessage((w),TVM_SETITEMHEIGHT,(WPARAM)(h),0)
+#define TreeView_SetTextColor(w,c) (COLORREF)SendMessage((w),TVM_SETTEXTCOLOR,0,(LPARAM)(c))
 #endif
 
 #ifdef UNICODE
@@ -1867,8 +1998,11 @@ typedef TOOLINFOW TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
 typedef TTHITTESTINFOW TTHITTESTINFO,*LPHITTESTINFO;
 typedef TOOLTIPTEXTW TOOLTIPTEXT,*LPTOOLTIPTEXT;
 typedef TV_ITEMW TV_ITEM,*LPTV_ITEM;
+typedef TVITEMW TVITEM,*LPTVITEM;
 typedef TV_INSERTSTRUCTW TV_INSERTSTRUCT,*LPTV_INSERTSTRUCT;
+typedef TVINSERTSTRUCTW TVINSERTSTRUCT,*LPTVINSERTSTRUCT;
 typedef NM_TREEVIEWW NM_TREEVIEW,*LPNM_TREEVIEW;
+typedef NMTREEVIEWW NMTREEVIEW,*LPNMTREEVIEW;
 #define ACM_OPEN ACM_OPENW
 #define SB_GETTEXT	SB_GETTEXTW
 #define SB_SETTEXT	SB_SETTEXTW
@@ -1916,15 +2050,18 @@ typedef NM_TREEVIEWW NM_TREEVIEW,*LPNM_TREEVIEW;
 #define HOTKEY_CLASS HOTKEY_CLASSW
 #define WC_LISTVIEW WC_LISTVIEWW
 #define LV_ITEM LV_ITEMW
+#define LVITEM LVITEMW
 #define LPSTR_TEXTCALLBACK LPSTR_TEXTCALLBACKW
 #define LVM_GETITEM	LVM_GETITEMW
 #define LVM_SETITEM LVM_SETITEMW
 #define LVM_INSERTITEM LVM_INSERTITEMW
 #define LV_FINDINFO LV_FINDINFOW
+#define LVFINDINFO LVFINDINFOW
 #define LVM_FINDITEM LVM_FINDITEMW
 #define LVM_GETSTRINGWIDTH LVM_GETSTRINGWIDTHW
 #define LVM_EDITLABEL LVM_EDITLABELW
 #define LV_COLUMN LV_COLUMNW
+#define LVCOLUMN LVCOLUMNW
 #define LVM_GETCOLUMN LVM_GETCOLUMNW
 #define LVM_SETCOLUMN LVM_SETCOLUMNW
 #define LVM_INSERTCOLUMN LVM_INSERTCOLUMNW
@@ -1936,6 +2073,7 @@ typedef NM_TREEVIEWW NM_TREEVIEW,*LPNM_TREEVIEW;
 #define LVN_GETDISPINFO LVN_GETDISPINFOW
 #define LVN_SETDISPINFO LVN_SETDISPINFOW
 #define LV_DISPINFO LV_DISPINFOW
+#define NMLVDISPINFO NMLVDISPINFOW
 #define WC_TREEVIEW WC_TREEVIEWW
 #define TVM_INSERTITEM TVM_INSERTITEMW
 #define TVM_GETITEM TVM_GETITEMW
@@ -1994,8 +2132,11 @@ typedef TOOLINFOA TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
 typedef TTHITTESTINFOA TTHITTESTINFO,*LPHITTESTINFO;
 typedef TOOLTIPTEXTA TOOLTIPTEXT,*LPTOOLTIPTEXT;
 typedef TV_ITEMA TV_ITEM,*LPTV_ITEM;
+typedef TVITEMA TVITEM,*LPTVITEM;
 typedef TV_INSERTSTRUCTA TV_INSERTSTRUCT,*LPTV_INSERTSTRUCT;
+typedef TVINSERTSTRUCTA TVINSERTSTRUCT,*LPTVINSERTSTRUCT;
 typedef NM_TREEVIEWA NM_TREEVIEW,*LPNM_TREEVIEW;
+typedef NMTREEVIEWA NMTREEVIEW,*LPNMTREEVIEW;
 #define ACM_OPEN ACM_OPENA
 #define SB_GETTEXT	SB_GETTEXTA
 #define SB_SETTEXT	SB_SETTEXTA
@@ -2034,15 +2175,18 @@ typedef NM_TREEVIEWA NM_TREEVIEW,*LPNM_TREEVIEW;
 #define SB_SETTEXT	SB_SETTEXTA
 #define SB_GETTEXTLENGTH	SB_GETTEXTLENGTHA
 #define LV_ITEM LV_ITEMA
+#define LVITEM LVITEMA
 #define LPSTR_TEXTCALLBACK LPSTR_TEXTCALLBACKA
 #define LVM_GETITEM	LVM_GETITEMA
 #define LVM_SETITEM LVM_SETITEMA
 #define LVM_INSERTITEM LVM_INSERTITEMA
 #define LV_FINDINFO LV_FINDINFOA
+#define LVFINDINFO LVFINDINFOA
 #define LVM_FINDITEM LVM_FINDITEMA
 #define LVM_GETSTRINGWIDTH LVM_GETSTRINGWIDTHA
 #define LVM_EDITLABEL LVM_EDITLABELA
 #define LV_COLUMN LV_COLUMNA
+#define LVCOLUMN LVCOLUMNA
 #define LVM_GETCOLUMN LVM_GETCOLUMNA
 #define LVM_SETCOLUMN LVM_SETCOLUMNA
 #define LVM_INSERTCOLUMN LVM_INSERTCOLUMNA
@@ -2054,6 +2198,7 @@ typedef NM_TREEVIEWA NM_TREEVIEW,*LPNM_TREEVIEW;
 #define LVN_GETDISPINFO LVN_GETDISPINFOA
 #define LVN_SETDISPINFO LVN_SETDISPINFOA
 #define LV_DISPINFO LV_DISPINFOA
+#define NMLVDISPINFO NMLVDISPINFOA
 #define TVM_INSERTITEM TVM_INSERTITEMA
 #define TVM_GETITEM TVM_GETITEMA
 #define TVM_SETITEM TVM_SETITEMA
@@ -2099,3 +2244,4 @@ typedef REBARBANDINFOA REBARBANDINFO,*LPREBARBANDINFO;
 }
 #endif
 #endif
+
diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h
index 4e1c9a7dc..dab26593c 100644
--- a/winsup/w32api/include/shellapi.h
+++ b/winsup/w32api/include/shellapi.h
@@ -183,7 +183,7 @@ typedef struct _SHFILEINFOW {
 	WCHAR szTypeName[80];
 } SHFILEINFOW;
 
-LPWSTR *CommandLineToArgvW(LPCWSTR,int*);
+LPWSTR * WINAPI CommandLineToArgvW(LPCWSTR,int*);
 void WINAPI DragAcceptFiles(HWND,BOOL);
 void WINAPI DragFinish(HDROP);
 UINT WINAPI DragQueryFileA(HDROP,UINT,LPSTR,UINT);
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index 771dee87e..ed228b1f9 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1163,7 +1163,7 @@ BOOL WINAPI GetExitCodeThread(HANDLE,PDWORD);
 DWORD WINAPI GetFileAttributesA(LPCSTR);
 DWORD WINAPI GetFileAttributesW(LPCWSTR);
 BOOL WINAPI GetFileAttributesExA(LPCSTR,GET_FILEEX_INFO_LEVELS,PVOID);
-BOOL WINAPI GetFileAttributesExW(LPCSTR,GET_FILEEX_INFO_LEVELS,PVOID);
+BOOL WINAPI GetFileAttributesExW(LPCWSTR,GET_FILEEX_INFO_LEVELS,PVOID);
 BOOL WINAPI GetFileInformationByHandle(HANDLE,LPBY_HANDLE_FILE_INFORMATION);
 BOOL WINAPI GetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,PDWORD);
 BOOL WINAPI GetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,PDWORD);
diff --git a/winsup/w32api/include/windef.h b/winsup/w32api/include/windef.h
index 7a80a5a99..812d80c28 100644
--- a/winsup/w32api/include/windef.h
+++ b/winsup/w32api/include/windef.h
@@ -173,6 +173,7 @@ DECLARE_HANDLE(HKEY);
 /* FIXME: How to handle these. SM_CMONITORS etc in winuser.h also. */
 /* #if (WINVER >= 0x0500) */
 DECLARE_HANDLE(HMONITOR);
+#define HMONITOR_DECLARED 1
 DECLARE_HANDLE(HTERMINAL);
 DECLARE_HANDLE(HWINEVENTHOOK);
 /* #endif */
diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index 345c7bbba..695d75d7a 100644
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -2653,8 +2653,8 @@ BOOL WINAPI SetWindowExtEx(HDC,int,int,LPSIZE);
 BOOL WINAPI SetWindowOrgEx(HDC,int,int,LPPOINT);
 HENHMETAFILE WINAPI SetWinMetaFileBits(UINT,const BYTE*,HDC,const METAFILEPICT*);
 BOOL WINAPI SetWorldTransform(HDC,const XFORM *);
-int WINAPI StartDocA(HDC,const LPDOCINFOA);
-int WINAPI StartDocW(HDC,const LPDOCINFOW);
+int WINAPI StartDocA(HDC,const DOCINFOA*);
+int WINAPI StartDocW(HDC,const DOCINFOW*);
 int WINAPI StartPage(HDC);
 BOOL WINAPI StretchBlt(HDC,int,int,int,int,HDC,int,int,int,int,DWORD);
 int WINAPI StretchDIBits(HDC,int,int,int,int,int,int,int,int,const VOID *,const BITMAPINFO *,UINT,DWORD);
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 5960046c7..ed25f06a5 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -2499,8 +2499,27 @@ typedef struct _REPARSE_POINT_INFORMATION {
 	WORD   ReparseDataLength;
 	WORD   UnparsedNameLength;
 } REPARSE_POINT_INFORMATION, *PREPARSE_POINT_INFORMATION;
-PVOID GetCurrentFiber(void);
-PVOID GetFiberData(void);
+__inline PVOID GetCurrentFiber(void)
+{
+    void* ret;
+    __asm__ volatile ("
+	      movl	%%fs:0x10,%0
+	      movl	(%0),%0
+	      " : "=r" (ret) /* allow use of reg eax, ebx, ecx, edx, esi, edi */
+	        :
+	      );
+    return ret;
+}
+__inline PVOID GetFiberData(void)
+{
+    void* ret;
+    __asm__ volatile ("
+	      movl	%%fs:0x10,%0
+	      " : "-r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */
+	        :
+		);
+    return ret;
+}
 #endif
 #ifdef __cplusplus
 }
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 2628d6ba7..1113bf909 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -648,7 +648,14 @@ extern "C" {
 #define MB_ICONSTOP 16
 #define MB_OKCANCEL 1
 #define MB_RETRYCANCEL 5
-#define MB_SERVICE_NOTIFICATION 0x40000
+#ifdef _WIN32_WINNT
+#if (_WIN32_WINNT >= 0x0400)
+#define MB_SERVICE_NOTIFICATION  0x00200000
+#else
+#define MB_SERVICE_NOTIFICATION  0x00040000
+#endif
+#define MB_SERVICE_NOTIFICATION_NT3X  0x00040000
+#endif
 #define MB_SETFOREGROUND 0x10000
 #define MB_SYSTEMMODAL 4096
 #define MB_TASKMODAL 0x2000