minor fixes and use a .spec file

svn path=/trunk/; revision=20797

diff --git a/reactos/lib/aclui/aclui.c b/reactos/lib/aclui/aclui.c
index d674edf..69b99fe 100644 (file)
--- a/reactos/lib/aclui/aclui.c
+++ b/reactos/lib/aclui/aclui.c
@@ -342,6 +342,27 @@ GetPrincipalDisplayString(IN PPRINCIPAL_LISTITEM PrincipalListItem)
     return lpDisplayString;
 }
 
     return lpDisplayString;
 }
 

+static LPWSTR
+GetPrincipalAccountNameString(IN PPRINCIPAL_LISTITEM PrincipalListItem)
+{
+    LPWSTR lpDisplayString = NULL;
+
+    if (PrincipalListItem->SidReqResult != NULL)
+    {
+        LoadAndFormatString(hDllInstance,
+                            IDS_USERFORMAT,
+                            &lpDisplayString,
+                            PrincipalListItem->SidReqResult->AccountName);
+    }
+    else
+    {
+        ConvertSidToStringSid((PSID)(PrincipalListItem + 1),
+                              &lpDisplayString);
+    }
+
+    return lpDisplayString;
+}
+

 static VOID
 CreatePrincipalListItem(OUT LVITEM *li,
                         IN PSECURITY_PAGE sp,
 static VOID
 CreatePrincipalListItem(OUT LVITEM *li,
                         IN PSECURITY_PAGE sp,


@@ -543,7 +564,7 @@ UpdateControlStates(IN PSECURITY_PAGE sp)
         LPWSTR szLabel;
         LPWSTR szDisplayString;
 
         LPWSTR szLabel;
         LPWSTR szDisplayString;
 

-        szDisplayString = GetPrincipalDisplayString(Selected);
+        szDisplayString = GetPrincipalAccountNameString(Selected);

         if (LoadAndFormatString(hDllInstance,
                                 IDS_PERMISSIONS_FOR,
                                 &szLabel,
         if (LoadAndFormatString(hDllInstance,
                                 IDS_PERMISSIONS_FOR,
                                 &szLabel,

diff --git a/reactos/lib/aclui/aclui.def b/reactos/lib/aclui/aclui.def
deleted file mode 100644 (file)
index 8112fd8..0000000
--- a/reactos/lib/aclui/aclui.def
+++ /dev/null
@@ -1,22 +0,0 @@
-LIBRARY aclui.dll
-
-EXPORTS
-CreateSecurityPage@4 @1
-EditSecurity@8 @2
-;ACLUI.3
-;ACLUI.4
-;ACLUI.5
-;ACLUI.6
-;ACLUI.7
-;ACLUI.8
-;ACLUI.9
-;ACLUI.10
-;ACLUI.11
-;ACLUI.12
-;ACLUI.13
-;ACLUI.14
-;ACLUI.15
-IID_ISecurityInformation @16 DATA
-
-
-; EOF

diff --git a/reactos/lib/aclui/aclui.spec b/reactos/lib/aclui/aclui.spec
new file mode 100644 (file)
index 0000000..267449b
--- /dev/null
+++ b/reactos/lib/aclui/aclui.spec
@@ -0,0 +1,5 @@
+# aclui.dll exports
+
+ 1 stdcall CreateSecurityPage(ptr)
+ 2 stdcall EditSecurity(ptr ptr)
+16 extern IID_ISecurityInformation
\ No newline at end of file

diff --git a/reactos/lib/aclui/aclui.xml b/reactos/lib/aclui/aclui.xml
index ecf94a2..b6191ee 100644 (file)
--- a/reactos/lib/aclui/aclui.xml
+++ b/reactos/lib/aclui/aclui.xml
@@ -1,5 +1,5 @@
 <module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll">
 <module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll">

-       <importlibrary definition="aclui.def" />
+       <importlibrary definition="aclui.spec.def" />

        <include base="aclui">.</include>
        <define name="UNICODE" />
        <define name="_UNICODE" />
        <include base="aclui">.</include>
        <define name="UNICODE" />
        <define name="_UNICODE" />


@@ -22,5 +22,6 @@
        <file>misc.c</file>
        <file>sidcache.c</file>
        <file>aclui.rc</file>
        <file>misc.c</file>
        <file>sidcache.c</file>
        <file>aclui.rc</file>

+       <file>aclui.spec</file>

        <pch>precomp.h</pch>
 </module>
        <pch>precomp.h</pch>
 </module>

diff --git a/reactos/lib/aclui/aclui_Hu.rc b/reactos/lib/aclui/aclui_Hu.rc
index 595b868..5edcdcb 100644 (file)
--- a/reactos/lib/aclui/aclui_Hu.rc
+++ b/reactos/lib/aclui/aclui_Hu.rc
@@ -1,35 +1,35 @@
-/*\r
- * Hungarian resources for aclui\r
- *\r
- * Copyright 2005 Robert Horvath - Hungarian translation - talley at cubeclub.hu\r
-*/\r
-LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL\r
-\r
-IDD_SECPAGE DIALOGEX 0, 0, 227, 215\r
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION\r
-CAPTION "Biztonság"\r
-FONT 8, "MS Shell Dlg", 0, 0, 0x0\r
-BEGIN\r
-  LTEXT "&Csoport vagy felhasználó nevek:", -1, 7, 7, 105, 8\r
-  CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE\r
-  PUSHBUTTON "H&ozzáadás...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14\r
-  PUSHBUTTON "&Törlés", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14\r
-  LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX\r
-  LTEXT "Engedélyez", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER\r
-  LTEXT "Tiltás", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER\r
-  CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE\r
-  LTEXT "További beállítások megtekintéséhez kattints a További beállítások gombra.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT\r
-  PUSHBUTTON "&További beállítások", IDC_ADVANCED, 165, 194, 55, 14\r
-END\r
-\r
-STRINGTABLE DISCARDABLE\r
-{\r
-  IDS_PSP_TITLE "%1 engedélye"\r
-  IDS_UNKNOWN "Ismeretlen"\r
-  IDS_SPECIAL_PERMISSIONS "Különleges engedélyek"\r
-  IDS_PERMISSIONS_FOR "%1 engedélye"\r
-  IDS_PERMISSIONS "Engedélyek"\r
-  IDS_USERDOMAINFORMAT "%1 (%2\\%3)"\r
-  IDS_USERFORMAT "%1"\r
-}\r
-\r
+/*
+ * Hungarian resources for aclui
+ *
+ * Copyright 2005 Robert Horvath - Hungarian translation - talley at cubeclub.hu
+*/
+LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
+
+IDD_SECPAGE DIALOGEX 0, 0, 227, 215
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION
+CAPTION "Biztonság"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT "&Csoport vagy felhasználó nevek:", -1, 7, 7, 105, 8
+  CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE
+  PUSHBUTTON "H&ozzáadás...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14
+  PUSHBUTTON "&Törlés", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14
+  LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX
+  LTEXT "Engedélyez", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER
+  LTEXT "Tiltás", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER
+  CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE
+  LTEXT "További beállítások megtekintéséhez kattints a További beállítások gombra.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT
+  PUSHBUTTON "&További beállítások", IDC_ADVANCED, 165, 194, 55, 14
+END
+
+STRINGTABLE DISCARDABLE
+{
+  IDS_PSP_TITLE "%1 engedélye"
+  IDS_UNKNOWN "Ismeretlen"
+  IDS_SPECIAL_PERMISSIONS "Különleges engedélyek"
+  IDS_PERMISSIONS_FOR "%1 engedélye"
+  IDS_PERMISSIONS "Engedélyek"
+  IDS_USERDOMAINFORMAT "%1 (%2\\%3)"
+  IDS_USERFORMAT "%1"
+}
+

diff --git a/reactos/lib/aclui/precomp.h b/reactos/lib/aclui/precomp.h
index 5367cff..6b6c67b 100644 (file)
--- a/reactos/lib/aclui/precomp.h
+++ b/reactos/lib/aclui/precomp.h
@@ -62,6 +62,9 @@ typedef struct _SECURITY_PAGE
     SI_ACCESS DefaultAccess;
 
     HANDLE SidCacheMgr;
     SI_ACCESS DefaultAccess;
 
     HANDLE SidCacheMgr;

+    LONG SidLookupsPending;
+    BOOL Initializing : 1;
+

     LPCWSTR ServerName;
 } SECURITY_PAGE, *PSECURITY_PAGE;
 
     LPCWSTR ServerName;
 } SECURITY_PAGE, *PSECURITY_PAGE;
 

diff --git a/reactos/lib/aclui/sidcache.c b/reactos/lib/aclui/sidcache.c
index 1ab245e..73513ff 100644 (file)
--- a/reactos/lib/aclui/sidcache.c
+++ b/reactos/lib/aclui/sidcache.c
@@ -583,8 +583,7 @@ CreateSidCacheMgr(IN HANDLE Heap,
     scm = HeapAlloc(Heap,
                     0,
                     FIELD_OFFSET(SIDCACHEMGR,
     scm = HeapAlloc(Heap,
                     0,
                     FIELD_OFFSET(SIDCACHEMGR,

-                                 SystemName[0]) +
-                        ((wcslen(SystemName) + 1) * sizeof(WCHAR)));
+                                 SystemName[wcslen(SystemName) + 1]));

     if (scm != NULL)
     {
         /* zero the static part of the structure */
     if (scm != NULL)
     {
         /* zero the static part of the structure */