From: Thomas Faber <thomas.faber@reactos.org>
Date: Sun, 31 Aug 2014 19:29:53 +0000 (+0000)
Subject: [NETAPI32]
X-Git-Tag: backups/0.3.17@66124~693
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=f8d910f07dec3d8a30fb9e2e8d2871a25c75ff30

[NETAPI32]
- Make the code in BuildUserInfoBuffer slightly more uniform so it can be generated.
See https://reactos.org/wiki/User:ThFabba/netuser.py for the generation script
CORE-8343

svn path=/trunk/; revision=64014
---

diff --git a/reactos/dll/win32/netapi32/user.c b/reactos/dll/win32/netapi32/user.c
index 0abfc0d73ab..ac8d20fa33e 100644
--- a/reactos/dll/win32/netapi32/user.c
+++ b/reactos/dll/win32/netapi32/user.c
@@ -657,6 +657,7 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle,
             UserInfo0 = (PUSER_INFO_0)LocalBuffer;
 
             Ptr = (LPWSTR)((ULONG_PTR)UserInfo0 + sizeof(USER_INFO_0));
+
             UserInfo0->usri0_name = Ptr;
 
             memcpy(UserInfo0->usri0_name,
@@ -680,10 +681,9 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle,
             Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR));
 
             UserInfo1->usri1_password = NULL;
-
             UserInfo1->usri1_password_age = GetPasswordAge(&UserInfo->PasswordLastSet);
 
-            /* FIXME: UserInfo1->usri1_priv */
+            /* FIXME: usri1_priv */
 
             if (UserInfo->HomeDirectory.Length > 0)
             {
@@ -737,6 +737,7 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle,
 
             Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR));
 
+            UserInfo2->usri2_password = NULL;
             UserInfo2->usri2_password_age = GetPasswordAge(&UserInfo->PasswordLastSet);
 
             /* FIXME: usri2_priv */
@@ -886,6 +887,7 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle,
 
             Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->UserName.Length + sizeof(WCHAR));
 
+            UserInfo3->usri3_password = NULL;
             UserInfo3->usri3_password_age = GetPasswordAge(&UserInfo->PasswordLastSet);
 
             /* FIXME: usri3_priv */
@@ -1275,8 +1277,6 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle,
                        UserInfo->FullName.Buffer,
                        UserInfo->FullName.Length);
                 UserInfo10->usri10_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL;
-
-                Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->FullName.Length + sizeof(WCHAR));
             }
             break;
 
@@ -1497,7 +1497,7 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle,
                                                        Dacl);
 
             /* FIXME: usri23_user_sid */
-           break;
+            break;
     }
 
 done: