[NETAPI32]
[reactos.git] / reactos / dll / win32 / netapi32 / user.c
index 19ee18c..46c2bab 100644 (file)
 /*
  *  TODO:
  *    Implement NetUserChangePassword
- *    Implement NetUserDel
  *    Implement NetUserGetGroups
  *    Implement NetUserSetGroups
- *    Implement NetUserSetInfo
  *    NetUserGetLocalGroups does not support LG_INCLUDE_INDIRECT yet.
  *    Add missing information levels.
  *    ...
@@ -50,122 +48,76 @@ typedef struct _ENUM_CONTEXT
 } ENUM_CONTEXT, *PENUM_CONTEXT;
 
 
-/* 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
+static
+ULONG
+GetAccountFlags(ULONG AccountControl)
 {
-    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;
-};
+    ULONG Flags = UF_SCRIPT;
 
-static struct list user_list = LIST_INIT( user_list );
+    if (AccountControl & USER_ACCOUNT_DISABLED)
+        Flags |= UF_ACCOUNTDISABLE;
 
-BOOL NETAPI_IsLocalComputer(LPCWSTR ServerName);
+    if (AccountControl & USER_HOME_DIRECTORY_REQUIRED)
+        Flags |= UF_HOMEDIR_REQUIRED;
 
-/************************************************************
- *                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;
-}
+    if (AccountControl & USER_PASSWORD_NOT_REQUIRED)
+        Flags |= UF_PASSWD_NOTREQD;
 
-/************************************************************
- *                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;
+//    UF_PASSWD_CANT_CHANGE
 
-    LIST_FOR_EACH_ENTRY(user, &user_list, struct sam_user, entry)
-    {
-        if(lstrcmpW(user->user_name, UserName) == 0)
-            return user;
-    }
-    return NULL;
-}
+    if (AccountControl & USER_ACCOUNT_AUTO_LOCKED)
+        Flags |= UF_LOCKOUT;
 
+    if (AccountControl & USER_DONT_EXPIRE_PASSWORD)
+        Flags |= UF_DONT_EXPIRE_PASSWD;
 
-static PSID
-CreateSidFromSidAndRid(PSID SrcSid,
-                       ULONG RelativeId)
-{
-    UCHAR RidCount;
-    PSID DstSid;
-    ULONG i;
-    ULONG DstSidSize;
-    PULONG p, q;
+/*
+    if (AccountControl & USER_ENCRYPTED_TEXT_PASSWORD_ALLOWED)
+        Flags |= UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED;
 
-    RidCount = *RtlSubAuthorityCountSid(SrcSid);
-    if (RidCount >= 8)
-        return NULL;
+    if (AccountControl & USER_SMARTCARD_REQUIRED)
+        Flags |= UF_SMARTCARD_REQUIRED;
 
-    DstSidSize = RtlLengthRequiredSid(RidCount + 1);
+    if (AccountControl & USER_TRUSTED_FOR_DELEGATION)
+        Flags |= UF_TRUSTED_FOR_DELEGATION;
 
-    DstSid = RtlAllocateHeap(RtlGetProcessHeap(),
-                             0,
-                             DstSidSize);
-    if (DstSid == NULL)
-        return NULL;
+    if (AccountControl & USER_NOT_DELEGATED)
+        Flags |= UF_NOT_DELEGATED;
 
-    RtlInitializeSid(DstSid,
-                     RtlIdentifierAuthoritySid(SrcSid),
-                     RidCount + 1);
+    if (AccountControl & USER_USE_DES_KEY_ONLY)
+        Flags |= UF_USE_DES_KEY_ONLY;
 
-    for (i = 0; i < (ULONG)RidCount; i++)
-    {
-        p = RtlSubAuthoritySid(SrcSid, i);
-        q = RtlSubAuthoritySid(DstSid, i);
-        *q = *p;
-    }
+    if (AccountControl & USER_DONT_REQUIRE_PREAUTH)
+        Flags |= UF_DONT_REQUIRE_PREAUTH;
+
+    if (AccountControl & USER_PASSWORD_EXPIRED)
+        Flags |= UF_PASSWORD_EXPIRED;
+*/
 
-    q = RtlSubAuthoritySid(DstSid, (ULONG)RidCount);
-    *q = RelativeId;
+    /* Set account type flags */
+    if (AccountControl & USER_TEMP_DUPLICATE_ACCOUNT)
+        Flags |= UF_TEMP_DUPLICATE_ACCOUNT;
+    else if (AccountControl & USER_NORMAL_ACCOUNT)
+        Flags |= UF_NORMAL_ACCOUNT;
+    else if (AccountControl & USER_INTERDOMAIN_TRUST_ACCOUNT)
+        Flags |= UF_INTERDOMAIN_TRUST_ACCOUNT;
+    else if (AccountControl & USER_WORKSTATION_TRUST_ACCOUNT)
+        Flags |= UF_WORKSTATION_TRUST_ACCOUNT;
+    else if (AccountControl & USER_SERVER_TRUST_ACCOUNT)
+        Flags |= UF_SERVER_TRUST_ACCOUNT;
 
-    return DstSid;
+    return Flags;
 }
 
 
 static
 NET_API_STATUS
-BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
+BuildUserInfoBuffer(PUSER_ALL_INFORMATION UserInfo,
                     DWORD level,
                     ULONG RelativeId,
                     LPVOID *Buffer)
 {
+    UNICODE_STRING LogonServer = RTL_CONSTANT_STRING(L"\\\\*");
     LPVOID LocalBuffer = NULL;
     PUSER_INFO_0 UserInfo0;
     PUSER_INFO_1 UserInfo1;
@@ -173,6 +125,7 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
     PUSER_INFO_3 UserInfo3;
     PUSER_INFO_10 UserInfo10;
     PUSER_INFO_20 UserInfo20;
+    PUSER_INFO_23 UserInfo23;
     LPWSTR Ptr;
     ULONG Size = 0;
     NET_API_STATUS ApiStatus = NERR_Success;
@@ -216,14 +169,20 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
             if (UserInfo->FullName.Length > 0)
                 Size += UserInfo->FullName.Length + sizeof(WCHAR);
 
-            /* FIXME: usri2_usr_comment */
-            /* FIXME: usri2_parms */
+            if (UserInfo->UserComment.Length > 0)
+                Size += UserInfo->UserComment.Length + sizeof(WCHAR);
+
+            if (UserInfo->Parameters.Length > 0)
+                Size += UserInfo->Parameters.Length + sizeof(WCHAR);
 
             if (UserInfo->WorkStations.Length > 0)
                 Size += UserInfo->WorkStations.Length + sizeof(WCHAR);
 
-            /* FIXME: usri2_logon_hours */
-            /* FIXME: usri2_logon_server */
+            if (UserInfo->LogonHours.UnitsPerWeek > 0)
+                Size += (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8;
+
+            if (LogonServer.Length > 0)
+                Size += LogonServer.Length + sizeof(WCHAR);
             break;
 
         case 3:
@@ -242,14 +201,20 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
             if (UserInfo->FullName.Length > 0)
                 Size += UserInfo->FullName.Length + sizeof(WCHAR);
 
-            /* FIXME: usri3_usr_comment */
-            /* FIXME: usri3_parms */
+            if (UserInfo->UserComment.Length > 0)
+                Size += UserInfo->UserComment.Length + sizeof(WCHAR);
+
+            if (UserInfo->Parameters.Length > 0)
+                Size += UserInfo->Parameters.Length + sizeof(WCHAR);
 
             if (UserInfo->WorkStations.Length > 0)
                 Size += UserInfo->WorkStations.Length + sizeof(WCHAR);
 
-            /* FIXME: usri3_logon_hours */
-            /* FIXME: usri3_logon_server */
+            if (UserInfo->LogonHours.UnitsPerWeek > 0)
+                Size += (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8;
+
+            if (LogonServer.Length > 0)
+                Size += LogonServer.Length + sizeof(WCHAR);
 
             if (UserInfo->ProfilePath.Length > 0)
                 Size += UserInfo->ProfilePath.Length + sizeof(WCHAR);
@@ -267,7 +232,8 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
             if (UserInfo->AdminComment.Length > 0)
                 Size += UserInfo->AdminComment.Length + sizeof(WCHAR);
 
-            /* FIXME: usri10_usr_comment */
+            if (UserInfo->UserComment.Length > 0)
+                Size += UserInfo->UserComment.Length + sizeof(WCHAR);
 
             if (UserInfo->FullName.Length > 0)
                 Size += UserInfo->FullName.Length + sizeof(WCHAR);
@@ -286,7 +252,18 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
                 Size += UserInfo->AdminComment.Length + sizeof(WCHAR);
             break;
 
-//        case 23:
+        case 23:
+            Size = sizeof(USER_INFO_23) +
+                   UserInfo->UserName.Length + sizeof(WCHAR);
+
+            if (UserInfo->FullName.Length > 0)
+                Size += UserInfo->FullName.Length + sizeof(WCHAR);
+
+            if (UserInfo->AdminComment.Length > 0)
+                Size += UserInfo->AdminComment.Length + sizeof(WCHAR);
+
+            /* FIXME: usri23_user_sid */
+            break;
 
         default:
             ApiStatus = ERROR_INVALID_LEVEL;
@@ -356,7 +333,7 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
                 Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR));
             }
 
-//            UserInfo1->usri1_flags = UserInfo->UserAccountControl;
+            UserInfo1->usri1_flags = GetAccountFlags(UserInfo->UserAccountControl);
 
             if (UserInfo->ScriptPath.Length > 0)
             {
@@ -383,7 +360,6 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
 
             Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR));
 
-            /* FIXME: usri2_password */
             /* FIXME: usri2_password_age */
             /* FIXME: usri2_priv */
 
@@ -411,7 +387,7 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
                 Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR));
             }
 
-            /* FIXME: usri2_flags */
+            UserInfo2->usri2_flags = GetAccountFlags(UserInfo->UserAccountControl);
 
             if (UserInfo->ScriptPath.Length > 0)
             {
@@ -439,8 +415,29 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
                 Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
             }
 
-            /* FIXME: usri2_usr_comment */
-            /* FIXME: usri2_parms */
+            if (UserInfo->UserComment.Length > 0)
+            {
+                UserInfo2->usri2_usr_comment = Ptr;
+
+                memcpy(UserInfo2->usri2_usr_comment,
+                       UserInfo->UserComment.Buffer,
+                       UserInfo->UserComment.Length);
+                UserInfo2->usri2_usr_comment[UserInfo->UserComment.Length / sizeof(WCHAR)] = UNICODE_NULL;
+
+                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserComment.Length + sizeof(WCHAR));
+            }
+
+            if (UserInfo->Parameters.Length > 0)
+            {
+                UserInfo2->usri2_parms = Ptr;
+
+                memcpy(UserInfo2->usri2_parms,
+                       UserInfo->Parameters.Buffer,
+                       UserInfo->Parameters.Length);
+                UserInfo2->usri2_parms[UserInfo->Parameters.Length / sizeof(WCHAR)] = UNICODE_NULL;
+
+                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->Parameters.Length + sizeof(WCHAR));
+            }
 
             if (UserInfo->WorkStations.Length > 0)
             {
@@ -454,18 +451,46 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
                 Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->WorkStations.Length + sizeof(WCHAR));
             }
 
-            /* FIXME: usri2_last_logon */
-            /* FIXME: usri2_last_logoff */
-            /* FIXME: usri2_acct_expires */
-            /* FIXME: usri2_max_storage */
-            /* FIXME: usri2_units_per_week */
-            /* FIXME: usri2_logon_hours */
-            /* FIXME: usri2_bad_pw_count */
-            /* FIXME: usri2_num_logons */
-            /* FIXME: usri2_logon_server */
-            /* FIXME: usri2_country_code */
-            /* FIXME: usri2_code_page */
+            RtlTimeToSecondsSince1970(&UserInfo->LastLogon,
+                                      &UserInfo2->usri2_last_logon);
+
+            RtlTimeToSecondsSince1970(&UserInfo->LastLogoff,
+                                      &UserInfo2->usri2_last_logoff);
+
+            RtlTimeToSecondsSince1970(&UserInfo->AccountExpires,
+                                      &UserInfo2->usri2_acct_expires);
+
+            UserInfo2->usri2_max_storage = USER_MAXSTORAGE_UNLIMITED;
+            UserInfo2->usri2_units_per_week = UserInfo->LogonHours.UnitsPerWeek;
+
+            if (UserInfo->LogonHours.UnitsPerWeek > 0)
+            {
+                UserInfo2->usri2_logon_hours = (PVOID)Ptr;
+
+                memcpy(UserInfo2->usri2_logon_hours,
+                       UserInfo->LogonHours.LogonHours,
+                       (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8);
 
+                Ptr = (LPWSTR)((ULONG_PTR)Ptr + (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8);
+            }
+
+            UserInfo2->usri2_bad_pw_count = UserInfo->BadPasswordCount;
+            UserInfo2->usri2_num_logons = UserInfo->LogonCount;
+
+            if (LogonServer.Length > 0)
+            {
+                UserInfo2->usri2_logon_server = Ptr;
+
+                memcpy(UserInfo2->usri2_logon_server,
+                       LogonServer.Buffer,
+                       LogonServer.Length);
+                UserInfo2->usri2_logon_server[LogonServer.Length / sizeof(WCHAR)] = UNICODE_NULL;
+
+                Ptr = (LPWSTR)((ULONG_PTR)Ptr + LogonServer.Length + sizeof(WCHAR));
+            }
+
+            UserInfo2->usri2_country_code = UserInfo->CountryCode;
+            UserInfo2->usri2_code_page = UserInfo->CodePage;
             break;
 
         case 3:
@@ -482,7 +507,6 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
 
             Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR));
 
-            /* FIXME: usri3_password */
             /* FIXME: usri3_password_age */
             /* FIXME: usri3_priv */
 
@@ -510,7 +534,7 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
                 Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR));
             }
 
-            /* FIXME: usri3_flags */
+            UserInfo3->usri3_flags = GetAccountFlags(UserInfo->UserAccountControl);
 
             if (UserInfo->ScriptPath.Length > 0)
             {
@@ -538,8 +562,29 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
                 Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
             }
 
-            /* FIXME: usri3_usr_comment */
-            /* FIXME: usri3_parms */
+            if (UserInfo->UserComment.Length > 0)
+            {
+                UserInfo3->usri3_usr_comment = Ptr;
+
+                memcpy(UserInfo3->usri3_usr_comment,
+                       UserInfo->UserComment.Buffer,
+                       UserInfo->UserComment.Length);
+                UserInfo3->usri3_usr_comment[UserInfo->UserComment.Length / sizeof(WCHAR)] = UNICODE_NULL;
+
+                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserComment.Length + sizeof(WCHAR));
+            }
+
+            if (UserInfo->Parameters.Length > 0)
+            {
+                UserInfo3->usri3_parms = Ptr;
+
+                memcpy(UserInfo3->usri3_parms,
+                       UserInfo->Parameters.Buffer,
+                       UserInfo->Parameters.Length);
+                UserInfo3->usri3_parms[UserInfo->Parameters.Length / sizeof(WCHAR)] = UNICODE_NULL;
+
+                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->Parameters.Length + sizeof(WCHAR));
+            }
 
             if (UserInfo->WorkStations.Length > 0)
             {
@@ -553,18 +598,46 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
                 Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->WorkStations.Length + sizeof(WCHAR));
             }
 
-            /* FIXME: usri3_last_logon */
-            /* FIXME: usri3_last_logoff */
-            /* FIXME: usri3_acct_expires */
-            /* FIXME: usri3_max_storage */
-            /* FIXME: usri3_units_per_week */
-            /* FIXME: usri3_logon_hours */
-            /* FIXME: usri3_bad_pw_count */
-            /* FIXME: usri3_num_logons */
-            /* FIXME: usri3_logon_server */
-            /* FIXME: usri3_country_code */
-            /* FIXME: usri3_code_page */
+            RtlTimeToSecondsSince1970(&UserInfo->LastLogon,
+                                      &UserInfo3->usri3_last_logon);
+
+            RtlTimeToSecondsSince1970(&UserInfo->LastLogoff,
+                                      &UserInfo3->usri3_last_logoff);
+
+            RtlTimeToSecondsSince1970(&UserInfo->AccountExpires,
+                                      &UserInfo3->usri3_acct_expires);
+
+            UserInfo3->usri3_max_storage = USER_MAXSTORAGE_UNLIMITED;
+            UserInfo3->usri3_units_per_week = UserInfo->LogonHours.UnitsPerWeek;
+
+            if (UserInfo->LogonHours.UnitsPerWeek > 0)
+            {
+                UserInfo3->usri3_logon_hours = (PVOID)Ptr;
+
+                memcpy(UserInfo3->usri3_logon_hours,
+                       UserInfo->LogonHours.LogonHours,
+                       (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8);
+
+                Ptr = (LPWSTR)((ULONG_PTR)Ptr + (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8);
+            }
+
+            UserInfo3->usri3_bad_pw_count = UserInfo->BadPasswordCount;
+            UserInfo3->usri3_num_logons = UserInfo->LogonCount;
 
+            if (LogonServer.Length > 0)
+            {
+                UserInfo3->usri3_logon_server = Ptr;
+
+                memcpy(UserInfo3->usri3_logon_server,
+                       LogonServer.Buffer,
+                       LogonServer.Length);
+                UserInfo3->usri3_logon_server[LogonServer.Length / sizeof(WCHAR)] = UNICODE_NULL;
+
+                Ptr = (LPWSTR)((ULONG_PTR)Ptr + LogonServer.Length + sizeof(WCHAR));
+            }
+
+            UserInfo3->usri3_country_code = UserInfo->CountryCode;
+            UserInfo3->usri3_code_page = UserInfo->CodePage;
             UserInfo3->usri3_user_id = RelativeId;
             UserInfo3->usri3_primary_group_id = UserInfo->PrimaryGroupId;
 
@@ -592,7 +665,7 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
                 Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->HomeDirectoryDrive.Length + sizeof(WCHAR));
             }
 
-            /* FIXME: usri3_password_expired */
+            UserInfo3->usri3_password_expired = (UserInfo->UserAccountControl & USER_PASSWORD_EXPIRED);
             break;
 
 //        case 4:
@@ -623,7 +696,17 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
                 Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR));
             }
 
-            /* FIXME: usri10_usr_comment */
+            if (UserInfo->UserComment.Length > 0)
+            {
+                UserInfo10->usri10_usr_comment = Ptr;
+
+                memcpy(UserInfo10->usri10_usr_comment,
+                       UserInfo->UserComment.Buffer,
+                       UserInfo->UserComment.Length);
+                UserInfo10->usri10_usr_comment[UserInfo->UserComment.Length / sizeof(WCHAR)] = UNICODE_NULL;
+
+                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserComment.Length + sizeof(WCHAR));
+            }
 
             if (UserInfo->FullName.Length > 0)
             {
@@ -678,11 +761,53 @@ BuildUserInfoBuffer(PUSER_ACCOUNT_INFORMATION UserInfo,
                 Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR));
             }
 
-//            UserInfo20->usri20_flags = UserInfo->UserAccountControl;
+            UserInfo20->usri20_flags = GetAccountFlags(UserInfo->UserAccountControl);
+
             UserInfo20->usri20_user_id = RelativeId;
             break;
 
-//        case 23:
+        case 23:
+            UserInfo23 = (PUSER_INFO_23)LocalBuffer;
+
+            Ptr = (LPWSTR)((ULONG_PTR)UserInfo23 + sizeof(USER_INFO_23));
+
+            UserInfo23->usri23_name = Ptr;
+
+            memcpy(UserInfo23->usri23_name,
+                   UserInfo->UserName.Buffer,
+                   UserInfo->UserName.Length);
+            UserInfo23->usri23_name[UserInfo->UserName.Length / sizeof(WCHAR)] = UNICODE_NULL;
+
+            Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR));
+
+            if (UserInfo->FullName.Length > 0)
+            {
+                UserInfo23->usri23_full_name = Ptr;
+
+                memcpy(UserInfo23->usri23_full_name,
+                       UserInfo->FullName.Buffer,
+                       UserInfo->FullName.Length);
+                UserInfo23->usri23_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
+
+                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
+            }
+
+            if (UserInfo->AdminComment.Length > 0)
+            {
+                UserInfo23->usri23_comment = Ptr;
+
+                memcpy(UserInfo23->usri23_comment,
+                       UserInfo->AdminComment.Buffer,
+                       UserInfo->AdminComment.Length);
+                UserInfo23->usri23_comment[UserInfo->AdminComment.Length / sizeof(WCHAR)] = UNICODE_NULL;
+
+                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR));
+            }
+
+            UserInfo23->usri23_flags = GetAccountFlags(UserInfo->UserAccountControl);
+
+            /* FIXME: usri23_user_sid */
+           break;
     }
 
 done:
@@ -702,7 +827,7 @@ done:
 
 static
 VOID
-FreeUserInfo(PUSER_ACCOUNT_INFORMATION UserInfo)
+FreeUserInfo(PUSER_ALL_INFORMATION UserInfo)
 {
     if (UserInfo->UserName.Buffer != NULL)
         SamFreeMemory(UserInfo->UserName.Buffer);
@@ -728,6 +853,15 @@ FreeUserInfo(PUSER_ACCOUNT_INFORMATION UserInfo)
     if (UserInfo->WorkStations.Buffer != NULL)
         SamFreeMemory(UserInfo->WorkStations.Buffer);
 
+    if (UserInfo->UserComment.Buffer != NULL)
+        SamFreeMemory(UserInfo->UserComment.Buffer);
+
+    if (UserInfo->Parameters.Buffer != NULL)
+        SamFreeMemory(UserInfo->Parameters.Buffer);
+
+    if (UserInfo->PrivateData.Buffer != NULL)
+        SamFreeMemory(UserInfo->PrivateData.Buffer);
+
     if (UserInfo->LogonHours.LogonHours != NULL)
         SamFreeMemory(UserInfo->LogonHours.LogonHours);
 
@@ -742,8 +876,20 @@ SetUserInfo(SAM_HANDLE UserHandle,
             DWORD Level)
 {
     USER_ALL_INFORMATION UserAllInfo;
+    PUSER_INFO_0 UserInfo0;
     PUSER_INFO_1 UserInfo1;
+    PUSER_INFO_2 UserInfo2;
     PUSER_INFO_3 UserInfo3;
+    PUSER_INFO_1003 UserInfo1003;
+    PUSER_INFO_1006 UserInfo1006;
+    PUSER_INFO_1007 UserInfo1007;
+    PUSER_INFO_1009 UserInfo1009;
+    PUSER_INFO_1011 UserInfo1011;
+    PUSER_INFO_1012 UserInfo1012;
+    PUSER_INFO_1013 UserInfo1013;
+    PUSER_INFO_1014 UserInfo1014;
+    PUSER_INFO_1052 UserInfo1052;
+    PUSER_INFO_1053 UserInfo1053;
     NET_API_STATUS ApiStatus = NERR_Success;
     NTSTATUS Status = STATUS_SUCCESS;
 
@@ -751,93 +897,374 @@ SetUserInfo(SAM_HANDLE UserHandle,
 
     switch (Level)
     {
+        case 0:
+            UserInfo0 = (PUSER_INFO_0)UserInfo;
+
+            RtlInitUnicodeString(&UserAllInfo.UserName,
+                                 UserInfo0->usri0_name);
+
+            UserAllInfo.WhichFields |= USER_ALL_USERNAME;
+            break;
+
         case 1:
             UserInfo1 = (PUSER_INFO_1)UserInfo;
-//            RtlInitUnicodeString(&UserAllInfo.UserName,
-//                                 UserInfo1->usri1_name);
 
-            RtlInitUnicodeString(&UserAllInfo.AdminComment,
-                                 UserInfo1->usri1_comment);
+            // usri1_name ignored
 
-            RtlInitUnicodeString(&UserAllInfo.HomeDirectory,
-                                 UserInfo1->usri1_home_dir);
+            if (UserInfo1->usri1_password != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.NtPassword,
+                                     UserInfo1->usri1_password);
+                UserAllInfo.NtPasswordPresent = TRUE;
+                UserAllInfo.WhichFields |= USER_ALL_NTPASSWORDPRESENT;
+            }
+
+            // usri1_password_age ignored
 
-            RtlInitUnicodeString(&UserAllInfo.ScriptPath,
-                                 UserInfo1->usri1_script_path);
+//          UserInfo1->usri1_priv
 
-            RtlInitUnicodeString(&UserAllInfo.NtPassword,
-                                 UserInfo1->usri1_password);
-            UserAllInfo.NtPasswordPresent = TRUE;
+            if (UserInfo1->usri1_home_dir != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.HomeDirectory,
+                                     UserInfo1->usri1_home_dir);
+                UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY;
+            }
+
+            if (UserInfo1->usri1_comment != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.AdminComment,
+                                     UserInfo1->usri1_comment);
+                UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT;
+            }
 
 //          UserInfo1->usri1_flags
-//          UserInfo1->usri1_priv
+//            UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL;
 
-            UserAllInfo.WhichFields = 
-                USER_ALL_ADMINCOMMENT |
-                USER_ALL_HOMEDIRECTORY |
-                USER_ALL_SCRIPTPATH |
-                USER_ALL_NTPASSWORDPRESENT
-//                USER_ALL_USERACCOUNTCONTROL
-                ;
+            if (UserInfo1->usri1_script_path != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.ScriptPath,
+                                     UserInfo1->usri1_script_path);
+                UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH;
+            }
             break;
 
+        case 2:
+            UserInfo2 = (PUSER_INFO_2)UserInfo;
+
+            // usri2_name ignored
+
+            if (UserInfo2->usri2_password != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.NtPassword,
+                                     UserInfo2->usri2_password);
+                UserAllInfo.NtPasswordPresent = TRUE;
+                UserAllInfo.WhichFields |= USER_ALL_NTPASSWORDPRESENT;
+            }
+
+            // usri2_password_age ignored
+
+//          UserInfo2->usri2_priv;
+
+            if (UserInfo2->usri2_home_dir != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.HomeDirectory,
+                                     UserInfo2->usri2_home_dir);
+                UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY;
+            }
+
+            if (UserInfo2->usri2_comment != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.AdminComment,
+                                     UserInfo2->usri2_comment);
+                UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT;
+            }
+
+//          UserInfo2->usri2_flags;
+
+            if (UserInfo2->usri2_script_path != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.ScriptPath,
+                                     UserInfo2->usri2_script_path);
+                UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH;
+            }
+
+//          UserInfo2->usri2_auth_flags;
+
+            if (UserInfo2->usri2_full_name != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.FullName,
+                                     UserInfo2->usri2_full_name);
+                UserAllInfo.WhichFields |= USER_ALL_FULLNAME;
+            }
+
+            if (UserInfo2->usri2_usr_comment != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.UserComment,
+                                     UserInfo2->usri2_usr_comment);
+                UserAllInfo.WhichFields |= USER_ALL_USERCOMMENT;
+            }
+
+            if (UserInfo2->usri2_parms != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.Parameters,
+                                     UserInfo2->usri2_parms);
+                UserAllInfo.WhichFields |= USER_ALL_PARAMETERS;
+            }
+
+            if (UserInfo2->usri2_workstations != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.WorkStations,
+                                     UserInfo2->usri2_workstations);
+                UserAllInfo.WhichFields |= USER_ALL_WORKSTATIONS;
+            }
+
+            // usri2_last_logon ignored
+            // usri2_last_logoff ignored
+
+//          UserInfo2->usri2_acct_expires;
+//          UserInfo2->usri2_max_storage;
+//          UserInfo2->usri2_units_per_week;
+//          UserInfo2->usri2_logon_hours;
+
+            // usri2_bad_pw_count ignored
+            // usri2_num_logons ignored
+            // usri2_logon_server ignored
+
+//          UserInfo2->usri2_country_code;
+//          UserInfo2->usri2_code_page;
+            break;
 
         case 3:
             UserInfo3 = (PUSER_INFO_3)UserInfo;
 
-//  LPWSTR usri3_name;
-
-            RtlInitUnicodeString(&UserAllInfo.NtPassword,
-                                 UserInfo3->usri3_password);
-            UserAllInfo.NtPasswordPresent = TRUE;
-
-//  DWORD  usri3_password_age; // ignored
-//  DWORD  usri3_priv;
-
-            RtlInitUnicodeString(&UserAllInfo.HomeDirectory,
-                                 UserInfo3->usri3_home_dir);
-
-            RtlInitUnicodeString(&UserAllInfo.AdminComment,
-                                 UserInfo3->usri3_comment);
-
-//  DWORD  usri3_flags;
-
-            RtlInitUnicodeString(&UserAllInfo.ScriptPath,
-                                 UserInfo3->usri3_script_path);
-
-//  DWORD  usri3_auth_flags;
-
-            RtlInitUnicodeString(&UserAllInfo.FullName,
-                                 UserInfo3->usri3_full_name);
-
-//  LPWSTR usri3_usr_comment;
-//  LPWSTR usri3_parms;
-//  LPWSTR usri3_workstations;
-//  DWORD  usri3_last_logon;
-//  DWORD  usri3_last_logoff;
-//  DWORD  usri3_acct_expires;
-//  DWORD  usri3_max_storage;
-//  DWORD  usri3_units_per_week;
-//  PBYTE  usri3_logon_hours;
-//  DWORD  usri3_bad_pw_count;
-//  DWORD  usri3_num_logons;
-//  LPWSTR usri3_logon_server;
-//  DWORD  usri3_country_code;
-//  DWORD  usri3_code_page;
-//  DWORD  usri3_user_id;  // ignored
-//  DWORD  usri3_primary_group_id;
-//  LPWSTR usri3_profile;
-//  LPWSTR usri3_home_dir_drive;
-//  DWORD  usri3_password_expired;
-
-            UserAllInfo.WhichFields = 
-                USER_ALL_NTPASSWORDPRESENT |
-                USER_ALL_HOMEDIRECTORY |
-                USER_ALL_ADMINCOMMENT |
-                USER_ALL_SCRIPTPATH |
-                USER_ALL_FULLNAME
-//                USER_ALL_USERACCOUNTCONTROL
-                ;
+            // usri3_name ignored
+
+            if (UserInfo3->usri3_password != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.NtPassword,
+                                     UserInfo3->usri3_password);
+                UserAllInfo.NtPasswordPresent = TRUE;
+                UserAllInfo.WhichFields |= USER_ALL_NTPASSWORDPRESENT;
+            }
+
+            // usri3_password_age ignored
+
+//          UserInfo3->usri3_priv;
+
+            if (UserInfo3->usri3_home_dir != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.HomeDirectory,
+                                     UserInfo3->usri3_home_dir);
+                UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY;
+            }
+
+            if (UserInfo3->usri3_comment != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.AdminComment,
+                                     UserInfo3->usri3_comment);
+                UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT;
+            }
+
+//          UserInfo3->usri3_flags;
+//              UserAllInfo.WhichFields |= USER_ALL_USERACCOUNTCONTROL;
+
+            if (UserInfo3->usri3_script_path != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.ScriptPath,
+                                     UserInfo3->usri3_script_path);
+                UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH;
+            }
+
+//          UserInfo3->usri3_auth_flags;
+
+            if (UserInfo3->usri3_full_name != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.FullName,
+                                     UserInfo3->usri3_full_name);
+                UserAllInfo.WhichFields |= USER_ALL_FULLNAME;
+            }
+
+            if (UserInfo3->usri3_usr_comment != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.UserComment,
+                                     UserInfo3->usri3_usr_comment);
+                UserAllInfo.WhichFields |= USER_ALL_USERCOMMENT;
+            }
+
+            if (UserInfo3->usri3_parms != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.Parameters,
+                                     UserInfo3->usri3_parms);
+                UserAllInfo.WhichFields |= USER_ALL_PARAMETERS;
+            }
+
+            if (UserInfo3->usri3_workstations != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.WorkStations,
+                                     UserInfo3->usri3_workstations);
+                UserAllInfo.WhichFields |= USER_ALL_WORKSTATIONS;
+            }
+
+            // usri3_last_logon ignored
+            // usri3_last_logoff ignored
+
+//          UserInfo3->usri3_acct_expires;
+//          UserInfo3->usri3_max_storage;
+//          UserInfo3->usri3_units_per_week;
+//          UserInfo3->usri3_logon_hours;
+
+            // usri3_bad_pw_count ignored
+            // usri3_num_logons ignored
+            // usri3_logon_server ignored
+
+//          UserInfo3->usri3_country_code;
+//          UserInfo3->usri3_code_page;
+
+            // usri3_user_id ignored
+
+//          UserInfo3->usri3_primary_group_id;
+
+            if (UserInfo3->usri3_profile != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.ProfilePath,
+                                     UserInfo3->usri3_profile);
+                UserAllInfo.WhichFields |= USER_ALL_PROFILEPATH;
+            }
+
+            if (UserInfo3->usri3_home_dir_drive != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.HomeDirectoryDrive,
+                                     UserInfo3->usri3_home_dir_drive);
+                UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORYDRIVE;
+            }
+
+//          UserInfo3->usri3_password_expired;
+            break;
+
+//        case 4:
+//        case 21:
+//        case 22:
+
+        case 1003:
+            UserInfo1003 = (PUSER_INFO_1003)UserInfo;
+
+            if (UserInfo1003->usri1003_password != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.NtPassword,
+                                     UserInfo1003->usri1003_password);
+                UserAllInfo.NtPasswordPresent = TRUE;
+                UserAllInfo.WhichFields |= USER_ALL_NTPASSWORDPRESENT;
+            }
+            break;
+
+//        case 1005:
+
+        case 1006:
+            UserInfo1006 = (PUSER_INFO_1006)UserInfo;
+
+            if (UserInfo1006->usri1006_home_dir != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.HomeDirectory,
+                                     UserInfo1006->usri1006_home_dir);
+                UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORY;
+            }
+            break;
+
+        case 1007:
+            UserInfo1007 = (PUSER_INFO_1007)UserInfo;
+
+            if (UserInfo1007->usri1007_comment != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.AdminComment,
+                                     UserInfo1007->usri1007_comment);
+                UserAllInfo.WhichFields |= USER_ALL_ADMINCOMMENT;
+            }
+            break;
+
+//        case 1008:
+
+        case 1009:
+            UserInfo1009 = (PUSER_INFO_1009)UserInfo;
+
+            if (UserInfo1009->usri1009_script_path != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.ScriptPath,
+                                     UserInfo1009->usri1009_script_path);
+                UserAllInfo.WhichFields |= USER_ALL_SCRIPTPATH;
+            }
+            break;
+
+//        case 1010:
+
+        case 1011:
+            UserInfo1011 = (PUSER_INFO_1011)UserInfo;
+
+            if (UserInfo1011->usri1011_full_name != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.FullName,
+                                     UserInfo1011->usri1011_full_name);
+                UserAllInfo.WhichFields |= USER_ALL_FULLNAME;
+            }
+            break;
+
+        case 1012:
+            UserInfo1012 = (PUSER_INFO_1012)UserInfo;
+
+            if (UserInfo1012->usri1012_usr_comment != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.UserComment,
+                                     UserInfo1012->usri1012_usr_comment);
+                UserAllInfo.WhichFields |= USER_ALL_USERCOMMENT;
+            }
+            break;
+
+        case 1013:
+            UserInfo1013 = (PUSER_INFO_1013)UserInfo;
+
+            if (UserInfo1013->usri1013_parms != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.Parameters,
+                                     UserInfo1013->usri1013_parms);
+                UserAllInfo.WhichFields |= USER_ALL_PARAMETERS;
+            }
+            break;
+
+        case 1014:
+            UserInfo1014 = (PUSER_INFO_1014)UserInfo;
+
+            if (UserInfo1014->usri1014_workstations != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.WorkStations,
+                                     UserInfo1014->usri1014_workstations);
+                UserAllInfo.WhichFields |= USER_ALL_WORKSTATIONS;
+            }
+            break;
+
+//        case 1017:
+//        case 1020:
+//        case 1024:
+//        case 1051:
+
+        case 1052:
+            UserInfo1052 = (PUSER_INFO_1052)UserInfo;
+
+            if (UserInfo1052->usri1052_profile != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.ProfilePath,
+                                     UserInfo1052->usri1052_profile);
+                UserAllInfo.WhichFields |= USER_ALL_PROFILEPATH;
+            }
+            break;
+
+        case 1053:
+            UserInfo1053 = (PUSER_INFO_1053)UserInfo;
+
+            if (UserInfo1053->usri1053_home_dir_drive != NULL)
+            {
+                RtlInitUnicodeString(&UserAllInfo.HomeDirectoryDrive,
+                                     UserInfo1053->usri1053_home_dir_drive);
+                UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORYDRIVE;
+            }
             break;
 
         default:
@@ -860,6 +1287,61 @@ done:
 }
 
 
+static
+NET_API_STATUS
+OpenUserByName(SAM_HANDLE DomainHandle,
+               PUNICODE_STRING UserName,
+               ULONG DesiredAccess,
+               PSAM_HANDLE UserHandle)
+{
+    PULONG RelativeIds = NULL;
+    PSID_NAME_USE Use = NULL;
+    NET_API_STATUS ApiStatus = NERR_Success;
+    NTSTATUS Status = STATUS_SUCCESS;
+
+    /* Get the RID for the given user name */
+    Status = SamLookupNamesInDomain(DomainHandle,
+                                    1,
+                                    UserName,
+                                    &RelativeIds,
+                                    &Use);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status);
+        return NetpNtStatusToApiStatus(Status);
+    }
+
+    /* Fail, if it is not an alias account */
+    if (Use[0] != SidTypeUser)
+    {
+        ERR("Object is not a user!\n");
+        ApiStatus = NERR_GroupNotFound;
+        goto done;
+    }
+
+    /* Open the alias account */
+    Status = SamOpenUser(DomainHandle,
+                         DesiredAccess,
+                         RelativeIds[0],
+                         UserHandle);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("SamOpenUser failed (Status %08lx)\n", Status);
+        ApiStatus = NetpNtStatusToApiStatus(Status);
+        goto done;
+    }
+
+done:
+    if (RelativeIds != NULL)
+        SamFreeMemory(RelativeIds);
+
+    if (Use != NULL)
+        SamFreeMemory(Use);
+
+    return ApiStatus;
+}
+
+
 /************************************************************
  * NetUserAdd (NETAPI32.@)
  */
@@ -883,8 +1365,17 @@ NetUserAdd(LPCWSTR servername,
     TRACE("(%s, %d, %p, %p)\n", debugstr_w(servername), level, bufptr, parm_err);
 
     /* Check the info level */
-    if (level < 1 || level > 4)
-        return ERROR_INVALID_LEVEL;
+    switch (level)
+    {
+        case 1:
+        case 2:
+        case 3:
+        case 4:
+            break;
+
+        default:
+            return ERROR_INVALID_LEVEL;
+    }
 
     if (servername != NULL)
         RtlInitUnicodeString(&ServerName, servername);
@@ -978,24 +1469,7 @@ NetUserChangePassword(LPCWSTR domainname,
                       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;
 }
 
@@ -1008,25 +1482,109 @@ WINAPI
 NetUserDel(LPCWSTR servername,
            LPCWSTR username)
 {
-    NET_API_STATUS status;
-    struct sam_user *user;
+    UNICODE_STRING ServerName;
+    UNICODE_STRING UserName;
+    SAM_HANDLE ServerHandle = NULL;
+    SAM_HANDLE DomainHandle = NULL;
+    SAM_HANDLE UserHandle = NULL;
+    NET_API_STATUS ApiStatus = NERR_Success;
+    NTSTATUS Status = STATUS_SUCCESS;
 
     TRACE("(%s, %s)\n", debugstr_w(servername), debugstr_w(username));
 
-    if((status = NETAPI_ValidateServername(servername))!= NERR_Success)
-        return status;
+    if (servername != NULL)
+        RtlInitUnicodeString(&ServerName, servername);
+
+    RtlInitUnicodeString(&UserName, username);
+
+    /* Connect to the SAM Server */
+    Status = SamConnect((servername != NULL) ? &ServerName : NULL,
+                        &ServerHandle,
+                        SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN,
+                        NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("SamConnect failed (Status %08lx)\n", Status);
+        ApiStatus = NetpNtStatusToApiStatus(Status);
+        goto done;
+    }
+
+    /* Open the Builtin Domain */
+    Status = OpenBuiltinDomain(ServerHandle,
+                               DOMAIN_LOOKUP,
+                               &DomainHandle);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status);
+        ApiStatus = NetpNtStatusToApiStatus(Status);
+        goto done;
+    }
+
+    /* Open the user account in the builtin domain */
+    ApiStatus = OpenUserByName(DomainHandle,
+                               &UserName,
+                               DELETE,
+                               &UserHandle);
+    if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED)
+    {
+        TRACE("OpenUserByName failed (ApiStatus %lu)\n", ApiStatus);
+        goto done;
+    }
 
-    if ((user = NETAPI_FindUser(username)) == NULL)
-        return NERR_UserNotFound;
+    if (UserHandle == NULL)
+    {
+        if (DomainHandle != NULL)
+        {
+            SamCloseHandle(DomainHandle);
+            DomainHandle = NULL;
+        }
+
+        /* Open the Acount Domain */
+        Status = OpenAccountDomain(ServerHandle,
+                                   (servername != NULL) ? &ServerName : NULL,
+                                   DOMAIN_LOOKUP,
+                                   &DomainHandle);
+        if (!NT_SUCCESS(Status))
+        {
+            ERR("OpenAccountDomain failed (Status %08lx)\n", Status);
+            ApiStatus = NetpNtStatusToApiStatus(Status);
+            goto done;
+        }
 
-    list_remove(&user->entry);
+        /* Open the user account in the account domain */
+        ApiStatus = OpenUserByName(DomainHandle,
+                                   &UserName,
+                                   DELETE,
+                                   &UserHandle);
+        if (ApiStatus != NERR_Success)
+        {
+            ERR("OpenUserByName failed (ApiStatus %lu)\n", ApiStatus);
+            if (ApiStatus == ERROR_NONE_MAPPED)
+                ApiStatus = NERR_GroupNotFound;
+            goto done;
+        }
+    }
 
-    HeapFree(GetProcessHeap(), 0, user->home_dir);
-    HeapFree(GetProcessHeap(), 0, user->user_comment);
-    HeapFree(GetProcessHeap(), 0, user->user_logon_script_path);
-    HeapFree(GetProcessHeap(), 0, user);
+    /* Delete the user */
+    Status = SamDeleteUser(UserHandle);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("SamDeleteUser failed (Status %08lx)\n", Status);
+        ApiStatus = NetpNtStatusToApiStatus(Status);
+        goto done;
+    }
 
-    return NERR_Success;
+done:
+    if (UserHandle != NULL)
+        SamCloseHandle(UserHandle);
+
+    if (DomainHandle != NULL)
+        SamCloseHandle(DomainHandle);
+
+    if (ServerHandle != NULL)
+        SamCloseHandle(ServerHandle);
+
+    return ApiStatus;
 }
 
 
@@ -1050,12 +1608,12 @@ NetUserEnum(LPCWSTR servername,
     LPVOID Buffer = NULL;
     ULONG i;
     SAM_HANDLE UserHandle = NULL;
-    PUSER_ACCOUNT_INFORMATION UserInfo = NULL;
+    PUSER_ALL_INFORMATION UserInfo = NULL;
 
     NET_API_STATUS ApiStatus = NERR_Success;
     NTSTATUS Status = STATUS_SUCCESS;
 
-    FIXME("(%s %d 0x%d %p %d %p %p %p) stub!\n", debugstr_w(servername), level,
+    TRACE("(%s %d 0x%d %p %d %p %p %p)\n", debugstr_w(servername), level,
           filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle);
 
     *entriesread = 0;
@@ -1175,7 +1733,7 @@ NetUserEnum(LPCWSTR servername,
         }
 
         Status = SamQueryInformationUser(UserHandle,
-                                         UserAccountInformation,
+                                         UserAllInformation,
                                          (PVOID *)&UserInfo);
         if (!NT_SUCCESS(Status))
         {
@@ -1302,7 +1860,7 @@ NetUserGetInfo(LPCWSTR servername,
     SAM_HANDLE UserHandle = NULL;
     PULONG RelativeIds = NULL;
     PSID_NAME_USE Use = NULL;
-    PUSER_ACCOUNT_INFORMATION UserInfo = NULL;
+    PUSER_ALL_INFORMATION UserInfo = NULL;
     LPVOID Buffer = NULL;
     NET_API_STATUS ApiStatus = NERR_Success;
     NTSTATUS Status = STATUS_SUCCESS;
@@ -1375,7 +1933,7 @@ NetUserGetInfo(LPCWSTR servername,
     }
 
     Status = SamQueryInformationUser(UserHandle,
-                                     UserAccountInformation,
+                                     UserAllInformation,
                                      (PVOID *)&UserInfo);
     if (!NT_SUCCESS(Status))
     {
@@ -1544,12 +2102,12 @@ NetUserGetLocalGroups(LPCWSTR servername,
     }
 
     /* Build the User SID from the Account Domain SID and the users RID */
-    UserSid = CreateSidFromSidAndRid(AccountDomainSid,
-                                     RelativeIds[0]);
-    if (UserSid == NULL)
+    ApiStatus = BuildSidFromSidAndRid(AccountDomainSid,
+                                      RelativeIds[0],
+                                      &UserSid);
+    if (ApiStatus != NERR_Success)
     {
-        ERR("CreateSidFromSidAndRid failed!\n");
-        ApiStatus = ERROR_NOT_ENOUGH_MEMORY;
+        ERR("BuildSidFromSidAndRid failed!\n");
         goto done;
     }
 
@@ -1697,7 +2255,7 @@ done:
         SamFreeMemory(Use);
 
     if (UserSid != NULL)
-        RtlFreeHeap(RtlGetProcessHeap(), 0, UserSid);
+        NetApiBufferFree(UserSid);
 
     if (AccountDomainSid != NULL)
         RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid);
@@ -1756,9 +2314,113 @@ NetUserSetInfo(LPCWSTR servername,
                LPBYTE buf,
                LPDWORD parm_err)
 {
-    FIXME("(%s %s %lu %p %p)\n",
+    UNICODE_STRING ServerName;
+    UNICODE_STRING UserName;
+    SAM_HANDLE ServerHandle = NULL;
+    SAM_HANDLE AccountDomainHandle = NULL;
+    SAM_HANDLE UserHandle = NULL;
+    NET_API_STATUS ApiStatus = NERR_Success;
+    NTSTATUS Status = STATUS_SUCCESS;
+
+    TRACE("(%s %s %lu %p %p)\n",
           debugstr_w(servername), debugstr_w(username), level, buf, parm_err);
-    return ERROR_ACCESS_DENIED;
+
+    if (parm_err != NULL)
+        *parm_err = PARM_ERROR_NONE;
+
+    /* Check the info level */
+    switch (level)
+    {
+        case 0:
+        case 1:
+        case 2:
+        case 3:
+//        case 4:
+//        case 21:
+//        case 22:
+        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 1020:
+//        case 1024:
+//        case 1051:
+        case 1052:
+        case 1053:
+            break;
+
+        default:
+            return ERROR_INVALID_LEVEL;
+    }
+
+    if (servername != NULL)
+        RtlInitUnicodeString(&ServerName, servername);
+
+    RtlInitUnicodeString(&UserName, username);
+
+    /* Connect to the SAM Server */
+    Status = SamConnect((servername != NULL) ? &ServerName : NULL,
+                        &ServerHandle,
+                        SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN,
+                        NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("SamConnect failed (Status %08lx)\n", Status);
+        ApiStatus = NetpNtStatusToApiStatus(Status);
+        goto done;
+    }
+
+    /* Open the Account Domain */
+    Status = OpenAccountDomain(ServerHandle,
+                               (servername != NULL) ? &ServerName : NULL,
+                               DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP,
+                               &AccountDomainHandle);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("OpenAccountDomain failed (Status %08lx)\n", Status);
+        ApiStatus = NetpNtStatusToApiStatus(Status);
+        goto done;
+    }
+
+    /* Open the User Account */
+    ApiStatus = OpenUserByName(AccountDomainHandle,
+                               &UserName,
+                               USER_ALL_ACCESS,
+                               &UserHandle);
+    if (ApiStatus != NERR_Success)
+    {
+        ERR("OpenUserByName failed (ApiStatus %lu)\n", ApiStatus);
+        goto done;
+    }
+
+    /* Set user information */
+    ApiStatus = SetUserInfo(UserHandle,
+                            buf,
+                            level);
+    if (ApiStatus != NERR_Success)
+    {
+        ERR("SetUserInfo failed (Status %lu)\n", ApiStatus);
+    }
+
+done:
+    if (UserHandle != NULL)
+        SamCloseHandle(UserHandle);
+
+    if (AccountDomainHandle != NULL)
+        SamCloseHandle(AccountDomainHandle);
+
+    if (ServerHandle != NULL)
+        SamCloseHandle(ServerHandle);
+
+    return ApiStatus;
 }
 
 /* EOF */