2003-05-18 Manu B <manubee@users.sourceforge.net>

	* include/commctrl.h (TVSORTCB): Rename old TV_SORTCB structure.

2003-05-18  Bang Jun-Young <junyoung@netbsd.org>

	* include/winbase.h (CREATE_DEFAULT_ERROR_MODE,
	DEBUG_PROCESS, DEBUG_ONLY_THIS_PROCESS, CREATE_SUSPENDED,
	DETACHED_PROCESS, CREATE_NEW_CONSOLE, NORMAL_PRIORITY_CLASS,
	IDLE_PRIORITY_CLASS, HIGH_PRIORITY_CLASS, REALTIME_PRIORITY_CLASS,
	CREATE_NEW_PROCESS_GROUP, CREATE_UNICODE_ENVIRONMENT,
	CREATE_SEPARATE_WOW_VDM, CREATE_SHARED_WOW_VDM, CREATE_FORCEDOS,
	CREATE_NO_WINDOW): Convert to hexadecimal form for better
	readability.
	(BELOW_NORMAL_PRIORITY_CLASS, ABOVE_NORMAL_PRIORITY_CLASS,
	CREATE_BREAKAWAY_FROM_JOB, CREATE_WITH_USERPROFILE): Add.

3 files changed, 47 insertions, 23 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 6a8f9de..3cade22 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,20 @@
+2003-05-18  Manu B  <manubee@users.sourceforge.net>
+	
+	* include/commctrl.h (TVSORTCB): Rename old TV_SORTCB structure.
+
+2003-05-18  Bang Jun-Young <junyoung@netbsd.org>
+
+	* include/winbase.h (CREATE_DEFAULT_ERROR_MODE,
+	DEBUG_PROCESS, DEBUG_ONLY_THIS_PROCESS, CREATE_SUSPENDED,
+	DETACHED_PROCESS, CREATE_NEW_CONSOLE, NORMAL_PRIORITY_CLASS,
+	IDLE_PRIORITY_CLASS, HIGH_PRIORITY_CLASS, REALTIME_PRIORITY_CLASS,
+	CREATE_NEW_PROCESS_GROUP, CREATE_UNICODE_ENVIRONMENT,
+	CREATE_SEPARATE_WOW_VDM, CREATE_SHARED_WOW_VDM, CREATE_FORCEDOS,
+	CREATE_NO_WINDOW): Convert to hexadecimal form for better
+	readability.
+	(BELOW_NORMAL_PRIORITY_CLASS, ABOVE_NORMAL_PRIORITY_CLASS,
+	CREATE_BREAKAWAY_FROM_JOB, CREATE_WITH_USERPROFILE): Add.
+
 2003-05-15  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/ddk/ndis.h (NDIS30_MINIPORT_CHARACTERISTICS_S):
diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
index 29a2fb5..7407c5c 100644
--- a/winsup/w32api/include/commctrl.h
+++ b/winsup/w32api/include/commctrl.h
@@ -2043,11 +2043,14 @@ typedef struct tagTVHITTESTINFO {
 #define TV_HITTESTINFO TVHITTESTINFO
 #define LPTV_HITTESTINFO LPTVHITTESTINFO
 typedef int(CALLBACK *PFNTVCOMPARE)(LPARAM,LPARAM,LPARAM);
-typedef struct _TV_SORTCB {
+typedef struct tagTVSORTCB {
 	HTREEITEM hParent;
 	PFNTVCOMPARE lpfnCompare;
 	LPARAM lParam;
-} TV_SORTCB,*LPTV_SORTCB;
+} TVSORTCB,*LPTVSORTCB;
+#define _TV_SORTCB tagTVSORTCB
+#define TV_SORTCB TVSORTCB
+#define LPTV_SORTCB LPTVSORTCB
 typedef struct tagNMTREEVIEWA {
 	NMHDR hdr;
 	UINT action;
@@ -2533,7 +2536,7 @@ BOOL WINAPI _TrackMouseEvent(LPTRACKMOUSEEVENT);
 #define TreeView_CreateDragImage(w,i) (HIMAGELIST)SNDMSG((w),TVM_CREATEDRAGIMAGE,0,(LPARAM)(HTREEITEM)(i))
 #define TreeView_SortChildren(w,i,r) (BOOL)SNDMSG((w),TVM_SORTCHILDREN,r,(LPARAM)(HTREEITEM)(i))
 #define TreeView_EnsureVisible(w,i) (BOOL)SNDMSG((w),TVM_ENSUREVISIBLE,0,(LPARAM)(HTREEITEM)(i))
-#define TreeView_SortChildrenCB(w,s,r) (BOOL)SNDMSG((w),TVM_SORTCHILDRENCB,r,(LPARAM)(LPTV_SORTCB)(s))
+#define TreeView_SortChildrenCB(w,s,r) (BOOL)SNDMSG((w),TVM_SORTCHILDRENCB,r,(LPARAM)(LPTVSORTCB)(s))
 #define TreeView_EndEditLabelNow(w,f) (BOOL)SNDMSG((w),TVM_ENDEDITLABELNOW,f,0)
 #define TreeView_GetISearchString(w,s) (BOOL)SNDMSG((w),TVM_GETISEARCHSTRING,0,(LPARAM)s)
 #if (_WIN32_IE >= 0x0300)
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index afc14e8..501e3b0 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -1,6 +1,6 @@
 #ifndef _WINBASE_H
 #define _WINBASE_H
-#if __GNUC__ >=3
+#if __GNUC__ >= 3
 #pragma GCC system_header
 #endif
 
@@ -153,22 +153,29 @@ extern "C" {
 #define PIPE_CLIENT_END 0
 #define PIPE_SERVER_END 1
 #define PIPE_UNLIMITED_INSTANCES 255
-#define CREATE_DEFAULT_ERROR_MODE	67108864
-#define DEBUG_PROCESS	1
-#define DEBUG_ONLY_THIS_PROCESS	2
-#define CREATE_SUSPENDED	4
-#define DETACHED_PROCESS	8
-#define CREATE_NEW_CONSOLE	16
-#define NORMAL_PRIORITY_CLASS	32
-#define IDLE_PRIORITY_CLASS	64
-#define HIGH_PRIORITY_CLASS	128
-#define REALTIME_PRIORITY_CLASS	256
-#define CREATE_NEW_PROCESS_GROUP	512
-#define CREATE_UNICODE_ENVIRONMENT	1024
-#define CREATE_SEPARATE_WOW_VDM	2048
-#define CREATE_SHARED_WOW_VDM 4096
-#define CREATE_FORCEDOS 8192
-#define CREATE_NO_WINDOW 0x8000000
+#define DEBUG_PROCESS			0x00000001
+#define DEBUG_ONLY_THIS_PROCESS		0x00000002
+#define CREATE_SUSPENDED		0x00000004
+#define DETACHED_PROCESS		0x00000008
+#define CREATE_NEW_CONSOLE		0x00000010
+#define NORMAL_PRIORITY_CLASS		0x00000020
+#define IDLE_PRIORITY_CLASS		0x00000040
+#define HIGH_PRIORITY_CLASS		0x00000080
+#define REALTIME_PRIORITY_CLASS		0x00000100
+#define CREATE_NEW_PROCESS_GROUP	0x00000200
+#define CREATE_UNICODE_ENVIRONMENT	0x00000400
+#define CREATE_SEPARATE_WOW_VDM		0x00000800
+#define CREATE_SHARED_WOW_VDM		0x00001000
+#define CREATE_FORCEDOS			0x00002000
+#define BELOW_NORMAL_PRIORITY_CLASS	0x00004000
+#define ABOVE_NORMAL_PRIORITY_CLASS	0x00008000
+#define CREATE_BREAKAWAY_FROM_JOB	0x01000000
+#define CREATE_WITH_USERPROFILE		0x02000000
+#define CREATE_DEFAULT_ERROR_MODE	0x04000000
+#define CREATE_NO_WINDOW		0x08000000
+#define PROFILE_USER			0x10000000
+#define PROFILE_KERNEL			0x20000000
+#define PROFILE_SERVER			0x40000000
 #define CONSOLE_TEXTMODE_BUFFER 1
 #define CREATE_NEW	1
 #define CREATE_ALWAYS	2
@@ -488,9 +495,6 @@ extern "C" {
 #define MS_DSR_ON 32
 #define MS_RING_ON 64
 #define MS_RLSD_ON 128
-#define PROFILE_USER 0x10000000
-#define PROFILE_KERNEL 0x20000000
-#define PROFILE_SERVER 0x40000000
 #define DTR_CONTROL_DISABLE 0
 #define DTR_CONTROL_ENABLE 1
 #define DTR_CONTROL_HANDSHAKE 2