[ADVAPI32]

- Use LookupAccountNameW to retrieve the account SID when a user tries to log-on to a computer.
- Little clean-up of LogonUserW.
This is the first step to get rid of hard-coded logon stuff.

svn path=/trunk/; revision=57601

reactos/dll/win32/advapi32/misc/logon.c

@@ -310,53 +310,72 @@ static BOOL WINAPI
 GetUserSid(LPCWSTR UserName,
            PSID *Sid)
 {
-    PSID AccountDomainSid = NULL;
+    PSID SidBuffer = NULL;
-    ULONG ulUserRid;
+    PWSTR DomainBuffer = NULL;
-    DWORD dwLength;
+    DWORD cbSidSize = 0;
-    HKEY hNamesKey = NULL;
+    DWORD cchDomSize = 0;
-    BOOL bResult = TRUE;
+    SID_NAME_USE Use;
+    BOOL res = TRUE;
 
-    if (!GetAccountDomainSid(&AccountDomainSid))
+    *Sid = NULL;
-    {
+
+    LookupAccountNameW(NULL,
+                       UserName,
+                       NULL,
+                       &cbSidSize,
+                       NULL,
+                       &cchDomSize,
+                       &Use);
+
+    if (cbSidSize == 0 || cchDomSize == 0)
         return FALSE;
-    }
 
-    /* Open the Users\Names key */
+    SidBuffer = RtlAllocateHeap(RtlGetProcessHeap(),
-    if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                                HEAP_ZERO_MEMORY,
-                      L"SAM\\SAM\\Domains\\Account\\Users\\Names",
+                                cbSidSize);
-                      0,
+    if (SidBuffer == NULL)
-                      KEY_READ,
+        return FALSE;
-                      &hNamesKey))
+
+    DomainBuffer = RtlAllocateHeap(RtlGetProcessHeap(),
+                                   HEAP_ZERO_MEMORY,
+                                   cchDomSize * sizeof(WCHAR));
+    if (DomainBuffer == NULL)
     {
-        ERR("Failed to open Users\\Names key! (Error %lu)\n", GetLastError());
+        res = FALSE;
-        bResult = FALSE;
         goto done;
     }
 
-    /* Read the user RID */
+    if (!LookupAccountNameW(NULL,
-    dwLength = sizeof(ULONG);
+                            UserName,
-    if (RegQueryValueExW(hNamesKey,
+                            SidBuffer,
-                         UserName,
+                            &cbSidSize,
-                         NULL,
+                            DomainBuffer,
-                         NULL,
+                            &cchDomSize,
-                        (LPBYTE)&ulUserRid,
+                            &Use))
-                        &dwLength))
     {
-        ERR("Failed to read the SID! (Error %ld)\n", GetLastError());
+        res = FALSE;
-        bResult = FALSE;
         goto done;
     }
 
-    *Sid = AppendRidToSid(AccountDomainSid, ulUserRid);
+    if (Use != SidTypeUser)
+    {
+        res = FALSE;
+        goto done;
+    }
+
+    *Sid = SidBuffer;
 
 done:
-    if (hNamesKey != NULL)
+    if (DomainBuffer != NULL)
-        RegCloseKey(hNamesKey);
+        RtlFreeHeap(RtlGetProcessHeap(), 0, DomainBuffer);
 
-    if (AccountDomainSid != NULL)
+    if (res == FALSE)
-        RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid);
+    {
+        if (SidBuffer != NULL)
+            RtlFreeHeap(RtlGetProcessHeap(), 0, SidBuffer);
+    }
 
-    return bResult;
+    return res;
 }
 
 
@@ -593,8 +612,8 @@ LogonUserW(LPWSTR lpszUsername,
     TOKEN_USER TokenUser;
     TOKEN_OWNER TokenOwner;
     TOKEN_PRIMARY_GROUP TokenPrimaryGroup;
-    PTOKEN_GROUPS TokenGroups;
+    PTOKEN_GROUPS TokenGroups = NULL;
-    PTOKEN_PRIVILEGES TokenPrivileges;
+    PTOKEN_PRIVILEGES TokenPrivileges = NULL;
     TOKEN_DEFAULT_DACL TokenDefaultDacl;
     LARGE_INTEGER ExpirationTime;
     LUID AuthenticationId;
@@ -603,10 +622,10 @@ LogonUserW(LPWSTR lpszUsername,
     PSID PrimaryGroupSid = NULL;
     PSID OwnerSid = NULL;
     PSID LocalSystemSid;
-    PACL Dacl;
+    PACL Dacl = NULL;
-    NTSTATUS Status;
     SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY};
     unsigned i;
+    NTSTATUS Status = STATUS_SUCCESS;
 
     Qos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE);
     Qos.ImpersonationLevel = SecurityAnonymous;
@@ -641,11 +660,10 @@ LogonUserW(LPWSTR lpszUsername,
     /* Allocate and initialize token groups */
     TokenGroups = AllocateGroupSids(&PrimaryGroupSid,
                                     &OwnerSid);
-    if (NULL == TokenGroups)
+    if (TokenGroups == NULL)
     {
-        RtlFreeSid(UserSid);
+        Status = STATUS_INSUFFICIENT_RESOURCES;
-        SetLastError(ERROR_OUTOFMEMORY);
+        goto done;
-        return FALSE;
     }
 
     /* Allocate and initialize token privileges */
@@ -653,12 +671,10 @@ LogonUserW(LPWSTR lpszUsername,
                                       sizeof(TOKEN_PRIVILEGES)
                                     + sizeof(DefaultPrivs) / sizeof(DefaultPrivs[0])
                                       * sizeof(LUID_AND_ATTRIBUTES));
-    if (NULL == TokenPrivileges)
+    if (TokenPrivileges == NULL)
     {
-        FreeGroupSids(TokenGroups);
+        Status = STATUS_INSUFFICIENT_RESOURCES;
-        RtlFreeSid(UserSid);
+        goto done;
-        SetLastError(ERROR_OUTOFMEMORY);
-        return FALSE;
     }
 
     TokenPrivileges->PrivilegeCount = 0;
@@ -683,21 +699,13 @@ LogonUserW(LPWSTR lpszUsername,
     Dacl = RtlAllocateHeap(GetProcessHeap(), 0, 1024);
     if (Dacl == NULL)
     {
-        FreeGroupSids(TokenGroups);
+        Status = STATUS_INSUFFICIENT_RESOURCES;
-        RtlFreeSid(UserSid);
+        goto done;
-        SetLastError(ERROR_OUTOFMEMORY);
-        return FALSE;
     }
 
     Status = RtlCreateAcl(Dacl, 1024, ACL_REVISION);
     if (!NT_SUCCESS(Status))
-    {
+        goto done;
-        RtlFreeHeap(GetProcessHeap(), 0, Dacl);
-        FreeGroupSids(TokenGroups);
-        RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges);
-        RtlFreeSid(UserSid);
-        return FALSE;
-    }
 
     RtlAddAccessAllowedAce(Dacl,
                            ACL_REVISION,
@@ -754,10 +762,18 @@ LogonUserW(LPWSTR lpszUsername,
                            &TokenDefaultDacl,
                            &TokenSource);
 
-    RtlFreeHeap(GetProcessHeap(), 0, Dacl);
+done:
-    FreeGroupSids(TokenGroups);
+    if (Dacl != NULL)
-    RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges);
+        RtlFreeHeap(GetProcessHeap(), 0, Dacl);
-    RtlFreeSid(UserSid);
+
+    if (TokenGroups != NULL)
+        FreeGroupSids(TokenGroups);
+
+    if (TokenPrivileges != NULL)
+        RtlFreeHeap(GetProcessHeap(), 0, TokenPrivileges);
+
+    if (UserSid != NULL)
+        RtlFreeHeap(GetProcessHeap(), 0, UserSid);
 
     return NT_SUCCESS(Status);
 }