[cwittich] 37971: implement hex value support for ParseAccessMaskString sync ComputeStringSidSize with wine

Author: cwittich
Date: Tue Dec  9 10:39:03 2008
New Revision: 37971

URL: http://svn.reactos.org/svn/reactos?rev=37971&view=rev
Log:
implement hex value support for ParseAccessMaskString
sync ComputeStringSidSize with wine

Modified:
    trunk/reactos/dll/win32/advapi32/sec/sid.c

Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid....
==============================================================================
--- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Tue Dec  9 10:39:03 2008
@@ -452,10 +452,35 @@
    OUT DWORD* pAccessMask,
    OUT SIZE_T* pLength)
 {
-	/* FIXME: Allow hexadecimal string for access rights! */
-
-	return ParseFlagsString(Buffer, AccessMaskTable, SDDL_SEPERATORC, pAccessMask, pLength);
-}
+    LPCWSTR szAcl = Buffer;
+    BOOL RetVal = FALSE;
+    LPCWSTR ptr;
+
+    if ((*szAcl == '0') && (*(szAcl + 1) == 'x'))
+    {
+        LPCWSTR p = szAcl;
+
+        while (*p && *p != ';')
+            p++;
+
+        if (p - szAcl <= 10 /* 8 hex digits + "0x" */ )
+        {
+            *pAccessMask = strtoulW(szAcl, NULL, 16);
+            ptr = wcschr(Buffer, SDDL_SEPERATORC);
+            if (ptr)
+            {
+                *pLength = ptr - Buffer;
+                RetVal = TRUE;
+            }
+        }
+    } 
+    else
+    {
+        RetVal = ParseFlagsString(Buffer, AccessMaskTable, SDDL_SEPERATORC, pAccessMask, pLength);
+    }
+
+    return RetVal;
+ }

static BOOL
 ParseGuidString(
@@ -1664,12 +1689,9 @@
 /******************************************************************************
  * ComputeStringSidSize
  */
-static DWORD
-ComputeStringSidSize(LPCWSTR StringSid)
-{
-    DWORD size = sizeof(SID);
-
-    if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I-S-S */
+static DWORD ComputeStringSidSize(LPCWSTR StringSid)
+{
+    if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I(-S)+ */
     {
         int ctok = 0;
         while (*StringSid)
@@ -1679,8 +1701,8 @@
             StringSid++;
         }

-        if (ctok > 3)
-            size += (ctok - 3) * sizeof(DWORD);
+        if (ctok >= 3)
+            return GetSidLengthRequired(ctok - 2);
     }
     else /* String constant format  - Only available in winxp and above */
     {
@@ -1688,10 +1710,10 @@

for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++)
             if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2))
-                size += (WellKnownSids[i].Sid.SubAuthorityCount - 1) * sizeof(DWORD);
-    }
-
-    return size;
+                return GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount);
+    }
+
+    return GetSidLengthRequired(0);
 }

static const RECORD SidTable[] =