* 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, 26 insertions, 12 deletions

diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h
index 44e0d4c0b..c22ef79d1 100644
--- a/winsup/w32api/include/shlobj.h
+++ b/winsup/w32api/include/shlobj.h
@@ -29,12 +29,6 @@ extern "C" {
 #define BFFM_SETSTATUSTEXT (WM_USER + 100)
 #define BFFM_ENABLEOK (WM_USER + 101)
 #define BFFM_SETSELECTION (WM_USER + 102)
-#define CMIC_MASK_HOTKEY	SEE_MASK_HOTKEY
-#define CMIC_MASK_ICON	SEE_MASK_ICON
-#define CMIC_MASK_FLAG_NO_UI	SEE_MASK_FLAG_NO_UI
-#define CMDSTR_NEWFOLDER	"NewFolder"
-#define CMDSTR_VIEWLIST	"ViewList"
-#define CMDSTR_VIEWDETAILS	"ViewDetails"
 #define DVASPECT_SHORTNAME 2
 #define SHARD_PIDL	1
 #define SHARD_PATH	2
@@ -117,6 +111,7 @@ extern "C" {
 #endif
 #define REGSTR_PATH_SPECIAL_FOLDERS	REGSTR_PATH_EXPLORER TEXT("\\Shell Folders")
 #define CSIDL_DESKTOP	0
+#define CSIDL_INTERNET  1
 #define CSIDL_PROGRAMS	2
 #define CSIDL_CONTROLS	3
 #define CSIDL_PRINTERS	4
@@ -137,8 +132,14 @@ extern "C" {
 #define CSIDL_COMMON_PROGRAMS	23
 #define CSIDL_COMMON_STARTUP	24
 #define CSIDL_COMMON_DESKTOPDIRECTORY	25
+#define CSIDL_APPDATA   26
+#define CSIDL_PRINTHOOD 27
+#define CSIDL_ALTSTARTUP    29
 #define CSIDL_COMMON_ALTSTARTUP	30
 #define CSIDL_COMMON_FAVORITES	31
+#define CSIDL_INTERNET_CACHE   32
+#define CSIDL_COOKIES	33
+#define CSIDL_HISTORY	34
 #define CFSTR_SHELLIDLIST	"Shell IDList Array"
 #define CFSTR_SHELLIDLISTOFFSET	"Shell Object Offsets"
 #define CFSTR_NETRESOURCES	"Net Resource"
@@ -152,12 +153,25 @@ extern "C" {
 #define CMF_VERBSONLY	2
 #define CMF_EXPLORE	4
 #define CMF_RESERVED	0xffff0000
-#define GCS_VERB	0
-#define GCS_HELPTEXT	1
-#define GCS_VALIDATE	2
-#define CMDSTR_NEWFOLDER	"NewFolder"
-#define CMDSTR_VIEWLIST	"ViewList"
-#define CMDSTR_VIEWDETAILS	"ViewDetails"
+#define GCS_VERBA        0
+#define GCS_HELPTEXTA    1
+#define GCS_VALIDATEA    2
+#define GCS_VERBW        4
+#define GCS_HELPTEXTW    5
+#define GCS_VALIDATEW    6
+#define GCS_UNICODE      4
+#ifdef UNICODE
+#define GCS_VERB        GCS_VERBW
+#define GCS_HELPTEXT    GCS_HELPTEXTW
+#define GCS_VALIDATE    GCS_VALIDATEW
+#else
+#define GCS_VERB        GCS_VERBA
+#define GCS_HELPTEXT    GCS_HELPTEXTA
+#define GCS_VALIDATE    GCS_VALIDATEA
+#endif
+#define CMDSTR_NEWFOLDER	TEXT("NewFolder")
+#define CMDSTR_VIEWLIST		TEXT("ViewList")
+#define CMDSTR_VIEWDETAILS	TEXT("ViewDetails")
 #define CMIC_MASK_HOTKEY	SEE_MASK_HOTKEY
 #define CMIC_MASK_ICON	SEE_MASK_ICON
 #define CMIC_MASK_FLAG_NO_UI	SEE_MASK_FLAG_NO_UI