[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
This commit is contained in:
Thomas Faber 2014-08-31 19:29:53 +00:00
parent 53c6f278b7
commit f8d910f07d

View file

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