[ros-diffs] [reactos] 01/01: [SYSSETUP] security.c: Remove 3 useless casts

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca1814f2c94c61404ade0f...

commit ca1814f2c94c61404ade0f7d54c8d313e68911d4
Author:     Serge Gautherie [e-mail]
AuthorDate: Thu Nov 12 01:22:46 2020 +0100
Commit:     Jérôme Gardou [e-mail]
CommitDate: Wed Mar 24 12:15:55 2021 +0100

[SYSSETUP] security.c: Remove 3 useless casts

And
    * Make 1 cast more explicit.
    * Fix 1 'SamSetInformationUser' copypasta in DPRINT1() text.
    * Optimize 1 '.MaximumLength' assignment.
---
 dll/win32/syssetup/security.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c
index eb505ffd3df..1a784edc5b5 100644
--- a/dll/win32/syssetup/security.c
+++ b/dll/win32/syssetup/security.c
@@ -100,7 +100,7 @@ SetAccountsDomainSid(
     LsaClose(PolicyHandle);

DomainNameInfo.DomainName.Length = wcslen(DomainName) * sizeof(WCHAR);
-    DomainNameInfo.DomainName.MaximumLength = (wcslen(DomainName) + 1) * sizeof(WCHAR);
+    DomainNameInfo.DomainName.MaximumLength = DomainNameInfo.DomainName.Length + sizeof(WCHAR);
     DomainNameInfo.DomainName.Buffer = (LPWSTR)DomainName;

Status = SamConnect(NULL,
@@ -117,7 +117,7 @@ SetAccountsDomainSid(
         {
             Status = SamSetInformationDomain(DomainHandle,
                                              DomainNameInformation,
-                                             (PVOID)&DomainNameInfo);
+                                             &DomainNameInfo);
             if (!NT_SUCCESS(Status))
             {
                 DPRINT1("SamSetInformationDomain failed (Status: 0x%08lx)\n", Status);
@@ -1186,7 +1186,7 @@ EnableAccount(

Status = SamQueryInformationUser(UserHandle,
                                      UserControlInformation,
-                                     (PVOID)&ControlInfo);
+                                     (PVOID*)&ControlInfo);
     if (!NT_SUCCESS(Status))
     {
         DPRINT1("SamQueryInformationUser() failed (Status: 0x%08lx)\n", Status);
@@ -1289,7 +1289,7 @@ SetNewAccountName(

Status = SamSetInformationUser(UserHandle,
                                    UserNameInformation,
-                                   (PVOID)&NameInfo);
+                                   &NameInfo);
     if (!NT_SUCCESS(Status))
     {
         DPRINT1("SamSetInformationUser() failed (Status: 0x%08lx)\n", Status);
@@ -1655,7 +1655,7 @@ SetAdministratorPassword(LPCWSTR Password)

Status = SamSetInformationUser(UserHandle,
                                    UserSetPasswordInformation,
-                                   (PVOID)&PasswordInfo);
+                                   &PasswordInfo);
     if (!NT_SUCCESS(Status))
     {
         DPRINT1("SamSetInformationUser() failed (Status %08lx)\n", Status);
@@ -1667,7 +1667,7 @@ SetAdministratorPassword(LPCWSTR Password)
                                      (PVOID*)&AccountNameInfo);
     if (!NT_SUCCESS(Status))
     {
-        DPRINT1("SamSetInformationUser() failed (Status %08lx)\n", Status);
+        DPRINT1("SamQueryInformationUser() failed (Status 0x%08lx)\n", Status);
         goto done;
     }