* 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.

winsup/w32api/ChangeLog

@@ -1,4 +1,76 @@
-2001-08-10 Danny Smith <dannysmith@users.sourceforge.net>
+2001-08-21  Earnie Boyd  <earnie@SF.Net>
+
+	* include/setupapi.h: Formatting.
+
+2001-08-21  Earnie Boyd  <earnie@SF.Net>
+
+	* include/shlobj.h: Remove \r from the line endings.
+
+2001-08-21  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/setupapi.h : New file.
+	* lib/setupapi.def:New file.
+	* lib/test.c: Include setupapi.h.
+
+2001-08-21  Danny Smith  <dannysmith@users.sourceforge.net>
+	* include/winioctl.h (_DISK_PERFORMANCE): Correct typo.
+
+2001-08-21  Mattia Barbon  <mbarbon@dsi.unive.it>
+
+	* include/richedit.h (ENLINK): Add structure definition.
+	(EM_AUTOURLDETECT, EN_LINK, ENM_LINK): Add defines.
+
+2001-08-21  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* 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.
+
+2001-08-15  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* 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.	
+
+2001-08-15  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* 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. 
+
+2001-08-15  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* 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.
+
+2001-08-15  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/lmcons.h: Guard CNLEN and UNCLEN against prior definition.
+	* include/nddeapi.h: Likewise.
+
+2001-08-10  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* lib/test.c (Win32_Winsock): Replace with __USE_W32_SOCKETS.
 	Add more includes of w32api headers.
@@ -8,26 +80,26 @@
 	* include/winnt.h (GetCurrentFiber): Change __inline to __inline__.
 	Swap asm code with that of GetFiberData.
 	(GetFiberData): Ditto.
-	* lib/kernels.c: New file, containing library versions of
+	* lib/kernel32.c: New file, containing library versions of
 	GetCurrentFiber and GetFiberData.
 	* lib/makefile.in: Add kernel32.o as static object to libkernal32.a.
 
-2001-08-08 Danny Smith <dannysmith@users.sourceforge.net>
+2001-08-08  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/winuser.h (GET_WHEEL_DELTA_WPARAM): Add macro.
 	Thanks to: Harold Hunt <Harold@compasstechnologies.com>.
 
-2001-08-08 Danny Smith <dannysmith@users.sourceforge.net>
+2001-08-08  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* lib/oleaut32.def: Regenerate.
 
-2001-08-04  Danny Smith <dannysmith@users.sourceforge.net>
+2001-08-04  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/wtypes.h (DECIMAL_SETZERO): Correct typo.
 
-2001-08-02  Danny Smith <dannysmith@users.sourceforge.net>
+2001-08-02  Danny Smith  <dannysmith@users.sourceforge.net>
 
-	Apply Dmitry Bely <dbely@mail.ru> patch 437834 (with additions).
+	Apply Dmitry Bely  <dbely@mail.ru> patch 437834 (with additions).
  	* include/oleidl.h (ISupportErrorInfo, ICreateInfo): Move from here
 	* include/oaidl.h: ... to here.
 	* include/oaidl.h ICreateErrorInfo): Add interface definition.
@@ -35,16 +107,16 @@
 	(LPSUPPORTERRORINFO): Add typedef.
 	(IID_ISupportErrorInfo): Change forward decl. of type to IID.
 
-2001-08-02  Danny Smith <dannysmith@users.sourceforge.net>
+2001-08-02  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/winsock2.h (WSAGET* and WSAMAKE*): Remove duplicate
 	defines.
 
-2001-07-30  Danny Smith <dannysmith@users.sourceforge.net>
+2001-07-30  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/commctrl.h (TreeView_SetIndent): Correct typo.
 
-2001-07-30  Danny Smith <dannysmith@users.sourceforge.net>
+2001-07-30  Danny Smith  <dannysmith@users.sourceforge.net>
  
 	* include/commctrl.h (TBSTYPE_FLAT): Remove define.
 	Thanks to: Jason Craig  <jacraig@softhome.net>
@@ -60,37 +132,37 @@
 	(tagNMTVCUSTOMDRAW): Likewise.
 	(tagNMLVCACHEHINT): Likewise.
 	
-2001-07-06 Danny Smith <dannysmith@users.sourceforge.net>
+2001-07-06  Danny Smith  <dannysmith@users.sourceforge.net>
  
 	* include/basetsd.h (#include <_mingw.h>): Remove.
 	(__int64): Define.
 
-2001-06-28 Danny Smith <dannysmith@users.sourceforge.net>
+2001-06-28  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/wingdi.h (AC_SRC_OVER): Add define.
 	(struct _BLENDFUNCTION): Add.
 
-2001-06-28 Danny Smith <dannysmith@users.sourceforge.net>
+2001-06-28  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/shlobj.h:  Add BIF_* defines.
 
-2001-06-27 Danny Smith <dannysmith@users.sourceforge.net>
+2001-06-27  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/winerror.h (E_PENDING): Add error code define.
 
-2001-06-27 Danny Smith <dannysmith@users.sourceforge.net>
+2001-06-27  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/basetsd.h (#include <_mingw.h>): Add directive.
 
-2001-06-25 Danny Smith <dannysmith@users.sourceforge.net>
+2001-06-25  Danny Smith  <dannysmith@users.sourceforge.net>
 
-	* include/winbase.h(InterlockedCompareExchange): Change args
+	* include/winbase.h (InterlockedCompareExchange): Change args
 	and return value from PVOID to LONG.
 	(InterlockedExchange): Change first arg to LPLONG.
 	(InterlockedCompareExchangePointer): New macro.
 	(InterlockedExchangePointer): New macro.
 
-2001-06-19 Danny Smith <dannysmith@users.sourceforge.net>
+2001-06-19  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* lib/kernel32.def: Add LanguageGroup and UILanguage symbols.
 	Thanks to Kevin Chase <kevincha99@hotmail.com>. 
@@ -100,7 +172,7 @@
 	* objidl.h (IMalloc::ReAlloc()): Correct declaration.
 	(IMalloc::Free()): Ditto.
 
-2001-06-11 Danny Smith <dannysmith@users.sourceforge.net>
+2001-06-11  Danny Smith <dannysmith@users.sourceforge.net>
 
 	* include/shlobj.h (REGSTR_PATH_EXPLORER): Unicode it. 
 	(REGSTR_PATH_SPECIAL_FOLDERS): Ditto.
@@ -185,7 +257,7 @@ Mon Apr 23 13:17:32 2001  Christopher Faylor <cgf@cygnus.com>
 	* include/winnt.h: Ditto.
 	* include/wtypes.h: Ditto.
 
-2001-04-11 Danny Smith <dannysmith@users.sourceforge.net>
+2001-04-11  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/windows.h (#include <winsock.h>): Include <winsock2.h>
 	instead if (_WIN32_WINNT >= 0x0400)&&(__W32API_MAJOR_VERSION > 0).

winsup/w32api/include/lmcons.h

@@ -8,7 +8,10 @@
 #define API_RET_TYPE NET_API_STATUS
 #define MIN_LANMAN_MESSAGE_ID NERR_BASE
 #define MAX_LANMAN_MESSAGE_ID 5799
+#ifndef CNLEN /* also in nddeapi.h */
 #define CNLEN 15
+#define UNCLEN (CNLEN + 2)
+#endif
 #define DNLEN 15
 #define LM20_CNLEN 15
 #define LM20_DNLEN 15
@@ -17,7 +20,6 @@
 #define LM20_UNCLEN (LM20_CNLEN+2)
 #define LM20_NNLEN 12
 #define LM20_RMLEN (LM20_UNCLEN+1+LM20_NNLEN)
-#define UNCLEN (CNLEN+2)
 #define NNLEN 80
 #define RMLEN (UNCLEN+1+NNLEN)
 #define SNLEN 80

winsup/w32api/include/nddeapi.h

@@ -3,8 +3,10 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#ifndef CNLEN /* also in lmcons.h */
 #define CNLEN 15
-#define UNCLEN 17
+#define UNCLEN (CNLEN + 2)
+#endif
 #define SEP_CHAR ','
 #define BAR_CHAR "|"
 #define SEP_WCHAR L','

winsup/w32api/include/oaidl.h

@@ -61,6 +61,7 @@ typedef interface IDispatch *LPDISPATCH;
 typedef interface IEnumVARIANT *LPENUMVARIANT;
 typedef interface ICreateErrorInfo *LPCREATEERRORINFO;
 typedef interface ISupportErrorInfo *LPSUPPORTERRORINFO;
+typedef interface IRecordInfo *LPRECORDINFO;
 
 extern const IID IID_ITypeLib;
 extern const IID IID_ICreateTypeInfo;
@@ -73,6 +74,7 @@ extern const IID IID_IDispatch;
 extern const IID IID_IEnumVARIANT;
 extern const IID IID_ICreateErrorInfo;
 extern const IID IID_ISupportErrorInfo;
+extern const IID IID_IRecordInfo;
 
 typedef enum tagSYSKIND {
 	SYS_WIN16,SYS_WIN32,SYS_MAC
@@ -122,6 +124,21 @@ typedef enum tagSF_TYPE {
 	SF_DISPATCH=VT_DISPATCH,
 	SF_VARIANT=VT_VARIANT
 }SF_TYPE;
+typedef struct _wireBRECORD  {
+	ULONG fFlags;
+	ULONG clSize;
+	LPRECORDINFO* pRecInfo;
+	byte* pRecord;
+} *wireBRECORD;
+typedef struct _wireSAFEARR_BRECORD {
+    ULONG Size;
+    wireBRECORD* aRecord;
+    } SAFEARR_BRECORD;
+typedef struct _wireSAFEARR_HAVEIID {
+	ULONG Size;
+	IUnknown** apUnknown;
+	IID iid;
+	} SAFEARR_HAVEIID;
 typedef struct _wireSAFEARRAY_UNION {
 	ULONG sfType;
 	union {
@@ -129,6 +146,8 @@ typedef struct _wireSAFEARRAY_UNION {
 		SAFEARR_UNKNOWN UnknownStr;
 		SAFEARR_DISPATCH DispatchStr;
 		SAFEARR_VARIANT VariantStr;
+		SAFEARR_BRECORD RecordStr;
+		SAFEARR_HAVEIID HaveIidStr;
 		BYTE_SIZEDARR ByteStr;
 		WORD_SIZEDARR WordStr;
 		DWORD_SIZEDARR LongStr;
@@ -153,13 +172,13 @@ typedef struct tagSAFEARRAY {
 	SAFEARRAYBOUND rgsabound[1];
 }SAFEARRAY,*LPSAFEARRAY;
 typedef struct tagVARIANT {
-  union {
+  _ANONYMOUS_UNION union {
-    struct __tagVARIANT {
+	struct __tagVARIANT {
 	VARTYPE vt;
 	WORD wReserved1;
 	WORD wReserved2;
 	WORD wReserved3;
-	union {
+	_ANONYMOUS_UNION union {
 		long lVal;
 		unsigned char bVal;
 		short iVal;
@@ -179,6 +198,7 @@ typedef struct tagVARIANT {
 		float *pfltVal;
 		double *pdblVal;
 		VARIANT_BOOL *pboolVal;
+		_VARIANT_BOOL  *pbool;
 		SCODE *pscode;
 		CY *pcyVal;
 		DATE *pdate;
@@ -199,7 +219,7 @@ typedef struct tagVARIANT {
 		ULONG  *pulVal;
 		INT  *pintVal;
 		UINT  *puintVal;
-		struct {
+		_ANONYMOUS_STRUCT struct {
 			PVOID pvRecord;
 			struct IRecordInfo *pRecInfo;
 		} __VARIANT_NAME_4;
@@ -230,7 +250,8 @@ typedef struct _wireVARIANT {
 		wireBSTR bstrVal;
 		IUnknown *punkVal;
 		LPDISPATCH pdispVal;
-		wireSAFEARRAY parray;
+		wirePSAFEARRAY parray;
+		wireBRECORD brecVal;
 		BYTE *pbVal;
 		SHORT *piVal;
 		LONG *plVal;
@@ -243,7 +264,7 @@ typedef struct _wireVARIANT {
 		wireBSTR *pbstrVal;
 		IUnknown **ppunkVal;
 		LPDISPATCH *ppdispVal;
-		wireSAFEARRAY *pparray;
+		wirePSAFEARRAY *pparray;
 		struct _wireVARIANT *pvarVal;
 		CHAR cVal;
 		USHORT uiVal;
@@ -258,7 +279,7 @@ typedef struct _wireVARIANT {
 		INT *pintVal;
 		UINT *puintVal;
 	} DUMMYUNIONNAME;
-} wireVARIANT;
+} *wireVARIANT;  
 typedef LONG DISPID;
 typedef DISPID MEMBERID;
 typedef DWORD HREFTYPE;
@@ -267,7 +288,7 @@ typedef enum tagTYPEKIND {
 	TKIND_COCLASS,TKIND_ALIAS,TKIND_UNION,TKIND_MAX
 }TYPEKIND;
 typedef struct tagTYPEDESC {
-	union {
+	_ANONYMOUS_UNION union {
 		struct tagTYPEDESC *lptdesc;
 		struct tagARRAYDESC *lpadesc;
 		HREFTYPE hreftype;
@@ -549,6 +570,32 @@ DECLARE_INTERFACE_(ISupportErrorInfo, IUnknown)
 	STDMETHOD(InterfaceSupportsErrorInfo)(THIS_ REFIID) PURE;
 };
 
+EXTERN_C const IID IID_IRecordInfo;
+#undef INTERFACE
+#define INTERFACE IRecordInfo
+DECLARE_INTERFACE_(IRecordInfo, IUnknown)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(RecordInit)(THIS_ PVOID) PURE;
+	STDMETHOD(RecordClear)(THIS_ PVOID) PURE;
+	STDMETHOD(RecordCopy)(THIS_ PVOID, PVOID) PURE;
+	STDMETHOD(GetGuid)(THIS_ GUID*) PURE;
+	STDMETHOD(GetName)(THIS_ BSTR*) PURE;
+	STDMETHOD(GetSize)(THIS_ ULONG*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ ITypeInfo**) PURE;
+	STDMETHOD(GetField)(THIS_ PVOID,LPCOLESTR,VARIANT*) PURE;
+	STDMETHOD(GetFieldNoCopy)(THIS_ PVOID,LPCOLESTR,VARIANT*,PVOID*) PURE;
+	STDMETHOD(PutField )(THIS_ ULONG,PVOID,LPCOLESTR, VARIANT*) PURE;
+	STDMETHOD(PutFieldNoCopy)(THIS_ ULONG,PVOID,LPCOLESTR,VARIANT*) PURE;
+	STDMETHOD(GetFieldNames)(THIS_ ULONG*,BSTR*) PURE;
+	STDMETHOD_(BOOL,IsMatchingType)(THIS_ THIS) PURE;
+	STDMETHOD_(PVOID,RecordCreate)(THIS) PURE;
+	STDMETHOD(RecordCreateCopy)(THIS_ PVOID,PVOID*) PURE;
+	STDMETHOD(RecordDestroy )(THIS_ PVOID) PURE;
+};
+
 #ifdef __cplusplus
 }
 #endif

winsup/w32api/include/odbcinst.h

@@ -141,5 +141,5 @@ BOOL INSTAPI SQLWriteFileDSNW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
 #endif /* RC_INVOKED */
 #ifdef __cplusplus
 }
-#endif 
+#endif
-#endif /* _ODBCINST_H */
+#endif /* _ODBCINST_H */

winsup/w32api/include/raserror.h

@@ -203,4 +203,4 @@
 #define ERROR_CONNECTING_DEVICE_NOT_FOUND    (RASBASE+197)
 #define ERROR_NO_EAPTLS_CERTIFICATE          (RASBASE+198)
 #define RASBASEEND                           (RASBASE+198)
-#endif /* _RASERROR_H */
+#endif /* _RASERROR_H */

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;

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_VERBA        0
-#define GCS_HELPTEXT	1
+#define GCS_HELPTEXTA    1
-#define GCS_VALIDATE	2
+#define GCS_VALIDATEA    2
-#define CMDSTR_NEWFOLDER	"NewFolder"
+#define GCS_VERBW        4
-#define CMDSTR_VIEWLIST	"ViewList"
+#define GCS_HELPTEXTW    5
-#define CMDSTR_VIEWDETAILS	"ViewDetails"
+#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

winsup/w32api/include/winbase.h

@@ -1291,6 +1291,7 @@ VOID WINAPI GlobalUnfix(HGLOBAL);
 BOOL WINAPI GlobalUnlock(HGLOBAL);
 BOOL WINAPI GlobalUnWire(HGLOBAL);
 PVOID WINAPI GlobalWire(HGLOBAL);
+#define HasOverlappedIoCompleted(lpOverlapped)  ((lpOverlapped)->Internal != STATUS_PENDING)
 PVOID WINAPI HeapAlloc(HANDLE,DWORD,DWORD);
 UINT WINAPI HeapCompact(HANDLE,DWORD);
 HANDLE WINAPI HeapCreate(DWORD,DWORD,DWORD);

winsup/w32api/include/winioctl.h

@@ -177,14 +177,14 @@ typedef enum _MEDIA_TYPE {
 	F5_160_512,
 	RemovableMedia,
 	FixedMedia
-} MEDIA_TYPE;
+} MEDIA_TYPE, *PMEDIA_TYPE ;
 typedef struct _DISK_GEOMETRY {
 	LARGE_INTEGER Cylinders;
 	MEDIA_TYPE MediaType;
 	DWORD TracksPerCylinder;
 	DWORD SectorsPerTrack;
 	DWORD BytesPerSector;
-} DISK_GEOMETRY;
+} DISK_GEOMETRY,  *PDISK_GEOMETRY;
 typedef struct _DISK_PERFORMANCE {
     LARGE_INTEGER BytesRead;
     LARGE_INTEGER BytesWritten;
@@ -193,7 +193,7 @@ typedef struct _DISK_PERFORMANCE {
     DWORD ReadCount;
     DWORD WriteCount;
     DWORD QueueDepth;
-} DISK_PERFORMANCE;
+} DISK_PERFORMANCE, *PDISK_PERFORMANCE;
 typedef struct _DISK_RECORD {
 	LARGE_INTEGER ByteOffset;
 	LARGE_INTEGER StartTime;

winsup/w32api/include/winnt.h

@@ -41,10 +41,10 @@ extern "C" {
 
 #ifndef VOID
 #define VOID void
+#endif
 typedef char CHAR;
 typedef short SHORT;
 typedef long LONG;
-#endif
 typedef CHAR CCHAR;
 typedef unsigned char UCHAR,*PUCHAR;
 typedef unsigned short USHORT,*PUSHORT;

winsup/w32api/include/winsock2.h

@@ -17,10 +17,6 @@
 
 #include <windows.h>
 
-#ifndef _WTYPES_H
-#include <wtypes.h> /* for BLOB */
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -709,6 +705,13 @@ typedef struct _WSAVersion
  * but itself needs LPSOCKADDR which is defined earlier in this file 
 */
 #include <nspapi.h>
+#ifndef __BLOB_T_DEFINED /* also in wtypes.h */
+#define __BLOB_T_DEFINED
+typedef struct _BLOB {
+	ULONG	cbSize;
+	BYTE	*pBlobData;
+} BLOB,*PBLOB,*LPBLOB;
+#endif
 
 typedef struct _WSAQuerySetA
 {

winsup/w32api/include/wtypes.h

@@ -11,10 +11,13 @@ extern "C" {
 #define CBPCLIPDATA(d) ((d).cbSize-sizeof((d).ulClipFmt))
 #define DECIMAL_NEG ((BYTE)0x80)
 #define DECIMAL_SETZERO(d) {(d).Lo64=(d).Hi32=(d).signscale=0;}
+#ifndef __BLOB_T_DEFINED /* also in winsock2.h */
+#define __BLOB_T_DEFINED
 typedef struct _BLOB {
 	ULONG	cbSize;
 	BYTE	*pBlobData;
 } BLOB,*PBLOB,*LPBLOB;
+#endif
 typedef enum tagDVASPECT {
 	DVASPECT_CONTENT=1,
 	DVASPECT_THUMBNAIL=2,

winsup/w32api/lib/setupapi.def

@@ -0,0 +1,375 @@
+LIBRARY setupapi.dll
+EXPORTS
+AcquireSCMLock@8
+AddMiniIconToList@8
+AddTagToGroupOrderListEntry@12
+AppendStringToMultiSz@24
+AssertFail@12
+CaptureAndConvertAnsiArg@8
+CaptureStringArg@8
+CenterWindowRelativeToParent@4
+ConcatenatePaths@16
+DelayedMove@8
+DelimStringToMultiSz@12
+DestroyTextFileReadBuffer@4
+DoInstallActionWithParams@24
+DoesUserHavePrivilege@4
+DuplicateString@4
+EnablePrivilege@8
+ExtensionPropSheetPageProc@12
+FileExists@8
+FreeStringArray@8
+GetCurrentDriverSigningPolicy@4
+GetSetFileTimestamp@20
+GetVersionInfoFromImage@12
+HandleFailedVerification@40
+InfIsFromOemLocation@8
+InstallCatalog@12
+InstallHinfSection@16
+InstallHinfSectionA@16
+InstallHinfSectionW@16
+InstallStop@4
+InstallStopEx@12
+IsUserAdmin@0
+LookUpStringInTable@12
+MemoryInitialize@4
+MultiByteToUnicode@8
+MultiSzFromSearchControl@16
+MyFree@4
+MyGetFileTitle@4
+MyMalloc@4
+MyRealloc@8
+OpenAndMapFileForRead@20
+OutOfMemory@4
+QueryMultiSzValueToArray@24
+QueryRegistryValue@20
+ReadAsciiOrUnicodeTextFile@8
+RegistryDelnode@8
+RetreiveFileSecurity@8
+RetrieveServiceConfig@8
+SearchForInfFile@24
+SetArrayToMultiSzValue@20
+SetupAddInstallSectionToDiskSpaceListA@24
+SetupAddInstallSectionToDiskSpaceListW@24
+SetupAddSectionToDiskSpaceListA@28
+SetupAddSectionToDiskSpaceListW@28
+SetupAddToDiskSpaceListA@28
+SetupAddToDiskSpaceListW@28
+SetupAddToSourceListA@8
+SetupAddToSourceListW@8
+SetupAdjustDiskSpaceListA@24
+SetupAdjustDiskSpaceListW@24
+SetupBackupErrorA@24
+SetupBackupErrorW@24
+SetupCancelTemporarySourceList@0
+SetupCloseFileQueue@4
+SetupCloseInfFile@4
+SetupCloseLog@0
+SetupCommitFileQueue@16
+SetupCommitFileQueueA@16
+SetupCommitFileQueueW@16
+SetupCopyErrorA@44
+SetupCopyErrorW@44
+SetupCopyOEMInfA@32
+SetupCopyOEMInfW@32
+SetupCreateDiskSpaceListA@12
+SetupCreateDiskSpaceListW@12
+SetupDecompressOrCopyFileA@12
+SetupDecompressOrCopyFileW@12
+SetupDefaultQueueCallback@16
+SetupDefaultQueueCallbackA@16
+SetupDefaultQueueCallbackW@16
+SetupDeleteErrorA@20
+SetupDeleteErrorW@20
+SetupDestroyDiskSpaceList@4
+SetupDiAskForOEMDisk@8
+SetupDiBuildClassInfoList@16
+SetupDiBuildClassInfoListExA@24
+SetupDiBuildClassInfoListExW@24
+SetupDiBuildDriverInfoList@12
+SetupDiCallClassInstaller@12
+SetupDiCancelDriverInfoSearch@4
+SetupDiChangeState@8
+SetupDiClassGuidsFromNameA@16
+SetupDiClassGuidsFromNameExA@24
+SetupDiClassGuidsFromNameExW@24
+SetupDiClassGuidsFromNameW@16
+SetupDiClassNameFromGuidA@16
+SetupDiClassNameFromGuidExA@24
+SetupDiClassNameFromGuidExW@24
+SetupDiClassNameFromGuidW@16
+SetupDiCreateDevRegKeyA@28
+SetupDiCreateDevRegKeyW@28
+SetupDiCreateDeviceInfoA@28
+SetupDiCreateDeviceInfoList@8
+SetupDiCreateDeviceInfoListExA@16
+SetupDiCreateDeviceInfoListExW@16
+SetupDiCreateDeviceInfoW@28
+SetupDiCreateDeviceInterfaceA@24
+SetupDiCreateDeviceInterfaceRegKeyA@24
+SetupDiCreateDeviceInterfaceRegKeyW@24
+SetupDiCreateDeviceInterfaceW@24
+SetupDiDeleteDevRegKey@20
+SetupDiDeleteDeviceInfo@8
+SetupDiDeleteDeviceInterfaceData@8
+SetupDiDeleteDeviceInterfaceRegKey@12
+SetupDiDestroyClassImageList@4
+SetupDiDestroyDeviceInfoList@4
+SetupDiDestroyDriverInfoList@12
+SetupDiDrawMiniIcon@28
+SetupDiEnumDeviceInfo@12
+SetupDiEnumDeviceInterfaces@20
+SetupDiEnumDriverInfoA@20
+SetupDiEnumDriverInfoW@20
+SetupDiGetActualSectionToInstallA@24
+SetupDiGetActualSectionToInstallW@24
+SetupDiGetClassBitmapIndex@8
+SetupDiGetClassDescriptionA@16
+SetupDiGetClassDescriptionExA@24
+SetupDiGetClassDescriptionExW@24
+SetupDiGetClassDescriptionW@16
+SetupDiGetClassDevPropertySheetsA@24
+SetupDiGetClassDevPropertySheetsW@24
+SetupDiGetClassDevsA@16
+SetupDiGetClassDevsExA@28
+SetupDiGetClassDevsExW@28
+SetupDiGetClassDevsW@16
+SetupDiGetClassImageIndex@12
+SetupDiGetClassImageList@4
+SetupDiGetClassImageListExA@12
+SetupDiGetClassImageListExW@12
+SetupDiGetClassInstallParamsA@20
+SetupDiGetClassInstallParamsW@20
+SetupDiGetDeviceInfoListClass@8
+SetupDiGetDeviceInfoListDetailA@8
+SetupDiGetDeviceInfoListDetailW@8
+SetupDiGetDeviceInstallParamsA@12
+SetupDiGetDeviceInstallParamsW@12
+SetupDiGetDeviceInstanceIdA@20
+SetupDiGetDeviceInstanceIdW@20
+SetupDiGetDeviceInterfaceAlias@16
+SetupDiGetDeviceInterfaceDetailA@24
+SetupDiGetDeviceInterfaceDetailW@24
+SetupDiGetDeviceRegistryPropertyA@28
+SetupDiGetDeviceRegistryPropertyW@28
+SetupDiGetDriverInfoDetailA@24
+SetupDiGetDriverInfoDetailW@24
+SetupDiGetDriverInstallParamsA@16
+SetupDiGetDriverInstallParamsW@16
+SetupDiGetHwProfileFriendlyNameA@16
+SetupDiGetHwProfileFriendlyNameExA@24
+SetupDiGetHwProfileFriendlyNameExW@24
+SetupDiGetHwProfileFriendlyNameW@16
+SetupDiGetHwProfileList@16
+SetupDiGetHwProfileListExA@24
+SetupDiGetHwProfileListExW@24
+SetupDiGetINFClassA@20
+SetupDiGetINFClassW@20
+SetupDiGetSelectedDevice@8
+SetupDiGetSelectedDriverA@12
+SetupDiGetSelectedDriverW@12
+SetupDiGetWizardPage@20
+SetupDiInstallClassA@16
+SetupDiInstallClassExA@28
+SetupDiInstallClassExW@28
+SetupDiInstallClassW@16
+SetupDiInstallDevice@8
+SetupDiInstallDeviceInterfaces@8
+SetupDiInstallDriverFiles@8
+SetupDiLoadClassIcon@12
+SetupDiMoveDuplicateDevice@8
+SetupDiOpenClassRegKey@8
+SetupDiOpenClassRegKeyExA@20
+SetupDiOpenClassRegKeyExW@20
+SetupDiOpenDevRegKey@24
+SetupDiOpenDeviceInfoA@20
+SetupDiOpenDeviceInfoW@20
+SetupDiOpenDeviceInterfaceA@16
+SetupDiOpenDeviceInterfaceRegKey@16
+SetupDiOpenDeviceInterfaceW@16
+SetupDiRegisterCoDeviceInstallers@8
+SetupDiRegisterDeviceInfo@24
+SetupDiRemoveDevice@8
+SetupDiRemoveDeviceInterface@8
+SetupDiSelectBestCompatDrv@8
+SetupDiSelectDevice@8
+SetupDiSelectOEMDrv@12
+SetupDiSetClassInstallParamsA@16
+SetupDiSetClassInstallParamsW@16
+SetupDiSetDeviceInstallParamsA@12
+SetupDiSetDeviceInstallParamsW@12
+SetupDiSetDeviceRegistryPropertyA@20
+SetupDiSetDeviceRegistryPropertyW@20
+SetupDiSetDriverInstallParamsA@16
+SetupDiSetDriverInstallParamsW@16
+SetupDiSetSelectedDevice@8
+SetupDiSetSelectedDriverA@12
+SetupDiSetSelectedDriverW@12
+SetupDiUnremoveDevice@8
+SetupDuplicateDiskSpaceListA@16
+SetupDuplicateDiskSpaceListW@16
+SetupFindFirstLineA@16
+SetupFindFirstLineW@16
+SetupFindNextLine@8
+SetupFindNextMatchLineA@12
+SetupFindNextMatchLineW@12
+SetupFreeSourceListA@8
+SetupFreeSourceListW@8
+SetupGetBackupInformationA@8
+SetupGetBackupInformationW@8
+SetupGetBinaryField@20
+SetupGetFieldCount@4
+SetupGetFileCompressionInfoA@20
+SetupGetFileCompressionInfoW@20
+SetupGetInfFileListA@20
+SetupGetInfFileListW@20
+SetupGetInfInformationA@20
+SetupGetInfInformationW@20
+SetupGetInfSections@16
+SetupGetIntField@12
+SetupGetLineByIndexA@16
+SetupGetLineByIndexW@16
+SetupGetLineCountA@8
+SetupGetLineCountW@8
+SetupGetLineTextA@28
+SetupGetLineTextW@28
+SetupGetMultiSzFieldA@20
+SetupGetMultiSzFieldW@20
+SetupGetSourceFileLocationA@28
+SetupGetSourceFileLocationW@28
+SetupGetSourceFileSizeA@24
+SetupGetSourceFileSizeW@24
+SetupGetSourceInfoA@24
+SetupGetSourceInfoW@24
+SetupGetStringFieldA@20
+SetupGetStringFieldW@20
+SetupGetTargetPathA@24
+SetupGetTargetPathW@24
+SetupInitDefaultQueueCallback@4
+SetupInitDefaultQueueCallbackEx@20
+SetupInitializeFileLogA@8
+SetupInitializeFileLogW@8
+SetupInstallFileA@32
+SetupInstallFileExA@36
+SetupInstallFileExW@36
+SetupInstallFileW@32
+SetupInstallFilesFromInfSectionA@24
+SetupInstallFilesFromInfSectionW@24
+SetupInstallFromInfSectionA@44
+SetupInstallFromInfSectionW@44
+SetupInstallServicesFromInfSectionA@12
+SetupInstallServicesFromInfSectionExA@28
+SetupInstallServicesFromInfSectionExW@28
+SetupInstallServicesFromInfSectionW@12
+SetupIterateCabinetA@16
+SetupIterateCabinetW@16
+SetupLogErrorA@8
+SetupLogErrorW@8
+SetupLogFileA@36
+SetupLogFileW@36
+SetupOpenAppendInfFileA@12
+SetupOpenAppendInfFileW@12
+SetupOpenFileQueue@0
+SetupOpenInfFileA@16
+SetupOpenInfFileW@16
+SetupOpenLog@4
+SetupOpenMasterInf@0
+SetupPromptForDiskA@40
+SetupPromptForDiskW@40
+SetupPromptReboot@12
+SetupQueryDrivesInDiskSpaceListA@16
+SetupQueryDrivesInDiskSpaceListW@16
+SetupQueryFileLogA@28
+SetupQueryFileLogW@28
+SetupQueryInfFileInformationA@20
+SetupQueryInfFileInformationW@20
+SetupQueryInfOriginalFileInformationA@16
+SetupQueryInfOriginalFileInformationW@16
+SetupQueryInfVersionInformationA@24
+SetupQueryInfVersionInformationW@24
+SetupQuerySourceListA@12
+SetupQuerySourceListW@12
+SetupQuerySpaceRequiredOnDriveA@20
+SetupQuerySpaceRequiredOnDriveW@20
+SetupQueueCopyA@36
+SetupQueueCopyIndirectA@4
+SetupQueueCopyIndirectW@4
+SetupQueueCopySectionA@24
+SetupQueueCopySectionW@24
+SetupQueueCopyW@36
+SetupQueueDefaultCopyA@24
+SetupQueueDefaultCopyW@24
+SetupQueueDeleteA@12
+SetupQueueDeleteSectionA@16
+SetupQueueDeleteSectionW@16
+SetupQueueDeleteW@12
+SetupQueueRenameA@20
+SetupQueueRenameSectionA@16
+SetupQueueRenameSectionW@16
+SetupQueueRenameW@20
+SetupRemoveFileLogEntryA@12
+SetupRemoveFileLogEntryW@12
+SetupRemoveFromDiskSpaceListA@20
+SetupRemoveFromDiskSpaceListW@20
+SetupRemoveFromSourceListA@8
+SetupRemoveFromSourceListW@8
+SetupRemoveInstallSectionFromDiskSpaceListA@24
+SetupRemoveInstallSectionFromDiskSpaceListW@24
+SetupRemoveSectionFromDiskSpaceListA@28
+SetupRemoveSectionFromDiskSpaceListW@28
+SetupRenameErrorA@24
+SetupRenameErrorW@24
+SetupScanFileQueue@24
+SetupScanFileQueueA@24
+SetupScanFileQueueW@24
+SetupSetDirectoryIdA@12
+SetupSetDirectoryIdExA@24
+SetupSetDirectoryIdExW@24
+SetupSetDirectoryIdW@12
+SetupSetFileQueueAlternatePlatformA@12
+SetupSetFileQueueAlternatePlatformW@12
+SetupSetPlatformPathOverrideA@4
+SetupSetPlatformPathOverrideW@4
+SetupSetSourceListA@12
+SetupSetSourceListW@12
+SetupTermDefaultQueueCallback@4
+SetupTerminateFileLog@4
+ShouldDeviceBeExcluded@12
+StampFileSecurity@8
+StringTableAddString@12
+StringTableAddStringEx@20
+StringTableDestroy@4
+StringTableDuplicate@4
+StringTableEnum@20
+StringTableGetExtraData@16
+StringTableInitialize@0
+StringTableInitializeEx@8
+StringTableLookUpString@12
+StringTableLookUpStringEx@20
+StringTableSetExtraData@16
+StringTableStringFromId@8
+StringTableStringFromIdEx@16
+StringTableTrim@4
+TakeOwnershipOfFile@4
+UnicodeToMultiByte@8
+UnmapAndCloseFile@12
+VerifyCatalogFile@4
+VerifyFile@48
+pSetupAccessRunOnceNodeList@0
+pSetupDestroyRunOnceNodeList@0
+pSetupDiGetDeviceInfoContext@12
+pSetupDiSetDeviceInfoContext@12
+pSetupDirectoryIdToPath@20
+pSetupGetField@8
+pSetupGetGlobalFlags@0
+pSetupGetOsLoaderDriveAndPath@16
+pSetupGetQueueFlags@4
+pSetupGetVersionDatum@8
+pSetupGuidFromString@8
+pSetupIsGuidNull@4
+pSetupMakeSurePathExists@4
+pSetupSetGlobalFlags@4
+pSetupSetQueueFlags@8
+pSetupSetSystemSourcePath@8
+pSetupStringFromGuid@12
+pSetupVerifyQueuedCatalogs@4

winsup/w32api/lib/test.c

@@ -55,7 +55,7 @@
 #include <winresrc.h>
 #include <winsock.h>
 #include <ws2tcpip.h>
-
+#include <setupapi.h>
 
 #ifndef __OBJC__  /* problems with BOOL */
 #include <ole2.h>