Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57587: [NTDLL/KERNEL32] - Use new naming scheme. [CSRSRV] - Continuing headers reorganization. - Activate new code. [CSRSRV/WIN32CSR] - Move some code into basesrv. [BASESRV] - Add bases...
by hbelusca＠svn.reactos.org 20 Oct '12

20 Oct '12

Author: hbelusca Date: Sat Oct 20 21:03:32 2012 New Revision: 57587 URL: http://svn.reactos.org/svn/reactos?rev=57587&view=rev Log: [NTDLL/KERNEL32] - Use new naming scheme. [CSRSRV] - Continuing headers reorganization. - Activate new code. [CSRSRV/WIN32CSR] - Move some code into basesrv. [BASESRV] - Add basesrv.dll The names of the APIs tables come from http://j00ru.vexillium.org/csrss_list/api_list.html as usual, however I used the NT 4 ones for testing purposes only. After that I will update them to 2k3 version and add function stubs. Also some variable names are deduced from the subsystems/win32/csrss/csrsrv/server.c ones. Added: branches/ros-csrss/include/reactos/subsys/win/console.h (with props) branches/ros-csrss/subsystems/win/basesrv/CMakeLists.txt (with props) branches/ros-csrss/subsystems/win/basesrv/basesrv.spec (with props) Removed: branches/ros-csrss/include/reactos/subsys/csrss/csrcons.h branches/ros-csrss/subsystems/win/basesrv/basesrv.def branches/ros-csrss/subsystems/win/basesrv/main.c branches/ros-csrss/win32ss/user/win32csr/file.c branches/ros-csrss/win32ss/user/win32csr/file.h Modified: branches/ros-csrss/dll/ntdll/csr/api.c branches/ros-csrss/dll/win32/kernel32/client/dosdev.c branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c branches/ros-csrss/dll/win32/kernel32/client/file/filename.c branches/ros-csrss/dll/win32/kernel32/client/proc.c branches/ros-csrss/dll/win32/kernel32/client/vdm.c branches/ros-csrss/include/reactos/subsys/csrss/csrss.h branches/ros-csrss/include/reactos/subsys/win/base.h (contents, props changed) branches/ros-csrss/include/reactos/subsys/win/windows.h (contents, props changed) branches/ros-csrss/subsystems/win/basesrv/basesrv.h (contents, props changed) branches/ros-csrss/subsystems/win/basesrv/basesrv.rc (contents, props changed) branches/ros-csrss/subsystems/win/basesrv/init.c (contents, props changed) branches/ros-csrss/subsystems/win/basesrv/server.c (contents, props changed) branches/ros-csrss/subsystems/win32/csrsrv/api/process.c branches/ros-csrss/subsystems/win32/csrsrv/api/wapi.c branches/ros-csrss/subsystems/win32/csrsrv/init.c branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/server.c branches/ros-csrss/win32ss/user/win32csr/CMakeLists.txt branches/ros-csrss/win32ss/user/win32csr/dllmain.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/dll/ntdll/csr/api.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/api.c?r… Modified: branches/ros-csrss/dll/win32/kernel32/client/dosdev.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/file/filename.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Modified: branches/ros-csrss/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl… Removed: branches/ros-csrss/include/reactos/subsys/csrss/csrcons.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Modified: branches/ros-csrss/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Modified: branches/ros-csrss/include/reactos/subsys/win/base.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Added: branches/ros-csrss/include/reactos/subsys/win/console.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Modified: branches/ros-csrss/include/reactos/subsys/win/windows.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy… Added: branches/ros-csrss/subsystems/win/basesrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… Removed: branches/ros-csrss/subsystems/win/basesrv/basesrv.def URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… Modified: branches/ros-csrss/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… Modified: branches/ros-csrss/subsystems/win/basesrv/basesrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… Added: branches/ros-csrss/subsystems/win/basesrv/basesrv.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… Modified: branches/ros-csrss/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… Removed: branches/ros-csrss/subsystems/win/basesrv/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… Modified: branches/ros-csrss/subsystems/win/basesrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… Modified: branches/ros-csrss/subsystems/win32/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/win32ss/user/win32csr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr… Modified: branches/ros-csrss/win32ss/user/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr… Removed: branches/ros-csrss/win32ss/user/win32csr/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr… Removed: branches/ros-csrss/win32ss/user/win32csr/file.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/win32csr…

1 0

[ekohl] 57585: [LSASRV] Rename sids.c to lookup.c because the new name fits much better.
by ekohl＠svn.reactos.org 20 Oct '12

20 Oct '12

Author: ekohl Date: Sat Oct 20 14:21:32 2012 New Revision: 57585 URL: http://svn.reactos.org/svn/reactos?rev=57585&view=rev Log: [LSASRV] Rename sids.c to lookup.c because the new name fits much better. Added: trunk/reactos/dll/win32/lsasrv/lookup.c - copied, changed from r57581, trunk/reactos/dll/win32/lsasrv/sids.c Removed: trunk/reactos/dll/win32/lsasrv/sids.c Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/lsasrv.h Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Sat Oct 20 14:21:32 2012 @@ -13,11 +13,11 @@ list(APPEND SOURCE authport.c database.c + lookup.c lsarpc.c lsasrv.c policy.c privileges.c - sids.c lsasrv.rc ${CMAKE_CURRENT_BINARY_DIR}/lsasrv_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def Copied: trunk/reactos/dll/win32/lsasrv/lookup.c (from r57581, trunk/reactos/dll/win32/lsasrv/sids.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lookup.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] Sat Oct 20 14:21:32 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: Local Security Authority (LSA) Server - * FILE: reactos/dll/win32/lsasrv/sids.c + * FILE: reactos/dll/win32/lsasrv/lookup.c * PURPOSE: Sid / Name lookup functions * * PROGRAMMERS: Eric Kohl Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sat Oct 20 14:21:32 2012 @@ -118,90 +118,7 @@ LPVOID AttributeData, ULONG AttributeSize); -/* lsarpc.c */ -VOID -LsarStartRpcServer(VOID); - -/* policy.c */ -NTSTATUS -LsarQueryAuditLog(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation); - -NTSTATUS -LsarQueryAuditEvents(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation); - -NTSTATUS -LsarQueryPrimaryDomain(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation); - -NTSTATUS -LsarQueryPdAccount(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation); - -NTSTATUS -LsarQueryAccountDomain(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation); - -NTSTATUS -LsarQueryServerRole(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation); - -NTSTATUS -LsarQueryReplicaSource(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation); - -NTSTATUS -LsarQueryDefaultQuota(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation); - -NTSTATUS -LsarQueryModification(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation); - -NTSTATUS -LsarQueryAuditFull(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation); - -NTSTATUS -LsarQueryDnsDomain(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation); - -NTSTATUS -LsarQueryDnsDomainInt(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation); - -NTSTATUS -LsarQueryLocalAccountDomain(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_INFORMATION *PolicyInformation); - -NTSTATUS -LsarSetPrimaryDomain(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_PRIMARY_DOM_INFO Info); - -NTSTATUS -LsarSetAccountDomain(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_ACCOUNT_DOM_INFO Info); - -NTSTATUS -LsarSetDnsDomain(PLSA_DB_OBJECT PolicyObject, - PLSAPR_POLICY_DNS_DOMAIN_INFO Info); - -/* privileges.c */ -NTSTATUS -LsarpLookupPrivilegeName(PLUID Value, - PUNICODE_STRING *Name); - -NTSTATUS -LsarpLookupPrivilegeValue(PUNICODE_STRING Name, - PLUID Value); - -NTSTATUS -LsarpEnumeratePrivileges(DWORD *EnumerationContext, - PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer, - DWORD PreferedMaximumLength); - -/* sids.h */ +/* lookup.c */ NTSTATUS LsapInitSids(VOID); @@ -227,4 +144,87 @@ DWORD LookupOptions, DWORD ClientRevision); +/* lsarpc.c */ +VOID +LsarStartRpcServer(VOID); + +/* policy.c */ +NTSTATUS +LsarQueryAuditLog(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryAuditEvents(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryPrimaryDomain(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryPdAccount(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryAccountDomain(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryServerRole(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryReplicaSource(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryDefaultQuota(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryModification(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryAuditFull(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryDnsDomain(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryDnsDomainInt(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarQueryLocalAccountDomain(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS +LsarSetPrimaryDomain(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_PRIMARY_DOM_INFO Info); + +NTSTATUS +LsarSetAccountDomain(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_ACCOUNT_DOM_INFO Info); + +NTSTATUS +LsarSetDnsDomain(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_DNS_DOMAIN_INFO Info); + +/* privileges.c */ +NTSTATUS +LsarpLookupPrivilegeName(PLUID Value, + PUNICODE_STRING *Name); + +NTSTATUS +LsarpLookupPrivilegeValue(PUNICODE_STRING Name, + PLUID Value); + +NTSTATUS +LsarpEnumeratePrivileges(DWORD *EnumerationContext, + PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer, + DWORD PreferedMaximumLength); + /* EOF */ Removed: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c (removed) @@ -1,2418 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Local Security Authority (LSA) Server - * FILE: reactos/dll/win32/lsasrv/sids.c - * PURPOSE: Sid / Name lookup functions - * - * PROGRAMMERS: Eric Kohl - */ -#include "lsasrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - -typedef wchar_t *PSAMPR_SERVER_NAME; -typedef void *SAMPR_HANDLE; - -typedef struct _SAMPR_RETURNED_USTRING_ARRAY -{ - unsigned long Count; - PRPC_UNICODE_STRING Element; -} SAMPR_RETURNED_USTRING_ARRAY, *PSAMPR_RETURNED_USTRING_ARRAY; - -typedef struct _SAMPR_ULONG_ARRAY -{ - unsigned long Count; - unsigned long *Element; -} SAMPR_ULONG_ARRAY, *PSAMPR_ULONG_ARRAY; - - -VOID -NTAPI -SamIFree_SAMPR_RETURNED_USTRING_ARRAY(PSAMPR_RETURNED_USTRING_ARRAY Ptr); - -VOID -NTAPI -SamIFree_SAMPR_ULONG_ARRAY(PSAMPR_ULONG_ARRAY Ptr); - -NTSTATUS -NTAPI -SamrConnect(IN PSAMPR_SERVER_NAME ServerName, - OUT SAMPR_HANDLE *ServerHandle, - IN ACCESS_MASK DesiredAccess); - -NTSTATUS -NTAPI -SamrCloseHandle(IN OUT SAMPR_HANDLE *SamHandle); - -NTSTATUS -NTAPI -SamrOpenDomain(IN SAMPR_HANDLE ServerHandle, - IN ACCESS_MASK DesiredAccess, - IN PRPC_SID DomainId, - OUT SAMPR_HANDLE *DomainHandle); - -NTSTATUS -NTAPI -SamrLookupIdsInDomain(IN SAMPR_HANDLE DomainHandle, - IN ULONG Count, - IN ULONG *RelativeIds, - OUT PSAMPR_RETURNED_USTRING_ARRAY Names, - OUT PSAMPR_ULONG_ARRAY Use); - -NTSTATUS -NTAPI -SamrLookupNamesInDomain(IN SAMPR_HANDLE DomainHandle, - IN ULONG Count, - IN RPC_UNICODE_STRING Names[], - OUT PSAMPR_ULONG_ARRAY RelativeIds, - OUT PSAMPR_ULONG_ARRAY Use); - - -typedef struct _WELL_KNOWN_SID -{ - LIST_ENTRY ListEntry; - PSID Sid; - UNICODE_STRING AccountName; - UNICODE_STRING DomainName; - SID_NAME_USE Use; -} WELL_KNOWN_SID, *PWELL_KNOWN_SID; - - -LIST_ENTRY WellKnownSidListHead; - -#if 0 -typedef struct _AccountSid -{ - WELL_KNOWN_SID_TYPE type; - LPCWSTR account; - LPCWSTR domain; - SID_NAME_USE name_use; -} AccountSid; - -static const WCHAR Account_Operators[] = { 'A','c','c','o','u','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR Administrator[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r',0 }; -static const WCHAR Administrators[] = { 'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0 }; -static const WCHAR ANONYMOUS_LOGON[] = { 'A','N','O','N','Y','M','O','U','S',' ','L','O','G','O','N',0 }; -static const WCHAR Authenticated_Users[] = { 'A','u','t','h','e','n','t','i','c','a','t','e','d',' ','U','s','e','r','s',0 }; -static const WCHAR Backup_Operators[] = { 'B','a','c','k','u','p',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR BATCH[] = { 'B','A','T','C','H',0 }; -static const WCHAR Blank[] = { 0 }; -static const WCHAR BUILTIN[] = { 'B','U','I','L','T','I','N',0 }; -static const WCHAR Cert_Publishers[] = { 'C','e','r','t',' ','P','u','b','l','i','s','h','e','r','s',0 }; -static const WCHAR CREATOR_GROUP[] = { 'C','R','E','A','T','O','R',' ','G','R','O','U','P',0 }; -static const WCHAR CREATOR_GROUP_SERVER[] = { 'C','R','E','A','T','O','R',' ','G','R','O','U','P',' ','S','E','R','V','E','R',0 }; -static const WCHAR CREATOR_OWNER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',0 }; -static const WCHAR CREATOR_OWNER_SERVER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',' ','S','E','R','V','E','R',0 }; -static const WCHAR DIALUP[] = { 'D','I','A','L','U','P',0 }; -static const WCHAR Digest_Authentication[] = { 'D','i','g','e','s','t',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; -static const WCHAR DOMAIN[] = {'D','O','M','A','I','N',0}; -static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','i','n','s',0 }; -static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 }; -static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 }; -static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 }; -static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 }; -static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 }; -static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 }; -static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 }; -static const WCHAR Group_Policy_Creator_Owners[] = { 'G','r','o','u','p',' ','P','o','l','i','c','y',' ','C','r','e','a','t','o','r',' ','O','w','n','e','r','s',0 }; -static const WCHAR Guest[] = { 'G','u','e','s','t',0 }; -static const WCHAR Guests[] = { 'G','u','e','s','t','s',0 }; -static const WCHAR INTERACTIVE[] = { 'I','N','T','E','R','A','C','T','I','V','E',0 }; -static const WCHAR LOCAL[] = { 'L','O','C','A','L',0 }; -static const WCHAR LOCAL_SERVICE[] = { 'L','O','C','A','L',' ','S','E','R','V','I','C','E',0 }; -static const WCHAR NETWORK[] = { 'N','E','T','W','O','R','K',0 }; -static const WCHAR Network_Configuration_Operators[] = { 'N','e','t','w','o','r','k',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR NETWORK_SERVICE[] = { 'N','E','T','W','O','R','K',' ','S','E','R','V','I','C','E',0 }; -static const WCHAR NT_AUTHORITY[] = { 'N','T',' ','A','U','T','H','O','R','I','T','Y',0 }; -static const WCHAR NT_Pseudo_Domain[] = { 'N','T',' ','P','s','e','u','d','o',' ','D','o','m','a','i','n',0 }; -static const WCHAR NTML_Authentication[] = { 'N','T','M','L',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; -static const WCHAR NULL_SID[] = { 'N','U','L','L',' ','S','I','D',0 }; -static const WCHAR Other_Organization[] = { 'O','t','h','e','r',' ','O','r','g','a','n','i','z','a','t','i','o','n',0 }; -static const WCHAR Performance_Log_Users[] = { 'P','e','r','f','o','r','m','a','n','c','e',' ','L','o','g',' ','U','s','e','r','s',0 }; -static const WCHAR Performance_Monitor_Users[] = { 'P','e','r','f','o','r','m','a','n','c','e',' ','M','o','n','i','t','o','r',' ','U','s','e','r','s',0 }; -static const WCHAR Power_Users[] = { 'P','o','w','e','r',' ','U','s','e','r','s',0 }; -static const WCHAR Pre_Windows_2000_Compatible_Access[] = { 'P','r','e','-','W','i','n','d','o','w','s',' ','2','0','0','0',' ','C','o','m','p','a','t','i','b','l','e',' ','A','c','c','e','s','s',0 }; -static const WCHAR Print_Operators[] = { 'P','r','i','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR PROXY[] = { 'P','R','O','X','Y',0 }; -static const WCHAR RAS_and_IAS_Servers[] = { 'R','A','S',' ','a','n','d',' ','I','A','S',' ','S','e','r','v','e','r','s',0 }; -static const WCHAR Remote_Desktop_Users[] = { 'R','e','m','o','t','e',' ','D','e','s','k','t','o','p',' ','U','s','e','r','s',0 }; -static const WCHAR REMOTE_INTERACTIVE_LOGON[] = { 'R','E','M','O','T','E',' ','I','N','T','E','R','A','C','T','I','V','E',' ','L','O','G','O','N',0 }; -static const WCHAR Replicators[] = { 'R','e','p','l','i','c','a','t','o','r','s',0 }; -static const WCHAR RESTRICTED[] = { 'R','E','S','T','R','I','C','T','E','D',0 }; -static const WCHAR SChannel_Authentication[] = { 'S','C','h','a','n','n','e','l',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; -static const WCHAR Schema_Admins[] = { 'S','c','h','e','m','a',' ','A','d','m','i','n','s',0 }; -static const WCHAR SELF[] = { 'S','E','L','F',0 }; -static const WCHAR Server_Operators[] = { 'S','e','r','v','e','r',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR SERVICE[] = { 'S','E','R','V','I','C','E',0 }; -static const WCHAR SYSTEM[] = { 'S','Y','S','T','E','M',0 }; -static const WCHAR TERMINAL_SERVER_USER[] = { 'T','E','R','M','I','N','A','L',' ','S','E','R','V','E','R',' ','U','S','E','R',0 }; -static const WCHAR This_Organization[] = { 'T','h','i','s',' ','O','r','g','a','n','i','z','a','t','i','o','n',0 }; -static const WCHAR Users[] = { 'U','s','e','r','s',0 }; - -static const AccountSid ACCOUNT_SIDS[] = { -// { WinNullSid, NULL_SID, Blank, SidTypeWellKnownGroup }, -// { WinWorldSid, Everyone, Blank, SidTypeWellKnownGroup }, -// { WinLocalSid, LOCAL, Blank, SidTypeWellKnownGroup }, -// { WinCreatorOwnerSid, CREATOR_OWNER, Blank, SidTypeWellKnownGroup }, -// { WinCreatorGroupSid, CREATOR_GROUP, Blank, SidTypeWellKnownGroup }, -// { WinCreatorOwnerServerSid, CREATOR_OWNER_SERVER, Blank, SidTypeWellKnownGroup }, -// { WinCreatorGroupServerSid, CREATOR_GROUP_SERVER, Blank, SidTypeWellKnownGroup }, -// { WinNtAuthoritySid, NT_Pseudo_Domain, NT_Pseudo_Domain, SidTypeDomain }, -// { WinDialupSid, DIALUP, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinNetworkSid, NETWORK, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinBatchSid, BATCH, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinInteractiveSid, INTERACTIVE, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinServiceSid, SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinAnonymousSid, ANONYMOUS_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinProxySid, PROXY, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinEnterpriseControllersSid, ENTERPRISE_DOMAIN_CONTROLLERS, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinSelfSid, SELF, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinAuthenticatedUserSid, Authenticated_Users, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinRestrictedCodeSid, RESTRICTED, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinTerminalServerSid, TERMINAL_SERVER_USER, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinRemoteLogonIdSid, REMOTE_INTERACTIVE_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinLocalSystemSid, SYSTEM, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinLocalServiceSid, LOCAL_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinNetworkServiceSid, NETWORK_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinBuiltinDomainSid, BUILTIN, BUILTIN, SidTypeDomain }, -// { WinBuiltinAdministratorsSid, Administrators, BUILTIN, SidTypeAlias }, -// { WinBuiltinUsersSid, Users, BUILTIN, SidTypeAlias }, -// { WinBuiltinGuestsSid, Guests, BUILTIN, SidTypeAlias }, -// { WinBuiltinPowerUsersSid, Power_Users, BUILTIN, SidTypeAlias }, -// { WinBuiltinAccountOperatorsSid, Account_Operators, BUILTIN, SidTypeAlias }, -// { WinBuiltinSystemOperatorsSid, Server_Operators, BUILTIN, SidTypeAlias }, -// { WinBuiltinPrintOperatorsSid, Print_Operators, BUILTIN, SidTypeAlias }, -// { WinBuiltinBackupOperatorsSid, Backup_Operators, BUILTIN, SidTypeAlias }, -// { WinBuiltinReplicatorSid, Replicators, BUILTIN, SidTypeAlias }, -// { WinBuiltinPreWindows2000CompatibleAccessSid, Pre_Windows_2000_Compatible_Access, BUILTIN, SidTypeAlias }, -// { WinBuiltinRemoteDesktopUsersSid, Remote_Desktop_Users, BUILTIN, SidTypeAlias }, -// { WinBuiltinNetworkConfigurationOperatorsSid, Network_Configuration_Operators, BUILTIN, SidTypeAlias }, - { WinNTLMAuthenticationSid, NTML_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinDigestAuthenticationSid, Digest_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinSChannelAuthenticationSid, SChannel_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinThisOrganizationSid, This_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinOtherOrganizationSid, Other_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinBuiltinPerfMonitoringUsersSid, Performance_Monitor_Users, BUILTIN, SidTypeAlias }, - { WinBuiltinPerfLoggingUsersSid, Performance_Log_Users, BUILTIN, SidTypeAlias }, -}; -#endif - - -BOOLEAN -LsapCreateSid(PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, - UCHAR SubAuthorityCount, - PULONG SubAuthorities, - PWSTR AccountName, - PWSTR DomainName, - SID_NAME_USE Use) -{ - PWELL_KNOWN_SID SidEntry; - PULONG p; - ULONG i; - - SidEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WELL_KNOWN_SID)); - if (SidEntry == NULL) - return FALSE; - - InitializeListHead(&SidEntry->ListEntry); - - SidEntry->Sid = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - RtlLengthRequiredSid(SubAuthorityCount)); - if (SidEntry->Sid == NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, SidEntry); - return FALSE; - } - - RtlInitializeSid(SidEntry->Sid, - IdentifierAuthority, - SubAuthorityCount); - - for (i = 0; i < (ULONG)SubAuthorityCount; i++) - { - p = RtlSubAuthoritySid(SidEntry->Sid, i); - *p = SubAuthorities[i]; - } - - RtlInitUnicodeString(&SidEntry->AccountName, - AccountName); - - RtlInitUnicodeString(&SidEntry->DomainName, - DomainName); - - SidEntry->Use = Use; - - InsertTailList(&WellKnownSidListHead, - &SidEntry->ListEntry); - - return TRUE; -} - - -NTSTATUS -LsapInitSids(VOID) -{ - ULONG SubAuthorities[8]; - - InitializeListHead(&WellKnownSidListHead); - - /* NT Authority */ - LsapCreateSid(&NtAuthority, - 0, - NULL, - L"NT AUTHORITY", - L"NT AUTHORITY", - SidTypeDomain); - - /* Null Sid */ - SubAuthorities[0] = SECURITY_NULL_RID; - LsapCreateSid(&NullSidAuthority, - 1, - SubAuthorities, - L"NULL SID", - L"", - SidTypeWellKnownGroup); - - /* World Sid */ - SubAuthorities[0] = SECURITY_WORLD_RID; - LsapCreateSid(&WorldSidAuthority, - 1, - SubAuthorities, - L"Everyone", - L"", - SidTypeWellKnownGroup); - - /* Local Sid */ - SubAuthorities[0] = SECURITY_LOCAL_RID; - LsapCreateSid(&LocalSidAuthority, - 1, - SubAuthorities, - L"LOCAL", - L"", - SidTypeWellKnownGroup); - - /* Creator Owner Sid */ - SubAuthorities[0] = SECURITY_CREATOR_OWNER_RID; - LsapCreateSid(&CreatorSidAuthority, - 1, - SubAuthorities, - L"CREATOR OWNER", - L"", - SidTypeWellKnownGroup); - - /* Creator Group Sid */ - SubAuthorities[0] = SECURITY_CREATOR_GROUP_RID; - LsapCreateSid(&CreatorSidAuthority, - 1, - SubAuthorities, - L"CREATOR GROUP", - L"", - SidTypeWellKnownGroup); - - /* Creator Owner Server Sid */ - SubAuthorities[0] = SECURITY_CREATOR_OWNER_SERVER_RID; - LsapCreateSid(&CreatorSidAuthority, - 1, - SubAuthorities, - L"CREATOR OWNER SERVER", - L"", - SidTypeWellKnownGroup); - - /* Creator Group Server Sid */ - SubAuthorities[0] = SECURITY_CREATOR_GROUP_SERVER_RID; - LsapCreateSid(&CreatorSidAuthority, - 1, - SubAuthorities, - L"CREATOR GROUP SERVER", - L"", - SidTypeWellKnownGroup); - - /* Dialup Sid */ - SubAuthorities[0] = SECURITY_DIALUP_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"DIALUP", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Network Sid */ - SubAuthorities[0] = SECURITY_NETWORK_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"NETWORK", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Batch Sid*/ - SubAuthorities[0] = SECURITY_BATCH_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"BATCH", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Interactive Sid */ - SubAuthorities[0] = SECURITY_INTERACTIVE_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"INTERACTIVE", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Service Sid */ - SubAuthorities[0] = SECURITY_SERVICE_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"SERVICE", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Anonymous Logon Sid */ - SubAuthorities[0] = SECURITY_ANONYMOUS_LOGON_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"ANONYMOUS LOGON", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Proxy Sid */ - SubAuthorities[0] = SECURITY_PROXY_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"PROXY", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Enterprise Controllers Sid */ - SubAuthorities[0] = SECURITY_ENTERPRISE_CONTROLLERS_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"ENTERPRISE DOMAIN CONTROLLERS", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Principal Self Sid */ - SubAuthorities[0] = SECURITY_PRINCIPAL_SELF_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"SELF", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Authenticated Users Sid */ - SubAuthorities[0] = SECURITY_AUTHENTICATED_USER_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"Authenticated Users", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Restricted Code Sid */ - SubAuthorities[0] = SECURITY_RESTRICTED_CODE_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"RESTRICTED", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Terminal Server Sid */ - SubAuthorities[0] = SECURITY_TERMINAL_SERVER_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"TERMINAL SERVER USER", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Remote Logon Sid */ - SubAuthorities[0] = SECURITY_REMOTE_LOGON_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"REMOTE INTERACTIVE LOGON", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* This Organization Sid */ - SubAuthorities[0] = SECURITY_THIS_ORGANIZATION_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"This Organization", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Local System Sid */ - SubAuthorities[0] = SECURITY_LOCAL_SYSTEM_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"SYSTEM", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Local Service Sid */ - SubAuthorities[0] = SECURITY_LOCAL_SERVICE_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"LOCAL SERVICE", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"LOCALSERVICE", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Network Service Sid */ - SubAuthorities[0] = SECURITY_NETWORK_SERVICE_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"NETWORK SERVICE", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"NETWORKSERVICE", - L"NT AUTHORITY", - SidTypeWellKnownGroup); - - /* Builtin Domain Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - LsapCreateSid(&NtAuthority, - 1, - SubAuthorities, - L"BUILTIN", - L"BUILTIN", - SidTypeDomain); - - /* Administrators Alias Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - SubAuthorities[1] = DOMAIN_ALIAS_RID_ADMINS; - LsapCreateSid(&NtAuthority, - 2, - SubAuthorities, - L"Administrators", - L"BUILTIN", - SidTypeAlias); - - /* Users Alias Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - SubAuthorities[1] = DOMAIN_ALIAS_RID_USERS; - LsapCreateSid(&NtAuthority, - 2, - SubAuthorities, - L"Users", - L"BUILTIN", - SidTypeAlias); - - /* Guests Alias Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - SubAuthorities[1] = DOMAIN_ALIAS_RID_GUESTS; - LsapCreateSid(&NtAuthority, - 2, - SubAuthorities, - L"Guests", - L"BUILTIN", - SidTypeAlias); - - /* Power User Alias Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - SubAuthorities[1] = DOMAIN_ALIAS_RID_POWER_USERS; - LsapCreateSid(&NtAuthority, - 2, - SubAuthorities, - L"Power User", - L"BUILTIN", - SidTypeAlias); - - /* Account Operators Alias Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - SubAuthorities[1] = DOMAIN_ALIAS_RID_ACCOUNT_OPS; - LsapCreateSid(&NtAuthority, - 2, - SubAuthorities, - L"Account Operators", - L"BUILTIN", - SidTypeAlias); - - /* System Operators Alias Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - SubAuthorities[1] = DOMAIN_ALIAS_RID_SYSTEM_OPS; - LsapCreateSid(&NtAuthority, - 2, - SubAuthorities, - L"Server Operators", - L"BUILTIN", - SidTypeAlias); - - /* Print Operators Alias Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - SubAuthorities[1] = DOMAIN_ALIAS_RID_PRINT_OPS; - LsapCreateSid(&NtAuthority, - 2, - SubAuthorities, - L"Print Operators", - L"BUILTIN", - SidTypeAlias); - - /* Backup Operators Alias Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - SubAuthorities[1] = DOMAIN_ALIAS_RID_BACKUP_OPS; - LsapCreateSid(&NtAuthority, - 2, - SubAuthorities, - L"Backup Operators", - L"BUILTIN", - SidTypeAlias); - - /* Replicators Alias Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - SubAuthorities[1] = DOMAIN_ALIAS_RID_REPLICATOR; - LsapCreateSid(&NtAuthority, - 2, - SubAuthorities, - L"Replicators", - L"BUILTIN", - SidTypeAlias); - -#if 0 - /* RAS Servers Alias Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - SubAuthorities[1] = DOMAIN_ALIAS_RID_RAS_SERVERS; - LsapCreateSid(&NtAuthority, - 2, - SubAuthorities, - L"Backup Operators", - L"BUILTIN", - SidTypeAlias); -#endif - - /* Pre-Windows 2000 Compatible Access Alias Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - SubAuthorities[1] = DOMAIN_ALIAS_RID_PREW2KCOMPACCESS; - LsapCreateSid(&NtAuthority, - 2, - SubAuthorities, - L"Pre-Windows 2000 Compatible Access", - L"BUILTIN", - SidTypeAlias); - - /* Remote Desktop Users Alias Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - SubAuthorities[1] = DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS; - LsapCreateSid(&NtAuthority, - 2, - SubAuthorities, - L"Remote Desktop Users", - L"BUILTIN", - SidTypeAlias); - - /* Network Configuration Operators Alias Sid */ - SubAuthorities[0] = SECURITY_BUILTIN_DOMAIN_RID; - SubAuthorities[1] = DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS; - LsapCreateSid(&NtAuthority, - 2, - SubAuthorities, - L"Network Configuration Operators", - L"BUILTIN", - SidTypeAlias); - - /* FIXME: Add more well known sids */ - - return STATUS_SUCCESS; -} - - -PWELL_KNOWN_SID -LsapLookupWellKnownSid(PSID Sid) -{ - PLIST_ENTRY ListEntry; - PWELL_KNOWN_SID Ptr; - - ListEntry = WellKnownSidListHead.Flink; - while (ListEntry != &WellKnownSidListHead) - { - Ptr = CONTAINING_RECORD(ListEntry, - WELL_KNOWN_SID, - ListEntry); - if (RtlEqualSid(Sid, Ptr->Sid)) - { - return Ptr; - } - - ListEntry = ListEntry->Flink; - } - - return NULL; -} - - -PWELL_KNOWN_SID -LsapLookupIsolatedWellKnownName(PUNICODE_STRING AccountName) -{ - PLIST_ENTRY ListEntry; - PWELL_KNOWN_SID Ptr; - - ListEntry = WellKnownSidListHead.Flink; - while (ListEntry != &WellKnownSidListHead) - { - Ptr = CONTAINING_RECORD(ListEntry, - WELL_KNOWN_SID, - ListEntry); - if (RtlEqualUnicodeString(AccountName, &Ptr->AccountName, TRUE)) - { - return Ptr; - } - - ListEntry = ListEntry->Flink; - } - - return NULL; -} - - -PWELL_KNOWN_SID -LsapLookupFullyQualifiedWellKnownName(PUNICODE_STRING AccountName, - PUNICODE_STRING DomainName) -{ - PLIST_ENTRY ListEntry; - PWELL_KNOWN_SID Ptr; - - ListEntry = WellKnownSidListHead.Flink; - while (ListEntry != &WellKnownSidListHead) - { - Ptr = CONTAINING_RECORD(ListEntry, - WELL_KNOWN_SID, - ListEntry); - if (RtlEqualUnicodeString(AccountName, &Ptr->AccountName, TRUE) && - RtlEqualUnicodeString(DomainName, &Ptr->DomainName, TRUE)) - { - return Ptr; - } - - ListEntry = ListEntry->Flink; - } - - return NULL; -} - - -static -NTSTATUS -LsapSplitNames(DWORD Count, - PRPC_UNICODE_STRING Names, - PRPC_UNICODE_STRING *DomainNames, - PRPC_UNICODE_STRING *AccountNames) -{ - PRPC_UNICODE_STRING DomainsBuffer = NULL; - PRPC_UNICODE_STRING AccountsBuffer = NULL; - ULONG DomainLength; - ULONG AccountLength; - ULONG i; - LPWSTR Ptr; - NTSTATUS Status = STATUS_SUCCESS; - - DomainsBuffer = MIDL_user_allocate(Count * sizeof(RPC_UNICODE_STRING)); - if (DomainsBuffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - AccountsBuffer = MIDL_user_allocate(Count * sizeof(RPC_UNICODE_STRING)); - if (AccountsBuffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - for (i = 0; i < Count; i++) - { -//TRACE("Name: %wZ\n", &Names[i]); - - Ptr = wcschr(Names[i].Buffer, L'\\'); - if (Ptr == NULL) - { - AccountLength = Names[i].Length / sizeof(WCHAR); - - AccountsBuffer[i].Length = Names[i].Length; - AccountsBuffer[i].MaximumLength = AccountsBuffer[i].Length + sizeof(WCHAR); - AccountsBuffer[i].Buffer = MIDL_user_allocate(AccountsBuffer[i].MaximumLength); - if (AccountsBuffer[i].Buffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - CopyMemory(AccountsBuffer[i].Buffer, - Names[i].Buffer, - AccountsBuffer[i].Length); - AccountsBuffer[i].Buffer[AccountLength] = UNICODE_NULL; - -//TRACE("Account name: %wZ\n", &AccountsBuffer[i]); - } - else - { - DomainLength = (ULONG)(ULONG_PTR)(Ptr - Names[i].Buffer); - AccountLength = (Names[i].Length / sizeof(WCHAR)) - DomainLength - 1; -//TRACE("DomainLength: %u\n", DomainLength); -//TRACE("AccountLength: %u\n", AccountLength); - - if (DomainLength > 0) - { - DomainsBuffer[i].Length = (USHORT)DomainLength * sizeof(WCHAR); - DomainsBuffer[i].MaximumLength = DomainsBuffer[i].Length + sizeof(WCHAR); - DomainsBuffer[i].Buffer = MIDL_user_allocate(DomainsBuffer[i].MaximumLength); - if (DomainsBuffer[i].Buffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - CopyMemory(DomainsBuffer[i].Buffer, - Names[i].Buffer, - DomainsBuffer[i].Length); - DomainsBuffer[i].Buffer[DomainLength] = UNICODE_NULL; - -//TRACE("Domain name: %wZ\n", &DomainsBuffer[i]); - } - - AccountsBuffer[i].Length = (USHORT)AccountLength * sizeof(WCHAR); - AccountsBuffer[i].MaximumLength = AccountsBuffer[i].Length + sizeof(WCHAR); - AccountsBuffer[i].Buffer = MIDL_user_allocate(AccountsBuffer[i].MaximumLength); - if (AccountsBuffer[i].Buffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - CopyMemory(AccountsBuffer[i].Buffer, - &(Names[i].Buffer[DomainLength + 1]), - AccountsBuffer[i].Length); - AccountsBuffer[i].Buffer[AccountLength] = UNICODE_NULL; - -//TRACE("Account name: %wZ\n", &AccountsBuffer[i]); - } - } - -done: - if (!NT_SUCCESS(Status)) - { - if (AccountsBuffer != NULL) - { - for (i = 0; i < Count; i++) - { - if (AccountsBuffer[i].Buffer != NULL) - MIDL_user_free(AccountsBuffer[i].Buffer); - } - - MIDL_user_free(AccountsBuffer); - } - - if (DomainsBuffer != NULL) - { - for (i = 0; i < Count; i++) - { - if (DomainsBuffer[i].Buffer != NULL) - MIDL_user_free(DomainsBuffer[i].Buffer); - } - - MIDL_user_free(DomainsBuffer); - } - } - else - { - *DomainNames = DomainsBuffer; - *AccountNames = AccountsBuffer; - } - - return Status; -} - - -static NTSTATUS -LsapAddDomainToDomainsList(PLSAPR_REFERENCED_DOMAIN_LIST ReferencedDomains, - PUNICODE_STRING Name, - PSID Sid, - PULONG Index) -{ - ULONG i; - - i = 0; - while (i < ReferencedDomains->Entries && - ReferencedDomains->Domains[i].Sid != NULL) - { - if (RtlEqualSid(Sid, ReferencedDomains->Domains[i].Sid)) - { - *Index = i; - return STATUS_SUCCESS; - } - - i++; - } - - ReferencedDomains->Domains[i].Sid = MIDL_user_allocate(RtlLengthSid(Sid)); - if (ReferencedDomains->Domains[i].Sid == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - RtlCopySid(RtlLengthSid(Sid), ReferencedDomains->Domains[i].Sid, Sid); - - ReferencedDomains->Domains[i].Name.Length = Name->Length; - ReferencedDomains->Domains[i].Name.MaximumLength = Name->MaximumLength; - ReferencedDomains->Domains[i].Name.Buffer = MIDL_user_allocate(Name->MaximumLength); - if (ReferencedDomains->Domains[i].Sid == NULL) - { - MIDL_user_free(ReferencedDomains->Domains[i].Sid); - ReferencedDomains->Domains[i].Sid = NULL; - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlCopyMemory(ReferencedDomains->Domains[i].Name.Buffer, - Name->Buffer, - Name->MaximumLength); - - ReferencedDomains->Entries++; - *Index = i; - - return STATUS_SUCCESS; -} - - -static BOOLEAN -LsapIsPrefixSid(IN PSID PrefixSid, - IN PSID Sid) -{ - PISID Sid1 = PrefixSid, Sid2 = Sid; - ULONG i; - - if (Sid1->Revision != Sid2->Revision) - return FALSE; - - if ((Sid1->IdentifierAuthority.Value[0] != Sid2->IdentifierAuthority.Value[0]) || - (Sid1->IdentifierAuthority.Value[1] != Sid2->IdentifierAuthority.Value[1]) || - (Sid1->IdentifierAuthority.Value[2] != Sid2->IdentifierAuthority.Value[2]) || - (Sid1->IdentifierAuthority.Value[3] != Sid2->IdentifierAuthority.Value[3]) || - (Sid1->IdentifierAuthority.Value[4] != Sid2->IdentifierAuthority.Value[4]) || - (Sid1->IdentifierAuthority.Value[5] != Sid2->IdentifierAuthority.Value[5])) - return FALSE; - - if (Sid1->SubAuthorityCount >= Sid2->SubAuthorityCount) - return FALSE; - - if (Sid1->SubAuthorityCount == 0) - return TRUE; - - for (i = 0; i < Sid1->SubAuthorityCount; i++) - { - if (Sid1->SubAuthority[i] != Sid2->SubAuthority[i]) - return FALSE; - } - - return TRUE; -} - - -ULONG -LsapGetRelativeIdFromSid(PSID Sid_) -{ - PISID Sid = Sid_; - - if (Sid->SubAuthorityCount != 0) - return Sid->SubAuthority[Sid->SubAuthorityCount - 1]; - - return 0; -} - - -static PSID -CreateSidFromSidAndRid(PSID SrcSid, - ULONG RelativeId) -{ - UCHAR RidCount; - PSID DstSid; - ULONG i; - ULONG DstSidSize; - PULONG p, q; - - RidCount = *RtlSubAuthorityCountSid(SrcSid); - if (RidCount >= 8) - return NULL; - - DstSidSize = RtlLengthRequiredSid(RidCount + 1); - - DstSid = MIDL_user_allocate(DstSidSize); - if (DstSid == NULL) - return NULL; - - RtlInitializeSid(DstSid, - RtlIdentifierAuthoritySid(SrcSid), - RidCount + 1); - - for (i = 0; i < (ULONG)RidCount; i++) - { - p = RtlSubAuthoritySid(SrcSid, i); - q = RtlSubAuthoritySid(DstSid, i); - *q = *p; - } - - q = RtlSubAuthoritySid(DstSid, (ULONG)RidCount); - *q = RelativeId; - - return DstSid; -} - - -static PSID -CreateDomainSidFromAccountSid(PSID AccountSid) -{ - UCHAR RidCount; - PSID DomainSid; - ULONG i; - ULONG DstSidSize; - PULONG p, q; - - RidCount = *RtlSubAuthorityCountSid(AccountSid); - if (RidCount > 0) - RidCount--; - - DstSidSize = RtlLengthRequiredSid(RidCount); - - DomainSid = MIDL_user_allocate(DstSidSize); - if (DomainSid == NULL) - return NULL; - - RtlInitializeSid(DomainSid, - RtlIdentifierAuthoritySid(AccountSid), - RidCount); - - for (i = 0; i < (ULONG)RidCount; i++) - { - p = RtlSubAuthoritySid(AccountSid, i); - q = RtlSubAuthoritySid(DomainSid, i); - *q = *p; - } - - return DomainSid; -} - - -static PSID -LsapCopySid(PSID SrcSid) -{ - UCHAR RidCount; - PSID DstSid; - ULONG i; - ULONG DstSidSize; - PULONG p, q; - - RidCount = *RtlSubAuthorityCountSid(SrcSid); - DstSidSize = RtlLengthRequiredSid(RidCount); - - DstSid = MIDL_user_allocate(DstSidSize); - if (DstSid == NULL) - return NULL; - - RtlInitializeSid(DstSid, - RtlIdentifierAuthoritySid(SrcSid), - RidCount); - - for (i = 0; i < (ULONG)RidCount; i++) - { - p = RtlSubAuthoritySid(SrcSid, i); - q = RtlSubAuthoritySid(DstSid, i); - *q = *p; - } - - return DstSid; -} - - -static -NTSTATUS -LsapLookupIsolatedNames(DWORD Count, - PRPC_UNICODE_STRING DomainNames, - PRPC_UNICODE_STRING AccountNames, - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, - PLSAPR_TRANSLATED_SID_EX2 SidsBuffer, - PULONG Mapped) -{ - UNICODE_STRING EmptyDomainName = RTL_CONSTANT_STRING(L""); - PWELL_KNOWN_SID ptr, ptr2; - PSID DomainSid; - ULONG DomainIndex; - ULONG i; - NTSTATUS Status = STATUS_SUCCESS; - - for (i = 0; i < Count; i++) - { - /* Ignore names which were already mapped */ - if (SidsBuffer[i].Use != SidTypeUnknown) - continue; - - /* Ignore fully qualified account names */ - if (DomainNames[i].Length != 0) - continue; - - TRACE("Mapping name: %wZ\n", &AccountNames[i]); - - /* Look-up all well-known names */ - ptr = LsapLookupIsolatedWellKnownName((PUNICODE_STRING)&AccountNames[i]); - if (ptr != NULL) - { - SidsBuffer[i].Use = ptr->Use; - SidsBuffer[i].Sid = LsapCopySid(ptr->Sid); - if (SidsBuffer[i].Sid == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - SidsBuffer[i].DomainIndex = -1; - SidsBuffer[i].Flags = 0; - - if (ptr->Use == SidTypeDomain) - { - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &ptr->AccountName, - ptr->Sid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - SidsBuffer[i].DomainIndex = DomainIndex; - } - else - { - ptr2= LsapLookupIsolatedWellKnownName(&ptr->DomainName); - if (ptr2 != NULL) - { - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &ptr2->AccountName, - ptr2->Sid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - SidsBuffer[i].DomainIndex = DomainIndex; - } - else - { - DomainSid = CreateDomainSidFromAccountSid(ptr->Sid); - if (DomainSid == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &EmptyDomainName, - DomainSid, - &DomainIndex); - - if (DomainSid != NULL) - { - MIDL_user_free(DomainSid); - DomainSid = NULL; - } - - if (!NT_SUCCESS(Status)) - goto done; - - SidsBuffer[i].DomainIndex = DomainIndex; - } - } - - (*Mapped)++; - continue; - } - - /* Look-up the built-in domain */ - if (RtlEqualUnicodeString((PUNICODE_STRING)&AccountNames[i], &BuiltinDomainName, TRUE)) - { - SidsBuffer[i].Use = SidTypeDomain; - SidsBuffer[i].Sid = LsapCopySid(BuiltinDomainSid); - if (SidsBuffer[i].Sid == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - SidsBuffer[i].DomainIndex = -1; - SidsBuffer[i].Flags = 0; - - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &BuiltinDomainName, - BuiltinDomainSid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - SidsBuffer[i].DomainIndex = DomainIndex; - - (*Mapped)++; - continue; - } - - /* Look-up the account domain */ - if (RtlEqualUnicodeString((PUNICODE_STRING)&AccountNames[i], &AccountDomainName, TRUE)) - { - SidsBuffer[i].Use = SidTypeDomain; - SidsBuffer[i].Sid = LsapCopySid(AccountDomainSid); - if (SidsBuffer[i].Sid == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - SidsBuffer[i].DomainIndex = -1; - SidsBuffer[i].Flags = 0; - - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &AccountDomainName, - AccountDomainSid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - SidsBuffer[i].DomainIndex = DomainIndex; - - (*Mapped)++; - continue; - } - - /* FIXME: Look-up the primary domain */ - - /* FIXME: Look-up the trusted domains */ - - } - -done: - - return Status; -} - - -static -NTSTATUS -LsapLookupIsolatedBuiltinNames(DWORD Count, - PRPC_UNICODE_STRING DomainNames, - PRPC_UNICODE_STRING AccountNames, - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, - PLSAPR_TRANSLATED_SID_EX2 SidsBuffer, - PULONG Mapped) -{ - SAMPR_HANDLE ServerHandle = NULL; - SAMPR_HANDLE DomainHandle = NULL; - SAMPR_ULONG_ARRAY RelativeIds = {0, NULL}; - SAMPR_ULONG_ARRAY Use = {0, NULL}; - ULONG DomainIndex; - ULONG i; - NTSTATUS Status = STATUS_SUCCESS; - - Status = SamrConnect(NULL, - &ServerHandle, - SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN); - if (!NT_SUCCESS(Status)) - { - TRACE("SamrConnect failed (Status %08lx)\n", Status); - goto done; - } - - Status = SamrOpenDomain(ServerHandle, - DOMAIN_LOOKUP, - BuiltinDomainSid, - &DomainHandle); - if (!NT_SUCCESS(Status)) - { - TRACE("SamOpenDomain failed (Status %08lx)\n", Status); - goto done; - } - - for (i = 0; i < Count; i++) - { - /* Ignore names which were already mapped */ - if (SidsBuffer[i].Use != SidTypeUnknown) - continue; - - /* Ignore fully qualified account names */ - if (DomainNames[i].Length != 0) - continue; - - TRACE("Mapping name: %wZ\n", &AccountNames[i]); - - Status = SamrLookupNamesInDomain(DomainHandle, - 1, - &AccountNames[i], - &RelativeIds, - &Use); - if (NT_SUCCESS(Status)) - { - TRACE("Found relative ID: %lu\n", RelativeIds.Element[0]); - - SidsBuffer[i].Use = Use.Element[0]; - SidsBuffer[i].Sid = CreateSidFromSidAndRid(BuiltinDomainSid, - RelativeIds.Element[0]); - if (SidsBuffer[i].Sid == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - SidsBuffer[i].DomainIndex = -1; - SidsBuffer[i].Flags = 0; - - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &BuiltinDomainName, - BuiltinDomainSid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - SidsBuffer[i].DomainIndex = DomainIndex; - - (*Mapped)++; - } - - SamIFree_SAMPR_ULONG_ARRAY(&RelativeIds); - SamIFree_SAMPR_ULONG_ARRAY(&Use); - } - -done: - if (DomainHandle != NULL) - SamrCloseHandle(&DomainHandle); - - if (ServerHandle != NULL) - SamrCloseHandle(&ServerHandle); - - return Status; -} - - -static -NTSTATUS -LsapLookupIsolatedAccountNames(DWORD Count, - PRPC_UNICODE_STRING DomainNames, - PRPC_UNICODE_STRING AccountNames, - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, - PLSAPR_TRANSLATED_SID_EX2 SidsBuffer, - PULONG Mapped) -{ - SAMPR_HANDLE ServerHandle = NULL; - SAMPR_HANDLE DomainHandle = NULL; - SAMPR_ULONG_ARRAY RelativeIds = {0, NULL}; - SAMPR_ULONG_ARRAY Use = {0, NULL}; - ULONG DomainIndex; - ULONG i; - NTSTATUS Status = STATUS_SUCCESS; - - TRACE("()\n"); - - Status = SamrConnect(NULL, - &ServerHandle, - SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN); - if (!NT_SUCCESS(Status)) - { - TRACE("SamrConnect failed (Status %08lx)\n", Status); - goto done; - } - - Status = SamrOpenDomain(ServerHandle, - DOMAIN_LOOKUP, - AccountDomainSid, - &DomainHandle); - if (!NT_SUCCESS(Status)) - { - TRACE("SamOpenDomain failed (Status %08lx)\n", Status); - goto done; - } - - for (i = 0; i < Count; i++) - { - /* Ignore names which were already mapped */ - if (SidsBuffer[i].Use != SidTypeUnknown) - continue; - - /* Ignore fully qualified account names */ - if (DomainNames[i].Length != 0) - continue; - - TRACE("Mapping name: %wZ\n", &AccountNames[i]); - - Status = SamrLookupNamesInDomain(DomainHandle, - 1, - &AccountNames[i], - &RelativeIds, - &Use); - if (NT_SUCCESS(Status)) - { - TRACE("Found relative ID: %lu\n", RelativeIds.Element[0]); - - SidsBuffer[i].Use = Use.Element[0]; - SidsBuffer[i].Sid = CreateSidFromSidAndRid(AccountDomainSid, - RelativeIds.Element[0]); - if (SidsBuffer[i].Sid == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - SidsBuffer[i].DomainIndex = -1; - SidsBuffer[i].Flags = 0; - - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &AccountDomainName, - AccountDomainSid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - SidsBuffer[i].DomainIndex = DomainIndex; - - (*Mapped)++; - } - - SamIFree_SAMPR_ULONG_ARRAY(&RelativeIds); - SamIFree_SAMPR_ULONG_ARRAY(&Use); - } - -done: - if (DomainHandle != NULL) - SamrCloseHandle(&DomainHandle); - - if (ServerHandle != NULL) - SamrCloseHandle(&ServerHandle); - - return Status; -} - - -static -NTSTATUS -LsapLookupFullyQualifiedWellKnownNames(DWORD Count, - PRPC_UNICODE_STRING DomainNames, - PRPC_UNICODE_STRING AccountNames, - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, - PLSAPR_TRANSLATED_SID_EX2 SidsBuffer, - PULONG Mapped) -{ - UNICODE_STRING EmptyDomainName = RTL_CONSTANT_STRING(L""); - PWELL_KNOWN_SID ptr, ptr2; - PSID DomainSid; - ULONG DomainIndex; - ULONG i; - NTSTATUS Status = STATUS_SUCCESS; - - for (i = 0; i < Count; i++) - { - /* Ignore names which were already mapped */ - if (SidsBuffer[i].Use != SidTypeUnknown) - continue; - - /* Ignore isolated account names */ - if (DomainNames[i].Length == 0) - continue; - - TRACE("Mapping name: %wZ\\%wZ\n", &DomainNames[i], &AccountNames[i]); - - /* Look-up all well-known names */ - ptr = LsapLookupFullyQualifiedWellKnownName((PUNICODE_STRING)&AccountNames[i], - (PUNICODE_STRING)&DomainNames[i]); - if (ptr != NULL) - { - TRACE("Found it! (%wZ\\%wZ)\n", &ptr->DomainName, &ptr->AccountName); - - SidsBuffer[i].Use = ptr->Use; - SidsBuffer[i].Sid = LsapCopySid(ptr->Sid); - if (SidsBuffer[i].Sid == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - SidsBuffer[i].DomainIndex = -1; - SidsBuffer[i].Flags = 0; - - if (ptr->Use == SidTypeDomain) - { - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &ptr->AccountName, - ptr->Sid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - SidsBuffer[i].DomainIndex = DomainIndex; - } - else - { - ptr2= LsapLookupIsolatedWellKnownName(&ptr->DomainName); - if (ptr2 != NULL) - { - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &ptr2->AccountName, - ptr2->Sid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - SidsBuffer[i].DomainIndex = DomainIndex; - } - else - { - DomainSid = CreateDomainSidFromAccountSid(ptr->Sid); - if (DomainSid == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &EmptyDomainName, - DomainSid, - &DomainIndex); - - if (DomainSid != NULL) - { - MIDL_user_free(DomainSid); - DomainSid = NULL; - } - - if (!NT_SUCCESS(Status)) - goto done; - - SidsBuffer[i].DomainIndex = DomainIndex; - } - } - - (*Mapped)++; - continue; - } - } - -done: - return Status; -} - - -static -NTSTATUS -LsapLookupBuiltinNames(DWORD Count, - PRPC_UNICODE_STRING DomainNames, - PRPC_UNICODE_STRING AccountNames, - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, - PLSAPR_TRANSLATED_SID_EX2 SidsBuffer, - PULONG Mapped) -{ - SAMPR_HANDLE ServerHandle = NULL; - SAMPR_HANDLE DomainHandle = NULL; - SAMPR_ULONG_ARRAY RelativeIds = {0, NULL}; - SAMPR_ULONG_ARRAY Use = {0, NULL}; - ULONG DomainIndex; - ULONG i; - NTSTATUS Status = STATUS_SUCCESS; - - Status = SamrConnect(NULL, - &ServerHandle, - SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN); - if (!NT_SUCCESS(Status)) - { - TRACE("SamrConnect failed (Status %08lx)\n", Status); - goto done; - } - - Status = SamrOpenDomain(ServerHandle, - DOMAIN_LOOKUP, - BuiltinDomainSid, - &DomainHandle); - if (!NT_SUCCESS(Status)) - { - TRACE("SamOpenDomain failed (Status %08lx)\n", Status); - goto done; - } - - for (i = 0; i < Count; i++) - { - /* Ignore names which were already mapped */ - if (SidsBuffer[i].Use != SidTypeUnknown) - continue; - - /* Ignore isolated account names */ - if (DomainNames[i].Length == 0) - continue; - - if (!RtlEqualUnicodeString((PUNICODE_STRING)&DomainNames[i], &BuiltinDomainName, TRUE)) - continue; - - TRACE("Mapping name: %wZ\\%wZ\n", &DomainNames[i], &AccountNames[i]); - - Status = SamrLookupNamesInDomain(DomainHandle, - 1, - &AccountNames[i], - &RelativeIds, - &Use); - if (NT_SUCCESS(Status)) - { - SidsBuffer[i].Use = Use.Element[0]; - SidsBuffer[i].Sid = CreateSidFromSidAndRid(BuiltinDomainSid, - RelativeIds.Element[0]); - if (SidsBuffer[i].Sid == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - SidsBuffer[i].DomainIndex = -1; - SidsBuffer[i].Flags = 0; - - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &BuiltinDomainName, - BuiltinDomainSid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - SidsBuffer[i].DomainIndex = DomainIndex; - - (*Mapped)++; - } - - SamIFree_SAMPR_ULONG_ARRAY(&RelativeIds); - SamIFree_SAMPR_ULONG_ARRAY(&Use); - } - -done: - if (DomainHandle != NULL) - SamrCloseHandle(&DomainHandle); - - if (ServerHandle != NULL) - SamrCloseHandle(&ServerHandle); - - return Status; -} - - -static -NTSTATUS -LsapLookupAccountNames(DWORD Count, - PRPC_UNICODE_STRING DomainNames, - PRPC_UNICODE_STRING AccountNames, - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, - PLSAPR_TRANSLATED_SID_EX2 SidsBuffer, - PULONG Mapped) -{ - SAMPR_HANDLE ServerHandle = NULL; - SAMPR_HANDLE DomainHandle = NULL; - SAMPR_ULONG_ARRAY RelativeIds = {0, NULL}; - SAMPR_ULONG_ARRAY Use = {0, NULL}; - ULONG DomainIndex; - ULONG i; - NTSTATUS Status = STATUS_SUCCESS; - - Status = SamrConnect(NULL, - &ServerHandle, - SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN); - if (!NT_SUCCESS(Status)) - { - TRACE("SamrConnect failed (Status %08lx)\n", Status); - goto done; - } - - Status = SamrOpenDomain(ServerHandle, - DOMAIN_LOOKUP, - AccountDomainSid, - &DomainHandle); - if (!NT_SUCCESS(Status)) - { - TRACE("SamOpenDomain failed (Status %08lx)\n", Status); - goto done; - } - - for (i = 0; i < Count; i++) - { - /* Ignore names which were already mapped */ - if (SidsBuffer[i].Use != SidTypeUnknown) - continue; - - /* Ignore isolated account names */ - if (DomainNames[i].Length == 0) - continue; - - if (!RtlEqualUnicodeString((PUNICODE_STRING)&DomainNames[i], &AccountDomainName, TRUE)) - continue; - - TRACE("Mapping name: %wZ\\%wZ\n", &DomainNames[i], &AccountNames[i]); - - Status = SamrLookupNamesInDomain(DomainHandle, - 1, - &AccountNames[i], - &RelativeIds, - &Use); - if (NT_SUCCESS(Status)) - { - SidsBuffer[i].Use = Use.Element[0]; - SidsBuffer[i].Sid = CreateSidFromSidAndRid(AccountDomainSid, - RelativeIds.Element[0]); - if (SidsBuffer[i].Sid == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - SidsBuffer[i].DomainIndex = -1; - SidsBuffer[i].Flags = 0; - - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &AccountDomainName, - AccountDomainSid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - SidsBuffer[i].DomainIndex = DomainIndex; - - (*Mapped)++; - } - - SamIFree_SAMPR_ULONG_ARRAY(&RelativeIds); - SamIFree_SAMPR_ULONG_ARRAY(&Use); - } - -done: - if (DomainHandle != NULL) - SamrCloseHandle(&DomainHandle); - - if (ServerHandle != NULL) - SamrCloseHandle(&ServerHandle); - - return Status; -} - - -NTSTATUS -LsapLookupNames(DWORD Count, - PRPC_UNICODE_STRING Names, - PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSAPR_TRANSLATED_SIDS_EX2 TranslatedSids, - LSAP_LOOKUP_LEVEL LookupLevel, - DWORD *MappedCount, - DWORD LookupOptions, - DWORD ClientRevision) -{ - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer = NULL; - PLSAPR_TRANSLATED_SID_EX2 SidsBuffer = NULL; - PRPC_UNICODE_STRING DomainNames = NULL; - PRPC_UNICODE_STRING AccountNames = NULL; - ULONG SidsBufferLength; - ULONG i; - ULONG Mapped = 0; - NTSTATUS Status = STATUS_SUCCESS; - -//TRACE("()\n"); - - TranslatedSids->Entries = 0; - TranslatedSids->Sids = NULL; - *ReferencedDomains = NULL; - - SidsBufferLength = Count * sizeof(LSAPR_TRANSLATED_SID_EX2); - SidsBuffer = MIDL_user_allocate(SidsBufferLength); - if (SidsBuffer == NULL) - { -//TRACE("\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); - if (DomainsBuffer == NULL) - { -//TRACE("\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - DomainsBuffer->Domains = MIDL_user_allocate(Count * sizeof(LSA_TRUST_INFORMATION)); - if (DomainsBuffer->Domains == NULL) - { -//TRACE("\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - DomainsBuffer->Entries = 0; - DomainsBuffer->MaxEntries = Count; - - for (i = 0; i < Count; i++) - { - SidsBuffer[i].Use = SidTypeUnknown; - SidsBuffer[i].Sid = NULL; - SidsBuffer[i].DomainIndex = -1; - SidsBuffer[i].Flags = 0; - } - - Status = LsapSplitNames(Count, - Names, - &DomainNames, - &AccountNames); - if (!NT_SUCCESS(Status)) - { - TRACE("LsapSplitNames failed! (Status %lx)\n", Status); - goto done; - } - - - Status = LsapLookupIsolatedNames(Count, - DomainNames, - AccountNames, - DomainsBuffer, - SidsBuffer, - &Mapped); - if (!NT_SUCCESS(Status) && - Status != STATUS_NONE_MAPPED && - Status != STATUS_SOME_NOT_MAPPED) - { - TRACE("LsapLookupIsolatedNames failed! (Status %lx)\n", Status); - goto done; - } - - if (Mapped == Count) - goto done; - - - Status = LsapLookupIsolatedBuiltinNames(Count, - DomainNames, - AccountNames, - DomainsBuffer, - SidsBuffer, - &Mapped); - if (!NT_SUCCESS(Status) && - Status != STATUS_NONE_MAPPED && - Status != STATUS_SOME_NOT_MAPPED) - { - TRACE("LsapLookupIsolatedBuiltinNames failed! (Status %lx)\n", Status); - goto done; - } - - if (Mapped == Count) - goto done; - - - Status = LsapLookupIsolatedAccountNames(Count, - DomainNames, - AccountNames, - DomainsBuffer, - SidsBuffer, - &Mapped); - if (!NT_SUCCESS(Status) && - Status != STATUS_NONE_MAPPED && - Status != STATUS_SOME_NOT_MAPPED) - { - TRACE("LsapLookupIsolatedAccountNames failed! (Status %lx)\n", Status); - goto done; - } - - if (Mapped == Count) - goto done; - - Status = LsapLookupFullyQualifiedWellKnownNames(Count, - DomainNames, - AccountNames, - DomainsBuffer, - SidsBuffer, - &Mapped); - if (!NT_SUCCESS(Status) && - Status != STATUS_NONE_MAPPED && - Status != STATUS_SOME_NOT_MAPPED) - { - TRACE("LsapLookupFullyQualifiedWellKnownNames failed! (Status %lx)\n", Status); - goto done; - } - - if (Mapped == Count) - goto done; - - Status = LsapLookupBuiltinNames(Count, - DomainNames, - AccountNames, - DomainsBuffer, - SidsBuffer, - &Mapped); - if (!NT_SUCCESS(Status) && - Status != STATUS_NONE_MAPPED && - Status != STATUS_SOME_NOT_MAPPED) - { - TRACE("LsapLookupBuiltinNames failed! (Status %lx)\n", Status); - goto done; - } - - if (Mapped == Count) - goto done; - - - Status = LsapLookupAccountNames(Count, - DomainNames, - AccountNames, - DomainsBuffer, - SidsBuffer, - &Mapped); - if (!NT_SUCCESS(Status) && - Status != STATUS_NONE_MAPPED && - Status != STATUS_SOME_NOT_MAPPED) - { - TRACE("LsapLookupAccountNames failed! (Status %lx)\n", Status); - goto done; - } - - if (Mapped == Count) - goto done; - -done: -// TRACE("done: Status %lx\n", Status); - - if (DomainNames != NULL) - { -//TRACE("Free DomainNames\n"); - for (i = 0; i < Count; i++) - { - if (DomainNames[i].Buffer != NULL) - MIDL_user_free(DomainNames[i].Buffer); - } - - MIDL_user_free(DomainNames); - } - - if (AccountNames != NULL) - { -//TRACE("Free AccountNames\n"); - for (i = 0; i < Count; i++) - { -//TRACE("i: %lu\n", i); - if (AccountNames[i].Buffer != NULL) - { - MIDL_user_free(AccountNames[i].Buffer); - } - } - - MIDL_user_free(AccountNames); - } - - if (!NT_SUCCESS(Status)) - { -//TRACE("Failure!\n"); - -//TRACE("Free DomainsBuffer\n"); - if (DomainsBuffer != NULL) - { - if (DomainsBuffer->Domains != NULL) - MIDL_user_free(DomainsBuffer->Domains); - - MIDL_user_free(DomainsBuffer); - } - -//TRACE("Free SidsBuffer\n"); - if (SidsBuffer != NULL) - MIDL_user_free(SidsBuffer); - } - else - { -//TRACE("Success!\n"); - - *ReferencedDomains = DomainsBuffer; - TranslatedSids->Entries = Count; - TranslatedSids->Sids = SidsBuffer; - *MappedCount = Mapped; - - if (Mapped == 0) - Status = STATUS_NONE_MAPPED; - else if (Mapped < Count) - Status = STATUS_SOME_NOT_MAPPED; - } - -// TRACE("done: Status %lx\n", Status); - - return Status; -} - - -static NTSTATUS -LsapLookupWellKnownSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, - PLSAPR_TRANSLATED_NAME_EX NamesBuffer, - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, - PULONG Mapped) -{ - PWELL_KNOWN_SID ptr, ptr2; - LPWSTR SidString = NULL; - ULONG DomainIndex; - ULONG i; - NTSTATUS Status = STATUS_SUCCESS; - - for (i = 0; i < SidEnumBuffer->Entries; i++) - { - /* Ignore SIDs which are already mapped */ - if (NamesBuffer[i].Use != SidTypeUnknown) - continue; - - ConvertSidToStringSidW(SidEnumBuffer->SidInfo[i].Sid, &SidString); - TRACE("Mapping SID: %S\n", SidString); - LocalFree(SidString); - SidString = NULL; - - ptr = LsapLookupWellKnownSid(SidEnumBuffer->SidInfo[i].Sid); - if (ptr != NULL) - { - NamesBuffer[i].Use = ptr->Use; - NamesBuffer[i].Flags = 0; - - NamesBuffer[i].Name.Length = ptr->AccountName.Length; - NamesBuffer[i].Name.MaximumLength = ptr->AccountName.MaximumLength; - NamesBuffer[i].Name.Buffer = MIDL_user_allocate(ptr->AccountName.MaximumLength); - if (NamesBuffer[i].Name.Buffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - RtlCopyMemory(NamesBuffer[i].Name.Buffer, ptr->AccountName.Buffer, ptr->AccountName.MaximumLength); - - ptr2= LsapLookupIsolatedWellKnownName(&ptr->DomainName); - if (ptr2 != NULL) - { - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &ptr2->AccountName, - ptr2->Sid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - NamesBuffer[i].DomainIndex = DomainIndex; - } - - TRACE("Mapped to: %wZ\n", &NamesBuffer[i].Name); - - (*Mapped)++; - } - } - -done: - return Status; -} - - -static NTSTATUS -LsapLookupBuiltinDomainSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, - PLSAPR_TRANSLATED_NAME_EX NamesBuffer, - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, - PULONG Mapped) -{ - SAMPR_HANDLE ServerHandle = NULL; - SAMPR_HANDLE DomainHandle = NULL; - SAMPR_RETURNED_USTRING_ARRAY Names = {0, NULL}; - SAMPR_ULONG_ARRAY Use = {0, NULL}; - LPWSTR SidString = NULL; - ULONG DomainIndex; - ULONG RelativeIds[1]; - ULONG i; - NTSTATUS Status = STATUS_SUCCESS; - - Status = SamrConnect(NULL, - &ServerHandle, - SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN); - if (!NT_SUCCESS(Status)) - { - TRACE("SamrConnect failed (Status %08lx)\n", Status); - goto done; - } - - Status = SamrOpenDomain(ServerHandle, - DOMAIN_LOOKUP, - BuiltinDomainSid, - &DomainHandle); - if (!NT_SUCCESS(Status)) - { - TRACE("SamOpenDomain failed (Status %08lx)\n", Status); - goto done; - } - - for (i = 0; i < SidEnumBuffer->Entries; i++) - { - /* Ignore SIDs which are already mapped */ - if (NamesBuffer[i].Use != SidTypeUnknown) - continue; - - ConvertSidToStringSidW(SidEnumBuffer->SidInfo[i].Sid, &SidString); - TRACE("Mapping SID: %S\n", SidString); - LocalFree(SidString); - SidString = NULL; - - if (RtlEqualSid(BuiltinDomainSid, SidEnumBuffer->SidInfo[i].Sid)) - { - TRACE("Found builtin domain!\n"); - - NamesBuffer[i].Use = SidTypeDomain; - NamesBuffer[i].Flags = 0; - - NamesBuffer[i].Name.Length = BuiltinDomainName.Length; - NamesBuffer[i].Name.MaximumLength = BuiltinDomainName.MaximumLength; - NamesBuffer[i].Name.Buffer = MIDL_user_allocate(BuiltinDomainName.MaximumLength); - if (NamesBuffer[i].Name.Buffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - RtlCopyMemory(NamesBuffer[i].Name.Buffer, BuiltinDomainName.Buffer, BuiltinDomainName.MaximumLength); - - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &BuiltinDomainName, - BuiltinDomainSid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - NamesBuffer[i].DomainIndex = DomainIndex; - - TRACE("Mapped to: %wZ\n", &NamesBuffer[i].Name); - - (*Mapped)++; - } - else if (LsapIsPrefixSid(BuiltinDomainSid, SidEnumBuffer->SidInfo[i].Sid)) - { - TRACE("Found builtin domain account!\n"); - - RelativeIds[0] = LsapGetRelativeIdFromSid(SidEnumBuffer->SidInfo[i].Sid); - - Status = SamrLookupIdsInDomain(DomainHandle, - 1, - RelativeIds, - &Names, - &Use); - if (NT_SUCCESS(Status)) - { - NamesBuffer[i].Use = Use.Element[0]; - NamesBuffer[i].Flags = 0; - - NamesBuffer[i].Name.Length = Names.Element[0].Length; - NamesBuffer[i].Name.MaximumLength = Names.Element[0].MaximumLength; - NamesBuffer[i].Name.Buffer = MIDL_user_allocate(Names.Element[0].MaximumLength); - if (NamesBuffer[i].Name.Buffer == NULL) - { - SamIFree_SAMPR_RETURNED_USTRING_ARRAY(&Names); - SamIFree_SAMPR_ULONG_ARRAY(&Use); - - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - RtlCopyMemory(NamesBuffer[i].Name.Buffer, - Names.Element[0].Buffer, - Names.Element[0].MaximumLength); - - SamIFree_SAMPR_RETURNED_USTRING_ARRAY(&Names); - SamIFree_SAMPR_ULONG_ARRAY(&Use); - - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &BuiltinDomainName, - BuiltinDomainSid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - NamesBuffer[i].DomainIndex = DomainIndex; - - TRACE("Mapped to: %wZ\n", &NamesBuffer[i].Name); - - (*Mapped)++; - } - } - } - -done: - if (DomainHandle != NULL) - SamrCloseHandle(&DomainHandle); - - if (ServerHandle != NULL) - SamrCloseHandle(&ServerHandle); - - return Status; -} - - -static NTSTATUS -LsapLookupAccountDomainSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, - PLSAPR_TRANSLATED_NAME_EX NamesBuffer, - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, - PULONG Mapped) -{ - SAMPR_HANDLE ServerHandle = NULL; - SAMPR_HANDLE DomainHandle = NULL; - SAMPR_RETURNED_USTRING_ARRAY Names = {0, NULL}; - SAMPR_ULONG_ARRAY Use = {0, NULL}; - LPWSTR SidString = NULL; - ULONG DomainIndex; - ULONG RelativeIds[1]; - ULONG i; - NTSTATUS Status = STATUS_SUCCESS; - - Status = SamrConnect(NULL, - &ServerHandle, - SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN); - if (!NT_SUCCESS(Status)) - { - TRACE("SamrConnect failed (Status %08lx)\n", Status); - goto done; - } - - Status = SamrOpenDomain(ServerHandle, - DOMAIN_LOOKUP, - AccountDomainSid, - &DomainHandle); - if (!NT_SUCCESS(Status)) - { - TRACE("SamOpenDomain failed (Status %08lx)\n", Status); - goto done; - } - - for (i = 0; i < SidEnumBuffer->Entries; i++) - { - /* Ignore SIDs which are already mapped */ - if (NamesBuffer[i].Use != SidTypeUnknown) - continue; - - ConvertSidToStringSidW(SidEnumBuffer->SidInfo[i].Sid, &SidString); - TRACE("Mapping SID: %S\n", SidString); - LocalFree(SidString); - SidString = NULL; - - if (RtlEqualSid(AccountDomainSid, SidEnumBuffer->SidInfo[i].Sid)) - { - TRACE("Found account domain!\n"); - - NamesBuffer[i].Use = SidTypeDomain; - NamesBuffer[i].Flags = 0; - - NamesBuffer[i].Name.Length = AccountDomainName.Length; - NamesBuffer[i].Name.MaximumLength = AccountDomainName.MaximumLength; - NamesBuffer[i].Name.Buffer = MIDL_user_allocate(AccountDomainName.MaximumLength); - if (NamesBuffer[i].Name.Buffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - RtlCopyMemory(NamesBuffer[i].Name.Buffer, AccountDomainName.Buffer, AccountDomainName.MaximumLength); - - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &AccountDomainName, - AccountDomainSid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - NamesBuffer[i].DomainIndex = DomainIndex; - - TRACE("Mapped to: %wZ\n", &NamesBuffer[i].Name); - - (*Mapped)++; - } - else if (LsapIsPrefixSid(AccountDomainSid, SidEnumBuffer->SidInfo[i].Sid)) - { - TRACE("Found account domain account!\n"); - - RelativeIds[0] = LsapGetRelativeIdFromSid(SidEnumBuffer->SidInfo[i].Sid); - - Status = SamrLookupIdsInDomain(DomainHandle, - 1, - RelativeIds, - &Names, - &Use); - if (NT_SUCCESS(Status)) - { - NamesBuffer[i].Use = Use.Element[0]; - NamesBuffer[i].Flags = 0; - - NamesBuffer[i].Name.Length = Names.Element[0].Length; - NamesBuffer[i].Name.MaximumLength = Names.Element[0].MaximumLength; - NamesBuffer[i].Name.Buffer = MIDL_user_allocate(Names.Element[0].MaximumLength); - if (NamesBuffer[i].Name.Buffer == NULL) - { - SamIFree_SAMPR_RETURNED_USTRING_ARRAY(&Names); - SamIFree_SAMPR_ULONG_ARRAY(&Use); - - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - RtlCopyMemory(NamesBuffer[i].Name.Buffer, - Names.Element[0].Buffer, - Names.Element[0].MaximumLength); - - SamIFree_SAMPR_RETURNED_USTRING_ARRAY(&Names); - SamIFree_SAMPR_ULONG_ARRAY(&Use); - - Status = LsapAddDomainToDomainsList(DomainsBuffer, - &AccountDomainName, - AccountDomainSid, - &DomainIndex); - if (!NT_SUCCESS(Status)) - goto done; - - NamesBuffer[i].DomainIndex = DomainIndex; - - TRACE("Mapped to: %wZ\n", &NamesBuffer[i].Name); - - (*Mapped)++; - } - } - } - -done: - if (DomainHandle != NULL) - SamrCloseHandle(&DomainHandle); - - if (ServerHandle != NULL) - SamrCloseHandle(&ServerHandle); - - return Status; -} - - -NTSTATUS -LsapLookupSids(PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, - PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSAPR_TRANSLATED_NAMES_EX TranslatedNames, - LSAP_LOOKUP_LEVEL LookupLevel, - DWORD *MappedCount, - DWORD LookupOptions, - DWORD ClientRevision) -{ - PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer = NULL; - PLSAPR_TRANSLATED_NAME_EX NamesBuffer = NULL; - ULONG NamesBufferLength; - ULONG i; - ULONG Mapped = 0; - NTSTATUS Status = STATUS_SUCCESS; - - NamesBufferLength = SidEnumBuffer->Entries * sizeof(LSAPR_TRANSLATED_NAME_EX); - NamesBuffer = MIDL_user_allocate(NamesBufferLength); - if (NamesBuffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); - if (DomainsBuffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - DomainsBuffer->Domains = MIDL_user_allocate(SidEnumBuffer->Entries * sizeof(LSA_TRUST_INFORMATION)); - if (DomainsBuffer->Domains == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - DomainsBuffer->Entries = 0; - DomainsBuffer->MaxEntries = SidEnumBuffer->Entries; - - /* Initialize all name entries */ - for (i = 0; i < SidEnumBuffer->Entries; i++) - { - NamesBuffer[i].Use = SidTypeUnknown; - NamesBuffer[i].Name.Length = 0; - NamesBuffer[i].Name.MaximumLength = 0; - NamesBuffer[i].Name.Buffer = NULL; - NamesBuffer[i].DomainIndex = -1; - NamesBuffer[i].Flags = 0; - } - - /* Look-up well-known SIDs */ - Status = LsapLookupWellKnownSids(SidEnumBuffer, - NamesBuffer, - DomainsBuffer, - &Mapped); - if (!NT_SUCCESS(Status) && - Status != STATUS_NONE_MAPPED && - Status != STATUS_SOME_NOT_MAPPED) - goto done; - - if (Mapped == SidEnumBuffer->Entries) - goto done; - - /* Look-up builtin domain SIDs */ - Status = LsapLookupBuiltinDomainSids(SidEnumBuffer, - NamesBuffer, - DomainsBuffer, - &Mapped); - if (!NT_SUCCESS(Status) && - Status != STATUS_NONE_MAPPED && - Status != STATUS_SOME_NOT_MAPPED) - goto done; - - if (Mapped == SidEnumBuffer->Entries) - goto done; - - /* Look-up account domain SIDs */ - Status = LsapLookupAccountDomainSids(SidEnumBuffer, - NamesBuffer, - DomainsBuffer, - &Mapped); - if (!NT_SUCCESS(Status) && - Status != STATUS_NONE_MAPPED && - Status != STATUS_SOME_NOT_MAPPED) - goto done; - - if (Mapped == SidEnumBuffer->Entries) - goto done; - -done: - TRACE("done Status: %lx Mapped: %lu\n", Status, Mapped); - - if (!NT_SUCCESS(Status)) - { - if (DomainsBuffer != NULL) - { - if (DomainsBuffer->Domains != NULL) - MIDL_user_free(DomainsBuffer->Domains); - - MIDL_user_free(DomainsBuffer); - } - - if (NamesBuffer != NULL) - MIDL_user_free(NamesBuffer); - } - else - { - *ReferencedDomains = DomainsBuffer; - TranslatedNames->Entries = SidEnumBuffer->Entries; - TranslatedNames->Names = NamesBuffer; - *MappedCount = Mapped; - - if (Mapped == 0) - Status = STATUS_NONE_MAPPED; - else if (Mapped < SidEnumBuffer->Entries) - Status = STATUS_SOME_NOT_MAPPED; - } - - return Status; -} - -/* EOF */

1 0

[hbelusca] 57584: [NTDLL] - Activate new code (but keep the old one for the moment).
by hbelusca＠svn.reactos.org 20 Oct '12

20 Oct '12

Author: hbelusca Date: Sat Oct 20 14:10:50 2012 New Revision: 57584 URL: http://svn.reactos.org/svn/reactos?rev=57584&view=rev Log: [NTDLL] - Activate new code (but keep the old one for the moment). Modified: branches/ros-csrss/dll/ntdll/csr/connect.c Modified: branches/ros-csrss/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/csr/connect… ============================================================================== --- branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ branches/ros-csrss/dll/ntdll/csr/connect.c [iso-8859-1] Sat Oct 20 14:10:50 2012 @@ -431,17 +431,16 @@ *ConnectionInfoSize = ClientConnect->ConnectionInfoSize; /* Call CSR */ -#if 0 Status = CsrClientCallServer(&ApiMessage, CaptureBuffer, CSR_CREATE_API_NUMBER(CSR_SRV_DLL, CsrpClientConnect), sizeof(CSR_CLIENT_CONNECT)); -#else +/* Status = CsrClientCallServer(&ApiMessage, CaptureBuffer, CSR_CREATE_API_NUMBER(CSR_NATIVE, CONNECT_PROCESS), sizeof(CSR_API_MESSAGE)); -#endif +*/ } else {

1 0

[hbelusca] 57583: [CSRSRV] - Start renaming some APIs which should not be present there, but in basesrv instead. Names come from http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_2k3
by hbelusca＠svn.reactos.org 20 Oct '12

20 Oct '12

Author: hbelusca Date: Sat Oct 20 14:07:04 2012 New Revision: 57583 URL: http://svn.reactos.org/svn/reactos?rev=57583&view=rev Log: [CSRSRV] - Start renaming some APIs which should not be present there, but in basesrv instead. Names come from http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_2k3 Modified: branches/ros-csrss/subsystems/win32/csrsrv/api/process.c branches/ros-csrss/subsystems/win32/csrsrv/api/user.c branches/ros-csrss/subsystems/win32/csrsrv/include/api.h branches/ros-csrss/subsystems/win32/csrsrv/init.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api/process.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api/process.c [iso-8859-1] Sat Oct 20 14:07:04 2012 @@ -23,7 +23,14 @@ * CSRSS API *********************************************************************/ -CSR_API(CsrSrvCreateProcess) +/*** + *** Some APIs from here will go to basesrv.dll, some others to winsrv.dll. + *** Furthermore, this structure uses the old definition of APIs list. + *** The new one is in fact three arrays, one of APIs pointers, one other of + *** corresponding indexes, and the third one of names (not very efficient...). + ***/ + +CSR_API(BaseSrvCreateProcess) { NTSTATUS Status; HANDLE ProcessHandle, ThreadHandle; @@ -135,7 +142,7 @@ return Status; } -CSR_API(CsrSrvCreateThread) +CSR_API(BaseSrvCreateThread) { PCSR_THREAD CurrentThread; HANDLE ThreadHandle; @@ -191,7 +198,7 @@ return Status; } -CSR_API(CsrTerminateProcess) +CSR_API(BaseSrvExitProcess) { PCSR_THREAD CsrThread = CsrGetClientThread(); ASSERT(CsrThread != NULL); @@ -204,12 +211,7 @@ (NTSTATUS)ApiMessage->Data.TerminateProcessRequest.uExitCode); } -CSR_API(CsrConnectProcess) -{ - return STATUS_SUCCESS; -} - -CSR_API(CsrGetShutdownParameters) +CSR_API(BaseSrvGetProcessShutdownParam) { PCSR_THREAD CsrThread = CsrGetClientThread(); ASSERT(CsrThread); @@ -220,7 +222,7 @@ return STATUS_SUCCESS; } -CSR_API(CsrSetShutdownParameters) +CSR_API(BaseSrvSetProcessShutdownParam) { PCSR_THREAD CsrThread = CsrGetClientThread(); ASSERT(CsrThread); Modified: branches/ros-csrss/subsystems/win32/csrsrv/api/user.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/api/user.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/api/user.c [iso-8859-1] Sat Oct 20 14:07:04 2012 @@ -23,7 +23,7 @@ /* FUNCTIONS *****************************************************************/ -CSR_API(CsrRegisterServicesProcess) +CSR_API(SrvRegisterServicesProcess) { if (ServicesProcessIdValid == TRUE) { Modified: branches/ros-csrss/subsystems/win32/csrsrv/include/api.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/include/api.h [iso-8859-1] Sat Oct 20 14:07:04 2012 @@ -71,11 +71,11 @@ /* api/process.c */ CSR_API(CsrConnectProcess); -CSR_API(CsrSrvCreateProcess); -CSR_API(CsrTerminateProcess); -CSR_API(CsrSrvCreateThread); -CSR_API(CsrGetShutdownParameters); -CSR_API(CsrSetShutdownParameters); +CSR_API(BaseSrvCreateProcess); +CSR_API(BaseSrvExitProcess); +CSR_API(BaseSrvCreateThread); +CSR_API(BaseSrvGetProcessShutdownParam); +CSR_API(BaseSrvSetProcessShutdownParam); VOID NTAPI @@ -263,6 +263,6 @@ IN ULONG ServerId); /* api/user.c */ -CSR_API(CsrRegisterServicesProcess); +CSR_API(SrvRegisterServicesProcess); /* EOF */ Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Sat Oct 20 14:07:04 2012 @@ -94,13 +94,12 @@ ***/ CSRSS_API_DEFINITION NativeDefinitions[] = { - CSRSS_DEFINE_API(CREATE_PROCESS, CsrSrvCreateProcess), - CSRSS_DEFINE_API(CREATE_THREAD, CsrSrvCreateThread), - CSRSS_DEFINE_API(TERMINATE_PROCESS, CsrTerminateProcess), - CSRSS_DEFINE_API(CONNECT_PROCESS, CsrConnectProcess), - CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS, CsrRegisterServicesProcess), - CSRSS_DEFINE_API(GET_SHUTDOWN_PARAMETERS, CsrGetShutdownParameters), - CSRSS_DEFINE_API(SET_SHUTDOWN_PARAMETERS, CsrSetShutdownParameters), + CSRSS_DEFINE_API(CREATE_PROCESS, BaseSrvCreateProcess), + CSRSS_DEFINE_API(CREATE_THREAD, BaseSrvCreateThread), + CSRSS_DEFINE_API(TERMINATE_PROCESS, BaseSrvExitProcess), + CSRSS_DEFINE_API(REGISTER_SERVICES_PROCESS, SrvRegisterServicesProcess), + CSRSS_DEFINE_API(GET_SHUTDOWN_PARAMETERS, BaseSrvGetProcessShutdownParam), + CSRSS_DEFINE_API(SET_SHUTDOWN_PARAMETERS, BaseSrvSetProcessShutdownParam), { 0, 0, NULL } };

1 0

[hbelusca] 57582: [CSRSS/CSRSRV] - Reorganize the source code tree. (Branch build still broken)
by hbelusca＠svn.reactos.org 20 Oct '12

20 Oct '12

Author: hbelusca Date: Sat Oct 20 13:28:09 2012 New Revision: 57582 URL: http://svn.reactos.org/svn/reactos?rev=57582&view=rev Log: [CSRSS/CSRSRV] - Reorganize the source code tree. (Branch build still broken) Added: branches/ros-csrss/subsystems/win32/csrsrv/ - copied from r57580, branches/ros-csrss/subsystems/win32/csrss/csrsrv/ branches/ros-csrss/subsystems/win32/csrsrv/include/ - copied from r57580, branches/ros-csrss/subsystems/win32/csrss/include/ Removed: branches/ros-csrss/subsystems/win32/csrss/csrsrv/ branches/ros-csrss/subsystems/win32/csrss/include/ Modified: branches/ros-csrss/subsystems/win32/CMakeLists.txt branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt Modified: branches/ros-csrss/subsystems/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/CMak… ============================================================================== --- branches/ros-csrss/subsystems/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/CMakeLists.txt [iso-8859-1] Sat Oct 20 13:28:09 2012 @@ -1,2 +1,3 @@ +add_subdirectory(csrsrv) add_subdirectory(csrss) Modified: branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt [iso-8859-1] Sat Oct 20 13:28:09 2012 @@ -10,5 +10,3 @@ add_importlibs(csrss ntdll csrsrv) add_dependencies(csrss psdk bugcodes) add_cd_file(TARGET csrss DESTINATION reactos/system32 FOR all) - -add_subdirectory(csrsrv)

1 0

[ekohl] 57581: [LSASRV] - Change the account and domain names in the WELL_KNOWN_SID type to AccountName and DomainName. - Implement a function to look-up fully qualified well-known names (for examp...
by ekohl＠svn.reactos.org 20 Oct '12

20 Oct '12

Author: ekohl Date: Sat Oct 20 13:21:48 2012 New Revision: 57581 URL: http://svn.reactos.org/svn/reactos?rev=57581&view=rev Log: [LSASRV] - Change the account and domain names in the WELL_KNOWN_SID type to AccountName and DomainName. - Implement a function to look-up fully qualified well-known names (for example "NT AUTHORITY\LOCAL SERVICE"). This kind of look-up was still missing from LsapLookupNames. - Ensure that all well-known SIDs returned by look-up functions are copied from the list of well-known SIDs, because RPCRT4.DLL frees the SID buffers after copying the SIDs to the caller. This will corrupt the well-known SID list if pointers to the original SIDs are passed. - Check all memory allocations. Modified: trunk/reactos/dll/win32/lsasrv/sids.c Modified: trunk/reactos/dll/win32/lsasrv/sids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/sids.c?re… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/sids.c [iso-8859-1] Sat Oct 20 13:21:48 2012 @@ -72,8 +72,8 @@ { LIST_ENTRY ListEntry; PSID Sid; - UNICODE_STRING Name; - UNICODE_STRING Domain; + UNICODE_STRING AccountName; + UNICODE_STRING DomainName; SID_NAME_USE Use; } WELL_KNOWN_SID, *PWELL_KNOWN_SID; @@ -202,8 +202,8 @@ LsapCreateSid(PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, UCHAR SubAuthorityCount, PULONG SubAuthorities, - PWSTR Name, - PWSTR Domain, + PWSTR AccountName, + PWSTR DomainName, SID_NAME_USE Use) { PWELL_KNOWN_SID SidEntry; @@ -235,11 +235,11 @@ *p = SubAuthorities[i]; } - RtlInitUnicodeString(&SidEntry->Name, - Name); - - RtlInitUnicodeString(&SidEntry->Domain, - Domain); + RtlInitUnicodeString(&SidEntry->AccountName, + AccountName); + + RtlInitUnicodeString(&SidEntry->DomainName, + DomainName); SidEntry->Use = Use; @@ -667,7 +667,7 @@ PWELL_KNOWN_SID -LsapLookupWellKnownName(PUNICODE_STRING Name) +LsapLookupIsolatedWellKnownName(PUNICODE_STRING AccountName) { PLIST_ENTRY ListEntry; PWELL_KNOWN_SID Ptr; @@ -678,7 +678,33 @@ Ptr = CONTAINING_RECORD(ListEntry, WELL_KNOWN_SID, ListEntry); - if (RtlEqualUnicodeString(Name, &Ptr->Name, TRUE)) + if (RtlEqualUnicodeString(AccountName, &Ptr->AccountName, TRUE)) + { + return Ptr; + } + + ListEntry = ListEntry->Flink; + } + + return NULL; +} + + +PWELL_KNOWN_SID +LsapLookupFullyQualifiedWellKnownName(PUNICODE_STRING AccountName, + PUNICODE_STRING DomainName) +{ + PLIST_ENTRY ListEntry; + PWELL_KNOWN_SID Ptr; + + ListEntry = WellKnownSidListHead.Flink; + while (ListEntry != &WellKnownSidListHead) + { + Ptr = CONTAINING_RECORD(ListEntry, + WELL_KNOWN_SID, + ListEntry); + if (RtlEqualUnicodeString(AccountName, &Ptr->AccountName, TRUE) && + RtlEqualUnicodeString(DomainName, &Ptr->DomainName, TRUE)) { return Ptr; } @@ -989,6 +1015,37 @@ } +static PSID +LsapCopySid(PSID SrcSid) +{ + UCHAR RidCount; + PSID DstSid; + ULONG i; + ULONG DstSidSize; + PULONG p, q; + + RidCount = *RtlSubAuthorityCountSid(SrcSid); + DstSidSize = RtlLengthRequiredSid(RidCount); + + DstSid = MIDL_user_allocate(DstSidSize); + if (DstSid == NULL) + return NULL; + + RtlInitializeSid(DstSid, + RtlIdentifierAuthoritySid(SrcSid), + RidCount); + + for (i = 0; i < (ULONG)RidCount; i++) + { + p = RtlSubAuthoritySid(SrcSid, i); + q = RtlSubAuthoritySid(DstSid, i); + *q = *p; + } + + return DstSid; +} + + static NTSTATUS LsapLookupIsolatedNames(DWORD Count, @@ -1018,18 +1075,24 @@ TRACE("Mapping name: %wZ\n", &AccountNames[i]); /* Look-up all well-known names */ - ptr = LsapLookupWellKnownName((PUNICODE_STRING)&AccountNames[i]); + ptr = LsapLookupIsolatedWellKnownName((PUNICODE_STRING)&AccountNames[i]); if (ptr != NULL) { SidsBuffer[i].Use = ptr->Use; - SidsBuffer[i].Sid = ptr->Sid; + SidsBuffer[i].Sid = LsapCopySid(ptr->Sid); + if (SidsBuffer[i].Sid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + SidsBuffer[i].DomainIndex = -1; SidsBuffer[i].Flags = 0; if (ptr->Use == SidTypeDomain) { Status = LsapAddDomainToDomainsList(DomainsBuffer, - &ptr->Name, + &ptr->AccountName, ptr->Sid, &DomainIndex); if (!NT_SUCCESS(Status)) @@ -1039,11 +1102,11 @@ } else { - ptr2= LsapLookupWellKnownName(&ptr->Domain); + ptr2= LsapLookupIsolatedWellKnownName(&ptr->DomainName); if (ptr2 != NULL) { Status = LsapAddDomainToDomainsList(DomainsBuffer, - &ptr2->Name, + &ptr2->AccountName, ptr2->Sid, &DomainIndex); if (!NT_SUCCESS(Status)) @@ -1086,7 +1149,13 @@ if (RtlEqualUnicodeString((PUNICODE_STRING)&AccountNames[i], &BuiltinDomainName, TRUE)) { SidsBuffer[i].Use = SidTypeDomain; - SidsBuffer[i].Sid = BuiltinDomainSid; + SidsBuffer[i].Sid = LsapCopySid(BuiltinDomainSid); + if (SidsBuffer[i].Sid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + SidsBuffer[i].DomainIndex = -1; SidsBuffer[i].Flags = 0; @@ -1107,7 +1176,12 @@ if (RtlEqualUnicodeString((PUNICODE_STRING)&AccountNames[i], &AccountDomainName, TRUE)) { SidsBuffer[i].Use = SidTypeDomain; - SidsBuffer[i].Sid = AccountDomainSid; + SidsBuffer[i].Sid = LsapCopySid(AccountDomainSid); + if (SidsBuffer[i].Sid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } SidsBuffer[i].DomainIndex = -1; SidsBuffer[i].Flags = 0; @@ -1197,7 +1271,10 @@ SidsBuffer[i].Sid = CreateSidFromSidAndRid(BuiltinDomainSid, RelativeIds.Element[0]); if (SidsBuffer[i].Sid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; goto done; + } SidsBuffer[i].DomainIndex = -1; SidsBuffer[i].Flags = 0; @@ -1292,7 +1369,10 @@ SidsBuffer[i].Sid = CreateSidFromSidAndRid(AccountDomainSid, RelativeIds.Element[0]); if (SidsBuffer[i].Sid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; goto done; + } SidsBuffer[i].DomainIndex = -1; SidsBuffer[i].Flags = 0; @@ -1320,6 +1400,114 @@ if (ServerHandle != NULL) SamrCloseHandle(&ServerHandle); + return Status; +} + + +static +NTSTATUS +LsapLookupFullyQualifiedWellKnownNames(DWORD Count, + PRPC_UNICODE_STRING DomainNames, + PRPC_UNICODE_STRING AccountNames, + PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer, + PLSAPR_TRANSLATED_SID_EX2 SidsBuffer, + PULONG Mapped) +{ + UNICODE_STRING EmptyDomainName = RTL_CONSTANT_STRING(L""); + PWELL_KNOWN_SID ptr, ptr2; + PSID DomainSid; + ULONG DomainIndex; + ULONG i; + NTSTATUS Status = STATUS_SUCCESS; + + for (i = 0; i < Count; i++) + { + /* Ignore names which were already mapped */ + if (SidsBuffer[i].Use != SidTypeUnknown) + continue; + + /* Ignore isolated account names */ + if (DomainNames[i].Length == 0) + continue; + + TRACE("Mapping name: %wZ\\%wZ\n", &DomainNames[i], &AccountNames[i]); + + /* Look-up all well-known names */ + ptr = LsapLookupFullyQualifiedWellKnownName((PUNICODE_STRING)&AccountNames[i], + (PUNICODE_STRING)&DomainNames[i]); + if (ptr != NULL) + { + TRACE("Found it! (%wZ\\%wZ)\n", &ptr->DomainName, &ptr->AccountName); + + SidsBuffer[i].Use = ptr->Use; + SidsBuffer[i].Sid = LsapCopySid(ptr->Sid); + if (SidsBuffer[i].Sid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + SidsBuffer[i].DomainIndex = -1; + SidsBuffer[i].Flags = 0; + + if (ptr->Use == SidTypeDomain) + { + Status = LsapAddDomainToDomainsList(DomainsBuffer, + &ptr->AccountName, + ptr->Sid, + &DomainIndex); + if (!NT_SUCCESS(Status)) + goto done; + + SidsBuffer[i].DomainIndex = DomainIndex; + } + else + { + ptr2= LsapLookupIsolatedWellKnownName(&ptr->DomainName); + if (ptr2 != NULL) + { + Status = LsapAddDomainToDomainsList(DomainsBuffer, + &ptr2->AccountName, + ptr2->Sid, + &DomainIndex); + if (!NT_SUCCESS(Status)) + goto done; + + SidsBuffer[i].DomainIndex = DomainIndex; + } + else + { + DomainSid = CreateDomainSidFromAccountSid(ptr->Sid); + if (DomainSid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = LsapAddDomainToDomainsList(DomainsBuffer, + &EmptyDomainName, + DomainSid, + &DomainIndex); + + if (DomainSid != NULL) + { + MIDL_user_free(DomainSid); + DomainSid = NULL; + } + + if (!NT_SUCCESS(Status)) + goto done; + + SidsBuffer[i].DomainIndex = DomainIndex; + } + } + + (*Mapped)++; + continue; + } + } + +done: return Status; } @@ -1372,6 +1560,8 @@ if (!RtlEqualUnicodeString((PUNICODE_STRING)&DomainNames[i], &BuiltinDomainName, TRUE)) continue; + + TRACE("Mapping name: %wZ\\%wZ\n", &DomainNames[i], &AccountNames[i]); Status = SamrLookupNamesInDomain(DomainHandle, 1, @@ -1384,7 +1574,10 @@ SidsBuffer[i].Sid = CreateSidFromSidAndRid(BuiltinDomainSid, RelativeIds.Element[0]); if (SidsBuffer[i].Sid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; goto done; + } SidsBuffer[i].DomainIndex = -1; SidsBuffer[i].Flags = 0; @@ -1464,6 +1657,8 @@ if (!RtlEqualUnicodeString((PUNICODE_STRING)&DomainNames[i], &AccountDomainName, TRUE)) continue; + + TRACE("Mapping name: %wZ\\%wZ\n", &DomainNames[i], &AccountNames[i]); Status = SamrLookupNamesInDomain(DomainHandle, 1, @@ -1476,7 +1671,10 @@ SidsBuffer[i].Sid = CreateSidFromSidAndRid(AccountDomainSid, RelativeIds.Element[0]); if (SidsBuffer[i].Sid == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; goto done; + } SidsBuffer[i].DomainIndex = -1; SidsBuffer[i].Flags = 0; @@ -1523,12 +1721,9 @@ PRPC_UNICODE_STRING DomainNames = NULL; PRPC_UNICODE_STRING AccountNames = NULL; ULONG SidsBufferLength; -// ULONG DomainIndex; ULONG i; ULONG Mapped = 0; NTSTATUS Status = STATUS_SUCCESS; - -// PWELL_KNOWN_SID ptr, ptr2; //TRACE("()\n"); @@ -1635,7 +1830,22 @@ if (Mapped == Count) goto done; - + Status = LsapLookupFullyQualifiedWellKnownNames(Count, + DomainNames, + AccountNames, + DomainsBuffer, + SidsBuffer, + &Mapped); + if (!NT_SUCCESS(Status) && + Status != STATUS_NONE_MAPPED && + Status != STATUS_SOME_NOT_MAPPED) + { + TRACE("LsapLookupFullyQualifiedWellKnownNames failed! (Status %lx)\n", Status); + goto done; + } + + if (Mapped == Count) + goto done; Status = LsapLookupBuiltinNames(Count, DomainNames, @@ -1769,16 +1979,22 @@ NamesBuffer[i].Use = ptr->Use; NamesBuffer[i].Flags = 0; - NamesBuffer[i].Name.Buffer = MIDL_user_allocate(ptr->Name.MaximumLength); - NamesBuffer[i].Name.Length = ptr->Name.Length; - NamesBuffer[i].Name.MaximumLength = ptr->Name.MaximumLength; - RtlCopyMemory(NamesBuffer[i].Name.Buffer, ptr->Name.Buffer, ptr->Name.MaximumLength); - - ptr2= LsapLookupWellKnownName(&ptr->Domain); + NamesBuffer[i].Name.Length = ptr->AccountName.Length; + NamesBuffer[i].Name.MaximumLength = ptr->AccountName.MaximumLength; + NamesBuffer[i].Name.Buffer = MIDL_user_allocate(ptr->AccountName.MaximumLength); + if (NamesBuffer[i].Name.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + RtlCopyMemory(NamesBuffer[i].Name.Buffer, ptr->AccountName.Buffer, ptr->AccountName.MaximumLength); + + ptr2= LsapLookupIsolatedWellKnownName(&ptr->DomainName); if (ptr2 != NULL) { Status = LsapAddDomainToDomainsList(DomainsBuffer, - &ptr2->Name, + &ptr2->AccountName, ptr2->Sid, &DomainIndex); if (!NT_SUCCESS(Status))

1 0

[hbelusca] 57580: [CSRSS/CSRSRV] - Rename ProcessDataLock to CsrProcessLock (as it was in the "old" csrsrv, see r57579). - Merge the APIs from the "old" csrsrv (subsystems/csr , see r57579) with th...
by hbelusca＠svn.reactos.org 20 Oct '12

20 Oct '12

Author: hbelusca Date: Sat Oct 20 13:00:41 2012 New Revision: 57580 URL: http://svn.reactos.org/svn/reactos?rev=57580&view=rev Log: [CSRSS/CSRSRV] - Rename ProcessDataLock to CsrProcessLock (as it was in the "old" csrsrv, see r57579). - Merge the APIs from the "old" csrsrv (subsystems/csr , see r57579) with the other ones (subsystems/win32/csrss/csrsrv). - Reorganize the functions into Private & Public functions. - Add temporary comments. - Start removing things which should be present in basesrv instead of in csrsrv. This breaks build of this branch at the moment... Modified: branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/wapi.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/csrsrv.spec branches/ros-csrss/subsystems/win32/csrss/csrsrv/init.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/session.c branches/ros-csrss/subsystems/win32/csrss/csrsrv/thredsup.c branches/ros-csrss/subsystems/win32/csrss/csrss.c branches/ros-csrss/subsystems/win32/csrss/include/api.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/subsystems/win32/csrss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/csrsrv.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/csrss.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… Modified: branches/ros-csrss/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs…

1 0

[hbelusca] 57579: [CSR] Remove old csrss.
by hbelusca＠svn.reactos.org 19 Oct '12

19 Oct '12

Author: hbelusca Date: Fri Oct 19 20:14:47 2012 New Revision: 57579 URL: http://svn.reactos.org/svn/reactos?rev=57579&view=rev Log: [CSR] Remove old csrss. Removed: branches/ros-csrss/subsystems/csr/

1 0

[jgardou] 57578: [WIN32K] - Use GdiBlt channel for relevant functions
by jgardou＠svn.reactos.org 19 Oct '12

19 Oct '12

Author: jgardou Date: Fri Oct 19 09:00:45 2012 New Revision: 57578 URL: http://svn.reactos.org/svn/reactos?rev=57578&view=rev Log: [WIN32K] - Use GdiBlt channel for relevant functions Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Fri Oct 19 09:00:45 2012 @@ -7,9 +7,7 @@ */ #include <win32k.h> - -#define NDEBUG -#include <debug.h> +DBG_DEFAULT_CHANNEL(GdiBlt); #define ROP_USES_SOURCE(Rop) (((((Rop) & 0xCC0000) >> 2) != ((Rop) & 0x330000)) || ((((Rop) & 0xCC000000) >> 2) != ((Rop) & 0x33000000))) #define ROP_USES_MASK(Rop) (((Rop) & 0xFF000000) != (((Rop) & 0xff0000) << 8)) @@ -49,12 +47,12 @@ return FALSE; } - DPRINT("Locking DCs\n"); + TRACE("Locking DCs\n"); ahDC[0] = hDCDest; ahDC[1] = hDCSrc ; if (!GDIOBJ_bLockMultipleObjects(2, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { - DPRINT1("Invalid dc handle (dest=0x%p, src=0x%p) passed to NtGdiAlphaBlend\n", hDCDest, hDCSrc); + WARN("Invalid dc handle (dest=0x%p, src=0x%p) passed to NtGdiAlphaBlend\n", hDCDest, hDCSrc); EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -102,7 +100,7 @@ } /* Prepare DCs for blit */ - DPRINT("Preparing DCs for blit\n"); + TRACE("Preparing DCs for blit\n"); DC_vPrepareDCsForBlit(DCDest, DestRect, DCSrc, SourceRect); /* Determine surfaces to be used in the bitblt */ @@ -124,7 +122,7 @@ EXLATEOBJ_vInitXlateFromDCs(&exlo, DCSrc, DCDest); /* Perform the alpha blend operation */ - DPRINT("Performing the alpha blend\n"); + TRACE("Performing the alpha blend\n"); bResult = IntEngAlphaBlend(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, DCDest->rosdc.CombinedClip, @@ -135,7 +133,7 @@ EXLATEOBJ_vCleanup(&exlo); leave : - DPRINT("Finishing blit\n"); + TRACE("Finishing blit\n"); DC_vFinishBlit(DCDest, DCSrc); GDIOBJ_vUnlockObject(&DCSrc->BaseObject); GDIOBJ_vUnlockObject(&DCDest->BaseObject); @@ -197,12 +195,12 @@ BOOL Ret = FALSE; EXLATEOBJ exlo; - DPRINT("Locking DCs\n"); + TRACE("Locking DCs\n"); ahDC[0] = hdcDst; ahDC[1] = hdcSrc ; if (!GDIOBJ_bLockMultipleObjects(2, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { - DPRINT1("Invalid dc handle (dest=0x%p, src=0x%p) passed to NtGdiAlphaBlend\n", hdcDst, hdcSrc); + WARN("Invalid dc handle (dest=0x%p, src=0x%p) passed to NtGdiAlphaBlend\n", hdcDst, hdcSrc); EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -343,7 +341,7 @@ } else if(psurfMask) { - DPRINT1("Getting Mask bitmap without needing it?\n"); + WARN("Getting Mask bitmap without needing it?\n"); SURFACE_ShareUnlockSurface(psurfMask); psurfMask = NULL; } @@ -351,12 +349,12 @@ MaskPoint.y = yMask; /* Take care of source and destination bitmap */ - DPRINT("Locking DCs\n"); + TRACE("Locking DCs\n"); ahDC[0] = hdcDest; ahDC[1] = UsesSource ? hdcSrc : NULL; if (!GDIOBJ_bLockMultipleObjects(2, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { - DPRINT1("Invalid dc handle (dest=0x%p, src=0x%p) passed to NtGdiAlphaBlend\n", hdcDest, hdcSrc); + WARN("Invalid dc handle (dest=0x%p, src=0x%p) passed to NtGdiAlphaBlend\n", hdcDest, hdcSrc); EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -367,7 +365,7 @@ if (NULL == DCDest) { if(DCSrc) DC_UnlockDc(DCSrc); - DPRINT("Invalid destination dc handle (0x%p) passed to NtGdiBitBlt\n", hdcDest); + WARN("Invalid destination dc handle (0x%p) passed to NtGdiBitBlt\n", hdcDest); return FALSE; } @@ -497,7 +495,7 @@ IN INT yMask, IN DWORD crBackColor) { - UNIMPLEMENTED; + FIXME("NtGdiPlgBlt: unimplemented.\n"); return FALSE; } @@ -558,7 +556,7 @@ ahDC[2] = UsesMask ? hDCMask : NULL; if (!GDIOBJ_bLockMultipleObjects(3, (HGDIOBJ*)ahDC, apObj, GDIObjType_DC_TYPE)) { - DPRINT1("Invalid dc handle (dest=0x%p, src=0x%p) passed to NtGdiAlphaBlend\n", hDCDest, hDCSrc); + WARN("Invalid dc handle (dest=0x%p, src=0x%p) passed to GreStretchBltMask\n", hDCDest, hDCSrc); EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -651,7 +649,7 @@ (BitmapMask->SurfObj.sizlBitmap.cx < WidthSrc || BitmapMask->SurfObj.sizlBitmap.cy < HeightSrc)) { - DPRINT1("%dx%d mask is smaller than %dx%d bitmap\n", + WARN("%dx%d mask is smaller than %dx%d bitmap\n", BitmapMask->SurfObj.sizlBitmap.cx, BitmapMask->SurfObj.sizlBitmap.cy, WidthSrc, HeightSrc); EXLATEOBJ_vCleanup(&exlo);

1 0

[tfaber] 57577: [WINE] - Remove useless casts from unicode.h CORE-6418 #resolve
by tfaber＠svn.reactos.org 19 Oct '12

19 Oct '12

Author: tfaber Date: Fri Oct 19 05:55:45 2012 New Revision: 57577 URL: http://svn.reactos.org/svn/reactos?rev=57577&view=rev Log: [WINE] - Remove useless casts from unicode.h CORE-6418 #resolve Modified: trunk/reactos/include/reactos/wine/unicode.h Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] Fri Oct 19 05:55:45 2012 @@ -24,23 +24,23 @@ #define WINE_UNICODE_INLINE static inline #endif -#define memicmpW(s1,s2,n) _wcsnicmp((const wchar_t *)(s1),(const wchar_t *)(s2),(n)) -#define strlenW(s) wcslen((const wchar_t *)(s)) -#define strcpyW(d,s) wcscpy((wchar_t *)(d),(const wchar_t *)(s)) -#define strcatW(d,s) wcscat((wchar_t *)(d),(const wchar_t *)(s)) -#define strcspnW(d,s) wcscspn((wchar_t *)(d),(const wchar_t *)(s)) -#define strstrW(d,s) wcsstr((const wchar_t *)(d),(const wchar_t *)(s)) -#define strtolW(s,e,b) wcstol((const wchar_t *)(s),(wchar_t **)(e),(b)) -#define strchrW(s,c) wcschr((const wchar_t *)(s),(wchar_t)(c)) -#define strrchrW(s,c) wcsrchr((const wchar_t *)(s),(wchar_t)(c)) -#define strncmpW(s1,s2,n) wcsncmp((const wchar_t *)(s1),(const wchar_t *)(s2),(n)) -#define strncpyW(s1,s2,n) wcsncpy((wchar_t *)(s1),(const wchar_t *)(s2),(n)) -#define strcmpW(s1,s2) wcscmp((const wchar_t *)(s1),(const wchar_t *)(s2)) -#define strcmpiW(s1,s2) _wcsicmp((const wchar_t *)(s1),(const wchar_t *)(s2)) -#define strncmpiW(s1,s2,n) _wcsnicmp((const wchar_t *)(s1),(const wchar_t *)(s2),(n)) -#define strtoulW(s1,s2,b) wcstoul((const wchar_t *)(s1),(wchar_t **)(s2),(b)) -#define strspnW(str, accept) wcsspn((const wchar_t *)(str), (const wchar_t *)(accept)) -#define strpbrkW(str, accept) wcspbrk((const wchar_t *)(str), (const wchar_t *)(accept)) +#define memicmpW(s1,s2,n) _wcsnicmp((s1),(s2),(n)) +#define strlenW(s) wcslen((s)) +#define strcpyW(d,s) wcscpy((d),(s)) +#define strcatW(d,s) wcscat((d),(s)) +#define strcspnW(d,s) wcscspn((d),(s)) +#define strstrW(d,s) wcsstr((d),(s)) +#define strtolW(s,e,b) wcstol((s),(e),(b)) +#define strchrW(s,c) wcschr((s),(c)) +#define strrchrW(s,c) wcsrchr((s),(c)) +#define strncmpW(s1,s2,n) wcsncmp((s1),(s2),(n)) +#define strncpyW(s1,s2,n) wcsncpy((s1),(s2),(n)) +#define strcmpW(s1,s2) wcscmp((s1),(s2)) +#define strcmpiW(s1,s2) _wcsicmp((s1),(s2)) +#define strncmpiW(s1,s2,n) _wcsnicmp((s1),(s2),(n)) +#define strtoulW(s1,s2,b) wcstoul((s1),(s2),(b)) +#define strspnW(str, accept) wcsspn((str),(accept)) +#define strpbrkW(str, accept) wcspbrk((str),(accept)) #define tolowerW(n) towlower((n)) #define toupperW(n) towupper((n)) #define islowerW(n) iswlower((n)) @@ -51,10 +51,10 @@ #define isxdigitW(n) iswxdigit((n)) #define isspaceW(n) iswspace((n)) #define iscntrlW(n) iswcntrl((n)) -#define atoiW(s) _wtoi((const wchar_t *)(s)) -#define atolW(s) _wtol((const wchar_t *)(s)) -#define strlwrW(s) _wcslwr((wchar_t *)(s)) -#define struprW(s) _wcsupr((wchar_t *)(s)) +#define atoiW(s) _wtoi((s)) +#define atolW(s) _wtol((s)) +#define strlwrW(s) _wcslwr((s)) +#define struprW(s) _wcsupr((s)) #define sprintfW swprintf #define vsprintfW vswprintf #define snprintfW _snwprintf

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs