netapi32: Add some missing prototypes in the lmaccess.h, lmshare.h and lmwksta.h headers.

dlls/netapi32/netapi32.c

@@ -53,14 +53,14 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
  *                NetServerEnum (NETAPI32.@)
  */
 NET_API_STATUS  WINAPI NetServerEnum(
-  LPCWSTR servername,
+  LMCSTR servername,
   DWORD level,
   LPBYTE* bufptr,
   DWORD prefmaxlen,
   LPDWORD entriesread,
   LPDWORD totalentries,
   DWORD servertype,
-  LPCWSTR domain,
+  LMCSTR domain,
   LPDWORD resume_handle
 )
 {
@@ -75,15 +75,15 @@ NET_API_STATUS  WINAPI NetServerEnum(
  *                NetServerEnumEx (NETAPI32.@)
  */
 NET_API_STATUS WINAPI NetServerEnumEx(
-    LPCWSTR ServerName,
+    LMCSTR ServerName,
     DWORD Level,
     LPBYTE *Bufptr,
     DWORD PrefMaxlen,
     LPDWORD EntriesRead,
     LPDWORD totalentries,
     DWORD servertype,
-    LPCWSTR domain,
-    LPCWSTR FirstNameToReturn)
+    LMCSTR domain,
+    LMCSTR FirstNameToReturn)
 {
     FIXME("Stub (%s %d %p %d %p %p %d %s %p)\n", debugstr_w(ServerName),
      Level, Bufptr, PrefMaxlen, EntriesRead, totalentries, servertype,
@@ -105,7 +105,7 @@ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bu
 /************************************************************
  *                NetStatisticsGet  (NETAPI32.@)
  */
-NET_API_STATUS WINAPI NetStatisticsGet(LPWSTR server, LPWSTR service,
+NET_API_STATUS WINAPI NetStatisticsGet(LMSTR server, LMSTR service,
                                        DWORD level, DWORD options,
                                        LPBYTE *bufptr)
 {

dlls/netapi32/share.c

@@ -47,8 +47,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(share);
  *     NERR_InvalidComputer        Invalid computer name
  *     NERR_UserNotFound           User name could not be found.
  */
-NET_API_STATUS WINAPI NetSessionEnum(LPWSTR servername, LPWSTR UncClientName,
-    LPWSTR username, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread,
+NET_API_STATUS WINAPI NetSessionEnum(LMSTR servername, LMSTR UncClientName,
+    LMSTR username, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread,
     LPDWORD totalentries, LPDWORD resume_handle)
 {
     FIXME("Stub (%s %s %s %d %p %d %p %p %p)\n", debugstr_w(servername),
@@ -75,7 +75,7 @@ NET_API_STATUS WINAPI NetSessionEnum(LPWSTR servername, LPWSTR UncClientName,
  *   On failure it returns a system error code (FIXME: find out which)
  *
  */
-NET_API_STATUS WINAPI NetShareEnum( LPWSTR servername, DWORD level, LPBYTE* bufptr,
+NET_API_STATUS WINAPI NetShareEnum( LMSTR servername, DWORD level, LPBYTE* bufptr,
     DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle)
 {
     FIXME("Stub (%s %d %p %d %p %p %p)\n", debugstr_w(servername), level, bufptr,

dlls/netapi32/wksta.c

@@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
  *
  * Checks whether the server name indicates local machine.
  */
-BOOL NETAPI_IsLocalComputer(LPCWSTR ServerName)
+BOOL NETAPI_IsLocalComputer(LMCSTR ServerName)
 {
     if (!ServerName)
     {
@@ -189,15 +189,15 @@ static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex,
             if (enumData->n_read < spaceFor)
             {
                 PWKSTA_TRANSPORT_INFO_0 ti;
-                LPWSTR transport_name, transport_addr;
+                LMSTR transport_name, transport_addr;
                 MIB_IFROW ifRow;
 
                 ti = (PWKSTA_TRANSPORT_INFO_0)(*(enumData->pbuf) +
                  enumData->n_read * sizeof(WKSTA_TRANSPORT_INFO_0));
-                transport_name = (LPWSTR)(*(enumData->pbuf) +
+                transport_name = (LMSTR)(*(enumData->pbuf) +
                  totalLANAs * sizeof(WKSTA_TRANSPORT_INFO_0) +
                  enumData->n_read * MAX_TRANSPORT_NAME * sizeof(WCHAR));
-                transport_addr = (LPWSTR)(*(enumData->pbuf) +
+                transport_addr = (LMSTR)(*(enumData->pbuf) +
                  totalLANAs * (sizeof(WKSTA_TRANSPORT_INFO_0) +
                  MAX_TRANSPORT_NAME * sizeof(WCHAR)) +
                  enumData->n_read * MAX_TRANSPORT_ADDR * sizeof(WCHAR));
@@ -247,7 +247,7 @@ static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex,
 /**********************************************************************/
 
 NET_API_STATUS WINAPI 
-NetWkstaTransportEnum(LPWSTR ServerName, DWORD level, PBYTE* pbuf,
+NetWkstaTransportEnum(LMSTR ServerName, DWORD level, PBYTE* pbuf,
       DWORD prefmaxlen, LPDWORD read_entries,
       PDWORD total_entries, PDWORD hresume)
 {
@@ -305,7 +305,7 @@ NetWkstaTransportEnum(LPWSTR ServerName, DWORD level, PBYTE* pbuf,
 /************************************************************
  *                NetWkstaUserGetInfo  (NETAPI32.@)
  */
-NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR reserved, DWORD level,
+NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level,
                                           PBYTE* bufptr)
 {
     TRACE("(%s, %d, %p)\n", debugstr_w(reserved), level, bufptr);
@@ -321,7 +321,7 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR reserved, DWORD level,
                              (LPVOID *) bufptr);
 
         ui = (PWKSTA_USER_INFO_0) *bufptr;
-        ui->wkui0_username = (LPWSTR) (*bufptr + sizeof(WKSTA_USER_INFO_0));
+        ui->wkui0_username = (LMSTR) (*bufptr + sizeof(WKSTA_USER_INFO_0));
 
         /* get data */
         if (!GetUserNameW(ui->wkui0_username, &dwSize))
@@ -381,13 +381,13 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR reserved, DWORD level,
                               oth_domains_sz + logon_server_sz) * sizeof(WCHAR),
                              (LPVOID *) bufptr);
         ui = (WKSTA_USER_INFO_1 *) *bufptr;
-        ui->wkui1_username = (LPWSTR) (*bufptr + sizeof(WKSTA_USER_INFO_1));
-        ui->wkui1_logon_domain = (LPWSTR) (
+        ui->wkui1_username = (LMSTR) (*bufptr + sizeof(WKSTA_USER_INFO_1));
+        ui->wkui1_logon_domain = (LMSTR) (
             ((PBYTE) ui->wkui1_username) + username_sz * sizeof(WCHAR));
-        ui->wkui1_oth_domains = (LPWSTR) (
+        ui->wkui1_oth_domains = (LMSTR) (
             ((PBYTE) ui->wkui1_logon_domain) +
             logon_domain_sz * sizeof(WCHAR));
-        ui->wkui1_logon_server = (LPWSTR) (
+        ui->wkui1_logon_server = (LMSTR) (
             ((PBYTE) ui->wkui1_oth_domains) +
             oth_domains_sz * sizeof(WCHAR));
 
@@ -418,7 +418,7 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR reserved, DWORD level,
                              (LPVOID *) bufptr);
 
         ui = (PWKSTA_USER_INFO_1101) *bufptr;
-        ui->wkui1101_oth_domains = (LPWSTR)(ui + 1);
+        ui->wkui1101_oth_domains = (LMSTR)(ui + 1);
 
         /* get data */
         ui->wkui1101_oth_domains[0] = 0;
@@ -469,7 +469,7 @@ NET_API_STATUS WINAPI I_NetNameValidate(LPVOID p1, LPWSTR wkgrp, LPVOID p3,
     return ERROR_INVALID_PARAMETER;
 }
 
-NET_API_STATUS WINAPI NetWkstaGetInfo( LPWSTR servername, DWORD level,
+NET_API_STATUS WINAPI NetWkstaGetInfo( LMSTR servername, DWORD level,
                                        LPBYTE* bufptr)
 {
     NET_API_STATUS ret;
@@ -524,7 +524,7 @@ NET_API_STATUS WINAPI NetWkstaGetInfo( LPWSTR servername, DWORD level,
                     OSVERSIONINFOW verInfo;
 
                     info->wki102_platform_id = PLATFORM_ID_NT;
-                    info->wki102_computername = (LPWSTR)(*bufptr +
+                    info->wki102_computername = (LMSTR)(*bufptr +
                      sizeof(WKSTA_INFO_102));
                     memcpy(info->wki102_computername, computerName,
                      computerNameLen * sizeof(WCHAR));

include/lmaccess.h

@@ -462,10 +462,11 @@ NET_API_STATUS WINAPI NetLocalGroupSetInfo(LPCWSTR,LPCWSTR,DWORD,LPBYTE,LPDWORD)
 NET_API_STATUS WINAPI NetLocalGroupSetMembers(LPCWSTR,LPCWSTR,DWORD,LPBYTE,DWORD);
 NET_API_STATUS WINAPI NetQueryDisplayInformation(LPCWSTR,DWORD,DWORD,DWORD,DWORD,LPDWORD,PVOID*);
 NET_API_STATUS WINAPI NetUserAdd(LPCWSTR,DWORD,LPBYTE,LPDWORD);
+NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
 NET_API_STATUS WINAPI NetUserDel(LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetUserGetLocalGroups(LPCWSTR,LPCWSTR,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD);
 NET_API_STATUS WINAPI NetUserEnum(LPCWSTR,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD);
 NET_API_STATUS WINAPI NetUserGetInfo(LPCWSTR,LPCWSTR,DWORD,LPBYTE*);
+NET_API_STATUS WINAPI NetUserGetLocalGroups(LPCWSTR,LPCWSTR,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD);
 NET_API_STATUS WINAPI NetUserModalsGet(LPCWSTR,DWORD,LPBYTE*);
 
 #ifdef __cplusplus

include/lmserver.h

@@ -39,8 +39,8 @@ typedef struct _SERVER_INFO_101 {
     LMSTR sv101_comment;
 } SERVER_INFO_101, *PSERVER_INFO_101, *LPSERVER_INFO_101;
 
-NET_API_STATUS WINAPI NetServerEnum(LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,DWORD,LPCWSTR,LPDWORD);
-NET_API_STATUS WINAPI NetServerEnumEx(LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,DWORD,LPCWSTR,LPCWSTR);
+NET_API_STATUS WINAPI NetServerEnum(LMCSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,DWORD,LMCSTR,LPDWORD);
+NET_API_STATUS WINAPI NetServerEnumEx(LMCSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,DWORD,LMCSTR,LMCSTR);
 NET_API_STATUS WINAPI NetServerGetInfo(LMSTR,DWORD,LPBYTE*);
 BOOL WINAPI SetServiceBits(SERVICE_STATUS_HANDLE,DWORD,BOOL,BOOL);
 

include/lmshare.h

@@ -34,10 +34,15 @@ typedef struct _SHARE_INFO_1 {
     LMSTR shi1_remark;
 } SHARE_INFO_1, *PSHARE_INFO_1, *LPSHARE_INFO_1;
 
-NET_API_STATUS WINAPI NetShareDel(LMSTR servername, LMSTR netname, DWORD reserved);
-NET_API_STATUS WINAPI NetShareEnum(LMSTR servername, DWORD level,
- LPBYTE *bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries,
- LPDWORD resume_handle);
+NET_API_STATUS WINAPI NetShareAdd(LMSTR,DWORD,LPBYTE,LPDWORD);
+NET_API_STATUS WINAPI NetShareCheck(LMSTR,LMSTR,LPDWORD);
+NET_API_STATUS WINAPI NetShareDel(LMSTR,LMSTR,DWORD);
+NET_API_STATUS WINAPI NetShareDelEx(LMSTR,DWORD,LPBYTE);
+NET_API_STATUS WINAPI NetShareDelSticky(LMSTR,LMSTR,DWORD);
+NET_API_STATUS WINAPI NetShareEnum(LMSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD);
+NET_API_STATUS WINAPI NetShareEnumSticky(LMSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD);
+NET_API_STATUS WINAPI NetShareGetInfo(LMSTR,LMSTR,DWORD,LPBYTE*);
+NET_API_STATUS WINAPI NetShareSetInfo(LMSTR,LMSTR,DWORD,LPBYTE,LPDWORD);
 
 #define STYPE_DISKTREE 0
 #define STYPE_PRINTQ   1
@@ -45,9 +50,9 @@ NET_API_STATUS WINAPI NetShareEnum(LMSTR servername, DWORD level,
 #define STYPE_IPC      3
 #define STYPE_SPECIAL  0x80000000
 
-NET_API_STATUS NET_API_FUNCTION NetSessionEnum(LMSTR servername, LMSTR UncClientName,
-    LMSTR username, DWORD level, LPBYTE *bufptr, DWORD prefmaxlen, LPDWORD entriesread,
-    LPDWORD totalentries, LPDWORD resume_handle);
+NET_API_STATUS WINAPI NetSessionDel(LMSTR,LMSTR,LMSTR);
+NET_API_STATUS WINAPI NetSessionEnum(LMSTR,LMSTR,LMSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD);
+NET_API_STATUS WINAPI NetSessionGetInfo(LMSTR,LMSTR,LMSTR,DWORD,LPBYTE*);
 
 #ifdef __cplusplus
 }

include/lmwksta.h

@@ -28,57 +28,61 @@ extern "C" {
 typedef struct _WKSTA_TRANSPORT_INFO_0 {
   DWORD wkti0_quality_of_service;
   DWORD wkti0_number_of_vcs;
-  LPWSTR wkti0_transport_name;
-  LPWSTR wkti0_transport_address;
+  LMSTR wkti0_transport_name;
+  LMSTR wkti0_transport_address;
   BOOL wkti0_wan_ish;
 } WKSTA_TRANSPORT_INFO_0, *PWKSTA_TRANSPORT_INFO_0, *LPWKSTA_TRANSPORT_INFO_0;
 
 typedef struct _WKSTA_USER_INFO_0 {
-    LPWSTR  wkui0_username;
+    LMSTR  wkui0_username;
 } WKSTA_USER_INFO_0, *PWKSTA_USER_INFO_0, *LPWKSTA_USER_INFO_0;
 
 typedef struct _WKSTA_USER_INFO_1 {
-    LPWSTR  wkui1_username;
-    LPWSTR  wkui1_logon_domain;
-    LPWSTR  wkui1_oth_domains;
-    LPWSTR  wkui1_logon_server;
+    LMSTR  wkui1_username;
+    LMSTR  wkui1_logon_domain;
+    LMSTR  wkui1_oth_domains;
+    LMSTR  wkui1_logon_server;
 } WKSTA_USER_INFO_1, *PWKSTA_USER_INFO_1, *LPWKSTA_USER_INFO_1;
 
 typedef struct _WKSTA_USER_INFO_1101 {
-    LPWSTR  wkui1101_oth_domains;
+    LMSTR  wkui1101_oth_domains;
 } WKSTA_USER_INFO_1101, *PWKSTA_USER_INFO_1101, *LPWKSTA_USER_INFO_1101;
 
 typedef struct _WKSTA_INFO_100 {
     DWORD   wki100_platform_id;
-    LPWSTR  wki100_computername;
-    LPWSTR  wki100_langroup;
+    LMSTR   wki100_computername;
+    LMSTR   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;
-    LPWSTR  wki101_computername;
-    LPWSTR  wki101_langroup;
+    LMSTR   wki101_computername;
+    LMSTR   wki101_langroup;
     DWORD   wki101_ver_major;
     DWORD   wki101_ver_minor;
-    LPWSTR  wki101_lanroot;
+    LMSTR   wki101_lanroot;
 } WKSTA_INFO_101, *PWKSTA_INFO_101, *LPWKSTA_INFO_101;
 
 typedef struct _WKSTA_INFO_102 {
     DWORD   wki102_platform_id;
-    LPWSTR  wki102_computername;
-    LPWSTR  wki102_langroup;
+    LMSTR   wki102_computername;
+    LMSTR   wki102_langroup;
     DWORD   wki102_ver_major;
     DWORD   wki102_ver_minor;
-    LPWSTR  wki102_lanroot;
+    LMSTR   wki102_lanroot;
     DWORD   wki102_logged_on_users;
 } WKSTA_INFO_102, *PWKSTA_INFO_102, *LPWKSTA_INFO_102;
 
 /* workstation */
-NET_API_STATUS WINAPI NetWkstaGetInfo(LPWSTR,DWORD,LPBYTE*);
-NET_API_STATUS NET_API_FUNCTION NetWkstaTransportEnum(LPWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD);
-NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR,DWORD,LPBYTE*);
+NET_API_STATUS WINAPI NetWkstaGetInfo(LMSTR,DWORD,LPBYTE*);
+NET_API_STATUS WINAPI NetWkstaSetInfo(LMSTR,DWORD,LPBYTE,LPDWORD);
+NET_API_STATUS WINAPI NetWkstaTransportAdd(LMSTR,DWORD,LPBYTE,LPDWORD);
+NET_API_STATUS WINAPI NetWkstaTransportDel(LMSTR,LMSTR,DWORD);
+NET_API_STATUS WINAPI NetWkstaTransportEnum(LMSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD);
+NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR,DWORD,LPBYTE*);
+NET_API_STATUS WINAPI NetWkstaUserSetInfo(LMSTR,DWORD,LPBYTE,LPDWORD);
 
 #ifdef __cplusplus
 }