Mailing-List: contact cygwin-developers-help AT sourceware DOT cygnus DOT com; run by ezmlm
List-Unsubscribe: <mailto:cygwin-developers-unsubscribe-archive-cygwin-developers=delorie DOT com AT sourceware DOT cygnus DOT com>
List-Subscribe: <mailto:cygwin-developers-subscribe AT sourceware DOT cygnus DOT com>
List-Archive: <http://sourceware.cygnus.com/ml/cygwin-developers/>
List-Post: <mailto:cygwin-developers AT sourceware DOT cygnus DOT com>
List-Help: <mailto:cygwin-developers-help AT sourceware DOT cygnus DOT com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: cygwin-developers-owner AT sourceware DOT cygnus DOT com
Delivered-To: mailing list cygwin-developers AT sourceware DOT cygnus DOT com
Message-ID: <37F6733E.2C36FC6F@vinschen.de>
Date: Sat, 02 Oct 1999 23:03:58 +0200
From: Corinna Vinschen <corinna AT vinschen DOT de>
X-Mailer: Mozilla 4.6 [en] (WinNT; I)
X-Accept-Language: de,en
MIME-Version: 1.0
To: Chris Faylor <cgf AT cygnus DOT com>,
        Anders Norlander <anorland AT hem2 DOT passagen DOT se>,
        cygdev <cygwin-developers AT sourceware DOT cygnus DOT com>
Subject: lm-header-patch
Content-Type: multipart/mixed;
 boundary="------------C4BF86F0387CC708494A8DA2"

This is a multi-part message in MIME format.
--------------C4BF86F0387CC708494A8DA2
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit


Hi!

I have found some errors in the lan manager header files. Some types
LPWSTR and LPCWSTR were defined as LPTSTR by accident and two or three
prototypes were missing.

Regards,
Corinna

ChangeLog:
==========

Sat Oct 2 23:00:00 1999  Corinna Vinschen  <corinna AT vinschen DOT de>

	* Some corrections in lan manager header files.
--------------C4BF86F0387CC708494A8DA2
Content-Type: text/plain; charset=us-ascii;
 name="lm-header-patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="lm-header-patch"

Index: include/lmalert.h
===================================================================
RCS file: /src/cvsroot/winsup-990916/include/lmalert.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 lmalert.h
--- include/lmalert.h	1999/09/17 07:37:42	1.1.1.1
+++ include/lmalert.h	1999/10/02 20:23:57
@@ -48,8 +48,8 @@ typedef struct _USER_OTHER_INFO {
 	DWORD alrtus_errcode;
 	DWORD alrtus_numstrings;
 }USER_OTHER_INFO,*PUSER_OTHER_INFO,*LPUSER_OTHER_INFO;
-NET_API_STATUS WINAPI NetAlertRaise(LPTSTR,PVOID,DWORD);
-NET_API_STATUS WINAPI NetAlertRaiseEx(LPTSTR,PVOID,DWORD,LPTSTR);
+NET_API_STATUS WINAPI NetAlertRaise(LPCWSTR,PVOID,DWORD);
+NET_API_STATUS WINAPI NetAlertRaiseEx(LPCWSTR,PVOID,DWORD,LPCWSTR);
 #ifdef __cplusplus
 }
 #endif
Index: include/lmbrowsr.h
===================================================================
RCS file: /src/cvsroot/winsup-990916/include/lmbrowsr.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 lmbrowsr.h
--- include/lmbrowsr.h	1999/09/17 07:37:42	1.1.1.1
+++ include/lmbrowsr.h	1999/10/02 20:31:44
@@ -54,13 +54,15 @@ typedef struct _BROWSER_STATISTICS_101 {
 	ULONG NumberOfDuplicateMasterAnnouncements;
 } BROWSER_STATISTICS_101,*PBROWSER_STATISTICS_101;
 
-NET_API_STATUS WINAPI I_BrowserServerEnum(LPTSTR,LPTSTR,LPTSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,DWORD,LPTSTR,PDWORD);
-NET_API_STATUS I_BrowserQueryOtherDomains(LPTSTR,PBYTE*,PDWORD,PDWORD);
-NET_API_STATUS I_BrowserResetNetlogonState(LPTSTR);
+NET_API_STATUS WINAPI I_BrowserServerEnum(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,DWORD,LPCWSTR,PDWORD);
+NET_API_STATUS WINAPI I_BrowserServerEnumEx(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,DWORD,LPCWSTR,LPCWSTR);
+NET_API_STATUS I_BrowserQueryEmulatedDomains(LPWSTR,PBYTE*,PDWORD);
+NET_API_STATUS I_BrowserQueryOtherDomains(LPCWSTR,PBYTE*,PDWORD,PDWORD);
+NET_API_STATUS I_BrowserResetNetlogonState(LPCWSTR);
 NET_API_STATUS I_BrowserSetNetlogonState(LPWSTR,LPWSTR,LPWSTR,DWORD);
-NET_API_STATUS I_BrowserQueryStatistics(LPTSTR,LPBROWSER_STATISTICS*);
-NET_API_STATUS I_BrowserResetStatistics(LPTSTR);
-WORD I_BrowserServerEnumForXactsrv(LPTSTR,LPTSTR,ULONG,USHORT,PVOID,WORD,DWORD,PDWORD,PDWORD,DWORD,LPTSTR,PWORD);
+NET_API_STATUS I_BrowserQueryStatistics(LPCWSTR,LPBROWSER_STATISTICS*);
+NET_API_STATUS I_BrowserResetStatistics(LPCWSTR);
+WORD I_BrowserServerEnumForXactsrv(LPCWSTR,LPCWSTR,ULONG,USHORT,PVOID,WORD,DWORD,PDWORD,PDWORD,DWORD,LPCWSTR,LPCWSTR,PWORD);
 NET_API_STATUS I_BrowserDebugTrace(PWCHAR,PCHAR);
 #ifdef __cplusplus
 }
Index: include/lmchdev.h
===================================================================
RCS file: /src/cvsroot/winsup-990916/include/lmchdev.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 lmchdev.h
--- include/lmchdev.h	1999/09/17 07:37:42	1.1.1.1
+++ include/lmchdev.h	1999/10/02 20:35:51
@@ -20,35 +20,35 @@ extern "C" {
 #define CHARDEVQ_PRIORITY_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+CHARDEVQ_PRIORITY_PARMNUM)
 #define CHARDEVQ_DEVS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+CHARDEVQ_DEVS_PARMNUM)
 #define CHARDEVQ_MIN_PRIORITY 9
-typedef struct _CHARDEV_INFO_0 { LPTSTR ch0_dev; } CHARDEV_INFO_0,*PCHARDEV_INFO_0,*LPCHARDEV_INFO_0;
+typedef struct _CHARDEV_INFO_0 { LPWSTR ch0_dev; } CHARDEV_INFO_0,*PCHARDEV_INFO_0,*LPCHARDEV_INFO_0;
 typedef struct _CHARDEV_INFO_1 {
-	LPTSTR ch1_dev;
+	LPWSTR ch1_dev;
 	DWORD ch1_status;
-	LPTSTR ch1_username;
+	LPWSTR ch1_username;
 	DWORD ch1_time;
 } CHARDEV_INFO_1,*PCHARDEV_INFO_1,*LPCHARDEV_INFO_1;
-typedef struct _CHARDEVQ_INFO_0 { LPTSTR cq0_dev; } CHARDEVQ_INFO_0,*PCHARDEVQ_INFO_0,*LPCHARDEVQ_INFO_0;
+typedef struct _CHARDEVQ_INFO_0 { LPWSTR cq0_dev; } CHARDEVQ_INFO_0,*PCHARDEVQ_INFO_0,*LPCHARDEVQ_INFO_0;
 typedef struct _CHARDEVQ_INFO_1 {
-	LPTSTR cq1_dev;
+	LPWSTR cq1_dev;
 	DWORD cq1_priority;
-	LPTSTR cq1_devs;
+	LPWSTR cq1_devs;
 	DWORD cq1_numusers;
 	DWORD cq1_numahead;
 } CHARDEVQ_INFO_1,*PCHARDEVQ_INFO_1,*LPCHARDEVQ_INFO_1;
 typedef struct _CHARDEVQ_INFO_1002 { DWORD cq1002_priority; } CHARDEVQ_INFO_1002,*PCHARDEVQ_INFO_1002,*LPCHARDEVQ_INFO_1002;
-typedef struct _CHARDEVQ_INFO_1003 { LPTSTR cq1003_devs; } CHARDEVQ_INFO_1003,*PCHARDEVQ_INFO_1003,*LPCHARDEVQ_INFO_1003;
+typedef struct _CHARDEVQ_INFO_1003 { LPWSTR cq1003_devs; } CHARDEVQ_INFO_1003,*PCHARDEVQ_INFO_1003,*LPCHARDEVQ_INFO_1003;
 typedef struct _HANDLE_INFO_1 {
 	DWORD hdli1_chartime;
 	DWORD hdli1_charcount;
 }HANDLE_INFO_1,*PHANDLE_INFO_1,*LPHANDLE_INFO_1;
-NET_API_STATUS WINAPI NetCharDevEnum(LPTSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetCharDevGetInfo(LPTSTR,LPTSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetCharDevControl(LPTSTR,LPTSTR,DWORD);
-NET_API_STATUS WINAPI NetCharDevQEnum(LPTSTR,LPTSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetCharDevQGetInfo(LPTSTR,LPTSTR,LPTSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetCharDevQSetInfo(LPTSTR,LPTSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetCharDevQPurge(LPTSTR,LPTSTR);
-NET_API_STATUS WINAPI NetCharDevQPurgeSelf(LPTSTR,LPTSTR,LPTSTR);
+NET_API_STATUS WINAPI NetCharDevEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
+NET_API_STATUS WINAPI NetCharDevGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
+NET_API_STATUS WINAPI NetCharDevControl(LPCWSTR,LPCWSTR,DWORD);
+NET_API_STATUS WINAPI NetCharDevQEnum(LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
+NET_API_STATUS WINAPI NetCharDevQGetInfo(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,PBYTE*);
+NET_API_STATUS WINAPI NetCharDevQSetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE,PDWORD);
+NET_API_STATUS WINAPI NetCharDevQPurge(LPCWSTR,LPCWSTR);
+NET_API_STATUS WINAPI NetCharDevQPurgeSelf(LPCWSTR,LPCWSTR,LPCWSTR);
 NET_API_STATUS WINAPI NetHandleGetInfo(HANDLE,DWORD,PBYTE*);
 NET_API_STATUS WINAPI NetHandleSetInfo(HANDLE,DWORD,PBYTE,DWORD,PDWORD);
 #ifdef __cplusplus
Index: include/lmconfig.h
===================================================================
RCS file: /src/cvsroot/winsup-990916/include/lmconfig.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 lmconfig.h
--- include/lmconfig.h	1999/09/17 07:37:42	1.1.1.1
+++ include/lmconfig.h	1999/10/02 20:37:36
@@ -5,12 +5,12 @@ extern "C" {
 #endif
 #define REVISED_CONFIG_APIS
 typedef struct _CONFIG_INFO_0 {
-	LPTSTR cfgi0_key;
-	LPTSTR cfgi0_data;
+	LPWSTR cfgi0_key;
+	LPWSTR cfgi0_data;
 } CONFIG_INFO_0,*PCONFIG_INFO_0,*LPCONFIG_INFO_0;
-NET_API_STATUS WINAPI NetConfigGet(LPTSTR,LPTSTR,LPTSTR,PBYTE*);
-NET_API_STATUS WINAPI NetConfigGetAll(LPTSTR,LPTSTR,PBYTE*);
-NET_API_STATUS WINAPI NetConfigSet(LPTSTR,LPTSTR,LPTSTR,DWORD,DWORD,PBYTE,DWORD);
+NET_API_STATUS WINAPI NetConfigGet(LPCWSTR,LPCWSTR,LPCWSTR,PBYTE*);
+NET_API_STATUS WINAPI NetConfigGetAll(LPCWSTR,LPCWSTR,PBYTE*);
+NET_API_STATUS WINAPI NetConfigSet(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,PBYTE,DWORD);
 #ifdef __cplusplus
 }
 #endif
Index: include/lmerrlog.h
===================================================================
RCS file: /src/cvsroot/winsup-990916/include/lmerrlog.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 lmerrlog.h
--- include/lmerrlog.h	1999/09/17 07:37:42	1.1.1.1
+++ include/lmerrlog.h	1999/10/02 20:39:02
@@ -189,13 +189,13 @@ typedef struct _ERROR_LOG {
 	DWORD el_reserved;
 	DWORD el_time;
 	DWORD el_error;
-	LPTSTR el_name; 
-	LPTSTR el_text; 
+	LPWSTR el_name; 
+	LPWSTR el_text; 
 	LPBYTE el_data; 
 	DWORD el_data_size; 
 	DWORD el_nstrings; 
 } ERROR_LOG,*PERROR_LOG,*LPERROR_LOG;
-NET_API_STATUS WINAPI NetErrorLogClear(LPTSTR,LPTSTR,LPBYTE);
-NET_API_STATUS WINAPI NetErrorLogRead(LPTSTR,LPTSTR,LPHLOG,DWORD,LPDWORD,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD);
-NET_API_STATUS WINAPI NetErrorLogWrite(LPBYTE,DWORD,LPTSTR,LPBYTE,DWORD,LPBYTE,DWORD,LPBYTE);
+NET_API_STATUS WINAPI NetErrorLogClear(LPCWSTR,LPCWSTR,LPBYTE);
+NET_API_STATUS WINAPI NetErrorLogRead(LPCWSTR,LPWSTR,LPHLOG,DWORD,LPDWORD,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD);
+NET_API_STATUS WINAPI NetErrorLogWrite(LPBYTE,DWORD,LPCWSTR,LPBYTE,DWORD,LPBYTE,DWORD,LPBYTE);
 #endif 
Index: include/lmmsg.h
===================================================================
RCS file: /src/cvsroot/winsup-990916/include/lmmsg.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 lmmsg.h
--- include/lmmsg.h	1999/09/17 07:37:42	1.1.1.1
+++ include/lmmsg.h	1999/10/02 20:40:18
@@ -6,17 +6,17 @@ extern "C" {
 #define MSGNAME_NOT_FORWARDED 0
 #define MSGNAME_FORWARDED_TO 4
 #define MSGNAME_FORWARDED_FROM 16
-typedef struct _MSG_INFO_0 { LPTSTR msgi0_name; }MSG_INFO_0,*PMSG_INFO_0,*LPMSG_INFO_0;
+typedef struct _MSG_INFO_0 { LPWSTR msgi0_name; }MSG_INFO_0,*PMSG_INFO_0,*LPMSG_INFO_0;
 typedef struct _MSG_INFO_1 {
-	LPTSTR msgi1_name;
+	LPWSTR msgi1_name;
 	DWORD msgi1_forward_flag;
-	LPTSTR msgi1_forward;
+	LPWSTR msgi1_forward;
 }MSG_INFO_1,*PMSG_INFO_1,*LPMSG_INFO_1;
-NET_API_STATUS WINAPI NetMessageBufferSend(LPTSTR,LPTSTR,LPTSTR,PBYTE,DWORD);
-NET_API_STATUS WINAPI NetMessageNameAdd(LPTSTR,LPTSTR);
-NET_API_STATUS WINAPI NetMessageNameDel(LPTSTR,LPTSTR);
-NET_API_STATUS WINAPI NetMessageNameEnum(LPTSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetMessageNameGetInfo(LPTSTR,LPTSTR,DWORD,PBYTE*);
+NET_API_STATUS WINAPI NetMessageBufferSend(LPCWSTR,LPCWSTR,LPCWSTR,PBYTE,DWORD);
+NET_API_STATUS WINAPI NetMessageNameAdd(LPCWSTR,LPCWSTR);
+NET_API_STATUS WINAPI NetMessageNameDel(LPCWSTR,LPCWSTR);
+NET_API_STATUS WINAPI NetMessageNameEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
+NET_API_STATUS WINAPI NetMessageNameGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
 #ifdef __cplusplus
 }
 #endif
Index: include/lmremutl.h
===================================================================
RCS file: /src/cvsroot/winsup-990916/include/lmremutl.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 lmremutl.h
--- include/lmremutl.h	1999/09/17 07:37:42	1.1.1.1
+++ include/lmremutl.h	1999/10/02 20:41:08
@@ -32,9 +32,9 @@ typedef struct _TIME_OF_DAY_INFO {
 	DWORD tod_year;
 	DWORD tod_weekday;
 } TIME_OF_DAY_INFO,*PTIME_OF_DAY_INFO,*LPTIME_OF_DAY_INFO;
-NET_API_STATUS WINAPI NetRemoteTOD(LPTSTR,PBYTE*);
-NET_API_STATUS WINAPI NetRemoteComputerSupports(LPTSTR,DWORD,PDWORD);
-NET_API_STATUS RxRemoteApi(DWORD,LPTSTR,LPDESC,LPDESC,LPDESC,LPDESC,LPDESC,LPDESC,LPDESC,DWORD,... );
+NET_API_STATUS WINAPI NetRemoteTOD(LPCWSTR,PBYTE*);
+NET_API_STATUS WINAPI NetRemoteComputerSupports(LPCWSTR,DWORD,PDWORD);
+NET_API_STATUS RxRemoteApi(DWORD,LPCWSTR,LPDESC,LPDESC,LPDESC,LPDESC,LPDESC,LPDESC,LPDESC,DWORD,... );
 #ifdef __cplusplus
 }
 #endif
Index: include/lmrepl.h
===================================================================
RCS file: /src/cvsroot/winsup-990916/include/lmrepl.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 lmrepl.h
--- include/lmrepl.h	1999/09/17 07:37:43	1.1.1.1
+++ include/lmrepl.h	1999/10/02 20:44:33
@@ -24,11 +24,11 @@ extern "C" {
 #define REPL_EXPORT_EXTENT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+1)
 typedef struct _REPL_INFO_0 {
 	DWORD rp0_role;
-	LPTSTR rp0_exportpath;
-	LPTSTR rp0_exportlist;
-	LPTSTR rp0_importpath;
-	LPTSTR rp0_importlist;
-	LPTSTR rp0_logonusername;
+	LPWSTR rp0_exportpath;
+	LPWSTR rp0_exportlist;
+	LPWSTR rp0_importpath;
+	LPWSTR rp0_importlist;
+	LPWSTR rp0_logonusername;
 	DWORD rp0_interval;
 	DWORD rp0_pulse;
 	DWORD rp0_guardtime;
@@ -39,18 +39,18 @@ typedef struct _REPL_INFO_1001 { DWORD r
 typedef struct _REPL_INFO_1002 { DWORD rp1002_guardtime; } REPL_INFO_1002,*PREPL_INFO_1002,*LPREPL_INFO_1002;
 typedef struct _REPL_INFO_1003 { DWORD rp1003_random; } REPL_INFO_1003,*PREPL_INFO_1003,*LPREPL_INFO_1003;
 
-NET_API_STATUS WINAPI NetReplGetInfo(LPTSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetReplSetInfo(LPTSTR,DWORD,PBYTE,PDWORD);
+NET_API_STATUS WINAPI NetReplGetInfo(LPCWSTR,DWORD,PBYTE*);
+NET_API_STATUS WINAPI NetReplSetInfo(LPCWSTR,DWORD,PBYTE,PDWORD);
 typedef struct _REPL_EDIR_INFO_0 {
-	LPTSTR rped0_dirname;
+	LPWSTR rped0_dirname;
 } REPL_EDIR_INFO_0,*PREPL_EDIR_INFO_0,*LPREPL_EDIR_INFO_0;
 typedef struct _REPL_EDIR_INFO_1 {
-	LPTSTR rped1_dirname;
+	LPWSTR rped1_dirname;
 	DWORD rped1_integrity;
 	DWORD rped1_extent;
 } REPL_EDIR_INFO_1,*PREPL_EDIR_INFO_1,*LPREPL_EDIR_INFO_1;
 typedef struct _REPL_EDIR_INFO_2 {
-	LPTSTR rped2_dirname;
+	LPWSTR rped2_dirname;
 	DWORD rped2_integrity;
 	DWORD rped2_extent;
 	DWORD rped2_lockcount;
@@ -62,28 +62,28 @@ typedef struct _REPL_EDIR_INFO_1000 {
 typedef struct _REPL_EDIR_INFO_1001 {
 	DWORD rped1001_extent;
 } REPL_EDIR_INFO_1001,*PREPL_EDIR_INFO_1001,*LPREPL_EDIR_INFO_1001;
-typedef struct _REPL_IDIR_INFO_0 { LPTSTR rpid0_dirname; } REPL_IDIR_INFO_0,*PREPL_IDIR_INFO_0,*LPREPL_IDIR_INFO_0;
+typedef struct _REPL_IDIR_INFO_0 { LPWSTR rpid0_dirname; } REPL_IDIR_INFO_0,*PREPL_IDIR_INFO_0,*LPREPL_IDIR_INFO_0;
 typedef struct _REPL_IDIR_INFO_1 {
-	LPTSTR rpid1_dirname;
+	LPWSTR rpid1_dirname;
 	DWORD rpid1_state;
-	LPTSTR rpid1_mastername;
+	LPWSTR rpid1_mastername;
 	DWORD rpid1_last_update_time;
 	DWORD rpid1_lockcount;
 	DWORD rpid1_locktime;
 } REPL_IDIR_INFO_1,*PREPL_IDIR_INFO_1,*LPREPL_IDIR_INFO_1;
-NET_API_STATUS WINAPI NetReplExportDirAdd(LPTSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetReplExportDirDel(LPTSTR,LPTSTR);
-NET_API_STATUS WINAPI NetReplExportDirEnum(LPTSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetReplExportDirGetInfo(LPTSTR,LPTSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetReplExportDirSetInfo(LPTSTR,LPTSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetReplExportDirLock(LPTSTR,LPTSTR);
-NET_API_STATUS WINAPI NetReplExportDirUnlock(LPTSTR,LPTSTR,DWORD);
-NET_API_STATUS WINAPI NetReplImportDirAdd(LPTSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetReplImportDirDel(LPTSTR,LPTSTR);
-NET_API_STATUS WINAPI NetReplImportDirEnum(LPTSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetReplImportDirGetInfo(LPTSTR,LPTSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetReplImportDirLock(LPTSTR,LPTSTR);
-NET_API_STATUS WINAPI NetReplImportDirUnlock(LPTSTR,LPTSTR,DWORD);
+NET_API_STATUS WINAPI NetReplExportDirAdd(LPCWSTR,DWORD,PBYTE,PDWORD);
+NET_API_STATUS WINAPI NetReplExportDirDel(LPCWSTR,LPCWSTR);
+NET_API_STATUS WINAPI NetReplExportDirEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
+NET_API_STATUS WINAPI NetReplExportDirGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
+NET_API_STATUS WINAPI NetReplExportDirSetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE,PDWORD);
+NET_API_STATUS WINAPI NetReplExportDirLock(LPCWSTR,LPCWSTR);
+NET_API_STATUS WINAPI NetReplExportDirUnlock(LPCWSTR,LPCWSTR,DWORD);
+NET_API_STATUS WINAWI NetReplImportDirAdd(LPCWSTR,DWORD,PBYTE,PDWORD);
+NET_API_STATUS WINAPI NetReplImportDirDel(LPCWSTR,LPCWSTR);
+NET_API_STATUS WINAPI NetReplImportDirEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
+NET_API_STATUS WINAPI NetReplImportDirGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
+NET_API_STATUS WINAPI NetReplImportDirLock(LPCWSTR,LPCWSTR);
+NET_API_STATUS WINAPI NetReplImportDirUnlock(LPCWSTR,LPCWSTR,DWORD);
 #ifdef __cplusplus
 }
 #endif
Index: include/lmserver.h
===================================================================
RCS file: /src/cvsroot/winsup-990916/include/lmserver.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 lmserver.h
--- include/lmserver.h	1999/09/17 07:37:43	1.1.1.1
+++ include/lmserver.h	1999/10/02 20:50:21
@@ -338,13 +338,17 @@ DWORD	svti0_transportaddresslength;
 LPTSTR	svti0_networkaddress;
 } SERVER_TRANSPORT_INFO_0,*PSERVER_TRANSPORT_INFO_0,*LPSERVER_TRANSPORT_INFO_0;
 
-NET_API_STATUS WINAPI NetServerEnum(LPTSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,DWORD,LPTSTR,PDWORD);
+NET_API_STATUS WINAPI NetServerEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,DWORD,LPCWSTR,PDWORD);
+NET_API_STATUS WINAPI NetServerEnumEx(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,DWORD,LPCWSTR,LPCWSTR);
 NET_API_STATUS WINAPI NetServerGetInfo(LPTSTR,DWORD,PBYTE*);
 NET_API_STATUS WINAPI NetServerSetInfo(LPTSTR,DWORD,PBYTE,PDWORD);
 NET_API_STATUS NetServerSetInfoCommandLine(WORD,LPTSTR*);
 NET_API_STATUS WINAPI NetServerDiskEnum(LPTSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
+NET_API_STATUS WINAPI NetServerComputerNameAdd(LPWSTR,LPWSTR,LPWSTR);
+NET_API_STATUS WINAPI NetServerComputerNameDel(LPWSTR,LPWSTR);
 NET_API_STATUS WINAPI
 NetServerTransportAdd(LPTSTR,DWORD,PBYTE);
+NetServerTransportAddEx(LPTSTR,DWORD,PBYTE);
 NET_API_STATUS WINAPI NetServerTransportDel(LPTSTR,DWORD,PBYTE);
 NET_API_STATUS WINAPI NetServerTransportEnum(LPTSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
 BOOL SetServiceBits(SERVICE_STATUS_HANDLE,DWORD,BOOL,BOOL);
Index: include/lmsvc.h
===================================================================
RCS file: /src/cvsroot/winsup-990916/include/lmsvc.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 lmsvc.h
--- include/lmsvc.h	1999/09/17 07:37:43	1.1.1.1
+++ include/lmsvc.h	1999/10/02 20:52:53
@@ -98,27 +98,27 @@ extern "C" {
 #define SERVICE_UIC_M_LSA_MACHINE_ACCT (SERVICE2_BASE+1)
 #define SERVICE_UIC_M_DATABASE_ERROR (SERVICE2_BASE+2)
 
-typedef struct _SERVICE_INFO_0 { LPTSTR svci0_name;} SERVICE_INFO_0,*PSERVICE_INFO_0,* LPSERVICE_INFO_0;
+typedef struct _SERVICE_INFO_0 { LPWSTR svci0_name;} SERVICE_INFO_0,*PSERVICE_INFO_0,* LPSERVICE_INFO_0;
 typedef struct _SERVICE_INFO_1 {
-	LPTSTR svci1_name;
+	LPWSTR svci1_name;
 	DWORD svci1_status;
 	DWORD svci1_code;
 	DWORD svci1_pid;
 } SERVICE_INFO_1,*PSERVICE_INFO_1,* LPSERVICE_INFO_1;
 typedef struct _SERVICE_INFO_2 {
-	LPTSTR svci2_name;
+	LPWSTR svci2_name;
 	DWORD svci2_status;
 	DWORD svci2_code;
 	DWORD svci2_pid;
-	LPTSTR svci2_text;
+	LPWSTR svci2_text;
 	DWORD svci2_specific_error;
-	LPTSTR svci2_display_name;
+	LPWSTR svci2_display_name;
 } SERVICE_INFO_2,*PSERVICE_INFO_2,* LPSERVICE_INFO_2;
 
-NET_API_STATUS WINAPI NetServiceControl(LPTSTR,LPTSTR,DWORD,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetServiceEnum(LPTSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetServiceGetInfo(LPTSTR,LPTSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetServiceInstall(LPTSTR,LPTSTR,DWORD,LPTSTR*,PBYTE*);
+NET_API_STATUS WINAPI NetServiceControl(LPCWSTR,LPCWSTR,DWORD,DWORD,PBYTE*);
+NET_API_STATUS WINAPI NetServiceEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
+NET_API_STATUS WINAPI NetServiceGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
+NET_API_STATUS WINAPI NetServiceInstall(LPCWSTR,LPCWSTR,DWORD,LPCWSTR*,PBYTE*);
 #define SERVICE_IP_CODE(t,n) ((long)SERVICE_IP_QUERY_HINT|(long)(n|(t<<SERVICE_IP_WAITTIME_SHIFT)))
 #define SERVICE_CCP_CODE(t,n) ((long)SERVICE_CCP_QUERY_HINT|(long)(n|(t<<SERVICE_IP_WAITTIME_SHIFT)))
 #define SERVICE_UIC_CODE(c,m) ((long)(((long)c<<16)|(long)(USHORT)m))
Index: include/lmwksta.h
===================================================================
RCS file: /src/cvsroot/winsup-990916/include/lmwksta.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 lmwksta.h
--- include/lmwksta.h	1999/09/17 07:37:43	1.1.1.1
+++ include/lmwksta.h	1999/10/02 20:16:32
@@ -62,26 +62,26 @@ extern "C" {
 
 typedef struct _WKSTA_INFO_100 {
 	DWORD wki100_platform_id;
-	LPTSTR wki100_computername;
-	LPTSTR wki100_langroup;
+	LPWSTR wki100_computername;
+	LPWSTR wki100_langroup;
 	DWORD wki100_ver_major;
 	DWORD wki100_ver_minor;
 }WKSTA_INFO_100,*PWKSTA_INFO_100,*LPWKSTA_INFO_100;
 typedef struct _WKSTA_INFO_101 {
 	DWORD wki101_platform_id;
-	LPTSTR wki101_computername;
-	LPTSTR wki101_langroup;
+	LPWSTR wki101_computername;
+	LPWSTR wki101_langroup;
 	DWORD wki101_ver_major;
 	DWORD wki101_ver_minor;
-	LPTSTR wki101_lanroot;
+	LPWSTR wki101_lanroot;
 }WKSTA_INFO_101,*PWKSTA_INFO_101,*LPWKSTA_INFO_101;
 typedef struct _WKSTA_INFO_102 {
 	DWORD wki102_platform_id;
-	LPTSTR wki102_computername;
-	LPTSTR wki102_langroup;
+	LPWSTR wki102_computername;
+	LPWSTR wki102_langroup;
 	DWORD wki102_ver_major;
 	DWORD wki102_ver_minor;
-	LPTSTR wki102_lanroot;
+	LPWSTR wki102_lanroot;
 	DWORD wki102_logged_on_users;
 }WKSTA_INFO_102,*PWKSTA_INFO_102,*LPWKSTA_INFO_102;
 typedef struct _WKSTA_INFO_302{
@@ -102,7 +102,7 @@ typedef struct _WKSTA_INFO_302{
 	DWORD wki302_print_buf_time;
 	DWORD wki302_num_char_buf;
 	DWORD wki302_siz_char_buf;
-	LPTSTR wki302_wrk_heuristics;
+	LPWSTR wki302_wrk_heuristics;
 	DWORD wki302_mailslots;
 	DWORD wki302_num_dgram_buf;
 }WKSTA_INFO_302,*PWKSTA_INFO_302,*LPWKSTA_INFO_302;
@@ -124,7 +124,7 @@ typedef struct _WKSTA_INFO_402{
 	DWORD wki402_print_buf_time;
 	DWORD wki402_num_char_buf;
 	DWORD wki402_siz_char_buf;
-	LPTSTR wki402_wrk_heuristics;
+	LPWSTR wki402_wrk_heuristics;
 	DWORD wki402_mailslots;
 	DWORD wki402_num_dgram_buf;
 	DWORD wki402_max_threads;
@@ -198,30 +198,30 @@ typedef struct _WKSTA_INFO_1059 { BOOL w
 typedef struct _WKSTA_INFO_1060 { BOOL wki1060_force_core_create_mode;} WKSTA_INFO_1060,*PWKSTA_INFO_1060,*LPWKSTA_INFO_1060;
 typedef struct _WKSTA_INFO_1061 { BOOL wki1061_use_512_byte_max_transfer;} WKSTA_INFO_1061,*PWKSTA_INFO_1061,*LPWKSTA_INFO_1061;
 typedef struct _WKSTA_INFO_1062 { DWORD wki1062_read_ahead_throughput;} WKSTA_INFO_1062,*PWKSTA_INFO_1062,*LPWKSTA_INFO_1062;
-typedef struct _WKSTA_USER_INFO_0 { LPTSTR wkui0_username;}WKSTA_USER_INFO_0,*PWKSTA_USER_INFO_0,*LPWKSTA_USER_INFO_0;
+typedef struct _WKSTA_USER_INFO_0 { LPWSTR wkui0_username;}WKSTA_USER_INFO_0,*PWKSTA_USER_INFO_0,*LPWKSTA_USER_INFO_0;
 typedef struct _WKSTA_USER_INFO_1 {
-	LPTSTR wkui1_username;
-	LPTSTR wkui1_logon_domain;
-	LPTSTR wkui1_oth_domains;
-	LPTSTR wkui1_logon_server;
+	LPWSTR wkui1_username;
+	LPWSTR wkui1_logon_domain;
+	LPWSTR wkui1_oth_domains;
+	LPWSTR wkui1_logon_server;
 }WKSTA_USER_INFO_1,*PWKSTA_USER_INFO_1,*LPWKSTA_USER_INFO_1;
-typedef struct _WKSTA_USER_INFO_1101 { LPTSTR wkui1101_oth_domains;} WKSTA_USER_INFO_1101,*PWKSTA_USER_INFO_1101,*LPWKSTA_USER_INFO_1101;
+typedef struct _WKSTA_USER_INFO_1101 { LPWSTR wkui1101_oth_domains;} WKSTA_USER_INFO_1101,*PWKSTA_USER_INFO_1101,*LPWKSTA_USER_INFO_1101;
 typedef struct _WKSTA_TRANSPORT_INFO_0 {
 	DWORD wkti0_quality_of_service;
 	DWORD wkti0_number_of_vcs;
-	LPTSTR wkti0_transport_name;
-	LPTSTR wkti0_transport_address;
+	LPWSTR wkti0_transport_name;
+	LPWSTR wkti0_transport_address;
 	BOOL wkti0_wan_ish;
 }WKSTA_TRANSPORT_INFO_0,*PWKSTA_TRANSPORT_INFO_0,*LPWKSTA_TRANSPORT_INFO_0;
 
-NET_API_STATUS WINAPI NetWkstaGetInfo(LPTSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetWkstaSetInfo(LPTSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPTSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetWkstaUserSetInfo(LPTSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetWkstaUserEnum(LPTSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetWkstaTransportAdd(LPTSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetWkstaTransportDel(LPTSTR,LPTSTR,DWORD);
-NET_API_STATUS WINAPI NetWkstaTransportEnum(LPTSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
+NET_API_STATUS WINAPI NetWkstaGetInfo(LPWSTR,DWORD,PBYTE*);
+NET_API_STATUS WINAPI NetWkstaSetInfo(LPWSTR,DWORD,PBYTE,PDWORD);
+NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR,DWORD,PBYTE*);
+NET_API_STATUS WINAPI NetWkstaUserSetInfo(LPWSTR,DWORD,PBYTE,PDWORD);
+NET_API_STATUS WINAPI NetWkstaUserEnum(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
+NET_API_STATUS WINAPI NetWkstaTransportAdd(LPWSTR,DWORD,PBYTE,PDWORD);
+NET_API_STATUS WINAPI NetWkstaTransportDel(LPWSTR,LPWSTR,DWORD);
+NET_API_STATUS WINAPI NetWkstaTransportEnum(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
 
 #ifdef __cplusplus
 }

--------------C4BF86F0387CC708494A8DA2--