Paul Bryan Roberts : advapi32: LookupAccountNameW() - correct call in SetEntriesInAclW().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a3e0bc10bb053d4698852dd7d19c0899f1084fec
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a3e0bc10bb053d4698852dd7d1...

Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk>
Date:   Sat Oct 18 20:56:08 2008 +0100

advapi32: LookupAccountNameW() - correct call in SetEntriesInAclW().

---

 dlls/advapi32/security.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 77009af..03933d2 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -2541,7 +2541,7 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI
             domainName = ACCOUNT_SIDS[i].domain;
             nameLen = strlenW(domainName);
 
-            if (*cchReferencedDomainName <= nameLen && ReferencedDomainName)
+            if (*cchReferencedDomainName <= nameLen || !ret)
             {
                 SetLastError(ERROR_INSUFFICIENT_BUFFER);
                 nameLen += 1;
@@ -3244,7 +3244,7 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries,
         case TRUSTEE_IS_NAME:
         {
             DWORD sid_size = FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]);
-            DWORD domain_size = 0;
+            DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1;
             SID_NAME_USE use;
             if (!LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use))
             {