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

	* include/commctrl.h (WC_*): Remove some duplicate defines.

2002-07-02  Ken Fitlike  <kenfitlike@hotmail.com>

	* include/commctrl.h (WC_IPADDRESS[AW]): Add defines and
	UNICODE mappings.
	(IPM*): Add defines.
	(IPN_*): Add defines.
	(NMIPADDRESS): Add structure and typedefs.
	(MAKEIPADDRESS): Add macro.
	(MAKEIPRANGE): Add macro.
	(FIRST_IPADDRESS): Add macro.
	(SECOND_IPADDRESS): Add macro.
	(THIRD_IPADDRESS): Add macro.
	(FOURTH_IPADDRESS): Add macro.

2 files changed, 45 insertions, 5 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index f77c93a7c..30646f2a7 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,21 @@
+2002-07-02  Danny Smith <dannysmith@users.sourceforge.net>
+
+	* include/commctrl.h (WC_*): Remove some duplicate defines.
+
+2002-07-02  Ken Fitlike  <kenfitlike@hotmail.com>
+
+	* include/commctrl.h (WC_IPADDRESS[AW]): Add defines and
+	UNICODE mappings.
+	(IPM*): Add defines.
+	(IPN_*): Add defines.
+	(NMIPADDRESS): Add structure and typedefs.
+	(MAKEIPADDRESS): Add macro.
+	(MAKEIPRANGE): Add macro.
+	(FIRST_IPADDRESS): Add macro.
+	(SECOND_IPADDRESS): Add macro.
+	(THIRD_IPADDRESS): Add macro.
+	(FOURTH_IPADDRESS): Add macro.
+
 2002-06-25  Conrad Scott  <conrad.scott@dsl.pipex.com>
 
 	* include/winbase.h (FILE_FLAG_FIRST_PIPE_INSTANCE): Add constant.
diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
index aa7d4a84a..526fac912 100644
--- a/winsup/w32api/include/commctrl.h
+++ b/winsup/w32api/include/commctrl.h
@@ -42,6 +42,8 @@ extern "C" {
 #define UPDOWN_CLASSW	L"msctls_updown32"
 #define WC_COMBOBOXEXW	L"ComboBoxEx32"
 #define WC_COMBOBOXEXA	"ComboBoxEx32"
+#define WC_IPADDRESSW	L"SysIPAddress32"
+#define WC_IPADDRESSA	"SysIPAddress32"
 #define WC_LISTVIEWA	"SysListView32"
 #define WC_LISTVIEWW	L"SysListView32"
 #define WC_TABCONTROLA	"SysTabControl32"
@@ -181,6 +183,11 @@ extern "C" {
 #define CBEN_FIRST	(-800)
 #define CBEN_LAST	(-830)
 #endif /* _WIN32_IE */
+#if (_WIN32_IE >= 0x0400)
+#define IPN_FIRST	(-860)
+#define IPN_LAST	(-879)
+#define IPN_FIELDCHANGED	(IPN_FIRST-0)
+#endif /* _WIN32_IE >= 0x0400 */
 #define HDI_WIDTH	1
 #define HDI_HEIGHT	1
 #define HDI_TEXT	2
@@ -261,6 +268,12 @@ extern "C" {
 #define HDN_ENDDRAG	(HDN_FIRST-11)
 #define HDN_BEGINDRAG	(HDN_FIRST-10)
 #endif
+#define IPM_CLEARADDRESS	(WM_USER+100)
+#define IPM_SETADDRESS	(WM_USER+101)
+#define IPM_GETADDRESS	(WM_USER+102)
+#define IPM_SETRANGE	(WM_USER+103)
+#define IPM_SETFOCUS	(WM_USER+104)
+#define IPM_ISBLANK	(WM_USER+105)
 #define CMB_MASKED 2
 #define TBSTATE_CHECKED	1
 #define TBSTATE_PRESSED	2
@@ -1332,6 +1345,11 @@ typedef struct {
 	int iItemid;
 	char    szText[CBEMAXSTRLEN];
 }NMCBEDRAGBEGINA, *LPNMCBEDRAGBEGINA, *PNMCBEDRAGBEGINA;
+typedef struct tagNMIPADDRESS{
+	NMHDR hdr;
+	int iField;
+	int iValue;
+} NMIPADDRESS, *LPNMIPADDRESS;
 #endif /*_WIN32_IE >= 0x0400*/
 typedef struct {
 	NMHDR hdr;
@@ -2080,6 +2098,12 @@ typedef struct _RB_HITTESTINFO {
 #define HANDLE_WM_NOTIFY(h,w,l,f) (f)((h),(int)(w),(NMHDR*)(l))
 #define FORWARD_WM_NOTIFY(h,i,p,f) (LRESULT)(f)((h),WM_NOTIFY,(WPARAM)(int)(i),(LPARAM)(NMHDR*)(p))
 #define CCSIZEOF_STRUCT(n,m) (((int)((PBYTE)(&((s*)0)->m)-((PBYTE)((s*)0))))+sizeof(((s*)0)->m))
+#define MAKEIPADDRESS(b1,b2,b3,b4) ((LPARAM)(((DWORD)(b1)<<24)+((DWORD)(b2)<<16)+((DWORD)(b3)<<8)+((DWORD)(b4))))
+#define MAKEIPRANGE(low,high) ((LPARAM)(WORD)(((BYTE)(high)<<8)+(BYTE)(low)))
+#define FIRST_IPADDRESS(a) ((a>>24) & 0xff)
+#define SECOND_IPADDRESS(a) ((a>>16) & 0xff)
+#define THIRD_IPADDRESS(a)  ((a>>8) & 0xff)
+#define FOURTH_IPADDRESS(a) (a & 0xff)
 #define Animate_Create(w,i,s,hI) CreateWindow(ANIMATE_CLASS,NULL,s,0,0,0,0,w,(HMENU)(i),hI,NULL)
 #define Animate_Open(w,f) (BOOL)SNDMSG(w,ACM_OPEN,0,(LPARAM)f)
 #define Animate_Play(w,f,t,r) (BOOL)SNDMSG(w,ACM_PLAY,(r),(LPARAM)MAKELONG(f,t))
@@ -2364,6 +2388,7 @@ WINBOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*);
 #define UPDOWN_CLASS UPDOWN_CLASSW
 #define WC_COMBOBOXEX WC_COMBOBOXEXW
 #define WC_HEADER WC_HEADERW
+#define WC_IPADDRESS WC_IPADDRESSW
 #define WC_LISTVIEW WC_LISTVIEWW
 #define WC_TABCONTROL WC_TABCONTROLW
 #define WC_TREEVIEW WC_TREEVIEWW
@@ -2404,7 +2429,6 @@ typedef NMTREEVIEWW NMTREEVIEW,*LPNMTREEVIEW;
 #define SB_SETTEXT	SB_SETTEXTW
 #define SB_GETTEXTLENGTH	SB_GETTEXTLENGTHW
 #define STATUSCLASSNAME         STATUSCLASSNAMEW
-#define WC_HEADER WC_HEADERW
 #define HDM_INSERTITEM HDM_INSERTITEMW
 #define HDM_GETITEM HDM_GETITEMW
 #define HDM_SETITEM HDM_SETITEMW
@@ -2448,7 +2472,6 @@ typedef NMTREEVIEWW NMTREEVIEW,*LPNMTREEVIEW;
 #define UPDOWN_CLASS UPDOWN_CLASSW
 #define PROGRESS_CLASS PROGRESS_CLASSW
 #define HOTKEY_CLASS HOTKEY_CLASSW
-#define WC_LISTVIEW WC_LISTVIEWW
 #define LV_ITEM LV_ITEMW
 #define LVITEM LVITEMW
 #define LPSTR_TEXTCALLBACK LPSTR_TEXTCALLBACKW
@@ -2474,7 +2497,6 @@ typedef NMTREEVIEWW NMTREEVIEW,*LPNMTREEVIEW;
 #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
 #define TVM_SETITEM TVM_SETITEMW
@@ -2492,7 +2514,6 @@ typedef NMTREEVIEWW NMTREEVIEW,*LPNMTREEVIEW;
 #define TVN_DELETEITEM TVN_DELETEITEMW
 #define TVN_BEGINLABELEDIT TVN_BEGINLABELEDITW
 #define TVN_ENDLABELEDIT TVN_ENDLABELEDITW
-#define WC_TABCONTROL WC_TABCONTROLW
 #define TC_ITEMHEADER TC_ITEMHEADERW
 #define TC_ITEM TC_ITEMW
 #define TCM_GETITEM TCM_GETITEMW
@@ -2523,8 +2544,9 @@ typedef REBARBANDINFOW REBARBANDINFO,*LPREBARBANDINFO;
 #define TOOLTIPS_CLASS TOOLTIPS_CLASSA
 #define TRACKBAR_CLASS TRACKBAR_CLASSA
 #define UPDOWN_CLASS UPDOWN_CLASSA
-#define WC_COMBOBOXEX	WC_COMBOBOXEXA
+#define WC_COMBOBOXEX WC_COMBOBOXEXA
 #define WC_HEADER WC_HEADERA
+#define WC_IPADDRESS WC_IPADDRESSA
 #define WC_LISTVIEW WC_LISTVIEWA
 #define WC_TABCONTROL WC_TABCONTROLA
 #define WC_TREEVIEW WC_TREEVIEWA