[ros-diffs] [weiden] 20797: minor fixes and use a .spec file

minor fixes and use a .spec file
Modified: trunk/reactos/lib/aclui/aclui.c
Deleted: trunk/reactos/lib/aclui/aclui.def
Added: trunk/reactos/lib/aclui/aclui.spec
Modified: trunk/reactos/lib/aclui/aclui.xml
Modified: trunk/reactos/lib/aclui/aclui_Hu.rc
Modified: trunk/reactos/lib/aclui/precomp.h
Modified: trunk/reactos/lib/aclui/sidcache.c
  _____  

Modified: trunk/reactos/lib/aclui/aclui.c
--- trunk/reactos/lib/aclui/aclui.c	2006-01-12 00:13:45 UTC (rev
20796)
+++ trunk/reactos/lib/aclui/aclui.c	2006-01-12 00:19:35 UTC (rev
20797)
@@ -342,6 +342,27 @@

     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,
@@ -543,7 +564,7 @@
         LPWSTR szLabel;
         LPWSTR szDisplayString;
 
-        szDisplayString = GetPrincipalDisplayString(Selected);
+        szDisplayString = GetPrincipalAccountNameString(Selected);
         if (LoadAndFormatString(hDllInstance,
                                 IDS_PERMISSIONS_FOR,
                                 &szLabel,
  _____  

Deleted: trunk/reactos/lib/aclui/aclui.def
--- trunk/reactos/lib/aclui/aclui.def	2006-01-12 00:13:45 UTC (rev
20796)
+++ trunk/reactos/lib/aclui/aclui.def	2006-01-12 00:19:35 UTC (rev
20797)
@@ -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
  _____  

Added: trunk/reactos/lib/aclui/aclui.spec
--- trunk/reactos/lib/aclui/aclui.spec	2006-01-12 00:13:45 UTC (rev
20796)
+++ trunk/reactos/lib/aclui/aclui.spec	2006-01-12 00:19:35 UTC (rev
20797)
@@ -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
Property changes on: trunk/reactos/lib/aclui/aclui.spec
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Modified: trunk/reactos/lib/aclui/aclui.xml
--- trunk/reactos/lib/aclui/aclui.xml	2006-01-12 00:13:45 UTC (rev
20796)
+++ trunk/reactos/lib/aclui/aclui.xml	2006-01-12 00:19:35 UTC (rev
20797)
@@ -1,5 +1,5 @@

 <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" />
@@ -22,5 +22,6 @@
 	<file>misc.c</file>
 	<file>sidcache.c</file>
 	<file>aclui.rc</file>
+	<file>aclui.spec</file>
 	<pch>precomp.h</pch>
 </module>
  _____  

Modified: trunk/reactos/lib/aclui/aclui_Hu.rc
--- trunk/reactos/lib/aclui/aclui_Hu.rc	2006-01-12 00:13:45 UTC (rev
20796)
+++ trunk/reactos/lib/aclui/aclui_Hu.rc	2006-01-12 00:19:35 UTC (rev
20797)
@@ -1,35 +1,35 @@

-/*
- * 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"
-}
-
+/*
+ * 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"
+}
+
Property changes on: trunk/reactos/lib/aclui/aclui_Hu.rc
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Modified: trunk/reactos/lib/aclui/precomp.h
--- trunk/reactos/lib/aclui/precomp.h	2006-01-12 00:13:45 UTC (rev
20796)
+++ trunk/reactos/lib/aclui/precomp.h	2006-01-12 00:19:35 UTC (rev
20797)
@@ -62,6 +62,9 @@

     SI_ACCESS DefaultAccess;
 
     HANDLE SidCacheMgr;
+    LONG SidLookupsPending;
+    BOOL Initializing : 1;
+
     LPCWSTR ServerName;
 } SECURITY_PAGE, *PSECURITY_PAGE;
 
  _____  

Modified: trunk/reactos/lib/aclui/sidcache.c
--- trunk/reactos/lib/aclui/sidcache.c	2006-01-12 00:13:45 UTC (rev
20796)
+++ trunk/reactos/lib/aclui/sidcache.c	2006-01-12 00:19:35 UTC (rev
20797)
@@ -583,8 +583,7 @@

     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 */