2002-07-17 Danny Smith <dannysmith@users.sourceforge.net>

	* include/commdlg.h: Define CDN_* notification message constants
	as UINT.

2002-07-17  Mattia Barbon  <mbarbon@users.sourceforge.net>

	* include/commctrl.h: Define notification message constants for
	NMHDR.code as UINT.

3 files changed, 57 insertions, 47 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index be2e787c3..34952d759 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-17  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/commdlg.h: Define CDN_* notification message constants
+	as UINT.
+
+2002-07-17  Mattia Barbon  <mbarbon@users.sourceforge.net>
+
+	* include/commctrl.h: Define notification message constants for
+	NMHDR.code as UINT.
+
 2002-07-17   Bart Oldeman  <bart.oldeman@btinternet.com>
 
 	* include/ddeml.h (MH_*) Add defines.
diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
index 526fac912..a03aeb66d 100644
--- a/winsup/w32api/include/commctrl.h
+++ b/winsup/w32api/include/commctrl.h
@@ -156,32 +156,32 @@ extern "C" {
 #define HDS_BUTTONS	2
 #define HDS_HIDDEN	8
 #define NM_FIRST	0
-#define NM_LAST	(-99)
-#define LVN_FIRST	(-100)
-#define LVN_LAST	(-199)
-#define HDN_FIRST	(-300)
-#define HDN_LAST	(-399)
-#define TVN_FIRST	(-400)
-#define TVN_LAST	(-499)
-#define TTN_FIRST	(-520)
-#define TTN_LAST	(-549)
-#define TCN_FIRST	(-550)
-#define TCN_LAST	(-580)
-#define CDN_FIRST	(-601)
-#define CDN_LAST	(-699)
-#define TBN_FIRST	(-700)
-#define TBN_LAST	(-720)
-#define UDN_FIRST	(-721)
-#define UDN_LAST	(-740)
+#define NM_LAST	((UINT)-99)
+#define LVN_FIRST	((UINT)-100)
+#define LVN_LAST	((UINT)-199)
+#define HDN_FIRST	((UINT)-300)
+#define HDN_LAST	((UINT)-399)
+#define TVN_FIRST	((UINT)-400)
+#define TVN_LAST	((UINT)-499)
+#define TTN_FIRST	((UINT)-520)
+#define TTN_LAST	((UINT)-549)
+#define TCN_FIRST	((UINT)-550)
+#define TCN_LAST	((UINT)-580)
+#define CDN_FIRST	((UINT)-601)
+#define CDN_LAST	((UINT)-699)
+#define TBN_FIRST	((UINT)-700)
+#define TBN_LAST	((UINT)-720)
+#define UDN_FIRST	((UINT)-721)
+#define UDN_LAST	((UINT)-740)
 #if (_WIN32_IE >= 0x0300)
-#define RBN_FIRST	(-831)
-#define RBN_LAST	(-859)
-#define MCN_FIRST	(-750)
-#define MCN_LAST	(-759)
-#define DTN_FIRST	(-760)
-#define DTN_LAST	(-799)
-#define CBEN_FIRST	(-800)
-#define CBEN_LAST	(-830)
+#define RBN_FIRST	((UINT)-831)
+#define RBN_LAST	((UINT)-859)
+#define MCN_FIRST	((UINT)-750)
+#define MCN_LAST	((UINT)-759)
+#define DTN_FIRST	((UINT)-760)
+#define DTN_LAST	((UINT)-799)
+#define CBEN_FIRST	((UINT)-800)
+#define CBEN_LAST	((UINT)-830)
 #endif /* _WIN32_IE */
 #if (_WIN32_IE >= 0x0400)
 #define IPN_FIRST	(-860)
@@ -1119,17 +1119,17 @@ extern "C" {
 #define DTM_GETMONTHCAL 0x1008
 #define DTM_SETMCFONT	0x1009
 #define DTM_GETMCFONT	0x100a
-#define DTN_USERSTRINGA  (-758)
-#define DTN_USERSTRINGW  (-745)
-#define DTN_WMKEYDOWNA  (-757)
-#define DTN_WMKEYDOWNW  (-744)
-#define DTN_FORMATA  (-756) 
-#define DTN_FORMATW  (-743)
-#define DTN_FORMATQUERYA  (-755) 
-#define DTN_FORMATQUERYW (-742)
-#define DTN_DROPDOWN    (-754) 
-#define DTN_CLOSEUP	(-753) 
-#define DTN_DATETIMECHANGE (-759) 
+#define DTN_USERSTRINGA  ((UINT)-758)
+#define DTN_USERSTRINGW  ((UINT)-745)
+#define DTN_WMKEYDOWNA  ((UINT)-757)
+#define DTN_WMKEYDOWNW  ((UINT)-744)
+#define DTN_FORMATA  ((UINT)-756) 
+#define DTN_FORMATW  ((UINT)-743)
+#define DTN_FORMATQUERYA  ((UINT)-755) 
+#define DTN_FORMATQUERYW ((UINT)-742)
+#define DTN_DROPDOWN    ((UINT)-754) 
+#define DTN_CLOSEUP	((UINT)-753) 
+#define DTN_DATETIMECHANGE ((UINT)-759) 
 #define MCM_GETCURSEL	0x1001
 #define MCM_SETCURSEL	0x1002
 #define MCM_GETMAXSELCOUNT 0x1003
@@ -1150,9 +1150,9 @@ extern "C" {
 #define MCM_SETRANGE 0x1012
 #define MCM_GETMONTHDELTA 0x1013
 #define MCM_SETMONTHDELTA 0x1014
-#define MCN_SELCHANGE	  (-749)
-#define MCN_GETDAYSTATE	(-747)
-#define MCN_SELECT		(-746)
+#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
diff --git a/winsup/w32api/include/commdlg.h b/winsup/w32api/include/commdlg.h
index 85c609392..77415a110 100644
--- a/winsup/w32api/include/commdlg.h
+++ b/winsup/w32api/include/commdlg.h
@@ -23,15 +23,15 @@ extern "C" {
 #define SETRGBSTRINGW   L"commdlg_SetRGBColor"
 #define HELPMSGSTRINGW  L"commdlg_help"
 #define FINDMSGSTRINGW  L"commdlg_FindReplace"
-#define CDN_FIRST	(-601)
-#define CDN_LAST	(-699)
+#define CDN_FIRST	((UINT)-601) /* also in commctrl.h */
+#define CDN_LAST	((UINT)-699)
 #define CDN_INITDONE	CDN_FIRST
-#define CDN_SELCHANGE	(CDN_FIRST-1)
-#define CDN_FOLDERCHANGE	(CDN_FIRST-2)
-#define CDN_SHAREVIOLATION	(CDN_FIRST-3)
-#define CDN_HELP	(CDN_FIRST-4)
-#define CDN_FILEOK	(CDN_FIRST-5)
-#define CDN_TYPECHANGE	(CDN_FIRST-6)
+#define CDN_SELCHANGE	(CDN_FIRST-1U)
+#define CDN_FOLDERCHANGE	(CDN_FIRST-2U)
+#define CDN_SHAREVIOLATION	(CDN_FIRST-3U)
+#define CDN_HELP	(CDN_FIRST-4U)
+#define CDN_FILEOK	(CDN_FIRST-5U)
+#define CDN_TYPECHANGE	(CDN_FIRST-6U)
 #define CDM_FIRST	(WM_USER+100)
 #define CDM_LAST	(WM_USER+200)
 #define CDM_GETSPEC	CDM_FIRST