* include/basetyps.h: add comment for GUID_DEFINED

	* include/lm.h: add includes for lmerr.h and lmserver.h
	* include/lmcons.h: add W2K typedefs LMSTR, LMCSTR
	* include/lmerr.h:  add error codes
	* include/lmserver.h: replace LPTSTR with LPWSTR,
	LPTCSTR with LPWCSTR in structures and prototypes
	* include/lmshare.h: ditto
	* include/lmuse.h: ditto
	* include/lmstats.h: ditto
	* include/oleauto.h: add function prototype SystemTimeToVariantTime
	* include/winbase.h: change first argument of CommConfigDialog to const
	* include/windowsx.h: add macros  defining FAR versions of
	mem and string functions for porting from Win16 code
	* include/winioctl.h:  added IOCTL_STORAGE defines
	* include/winnetwk.h:  added WNNC_NET flags
	* include/winnt.h: add include of <basetsd.h>;
	add structs; add pointer typedefs  for TOKEN structs
	* include/winsock.h: add guard around BSD-ish typedefs
	* include/wtypes.h: new VARENUM enums, new WIN32/WIN64 compat. macros
	* include/basetsd.h: new file
	* include/raserror.h: ditto
	* include/rassapi.h: ditto
	* include/ras.h: ditto
	comment from Earnie: replaced original ras.h contribution with Danny's
	contribution as it is more complete.
	* include/rpcndr.h: add default definition for __RPCNDR_H_VERSION__

1 files changed, 53 insertions, 27 deletions

diff --git a/winsup/w32api/include/winnetwk.h b/winsup/w32api/include/winnetwk.h
index 538487cb0..2fc39ceb0 100644
--- a/winsup/w32api/include/winnetwk.h
+++ b/winsup/w32api/include/winnetwk.h
@@ -3,26 +3,51 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#define WNNC_NET_MSNET 0x10000
-#define WNNC_NET_LANMAN 0x20000
-#define WNNC_NET_NETWARE 0x30000
-#define WNNC_NET_VINES 0x40000
-#define WNNC_NET_10NET 0x50000
-#define WNNC_NET_LOCUS 0x60000
-#define WNNC_NET_SUN_PC_NFS 0x70000
-#define WNNC_NET_LANSTEP 0x80000
-#define WNNC_NET_9TILES 0x90000
-#define WNNC_NET_LANTASTIC 0xA0000
-#define WNNC_NET_AS400 0xB0000
-#define WNNC_NET_FTP_NFS 0xC0000
-#define WNNC_NET_PATHWORKS 0xD0000
-#define WNNC_NET_LIFENET 0xE0000
-#define WNNC_NET_POWERLAN 0xF0000
-#define WNNC_NET_BWNFS	0x100000
-#define WNNC_NET_COGENT	0x110000
-#define WNNC_NET_FARALLON	0x120000
-#define WNNC_NET_APPLETALK	0x130000
-#define WNNC_NET_INTERGRAPH	0x140000
+#define WNNC_NET_MSNET      0x00010000
+#define WNNC_NET_LANMAN     0x00020000
+#define WNNC_NET_NETWARE    0x00030000
+#define WNNC_NET_VINES      0x00040000
+#define WNNC_NET_10NET      0x00050000
+#define WNNC_NET_LOCUS      0x00060000
+#define WNNC_NET_SUN_PC_NFS 0x00070000
+#define WNNC_NET_LANSTEP    0x00080000
+#define WNNC_NET_9TILES     0x00090000
+#define WNNC_NET_LANTASTIC  0x000A0000
+#define WNNC_NET_AS400      0x000B0000
+#define WNNC_NET_FTP_NFS    0x000C0000
+#define WNNC_NET_PATHWORKS  0x000D0000
+#define WNNC_NET_LIFENET    0x000E0000
+#define WNNC_NET_POWERLAN   0x000F0000
+#define WNNC_NET_BWNFS      0x00100000
+#define WNNC_NET_COGENT     0x00110000
+#define WNNC_NET_FARALLON	0x00120000
+#define WNNC_NET_APPLETALK	0x00130000
+#define WNNC_NET_INTERGRAPH	0x00140000
+#define WNNC_NET_SYMFONET   0x00150000
+#define WNNC_NET_CLEARCASE  0x00160000
+#define WNNC_NET_FRONTIER   0x00170000
+#define WNNC_NET_BMC        0x00180000
+#define WNNC_NET_DCE        0x00190000
+#define WNNC_NET_AVID       0x001A0000
+#define WNNC_NET_DOCUSPACE  0x001B0000
+#define WNNC_NET_MANGOSOFT  0x001C0000
+#define WNNC_NET_SERNET     0x001D0000
+#define WNNC_NET_DECORB     0x00200000
+#define WNNC_NET_PROTSTOR   0x00210000
+#define WNNC_NET_FJ_REDIR   0x00220000
+#define WNNC_NET_DISTINCT   0x00230000
+#define WNNC_NET_TWINS      0x00240000
+#define WNNC_NET_RDR2SAMPLE 0x00250000
+#define WNNC_NET_CSC        0x00260000
+#define WNNC_NET_3IN1       0x00270000
+#define WNNC_NET_EXTENDNET  0x00290000
+#define WNNC_NET_OBJECT_DIRE 0x00300000
+#define WNNC_NET_MASFAX     0x00310000
+#define WNNC_NET_HOB_NFS    0x00320000
+#define WNNC_NET_SHIVA      0x00330000
+#define WNNC_NET_IBMAL      0x00340000
+#define WNNC_CRED_MANAGER   0xFFFF0000
+
 #define RESOURCE_CONNECTED 1
 #define RESOURCE_GLOBALNET 2
 #define RESOURCE_REMEMBERED 3
@@ -32,13 +57,14 @@ extern "C" {
 #define RESOURCETYPE_DISK 1
 #define RESOURCETYPE_PRINT 2
 #define RESOURCETYPE_RESERVED 8
-#define RESOURCETYPE_UNKNOWN 0xFFFFFFFF
-#define RESOURCEUSAGE_CONNECTABLE 1
-#define RESOURCEUSAGE_CONTAINER 2
-#define RESOURCEUSAGE_NOLOCALDEVICE 4
-#define RESOURCEUSAGE_SIBLING 8
-#define RESOURCEUSAGE_ALL (RESOURCEUSAGE_CONNECTABLE|RESOURCEUSAGE_CONTAINER)
-#define RESOURCEUSAGE_RESERVED 0x80000000
+#define RESOURCETYPE_UNKNOWN        0xFFFFFFFF
+#define RESOURCEUSAGE_CONNECTABLE   0x00000001
+#define RESOURCEUSAGE_CONTAINER     0x00000002
+#define RESOURCEUSAGE_NOLOCALDEVICE 0x00000004
+#define RESOURCEUSAGE_SIBLING       0x00000008
+#define RESOURCEUSAGE_ATTACHED      0x00000010
+#define RESOURCEUSAGE_ALL           (RESOURCEUSAGE_CONNECTABLE | RESOURCEUSAGE_CONTAINER | RESOURCEUSAGE_ATTACHED)
+#define RESOURCEUSAGE_RESERVED      0x80000000
 #define RESOURCEDISPLAYTYPE_GENERIC 0
 #define RESOURCEDISPLAYTYPE_DOMAIN 1
 #define RESOURCEDISPLAYTYPE_SERVER 2