[ros-diffs] [ekohl] 57972: [NETAPI32] - Fork netapi32.dll because most of its exported functions are interfaces to services that wine will not implement. - Move user and group functions to separate files and a...

Author: ekohl
Date: Sat Dec 22 20:11:43 2012
New Revision: 57972

URL: http://svn.reactos.org/svn/reactos?rev=57972&view=rev
Log:
[NETAPI32]
- Fork netapi32.dll because most of its exported functions are interfaces to services that
wine will not implement.
- Move user and group functions to separate files and add some stubs. 
- Update README.WINE.

Added:
    trunk/reactos/dll/win32/netapi32/group.c   (with props)
    trunk/reactos/dll/win32/netapi32/user.c   (with props)
Modified:
    trunk/reactos/dll/win32/netapi32/CMakeLists.txt
    trunk/reactos/dll/win32/netapi32/access.c
    trunk/reactos/dll/win32/netapi32/netapi32.spec
    trunk/reactos/dll/win32/netapi32/wksta.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Sat Dec 22 20:11:43 2012
@@ -9,6 +9,7 @@
     apibuf.c
     browsr.c
     ds.c
+    group.c
     local_group.c
     nbcmdqueue.c
     nbnamecache.c
@@ -16,6 +17,7 @@
     netapi32.c
     netbios.c
     share.c
+    user.c
     wksta.c
     ${CMAKE_CURRENT_BINARY_DIR}/netapi32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def)

Modified: trunk/reactos/dll/win32/netapi32/access.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.…
==============================================================================
--- trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] Sat Dec 22 20:11:43 2012
@@ -37,447 +37,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
 
-/* NOTE: So far, this is implemented to support tests that require user logins,
- *       but not designed to handle real user databases. Those should probably
- *       be synced with either the host's user database or with Samba.
- *
- * FIXME: The user database should hold all the information the USER_INFO_4 struct
- * needs, but for the first try, I will just implement the USER_INFO_1 fields.
- */
-
-struct sam_user
-{
-    struct list entry;
-    WCHAR user_name[LM20_UNLEN+1];
-    WCHAR user_password[PWLEN + 1];
-    DWORD sec_since_passwd_change;
-    DWORD user_priv;
-    LPWSTR home_dir;
-    LPWSTR user_comment;
-    DWORD user_flags;
-    LPWSTR user_logon_script_path;
-};
-
-static struct list user_list = LIST_INIT( user_list );
-
 BOOL NETAPI_IsLocalComputer(LPCWSTR ServerName);
-
-/************************************************************
- *                NETAPI_ValidateServername
- *
- * Validates server name
- */
-static NET_API_STATUS NETAPI_ValidateServername(LPCWSTR ServerName)
-{
-    if (ServerName)
-    {
-        if (ServerName[0] == 0)
-            return ERROR_BAD_NETPATH;
-        else if (
-            ((ServerName[0] == '\\') &&
-             (ServerName[1] != '\\'))
-            ||
-            ((ServerName[0] == '\\') &&
-             (ServerName[1] == '\\') &&
-             (ServerName[2] == 0))
-            )
-            return ERROR_INVALID_NAME;
-    }
-    return NERR_Success;
-}
-
-/************************************************************
- *                NETAPI_FindUser
- *
- * Looks for a user in the user database.
- * Returns a pointer to the entry in the user list when the user
- * is found, NULL otherwise.
- */
-static struct sam_user* NETAPI_FindUser(LPCWSTR UserName)
-{
-    struct sam_user *user;
-
-    LIST_FOR_EACH_ENTRY(user, &user_list, struct sam_user, entry)
-    {
-        if(lstrcmpW(user->user_name, UserName) == 0)
-            return user;
-    }
-    return NULL;
-}
-
-static BOOL NETAPI_IsCurrentUser(LPCWSTR username)
-{
-    LPWSTR curr_user = NULL;
-    DWORD dwSize;
-    BOOL ret = FALSE;
-
-    dwSize = LM20_UNLEN+1;
-    curr_user = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR));
-    if(!curr_user)
-    {
-        ERR("Failed to allocate memory for user name.\n");
-        goto end;
-    }
-    if(!GetUserNameW(curr_user, &dwSize))
-    {
-        ERR("Failed to get current user's user name.\n");
-        goto end;
-    }
-    if (!lstrcmpW(curr_user, username))
-    {
-        ret = TRUE;
-    }
-
-end:
-    HeapFree(GetProcessHeap(), 0, curr_user);
-    return ret;
-}
-
-/************************************************************
- *                NetUserAdd (NETAPI32.@)
- */
-NET_API_STATUS WINAPI NetUserAdd(LPCWSTR servername,
-                  DWORD level, LPBYTE bufptr, LPDWORD parm_err)
-{
-    NET_API_STATUS status;
-    struct sam_user * su = NULL;
-
-    FIXME("(%s, %d, %p, %p) stub!\n", debugstr_w(servername), level, bufptr,
parm_err);
-
-    if((status = NETAPI_ValidateServername(servername)) != NERR_Success)
-        return status;
-
-    switch(level)
-    {
-    /* Level 3 and 4 are identical for the purposes of NetUserAdd */
-    case 4:
-    case 3:
-        FIXME("Level 3 and 4 not implemented.\n");
-        /* Fall through */
-    case 2:
-        FIXME("Level 2 not implemented.\n");
-        /* Fall through */
-    case 1:
-    {
-        PUSER_INFO_1 ui = (PUSER_INFO_1) bufptr;
-        su = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sam_user));
-        if(!su)
-        {
-            status = NERR_InternalError;
-            break;
-        }
-
-        if(lstrlenW(ui->usri1_name) > LM20_UNLEN)
-        {
-            status = NERR_BadUsername;
-            break;
-        }
-
-        /*FIXME: do other checks for a valid username */
-        lstrcpyW(su->user_name, ui->usri1_name);
-
-        if(lstrlenW(ui->usri1_password) > PWLEN)
-        {
-            /* Always return PasswordTooShort on invalid passwords. */
-            status = NERR_PasswordTooShort;
-            break;
-        }
-        lstrcpyW(su->user_password, ui->usri1_password);
-
-        su->sec_since_passwd_change = ui->usri1_password_age;
-        su->user_priv = ui->usri1_priv;
-        su->user_flags = ui->usri1_flags;
-
-        /*FIXME: set the other LPWSTRs to NULL for now */
-        su->home_dir = NULL;
-        su->user_comment = NULL;
-        su->user_logon_script_path = NULL;
-
-        list_add_head(&user_list, &su->entry);
-        return NERR_Success;
-    }
-    default:
-        TRACE("Invalid level %d specified.\n", level);
-        status = ERROR_INVALID_LEVEL;
-        break;
-    }
-
-    HeapFree(GetProcessHeap(), 0, su);
-
-    return status;
-}
-
-/************************************************************
- *                NetUserDel  (NETAPI32.@)
- */
-NET_API_STATUS WINAPI NetUserDel(LPCWSTR servername, LPCWSTR username)
-{
-    NET_API_STATUS status;
-    struct sam_user *user;
-
-    TRACE("(%s, %s)\n", debugstr_w(servername), debugstr_w(username));
-
-    if((status = NETAPI_ValidateServername(servername))!= NERR_Success)
-        return status;
-
-    if ((user = NETAPI_FindUser(username)) == NULL)
-        return NERR_UserNotFound;
-
-    list_remove(&user->entry);
-
-    HeapFree(GetProcessHeap(), 0, user->home_dir);
-    HeapFree(GetProcessHeap(), 0, user->user_comment);
-    HeapFree(GetProcessHeap(), 0, user->user_logon_script_path);
-    HeapFree(GetProcessHeap(), 0, user);
-
-    return NERR_Success;
-}
-
-/************************************************************
- *                NetUserGetInfo  (NETAPI32.@)
- */
-NET_API_STATUS WINAPI
-NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level,
-               LPBYTE* bufptr)
-{
-    NET_API_STATUS status;
-    TRACE("(%s, %s, %d, %p)\n", debugstr_w(servername), debugstr_w(username),
-          level, bufptr);
-    status = NETAPI_ValidateServername(servername);
-    if (status != NERR_Success)
-        return status;
-
-    if(!NETAPI_IsLocalComputer(servername))
-    {
-        FIXME("Only implemented for local computer, but remote server"
-              "%s was requested.\n", debugstr_w(servername));
-        return NERR_InvalidComputer;
-    }
-
-    if(!NETAPI_FindUser(username) && !NETAPI_IsCurrentUser(username))
-    {
-        TRACE("User %s is unknown.\n", debugstr_w(username));
-        return NERR_UserNotFound;
-    }
-
-    switch (level)
-    {
-    case 0:
-    {
-        PUSER_INFO_0 ui;
-        int name_sz;
-
-        name_sz = lstrlenW(username) + 1;
-
-        /* set up buffer */
-        NetApiBufferAllocate(sizeof(USER_INFO_0) + name_sz * sizeof(WCHAR),
-                             (LPVOID *) bufptr);
-
-        ui = (PUSER_INFO_0) *bufptr;
-        ui->usri0_name = (LPWSTR) (*bufptr + sizeof(USER_INFO_0));
-
-        /* get data */
-        lstrcpyW(ui->usri0_name, username);
-        break;
-    }
-
-    case 10:
-    {
-        PUSER_INFO_10 ui;
-        PUSER_INFO_0 ui0;
-        NET_API_STATUS status;
-        /* sizes of the field buffers in WCHARS */
-        int name_sz, comment_sz, usr_comment_sz, full_name_sz;
-
-        comment_sz = 1;
-        usr_comment_sz = 1;
-        full_name_sz = 1;
-
-        /* get data */
-        status = NetUserGetInfo(servername, username, 0, (LPBYTE *) &ui0);
-        if (status != NERR_Success)
-        {
-            NetApiBufferFree(ui0);
-            return status;
-        }
-        name_sz = lstrlenW(ui0->usri0_name) + 1;
-
-        /* set up buffer */
-        NetApiBufferAllocate(sizeof(USER_INFO_10) +
-                             (name_sz + comment_sz + usr_comment_sz +
-                              full_name_sz) * sizeof(WCHAR),
-                             (LPVOID *) bufptr);
-        ui = (PUSER_INFO_10) *bufptr;
-        ui->usri10_name = (LPWSTR) (*bufptr + sizeof(USER_INFO_10));
-        ui->usri10_comment = (LPWSTR) (
-            ((PBYTE) ui->usri10_name) + name_sz * sizeof(WCHAR));
-        ui->usri10_usr_comment = (LPWSTR) (
-            ((PBYTE) ui->usri10_comment) + comment_sz * sizeof(WCHAR));
-        ui->usri10_full_name = (LPWSTR) (
-            ((PBYTE) ui->usri10_usr_comment) + usr_comment_sz * sizeof(WCHAR));
-
-        /* set data */
-        lstrcpyW(ui->usri10_name, ui0->usri0_name);
-        NetApiBufferFree(ui0);
-        ui->usri10_comment[0] = 0;
-        ui->usri10_usr_comment[0] = 0;
-        ui->usri10_full_name[0] = 0;
-        break;
-    }
-
-    case 1:
-      {
-        static const WCHAR homedirW[] =
{'H','O','M','E',0};
-        PUSER_INFO_1 ui;
-        PUSER_INFO_0 ui0;
-        NET_API_STATUS status;
-        /* sizes of the field buffers in WCHARS */
-        int name_sz, password_sz, home_dir_sz, comment_sz, script_path_sz;
-
-        password_sz = 1; /* not filled out for security reasons for NetUserGetInfo*/
-        comment_sz = 1;
-        script_path_sz = 1;
-
-       /* get data */
-        status = NetUserGetInfo(servername, username, 0, (LPBYTE *) &ui0);
-        if (status != NERR_Success)
-        {
-            NetApiBufferFree(ui0);
-            return status;
-        }
-        name_sz = lstrlenW(ui0->usri0_name) + 1;
-        home_dir_sz = GetEnvironmentVariableW(homedirW, NULL,0);
-        /* set up buffer */
-        NetApiBufferAllocate(sizeof(USER_INFO_1) +
-                             (name_sz + password_sz + home_dir_sz +
-                              comment_sz + script_path_sz) * sizeof(WCHAR),
-                             (LPVOID *) bufptr);
-
-        ui = (PUSER_INFO_1) *bufptr;
-        ui->usri1_name = (LPWSTR) (ui + 1);
-        ui->usri1_password = ui->usri1_name + name_sz;
-        ui->usri1_home_dir = ui->usri1_password + password_sz;
-        ui->usri1_comment = ui->usri1_home_dir + home_dir_sz;
-        ui->usri1_script_path = ui->usri1_comment + comment_sz;
-        /* set data */
-        lstrcpyW(ui->usri1_name, ui0->usri0_name);
-        NetApiBufferFree(ui0);
-        ui->usri1_password[0] = 0;
-        ui->usri1_password_age = 0;
-        ui->usri1_priv = 0;
-        GetEnvironmentVariableW(homedirW, ui->usri1_home_dir,home_dir_sz);
-        ui->usri1_comment[0] = 0;
-        ui->usri1_flags = 0;
-        ui->usri1_script_path[0] = 0;
-        break;
-      }
-    case 2:
-    case 3:
-    case 4:
-    case 11:
-    case 20:
-    case 23:
-    case 1003:
-    case 1005:
-    case 1006:
-    case 1007:
-    case 1008:
-    case 1009:
-    case 1010:
-    case 1011:
-    case 1012:
-    case 1013:
-    case 1014:
-    case 1017:
-    case 1018:
-    case 1020:
-    case 1023:
-    case 1024:
-    case 1025:
-    case 1051:
-    case 1052:
-    case 1053:
-    {
-        FIXME("Level %d is not implemented\n", level);
-        return NERR_InternalError;
-    }
-    default:
-        TRACE("Invalid level %d is specified\n", level);
-        return ERROR_INVALID_LEVEL;
-    }
-    return NERR_Success;
-}
-
-/************************************************************
- *                NetUserGetLocalGroups  (NETAPI32.@)
- */
-NET_API_STATUS WINAPI
-NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level,
-                      DWORD flags, LPBYTE* bufptr, DWORD prefmaxlen,
-                      LPDWORD entriesread, LPDWORD totalentries)
-{
-    NET_API_STATUS status;
-    const WCHAR admins[] =
{'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0};
-    LPWSTR currentuser;
-    LOCALGROUP_USERS_INFO_0* info;
-    DWORD size;
-
-    FIXME("(%s, %s, %d, %08x, %p %d, %p, %p) stub!\n",
-          debugstr_w(servername), debugstr_w(username), level, flags, bufptr,
-          prefmaxlen, entriesread, totalentries);
-
-    status = NETAPI_ValidateServername(servername);
-    if (status != NERR_Success)
-        return status;
-
-    size = UNLEN + 1;
-    NetApiBufferAllocate(size * sizeof(WCHAR), (LPVOID*)&currentuser);
-    GetUserNameW(currentuser, &size);
-
-    if (lstrcmpiW(username, currentuser) && NETAPI_FindUser(username))
-    {
-        NetApiBufferFree(currentuser);
-        return NERR_UserNotFound;
-    }
-
-    NetApiBufferFree(currentuser);
-    *totalentries = 1;
-    size = sizeof(*info) + sizeof(admins);
-
-    if(prefmaxlen < size)
-        status = ERROR_MORE_DATA;
-    else
-        status = NetApiBufferAllocate(size, (LPVOID*)&info);
-
-    if(status != NERR_Success)
-    {
-        *bufptr = NULL;
-        *entriesread = 0;
-        return status;
-    }
-
-    info->lgrui0_name = (LPWSTR)((LPBYTE)info + sizeof(*info));
-    lstrcpyW(info->lgrui0_name, admins);
-
-    *bufptr = (LPBYTE)info;
-    *entriesread = 1;
-
-    return NERR_Success;
-}
-
-/************************************************************
- *                NetUserEnum  (NETAPI32.@)
- */
-NET_API_STATUS WINAPI
-NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr,
-	    DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries,
-	    LPDWORD resume_handle)
-{
-  FIXME("(%s,%d, 0x%d,%p,%d,%p,%p,%p) stub!\n", debugstr_w(servername), level,
-        filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle);
-
-  return ERROR_ACCESS_DENIED;
-}
 
 /************************************************************
  *                ACCESS_QueryAdminDisplayInformation
@@ -716,29 +276,6 @@
   FIXME("(%s, %s, %p) stub!\n", debugstr_w(servername),
                  debugstr_w(domainname), bufptr);
   return NERR_DCNotFound; /* say we can't find a domain controller */  
-}
-
-/************************************************************
- *                NetGroupEnum  (NETAPI32.@)
- *
- */
-NET_API_STATUS WINAPI
-NetGroupEnum(LPCWSTR servername, DWORD level, LPBYTE *bufptr, DWORD prefmaxlen,
-             LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle)
-{
-    FIXME("(%s, %d, %p, %d, %p, %p, %p) stub!\n", debugstr_w(servername),
-          level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle);
-    return ERROR_ACCESS_DENIED;
-}
-
-/************************************************************
- *                NetGroupGetInfo  (NETAPI32.@)
- *
- */
-NET_API_STATUS WINAPI NetGroupGetInfo(LPCWSTR servername, LPCWSTR groupname, DWORD level,
LPBYTE *bufptr)
-{
-    FIXME("(%s, %s, %d, %p) stub!\n", debugstr_w(servername),
debugstr_w(groupname), level, bufptr);
-    return ERROR_ACCESS_DENIED;
 }
 
 /******************************************************************************
@@ -866,45 +403,6 @@
     return NERR_Success;
 }
 
-/******************************************************************************
- *                NetUserChangePassword  (NETAPI32.@)
- * PARAMS
- *  domainname  [I] Optional. Domain on which the user resides or the logon
- *                  domain of the current user if NULL.
- *  username    [I] Optional. Username to change the password for or the name
- *                  of the current user if NULL.
- *  oldpassword [I] The user's current password.
- *  newpassword [I] The password that the user will be changed to using.
- *
- * RETURNS
- *  Success: NERR_Success.
- *  Failure: NERR_* failure code or win error code.
- *
- */
-NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR domainname, LPCWSTR username,
-    LPCWSTR oldpassword, LPCWSTR newpassword)
-{
-    struct sam_user *user;
-
-    TRACE("(%s, %s, ..., ...)\n", debugstr_w(domainname),
debugstr_w(username));
-
-    if(domainname)
-        FIXME("Ignoring domainname %s.\n", debugstr_w(domainname));
-
-    if((user = NETAPI_FindUser(username)) == NULL)
-        return NERR_UserNotFound;
-
-    if(lstrcmpW(user->user_password, oldpassword) != 0)
-        return ERROR_INVALID_PASSWORD;
-
-    if(lstrlenW(newpassword) > PWLEN)
-        return ERROR_PASSWORD_RESTRICTION;
-
-    lstrcpyW(user->user_password, newpassword);
-
-    return NERR_Success;
-}
-
 NET_API_STATUS WINAPI NetUseAdd(LMSTR servername, DWORD level, LPBYTE bufptr, LPDWORD
parm_err)
 {
     FIXME("%s %d %p %p stub\n", debugstr_w(servername), level, bufptr,
parm_err);

Added: trunk/reactos/dll/win32/netapi32/group.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/group.c…
==============================================================================
--- trunk/reactos/dll/win32/netapi32/group.c (added)
+++ trunk/reactos/dll/win32/netapi32/group.c [iso-8859-1] Sat Dec 22 20:11:43 2012
@@ -1,0 +1,85 @@
+/*
+ * Copyright 2002 Andriy Palamarchuk
+ *
+ * netapi32 access functions
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "lmcons.h"
+#include "lmaccess.h"
+#include "lmapibuf.h"
+#include "lmerr.h"
+#include "lmuse.h"
+#include "ntsecapi.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "wine/list.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
+
+/*
+@ stub NetGroupAdd
+@ stub NetGroupAddUser
+@ stub NetGroupDel
+@ stub NetGroupDelUser
+*/
+
+/************************************************************
+ * NetGroupEnum  (NETAPI32.@)
+ *
+ */
+NET_API_STATUS
+WINAPI
+NetGroupEnum(LPCWSTR servername,
+             DWORD level,
+             LPBYTE *bufptr,
+             DWORD prefmaxlen,
+             LPDWORD entriesread,
+             LPDWORD totalentries,
+             LPDWORD resume_handle)
+{
+    FIXME("(%s, %d, %p, %d, %p, %p, %p) stub!\n", debugstr_w(servername),
+          level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle);
+    return ERROR_ACCESS_DENIED;
+}
+
+/************************************************************
+ * NetGroupGetInfo  (NETAPI32.@)
+ *
+ */
+NET_API_STATUS
+WINAPI
+NetGroupGetInfo(LPCWSTR servername,
+                LPCWSTR groupname,
+                DWORD level,
+                LPBYTE *bufptr)
+{
+    FIXME("(%s, %s, %d, %p) stub!\n", debugstr_w(servername),
debugstr_w(groupname), level, bufptr);
+    return ERROR_ACCESS_DENIED;
+}
+
+/*
+@ stub NetGroupGetUsers
+@ stub NetGroupSetInfo
+@ stub NetGroupSetUsers
+*/

Propchange: trunk/reactos/dll/win32/netapi32/group.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/dll/win32/netapi32/group.c
------------------------------------------------------------------------------
    svn:keywords = author date id revision

Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3…
==============================================================================
--- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Sat Dec 22 20:11:43 2012
@@ -210,8 +210,8 @@
 @ stdcall NetUserGetLocalGroups(wstr wstr long long ptr long ptr ptr)
 @ stdcall NetUserModalsGet(wstr long ptr)
 @ stub NetUserModalsSet
-@ stub NetUserSetGroups
-@ stub NetUserSetInfo
+@ stdcall NetUserSetGroups(wstr wstr long ptr long)
+@ stdcall NetUserSetInfo(wstr wstr long ptr ptr)
 @ stdcall NetWkstaGetInfo(wstr long ptr)
 @ stub NetWkstaSetInfo
 @ stub NetWkstaTransportAdd

Added: trunk/reactos/dll/win32/netapi32/user.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?…
==============================================================================
--- trunk/reactos/dll/win32/netapi32/user.c (added)
+++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sat Dec 22 20:11:43 2012
@@ -1,0 +1,612 @@
+/*
+ * Copyright 2002 Andriy Palamarchuk
+ *
+ * netapi32 user functions
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "lmcons.h"
+#include "lmaccess.h"
+#include "lmapibuf.h"
+#include "lmerr.h"
+#include "lmuse.h"
+#include "ntsecapi.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "wine/list.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
+
+/* NOTE: So far, this is implemented to support tests that require user logins,
+ *       but not designed to handle real user databases. Those should probably
+ *       be synced with either the host's user database or with Samba.
+ *
+ * FIXME: The user database should hold all the information the USER_INFO_4 struct
+ * needs, but for the first try, I will just implement the USER_INFO_1 fields.
+ */
+
+struct sam_user
+{
+    struct list entry;
+    WCHAR user_name[LM20_UNLEN+1];
+    WCHAR user_password[PWLEN + 1];
+    DWORD sec_since_passwd_change;
+    DWORD user_priv;
+    LPWSTR home_dir;
+    LPWSTR user_comment;
+    DWORD user_flags;
+    LPWSTR user_logon_script_path;
+};
+
+static struct list user_list = LIST_INIT( user_list );
+
+BOOL NETAPI_IsLocalComputer(LPCWSTR ServerName);
+
+/************************************************************
+ *                NETAPI_ValidateServername
+ *
+ * Validates server name
+ */
+static NET_API_STATUS NETAPI_ValidateServername(LPCWSTR ServerName)
+{
+    if (ServerName)
+    {
+        if (ServerName[0] == 0)
+            return ERROR_BAD_NETPATH;
+        else if (
+            ((ServerName[0] == '\\') &&
+             (ServerName[1] != '\\'))
+            ||
+            ((ServerName[0] == '\\') &&
+             (ServerName[1] == '\\') &&
+             (ServerName[2] == 0))
+            )
+            return ERROR_INVALID_NAME;
+    }
+    return NERR_Success;
+}
+
+/************************************************************
+ *                NETAPI_FindUser
+ *
+ * Looks for a user in the user database.
+ * Returns a pointer to the entry in the user list when the user
+ * is found, NULL otherwise.
+ */
+static struct sam_user* NETAPI_FindUser(LPCWSTR UserName)
+{
+    struct sam_user *user;
+
+    LIST_FOR_EACH_ENTRY(user, &user_list, struct sam_user, entry)
+    {
+        if(lstrcmpW(user->user_name, UserName) == 0)
+            return user;
+    }
+    return NULL;
+}
+
+static BOOL NETAPI_IsCurrentUser(LPCWSTR username)
+{
+    LPWSTR curr_user = NULL;
+    DWORD dwSize;
+    BOOL ret = FALSE;
+
+    dwSize = LM20_UNLEN+1;
+    curr_user = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR));
+    if(!curr_user)
+    {
+        ERR("Failed to allocate memory for user name.\n");
+        goto end;
+    }
+    if(!GetUserNameW(curr_user, &dwSize))
+    {
+        ERR("Failed to get current user's user name.\n");
+        goto end;
+    }
+    if (!lstrcmpW(curr_user, username))
+    {
+        ret = TRUE;
+    }
+
+end:
+    HeapFree(GetProcessHeap(), 0, curr_user);
+    return ret;
+}
+
+/************************************************************
+ *                NetUserAdd (NETAPI32.@)
+ */
+NET_API_STATUS
+WINAPI
+NetUserAdd(LPCWSTR servername,
+           DWORD level,
+           LPBYTE bufptr,
+           LPDWORD parm_err)
+{
+    NET_API_STATUS status;
+    struct sam_user * su = NULL;
+
+    FIXME("(%s, %d, %p, %p) stub!\n", debugstr_w(servername), level, bufptr,
parm_err);
+
+    if((status = NETAPI_ValidateServername(servername)) != NERR_Success)
+        return status;
+
+    switch(level)
+    {
+    /* Level 3 and 4 are identical for the purposes of NetUserAdd */
+    case 4:
+    case 3:
+        FIXME("Level 3 and 4 not implemented.\n");
+        /* Fall through */
+    case 2:
+        FIXME("Level 2 not implemented.\n");
+        /* Fall through */
+    case 1:
+    {
+        PUSER_INFO_1 ui = (PUSER_INFO_1) bufptr;
+        su = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sam_user));
+        if(!su)
+        {
+            status = NERR_InternalError;
+            break;
+        }
+
+        if(lstrlenW(ui->usri1_name) > LM20_UNLEN)
+        {
+            status = NERR_BadUsername;
+            break;
+        }
+
+        /*FIXME: do other checks for a valid username */
+        lstrcpyW(su->user_name, ui->usri1_name);
+
+        if(lstrlenW(ui->usri1_password) > PWLEN)
+        {
+            /* Always return PasswordTooShort on invalid passwords. */
+            status = NERR_PasswordTooShort;
+            break;
+        }
+        lstrcpyW(su->user_password, ui->usri1_password);
+
+        su->sec_since_passwd_change = ui->usri1_password_age;
+        su->user_priv = ui->usri1_priv;
+        su->user_flags = ui->usri1_flags;
+
+        /*FIXME: set the other LPWSTRs to NULL for now */
+        su->home_dir = NULL;
+        su->user_comment = NULL;
+        su->user_logon_script_path = NULL;
+
+        list_add_head(&user_list, &su->entry);
+        return NERR_Success;
+    }
+    default:
+        TRACE("Invalid level %d specified.\n", level);
+        status = ERROR_INVALID_LEVEL;
+        break;
+    }
+
+    HeapFree(GetProcessHeap(), 0, su);
+
+    return status;
+}
+
+
+/******************************************************************************
+ *                NetUserChangePassword  (NETAPI32.@)
+ * PARAMS
+ *  domainname  [I] Optional. Domain on which the user resides or the logon
+ *                  domain of the current user if NULL.
+ *  username    [I] Optional. Username to change the password for or the name
+ *                  of the current user if NULL.
+ *  oldpassword [I] The user's current password.
+ *  newpassword [I] The password that the user will be changed to using.
+ *
+ * RETURNS
+ *  Success: NERR_Success.
+ *  Failure: NERR_* failure code or win error code.
+ *
+ */
+NET_API_STATUS
+WINAPI
+NetUserChangePassword(LPCWSTR domainname,
+                      LPCWSTR username,
+                      LPCWSTR oldpassword,
+                      LPCWSTR newpassword)
+{
+    struct sam_user *user;
+
+    TRACE("(%s, %s, ..., ...)\n", debugstr_w(domainname),
debugstr_w(username));
+
+    if(domainname)
+        FIXME("Ignoring domainname %s.\n", debugstr_w(domainname));
+
+    if((user = NETAPI_FindUser(username)) == NULL)
+        return NERR_UserNotFound;
+
+    if(lstrcmpW(user->user_password, oldpassword) != 0)
+        return ERROR_INVALID_PASSWORD;
+
+    if(lstrlenW(newpassword) > PWLEN)
+        return ERROR_PASSWORD_RESTRICTION;
+
+    lstrcpyW(user->user_password, newpassword);
+
+    return NERR_Success;
+}
+
+
+/************************************************************
+ *                NetUserDel  (NETAPI32.@)
+ */
+NET_API_STATUS
+WINAPI
+NetUserDel(LPCWSTR servername,
+           LPCWSTR username)
+{
+    NET_API_STATUS status;
+    struct sam_user *user;
+
+    TRACE("(%s, %s)\n", debugstr_w(servername), debugstr_w(username));
+
+    if((status = NETAPI_ValidateServername(servername))!= NERR_Success)
+        return status;
+
+    if ((user = NETAPI_FindUser(username)) == NULL)
+        return NERR_UserNotFound;
+
+    list_remove(&user->entry);
+
+    HeapFree(GetProcessHeap(), 0, user->home_dir);
+    HeapFree(GetProcessHeap(), 0, user->user_comment);
+    HeapFree(GetProcessHeap(), 0, user->user_logon_script_path);
+    HeapFree(GetProcessHeap(), 0, user);
+
+    return NERR_Success;
+}
+
+
+/************************************************************
+ *                NetUserEnum  (NETAPI32.@)
+ */
+NET_API_STATUS
+WINAPI
+NetUserEnum(LPCWSTR servername,
+            DWORD level,
+            DWORD filter,
+            LPBYTE* bufptr,
+            DWORD prefmaxlen,
+            LPDWORD entriesread,
+            LPDWORD totalentries,
+            LPDWORD resume_handle)
+{
+  FIXME("(%s,%d, 0x%d,%p,%d,%p,%p,%p) stub!\n", debugstr_w(servername), level,
+        filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle);
+
+  return ERROR_ACCESS_DENIED;
+}
+
+
+/************************************************************
+ *                NetUserGetGroups (NETAPI32.@)
+ */
+NET_API_STATUS
+WINAPI
+NetUserGetGroups(LPCWSTR servername,
+                 LPCWSTR username,
+                 DWORD level,
+                 LPBYTE *bufptr,
+                 DWORD prefixmaxlen,
+                 LPDWORD entriesread,
+                 LPDWORD totalentries)
+{
+    FIXME("%s %s %d %p %d %p %p stub\n", debugstr_w(servername),
+          debugstr_w(username), level, bufptr, prefixmaxlen, entriesread,
+          totalentries);
+
+    *bufptr = NULL;
+    *entriesread = 0;
+    *totalentries = 0;
+
+    return ERROR_INVALID_LEVEL;
+}
+
+
+/************************************************************
+ * NetUserGetInfo  (NETAPI32.@)
+ */
+NET_API_STATUS
+WINAPI
+NetUserGetInfo(LPCWSTR servername,
+               LPCWSTR username,
+               DWORD level,
+               LPBYTE* bufptr)
+{
+    NET_API_STATUS status;
+    TRACE("(%s, %s, %d, %p)\n", debugstr_w(servername), debugstr_w(username),
+          level, bufptr);
+    status = NETAPI_ValidateServername(servername);
+    if (status != NERR_Success)
+        return status;
+
+    if(!NETAPI_IsLocalComputer(servername))
+    {
+        FIXME("Only implemented for local computer, but remote server"
+              "%s was requested.\n", debugstr_w(servername));
+        return NERR_InvalidComputer;
+    }
+
+    if(!NETAPI_FindUser(username) && !NETAPI_IsCurrentUser(username))
+    {
+        TRACE("User %s is unknown.\n", debugstr_w(username));
+        return NERR_UserNotFound;
+    }
+
+    switch (level)
+    {
+    case 0:
+    {
+        PUSER_INFO_0 ui;
+        int name_sz;
+
+        name_sz = lstrlenW(username) + 1;
+
+        /* set up buffer */
+        NetApiBufferAllocate(sizeof(USER_INFO_0) + name_sz * sizeof(WCHAR),
+                             (LPVOID *) bufptr);
+
+        ui = (PUSER_INFO_0) *bufptr;
+        ui->usri0_name = (LPWSTR) (*bufptr + sizeof(USER_INFO_0));
+
+        /* get data */
+        lstrcpyW(ui->usri0_name, username);
+        break;
+    }
+
+    case 10:
+    {
+        PUSER_INFO_10 ui;
+        PUSER_INFO_0 ui0;
+        NET_API_STATUS status;
+        /* sizes of the field buffers in WCHARS */
+        int name_sz, comment_sz, usr_comment_sz, full_name_sz;
+
+        comment_sz = 1;
+        usr_comment_sz = 1;
+        full_name_sz = 1;
+
+        /* get data */
+        status = NetUserGetInfo(servername, username, 0, (LPBYTE *) &ui0);
+        if (status != NERR_Success)
+        {
+            NetApiBufferFree(ui0);
+            return status;
+        }
+        name_sz = lstrlenW(ui0->usri0_name) + 1;
+
+        /* set up buffer */
+        NetApiBufferAllocate(sizeof(USER_INFO_10) +
+                             (name_sz + comment_sz + usr_comment_sz +
+                              full_name_sz) * sizeof(WCHAR),
+                             (LPVOID *) bufptr);
+        ui = (PUSER_INFO_10) *bufptr;
+        ui->usri10_name = (LPWSTR) (*bufptr + sizeof(USER_INFO_10));
+        ui->usri10_comment = (LPWSTR) (
+            ((PBYTE) ui->usri10_name) + name_sz * sizeof(WCHAR));
+        ui->usri10_usr_comment = (LPWSTR) (
+            ((PBYTE) ui->usri10_comment) + comment_sz * sizeof(WCHAR));
+        ui->usri10_full_name = (LPWSTR) (
+            ((PBYTE) ui->usri10_usr_comment) + usr_comment_sz * sizeof(WCHAR));
+
+        /* set data */
+        lstrcpyW(ui->usri10_name, ui0->usri0_name);
+        NetApiBufferFree(ui0);
+        ui->usri10_comment[0] = 0;
+        ui->usri10_usr_comment[0] = 0;
+        ui->usri10_full_name[0] = 0;
+        break;
+    }
+
+    case 1:
+      {
+        static const WCHAR homedirW[] =
{'H','O','M','E',0};
+        PUSER_INFO_1 ui;
+        PUSER_INFO_0 ui0;
+        NET_API_STATUS status;
+        /* sizes of the field buffers in WCHARS */
+        int name_sz, password_sz, home_dir_sz, comment_sz, script_path_sz;
+
+        password_sz = 1; /* not filled out for security reasons for NetUserGetInfo*/
+        comment_sz = 1;
+        script_path_sz = 1;
+
+       /* get data */
+        status = NetUserGetInfo(servername, username, 0, (LPBYTE *) &ui0);
+        if (status != NERR_Success)
+        {
+            NetApiBufferFree(ui0);
+            return status;
+        }
+        name_sz = lstrlenW(ui0->usri0_name) + 1;
+        home_dir_sz = GetEnvironmentVariableW(homedirW, NULL,0);
+        /* set up buffer */
+        NetApiBufferAllocate(sizeof(USER_INFO_1) +
+                             (name_sz + password_sz + home_dir_sz +
+                              comment_sz + script_path_sz) * sizeof(WCHAR),
+                             (LPVOID *) bufptr);
+
+        ui = (PUSER_INFO_1) *bufptr;
+        ui->usri1_name = (LPWSTR) (ui + 1);
+        ui->usri1_password = ui->usri1_name + name_sz;
+        ui->usri1_home_dir = ui->usri1_password + password_sz;
+        ui->usri1_comment = ui->usri1_home_dir + home_dir_sz;
+        ui->usri1_script_path = ui->usri1_comment + comment_sz;
+        /* set data */
+        lstrcpyW(ui->usri1_name, ui0->usri0_name);
+        NetApiBufferFree(ui0);
+        ui->usri1_password[0] = 0;
+        ui->usri1_password_age = 0;
+        ui->usri1_priv = 0;
+        GetEnvironmentVariableW(homedirW, ui->usri1_home_dir,home_dir_sz);
+        ui->usri1_comment[0] = 0;
+        ui->usri1_flags = 0;
+        ui->usri1_script_path[0] = 0;
+        break;
+      }
+    case 2:
+    case 3:
+    case 4:
+    case 11:
+    case 20:
+    case 23:
+    case 1003:
+    case 1005:
+    case 1006:
+    case 1007:
+    case 1008:
+    case 1009:
+    case 1010:
+    case 1011:
+    case 1012:
+    case 1013:
+    case 1014:
+    case 1017:
+    case 1018:
+    case 1020:
+    case 1023:
+    case 1024:
+    case 1025:
+    case 1051:
+    case 1052:
+    case 1053:
+    {
+        FIXME("Level %d is not implemented\n", level);
+        return NERR_InternalError;
+    }
+    default:
+        TRACE("Invalid level %d is specified\n", level);
+        return ERROR_INVALID_LEVEL;
+    }
+    return NERR_Success;
+}
+
+
+/************************************************************
+ * NetUserGetLocalGroups  (NETAPI32.@)
+ */
+NET_API_STATUS
+WINAPI
+NetUserGetLocalGroups(LPCWSTR servername,
+                      LPCWSTR username,
+                      DWORD level,
+                      DWORD flags,
+                      LPBYTE* bufptr,
+                      DWORD prefmaxlen,
+                      LPDWORD entriesread,
+                      LPDWORD totalentries)
+{
+    NET_API_STATUS status;
+    const WCHAR admins[] =
{'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0};
+    LPWSTR currentuser;
+    LOCALGROUP_USERS_INFO_0* info;
+    DWORD size;
+
+    FIXME("(%s, %s, %d, %08x, %p %d, %p, %p) stub!\n",
+          debugstr_w(servername), debugstr_w(username), level, flags, bufptr,
+          prefmaxlen, entriesread, totalentries);
+
+    status = NETAPI_ValidateServername(servername);
+    if (status != NERR_Success)
+        return status;
+
+    size = UNLEN + 1;
+    NetApiBufferAllocate(size * sizeof(WCHAR), (LPVOID*)&currentuser);
+    GetUserNameW(currentuser, &size);
+
+    if (lstrcmpiW(username, currentuser) && NETAPI_FindUser(username))
+    {
+        NetApiBufferFree(currentuser);
+        return NERR_UserNotFound;
+    }
+
+    NetApiBufferFree(currentuser);
+    *totalentries = 1;
+    size = sizeof(*info) + sizeof(admins);
+
+    if(prefmaxlen < size)
+        status = ERROR_MORE_DATA;
+    else
+        status = NetApiBufferAllocate(size, (LPVOID*)&info);
+
+    if(status != NERR_Success)
+    {
+        *bufptr = NULL;
+        *entriesread = 0;
+        return status;
+    }
+
+    info->lgrui0_name = (LPWSTR)((LPBYTE)info + sizeof(*info));
+    lstrcpyW(info->lgrui0_name, admins);
+
+    *bufptr = (LPBYTE)info;
+    *entriesread = 1;
+
+    return NERR_Success;
+}
+
+
+/******************************************************************************
+ * NetUserSetGroups  (NETAPI32.@)
+ */
+NET_API_STATUS
+WINAPI
+NetUserSetGroups(LPCWSTR servername,
+                 LPCWSTR username,
+                 DWORD level,
+                 LPBYTE buf,
+                 DWORD num_entries)
+{
+    FIXME("(%s %s %lu %p %lu)\n",
+          debugstr_w(servername), debugstr_w(username), level, buf, num_entries);
+    return ERROR_ACCESS_DENIED;
+}
+
+
+
+/******************************************************************************
+ * NetUserSetInfo  (NETAPI32.@)
+ */
+NET_API_STATUS
+WINAPI
+NetUserSetInfo(LPCWSTR servername,
+               LPCWSTR username,
+               DWORD level,
+               LPBYTE buf,
+               LPDWORD parm_err)
+{
+    FIXME("(%s %s %lu %p %p)\n",
+          debugstr_w(servername), debugstr_w(username), level, buf, parm_err);
+    return ERROR_ACCESS_DENIED;
+}
+
+/* EOF */

Propchange: trunk/reactos/dll/win32/netapi32/user.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/dll/win32/netapi32/user.c
------------------------------------------------------------------------------
    svn:keywords = author date id revision

Modified: trunk/reactos/dll/win32/netapi32/wksta.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c…
==============================================================================
--- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Sat Dec 22 20:11:43 2012
@@ -592,25 +592,3 @@
     return NERR_Success;
 }
 
-/************************************************************
- *                NetUserGetGroups (NETAPI32.@)
- */
-NET_API_STATUS NET_API_FUNCTION NetUserGetGroups(
-        LPCWSTR servername,
-        LPCWSTR username,
-        DWORD level,
-        LPBYTE *bufptr,
-        DWORD prefixmaxlen,
-        LPDWORD entriesread,
-        LPDWORD totalentries)
-{
-    FIXME("%s %s %d %p %d %p %p stub\n", debugstr_w(servername),
-          debugstr_w(username), level, bufptr, prefixmaxlen, entriesread,
-          totalentries);
-
-    *bufptr = NULL;
-    *entriesread = 0;
-    *totalentries = 0;
-
-    return ERROR_INVALID_LEVEL;
-}

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Dec 22 20:11:43 2012
@@ -124,7 +124,7 @@
 reactos/dll/win32/msxml4          # Synced to Wine-1.5.19
 reactos/dll/win32/msxml6          # Synced to Wine-1.5.19
 reactos/dll/win32/nddeapi         # Synced to Wine-1.5.19
-reactos/dll/win32/netapi32        # Autosync
+reactos/dll/win32/netapi32        # Forked at Wine-1.3.34
 reactos/dll/win32/ntdsapi         # Synced to Wine-1.5.19
 reactos/dll/win32/ntprint         # Synced to Wine-1.5.4
 reactos/dll/win32/objsel          # Synced to Wine-1.5.19