Ros-diffs November 2018

ros-diffs@reactos.org

29 participants
250 discussions

01/01: [LSASRV] Return STATUS_DIRECTORY_SERVICE_REQUIRED for all trusted domain functions that use a policy handle and a domain name or domain SID when the machine is not a domain controller.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee90e7f608ead823adbc2… commit ee90e7f608ead823adbc2470910455d250cebafe Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 4 15:27:57 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 4 15:27:57 2018 +0100 [LSASRV] Return STATUS_DIRECTORY_SERVICE_REQUIRED for all trusted domain functions that use a policy handle and a domain name or domain SID when the machine is not a domain controller. --- dll/win32/lsasrv/lsarpc.c | 72 ++++++++++++++++++++++++++++++++++++++--------- dll/win32/lsasrv/lsasrv.c | 10 +++++-- dll/win32/lsasrv/lsasrv.h | 3 ++ 3 files changed, 69 insertions(+), 16 deletions(-) diff --git a/dll/win32/lsasrv/lsarpc.c b/dll/win32/lsasrv/lsarpc.c index 54afdf380f..62d245b9d4 100644 --- a/dll/win32/lsasrv/lsarpc.c +++ b/dll/win32/lsasrv/lsarpc.c @@ -1161,8 +1161,12 @@ LsarCreateTrustedDomain( ACCESS_MASK DesiredAccess, LSAPR_HANDLE *TrustedDomainHandle) { - /* FIXME: We are not running an AD yet */ - return STATUS_DIRECTORY_SERVICE_REQUIRED; + /* Fail, if we are not a domain controller */ + if (LsapProductType != NtProductLanManNt) + return STATUS_DIRECTORY_SERVICE_REQUIRED; + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -2045,6 +2049,10 @@ LsarOpenTrustedDomain( ACCESS_MASK DesiredAccess, LSAPR_HANDLE *TrustedDomainHandle) { + /* Fail, if we are not a domain controller */ + if (LsapProductType != NtProductLanManNt) + return STATUS_DIRECTORY_SERVICE_REQUIRED; + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -3405,8 +3413,12 @@ LsarQueryTrustedDomainInfo( TRUSTED_INFORMATION_CLASS InformationClass, PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation) { - /* FIXME: We are not running an AD yet */ - return STATUS_DIRECTORY_SERVICE_REQUIRED; + /* Fail, if we are not a domain controller */ + if (LsapProductType != NtProductLanManNt) + return STATUS_DIRECTORY_SERVICE_REQUIRED; + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -3419,8 +3431,12 @@ LsarSetTrustedDomainInfo( TRUSTED_INFORMATION_CLASS InformationClass, PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation) { - /* FIXME: We are not running an AD yet */ - return STATUS_DIRECTORY_SERVICE_REQUIRED; + /* Fail, if we are not a domain controller */ + if (LsapProductType != NtProductLanManNt) + return STATUS_DIRECTORY_SERVICE_REQUIRED; + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -3431,8 +3447,12 @@ LsarDeleteTrustedDomain( LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid) { - /* FIXME: We are not running an AD yet */ - return STATUS_DIRECTORY_SERVICE_REQUIRED; + /* Fail, if we are not a domain controller */ + if (LsapProductType != NtProductLanManNt) + return STATUS_DIRECTORY_SERVICE_REQUIRED; + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -3763,6 +3783,10 @@ LsarQueryTrustedDomainInfoByName( POLICY_INFORMATION_CLASS InformationClass, PLSAPR_TRUSTED_DOMAIN_INFO *PolicyInformation) { + /* Fail, if we are not a domain controller */ + if (LsapProductType != NtProductLanManNt) + return STATUS_DIRECTORY_SERVICE_REQUIRED; + /* FIXME: We are not running an AD yet */ return STATUS_OBJECT_NAME_NOT_FOUND; } @@ -3777,6 +3801,10 @@ LsarSetTrustedDomainInfoByName( POLICY_INFORMATION_CLASS InformationClass, PLSAPR_TRUSTED_DOMAIN_INFO PolicyInformation) { + /* Fail, if we are not a domain controller */ + if (LsapProductType != NtProductLanManNt) + return STATUS_DIRECTORY_SERVICE_REQUIRED; + /* FIXME: We are not running an AD yet */ return STATUS_OBJECT_NAME_NOT_FOUND; } @@ -3791,6 +3819,10 @@ LsarEnumerateTrustedDomainsEx( PLSAPR_TRUSTED_ENUM_BUFFER_EX EnumerationBuffer, DWORD PreferedMaximumLength) { + /* Fail, if we are not a domain controller */ + if (LsapProductType != NtProductLanManNt) + return STATUS_DIRECTORY_SERVICE_REQUIRED; + /* FIXME: We are not running an AD yet */ EnumerationBuffer->EntriesRead = 0; EnumerationBuffer->EnumerationBuffer = NULL; @@ -3808,8 +3840,12 @@ LsarCreateTrustedDomainEx( ACCESS_MASK DesiredAccess, LSAPR_HANDLE *TrustedDomainHandle) { - /* FIXME: We are not running an AD yet */ - return STATUS_DIRECTORY_SERVICE_REQUIRED; + /* Fail, if we are not a domain controller */ + if (LsapProductType != NtProductLanManNt) + return STATUS_DIRECTORY_SERVICE_REQUIRED; + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -3859,8 +3895,12 @@ LsarOpenTrustedDomainByName( ACCESS_MASK DesiredAccess, LSAPR_HANDLE *TrustedDomainHandle) { - /* FIXME: We are not running an AD yet */ - return STATUS_OBJECT_NAME_NOT_FOUND; + /* Fail, if we are not a domain controller */ + if (LsapProductType != NtProductLanManNt) + return STATUS_DIRECTORY_SERVICE_REQUIRED; + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -3989,8 +4029,12 @@ LsarCreateTrustedDomainEx2( ACCESS_MASK DesiredAccess, LSAPR_HANDLE *TrustedDomainHandle) { - /* FIXME: We are not running an AD yet */ - return STATUS_DIRECTORY_SERVICE_REQUIRED; + /* Fail, if we are not a domain controller */ + if (LsapProductType != NtProductLanManNt) + return STATUS_DIRECTORY_SERVICE_REQUIRED; + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } diff --git a/dll/win32/lsasrv/lsasrv.c b/dll/win32/lsasrv/lsasrv.c index b92e0e6ff9..7b09751fdc 100644 --- a/dll/win32/lsasrv/lsasrv.c +++ b/dll/win32/lsasrv/lsasrv.c @@ -10,6 +10,8 @@ #include "lsasrv.h" +NT_PRODUCT_TYPE LsapProductType = NtProductWinNt; + /* FUNCTIONS ***************************************************************/ VOID @@ -268,13 +270,17 @@ LsaIFree_LSAPR_TRANSLATED_SIDS( } -NTSTATUS WINAPI +NTSTATUS +WINAPI LsapInitLsa(VOID) { NTSTATUS Status; BOOLEAN PrivilegeEnabled; - TRACE("LsapInitLsa() called\n"); + TRACE("LsapInitLsa()\n"); + + /* Get the product type */ + RtlGetNtProductType(&LsapProductType); /* Initialize the well known SIDs */ LsapInitSids(); diff --git a/dll/win32/lsasrv/lsasrv.h b/dll/win32/lsasrv/lsasrv.h index 174a8fb6f4..62c7fdd236 100644 --- a/dll/win32/lsasrv/lsasrv.h +++ b/dll/win32/lsasrv/lsasrv.h @@ -28,6 +28,7 @@ #include <ndk/obfuncs.h> #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> +#include <ndk/ketypes.h> #include <ndk/setypes.h> #include <ntsam.h> @@ -85,6 +86,8 @@ typedef struct _SAMPR_ULONG_ARRAY unsigned long *Element; } SAMPR_ULONG_ARRAY, *PSAMPR_ULONG_ARRAY; +extern NT_PRODUCT_TYPE LsapProductType; + extern SID_IDENTIFIER_AUTHORITY NullSidAuthority; extern SID_IDENTIFIER_AUTHORITY WorldSidAuthority; extern SID_IDENTIFIER_AUTHORITY LocalSidAuthority;

5 years, 10 months

01/01: [LSASRV] Coding style fixes

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91eaa5e2d486315f5a7e0… commit 91eaa5e2d486315f5a7e0bbf1dec20f5bf0133b7 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 4 12:50:21 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 4 12:50:21 2018 +0100 [LSASRV] Coding style fixes --- dll/win32/lsasrv/lsarpc.c | 314 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 235 insertions(+), 79 deletions(-) diff --git a/dll/win32/lsasrv/lsarpc.c b/dll/win32/lsasrv/lsarpc.c index 925ca45556..54afdf380f 100644 --- a/dll/win32/lsasrv/lsarpc.c +++ b/dll/win32/lsasrv/lsarpc.c @@ -111,14 +111,18 @@ LsarStartRpcServer(VOID) } -void __RPC_USER LSAPR_HANDLE_rundown(LSAPR_HANDLE hHandle) +void +__RPC_USER +LSAPR_HANDLE_rundown( + LSAPR_HANDLE hHandle) { - } /* Function 0 */ -NTSTATUS WINAPI LsarClose( +NTSTATUS +WINAPI +LsarClose( LSAPR_HANDLE *ObjectHandle) { PLSA_DB_OBJECT DbObject; @@ -145,7 +149,9 @@ NTSTATUS WINAPI LsarClose( /* Function 1 */ -NTSTATUS WINAPI LsarDelete( +NTSTATUS +WINAPI +LsarDelete( LSAPR_HANDLE ObjectHandle) { TRACE("LsarDelete(%p)\n", ObjectHandle); @@ -155,7 +161,9 @@ NTSTATUS WINAPI LsarDelete( /* Function 2 */ -NTSTATUS WINAPI LsarEnumeratePrivileges( +NTSTATUS +WINAPI +LsarEnumeratePrivileges( LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_PRIVILEGE_ENUM_BUFFER EnumerationBuffer, @@ -185,7 +193,9 @@ NTSTATUS WINAPI LsarEnumeratePrivileges( /* Function 3 */ -NTSTATUS WINAPI LsarQuerySecurityObject( +NTSTATUS +WINAPI +LsarQuerySecurityObject( LSAPR_HANDLE ObjectHandle, SECURITY_INFORMATION SecurityInformation, PLSAPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor) @@ -308,7 +318,9 @@ done: /* Function 4 */ -NTSTATUS WINAPI LsarSetSecurityObject( +NTSTATUS +WINAPI +LsarSetSecurityObject( LSAPR_HANDLE ObjectHandle, SECURITY_INFORMATION SecurityInformation, PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor) @@ -462,7 +474,9 @@ done: /* Function 5 */ -NTSTATUS WINAPI LsarChangePassword( +NTSTATUS +WINAPI +LsarChangePassword( handle_t IDL_handle, PRPC_UNICODE_STRING String1, PRPC_UNICODE_STRING String2, @@ -476,7 +490,9 @@ NTSTATUS WINAPI LsarChangePassword( /* Function 6 */ -NTSTATUS WINAPI LsarOpenPolicy( +NTSTATUS +WINAPI +LsarOpenPolicy( LPWSTR SystemName, PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK DesiredAccess, @@ -510,7 +526,9 @@ NTSTATUS WINAPI LsarOpenPolicy( /* Function 7 */ -NTSTATUS WINAPI LsarQueryInformationPolicy( +NTSTATUS +WINAPI +LsarQueryInformationPolicy( LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_INFORMATION *PolicyInformation) @@ -640,7 +658,9 @@ NTSTATUS WINAPI LsarQueryInformationPolicy( /* Function 8 */ -NTSTATUS WINAPI LsarSetInformationPolicy( +NTSTATUS +WINAPI +LsarSetInformationPolicy( LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_INFORMATION PolicyInformation) @@ -779,7 +799,9 @@ NTSTATUS WINAPI LsarSetInformationPolicy( /* Function 9 */ -NTSTATUS WINAPI LsarClearAuditLog( +NTSTATUS +WINAPI +LsarClearAuditLog( LSAPR_HANDLE ObjectHandle) { /* Deprecated */ @@ -856,7 +878,9 @@ done: /* Function 10 */ -NTSTATUS WINAPI LsarCreateAccount( +NTSTATUS +WINAPI +LsarCreateAccount( LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, ACCESS_MASK DesiredAccess, @@ -899,7 +923,9 @@ NTSTATUS WINAPI LsarCreateAccount( /* Function 11 */ -NTSTATUS WINAPI LsarEnumerateAccounts( +NTSTATUS +WINAPI +LsarEnumerateAccounts( LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer, @@ -1127,7 +1153,9 @@ done: /* Function 12 */ -NTSTATUS WINAPI LsarCreateTrustedDomain( +NTSTATUS +WINAPI +LsarCreateTrustedDomain( LSAPR_HANDLE PolicyHandle, PLSAPR_TRUST_INFORMATION TrustedDomainInformation, ACCESS_MASK DesiredAccess, @@ -1139,7 +1167,9 @@ NTSTATUS WINAPI LsarCreateTrustedDomain( /* Function 13 */ -NTSTATUS WINAPI LsarEnumerateTrustedDomains( +NTSTATUS +WINAPI +LsarEnumerateTrustedDomains( LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_TRUSTED_ENUM_BUFFER EnumerationBuffer, @@ -1153,7 +1183,9 @@ NTSTATUS WINAPI LsarEnumerateTrustedDomains( /* Function 14 */ -NTSTATUS WINAPI LsarLookupNames( +NTSTATUS +WINAPI +LsarLookupNames( LSAPR_HANDLE PolicyHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -1215,7 +1247,9 @@ NTSTATUS WINAPI LsarLookupNames( /* Function 15 */ -NTSTATUS WINAPI LsarLookupSids( +NTSTATUS +WINAPI +LsarLookupSids( LSAPR_HANDLE PolicyHandle, PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -1276,7 +1310,9 @@ NTSTATUS WINAPI LsarLookupSids( /* Function 16 */ -NTSTATUS WINAPI LsarCreateSecret( +NTSTATUS +WINAPI +LsarCreateSecret( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING SecretName, ACCESS_MASK DesiredAccess, @@ -1420,7 +1456,9 @@ LsarpOpenAccount( /* Function 17 */ -NTSTATUS WINAPI LsarOpenAccount( +NTSTATUS +WINAPI +LsarOpenAccount( LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, ACCESS_MASK DesiredAccess, @@ -1457,7 +1495,9 @@ NTSTATUS WINAPI LsarOpenAccount( /* Function 18 */ -NTSTATUS WINAPI LsarEnumeratePrivilegesAccount( +NTSTATUS +WINAPI +LsarEnumeratePrivilegesAccount( LSAPR_HANDLE AccountHandle, PLSAPR_PRIVILEGE_SET *Privileges) { @@ -1514,7 +1554,9 @@ NTSTATUS WINAPI LsarEnumeratePrivilegesAccount( /* Function 19 */ -NTSTATUS WINAPI LsarAddPrivilegesToAccount( +NTSTATUS +WINAPI +LsarAddPrivilegesToAccount( LSAPR_HANDLE AccountHandle, PLSAPR_PRIVILEGE_SET Privileges) { @@ -1668,7 +1710,9 @@ done: /* Function 20 */ -NTSTATUS WINAPI LsarRemovePrivilegesFromAccount( +NTSTATUS +WINAPI +LsarRemovePrivilegesFromAccount( LSAPR_HANDLE AccountHandle, BOOLEAN AllPrivileges, PLSAPR_PRIVILEGE_SET Privileges) @@ -1825,7 +1869,9 @@ done: /* Function 21 */ -NTSTATUS WINAPI LsarGetQuotasForAccount( +NTSTATUS +WINAPI +LsarGetQuotasForAccount( LSAPR_HANDLE AccountHandle, PQUOTA_LIMITS QuotaLimits) { @@ -1858,7 +1904,9 @@ NTSTATUS WINAPI LsarGetQuotasForAccount( /* Function 22 */ -NTSTATUS WINAPI LsarSetQuotasForAccount( +NTSTATUS +WINAPI +LsarSetQuotasForAccount( LSAPR_HANDLE AccountHandle, PQUOTA_LIMITS QuotaLimits) { @@ -1920,7 +1968,9 @@ NTSTATUS WINAPI LsarSetQuotasForAccount( /* Function 23 */ -NTSTATUS WINAPI LsarGetSystemAccessAccount( +NTSTATUS +WINAPI +LsarGetSystemAccessAccount( LSAPR_HANDLE AccountHandle, ACCESS_MASK *SystemAccess) { @@ -1953,7 +2003,9 @@ NTSTATUS WINAPI LsarGetSystemAccessAccount( /* Function 24 */ -NTSTATUS WINAPI LsarSetSystemAccessAccount( +NTSTATUS +WINAPI +LsarSetSystemAccessAccount( LSAPR_HANDLE AccountHandle, ACCESS_MASK SystemAccess) { @@ -1985,7 +2037,9 @@ NTSTATUS WINAPI LsarSetSystemAccessAccount( /* Function 25 */ -NTSTATUS WINAPI LsarOpenTrustedDomain( +NTSTATUS +WINAPI +LsarOpenTrustedDomain( LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid, ACCESS_MASK DesiredAccess, @@ -1997,7 +2051,9 @@ NTSTATUS WINAPI LsarOpenTrustedDomain( /* Function 26 */ -NTSTATUS WINAPI LsarQueryInfoTrustedDomain( +NTSTATUS +WINAPI +LsarQueryInfoTrustedDomain( LSAPR_HANDLE TrustedDomainHandle, TRUSTED_INFORMATION_CLASS InformationClass, PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation) @@ -2008,7 +2064,9 @@ NTSTATUS WINAPI LsarQueryInfoTrustedDomain( /* Function 27 */ -NTSTATUS WINAPI LsarSetInformationTrustedDomain( +NTSTATUS +WINAPI +LsarSetInformationTrustedDomain( LSAPR_HANDLE TrustedDomainHandle, TRUSTED_INFORMATION_CLASS InformationClass, PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation) @@ -2019,7 +2077,9 @@ NTSTATUS WINAPI LsarSetInformationTrustedDomain( /* Function 28 */ -NTSTATUS WINAPI LsarOpenSecret( +NTSTATUS +WINAPI +LsarOpenSecret( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING SecretName, ACCESS_MASK DesiredAccess, @@ -2073,7 +2133,9 @@ done: /* Function 29 */ -NTSTATUS WINAPI LsarSetSecret( +NTSTATUS +WINAPI +LsarSetSecret( LSAPR_HANDLE SecretHandle, PLSAPR_CR_CIPHER_VALUE EncryptedCurrentValue, PLSAPR_CR_CIPHER_VALUE EncryptedOldValue) @@ -2171,7 +2233,9 @@ done: /* Function 30 */ -NTSTATUS WINAPI LsarQuerySecret( +NTSTATUS +WINAPI +LsarQuerySecret( LSAPR_HANDLE SecretHandle, PLSAPR_CR_CIPHER_VALUE *EncryptedCurrentValue, PLARGE_INTEGER CurrentValueSetTime, @@ -2351,7 +2415,9 @@ done: /* Function 31 */ -NTSTATUS WINAPI LsarLookupPrivilegeValue( +NTSTATUS +WINAPI +LsarLookupPrivilegeValue( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING Name, PLUID Value) @@ -2385,7 +2451,9 @@ NTSTATUS WINAPI LsarLookupPrivilegeValue( /* Function 32 */ -NTSTATUS WINAPI LsarLookupPrivilegeName( +NTSTATUS +WINAPI +LsarLookupPrivilegeName( LSAPR_HANDLE PolicyHandle, PLUID Value, PRPC_UNICODE_STRING *Name) @@ -2413,7 +2481,9 @@ NTSTATUS WINAPI LsarLookupPrivilegeName( /* Function 33 */ -NTSTATUS WINAPI LsarLookupPrivilegeDisplayName( +NTSTATUS +WINAPI +LsarLookupPrivilegeDisplayName( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING Name, USHORT ClientLanguage, @@ -2447,7 +2517,9 @@ NTSTATUS WINAPI LsarLookupPrivilegeDisplayName( /* Function 34 */ -NTSTATUS WINAPI LsarDeleteObject( +NTSTATUS +WINAPI +LsarDeleteObject( LSAPR_HANDLE *ObjectHandle) { PLSA_DB_OBJECT DbObject; @@ -2489,7 +2561,9 @@ NTSTATUS WINAPI LsarDeleteObject( /* Function 35 */ -NTSTATUS WINAPI LsarEnumerateAccountsWithUserRight( +NTSTATUS +WINAPI +LsarEnumerateAccountsWithUserRight( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING UserRight, PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer) @@ -2766,7 +2840,9 @@ done: /* Function 36 */ -NTSTATUS WINAPI LsarEnumerateAccountRights( +NTSTATUS +WINAPI +LsarEnumerateAccountRights( LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, PLSAPR_USER_RIGHT_SET UserRights) @@ -2914,7 +2990,9 @@ done: /* Function 37 */ -NTSTATUS WINAPI LsarAddAccountRights( +NTSTATUS +WINAPI +LsarAddAccountRights( LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, PLSAPR_USER_RIGHT_SET UserRights) @@ -3123,7 +3201,9 @@ done: /* Function 38 */ -NTSTATUS WINAPI LsarRemoveAccountRights( +NTSTATUS +WINAPI +LsarRemoveAccountRights( LSAPR_HANDLE PolicyHandle, PRPC_SID AccountSid, BOOLEAN AllRights, @@ -3317,7 +3397,9 @@ done: /* Function 39 */ -NTSTATUS WINAPI LsarQueryTrustedDomainInfo( +NTSTATUS +WINAPI +LsarQueryTrustedDomainInfo( LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid, TRUSTED_INFORMATION_CLASS InformationClass, @@ -3329,7 +3411,9 @@ NTSTATUS WINAPI LsarQueryTrustedDomainInfo( /* Function 40 */ -NTSTATUS WINAPI LsarSetTrustedDomainInfo( +NTSTATUS +WINAPI +LsarSetTrustedDomainInfo( LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid, TRUSTED_INFORMATION_CLASS InformationClass, @@ -3341,7 +3425,9 @@ NTSTATUS WINAPI LsarSetTrustedDomainInfo( /* Function 41 */ -NTSTATUS WINAPI LsarDeleteTrustedDomain( +NTSTATUS +WINAPI +LsarDeleteTrustedDomain( LSAPR_HANDLE PolicyHandle, PRPC_SID TrustedDomainSid) { @@ -3351,7 +3437,9 @@ NTSTATUS WINAPI LsarDeleteTrustedDomain( /* Function 42 */ -NTSTATUS WINAPI LsarStorePrivateData( +NTSTATUS +WINAPI +LsarStorePrivateData( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING KeyName, PLSAPR_CR_CIPHER_VALUE EncryptedData) @@ -3505,7 +3593,9 @@ done: /* Function 43 */ -NTSTATUS WINAPI LsarRetrievePrivateData( +NTSTATUS +WINAPI +LsarRetrievePrivateData( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING KeyName, PLSAPR_CR_CIPHER_VALUE *EncryptedData) @@ -3608,7 +3698,9 @@ done: /* Function 44 */ -NTSTATUS WINAPI LsarOpenPolicy2( +NTSTATUS +WINAPI +LsarOpenPolicy2( LPWSTR SystemName, PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK DesiredAccess, @@ -3622,7 +3714,9 @@ NTSTATUS WINAPI LsarOpenPolicy2( /* Function 45 */ -NTSTATUS WINAPI LsarGetUserName( +NTSTATUS +WINAPI +LsarGetUserName( LPWSTR SystemName, PRPC_UNICODE_STRING *UserName, PRPC_UNICODE_STRING *DomainName) @@ -3633,7 +3727,9 @@ NTSTATUS WINAPI LsarGetUserName( /* Function 46 */ -NTSTATUS WINAPI LsarQueryInformationPolicy2( +NTSTATUS +WINAPI +LsarQueryInformationPolicy2( LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_INFORMATION *PolicyInformation) @@ -3645,7 +3741,9 @@ NTSTATUS WINAPI LsarQueryInformationPolicy2( /* Function 47 */ -NTSTATUS WINAPI LsarSetInformationPolicy2( +NTSTATUS +WINAPI +LsarSetInformationPolicy2( LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_INFORMATION PolicyInformation) @@ -3657,7 +3755,9 @@ NTSTATUS WINAPI LsarSetInformationPolicy2( /* Function 48 */ -NTSTATUS WINAPI LsarQueryTrustedDomainInfoByName( +NTSTATUS +WINAPI +LsarQueryTrustedDomainInfoByName( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING TrustedDomainName, POLICY_INFORMATION_CLASS InformationClass, @@ -3669,7 +3769,9 @@ NTSTATUS WINAPI LsarQueryTrustedDomainInfoByName( /* Function 49 */ -NTSTATUS WINAPI LsarSetTrustedDomainInfoByName( +NTSTATUS +WINAPI +LsarSetTrustedDomainInfoByName( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING TrustedDomainName, POLICY_INFORMATION_CLASS InformationClass, @@ -3681,7 +3783,9 @@ NTSTATUS WINAPI LsarSetTrustedDomainInfoByName( /* Function 50 */ -NTSTATUS WINAPI LsarEnumerateTrustedDomainsEx( +NTSTATUS +WINAPI +LsarEnumerateTrustedDomainsEx( LSAPR_HANDLE PolicyHandle, DWORD *EnumerationContext, PLSAPR_TRUSTED_ENUM_BUFFER_EX EnumerationBuffer, @@ -3695,7 +3799,9 @@ NTSTATUS WINAPI LsarEnumerateTrustedDomainsEx( /* Function 51 */ -NTSTATUS WINAPI LsarCreateTrustedDomainEx( +NTSTATUS +WINAPI +LsarCreateTrustedDomainEx( LSAPR_HANDLE PolicyHandle, PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION AuthentificationInformation, @@ -3708,7 +3814,9 @@ NTSTATUS WINAPI LsarCreateTrustedDomainEx( /* Function 52 */ -NTSTATUS WINAPI LsarSetPolicyReplicationHandle( +NTSTATUS +WINAPI +LsarSetPolicyReplicationHandle( PLSAPR_HANDLE PolicyHandle) { /* Deprecated */ @@ -3717,7 +3825,9 @@ NTSTATUS WINAPI LsarSetPolicyReplicationHandle( /* Function 53 */ -NTSTATUS WINAPI LsarQueryDomainInformationPolicy( +NTSTATUS +WINAPI +LsarQueryDomainInformationPolicy( LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_DOMAIN_INFORMATION *PolicyInformation) @@ -3728,7 +3838,9 @@ NTSTATUS WINAPI LsarQueryDomainInformationPolicy( /* Function 54 */ -NTSTATUS WINAPI LsarSetDomainInformationPolicy( +NTSTATUS +WINAPI +LsarSetDomainInformationPolicy( LSAPR_HANDLE PolicyHandle, POLICY_INFORMATION_CLASS InformationClass, PLSAPR_POLICY_DOMAIN_INFORMATION PolicyInformation) @@ -3739,7 +3851,9 @@ NTSTATUS WINAPI LsarSetDomainInformationPolicy( /* Function 55 */ -NTSTATUS WINAPI LsarOpenTrustedDomainByName( +NTSTATUS +WINAPI +LsarOpenTrustedDomainByName( LSAPR_HANDLE PolicyHandle, PRPC_UNICODE_STRING TrustedDomainName, ACCESS_MASK DesiredAccess, @@ -3751,7 +3865,9 @@ NTSTATUS WINAPI LsarOpenTrustedDomainByName( /* Function 56 */ -NTSTATUS WINAPI LsarTestCall( +NTSTATUS +WINAPI +LsarTestCall( handle_t hBinding) { UNIMPLEMENTED; @@ -3760,7 +3876,9 @@ NTSTATUS WINAPI LsarTestCall( /* Function 57 */ -NTSTATUS WINAPI LsarLookupSids2( +NTSTATUS +WINAPI +LsarLookupSids2( LSAPR_HANDLE PolicyHandle, PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -3795,7 +3913,9 @@ NTSTATUS WINAPI LsarLookupSids2( /* Function 58 */ -NTSTATUS WINAPI LsarLookupNames2( +NTSTATUS +WINAPI +LsarLookupNames2( LSAPR_HANDLE PolicyHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -3860,7 +3980,9 @@ NTSTATUS WINAPI LsarLookupNames2( /* Function 59 */ -NTSTATUS WINAPI LsarCreateTrustedDomainEx2( +NTSTATUS +WINAPI +LsarCreateTrustedDomainEx2( LSAPR_HANDLE PolicyHandle, PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX TrustedDomainInformation, PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL AuthentificationInformation, @@ -3873,7 +3995,9 @@ NTSTATUS WINAPI LsarCreateTrustedDomainEx2( /* Function 60 */ -NTSTATUS WINAPI CredrWrite( +NTSTATUS +WINAPI +CredrWrite( PLSAPR_SERVER_NAME SystemName) { UNIMPLEMENTED; @@ -3882,7 +4006,9 @@ NTSTATUS WINAPI CredrWrite( /* Function 61 */ -NTSTATUS WINAPI CredrRead( +NTSTATUS +WINAPI +CredrRead( PLSAPR_SERVER_NAME SystemName) { UNIMPLEMENTED; @@ -3891,7 +4017,9 @@ NTSTATUS WINAPI CredrRead( /* Function 62 */ -NTSTATUS WINAPI CredrEnumerate( +NTSTATUS +WINAPI +CredrEnumerate( PLSAPR_SERVER_NAME SystemName) { UNIMPLEMENTED; @@ -3900,7 +4028,9 @@ NTSTATUS WINAPI CredrEnumerate( /* Function 63 */ -NTSTATUS WINAPI CredrWriteDomainCredentials( +NTSTATUS +WINAPI +CredrWriteDomainCredentials( PLSAPR_SERVER_NAME SystemName) { UNIMPLEMENTED; @@ -3909,7 +4039,9 @@ NTSTATUS WINAPI CredrWriteDomainCredentials( /* Function 64 */ -NTSTATUS WINAPI CredrReadDomainCredentials( +NTSTATUS +WINAPI +CredrReadDomainCredentials( PLSAPR_SERVER_NAME SystemName) { UNIMPLEMENTED; @@ -3957,7 +4089,9 @@ CredrProfileLoaded( /* Function 68 */ -NTSTATUS WINAPI LsarLookupNames3( +NTSTATUS +WINAPI +LsarLookupNames3( LSAPR_HANDLE PolicyHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -4008,7 +4142,9 @@ CredrGetSessionTypes( /* Function 70 */ -NTSTATUS WINAPI LsarRegisterAuditEvent( +NTSTATUS +WINAPI +LsarRegisterAuditEvent( handle_t hBinding) { UNIMPLEMENTED; @@ -4017,7 +4153,9 @@ NTSTATUS WINAPI LsarRegisterAuditEvent( /* Function 71 */ -NTSTATUS WINAPI LsarGenAuditEvent( +NTSTATUS +WINAPI +LsarGenAuditEvent( handle_t hBinding) { UNIMPLEMENTED; @@ -4026,7 +4164,9 @@ NTSTATUS WINAPI LsarGenAuditEvent( /* Function 72 */ -NTSTATUS WINAPI LsarUnregisterAuditEvent( +NTSTATUS +WINAPI +LsarUnregisterAuditEvent( handle_t hBinding) { UNIMPLEMENTED; @@ -4035,7 +4175,9 @@ NTSTATUS WINAPI LsarUnregisterAuditEvent( /* Function 73 */ -NTSTATUS WINAPI LsarQueryForestTrustInformation( +NTSTATUS +WINAPI +LsarQueryForestTrustInformation( LSAPR_HANDLE PolicyHandle, PLSA_UNICODE_STRING TrustedDomainName, LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -4047,7 +4189,9 @@ NTSTATUS WINAPI LsarQueryForestTrustInformation( /* Function 74 */ -NTSTATUS WINAPI LsarSetForestTrustInformation( +NTSTATUS +WINAPI +LsarSetForestTrustInformation( LSAPR_HANDLE PolicyHandle, PLSA_UNICODE_STRING TrustedDomainName, LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType, @@ -4076,7 +4220,9 @@ CredrRename( /* Function 76 */ -NTSTATUS WINAPI LsarLookupSids3( +NTSTATUS +WINAPI +LsarLookupSids3( LSAPR_HANDLE PolicyHandle, PLSAPR_SID_ENUM_BUFFER SidEnumBuffer, PLSAPR_REFERENCED_DOMAIN_LIST *ReferencedDomains, @@ -4111,7 +4257,9 @@ NTSTATUS WINAPI LsarLookupSids3( /* Function 77 */ -NTSTATUS WINAPI LsarLookupNames4( +NTSTATUS +WINAPI +LsarLookupNames4( handle_t RpcHandle, DWORD Count, PRPC_UNICODE_STRING Names, @@ -4149,7 +4297,9 @@ NTSTATUS WINAPI LsarLookupNames4( /* Function 78 */ -NTSTATUS WINAPI LsarOpenPolicySce( +NTSTATUS +WINAPI +LsarOpenPolicySce( LPWSTR SystemName, PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, ACCESS_MASK DesiredAccess, @@ -4161,7 +4311,9 @@ NTSTATUS WINAPI LsarOpenPolicySce( /* Function 79 */ -NTSTATUS WINAPI LsarAdtRegisterSecurityEventSource( +NTSTATUS +WINAPI +LsarAdtRegisterSecurityEventSource( handle_t hBinding) { UNIMPLEMENTED; @@ -4170,7 +4322,9 @@ NTSTATUS WINAPI LsarAdtRegisterSecurityEventSource( /* Function 80 */ -NTSTATUS WINAPI LsarAdtUnregisterSecurityEventSource( +NTSTATUS +WINAPI +LsarAdtUnregisterSecurityEventSource( handle_t hBinding) { UNIMPLEMENTED; @@ -4179,7 +4333,9 @@ NTSTATUS WINAPI LsarAdtUnregisterSecurityEventSource( /* Function 81 */ -NTSTATUS WINAPI LsarAdtReportSecurityEvent( +NTSTATUS +WINAPI +LsarAdtReportSecurityEvent( handle_t hBinding) { UNIMPLEMENTED;

5 years, 10 months

01/01: [KMTESTS:MM] Fix 'PAGE_NOACCESS' copypasta, in an error string

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4859bf283ee77865e353… commit a4859bf283ee77865e353f3bb3f7a94f4048e42c Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Nov 3 14:57:24 2018 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sat Nov 3 16:36:24 2018 +0100 [KMTESTS:MM] Fix 'PAGE_NOACCESS' copypasta, in an error string ROSTESTS-110 --- modules/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c b/modules/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c index aa8e145954..73bc8f0c02 100644 --- a/modules/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c +++ b/modules/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c @@ -452,7 +452,7 @@ BehaviorChecks(HANDLE FileHandleReadOnly, HANDLE FileHandleWriteOnly) ViewSize = 0; SectionOffset.QuadPart = 0; Status = ZwMapViewOfSection(WriteSectionHandle, NtCurrentProcess(), &BaseAddress, 0, 0, &SectionOffset, &ViewSize, ViewUnmap, 0, PAGE_GUARD | PAGE_READWRITE); - if (!skip(NT_SUCCESS(Status), "Error mapping view with PAGE_NOACCESS priv. Error = %p\n", Status)) + if (!skip(NT_SUCCESS(Status), "Error mapping view with PAGE_GUARD priv. Error = %p\n", Status)) { KmtStartSeh() RtlCompareMemory(BaseAddress, TestString, TestStringSize);

5 years, 10 months

03/03: [KMTESTS/MM] Enable again accessing forbidden memory.

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d91d52417f94e41427bd… commit 5d91d52417f94e41427bd3ecc7239c31d726d8ac Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Nov 2 18:26:52 2018 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sat Nov 3 12:50:16 2018 +0100 [KMTESTS/MM] Enable again accessing forbidden memory. Also adda test case for the PAGE_GUARD case ROSTESTS-110 --- .../rostests/kmtests/ntos_mm/ZwMapViewOfSection.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/modules/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c b/modules/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c index b6e6146536..aa8e145954 100644 --- a/modules/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c +++ b/modules/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c @@ -433,8 +433,6 @@ BehaviorChecks(HANDLE FileHandleReadOnly, HANDLE FileHandleWriteOnly) ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); } -/* FIXME: Crash. See ROSTESTS-110 */ -#ifdef ROSTESTS_110_FIXED //try to access forbidden memory BaseAddress = NULL; ViewSize = 0; @@ -448,7 +446,24 @@ BehaviorChecks(HANDLE FileHandleReadOnly, HANDLE FileHandleWriteOnly) ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); } -#endif /* ROSTESTS_110_FIXED */ + + //try to access guarded memory + BaseAddress = NULL; + ViewSize = 0; + SectionOffset.QuadPart = 0; + Status = ZwMapViewOfSection(WriteSectionHandle, NtCurrentProcess(), &BaseAddress, 0, 0, &SectionOffset, &ViewSize, ViewUnmap, 0, PAGE_GUARD | PAGE_READWRITE); + if (!skip(NT_SUCCESS(Status), "Error mapping view with PAGE_NOACCESS priv. Error = %p\n", Status)) + { + KmtStartSeh() + RtlCompareMemory(BaseAddress, TestString, TestStringSize); + KmtEndSeh(STATUS_GUARD_PAGE_VIOLATION); + + KmtStartSeh() + RtlCompareMemory(BaseAddress, TestString, TestStringSize); + KmtEndSeh(STATUS_SUCCESS); + + ZwUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + } ZwClose(WriteSectionHandle);

5 years, 10 months

02/03: [NTOS/MM] Properly handle page faults in regions marked with PAGE_NOACCESS or PAGE_GUARD

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df25e4e79109a785b4be4… commit df25e4e79109a785b4be4971081af11573e44259 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Nov 2 18:23:16 2018 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sat Nov 3 12:50:16 2018 +0100 [NTOS/MM] Properly handle page faults in regions marked with PAGE_NOACCESS or PAGE_GUARD ROSTESTS-110 --- ntoskrnl/mm/section.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 4a03514f00..298fc5f0f9 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1410,6 +1410,29 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, &MemoryArea->Data.SectionData.RegionListHead, Address, NULL); ASSERT(Region != NULL); + + /* Check for a NOACCESS mapping */ + if (Region->Protect & PAGE_NOACCESS) + { + return STATUS_ACCESS_VIOLATION; + } + + if (Region->Protect & PAGE_GUARD) + { + /* Remove it */ + Status = MmAlterRegion(AddressSpace, (PVOID)MA_GetStartingAddress(MemoryArea), + &MemoryArea->Data.SectionData.RegionListHead, + Address, PAGE_SIZE, Region->Type, Region->Protect & ~PAGE_GUARD, + MmAlterViewAttributes); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Removing PAGE_GUARD protection failed : 0x%08x.\n", Status); + } + + return STATUS_GUARD_PAGE_VIOLATION; + } + /* * Lock the segment */

5 years, 10 months

01/03: [NTOS/MM] Move up MmAlterViewAttributes for later use in MmNotPresentFaultSectionView

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47ac7a2b28df852a30e04… commit 47ac7a2b28df852a30e047426408bc368d37e5db Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Nov 2 18:20:13 2018 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Sat Nov 3 12:50:16 2018 +0100 [NTOS/MM] Move up MmAlterViewAttributes for later use in MmNotPresentFaultSectionView No code change --- ntoskrnl/mm/section.c | 162 +++++++++++++++++++++++++------------------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 9bf9f3cd50..4a03514f00 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1275,6 +1275,87 @@ MiReadPage(PMEMORY_AREA MemoryArea, } #endif +static VOID +MmAlterViewAttributes(PMMSUPPORT AddressSpace, + PVOID BaseAddress, + SIZE_T RegionSize, + ULONG OldType, + ULONG OldProtect, + ULONG NewType, + ULONG NewProtect) +{ + PMEMORY_AREA MemoryArea; + PMM_SECTION_SEGMENT Segment; + BOOLEAN DoCOW = FALSE; + ULONG i; + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); + ASSERT(MemoryArea != NULL); + Segment = MemoryArea->Data.SectionData.Segment; + MmLockSectionSegment(Segment); + + if ((Segment->WriteCopy) && + (NewProtect == PAGE_READWRITE || NewProtect == PAGE_EXECUTE_READWRITE)) + { + DoCOW = TRUE; + } + + if (OldProtect != NewProtect) + { + for (i = 0; i < PAGE_ROUND_UP(RegionSize) / PAGE_SIZE; i++) + { + SWAPENTRY SwapEntry; + PVOID Address = (char*)BaseAddress + (i * PAGE_SIZE); + ULONG Protect = NewProtect; + + /* Wait for a wait entry to disappear */ + do + { + MmGetPageFileMapping(Process, Address, &SwapEntry); + if (SwapEntry != MM_WAIT_ENTRY) + break; + MiWaitForPageEvent(Process, Address); + } + while (TRUE); + + /* + * If we doing COW for this segment then check if the page is + * already private. + */ + if (DoCOW && MmIsPagePresent(Process, Address)) + { + LARGE_INTEGER Offset; + ULONG_PTR Entry; + PFN_NUMBER Page; + + Offset.QuadPart = (ULONG_PTR)Address - MA_GetStartingAddress(MemoryArea) + + MemoryArea->Data.SectionData.ViewOffset.QuadPart; + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); + /* + * An MM_WAIT_ENTRY is ok in this case... It'll just count as + * IS_SWAP_FROM_SSE and we'll do the right thing. + */ + Page = MmGetPfnForProcess(Process, Address); + + Protect = PAGE_READONLY; + if (IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != Page) + { + Protect = NewProtect; + } + } + + if (MmIsPagePresent(Process, Address) || MmIsDisabledPage(Process, Address)) + { + MmSetPageProtect(Process, Address, + Protect); + } + } + } + + MmUnlockSectionSegment(Segment); +} + NTSTATUS NTAPI MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, @@ -2413,87 +2494,6 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace, return(STATUS_SUCCESS); } -static VOID -MmAlterViewAttributes(PMMSUPPORT AddressSpace, - PVOID BaseAddress, - SIZE_T RegionSize, - ULONG OldType, - ULONG OldProtect, - ULONG NewType, - ULONG NewProtect) -{ - PMEMORY_AREA MemoryArea; - PMM_SECTION_SEGMENT Segment; - BOOLEAN DoCOW = FALSE; - ULONG i; - PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); - ASSERT(MemoryArea != NULL); - Segment = MemoryArea->Data.SectionData.Segment; - MmLockSectionSegment(Segment); - - if ((Segment->WriteCopy) && - (NewProtect == PAGE_READWRITE || NewProtect == PAGE_EXECUTE_READWRITE)) - { - DoCOW = TRUE; - } - - if (OldProtect != NewProtect) - { - for (i = 0; i < PAGE_ROUND_UP(RegionSize) / PAGE_SIZE; i++) - { - SWAPENTRY SwapEntry; - PVOID Address = (char*)BaseAddress + (i * PAGE_SIZE); - ULONG Protect = NewProtect; - - /* Wait for a wait entry to disappear */ - do - { - MmGetPageFileMapping(Process, Address, &SwapEntry); - if (SwapEntry != MM_WAIT_ENTRY) - break; - MiWaitForPageEvent(Process, Address); - } - while (TRUE); - - /* - * If we doing COW for this segment then check if the page is - * already private. - */ - if (DoCOW && MmIsPagePresent(Process, Address)) - { - LARGE_INTEGER Offset; - ULONG_PTR Entry; - PFN_NUMBER Page; - - Offset.QuadPart = (ULONG_PTR)Address - MA_GetStartingAddress(MemoryArea) - + MemoryArea->Data.SectionData.ViewOffset.QuadPart; - Entry = MmGetPageEntrySectionSegment(Segment, &Offset); - /* - * An MM_WAIT_ENTRY is ok in this case... It'll just count as - * IS_SWAP_FROM_SSE and we'll do the right thing. - */ - Page = MmGetPfnForProcess(Process, Address); - - Protect = PAGE_READONLY; - if (IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != Page) - { - Protect = NewProtect; - } - } - - if (MmIsPagePresent(Process, Address) || MmIsDisabledPage(Process, Address)) - { - MmSetPageProtect(Process, Address, - Protect); - } - } - } - - MmUnlockSectionSegment(Segment); -} - NTSTATUS NTAPI MmProtectSectionView(PMMSUPPORT AddressSpace,

5 years, 10 months

01/01: [WIN32SS][FONT] Define IntUnicodeStringToBuffer function and use it (#1004)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2737d9144db2afe7c39b5… commit 2737d9144db2afe7c39b58cd9fd0a733524a046c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 3 05:42:58 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 3 05:42:58 2018 +0900 [WIN32SS][FONT] Define IntUnicodeStringToBuffer function and use it (#1004) - Define IntUnicodeStringToBuffer function to copy the contents of a UNICODE_STRING to a string buffer with a UNICODE_NULL correctly. - Use it. JIRA issue: N/A --- win32ss/gdi/ntgdi/freetype.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 6e06763a69..55efa4ecc5 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -741,6 +741,21 @@ SubstituteFontByList(PLIST_ENTRY pHead, return FALSE; } +static VOID +IntUnicodeStringToBuffer(LPWSTR pszBuffer, USHORT cbBuffer, const UNICODE_STRING *pString) +{ + USHORT cbLength = pString->Length; + + if (cbBuffer < sizeof(UNICODE_NULL)) + return; + + if (cbLength > cbBuffer - sizeof(UNICODE_NULL)) + cbLength = cbBuffer - sizeof(UNICODE_NULL); + + RtlCopyMemory(pszBuffer, pString->Buffer, cbLength); + pszBuffer[cbLength / sizeof(WCHAR)] = UNICODE_NULL; +} + static BOOL SubstituteFontRecurse(LOGFONTW* pLogFont) { @@ -763,7 +778,7 @@ SubstituteFontRecurse(LOGFONTW* pLogFont) if (!Found) break; - RtlStringCchCopyW(pLogFont->lfFaceName, LF_FACESIZE, OutputNameW.Buffer); + IntUnicodeStringToBuffer(pLogFont->lfFaceName, sizeof(pLogFont->lfFaceName), &OutputNameW); if (CharSetMap[FONTSUBST_FROM] == DEFAULT_CHARSET || CharSetMap[FONTSUBST_FROM] == pLogFont->lfCharSet) @@ -1037,8 +1052,8 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; /* failure */ } - RtlCopyMemory(FontGDI->Filename, pFileName->Buffer, pFileName->Length); - FontGDI->Filename[pFileName->Length / sizeof(WCHAR)] = UNICODE_NULL; + + IntUnicodeStringToBuffer(FontGDI->Filename, sizeof(FontGDI->Filename), pFileName); } else { @@ -2588,7 +2603,7 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, /* full name */ if (!FullName) FullName = (WCHAR*)((ULONG_PTR) Otm + (ULONG_PTR)Otm->otmpFaceName); - + RtlStringCbCopyW(Info->EnumLogFontEx.elfFullName, sizeof(Info->EnumLogFontEx.elfFullName), FullName); @@ -2815,7 +2830,7 @@ GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, continue; /* mismatch */ } - RtlStringCchCopyW(lf.lfFaceName, LF_FACESIZE, pFromW->Buffer); + IntUnicodeStringToBuffer(lf.lfFaceName, sizeof(lf.lfFaceName), pFromW); SubstituteFontRecurse(&lf); RtlInitUnicodeString(&NameW, lf.lfFaceName); @@ -4986,9 +5001,7 @@ TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) if (NT_SUCCESS(Status)) { /* truncated copy */ - Name.Length = (USHORT)min(Name.Length, (LF_FACESIZE - 1) * sizeof(WCHAR)); - RtlStringCbCopyNW(TextObj->TextFace, Name.Length + sizeof(WCHAR), Name.Buffer, Name.Length); - + IntUnicodeStringToBuffer(TextObj->TextFace, sizeof(TextObj->TextFace), &Name); RtlFreeUnicodeString(&Name); } }

5 years, 10 months

01/01: [WIN32SS][FONT] Improve Precision Penalty (#1006)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4abba2b7acaca81593ef0… commit 4abba2b7acaca81593ef04d9dbe78ee838adc9fc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 3 05:37:05 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 3 05:37:05 2018 +0900 [WIN32SS][FONT] Improve Precision Penalty (#1006) --- win32ss/gdi/ntgdi/freetype.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index f1dee700b7..6e06763a69 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -4456,10 +4456,11 @@ GetFontPenalty(const LOGFONTW * LogFont, } Byte = LogFont->lfOutPrecision; - if (Byte == OUT_DEFAULT_PRECIS) - Byte = OUT_OUTLINE_PRECIS; /* Is it OK? */ switch (Byte) { + case OUT_DEFAULT_PRECIS: + /* nothing to do */ + break; case OUT_DEVICE_PRECIS: if (!(TM->tmPitchAndFamily & TMPF_DEVICE) || !(TM->tmPitchAndFamily & (TMPF_VECTOR | TMPF_TRUETYPE)))

5 years, 10 months

01/01: [REACTOS] Don't include another module's PCH aka fix build.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bb1b39f66d387215f1c9… commit 8bb1b39f66d387215f1c95f73af1a76a5d79762b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Nov 2 11:10:07 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Nov 2 11:14:09 2018 +0100 [REACTOS] Don't include another module's PCH aka fix build. --- base/setup/CMakeLists.txt | 2 +- base/setup/reactos/spapisup/fileqsup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/setup/CMakeLists.txt b/base/setup/CMakeLists.txt index ce9adc709f..ee5a90d0bc 100644 --- a/base/setup/CMakeLists.txt +++ b/base/setup/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(lib) -#add_subdirectory(reactos) +add_subdirectory(reactos) add_subdirectory(setup) add_subdirectory(usetup) add_subdirectory(welcome) diff --git a/base/setup/reactos/spapisup/fileqsup.c b/base/setup/reactos/spapisup/fileqsup.c index ad31c38ee1..9c15f8cdac 100644 --- a/base/setup/reactos/spapisup/fileqsup.c +++ b/base/setup/reactos/spapisup/fileqsup.c @@ -8,7 +8,7 @@ /* INCLUDES *****************************************************************/ -#include "precomp.h" +#include "reactos.h" #define NDEBUG #include <debug.h>

5 years, 10 months

01/01: [WIN32SS][FONT] Add ASSERT_FREETYPE_LOCK_HELD(); in FillTMEx (#1005)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08cfe38ec62b328c99b9e… commit 08cfe38ec62b328c99b9ea275726445bf89fb149 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 2 18:53:50 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 2 18:53:50 2018 +0900 [WIN32SS][FONT] Add ASSERT_FREETYPE_LOCK_HELD(); in FillTMEx (#1005) Add a assertion for locking, in FillTMEx function of freetype.c. CORE-15166 --- win32ss/gdi/ntgdi/freetype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 693056b9a2..f1dee700b7 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1722,6 +1722,8 @@ FillTMEx(TEXTMETRICW *TM, PFONTGDI FontGDI, int Ascent, Descent; FT_Face Face = FontGDI->SharedFace->Face; + ASSERT_FREETYPE_LOCK_HELD(); + XScale = Face->size->metrics.x_scale; YScale = Face->size->metrics.y_scale;

5 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2018