Dmitry Timoshkov : sechost: Support decimal or octal access rights in ConvertStringSecurityDescriptorToSecurityDescriptor.

[Alexandre Julliard]

Module: wine
Branch: oldstable
Commit: 4551a6a3c78ba0f2718d1ad6fffbb027f8cde255
URL:    https://gitlab.winehq.org/wine/wine/-/commit/4551a6a3c78ba0f2718d1ad6fffbb02...

Author: Dmitry Timoshkov <dmitry(a)baikal.ru>
Date:   Wed Jul  6 15:30:46 2022 +0300

sechost: Support decimal or octal access rights in ConvertStringSecurityDescriptorToSecurityDescriptor.

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit f2583de38d4a9370137f578f8c239041ae080ac1)
Conflicts:
	dlls/advapi32/tests/security.c
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/advapi32/tests/security.c | 23 ++++++++++++++++++++---
 dlls/sechost/security.c        |  4 ++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index c73e28a98e6..f783f46996d 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -4216,6 +4216,7 @@ static void test_ConvertStringSecurityDescriptor(void)
         BOOL       ret;
         DWORD      GLE;
         DWORD      altGLE;
+        DWORD      ace_Mask;
     } cssd[] =
     {
         { "D:(A;;GA;;;WD)",                  0xdeadbeef,      FALSE, ERROR_UNKNOWN_REVISION },
@@ -4236,9 +4237,12 @@ static void test_ConvertStringSecurityDescriptor(void)
         { "D:(D;;GA;;; WD)",                SDDL_REVISION_1, TRUE },
         { "D:(D;;GA;;;WD )",                SDDL_REVISION_1, TRUE },
         /* test ACE string access rights */
-        { "D:(A;;GA;;;WD)",                  SDDL_REVISION_1, TRUE },
-        { "D:(A;;GRGWGX;;;WD)",              SDDL_REVISION_1, TRUE },
-        { "D:(A;;RCSDWDWO;;;WD)",            SDDL_REVISION_1, TRUE },
+        { "D:(A;;GA;;;WD)",                  SDDL_REVISION_1, TRUE, 0, 0, GENERIC_ALL },
+        { "D:(A;;1;;;WD)",                   SDDL_REVISION_1, TRUE, 0, 0, 1 },
+        { "D:(A;;020000000000;;;WD)",        SDDL_REVISION_1, TRUE, 0, 0, GENERIC_READ },
+        { "D:(A;;0X40000000;;;WD)",          SDDL_REVISION_1, TRUE, 0, 0, GENERIC_WRITE },
+        { "D:(A;;GRGWGX;;;WD)",              SDDL_REVISION_1, TRUE, 0, 0, GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE },
+        { "D:(A;;RCSDWDWO;;;WD)",            SDDL_REVISION_1, TRUE, 0, 0, READ_CONTROL | DELETE | WRITE_DAC | WRITE_OWNER },
         { "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)",  SDDL_REVISION_1, TRUE },
         { "D:(A;;FAFRFWFX;;;WD)",            SDDL_REVISION_1, TRUE },
         { "D:(A;;KAKRKWKX;;;WD)",            SDDL_REVISION_1, TRUE },
@@ -4272,7 +4276,20 @@ static void test_ConvertStringSecurityDescriptor(void)
                (cssd[i].altGLE && GLE == cssd[i].altGLE),
                "(%02u) Unexpected last error %d\n", i, GLE);
         if (ret)
+        {
+            if (cssd[i].ace_Mask)
+            {
+                ACCESS_ALLOWED_ACE *ace;
+
+                acl = (ACL *)((char *)pSD + sizeof(SECURITY_DESCRIPTOR_RELATIVE));
+                ok(acl->AclRevision == ACL_REVISION, "(%02u) Got %u\n", i, acl->AclRevision);
+
+                ace = (ACCESS_ALLOWED_ACE *)(acl + 1);
+                ok(ace->Mask == cssd[i].ace_Mask, "(%02u) Expected %08x, got %08x\n",
+                   i, cssd[i].ace_Mask, ace->Mask);
+            }
             LocalFree(pSD);
+        }
     }
 
     /* test behaviour with NULL parameters */
diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c
index 4aee8c723d2..a27a4f001b7 100644
--- a/dlls/sechost/security.c
+++ b/dlls/sechost/security.c
@@ -900,8 +900,8 @@ static DWORD parse_ace_right( const WCHAR **string_ptr )
     const WCHAR *string = *string_ptr;
     unsigned int i;
 
-    if (string[0] == '0' && string[1] == 'x')
-        return wcstoul( string, (WCHAR **)string_ptr, 16 );
+    if (iswdigit( string[0] ))
+        return wcstoul( string, (WCHAR **)string_ptr, 0 );
 
     for (i = 0; i < ARRAY_SIZE(ace_rights); ++i)
     {