* include/setupapi.h : New file.

	* lib/setupapi.def:New file.
	* lib/test.c: Include setupapi.h.
	* include/winioctl.h (_DISK_PERFORMANCE): Correct typo.
	* include/richedit.h (ENLINK): Add structure definition.
	(EM_AUTOURLDETECT, EN_LINK, ENM_LINK): Add defines.
	* include/shlobj.h (CMIC_*): Remove duplicate defines.
	(CMDSTR_*): Remove duplicates; UNICODE string constants.
	(GCS_*): Make UNICODE.
	(CSIDL_*): Add more defines.
	* include/winioctl.h (_MEDIA_TYPE): Add pointer typedef.
	(_DISK_GEOMETRY): Ditto.
	(_DISK_PERFORMANCE): Ditto.
	* include/winbase.h (HasOverlappedIoCompleted): Add macro.
	* include/winnt.h: Move CHAR, SHORT and LONG typedefs outside
	of block protected by #ifndef VOID.
	(This reverts 1998-12-01 Anders Norlander change.)
	* include/odbcinst.h: End file with newline.
	* include/raserror.h: Ditto.
	* include/winsock2.h (#include <wtypes.h): Don't.
	(_BLOB): Define instead, if not already done.
	(__BLOB_T_DEFINED: New define for guarding _BLOB.
	* include/wtypes.h (_BLOB): Guard against prior definition.
	* include/oaidl.h (tagVARIANT): Mark anonymous structs and unions
	 as 	__extension__.
	(tagTYPEDESC): Ditto.
	(_wireBRECORD): Add structure definition.
	(_wireSAFEARR_BRECORD): Ditto.
	(_wireSAFEARR_HAVEIID): Ditto.
	(_wireSAFEARRAY_UNION.u): Add fields SAFEARR_BRECORD RecordStr,
	SAFEARR_HAVEIID HaveIidStr.
	(tagVariant): Add fields _VARIANT_BOOL bool,*pbool.
	(_wireVARIANT): Change field parray to type wirePSAFEARRAY,
	pparray to wirePSAFEARRAY*.
	(_wireVARIANT): Add field wireBRECORD brecVal.
	(wireVARIANT): Change typedef to struct _wireVariant*.
	(IRecordInfo): Add interface definition.
	(LPRECORDINFO): Add typedef for IRecordInfo*.
	(IID_IRecordInfo): Add forward decalaration.
	* include/lmcons.h: Guard CNLEN and UNCLEN against prior definition.
	* include/nddeapi.h: Likewise.
	* ChangeLog: Formatting and typo fixes.

1 files changed, 10 insertions, 0 deletions

diff --git a/winsup/w32api/include/richedit.h b/winsup/w32api/include/richedit.h
index 1bbac22e7..67c159bc8 100644
--- a/winsup/w32api/include/richedit.h
+++ b/winsup/w32api/include/richedit.h
@@ -132,6 +132,7 @@ extern "C" {
 #define EM_GETREDONAME	(WM_USER+87)
 #define EM_STOPGROUPTYPING	(WM_USER+88)
 #define EM_GETTEXTLENGTHEX	(WM_USER+95)
+#define EM_AUTOURLDETECT	(WM_USER+91)
 #define EM_SETLANGOPTIONS	(WM_USER+120)
 #define EM_GETLANGOPTIONS	(WM_USER+121)
 #define EM_GETIMECOMPMODE	(WM_USER+122)
@@ -144,6 +145,7 @@ extern "C" {
 #define EN_CORRECTTEXT 1797
 #define EN_DROPFILES 1795
 #define EN_IMECHANGE 1799
+#define EN_LINK 1803
 #define EN_MSGFILTER 1792
 #define EN_OLEOPFAILED 1801
 #define EN_PROTECTED 1796
@@ -162,6 +164,7 @@ extern "C" {
 #define ENM_SCROLL 4
 #define ENM_SELCHANGE 524288
 #define ENM_UPDATE 2
+#define ENM_LINK 67108864
 #define ECO_AUTOWORDSELECTION	1
 #define ECO_AUTOVSCROLL	64
 #define ECO_AUTOHSCROLL	128
@@ -273,6 +276,13 @@ typedef struct _endropfiles {
 	LONG cp;
 	BOOL fProtected;
 } ENDROPFILES;
+typedef struct _enlink {
+	NMHDR nmhdr;
+	UINT msg;
+	WPARAM wParam;
+	LPARAM lParam;
+	CHARRANGE chrg;
+} ENLINK;
 typedef struct {
 	NMHDR nmhdr;
 	LONG iob;