[ros-diffs] [weiden] 16367: query the dacl from the ISecurityInformation server, query the domains name from lsass and list them in the dialog box

query the dacl from the ISecurityInformation server, query the domains
name from lsass and list them in the dialog box
Modified: trunk/reactos/lib/aclui/aclui.c
Modified: trunk/reactos/lib/aclui/aclui.xml
Added: trunk/reactos/lib/aclui/acluilib.h
Deleted: trunk/reactos/lib/aclui/internal.h
Added: trunk/reactos/lib/aclui/misc.c
  _____  

Modified: trunk/reactos/lib/aclui/aclui.c
--- trunk/reactos/lib/aclui/aclui.c	2005-07-01 03:58:55 UTC (rev
16366)
+++ trunk/reactos/lib/aclui/aclui.c	2005-07-01 12:09:04 UTC (rev
16367)
@@ -21,103 +21,486 @@

  * PROJECT:         ReactOS Access Control List Editor
  * FILE:            lib/aclui/aclui.c
  * PURPOSE:         Access Control List Editor
- * PROGRAMMER:      Thomas Weidenmueller (w3seek(a)users.sourceforge.net)
+ * PROGRAMMER:      Thomas Weidenmueller <w3seek(a)reactos.com>
  *
  * UPDATE HISTORY:
  *      08/10/2004  Created
  */
-#define INITGUID
-#include <windows.h>
-#include <commctrl.h>
-#include <prsht.h>
-#include <aclui.h>
-#include "internal.h"
-#include "resource.h"
+#include "acluilib.h"
 
 HINSTANCE hDllInstance;
 
-UINT CALLBACK
-SecurityPageCallback(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp)
+static LPARAM
+ListViewGetSelectedItemData(IN HWND hwnd)
 {
-  switch(uMsg)
-  {
-    case PSPCB_CREATE:
+    int Index;
+    
+    Index = ListView_GetNextItem(hwnd,
+                                 -1,
+                                 LVNI_SELECTED);
+    if (Index != -1)
     {
-      PSECURITY_PAGE sp;
+        LVITEM li;
+        
+        li.mask = LVIF_PARAM;
+        li.iItem = Index;
+        li.iSubItem = 0;
+        
+        if (ListView_GetItem(hwnd,
+                             &li))
+        {
+            return li.lParam;
+        }
+    }
+    
+    return 0;
+}
 
-      sp = LocalAlloc(LHND, sizeof(SECURITY_PAGE));
-      if(sp != NULL)
-      {
-        /* save the pointer to the ISecurityInformation interface */
-        sp->psi = (LPSECURITYINFO)ppsp->lParam;
-        /* set the lParam to the allocated structure */
-        ppsp->lParam = (LPARAM)sp;
-        return TRUE;
-      }
-      return FALSE;
+static VOID
+DestroySecurityPage(IN PSECURITY_PAGE sp)
+{
+    if(sp->hiUsrs != NULL)
+    {
+        ImageList_Destroy(sp->hiUsrs);
     }
-    case PSPCB_RELEASE:
+
+    HeapFree(GetProcessHeap(),
+             0,
+             sp);
+}
+
+static VOID
+FreeAceList(IN PACE_LISTITEM *AceListHead)
+{
+    PACE_LISTITEM CurItem, NextItem;
+    
+    CurItem = *AceListHead;
+    while (CurItem != NULL)
     {
-      if(ppsp->lParam != 0)
-      {
-        PSECURITY_PAGE sp = (PSECURITY_PAGE)ppsp->lParam;
-        if(sp->hiUsrs != NULL)
+        /* free the SID string if present */
+        if (CurItem->DisplayString != NULL)
         {
-          ImageList_Destroy(sp->hiUsrs);
+            LocalFree((HLOCAL)CurItem->DisplayString);
         }
-        LocalFree((HLOCAL)sp);
-      }
-      return FALSE;
+
+        /* free the ACE list item */
+        NextItem = CurItem->Next;
+        HeapFree(GetProcessHeap(),
+                 0,
+                 CurItem);
+        CurItem = NextItem;
     }
-  }
+    
+    *AceListHead = NULL;
+}
 
-  return FALSE;
+static PACE_LISTITEM
+FindSidInAceList(IN PACE_LISTITEM AceListHead,
+                 IN PSID Sid)
+{
+    PACE_LISTITEM CurItem;
+    
+    for (CurItem = AceListHead;
+         CurItem != NULL;
+         CurItem = CurItem->Next)
+    {
+        if (EqualSid((PSID)(CurItem + 1),
+                     Sid))
+        {
+            return CurItem;
+        }
+    }
+    
+    return NULL;
 }
 
+static VOID
+ReloadUsersGroupsList(IN PSECURITY_PAGE sp)
+{
+    PSECURITY_DESCRIPTOR SecurityDescriptor;
+    BOOL DaclPresent, DaclDefaulted;
+    PACL Dacl = NULL;
+    HRESULT hRet;
 
-INT_PTR CALLBACK
-SecurityPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+    /* delete the cached ACL */
+    FreeAceList(&sp->AceListHead);
+
+    /* query the ACL */
+    hRet = sp->psi->lpVtbl->GetSecurity(sp->psi,
+                                        DACL_SECURITY_INFORMATION,
+                                        &SecurityDescriptor,
+                                        FALSE);
+    if (SUCCEEDED(hRet) && SecurityDescriptor != NULL)
+    {
+        if (GetSecurityDescriptorDacl(SecurityDescriptor,
+                                      &DaclPresent,
+                                      &Dacl,
+                                      &DaclDefaulted))
+        {
+            PACE_LISTITEM AceListItem, *NextAcePtr;
+            PSID Sid;
+            PVOID Ace;
+            ULONG AceIndex;
+            DWORD AccountNameSize, DomainNameSize, SidLength;
+            SID_NAME_USE SidNameUse;
+            DWORD LookupResult;
+            
+            NextAcePtr = &sp->AceListHead;
+            
+            for (AceIndex = 0;
+                 AceIndex < Dacl->AceCount;
+                 AceIndex++)
+            {
+                GetAce(Dacl,
+                       AceIndex,
+                       &Ace);
+
+                Sid = (PSID)&((PACCESS_ALLOWED_ACE)Ace)->SidStart;
+
+                if (!FindSidInAceList(sp->AceListHead,
+                                      Sid))
+                {
+                    SidLength = GetLengthSid(Sid);
+                    
+                    AccountNameSize = 0;
+                    DomainNameSize = 0;
+
+                    /* calculate the size of the buffer we need to
calculate */
+                    LookupAccountSid(NULL, /* FIXME */
+                                     Sid,
+                                     NULL,
+                                     &AccountNameSize,
+                                     NULL,
+                                     &DomainNameSize,
+                                     &SidNameUse);
+
+                    /* allocate the ace */
+                    AceListItem = HeapAlloc(GetProcessHeap(),
+                                            0,
+                                            sizeof(ACE_LISTITEM) +
+                                            SidLength +
+                                            ((AccountNameSize +
DomainNameSize) * sizeof(WCHAR)));
+                    if (AceListItem != NULL)
+                    {
+                        AceListItem->AccountName =
(LPWSTR)((ULONG_PTR)(AceListItem + 1) + SidLength);
+                        AceListItem->DomainName =
AceListItem->AccountName + AccountNameSize;
+
+                        CopySid(SidLength,
+                                (PSID)(AceListItem + 1),
+                                Sid);
+
+                        LookupResult = ERROR_SUCCESS;
+                        if (!LookupAccountSid(NULL, /* FIXME */
+                                              Sid,
+                                              AceListItem->AccountName,
+                                              &AccountNameSize,
+                                              AceListItem->DomainName,
+                                              &DomainNameSize,
+                                              &SidNameUse))
+                        {
+                            LookupResult = GetLastError();
+                            if (LookupResult != ERROR_NONE_MAPPED)
+                            {
+                                HeapFree(GetProcessHeap(),
+                                         0,
+                                         AceListItem);
+                                continue;
+                            }
+                        }
+                        
+                        if (AccountNameSize == 0)
+                        {
+                            AceListItem->AccountName = NULL;
+                        }
+                        if (DomainNameSize == 0)
+                        {
+                            AceListItem->DomainName = NULL;
+                        }
+
+                        AceListItem->Next = NULL;
+                        if (LookupResult == ERROR_NONE_MAPPED)
+                        {
+                            if (!ConvertSidToStringSid(Sid,
+
&AceListItem->DisplayString))
+                            {
+                                AceListItem->DisplayString = NULL;
+                            }
+                        }
+                        else
+                        {
+                            LSA_HANDLE LsaHandle;
+                            NTSTATUS Status;
+                            
+                            AceListItem->DisplayString = NULL;
+                            
+                            /* read the domain of the SID */
+                            if (OpenLSAPolicyHandle(NULL, /* FIXME */
+                                                    POLICY_LOOKUP_NAMES
| POLICY_VIEW_LOCAL_INFORMATION,
+                                                    &LsaHandle))
+                            {
+                                PLSA_REFERENCED_DOMAIN_LIST
ReferencedDomain;
+                                PLSA_TRANSLATED_NAME Names;
+                                PLSA_TRUST_INFORMATION Domain;
+                                PLSA_UNICODE_STRING DomainName;
+                                PPOLICY_ACCOUNT_DOMAIN_INFO
PolicyAccountDomainInfo = NULL;
+
+                                Status = LsaLookupSids(LsaHandle,
+                                                       1,
+                                                       &Sid,
+
&ReferencedDomain,
+                                                       &Names);
+                                if (NT_SUCCESS(Status))
+                                {
+                                    if (ReferencedDomain != NULL &&
+                                        Names->DomainIndex >= 0)
+                                    {
+                                        Domain =
&ReferencedDomain->Domains[Names->DomainIndex];
+                                        DomainName = &Domain->Name;
+                                    }
+                                    else
+                                    {
+                                        Domain = NULL;
+                                        DomainName = NULL;
+                                    }
+                                    
+                                    AceListItem->SidNameUse =
Names->Use;
+
+                                    switch (Names->Use)
+                                    {
+                                        case SidTypeAlias:
+                                            if (Domain != NULL)
+                                            {
+                                                /* query the domain
name for BUILTIN accounts */
+                                                Status =
LsaQueryInformationPolicy(LsaHandle,
+
PolicyAccountDomainInformation,
+
(PVOID*)&PolicyAccountDomainInfo);
+                                                if (NT_SUCCESS(Status))
+                                                {
+                                                    DomainName =
&PolicyAccountDomainInfo->DomainName;
+
+                                                    /* make the user
believe this is a group */
+
AceListItem->SidNameUse = SidTypeGroup;
+                                                }
+                                            }
+                                            /* fall through */
+
+                                        case SidTypeUser:
+                                        {
+                                            if (Domain != NULL)
+                                            {
+
AceListItem->DisplayString = (LPWSTR)LocalAlloc(LMEM_FIXED,
+
(AccountNameSize * sizeof(WCHAR)) +
+
(DomainName->Length + sizeof(WCHAR)) +
+
(Names->Name.Length + sizeof(WCHAR)) +
+
(4 * sizeof(WCHAR)));
+                                                if
(AceListItem->DisplayString != NULL)
+                                                {
+                                                    WCHAR *s;
+                                                    
+                                                    /* NOTE:
LSA_UNICODE_STRINGs are not always NULL-terminated! */
+
+
wcscpy(AceListItem->DisplayString,
+
AceListItem->AccountName);
+
wcscat(AceListItem->DisplayString,
+                                                           L" (");
+                                                    s =
AceListItem->DisplayString + wcslen(AceListItem->DisplayString);
+                                                    CopyMemory(s,
+
DomainName->Buffer,
+
DomainName->Length);
+                                                    s +=
DomainName->Length / sizeof(WCHAR);
+                                                    *(s++) = L'\\';
+                                                    CopyMemory(s,
+
Names->Name.Buffer,
+
Names->Name.Length);
+                                                    s +=
Names->Name.Length / sizeof(WCHAR);
+                                                    *(s++) = L')';
+                                                    *s = L'\0';
+                                                }
+                                                
+                                                /* mark the ace as a
user unless it's a
+                                                   BUILTIN account */
+                                                if
(PolicyAccountDomainInfo == NULL)
+                                                {
+
AceListItem->SidNameUse = SidTypeUser;
+                                                }
+                                            }
+                                            break;
+                                        }
+                                        
+                                        case SidTypeWellKnownGroup:
+                                        {
+                                            /* make the user believe
this is a group */
+                                            AceListItem->SidNameUse =
SidTypeGroup;
+                                            break;
+                                        }
+                                        
+                                        default:
+                                        {
+                                            break;
+                                        }
+                                    }
+                                    
+                                    if (PolicyAccountDomainInfo !=
NULL)
+                                    {
+
LsaFreeMemory(PolicyAccountDomainInfo);
+                                    }
+                                    
+                                    LsaFreeMemory(ReferencedDomain);
+                                    LsaFreeMemory(Names);
+                                }
+                                LsaClose(LsaHandle);
+                            }
+                        }
+
+                        /* append item to the cached ACL */
+                        *NextAcePtr = AceListItem;
+                        NextAcePtr = &AceListItem->Next;
+                    }
+                }
+            }
+        }
+        LocalFree((HLOCAL)SecurityDescriptor);
+    }
+}
+
+static VOID
+FillUsersGroupsList(IN PSECURITY_PAGE sp)
 {
-  PSECURITY_PAGE sp;
-  
-  switch(uMsg)
-  {
-    case WM_INITDIALOG:
+    LPARAM SelLParam;
+    PACE_LISTITEM CurItem;
+    RECT rcLvClient;
+
+    SelLParam = ListViewGetSelectedItemData(sp->hWndAceList);
+
+    DisableRedrawWindow(sp->hWndAceList);
+
+    ListView_DeleteAllItems(sp->hWndAceList);
+
+    ReloadUsersGroupsList(sp);
+
+    for (CurItem = sp->AceListHead;
+         CurItem != NULL;
+         CurItem = CurItem->Next)
     {
-      sp = (PSECURITY_PAGE)lParam;
-      if(sp != NULL)
-      {
-        LV_COLUMN lvc;
-        RECT rcLvClient;
-        
-        sp->hWnd = hwndDlg;
-        sp->hWndUsrList = GetDlgItem(hwndDlg, IDC_ACELIST);
-        sp->hiUsrs = ImageList_LoadBitmap(hDllInstance,
MAKEINTRESOURCE(IDB_USRGRPIMAGES), 16, 3, 0);
-        
-        /* save the pointer to the structure */
-        SetWindowLongPtr(hwndDlg, DWL_USER, (DWORD_PTR)sp);
-        
-        GetClientRect(sp->hWndUsrList, &rcLvClient);
-        
-        /* setup the listview control */
-        ListView_SetExtendedListViewStyleEx(sp->hWndUsrList,
LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT);
-        ListView_SetImageList(sp->hWndUsrList, sp->hiUsrs,
LVSIL_SMALL);
+        LVITEM li;
 
-        /* add a column to the list view */
-        lvc.mask = LVCF_FMT | LVCF_WIDTH;
-        lvc.fmt = LVCFMT_LEFT;
-        lvc.cx = rcLvClient.right;
-        ListView_InsertColumn(sp->hWndUsrList, 0, &lvc);
-        
-        /* FIXME - hide controls in case the flags aren't present */
-      }
-      break;
+        li.mask = LVIF_IMAGE | LVIF_PARAM | LVIF_STATE | LVIF_TEXT;
+        li.iItem = -1;
+        li.iSubItem = 0;
+        li.state = (CurItem == (PACE_LISTITEM)SelLParam ? LVIS_SELECTED
: 0);
+        li.stateMask = LVIS_SELECTED;
+        li.pszText = (CurItem->DisplayString != NULL ?
CurItem->DisplayString : CurItem->AccountName);
+        switch (CurItem->SidNameUse)
+        {
+            case SidTypeUser:
+                li.iImage = 0;
+                break;
+            case SidTypeGroup:
+                li.iImage = 1;
+                break;
+            default:
+                li.iImage = -1;
+                break;
+        }
+        li.lParam = (LPARAM)CurItem;
+
+        ListView_InsertItem(sp->hWndAceList,
+                            &li);
     }
-  }
-  return 0;
+    
+    EnableRedrawWindow(sp->hWndAceList);
+    
+    GetClientRect(sp->hWndAceList, &rcLvClient);
+    
+    ListView_SetColumnWidth(sp->hWndAceList,
+                            0,
+                            rcLvClient.right);
 }
 
 
+static UINT CALLBACK
+SecurityPageCallback(IN HWND hwnd,
+                     IN UINT uMsg,
+                     IN LPPROPSHEETPAGE ppsp)
+{
+    PSECURITY_PAGE sp = (PSECURITY_PAGE)ppsp->lParam;
+    
+    switch(uMsg)
+    {
+        case PSPCB_CREATE:
+        {
+            return TRUE;
+        }
+        case PSPCB_RELEASE:
+        {
+            DestroySecurityPage(sp);
+            return FALSE;
+        }
+    }
+
+    return FALSE;
+}
+
+
+static INT_PTR CALLBACK
+SecurityPageProc(IN HWND hwndDlg,
+                 IN UINT uMsg,
+                 IN WPARAM wParam,
+                 IN LPARAM lParam)
+{
+    PSECURITY_PAGE sp;
+
+    switch(uMsg)
+    {
+        case WM_INITDIALOG:
+        {
+            sp = (PSECURITY_PAGE)((LPPROPSHEETPAGE)lParam)->lParam;
+            if(sp != NULL)
+            {
+                LV_COLUMN lvc;
+                RECT rcLvClient;
+                
+                sp->hWnd = hwndDlg;
+                sp->hWndAceList = GetDlgItem(hwndDlg, IDC_ACELIST);
+
+                /* save the pointer to the structure */
+                SetWindowLongPtr(hwndDlg,
+                                 DWL_USER,
+                                 (DWORD_PTR)sp);
+
+                sp->hiUsrs = ImageList_LoadBitmap(hDllInstance,
+
MAKEINTRESOURCE(IDB_USRGRPIMAGES),
+                                                  16,
+                                                  3,
+                                                  0);
+
+                /* setup the listview control */
+                ListView_SetExtendedListViewStyleEx(sp->hWndAceList,
+
LVS_EX_FULLROWSELECT,
+
LVS_EX_FULLROWSELECT);
+                ListView_SetImageList(sp->hWndAceList,
+                                      sp->hiUsrs,
+                                      LVSIL_SMALL);
+
+                GetClientRect(sp->hWndAceList, &rcLvClient);
+                
+                /* add a column to the list view */
+                lvc.mask = LVCF_FMT | LVCF_WIDTH;
+                lvc.fmt = LVCFMT_LEFT;
+                lvc.cx = rcLvClient.right;
+                ListView_InsertColumn(sp->hWndAceList, 0, &lvc);
+
+                FillUsersGroupsList(sp);
+
+                /* FIXME - hide controls in case the flags aren't
present */
+            }
+            break;
+        }
+    }
+    return 0;
+}
+
+
 /*
  * CreateSecurityPage
EXPORTED
  *
@@ -125,48 +508,65 @@
  */
 HPROPSHEETPAGE
 WINAPI
-CreateSecurityPage(LPSECURITYINFO psi)
+CreateSecurityPage(IN LPSECURITYINFO psi)
 {
-  PROPSHEETPAGE psp;
-  SI_OBJECT_INFO ObjectInfo;
-  HRESULT hRet;
+    PROPSHEETPAGE psp;
+    PSECURITY_PAGE sPage;
+    SI_OBJECT_INFO ObjectInfo;
+    HRESULT hRet;
 
-  if(psi == NULL)
-  {
-    SetLastError(ERROR_INVALID_PARAMETER);
+    if(psi == NULL)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
 
-    DPRINT("No ISecurityInformation class passed!\n");
-    return NULL;
-  }
+        DPRINT("No ISecurityInformation class passed!\n");
+        return NULL;
+    }
 
-  /* get the object information from the server interface */
-  hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo);
+    /* get the object information from the server interface */
+    hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo);
 
-  if(FAILED(hRet))
-  {
-    SetLastError(hRet);
+    if(FAILED(hRet))
+    {
+        SetLastError(hRet);
 
-    DPRINT("CreateSecurityPage() failed!\n");
-    return NULL;
-  }
+        DPRINT("CreateSecurityPage() failed!\n");
+        return NULL;
+    }
+    
+    sPage = HeapAlloc(GetProcessHeap(),
+                      HEAP_ZERO_MEMORY,
+                      sizeof(SECURITY_PAGE));
+    if (sPage == NULL)
+    {
+        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        
+        DPRINT("Not enough memory to allocate a SECURITY_PAGE!\n");
+        return NULL;
+    }
+    sPage->psi = psi;
+    sPage->ObjectInfo = ObjectInfo;
 
-  psp.dwSize = sizeof(PROPSHEETPAGE);
-  psp.dwFlags = PSP_DEFAULT | PSP_USECALLBACK;
-  psp.hInstance = hDllInstance;
-  psp.pszTemplate = MAKEINTRESOURCE(IDD_SECPAGE);
-  psp.pfnDlgProc = SecurityPageProc;
-  psp.lParam = (LPARAM)psi;
-  psp.pfnCallback = SecurityPageCallback;
+    psp.dwSize = sizeof(PROPSHEETPAGE);
+    psp.dwFlags = PSP_USECALLBACK;
+    psp.hInstance = hDllInstance;
+    psp.pszTemplate = MAKEINTRESOURCE(IDD_SECPAGE);
+    psp.pfnDlgProc = SecurityPageProc;
+    psp.lParam = (LPARAM)sPage;
+    psp.pfnCallback = SecurityPageCallback;
 
-  if((ObjectInfo.dwFlags & SI_PAGE_TITLE) != 0 &&
-     ObjectInfo.pszPageTitle != NULL && ObjectInfo.pszPageTitle[0] !=
L'\0')
-  {
-    /* Set the page title if the flag is present and the string isn't
empty */
-    psp.pszTitle = ObjectInfo.pszPageTitle;
-    psp.dwFlags |= PSP_USETITLE;
-  }
+    if((ObjectInfo.dwFlags & SI_PAGE_TITLE) != 0 &&
+       ObjectInfo.pszPageTitle != NULL && ObjectInfo.pszPageTitle[0] !=
L'\0')
+    {
+        /* Set the page title if the flag is present and the string
isn't empty */
+        psp.pszTitle = ObjectInfo.pszPageTitle;
+        psp.dwFlags |= PSP_USETITLE;
+    }
+    
+    /* NOTE: the SECURITY_PAGE structure will be freed by the property
page
+             callback! */
 
-  return CreatePropertySheetPage(&psp);
+    return CreatePropertySheetPage(&psp);
 }
 
 
@@ -177,99 +577,95 @@
  */
 BOOL
 WINAPI
-EditSecurity(HWND hwndOwner, LPSECURITYINFO psi)
+EditSecurity(IN HWND hwndOwner,
+             IN LPSECURITYINFO psi)
 {
-  HRESULT hRet;
-  SI_OBJECT_INFO ObjectInfo;
-  PROPSHEETHEADER psh;
-  HPROPSHEETPAGE hPages[1];
-  LPVOID lpCaption;
-  BOOL Ret;
-  
-  if(psi == NULL)
-  {
-    SetLastError(ERROR_INVALID_PARAMETER);
-    
-    DPRINT("No ISecurityInformation class passed!\n");
-    return FALSE;
-  }
-  
-  /* get the object information from the server interface */
-  hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo);
-  
-  if(FAILED(hRet))
-  {
-    SetLastError(hRet);
-    
-    DPRINT("GetObjectInformation() failed!\n");
-    return FALSE;
-  }
+    HRESULT hRet;
+    SI_OBJECT_INFO ObjectInfo;
+    PROPSHEETHEADER psh;
+    HPROPSHEETPAGE hPages[1];
+    LPWSTR lpCaption;
+    BOOL Ret;
 
-  /* create the page */
-  hPages[0] = CreateSecurityPage(psi);
-  if(hPages[0] == NULL)
-  {
-    DPRINT("CreateSecurityPage(), couldn't create property sheet!\n");
-    return FALSE;
-  }
-  
-  psh.dwSize = sizeof(PROPSHEETHEADER);
-  psh.dwFlags = PSH_DEFAULT;
-  psh.hwndParent = hwndOwner;
-  psh.hInstance = hDllInstance;
-  if((ObjectInfo.dwFlags & SI_PAGE_TITLE) != 0 &&
-     ObjectInfo.pszPageTitle != NULL && ObjectInfo.pszPageTitle[0] !=
L'\0')
-  {
-    /* Set the page title if the flag is present and the string isn't
empty */
-    psh.pszCaption = ObjectInfo.pszPageTitle;
-    lpCaption = NULL;
-  }
-  else
-  {
-    /* Set the page title to the object name, make sure the format
string
-       has "%1" NOT "%s" because it uses FormatMessage() to
automatically
-       allocate the right amount of memory. */       
-    FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-                   FORMAT_MESSAGE_FROM_HMODULE |
FORMAT_MESSAGE_ARGUMENT_ARRAY,
-                   hDllInstance, 
-                   IDS_PSP_TITLE, 
-                   0,
-                   (LPSTR)lpCaption,
-                   0,
-                   (va_list*)&ObjectInfo.pszObjectName); /* Acc. to
MSDN, should work */
-    psh.pszCaption = lpCaption;
-  }
-  psh.nPages = sizeof(hPages) / sizeof(HPROPSHEETPAGE);
-  psh.nStartPage = 0;
-  psh.phpage = hPages;
-  
-  Ret = (PropertySheet(&psh) != -1);
-  
-  if(lpCaption != NULL)
-  {
-    LocalFree((HLOCAL)lpCaption);
-  }
-  
-  return Ret;
+    if(psi == NULL)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+
+        DPRINT("No ISecurityInformation class passed!\n");
+        return FALSE;
+    }
+
+    /* get the object information from the server interface */
+    hRet = psi->lpVtbl->GetObjectInformation(psi, &ObjectInfo);
+
+    if(FAILED(hRet))
+    {
+        SetLastError(hRet);
+
+        DPRINT("GetObjectInformation() failed!\n");
+        return FALSE;
+    }
+
+    /* create the page */
+    hPages[0] = CreateSecurityPage(psi);
+    if(hPages[0] == NULL)
+    {
+        DPRINT("CreateSecurityPage(), couldn't create property
sheet!\n");
+        return FALSE;
+    }
+
+    psh.dwSize = sizeof(PROPSHEETHEADER);
+    psh.dwFlags = PSH_DEFAULT;
+    psh.hwndParent = hwndOwner;
+    psh.hInstance = hDllInstance;
+    if((ObjectInfo.dwFlags & SI_PAGE_TITLE) != 0 &&
+       ObjectInfo.pszPageTitle != NULL && ObjectInfo.pszPageTitle[0] !=
L'\0')
+    {
+        /* Set the page title if the flag is present and the string
isn't empty */
+        psh.pszCaption = ObjectInfo.pszPageTitle;
+        lpCaption = NULL;
+    }
+    else
+    {
+        /* Set the page title to the object name, make sure the format
string
+           has "%1" NOT "%s" because it uses FormatMessage() to
automatically
+           allocate the right amount of memory. */
+        LoadAndFormatString(hDllInstance,
+                            IDS_PSP_TITLE,
+                            &lpCaption,
+                            ObjectInfo.pszObjectName);
+        psh.pszCaption = lpCaption;
+    }
+
+    psh.nPages = sizeof(hPages) / sizeof(HPROPSHEETPAGE);
+    psh.nStartPage = 0;
+    psh.phpage = hPages;
+
+    Ret = (PropertySheet(&psh) != -1);
+
+    if(lpCaption != NULL)
+    {
+        LocalFree((HLOCAL)lpCaption);
+    }
+
+    return Ret;
 }
 
 BOOL STDCALL
-DllMain(HINSTANCE hinstDLL,
-        DWORD dwReason,
-        LPVOID lpvReserved)
+DllMain(IN HINSTANCE hinstDLL,
+        IN DWORD dwReason,
+        IN LPVOID lpvReserved)
 {
-  switch (dwReason)
-  {
-    case DLL_PROCESS_ATTACH:
-      hDllInstance = hinstDLL;
-      break;
-    case DLL_THREAD_ATTACH:
-      break;
-    case DLL_THREAD_DETACH:
-      break;
-    case DLL_PROCESS_DETACH:
-      break;
-  }
-  return TRUE;
+    switch (dwReason)
+    {
+        case DLL_PROCESS_ATTACH:
+            hDllInstance = hinstDLL;
+            break;
+        case DLL_THREAD_ATTACH:
+        case DLL_THREAD_DETACH:
+        case DLL_PROCESS_DETACH:
+            break;
+    }
+    return TRUE;
 }
 
  _____  

Modified: trunk/reactos/lib/aclui/aclui.xml
--- trunk/reactos/lib/aclui/aclui.xml	2005-07-01 03:58:55 UTC (rev
16366)
+++ trunk/reactos/lib/aclui/aclui.xml	2005-07-01 12:09:04 UTC (rev
16367)
@@ -3,16 +3,16 @@

 	<include base="aclui">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x0600</define>
-	<library>rosrtl</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<file>aclui.c</file>
+	<file>misc.c</file>
 	<file>aclui.rc</file>
+	<pch>acluilib.h</pch>
 </module>
  _____  

Copied: trunk/reactos/lib/aclui/acluilib.h (from rev 16307,
trunk/reactos/lib/aclui/internal.h)
--- trunk/reactos/lib/aclui/internal.h	2005-06-27 18:56:50 UTC (rev
16307)
+++ trunk/reactos/lib/aclui/acluilib.h	2005-07-01 12:09:04 UTC (rev
16367)
@@ -0,0 +1,58 @@

+#include <windows.h>
+#include <commctrl.h>
+#include <prsht.h>
+#include <aclui.h>
+#include <sddl.h>
+#include <ntsecapi.h>
+#include "resource.h"
+
+ULONG DbgPrint(PCH Format,...);
+#define DPRINT DbgPrint
+
+#ifndef NT_SUCCESS
+#define NT_SUCCESS(status) ((LONG)(status) >= 0)
+#endif
+
+#define EnableRedrawWindow(hwnd) \
+    SendMessage((hwnd), WM_SETREDRAW, TRUE, 0)
+
+#define DisableRedrawWindow(hwnd) \
+    SendMessage((hwnd), WM_SETREDRAW, FALSE, 0)
+
+extern HINSTANCE hDllInstance;
+
+typedef struct _ACE_LISTITEM
+{
+    struct _ACE_LISTITEM *Next;
+    SID_NAME_USE SidNameUse;
+    WCHAR *DisplayString;
+    WCHAR *AccountName;
+    WCHAR *DomainName;
+} ACE_LISTITEM, *PACE_LISTITEM;
+
+typedef struct _SECURITY_PAGE
+{
+    HWND hWnd;
+
+    /* Main ACE List */
+    HWND hWndAceList;
+    PACE_LISTITEM AceListHead;
+
+    HIMAGELIST hiUsrs;
+
+    LPSECURITYINFO psi;
+    SI_OBJECT_INFO ObjectInfo;
+} SECURITY_PAGE, *PSECURITY_PAGE;
+
+BOOL
+OpenLSAPolicyHandle(IN WCHAR *SystemName,
+                    IN ACCESS_MASK DesiredAccess,
+                    OUT PLSA_HANDLE PolicyHandle);
+
+DWORD
+LoadAndFormatString(IN HINSTANCE hInstance,
+                    IN UINT uID,
+                    OUT LPWSTR *lpTarget,
+                    ...);
+
+/* EOF */
  _____  

Deleted: trunk/reactos/lib/aclui/internal.h
--- trunk/reactos/lib/aclui/internal.h	2005-07-01 03:58:55 UTC (rev
16366)
+++ trunk/reactos/lib/aclui/internal.h	2005-07-01 12:09:04 UTC (rev
16367)
@@ -1,19 +0,0 @@

-#ifndef __ACLUI_INTERNAL_H
-#define __ACLUI_INTERNAL_H
-
-ULONG DbgPrint(PCH Format,...);
-#define DPRINT DbgPrint
-
-extern HINSTANCE hDllInstance;
-
-typedef struct _SECURITY_PAGE
-{
-  HWND hWnd;
-  HWND hWndUsrList;
-  HIMAGELIST hiUsrs;
-  LPSECURITYINFO psi;
-} SECURITY_PAGE, *PSECURITY_PAGE;
-
-#endif /* __ACLUI_INTERNAL_H */
-
-/* EOF */
  _____  

Added: trunk/reactos/lib/aclui/misc.c
--- trunk/reactos/lib/aclui/misc.c	2005-07-01 03:58:55 UTC (rev
16366)
+++ trunk/reactos/lib/aclui/misc.c	2005-07-01 12:09:04 UTC (rev
16367)
@@ -0,0 +1,163 @@

+/*
+ * ReactOS Access Control List Editor
+ * Copyright (C) 2004 ReactOS Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
+ */
+/* $Id$
+ *
+ * PROJECT:         ReactOS Access Control List Editor
+ * FILE:            lib/aclui/misc.c
+ * PURPOSE:         Access Control List Editor
+ * PROGRAMMER:      Thomas Weidenmueller &lt;w3seek(a)reactos.com&gt;
+ *
+ * UPDATE HISTORY:
+ *      07/01/2005  Created
+ */
+#define INITGUID
+#include <windows.h>
+#include <aclui.h>
+
+#include "acluilib.h"
+
+static INT
+LengthOfStrResource(IN HINSTANCE hInst,
+                    IN UINT uID)
+{
+  HRSRC hrSrc;
+  HGLOBAL hRes;
[truncated at 1000 lines; 129 more skipped]