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

diff --git a/winsup/w32api/include/lmuse.h b/winsup/w32api/include/lmuse.h
index a10696813..528e1ff3f 100644
--- a/winsup/w32api/include/lmuse.h
+++ b/winsup/w32api/include/lmuse.h
@@ -3,7 +3,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include <lmuseflg.h> 
+#include <lmuseflg.h>
 #define USE_LOCAL_PARMNUM 1
 #define USE_REMOTE_PARMNUM 2
 #define USE_PASSWORD_PARMNUM 3
@@ -23,33 +23,33 @@ extern "C" {
 #define USE_CHARDEV 2
 #define USE_IPC 3
 typedef struct _USE_INFO_0 {
-	LPTSTR ui0_local;
-	LPTSTR ui0_remote;
+	LPWSTR ui0_local;
+	LPWSTR ui0_remote;
 }USE_INFO_0,*PUSE_INFO_0,*LPUSE_INFO_0;
 typedef struct _USE_INFO_1 {
-	LPTSTR ui1_local;
-	LPTSTR ui1_remote;
-	LPTSTR ui1_password;
+	LPWSTR ui1_local;
+	LPWSTR ui1_remote;
+	LPWSTR ui1_password;
 	DWORD ui1_status;
 	DWORD ui1_asg_type;
 	DWORD ui1_refcount;
 	DWORD ui1_usecount;
 }USE_INFO_1,*PUSE_INFO_1,*LPUSE_INFO_1;
 typedef struct _USE_INFO_2 {
-	LPTSTR ui2_local;
-	LPTSTR ui2_remote;
-	LPTSTR ui2_password;
+	LPWSTR ui2_local;
+	LPWSTR ui2_remote;
+	LPWSTR ui2_password;
 	DWORD ui2_status;
 	DWORD ui2_asg_type;
 	DWORD ui2_refcount;
 	DWORD ui2_usecount;
-	LPTSTR ui2_username;
-	LPTSTR ui2_domainname;
+	LPWSTR ui2_username;
+	LPWSTR ui2_domainname;
 }USE_INFO_2,*PUSE_INFO_2,*LPUSE_INFO_2;
-NET_API_STATUS WINAPI NetUseAdd(LPTSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetUseDel(LPTSTR,LPTSTR,DWORD);
-NET_API_STATUS WINAPI NetUseEnum(LPTSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetUseGetInfo(LPTSTR,LPTSTR,DWORD,PBYTE*);
+NET_API_STATUS WINAPI NetUseAdd(LPWSTR,DWORD,PBYTE,PDWORD);
+NET_API_STATUS WINAPI NetUseDel(LPWSTR,LPWSTR,DWORD);
+NET_API_STATUS WINAPI NetUseEnum(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
+NET_API_STATUS WINAPI NetUseGetInfo(LPWSTR,LPWSTR,DWORD,PBYTE*);
 #ifdef __cplusplus
 }
 #endif