Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 61110: [NTOSKRNL] - Get rid of MmZeroPte and instead implement MI_ERASE_PTE. Use this and only this to make a PTE zero. The other functions will not allow to do this. - Add MI_UPDATE_VAL...
by tkreuzer＠svn.reactos.org 27 Nov '13

27 Nov '13

Author: tkreuzer Date: Wed Nov 27 00:04:26 2013 New Revision: 61110 URL: http://svn.reactos.org/svn/reactos?rev=61110&view=rev Log: [NTOSKRNL] - Get rid of MmZeroPte and instead implement MI_ERASE_PTE. Use this and only this to make a PTE zero. The other functions will not allow to do this. - Add MI_UPDATE_VALID_PTE to update a valid PTE with another valid PTE - Add 2 additional protection mask constants: MM_PROTECT_ACCESS for the lower 3 bits and MM_PROTECT_SPECIAL for the higher 2 bits. Make use of the latter when dealing with guard pages and caching. - Deduplicate some code in MmArmAccessFault - Move code in MiDeleteSystemPageableVm to where it belongs (it was in the wrong else case!) - Wse MiQueryPageTableReferences instead of manipulating MmWorkingSetList->UsedPageTableEntries Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Nov 27 00:04:26 2013 @@ -107,6 +107,7 @@ #define MM_WRITECOPY 5 #define MM_EXECUTE_READWRITE 6 #define MM_EXECUTE_WRITECOPY 7 +#define MM_PROTECT_ACCESS 7 // // These are flags on top of the actual protection mask @@ -114,6 +115,7 @@ #define MM_NOCACHE 0x08 #define MM_GUARDPAGE 0x10 #define MM_WRITECOMBINE 0x18 +#define MM_PROTECT_SPECIAL 0x18 // // These are special cases @@ -588,7 +590,6 @@ LONG ImageLoadingCount; } MM_SESSION_SPACE, *PMM_SESSION_SPACE; -static const MMPTE MmZeroPte = {{0}}; extern PMM_SESSION_SPACE MmSessionSpace; extern MMPTE HyperTemplatePte; extern MMPDE ValidKernelPde; @@ -1003,6 +1004,21 @@ } // +// Updates a valid PTE +// +VOID +FORCEINLINE +MI_UPDATE_VALID_PTE(IN PMMPTE PointerPte, + IN MMPTE TempPte) +{ + /* Write the valid PTE */ + ASSERT(PointerPte->u.Hard.Valid == 1); + ASSERT(TempPte.u.Hard.Valid == 1); + ASSERT(PointerPte->u.Hard.PageFrameNumber == TempPte.u.Hard.PageFrameNumber); + *PointerPte = TempPte; +} + +// // Writes an invalid PTE // FORCEINLINE @@ -1012,7 +1028,20 @@ { /* Write the invalid PTE */ ASSERT(InvalidPte.u.Hard.Valid == 0); + ASSERT(InvalidPte.u.Long != 0); *PointerPte = InvalidPte; +} + +// +// Erase the PTE completely +// +VOID +FORCEINLINE +MI_ERASE_PTE(IN PMMPTE PointerPte) +{ + /* Zero out the PTE */ + ASSERT(PointerPte->u.Long != 0); + PointerPte->u.Long = 0; } // @@ -1039,6 +1068,7 @@ { /* Write the invalid PDE */ ASSERT(InvalidPde.u.Hard.Valid == 0); + ASSERT(InvalidPde.u.Long != 0); *PointerPde = InvalidPde; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Wed Nov 27 00:04:26 2013 @@ -122,7 +122,7 @@ #define _BYTE_MASK(Bit0, Bit1, Bit2, Bit3, Bit4, Bit5, Bit6, Bit7) \ (Bit0) | ((Bit1) << 1) | ((Bit2) << 2) | ((Bit3) << 3) | \ ((Bit4) << 4) | ((Bit5) << 5) | ((Bit6) << 6) | ((Bit7) << 7) - static const UCHAR MiAccessAllowedMask[2][2] = + static const UCHAR AccessAllowedMask[2][2] = { { // Protect 0 1 2 3 4 5 6 7 _BYTE_MASK(0, 1, 1, 1, 1, 1, 1, 1), // READ @@ -134,11 +134,11 @@ } }; - /* We want only the low 3 bits */ - ProtectionMask &= 7; + /* We want only the lower access bits */ + ProtectionMask &= MM_PROTECT_ACCESS; /* Look it up in the table */ - return (MiAccessAllowedMask[Write != 0][Execute != 0] >> ProtectionMask) & 1; + return (AccessAllowedMask[Write != 0][Execute != 0] >> ProtectionMask) & 1; } NTSTATUS @@ -187,7 +187,7 @@ } /* Check if this is a guard page */ - if (ProtectionMask & MM_GUARDPAGE) + if ((ProtectionMask & MM_PROTECT_SPECIAL) == MM_GUARDPAGE) { NT_ASSERT(ProtectionMask != MM_DECOMMIT); @@ -765,8 +765,8 @@ /* Release the PFN lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - /* Remove caching bits */ - Protection &= ~(MM_NOCACHE | MM_NOACCESS); + /* Remove special/caching bits */ + Protection &= ~MM_PROTECT_SPECIAL; /* Setup caching */ if (Pfn1->u3.e1.CacheAttribute == MiWriteCombined) @@ -820,7 +820,8 @@ PMMPFN Pfn1; MMPTE TempPte; PMMPTE PointerToPteForProtoPage; - DPRINT1("Transition fault on 0x%p with PTE 0x%p in process %s\n", FaultingAddress, PointerPte, CurrentProcess->ImageFileName); + DPRINT1("Transition fault on 0x%p with PTE 0x%p in process %s\n", + FaultingAddress, PointerPte, CurrentProcess->ImageFileName); /* Windowss does this check */ ASSERT(*InPageBlock == NULL); @@ -1453,37 +1454,25 @@ /* Bail out, if the fault came from user mode */ if (Mode == UserMode) return STATUS_ACCESS_VIOLATION; -#if (_MI_PAGING_LEVELS == 4) - /* AMD64 system, check if PXE is invalid */ - if (PointerPxe->u.Hard.Valid == 0) - { - KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, - (ULONG_PTR)Address, - StoreInstruction, - (ULONG_PTR)TrapInformation, - 7); - } -#endif -#if (_MI_PAGING_LEVELS == 4) - /* PAE/AMD64 system, check if PPE is invalid */ - if (PointerPpe->u.Hard.Valid == 0) - { - KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, - (ULONG_PTR)Address, - StoreInstruction, - (ULONG_PTR)TrapInformation, - 5); - } -#endif #if (_MI_PAGING_LEVELS == 2) if (MI_IS_SYSTEM_PAGE_TABLE_ADDRESS(Address)) MiSynchronizeSystemPde((PMMPDE)PointerPte); MiCheckPdeForPagedPool(Address); #endif - /* Check if the PDE is invalid */ - if (PointerPde->u.Hard.Valid == 0) - { - /* PDE (still) not valid, kill the system */ + /* Check if the higher page table entries are invalid */ + if ( +#if (_MI_PAGING_LEVELS == 4) + /* AMD64 system, check if PXE is invalid */ + (PointerPxe->u.Hard.Valid == 0) || +#endif +#if (_MI_PAGING_LEVELS >= 3) + /* PAE/AMD64 system, check if PPE is invalid */ + (PointerPpe->u.Hard.Valid == 0) || +#endif + /* Always check if the PDE is valid */ + (PointerPde->u.Hard.Valid == 0)) + { + /* PXE/PPE/PDE (still) not valid, kill the system */ KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, (ULONG_PTR)Address, StoreInstruction, @@ -1894,7 +1883,7 @@ } /* Is this a guard page? */ - if (ProtectionCode & MM_GUARDPAGE) + if ((ProtectionCode & MM_PROTECT_SPECIAL) == MM_GUARDPAGE) { /* The VAD protection cannot be MM_DECOMMIT! */ NT_ASSERT(ProtectionCode != MM_DECOMMIT); Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Wed Nov 27 00:04:26 2013 @@ -198,7 +198,7 @@ } /* This actually turns on guard page in this scenario! */ - ProtectMask |= MM_GUARDPAGE; + ProtectMask |= MM_DECOMMIT; } /* Check for nocache option */ @@ -1914,10 +1914,7 @@ // // Write the new PTE, making sure we are only changing the bits // - ASSERT(PointerPte->u.Hard.Valid == 1); - ASSERT(TempPte.u.Hard.Valid == 1); - ASSERT(PointerPte->u.Hard.PageFrameNumber == TempPte.u.Hard.PageFrameNumber); - *PointerPte = TempPte; + MI_UPDATE_VALID_PTE(PointerPte, TempPte); // // Flush the TLB Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Nov 27 00:04:26 2013 @@ -350,25 +350,25 @@ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); /* Destroy the PTE */ - MI_WRITE_INVALID_PTE(PointerPte, MmZeroPte); + MI_ERASE_PTE(PointerPte); + } + else + { + /* + * The only other ARM3 possibility is a demand zero page, which would + * mean freeing some of the paged pool pages that haven't even been + * touched yet, as part of a larger allocation. + * + * Right now, we shouldn't expect any page file information in the PTE + */ + ASSERT(PointerPte->u.Soft.PageFileHigh == 0); + + /* Destroy the PTE */ + MI_ERASE_PTE(PointerPte); } /* Actual legitimate pages */ ActualPages++; - } - else - { - /* - * The only other ARM3 possibility is a demand zero page, which would - * mean freeing some of the paged pool pages that haven't even been - * touched yet, as part of a larger allocation. - * - * Right now, we shouldn't expect any page file information in the PTE - */ - ASSERT(PointerPte->u.Soft.PageFileHigh == 0); - - /* Destroy the PTE */ - MI_WRITE_INVALID_PTE(PointerPte, MmZeroPte); } /* Keep going */ @@ -486,7 +486,7 @@ } /* Destroy the PTE and flush the TLB */ - MI_WRITE_INVALID_PTE(PointerPte, MmZeroPte); + MI_ERASE_PTE(PointerPte); KeFlushCurrentTb(); } @@ -618,7 +618,7 @@ (TempPte.u.Soft.Prototype == 1)) { /* Just nuke it */ - MI_WRITE_INVALID_PTE(PointerPte, MmZeroPte); + MI_ERASE_PTE(PointerPte); } else { @@ -632,7 +632,7 @@ else { /* The PTE was never mapped, just nuke it here */ - MI_WRITE_INVALID_PTE(PointerPte, MmZeroPte); + MI_ERASE_PTE(PointerPte); } } Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Wed Nov 27 00:04:26 2013 @@ -394,7 +394,7 @@ Address < (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; Address += (PAGE_SIZE * PTE_COUNT)) { - if (MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] == 0) + if (MiQueryPageTableReferences((PVOID)Address) == 0) { pointerPde = MiAddressToPde(Address); if (pointerPde->u.Hard.Valid)

1 0

[tkreuzer] 61109: [NTOSKRNL] - Implement SepAdjustPrivileges, which does both the counting of (changed) privileges as well as applying them, when requested. Use it in NtAdjustPrivilegesToken twice ...
by tkreuzer＠svn.reactos.org 26 Nov '13

26 Nov '13

Author: tkreuzer Date: Tue Nov 26 23:28:37 2013 New Revision: 61109 URL: http://svn.reactos.org/svn/reactos?rev=61109&view=rev Log: [NTOSKRNL] - Implement SepAdjustPrivileges, which does both the counting of (changed) privileges as well as applying them, when requested. Use it in NtAdjustPrivilegesToken twice instead of duplicating the code there. - Fix return value of NtAdjustPrivilegesToken by making sure to properly count the found privileges and check against the provided ones - Lock the Token, while messing with the privileges - Add support for SE_PRIVILEGE_REMOVED - Proplery (re)calculate Token flags after changing privileges - Improve failure pathes by using a common cleanup label - Don't free the allocations atatched to the token in SepCreateToken on failure, since ObDereferenceObject will already do that. - Make priviliges constants instead of initializing them. Modified: trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/se/priv.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Tue Nov 26 23:28:37 2013 @@ -145,32 +145,40 @@ extern PSID SeAnonymousLogonSid; /* Privileges */ -extern LUID SeCreateTokenPrivilege; -extern LUID SeAssignPrimaryTokenPrivilege; -extern LUID SeLockMemoryPrivilege; -extern LUID SeIncreaseQuotaPrivilege; -extern LUID SeUnsolicitedInputPrivilege; -extern LUID SeTcbPrivilege; -extern LUID SeSecurityPrivilege; -extern LUID SeTakeOwnershipPrivilege; -extern LUID SeLoadDriverPrivilege; -extern LUID SeCreatePagefilePrivilege; -extern LUID SeIncreaseBasePriorityPrivilege; -extern LUID SeSystemProfilePrivilege; -extern LUID SeSystemtimePrivilege; -extern LUID SeProfileSingleProcessPrivilege; -extern LUID SeCreatePermanentPrivilege; -extern LUID SeBackupPrivilege; -extern LUID SeRestorePrivilege; -extern LUID SeShutdownPrivilege; -extern LUID SeDebugPrivilege; -extern LUID SeAuditPrivilege; -extern LUID SeSystemEnvironmentPrivilege; -extern LUID SeChangeNotifyPrivilege; -extern LUID SeRemoteShutdownPrivilege; -extern LUID SeUndockPrivilege; -extern LUID SeSyncAgentPrivilege; -extern LUID SeEnableDelegationPrivilege; +extern const LUID SeCreateTokenPrivilege; +extern const LUID SeAssignPrimaryTokenPrivilege; +extern const LUID SeLockMemoryPrivilege; +extern const LUID SeIncreaseQuotaPrivilege; +extern const LUID SeUnsolicitedInputPrivilege; +extern const LUID SeTcbPrivilege; +extern const LUID SeSecurityPrivilege; +extern const LUID SeTakeOwnershipPrivilege; +extern const LUID SeLoadDriverPrivilege; +extern const LUID SeSystemProfilePrivilege; +extern const LUID SeSystemtimePrivilege; +extern const LUID SeProfileSingleProcessPrivilege; +extern const LUID SeIncreaseBasePriorityPrivilege; +extern const LUID SeCreatePagefilePrivilege; +extern const LUID SeCreatePermanentPrivilege; +extern const LUID SeBackupPrivilege; +extern const LUID SeRestorePrivilege; +extern const LUID SeShutdownPrivilege; +extern const LUID SeDebugPrivilege; +extern const LUID SeAuditPrivilege; +extern const LUID SeSystemEnvironmentPrivilege; +extern const LUID SeChangeNotifyPrivilege; +extern const LUID SeRemoteShutdownPrivilege; +extern const LUID SeUndockPrivilege; +extern const LUID SeSyncAgentPrivilege; +extern const LUID SeEnableDelegationPrivilege; +extern const LUID SeManageVolumePrivilege; +extern const LUID SeImpersonatePrivilege; +extern const LUID SeCreateGlobalPrivilege; +extern const LUID SeTrustedCredmanPrivilege; +extern const LUID SeRelabelPrivilege; +extern const LUID SeIncreaseWorkingSetPrivilege; +extern const LUID SeTimeZonePrivilege; +extern const LUID SeCreateSymbolicLinkPrivilege; /* DACLs */ extern PACL SePublicDefaultUnrestrictedDacl; Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=611… ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Tue Nov 26 23:28:37 2013 @@ -19,32 +19,42 @@ /* GLOBALS ********************************************************************/ -LUID SeCreateTokenPrivilege; -LUID SeAssignPrimaryTokenPrivilege; -LUID SeLockMemoryPrivilege; -LUID SeIncreaseQuotaPrivilege; -LUID SeUnsolicitedInputPrivilege; -LUID SeTcbPrivilege; -LUID SeSecurityPrivilege; -LUID SeTakeOwnershipPrivilege; -LUID SeLoadDriverPrivilege; -LUID SeCreatePagefilePrivilege; -LUID SeIncreaseBasePriorityPrivilege; -LUID SeSystemProfilePrivilege; -LUID SeSystemtimePrivilege; -LUID SeProfileSingleProcessPrivilege; -LUID SeCreatePermanentPrivilege; -LUID SeBackupPrivilege; -LUID SeRestorePrivilege; -LUID SeShutdownPrivilege; -LUID SeDebugPrivilege; -LUID SeAuditPrivilege; -LUID SeSystemEnvironmentPrivilege; -LUID SeChangeNotifyPrivilege; -LUID SeRemoteShutdownPrivilege; -LUID SeUndockPrivilege; -LUID SeSyncAgentPrivilege; -LUID SeEnableDelegationPrivilege; +#define CONST_LUID(x1, x2) {x1, x2} +const LUID SeCreateTokenPrivilege = CONST_LUID(SE_CREATE_TOKEN_PRIVILEGE, 0); +const LUID SeAssignPrimaryTokenPrivilege = CONST_LUID(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, 0); +const LUID SeLockMemoryPrivilege = CONST_LUID(SE_LOCK_MEMORY_PRIVILEGE, 0); +const LUID SeIncreaseQuotaPrivilege = CONST_LUID(SE_INCREASE_QUOTA_PRIVILEGE, 0); +const LUID SeUnsolicitedInputPrivilege = CONST_LUID(6, 0); +const LUID SeTcbPrivilege = CONST_LUID(SE_TCB_PRIVILEGE, 0); +const LUID SeSecurityPrivilege = CONST_LUID(SE_SECURITY_PRIVILEGE, 0); +const LUID SeTakeOwnershipPrivilege = CONST_LUID(SE_TAKE_OWNERSHIP_PRIVILEGE, 0); +const LUID SeLoadDriverPrivilege = CONST_LUID(SE_LOAD_DRIVER_PRIVILEGE, 0); +const LUID SeSystemProfilePrivilege = CONST_LUID(SE_SYSTEM_PROFILE_PRIVILEGE, 0); +const LUID SeSystemtimePrivilege = CONST_LUID(SE_SYSTEMTIME_PRIVILEGE, 0); +const LUID SeProfileSingleProcessPrivilege = CONST_LUID(SE_PROF_SINGLE_PROCESS_PRIVILEGE, 0); +const LUID SeIncreaseBasePriorityPrivilege = CONST_LUID(SE_INC_BASE_PRIORITY_PRIVILEGE, 0); +const LUID SeCreatePagefilePrivilege = CONST_LUID(SE_CREATE_PAGEFILE_PRIVILEGE, 0); +const LUID SeCreatePermanentPrivilege = CONST_LUID(SE_CREATE_PERMANENT_PRIVILEGE, 0); +const LUID SeBackupPrivilege = CONST_LUID(SE_BACKUP_PRIVILEGE, 0); +const LUID SeRestorePrivilege = CONST_LUID(SE_RESTORE_PRIVILEGE, 0); +const LUID SeShutdownPrivilege = CONST_LUID(SE_SHUTDOWN_PRIVILEGE, 0); +const LUID SeDebugPrivilege = CONST_LUID(SE_DEBUG_PRIVILEGE, 0); +const LUID SeAuditPrivilege = CONST_LUID(SE_AUDIT_PRIVILEGE, 0); +const LUID SeSystemEnvironmentPrivilege = CONST_LUID(SE_SYSTEM_ENVIRONMENT_PRIVILEGE, 0); +const LUID SeChangeNotifyPrivilege = CONST_LUID(SE_CHANGE_NOTIFY_PRIVILEGE, 0); +const LUID SeRemoteShutdownPrivilege = CONST_LUID(SE_REMOTE_SHUTDOWN_PRIVILEGE, 0); +const LUID SeUndockPrivilege = CONST_LUID(SE_UNDOCK_PRIVILEGE, 0); +const LUID SeSyncAgentPrivilege = CONST_LUID(SE_SYNC_AGENT_PRIVILEGE, 0); +const LUID SeEnableDelegationPrivilege = CONST_LUID(SE_ENABLE_DELEGATION_PRIVILEGE, 0); +const LUID SeManageVolumePrivilege = CONST_LUID(SE_MANAGE_VOLUME_PRIVILEGE, 0); +const LUID SeImpersonatePrivilege = CONST_LUID(SE_IMPERSONATE_PRIVILEGE, 0); +const LUID SeCreateGlobalPrivilege = CONST_LUID(SE_CREATE_GLOBAL_PRIVILEGE, 0); +const LUID SeTrustedCredmanPrivilege = CONST_LUID(SE_TRUSTED_CREDMAN_ACCESS_PRIVILEGE, 0); +const LUID SeRelabelPrivilege = CONST_LUID(SE_RELABEL_PRIVILEGE, 0); +const LUID SeIncreaseWorkingSetPrivilege = CONST_LUID(SE_INC_WORKING_SET_PRIVILEGE, 0); +const LUID SeTimeZonePrivilege = CONST_LUID(SE_TIME_ZONE_PRIVILEGE, 0); +const LUID SeCreateSymbolicLinkPrivilege = CONST_LUID(SE_CREATE_SYMBOLIC_LINK_PRIVILEGE, 0); + /* PRIVATE FUNCTIONS **********************************************************/ @@ -53,58 +63,7 @@ NTAPI SepInitPrivileges(VOID) { - SeCreateTokenPrivilege.LowPart = SE_CREATE_TOKEN_PRIVILEGE; - SeCreateTokenPrivilege.HighPart = 0; - SeAssignPrimaryTokenPrivilege.LowPart = SE_ASSIGNPRIMARYTOKEN_PRIVILEGE; - SeAssignPrimaryTokenPrivilege.HighPart = 0; - SeLockMemoryPrivilege.LowPart = SE_LOCK_MEMORY_PRIVILEGE; - SeLockMemoryPrivilege.HighPart = 0; - SeIncreaseQuotaPrivilege.LowPart = SE_INCREASE_QUOTA_PRIVILEGE; - SeIncreaseQuotaPrivilege.HighPart = 0; - SeUnsolicitedInputPrivilege.LowPart = SE_UNSOLICITED_INPUT_PRIVILEGE; - SeUnsolicitedInputPrivilege.HighPart = 0; - SeTcbPrivilege.LowPart = SE_TCB_PRIVILEGE; - SeTcbPrivilege.HighPart = 0; - SeSecurityPrivilege.LowPart = SE_SECURITY_PRIVILEGE; - SeSecurityPrivilege.HighPart = 0; - SeTakeOwnershipPrivilege.LowPart = SE_TAKE_OWNERSHIP_PRIVILEGE; - SeTakeOwnershipPrivilege.HighPart = 0; - SeLoadDriverPrivilege.LowPart = SE_LOAD_DRIVER_PRIVILEGE; - SeLoadDriverPrivilege.HighPart = 0; - SeSystemProfilePrivilege.LowPart = SE_SYSTEM_PROFILE_PRIVILEGE; - SeSystemProfilePrivilege.HighPart = 0; - SeSystemtimePrivilege.LowPart = SE_SYSTEMTIME_PRIVILEGE; - SeSystemtimePrivilege.HighPart = 0; - SeProfileSingleProcessPrivilege.LowPart = SE_PROF_SINGLE_PROCESS_PRIVILEGE; - SeProfileSingleProcessPrivilege.HighPart = 0; - SeIncreaseBasePriorityPrivilege.LowPart = SE_INC_BASE_PRIORITY_PRIVILEGE; - SeIncreaseBasePriorityPrivilege.HighPart = 0; - SeCreatePagefilePrivilege.LowPart = SE_CREATE_PAGEFILE_PRIVILEGE; - SeCreatePagefilePrivilege.HighPart = 0; - SeCreatePermanentPrivilege.LowPart = SE_CREATE_PERMANENT_PRIVILEGE; - SeCreatePermanentPrivilege.HighPart = 0; - SeBackupPrivilege.LowPart = SE_BACKUP_PRIVILEGE; - SeBackupPrivilege.HighPart = 0; - SeRestorePrivilege.LowPart = SE_RESTORE_PRIVILEGE; - SeRestorePrivilege.HighPart = 0; - SeShutdownPrivilege.LowPart = SE_SHUTDOWN_PRIVILEGE; - SeShutdownPrivilege.HighPart = 0; - SeDebugPrivilege.LowPart = SE_DEBUG_PRIVILEGE; - SeDebugPrivilege.HighPart = 0; - SeAuditPrivilege.LowPart = SE_AUDIT_PRIVILEGE; - SeAuditPrivilege.HighPart = 0; - SeSystemEnvironmentPrivilege.LowPart = SE_SYSTEM_ENVIRONMENT_PRIVILEGE; - SeSystemEnvironmentPrivilege.HighPart = 0; - SeChangeNotifyPrivilege.LowPart = SE_CHANGE_NOTIFY_PRIVILEGE; - SeChangeNotifyPrivilege.HighPart = 0; - SeRemoteShutdownPrivilege.LowPart = SE_REMOTE_SHUTDOWN_PRIVILEGE; - SeRemoteShutdownPrivilege.HighPart = 0; - SeUndockPrivilege.LowPart = SE_UNDOCK_PRIVILEGE; - SeUndockPrivilege.HighPart = 0; - SeSyncAgentPrivilege.LowPart = SE_SYNC_AGENT_PRIVILEGE; - SeSyncAgentPrivilege.HighPart = 0; - SeEnableDelegationPrivilege.LowPart = SE_ENABLE_DELEGATION_PRIVILEGE; - SeEnableDelegationPrivilege.HighPart = 0; + } @@ -233,7 +192,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } } - + /* copy the array to the buffer */ _SEH2_TRY { Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=61… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Tue Nov 26 23:28:37 2013 @@ -101,6 +101,95 @@ return STATUS_SUCCESS; } +static +VOID +SepUpdateSinglePrivilegeFlagToken( + _Inout_ PTOKEN Token, + _In_ ULONG Index) +{ + ULONG TokenFlag; + NT_ASSERT(Index < Token->PrivilegeCount); + + /* The high part of all values we are interested in is 0 */ + if (Token->Privileges[Index].Luid.HighPart != 0) + { + return; + } + + /* Check for certain privileges to update flags */ + if (Token->Privileges[Index].Luid.LowPart == SE_CHANGE_NOTIFY_PRIVILEGE) + { + TokenFlag = TOKEN_HAS_TRAVERSE_PRIVILEGE; + } + else if (Token->Privileges[Index].Luid.LowPart == SE_BACKUP_PRIVILEGE) + { + TokenFlag = TOKEN_HAS_BACKUP_PRIVILEGE; + } + else if (Token->Privileges[Index].Luid.LowPart == SE_RESTORE_PRIVILEGE) + { + TokenFlag = TOKEN_HAS_RESTORE_PRIVILEGE; + } + else if (Token->Privileges[Index].Luid.LowPart == SE_IMPERSONATE_PRIVILEGE) + { + TokenFlag = TOKEN_HAS_IMPERSONATE_PRIVILEGE; + } + else + { + /* Nothing to do */ + return; + } + + /* Check if the specified privilege is enabled */ + if (Token->Privileges[Index].Attributes & SE_PRIVILEGE_ENABLED) + { + /* It is enabled, so set the flag */ + Token->TokenFlags |= TokenFlag; + } + else + { + /* Is is disabled, so remove the flag */ + Token->TokenFlags &= ~TokenFlag; + } +} + +static +VOID +SepUpdatePrivilegeFlagsToken( + _Inout_ PTOKEN Token) +{ + ULONG i; + + /* Loop all privileges */ + for (i = 0; i < Token->PrivilegeCount; i++) + { + /* Updates the flags dor this privilege */ + SepUpdateSinglePrivilegeFlagToken(Token, i); + } +} + +static +VOID +SepRemovePrivilegeToken( + _Inout_ PTOKEN Token, + _In_ ULONG Index) +{ + ULONG MoveCount; + NT_ASSERT(Index < Token->PrivilegeCount); + + /* Calculate the number of trailing privileges */ + MoveCount = Token->PrivilegeCount - Index - 1; + if (MoveCount != 0) + { + /* Move them one location ahead */ + RtlMoveMemory(&Token->Privileges[Index], + &Token->Privileges[Index + 1], + MoveCount * sizeof(LUID_AND_ATTRIBUTES)); + } + + /* Update privilege count */ + Token->PrivilegeCount--; +} + VOID NTAPI SepFreeProxyData(PVOID ProxyData) @@ -592,18 +681,6 @@ } } - /* Loop all privileges */ - for (i = 0; i < PrivilegeCount; i++) - { - /* For optimization, check for change notify and impersonate rights */ - if (((RtlEqualLuid(&Privileges[i].Luid, &SeChangeNotifyPrivilege)) && - (Privileges[i].Attributes & SE_PRIVILEGE_ENABLED))) - { - /* Remember token has traverse */ - TokenFlags |= TOKEN_HAS_TRAVERSE_PRIVILEGE; - } - } - Status = ZwAllocateLocallyUniqueId(&TokenId); if (!NT_SUCCESS(Status)) return Status; @@ -732,6 +809,9 @@ if (!NT_SUCCESS(Status)) goto done; + /* Update privilege flags */ + SepUpdatePrivilegeFlagsToken(AccessToken); + AccessToken->DefaultDacl = ExAllocatePoolWithTag(PagedPool, DefaultDacl->AclSize, TAG_TOKEN_ACL); @@ -769,15 +849,7 @@ { if (AccessToken) { - if (AccessToken->UserAndGroups) - ExFreePoolWithTag(AccessToken->UserAndGroups, TAG_TOKEN_USERS); - - if (AccessToken->Privileges) - ExFreePoolWithTag(AccessToken->Privileges, TAG_TOKEN_PRIVILAGES); - - if (AccessToken->DefaultDacl) - ExFreePoolWithTag(AccessToken->DefaultDacl, TAG_TOKEN_ACL); - + /* Dereference the token, the delete procedure will clean up */ ObDereferenceObject(AccessToken); } } @@ -1995,16 +2067,136 @@ return(STATUS_NOT_IMPLEMENTED); } + +static +ULONG +SepAdjustPrivileges( + _Inout_ PTOKEN Token, + _In_ BOOLEAN DisableAllPrivileges, + _In_opt_ PLUID_AND_ATTRIBUTES NewState, + _In_ ULONG NewStateCount, + _Out_opt_ PTOKEN_PRIVILEGES PreviousState, + _In_ BOOLEAN ApplyChanges, + _Out_ PULONG ChangedPrivileges) +{ + ULONG i, j, PrivilegeCount, ChangeCount, NewAttributes; + + /* Count the found privileges and those that need to be changed */ + PrivilegeCount = 0; + ChangeCount = 0; + + /* Loop all privileges in the token */ + for (i = 0; i < Token->PrivilegeCount; i++) + { + /* Shall all of them be disabled? */ + if (DisableAllPrivileges) + { + /* The new attributes are the old ones, but disabled */ + NewAttributes = Token->Privileges[i].Attributes & ~SE_PRIVILEGE_ENABLED; + } + else + { + /* Otherwise loop all provided privileges */ + for (j = 0; j < NewStateCount; j++) + { + /* Check if this is the LUID we are looking for */ + if (RtlEqualLuid(&Token->Privileges[i].Luid, &NewState[j].Luid)) + { + DPRINT("Found privilege\n"); + + /* Copy SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_REMOVED */ + NewAttributes = NewState[j].Attributes; + NewAttributes &= (SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_REMOVED); + NewAttributes |= Token->Privileges[i].Attributes & ~SE_PRIVILEGE_ENABLED; + + /* Stop looking */ + break; + } + } + + /* Check if we didn't find the privilege */ + if (j == NewStateCount) + { + /* Continue with the token's next privilege */ + continue; + } + } + + /* We found a privilege, count it */ + PrivilegeCount++; + + /* Does the privilege need to be changed? */ + if (Token->Privileges[i].Attributes != NewAttributes) + { + /* Does the caller want the old privileges? */ + if (PreviousState != NULL) + { + /* Copy the old privilege */ + PreviousState->Privileges[ChangeCount] = Token->Privileges[i]; + } + + /* Does the caller want to apply the changes? */ + if (ApplyChanges) + { + /* Shall we remove the privilege? */ + if (NewAttributes & SE_PRIVILEGE_REMOVED) + { + /* Set the token as disabled and update flags for it */ + Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; + SepUpdateSinglePrivilegeFlagToken(Token, i); + + /* Remove the privilege */ + SepRemovePrivilegeToken(Token, i); + + /* Fix the running index */ + i--; + + /* Continue with next */ + continue; + } + + /* Set the new attributes and update flags */ + Token->Privileges[i].Attributes = NewAttributes; + SepUpdateSinglePrivilegeFlagToken(Token, i); + } + + /* Increment the change count */ + ChangeCount++; + } + } + + /* Set the number of saved privileges */ + if (PreviousState != NULL) + PreviousState->PrivilegeCount = ChangeCount; + + /* Return the number of changed privileges */ + *ChangedPrivileges = ChangeCount; + + /* Check if we missed some */ + if (!DisableAllPrivileges && (PrivilegeCount < NewStateCount)) + { + return STATUS_NOT_ALL_ASSIGNED; + } + + return STATUS_SUCCESS; +} + + /* * @implemented */ -NTSTATUS NTAPI -NtAdjustPrivilegesToken(IN HANDLE TokenHandle, - IN BOOLEAN DisableAllPrivileges, - IN PTOKEN_PRIVILEGES NewState, - IN ULONG BufferLength, - OUT PTOKEN_PRIVILEGES PreviousState OPTIONAL, - OUT PULONG ReturnLength OPTIONAL) +_Must_inspect_result_ +__kernel_entry +NTSTATUS +NTAPI +NtAdjustPrivilegesToken( + _In_ HANDLE TokenHandle, + _In_ BOOLEAN DisableAllPrivileges, + _In_opt_ PTOKEN_PRIVILEGES NewState, + _In_ ULONG BufferLength, + _Out_writes_bytes_to_opt_(BufferLength,*ReturnLength) + PTOKEN_PRIVILEGES PreviousState, + _When_(PreviousState!=NULL, _Out_) PULONG ReturnLength) { PLUID_AND_ATTRIBUTES CapturedPrivileges = NULL; KPROCESSOR_MODE PreviousMode; @@ -2012,14 +2204,12 @@ ULONG CapturedLength = 0; ULONG NewStateSize = 0; ULONG ChangeCount; + ULONG RequiredLength; PTOKEN Token; - ULONG i; - ULONG j; NTSTATUS Status; - PAGED_CODE(); - DPRINT ("NtAdjustPrivilegesToken() called\n"); + DPRINT("NtAdjustPrivilegesToken() called\n"); /* Fail, if we do not disable all privileges but NewState is NULL */ if (DisableAllPrivileges == FALSE && NewState == NULL) @@ -2033,29 +2223,20 @@ /* Probe NewState */ if (DisableAllPrivileges == FALSE) { - ProbeForRead(NewState, - sizeof(TOKEN_PRIVILEGES), - sizeof(ULONG)); + /* First probe the header */ + ProbeForRead(NewState, sizeof(TOKEN_PRIVILEGES), sizeof(ULONG)); CapturedCount = NewState->PrivilegeCount; - NewStateSize = (ULONG)sizeof(TOKEN_PRIVILEGES) + - ((CapturedCount - ANYSIZE_ARRAY) * (ULONG)sizeof(LUID_AND_ATTRIBUTES)); - - ProbeForRead(NewState, - NewStateSize, - sizeof(ULONG)); + NewStateSize = FIELD_OFFSET(TOKEN_PRIVILEGES, Privileges[CapturedCount]); + + ProbeForRead(NewState, NewStateSize, sizeof(ULONG)); } /* Probe PreviousState and ReturnLength */ if (PreviousState != NULL) { - ProbeForWrite(PreviousState, - BufferLength, - sizeof(ULONG)); - - ProbeForWrite(ReturnLength, - sizeof(ULONG), - sizeof(ULONG)); + ProbeForWrite(PreviousState, BufferLength, sizeof(ULONG)); + ProbeForWrite(ReturnLength, sizeof(ULONG), sizeof(ULONG)); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -2067,10 +2248,12 @@ } else { + /* This is kernel mode, we trust the caller */ if (DisableAllPrivileges == FALSE) CapturedCount = NewState->PrivilegeCount; } + /* Do we need to capture the new state? */ if (DisableAllPrivileges == FALSE) { _SEH2_TRY @@ -2089,7 +2272,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); + Status = _SEH2_GetExceptionCode(); } _SEH2_END; @@ -2106,7 +2289,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1 ("Failed to reference token (Status %lx)\n", Status); + DPRINT1("Failed to reference token (Status %lx)\n", Status); /* Release the captured privileges */ if (CapturedPrivileges != NULL) @@ -2117,51 +2300,23 @@ return Status; } - /* Count the privileges that need to be changed */ - ChangeCount = 0; - for (i = 0; i < Token->PrivilegeCount; i++) - { - if (DisableAllPrivileges) - { - if (Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) - { - DPRINT("Privilege enabled\n"); - - ChangeCount++; - } - } - else - { - for (j = 0; j < CapturedCount; j++) - { - if (Token->Privileges[i].Luid.LowPart == CapturedPrivileges[j].Luid.LowPart && - Token->Privileges[i].Luid.HighPart == CapturedPrivileges[j].Luid.HighPart) - { - DPRINT("Found privilege\n"); - - if ((Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) != - (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED)) - { - DPRINT("Attributes differ\n"); - DPRINT("Current attributes %lx New attributes %lx\n", - Token->Privileges[i].Attributes, - CapturedPrivileges[j].Attributes); - - ChangeCount++; - } - } - } - } - } - - /* - * Return the required buffer size and - * check if the available buffer is large enough - */ + /* Lock the token */ + ExEnterCriticalRegionAndAcquireResourceExclusive(Token->TokenLock); + + /* Count the privileges that need to be changed, do not apply them yet */ + Status = SepAdjustPrivileges(Token, + DisableAllPrivileges, + CapturedPrivileges, + CapturedCount, + NULL, + FALSE, + &ChangeCount); + + /* Check if the caller asked for the previous state */ if (PreviousState != NULL) { - ULONG RequiredLength = (ULONG)sizeof(TOKEN_PRIVILEGES) + - ((ChangeCount - ANYSIZE_ARRAY) * (ULONG)sizeof(LUID_AND_ATTRIBUTES)); + /* Calculate the required length */ + RequiredLength = FIELD_OFFSET(TOKEN_PRIVILEGES, Privileges[ChangeCount]); /* Try to return the required buffer length */ _SEH2_TRY @@ -2170,125 +2325,44 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Dereference the token */ - ObDereferenceObject(Token); - - /* Release the captured privileges */ - if (CapturedPrivileges != NULL) - SeReleaseLuidAndAttributesArray(CapturedPrivileges, - PreviousMode, - TRUE); - - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); + /* Do cleanup and return the exception code */ + Status = _SEH2_GetExceptionCode(); + goto Cleanup; } _SEH2_END; /* Fail, if the buffer length is smaller than the required length */ if (BufferLength < RequiredLength) { - /* Dereference the token */ - ObDereferenceObject(Token); - - /* Release the captured privileges */ - if (CapturedPrivileges != NULL) - SeReleaseLuidAndAttributesArray(CapturedPrivileges, - PreviousMode, - TRUE); - - return STATUS_BUFFER_TOO_SMALL; - } - } - - /* Change the privilege attributes */ - ChangeCount = 0; + Status = STATUS_BUFFER_TOO_SMALL; + goto Cleanup; + } + } + + /* Now enter SEH, since we might return the old privileges */ _SEH2_TRY { - for (i = 0; i < Token->PrivilegeCount; i++) - { - if (DisableAllPrivileges == TRUE) - { - if (Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) - { - DPRINT("Privilege enabled\n"); - - /* Save the current privilege */ - if (PreviousState != NULL) - { - PreviousState->Privileges[ChangeCount].Luid = Token->Privileges[i].Luid; - PreviousState->Privileges[ChangeCount].Attributes = Token->Privileges[i].Attributes; - } - - /* Disable the current privlege */ - Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; - - ChangeCount++; - } - } - else - { - for (j = 0; j < CapturedCount; j++) - { - if (Token->Privileges[i].Luid.LowPart == CapturedPrivileges[j].Luid.LowPart && - Token->Privileges[i].Luid.HighPart == CapturedPrivileges[j].Luid.HighPart) - { - DPRINT("Found privilege\n"); - - /* Check whether the attributes differ */ - if ((Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) != - (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED)) - { - DPRINT("Attributes differ\n"); - DPRINT("Current attributes %lx New attributes %lx\n", - Token->Privileges[i].Attributes, - CapturedPrivileges[j].Attributes); - - /* Save the current privilege */ - if (PreviousState != NULL) - { - PreviousState->Privileges[ChangeCount].Luid = Token->Privileges[i].Luid; - PreviousState->Privileges[ChangeCount].Attributes = Token->Privileges[i].Attributes; - } - - /* Update the current privlege */ - Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; - Token->Privileges[i].Attributes |= - (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED); - DPRINT("New attributes %lx\n", - Token->Privileges[i].Attributes); - - ChangeCount++; - } - } - } - } - } - - /* Set the number of saved privileges */ - if (PreviousState != NULL) - PreviousState->PrivilegeCount = ChangeCount; + /* This time apply the changes */ + Status = SepAdjustPrivileges(Token, + DisableAllPrivileges, + CapturedPrivileges, + CapturedCount, + PreviousState, + TRUE, + &ChangeCount); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Dereference the token */ - ObDereferenceObject(Token); - - /* Release the captured privileges */ - if (CapturedPrivileges != NULL) - SeReleaseLuidAndAttributesArray(CapturedPrivileges, - PreviousMode, - TRUE); - - /* Return the exception code */ - _SEH2_YIELD(return _SEH2_GetExceptionCode()); + /* Do cleanup and return the exception code */ + Status = _SEH2_GetExceptionCode(); + goto Cleanup; } _SEH2_END; - /* Set the status */ - Status = (ChangeCount < CapturedCount) ? STATUS_NOT_ALL_ASSIGNED : STATUS_SUCCESS; - - /* Dereference the token */ - ObDereferenceObject (Token); +Cleanup: + /* Unlock and dereference the token */ + ExReleaseResourceAndLeaveCriticalRegion(Token->TokenLock); + ObDereferenceObject(Token); /* Release the captured privileges */ if (CapturedPrivileges != NULL) @@ -2297,7 +2371,6 @@ TRUE); DPRINT ("NtAdjustPrivilegesToken() done\n"); - return Status; }

1 0

[tkreuzer] 61108: [NTOSKRNL] - Remove the BoundaryAddressMultiple parameter from MmCreateMemoryArea (wasn't used) and give it instead a Granularity parameter - Use the Granularity parameter in MmMa...
by tkreuzer＠svn.reactos.org 26 Nov '13

26 Nov '13

Author: tkreuzer Date: Tue Nov 26 21:38:02 2013 New Revision: 61108 URL: http://svn.reactos.org/svn/reactos?rev=61108&view=rev Log: [NTOSKRNL] - Remove the BoundaryAddressMultiple parameter from MmCreateMemoryArea (wasn't used) and give it instead a Granularity parameter - Use the Granularity parameter in MmMapViewOfSegment to make sure that full sections are allocated on a MM_ALLOCATION_GRANULARITY aligned address. - Check for overflow and unaligned image base in MmMapViewOfSection when mapping image sections - Return proper status code on failure Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/mm/i386/pagepae.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Tue Nov 26 21:38:02 2013 @@ -627,9 +627,6 @@ { PMEMORY_AREA MArea; NTSTATUS Status; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - - BoundaryAddressMultiple.QuadPart = 0; Status = MmCreateMemoryArea(AddressSpace, MEMORY_AREA_CACHE, @@ -639,7 +636,7 @@ &MArea, FALSE, AllocationType, - BoundaryAddressMultiple); + PAGE_SIZE); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=611… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Tue Nov 26 21:38:02 2013 @@ -611,13 +611,11 @@ #ifdef CACHE_BITMAP ULONG StartingOffset; #endif - PHYSICAL_ADDRESS BoundaryAddressMultiple; ASSERT(Bcb); DPRINT("CcRosCreateCacheSegment()\n"); - BoundaryAddressMultiple.QuadPart = 0; if (FileOffset >= Bcb->FileSize.u.LowPart) { CacheSeg = NULL; @@ -742,7 +740,7 @@ (PMEMORY_AREA*)&current->MemoryArea, FALSE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); MmUnlockAddressSpace(MmGetKernelAddressSpace()); if (!NT_SUCCESS(Status)) { @@ -1370,12 +1368,10 @@ #ifdef CACHE_BITMAP PMEMORY_AREA marea; PVOID Buffer; - PHYSICAL_ADDRESS BoundaryAddressMultiple; #endif DPRINT("CcInitView()\n"); #ifdef CACHE_BITMAP - BoundaryAddressMultiple.QuadPart = 0; CiCacheSegMappingRegionHint = 0; CiCacheSegMappingRegionBase = NULL; @@ -1389,7 +1385,7 @@ &marea, FALSE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); MmUnlockAddressSpace(MmGetKernelAddressSpace()); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Tue Nov 26 21:38:02 2013 @@ -512,7 +512,7 @@ PMEMORY_AREA *Result, BOOLEAN FixedAddress, ULONG AllocationFlags, - PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL + ULONG AllocationGranularity ); PMEMORY_AREA Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Tue Nov 26 21:38:02 2013 @@ -30,9 +30,7 @@ { NTSTATUS Status; PMEMORY_AREA MemoryArea; - PHYSICAL_ADDRESS BoundaryAddressMultiple; PVOID AllocatedBase = (PVOID)MM_SHARED_USER_DATA_VA; - BoundaryAddressMultiple.QuadPart = 0; Status = MmCreateMemoryArea(&Process->Vm, MEMORY_AREA_OWNED_BY_ARM3, @@ -42,7 +40,7 @@ &MemoryArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(NT_SUCCESS(Status)); } Modified: trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/vadnode.c [iso-8859-1] Tue Nov 26 21:38:02 2013 @@ -24,19 +24,19 @@ CHAR MmReadWrite[32] = { - MM_NO_ACCESS_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, + MM_NO_ACCESS_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, - MM_NO_ACCESS_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, + MM_NO_ACCESS_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, - MM_NO_ACCESS_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, + MM_NO_ACCESS_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, - MM_NO_ACCESS_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, + MM_NO_ACCESS_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_ONLY_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, MM_READ_WRITE_ALLOWED, }; @@ -129,11 +129,10 @@ { NTSTATUS Status; PMEMORY_AREA MemoryArea; - PHYSICAL_ADDRESS BoundaryAddressMultiple; SIZE_T Size; PEPROCESS Process = CONTAINING_RECORD(Table, EPROCESS, VadRoot); PVOID AllocatedBase = (PVOID)(Vad->StartingVpn << PAGE_SHIFT); - BoundaryAddressMultiple.QuadPart = 0; + Size = ((Vad->EndingVpn + 1) - Vad->StartingVpn) << PAGE_SHIFT; Status = MmCreateMemoryArea(&Process->Vm, MEMORY_AREA_OWNED_BY_ARM3, @@ -143,7 +142,7 @@ &MemoryArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(NT_SUCCESS(Status)); /* Check if this is VM VAD */ @@ -635,7 +634,7 @@ /* This is allowed */ ProtectionMask = 0; } - + /* ARM3 doesn't support this yet */ ASSERT(Vad->u2.VadFlags2.MultipleSecured == 0); @@ -655,7 +654,7 @@ /* ARM3 doesn't have read-only VADs yet */ ASSERT(Vad->u2.VadFlags2.ReadOnly == 0); - + /* Check if read-write protections are allowed */ if (MmReadWrite[ProtectionMask] < MM_READ_WRITE_ALLOWED) { Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Tue Nov 26 21:38:02 2013 @@ -779,14 +779,12 @@ MiInitPageDirectoryMap(VOID) { MEMORY_AREA* MemoryArea = NULL; - PHYSICAL_ADDRESS BoundaryAddressMultiple; PVOID BaseAddress; NTSTATUS Status; // // Create memory area for the PTE area // - BoundaryAddressMultiple.QuadPart = 0; BaseAddress = (PVOID)PTE_BASE; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_OWNED_BY_ARM3, @@ -796,7 +794,7 @@ &MemoryArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(NT_SUCCESS(Status)); // @@ -811,7 +809,7 @@ &MemoryArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(NT_SUCCESS(Status)); // @@ -826,7 +824,7 @@ &MemoryArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(NT_SUCCESS(Status)); } Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Tue Nov 26 21:38:02 2013 @@ -2311,13 +2311,11 @@ { MEMORY_AREA* kernel_map_desc = NULL; MEMORY_AREA* hyperspace_desc = NULL; - PHYSICAL_ADDRESS BoundaryAddressMultiple; PVOID BaseAddress; NTSTATUS Status; DPRINT("MiInitPageDirectoryMap()\n"); - BoundaryAddressMultiple.QuadPart = 0; BaseAddress = (PVOID)PAGETABLE_MAP; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, @@ -2327,7 +2325,7 @@ &kernel_map_desc, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); if (!NT_SUCCESS(Status)) { ASSERT(FALSE); @@ -2341,7 +2339,7 @@ &hyperspace_desc, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); if (!NT_SUCCESS(Status)) { ASSERT(FALSE); Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=61… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Tue Nov 26 21:38:02 2013 @@ -984,10 +984,8 @@ PMEMORY_AREA *Result, BOOLEAN FixedAddress, ULONG AllocationFlags, - PHYSICAL_ADDRESS BoundaryAddressMultiple) -{ - PVOID EndAddress; - ULONG Granularity; + ULONG Granularity) +{ ULONG_PTR tmpLength; PMEMORY_AREA MemoryArea; @@ -997,7 +995,6 @@ Type, BaseAddress, *BaseAddress, Length, AllocationFlags, FixedAddress, Result); - Granularity = PAGE_SIZE; if ((*BaseAddress) == 0 && !FixedAddress) { tmpLength = (ULONG_PTR)MM_ROUND_UP(Length, Granularity); @@ -1028,12 +1025,6 @@ { DPRINT("Memory area for user mode address space exceeds MmSystemRangeStart\n"); return STATUS_ACCESS_VIOLATION; - } - - if (BoundaryAddressMultiple.QuadPart != 0) - { - EndAddress = ((char*)(*BaseAddress)) + tmpLength-1; - ASSERT(((ULONG_PTR)*BaseAddress/BoundaryAddressMultiple.QuadPart) == ((DWORD_PTR)EndAddress/BoundaryAddressMultiple.QuadPart)); } if (MmLocateMemoryAreaByRegion(AddressSpace, Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Nov 26 21:38:02 2013 @@ -44,10 +44,8 @@ MiInitSystemMemoryAreas() { PVOID BaseAddress; - PHYSICAL_ADDRESS BoundaryAddressMultiple; PMEMORY_AREA MArea; NTSTATUS Status; - BoundaryAddressMultiple.QuadPart = 0; // // Create the memory area to define the loader mappings @@ -61,7 +59,7 @@ &MArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); // @@ -76,7 +74,7 @@ &MArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); // @@ -91,7 +89,7 @@ &MArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); // @@ -106,7 +104,7 @@ &MArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); // @@ -121,7 +119,7 @@ &MArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); // @@ -136,7 +134,7 @@ &MArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); // @@ -151,7 +149,7 @@ &MArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); // @@ -167,7 +165,7 @@ &MArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); // @@ -182,7 +180,7 @@ &MArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); #ifndef _M_AMD64 // @@ -197,7 +195,7 @@ &MArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); #endif // @@ -212,7 +210,7 @@ &MArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); // @@ -227,7 +225,7 @@ &MArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); #if defined(_X86_) @@ -243,7 +241,7 @@ &MArea, TRUE, 0, - BoundaryAddressMultiple); + PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); #endif } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Nov 26 21:38:02 2013 @@ -200,7 +200,7 @@ ULONG cbHeadersSize = 0; ULONG nSectionAlignment; ULONG nFileAlignment; - ULONG ImageBase; + ULONG_PTR ImageBase; const IMAGE_DOS_HEADER * pidhDosHeader; const IMAGE_NT_HEADERS32 * pinhNtHeader; const IMAGE_OPTIONAL_HEADER32 * piohOptHeader; @@ -457,7 +457,7 @@ break; } - +#ifdef _WIN64 /* PE64 */ case IMAGE_NT_OPTIONAL_HDR64_MAGIC: { @@ -535,6 +535,7 @@ break; } +#endif // _WIN64 } /* [1], section 3.4.2 */ @@ -2816,7 +2817,8 @@ if (UMaximumSize == NULL) { - return(STATUS_UNSUCCESSFUL); + DPRINT1("MmCreatePageFileSection: (UMaximumSize == NULL)\n"); + return(STATUS_INVALID_PARAMETER); } MaximumSize = *UMaximumSize; @@ -2834,6 +2836,7 @@ (PVOID*)(PVOID)&Section); if (!NT_SUCCESS(Status)) { + DPRINT1("MmCreatePageFileSection: failed to create object (0x%lx)\n", Status); return(Status); } @@ -3901,7 +3904,7 @@ { PMEMORY_AREA MArea; NTSTATUS Status; - PHYSICAL_ADDRESS BoundaryAddressMultiple; + ULONG Granularity; if (Segment->WriteCopy) { @@ -3920,7 +3923,10 @@ Protect = PAGE_EXECUTE_READWRITE; } - BoundaryAddressMultiple.QuadPart = 0; + if (*BaseAddress == NULL) + Granularity = MM_ALLOCATION_GRANULARITY; + else + Granularity = PAGE_SIZE; #ifdef NEWCC if (Segment->Flags & MM_DATAFILE_SEGMENT) { @@ -3938,7 +3944,7 @@ &MArea, FALSE, AllocationType, - BoundaryAddressMultiple); + Granularity); if (!NT_SUCCESS(Status)) { DPRINT1("Mapping between 0x%p and 0x%p failed (%X).\n", @@ -4471,9 +4477,19 @@ ImageSectionObject->ImageInformation.ImageFileSize = (ULONG)ImageSize; /* Check for an illegal base address */ - if ((ImageBase + ImageSize) > (ULONG_PTR)MmHighestUserAddress) - { - ImageBase = PAGE_ROUND_DOWN((ULONG_PTR)MmHighestUserAddress - ImageSize); + if (((ImageBase + ImageSize) > (ULONG_PTR)MmHighestUserAddress) || + ((ImageBase + ImageSize) < ImageSize)) + { + NT_ASSERT(*BaseAddress == NULL); + ImageBase = ALIGN_DOWN_BY((ULONG_PTR)MmHighestUserAddress - ImageSize, + MM_VIRTMEM_GRANULARITY); + NotAtBase = TRUE; + } + else if (ImageBase != ALIGN_DOWN_BY(ImageBase, MM_VIRTMEM_GRANULARITY)) + { + NT_ASSERT(*BaseAddress == NULL); + ImageBase = ALIGN_DOWN_BY(ImageBase, MM_VIRTMEM_GRANULARITY); + NotAtBase = TRUE; } /* Check there is enough space to map the section at that point. */ @@ -4484,14 +4500,14 @@ if ((*BaseAddress) != NULL) { MmUnlockAddressSpace(AddressSpace); - return(STATUS_UNSUCCESSFUL); + return(STATUS_CONFLICTING_ADDRESSES); } /* Otherwise find a gap to map the image. */ - ImageBase = (ULONG_PTR)MmFindGap(AddressSpace, PAGE_ROUND_UP(ImageSize), PAGE_SIZE, FALSE); + ImageBase = (ULONG_PTR)MmFindGap(AddressSpace, PAGE_ROUND_UP(ImageSize), MM_VIRTMEM_GRANULARITY, FALSE); if (ImageBase == 0) { MmUnlockAddressSpace(AddressSpace); - return(STATUS_UNSUCCESSFUL); + return(STATUS_CONFLICTING_ADDRESSES); } /* Remember that we loaded image at a different base address */ NotAtBase = TRUE; @@ -4599,6 +4615,7 @@ } MmUnlockAddressSpace(AddressSpace); + NT_ASSERT(*BaseAddress == ALIGN_DOWN_POINTER_BY(*BaseAddress, MM_VIRTMEM_GRANULARITY)); if (NotAtBase) Status = STATUS_IMAGE_NOT_AT_BASE;

1 0

[hbelusca] 61107: [NTVDM] - Move some PS/2 initialization from bios.c to ps2.c - NULLify interrupt entries which are in fact pointers to data tables. - Add a framework for adding I/O port handlers.
by hbelusca＠svn.reactos.org 26 Nov '13

26 Nov '13

Author: hbelusca Date: Tue Nov 26 20:20:51 2013 New Revision: 61107 URL: http://svn.reactos.org/svn/reactos?rev=61107&view=rev Log: [NTVDM] - Move some PS/2 initialization from bios.c to ps2.c - NULLify interrupt entries which are in fact pointers to data tables. - Add a framework for adding I/O port handlers. Added: branches/ntvdm/subsystems/ntvdm/io.c (with props) branches/ntvdm/subsystems/ntvdm/io.h (with props) Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/cmos.c branches/ntvdm/subsystems/ntvdm/cmos.h branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h branches/ntvdm/subsystems/ntvdm/pic.c branches/ntvdm/subsystems/ntvdm/pic.h branches/ntvdm/subsystems/ntvdm/ps2.c branches/ntvdm/subsystems/ntvdm/ps2.h branches/ntvdm/subsystems/ntvdm/registers.c branches/ntvdm/subsystems/ntvdm/speaker.c branches/ntvdm/subsystems/ntvdm/timer.c branches/ntvdm/subsystems/ntvdm/timer.h branches/ntvdm/subsystems/ntvdm/vga.c branches/ntvdm/subsystems/ntvdm/vga.h Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -10,6 +10,7 @@ dos.c emulator.c int32.c + io.c pic.c ps2.c registers.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -28,7 +28,6 @@ static HANDLE BiosConsoleInput = INVALID_HANDLE_VALUE; static HANDLE BiosConsoleOutput = INVALID_HANDLE_VALUE; static CONSOLE_SCREEN_BUFFER_INFO BiosSavedBufferInfo; -static HANDLE InputThread = NULL; /* * VGA Register Configurations for BIOS Video Modes @@ -486,6 +485,18 @@ RegisterInt32(BIOS_TIME_INTERRUPT , BiosTimeService ); RegisterInt32(BIOS_SYS_TIMER_INTERRUPT, BiosSystemTimerInterrupt); + /* Some interrupts are in fact addresses to tables */ + ((PDWORD)BaseAddress)[0x1D] = (DWORD)NULL; + ((PDWORD)BaseAddress)[0x1E] = (DWORD)NULL; + ((PDWORD)BaseAddress)[0x1F] = (DWORD)NULL; + + ((PDWORD)BaseAddress)[0x41] = (DWORD)NULL; + ((PDWORD)BaseAddress)[0x43] = (DWORD)NULL; + ((PDWORD)BaseAddress)[0x44] = (DWORD)NULL; + ((PDWORD)BaseAddress)[0x46] = (DWORD)NULL; + ((PDWORD)BaseAddress)[0x48] = (DWORD)NULL; + ((PDWORD)BaseAddress)[0x49] = (DWORD)NULL; + /* Get the input handle to the real console, and check for success */ BiosConsoleInput = CreateFileW(L"CONIN$", GENERIC_READ | GENERIC_WRITE, @@ -537,8 +548,8 @@ /* Set the console input mode */ SetConsoleMode(BiosConsoleInput, ENABLE_MOUSE_INPUT | ENABLE_PROCESSED_INPUT); - /* Start the input thread */ - InputThread = CreateThread(NULL, 0, &InputThreadProc, BiosConsoleInput, 0, NULL); + /* Initialize PS2 */ + PS2Initialize(BiosConsoleInput); /* Initialize the PIC */ PicWriteCommand(PIC_MASTER_CMD, PIC_ICW1 | PIC_ICW1_ICW4); @@ -569,8 +580,7 @@ VOID BiosCleanup(VOID) { - /* Close the input thread handle */ - if (InputThread != NULL) CloseHandle(InputThread); + PS2Cleanup(); /* Restore the old screen buffer */ SetConsoleActiveScreenBuffer(BiosConsoleOutput); Modified: branches/ntvdm/subsystems/ntvdm/cmos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/cmos.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/cmos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/cmos.c [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -10,7 +10,9 @@ #define NDEBUG +#include "emulator.h" #include "cmos.h" +#include "io.h" #include "bios.h" #include "pic.h" @@ -303,6 +305,19 @@ /* Return to Status Register D */ SelectedRegister = CMOS_REG_STATUS_D; +} + +BYTE WINAPI CmosReadPort(ULONG Port) +{ + return CmosReadData(); +} + +VOID WINAPI CmosWritePort(ULONG Port, BYTE Data) +{ + if (Port == CMOS_ADDRESS_PORT) + CmosWriteAddress(Data); + else if (Port == CMOS_DATA_PORT) + CmosWriteData(Data); } DWORD RtcGetTicksPerSecond(VOID) @@ -415,6 +430,10 @@ CmosMemory.Diagnostics = 0x00; // Diagnostics must not find any errors. CmosMemory.ShutdownStatus = 0x00; + /* Register the I/O Ports */ + RegisterIoPort(CMOS_ADDRESS_PORT, NULL , CmosWritePort); + RegisterIoPort(CMOS_DATA_PORT , CmosReadPort, CmosWritePort); + return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/cmos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/cmos.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/cmos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/cmos.h [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -38,10 +38,6 @@ /* Default register values */ #define CMOS_DEFAULT_STA 0x26 #define CMOS_DEFAULT_STB CMOS_STB_24HOUR - -/* BCD-Binary conversion */ -#define BINARY_TO_BCD(x) (((x / 10) << 4) | (x % 10)) -#define BCD_TO_BINARY(x) (((x >> 4) * 10) + (x & 0x0F)) #define WRITE_CMOS_DATA(Cmos, Value) \ ((Cmos).StatusRegB & CMOS_STB_BINARY) ? (Value) : BCD_TO_BINARY(Value) @@ -129,9 +125,6 @@ /* FUNCTIONS ******************************************************************/ BOOLEAN IsNmiEnabled(VOID); -VOID CmosWriteAddress(BYTE Value); -BYTE CmosReadData(VOID); -VOID CmosWriteData(BYTE Value); DWORD RtcGetTicksPerSecond(VOID); VOID RtcPeriodicTick(VOID); VOID RtcTimeUpdate(VOID); Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -2580,7 +2580,9 @@ /* Register the DOS 32-bit Interrupts */ RegisterInt32(0x20, DosInt20h ); RegisterInt32(0x21, DosInt21h ); - RegisterInt32(0x23, DosBreakInterrupt); +// RegisterInt32(0x22, DosInt22h ); // Termination + RegisterInt32(0x23, DosBreakInterrupt); // Ctrl-C / Ctrl-Break +// RegisterInt32(0x24, DosInt24h ); // Critical Error RegisterInt32(0x2F, DosInt2Fh ); return TRUE; Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -11,16 +11,12 @@ #define NDEBUG #include "emulator.h" -#include "cmos.h" #include "bios.h" #include "bop.h" +#include "io.h" #include "registers.h" -#include "dos.h" -#include "speaker.h" #include "vga.h" #include "pic.h" -#include "ps2.h" -#include "timer.h" /* PRIVATE VARIABLES **********************************************************/ @@ -84,192 +80,6 @@ /* Write to the VGA memory */ VgaWriteMemory(VgaAddress, VgaBuffer, ActualSize); - } -} - -VOID WINAPI EmulatorReadIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) -{ - INT i, j; - LPBYTE Address = (LPBYTE)Buffer; - - UNREFERENCED_PARAMETER(State); - - for (i = 0; i < DataCount; i++) for (j = 0; j < DataSize; j++) - { - ULONG CurrentPort = Port + j; - - switch (CurrentPort) - { - case PIC_MASTER_CMD: - case PIC_SLAVE_CMD: - { - *(Address++) = PicReadCommand(CurrentPort); - break; - } - - case PIC_MASTER_DATA: - case PIC_SLAVE_DATA: - { - *(Address++) = PicReadData(CurrentPort); - break; - } - - case PIT_DATA_PORT(0): - case PIT_DATA_PORT(1): - case PIT_DATA_PORT(2): - { - *(Address++) = PitReadData(CurrentPort - PIT_DATA_PORT(0)); - break; - } - - case PS2_CONTROL_PORT: - { - *(Address++) = KeyboardReadStatus(); - break; - } - - case PS2_DATA_PORT: - { - *(Address++) = KeyboardReadData(); - break; - } - - case CMOS_DATA_PORT: - { - *(Address++) = CmosReadData(); - break; - } - - case SPEAKER_CONTROL_PORT: - { - *(Address++) = SpeakerReadStatus(); - break; - } - - case VGA_AC_WRITE: - case VGA_AC_READ: - case VGA_SEQ_INDEX: - case VGA_SEQ_DATA: - case VGA_DAC_READ_INDEX: - case VGA_DAC_WRITE_INDEX: - case VGA_DAC_DATA: - case VGA_MISC_READ: - case VGA_MISC_WRITE: - case VGA_CRTC_INDEX: - case VGA_CRTC_DATA: - case VGA_GC_INDEX: - case VGA_GC_DATA: - case VGA_STAT_MONO: - case VGA_STAT_COLOR: - { - *(Address++) = VgaReadPort(CurrentPort); - break; - } - - default: - { - DPRINT1("Read from unknown port: 0x%X\n", CurrentPort); - } - } - } -} - -VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) -{ - INT i, j; - LPBYTE Address = (LPBYTE)Buffer; - - UNREFERENCED_PARAMETER(State); - - for (i = 0; i < DataCount; i++) for (j = 0; j < DataSize; j++) - { - ULONG CurrentPort = Port + j; - - switch (CurrentPort) - { - case PIT_COMMAND_PORT: - { - PitWriteCommand(*(Address++)); - break; - } - - case PIT_DATA_PORT(0): - case PIT_DATA_PORT(1): - case PIT_DATA_PORT(2): - { - PitWriteData(CurrentPort - PIT_DATA_PORT(0), *(Address++)); - break; - } - - case PIC_MASTER_CMD: - case PIC_SLAVE_CMD: - { - PicWriteCommand(CurrentPort, *(Address++)); - break; - } - - case PIC_MASTER_DATA: - case PIC_SLAVE_DATA: - { - PicWriteData(CurrentPort, *(Address++)); - break; - } - - case PS2_CONTROL_PORT: - { - KeyboardWriteCommand(*(Address++)); - break; - } - - case PS2_DATA_PORT: - { - KeyboardWriteData(*(Address++)); - break; - } - - case CMOS_ADDRESS_PORT: - { - CmosWriteAddress(*(Address++)); - break; - } - - case CMOS_DATA_PORT: - { - CmosWriteData(*(Address++)); - break; - } - - case SPEAKER_CONTROL_PORT: - { - SpeakerWriteCommand(*(Address++)); - break; - } - - case VGA_AC_WRITE: - case VGA_AC_READ: - case VGA_SEQ_INDEX: - case VGA_SEQ_DATA: - case VGA_DAC_READ_INDEX: - case VGA_DAC_WRITE_INDEX: - case VGA_DAC_DATA: - case VGA_MISC_READ: - case VGA_MISC_WRITE: - case VGA_CRTC_INDEX: - case VGA_CRTC_DATA: - case VGA_GC_INDEX: - case VGA_GC_DATA: - case VGA_STAT_MONO: - case VGA_STAT_COLOR: - { - VgaWritePort(CurrentPort, *(Address++)); - break; - } - - default: - { - DPRINT1("Write to unknown port: 0x%X\n", CurrentPort); - } - } } } Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -79,24 +79,6 @@ ULONG Size ); -VOID WINAPI EmulatorReadIo -( - PFAST486_STATE State, - ULONG Port, - PVOID Buffer, - ULONG DataCount, - UCHAR DataSize -); - -VOID WINAPI EmulatorWriteIo -( - PFAST486_STATE State, - ULONG Port, - PVOID Buffer, - ULONG DataCount, - UCHAR DataSize -); - UCHAR WINAPI EmulatorIntAcknowledge ( PFAST486_STATE State Added: branches/ntvdm/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/io.c?rev… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/io.c (added) +++ branches/ntvdm/subsystems/ntvdm/io.c [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -0,0 +1,100 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: io.c + * PURPOSE: I/O Port Handlers + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "emulator.h" +#include "io.h" + +/* PRIVATE VARIABLES **********************************************************/ + +typedef struct _EMULATOR_IOPORT_HANDLER +{ + EMULATOR_IN_PROC In; + EMULATOR_OUT_PROC Out; +} EMULATOR_IOPORT_HANDLER, *PEMULATOR_IOPORT_HANDLER; + +/* + * This is the list of registered I/O Port handlers. + */ +EMULATOR_IOPORT_HANDLER IoPortProc[EMULATOR_MAX_IOPORTS_NUM]; + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID WINAPI RegisterIoPort(ULONG Port, + EMULATOR_IN_PROC InHandler, + EMULATOR_OUT_PROC OutHandler) +{ + if (IoPortProc[Port].In == NULL) + IoPortProc[Port].In = InHandler; + else + DPRINT1("IoPortProc[%d].In already registered\n", Port); + + if (IoPortProc[Port].Out == NULL) + IoPortProc[Port].Out = OutHandler; + else + DPRINT1("IoPortProc[%d].Out already registered\n", Port); +} + +VOID WINAPI +EmulatorReadIo(PFAST486_STATE State, + ULONG Port, + PVOID Buffer, + ULONG DataCount, + UCHAR DataSize) +{ + INT i, j; + LPBYTE Address = (LPBYTE)Buffer; + + UNREFERENCED_PARAMETER(State); + + for (i = 0; i < DataCount; i++) for (j = 0; j < DataSize; j++) + { + ULONG CurrentPort = Port + j; + + /* Call the IN Port handler */ + if (IoPortProc[CurrentPort].In != NULL) + { + *(Address++) = IoPortProc[CurrentPort].In(CurrentPort); + } + else + { + DPRINT1("Read from unknown port: 0x%X\n", CurrentPort); + *(Address++) = 0xFF; // Empty port value + } + } +} + +VOID WINAPI +EmulatorWriteIo(PFAST486_STATE State, + ULONG Port, + PVOID Buffer, + ULONG DataCount, + UCHAR DataSize) +{ + INT i, j; + LPBYTE Address = (LPBYTE)Buffer; + + UNREFERENCED_PARAMETER(State); + + for (i = 0; i < DataCount; i++) for (j = 0; j < DataSize; j++) + { + ULONG CurrentPort = Port + j; + + /* Call the OUT Port handler */ + if (IoPortProc[CurrentPort].Out != NULL) + IoPortProc[CurrentPort].Out(CurrentPort, *(Address++)); + else + DPRINT1("Write to unknown port: 0x%X\n", CurrentPort); + } +} + +/* EOF */ Propchange: branches/ntvdm/subsystems/ntvdm/io.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/subsystems/ntvdm/io.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/io.h?rev… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/io.h (added) +++ branches/ntvdm/subsystems/ntvdm/io.h [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -0,0 +1,47 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: io.c + * PURPOSE: I/O Port Handlers + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#ifndef _IO_H_ +#define _IO_H_ + +/* DEFINES ********************************************************************/ + +#define EMULATOR_MAX_IOPORTS_NUM 0x10000 + +/* FUNCTIONS ******************************************************************/ + +typedef BYTE (WINAPI *EMULATOR_IN_PROC)(ULONG Port); +typedef VOID (WINAPI *EMULATOR_OUT_PROC)(ULONG Port, BYTE Data); + +VOID WINAPI RegisterIoPort(ULONG Port, + EMULATOR_IN_PROC InHandler, + EMULATOR_OUT_PROC OutHandler); + +VOID WINAPI EmulatorReadIo +( + PFAST486_STATE State, + ULONG Port, + PVOID Buffer, + ULONG DataCount, + UCHAR DataSize +); + +VOID WINAPI EmulatorWriteIo +( + PFAST486_STATE State, + ULONG Port, + PVOID Buffer, + ULONG DataCount, + UCHAR DataSize +); + + +#endif // _IO_H_ + +/* EOF */ Propchange: branches/ntvdm/subsystems/ntvdm/io.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -103,6 +103,7 @@ DPRINT1("\n\n\nNTVDM - Starting '%s'...\n\n\n", CommandLine); + /* Initialize the emulator */ if (!EmulatorInitialize()) { wprintf(L"FATAL: Failed to initialize the CPU emulator\n"); @@ -116,6 +117,20 @@ goto Cleanup; } + /* Initialize the PIC */ + if (!PicInitialize()) + { + wprintf(L"FATAL: Failed to initialize the PIC.\n"); + goto Cleanup; + } + + /* Initialize the PIT */ + if (!PitInitialize()) + { + wprintf(L"FATAL: Failed to initialize the PIT.\n"); + goto Cleanup; + } + /* Initialize the CMOS */ if (!CmosInitialize()) { @@ -123,15 +138,15 @@ goto Cleanup; } + /* Initialize the PC Speaker */ + SpeakerInitialize(); + /* Initialize the system BIOS */ if (!BiosInitialize()) { wprintf(L"FATAL: Failed to initialize the VDM BIOS.\n"); goto Cleanup; } - - /* Initialize the PC Speaker */ - SpeakerInitialize(); /* Initialize the VDM DOS kernel */ if (!DosInitialize()) Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -27,6 +27,7 @@ /* DEFINES ********************************************************************/ +/* Basic Memory Management */ #define TO_LINEAR(seg, off) (((seg) << 4) + (off)) #define MAX_SEGMENT 0xFFFF #define MAX_OFFSET 0xFFFF @@ -38,6 +39,11 @@ #define SEG_OFF_TO_PTR(seg, off) \ (PVOID)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), (off))) +/* BCD-Binary conversion */ +#define BINARY_TO_BCD(x) ((((x) / 1000) << 12) + (((x) / 100) << 8) + (((x) / 10) << 4) + ((x) % 10)) +#define BCD_TO_BINARY(x) (((x) >> 12) * 1000 + ((x) >> 8) * 100 + ((x) >> 4) * 10 + ((x) & 0x0F)) + +/* Processor speed */ #define STEPS_PER_CYCLE 256 /* FUNCTIONS ******************************************************************/ Modified: branches/ntvdm/subsystems/ntvdm/pic.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/pic.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/pic.c [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -10,8 +10,9 @@ #define NDEBUG +#include "emulator.h" +#include "io.h" #include "pic.h" -#include "emulator.h" /* PRIVATE VARIABLES **********************************************************/ @@ -150,6 +151,46 @@ /* Done initializing */ Pic->Initialization = FALSE; +} + +BYTE WINAPI PicReadPort(ULONG Port) +{ + switch (Port) + { + case PIC_MASTER_CMD: + case PIC_SLAVE_CMD: + { + return PicReadCommand(Port); + } + + case PIC_MASTER_DATA: + case PIC_SLAVE_DATA: + { + return PicReadData(Port); + } + } + + return 0; +} + +VOID WINAPI PicWritePort(ULONG Port, BYTE Data) +{ + switch (Port) + { + case PIC_MASTER_CMD: + case PIC_SLAVE_CMD: + { + PicWriteCommand(Port, Data); + break; + } + + case PIC_MASTER_DATA: + case PIC_SLAVE_DATA: + { + PicWriteData(Port, Data); + break; + } + } } VOID PicInterruptRequest(BYTE Number) @@ -249,4 +290,15 @@ else return MasterPic.IntOffset + 7; } +BOOLEAN PicInitialize(VOID) +{ + /* Register the I/O Ports */ + RegisterIoPort(PIC_MASTER_CMD , PicReadPort, PicWritePort); + RegisterIoPort(PIC_SLAVE_CMD , PicReadPort, PicWritePort); + RegisterIoPort(PIC_MASTER_DATA, PicReadPort, PicWritePort); + RegisterIoPort(PIC_SLAVE_DATA , PicReadPort, PicWritePort); + + return TRUE; +} + /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/pic.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/pic.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/pic.h [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -47,12 +47,11 @@ /* FUNCTIONS ******************************************************************/ -BYTE PicReadCommand(BYTE Port); VOID PicWriteCommand(BYTE Port, BYTE Value); -BYTE PicReadData(BYTE Port); VOID PicWriteData(BYTE Port, BYTE Value); VOID PicInterruptRequest(BYTE Number); BYTE PicGetInterrupt(VOID); +BOOLEAN PicInitialize(VOID); #endif // _PIC_H_ Modified: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -10,8 +10,9 @@ #define NDEBUG +#include "emulator.h" +#include "io.h" #include "ps2.h" -#include "emulator.h" #include "pic.h" /* PRIVATE VARIABLES **********************************************************/ @@ -23,6 +24,8 @@ static BYTE KeyboardData = 0, KeyboardResponse = 0; static BOOLEAN KeyboardReadResponse = FALSE, KeyboardWriteResponse = FALSE; static BYTE KeyboardConfig = PS2_DEFAULT_CONFIG; + +static HANDLE InputThread = NULL; /* PRIVATE FUNCTIONS **********************************************************/ @@ -265,6 +268,24 @@ // TODO: Implement PS/2 device commands } +BYTE WINAPI PS2ReadPort(ULONG Port) +{ + if (Port == PS2_CONTROL_PORT) + return KeyboardReadStatus(); + else if (Port == PS2_DATA_PORT) + return KeyboardReadData(); + else + return 0; +} + +VOID WINAPI PS2WritePort(ULONG Port, BYTE Data) +{ + if (Port == PS2_CONTROL_PORT) + KeyboardWriteCommand(Data); + else if (Port == PS2_DATA_PORT) + KeyboardWriteData(Data); +} + DWORD WINAPI InputThreadProc(LPVOID Parameter) { INT i; @@ -325,4 +346,25 @@ return 0; } +BOOLEAN PS2Initialize(HANDLE ConsoleInput) +{ + /* Start the input thread */ + InputThread = CreateThread(NULL, 0, &InputThreadProc, ConsoleInput, 0, NULL); + + // if (InputThread == NULL) return FALSE; + + /* Register the I/O Ports */ + RegisterIoPort(PS2_CONTROL_PORT, PS2ReadPort, PS2WritePort); + RegisterIoPort(PS2_DATA_PORT , PS2ReadPort, PS2WritePort); + + return TRUE; +} + +VOID PS2Cleanup(VOID) +{ + /* Close the input thread handle */ + if (InputThread != NULL) CloseHandle(InputThread); + InputThread = NULL; +} + /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/ps2.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.h [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -25,10 +25,12 @@ /* FUNCTIONS ******************************************************************/ BYTE KeyboardReadStatus(); -VOID KeyboardWriteCommand(BYTE Command); +//VOID KeyboardWriteCommand(BYTE Command); BYTE KeyboardReadData(); -VOID KeyboardWriteData(BYTE Data); -DWORD WINAPI InputThreadProc(LPVOID Parameter); +//VOID KeyboardWriteData(BYTE Data); + +BOOLEAN PS2Initialize(HANDLE ConsoleInput); +VOID PS2Cleanup(VOID); #endif // _PS2_H_ Modified: branches/ntvdm/subsystems/ntvdm/registers.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -668,7 +668,7 @@ CDECL setMSW(USHORT Value) { - /* Set the lowest word (8 bits) */ + /* Set the lower 16 bits (Machine Status Word) of CR0 */ EmulatorContext.ControlRegisters[FAST486_REG_CR0] &= 0xFFFF0000; EmulatorContext.ControlRegisters[FAST486_REG_CR0] |= Value & 0xFFFF; } Modified: branches/ntvdm/subsystems/ntvdm/speaker.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/speaker.… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/speaker.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/speaker.c [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -10,8 +10,9 @@ #define NDEBUG +#include "emulator.h" #include "speaker.h" -#include "emulator.h" +#include "io.h" #include "timer.h" /* Extra PSDK/NDK Headers */ @@ -29,48 +30,8 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -VOID SpeakerInitialize(VOID) -{ - NTSTATUS Status; - UNICODE_STRING BeepDevice; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - - /* Adapted from kernel32:Beep() */ - - // - // On TS systems, we need to Load Winsta.dll and call WinstationBeepOpen - // after doing a GetProcAddress for it - // - - /* Open the device */ - RtlInitUnicodeString(&BeepDevice, L"\\Device\\Beep"); - InitializeObjectAttributes(&ObjectAttributes, &BeepDevice, 0, NULL, NULL); - Status = NtCreateFile(&hBeep, - FILE_READ_DATA | FILE_WRITE_DATA, - &ObjectAttributes, - &IoStatusBlock, - NULL, - 0, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_OPEN_IF, - 0, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to open Beep driver, Status 0x%08lx\n", Status); - } -} - -VOID SpeakerCleanup(VOID) -{ - NtClose(hBeep); -} - BYTE SpeakerReadStatus(VOID) { - // DPRINT1("SpeakerReadStatus() == 0x%x\n", Port61hState); return Port61hState; } @@ -78,8 +39,6 @@ { BOOLEAN IsConnectedToPITChannel2; UCHAR SpeakerData; - - // DPRINT1("SpeakerWriteCommand(0x%x)\n", Value); Port61hState = Value; IsConnectedToPITChannel2 = ((Port61hState & 0x01) != 0); @@ -162,4 +121,56 @@ } } +BYTE WINAPI SpeakerReadPort(ULONG Port) +{ + return SpeakerReadStatus(); +} + +VOID WINAPI SpeakerWritePort(ULONG Port, BYTE Data) +{ + SpeakerWriteCommand(Data); +} + +VOID SpeakerInitialize(VOID) +{ + NTSTATUS Status; + UNICODE_STRING BeepDevice; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + + /* Adapted from kernel32:Beep() */ + + // + // On TS systems, we need to Load Winsta.dll and call WinstationBeepOpen + // after doing a GetProcAddress for it + // + + /* Open the device */ + RtlInitUnicodeString(&BeepDevice, L"\\Device\\Beep"); + InitializeObjectAttributes(&ObjectAttributes, &BeepDevice, 0, NULL, NULL); + Status = NtCreateFile(&hBeep, + FILE_READ_DATA | FILE_WRITE_DATA, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN_IF, + 0, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open Beep driver, Status 0x%08lx\n", Status); + } + + /* Register the I/O Ports */ + RegisterIoPort(SPEAKER_CONTROL_PORT, SpeakerReadPort, SpeakerWritePort); +} + +VOID SpeakerCleanup(VOID) +{ + NtClose(hBeep); +} + /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -10,6 +10,8 @@ #define NDEBUG +#include "emulator.h" +#include "io.h" #include "timer.h" #include "pic.h" @@ -143,6 +145,41 @@ /* High byte */ PitChannels[Channel].ReloadValue &= 0x00FF; PitChannels[Channel].ReloadValue |= Value << 8; + } + } +} + +static BYTE WINAPI PitReadPort(ULONG Port) +{ + switch (Port) + { + case PIT_DATA_PORT(0): + case PIT_DATA_PORT(1): + case PIT_DATA_PORT(2): + { + return PitReadData(Port - PIT_DATA_PORT(0)); + } + } + + return 0; +} + +static VOID WINAPI PitWritePort(ULONG Port, BYTE Data) +{ + switch (Port) + { + case PIT_COMMAND_PORT: + { + PitWriteCommand(Data); + break; + } + + case PIT_DATA_PORT(0): + case PIT_DATA_PORT(1): + case PIT_DATA_PORT(2): + { + PitWriteData(Port - PIT_DATA_PORT(0), Data); + break; } } } @@ -311,4 +348,15 @@ return PIT_BASE_FREQUENCY / MinReloadValue; } +BOOLEAN PitInitialize(VOID) +{ + /* Register the I/O Ports */ + RegisterIoPort(PIT_COMMAND_PORT, NULL , PitWritePort); + RegisterIoPort(PIT_DATA_PORT(0), PitReadPort, PitWritePort); + RegisterIoPort(PIT_DATA_PORT(1), PitReadPort, PitWritePort); + RegisterIoPort(PIT_DATA_PORT(2), PitReadPort, PitWritePort); + + return TRUE; +} + /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/timer.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/timer.h [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: timer.h - * PURPOSE: Programmable Interval Timer emulation (header file) + * PURPOSE: Programmable Interval Timer emulation * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ @@ -48,10 +48,11 @@ /* FUNCTIONS ******************************************************************/ VOID PitWriteCommand(BYTE Value); -BYTE PitReadData(BYTE Channel); VOID PitWriteData(BYTE Channel, BYTE Value); + VOID PitDecrementCount(DWORD Count); DWORD PitGetResolution(VOID); +BOOLEAN PitInitialize(VOID); #endif // _TIMER_H_ Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -10,7 +10,10 @@ #define NDEBUG +#include "emulator.h" #include "vga.h" + +#include "io.h" #include "bios.h" /* PRIVATE VARIABLES **********************************************************/ @@ -1082,9 +1085,9 @@ } } -BYTE VgaReadPort(WORD Port) -{ - DPRINT("VgaReadPort: Port 0x%04X\n", Port); +BYTE WINAPI VgaReadPort(ULONG Port) +{ + DPRINT("VgaReadPort: Port 0x%08X\n", Port); switch (Port) { @@ -1181,9 +1184,9 @@ return 0; } -VOID VgaWritePort(WORD Port, BYTE Data) -{ - DPRINT("VgaWritePort: Port 0x%04X, Data 0x%02X\n", Port, Data); +VOID WINAPI VgaWritePort(ULONG Port, BYTE Data) +{ + DPRINT("VgaWritePort: Port 0x%08X, Data 0x%02X\n", Port, Data); switch (Port) { @@ -1353,6 +1356,23 @@ Address += ScanlineSize; } + /* Register the I/O Ports */ + RegisterIoPort(VGA_AC_WRITE , VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_AC_READ , VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_SEQ_INDEX, VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_SEQ_DATA , VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_DAC_READ_INDEX , VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_DAC_WRITE_INDEX, VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_DAC_DATA , VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_MISC_READ , VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_MISC_WRITE, VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_CRTC_INDEX, VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_CRTC_DATA , VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_GC_INDEX, VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_GC_DATA , VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_STAT_MONO , VgaReadPort, VgaWritePort); + RegisterIoPort(VGA_STAT_COLOR, VgaReadPort, VgaWritePort); + /* Return success */ return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/vga.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] Tue Nov 26 20:20:51 2013 @@ -199,12 +199,13 @@ VOID VgaHorizontalRetrace(VOID); VOID VgaReadMemory(DWORD Address, LPBYTE Buffer, DWORD Size); VOID VgaWriteMemory(DWORD Address, LPBYTE Buffer, DWORD Size); -BYTE VgaReadPort(WORD Port); -VOID VgaWritePort(WORD Port, BYTE Data); VOID VgaClearMemory(VOID); VOID VgaResetPalette(VOID); BOOLEAN VgaInitialize(HANDLE TextHandle); +BYTE WINAPI VgaReadPort(ULONG Port); +VOID WINAPI VgaWritePort(ULONG Port, BYTE Data); + #endif // _VGA_H_ /* EOF */

1 0

[aandrejevic] 61106: [FAST486] Fix the order of operations.
by aandrejevic＠svn.reactos.org 26 Nov '13

26 Nov '13

Author: aandrejevic Date: Tue Nov 26 18:11:53 2013 New Revision: 61106 URL: http://svn.reactos.org/svn/reactos?rev=61106&view=rev Log: [FAST486] Fix the order of operations. Modified: branches/ntvdm/lib/fast486/common.inl Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Tue Nov 26 18:11:53 2013 @@ -159,7 +159,7 @@ if (Page == PAGE_ALIGN(LinearAddress + Size - 1)) { /* Copy only a part of the page */ - PageLength = PAGE_OFFSET(LinearAddress + Size) - PageOffset; + PageLength = PAGE_OFFSET(LinearAddress) + Size - PageOffset; } /* Read the memory */ @@ -224,7 +224,7 @@ if (Page == PAGE_ALIGN(LinearAddress + Size - 1)) { /* Copy only a part of the page */ - PageLength = PAGE_OFFSET(LinearAddress + Size) - PageOffset; + PageLength = PAGE_OFFSET(LinearAddress) + Size - PageOffset; } /* Write the memory */

1 0

[aandrejevic] 61105: [FAST486] Complete the previous commit with a fix for Fast486WriteLinearMemory too.
by aandrejevic＠svn.reactos.org 26 Nov '13

26 Nov '13

Author: aandrejevic Date: Tue Nov 26 17:56:18 2013 New Revision: 61105 URL: http://svn.reactos.org/svn/reactos?rev=61105&view=rev Log: [FAST486] Complete the previous commit with a fix for Fast486WriteLinearMemory too. Modified: branches/ntvdm/lib/fast486/common.inl Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Tue Nov 26 17:56:18 2013 @@ -224,7 +224,7 @@ if (Page == PAGE_ALIGN(LinearAddress + Size - 1)) { /* Copy only a part of the page */ - PageLength = PAGE_OFFSET(LinearAddress + Size); + PageLength = PAGE_OFFSET(LinearAddress + Size) - PageOffset; } /* Write the memory */

1 0

[aandrejevic] 61104: [FAST486] Handle the case when the last page is also the first page in Fast486ReadLinearMemory ( when paging is enabled).
by aandrejevic＠svn.reactos.org 26 Nov '13

26 Nov '13

Author: aandrejevic Date: Tue Nov 26 17:55:07 2013 New Revision: 61104 URL: http://svn.reactos.org/svn/reactos?rev=61104&view=rev Log: [FAST486] Handle the case when the last page is also the first page in Fast486ReadLinearMemory ( when paging is enabled). Modified: branches/ntvdm/lib/fast486/common.inl Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Tue Nov 26 17:55:07 2013 @@ -159,7 +159,7 @@ if (Page == PAGE_ALIGN(LinearAddress + Size - 1)) { /* Copy only a part of the page */ - PageLength = PAGE_OFFSET(LinearAddress + Size); + PageLength = PAGE_OFFSET(LinearAddress + Size) - PageOffset; } /* Read the memory */

1 0

[ekohl] 61103: [NETAPI32] BuildUserInfoBuffer: Set the UF_PASSWD_CANT_CHANGE account control flag if the user does not have the USER_CHANGE_PASSWORD access right for his own account data.
by ekohl＠svn.reactos.org 26 Nov '13

26 Nov '13

Author: ekohl Date: Tue Nov 26 16:56:33 2013 New Revision: 61103 URL: http://svn.reactos.org/svn/reactos?rev=61103&view=rev Log: [NETAPI32] BuildUserInfoBuffer: Set the UF_PASSWD_CANT_CHANGE account control flag if the user does not have the USER_CHANGE_PASSWORD access right for his own account data. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Tue Nov 26 16:56:33 2013 @@ -66,10 +66,76 @@ static +NTSTATUS +GetAllowedWorldAce(IN PACL Acl, + OUT PACCESS_ALLOWED_ACE *Ace) +{ + SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; + ULONG WorldSid[sizeof(SID) / sizeof(ULONG) + SID_MAX_SUB_AUTHORITIES]; + ACL_SIZE_INFORMATION AclSize; + PVOID LocalAce = NULL; + ULONG i; + NTSTATUS Status; + + *Ace = NULL; + + RtlInitializeSid((PSID)WorldSid, + &WorldAuthority, + 1); + *(RtlSubAuthoritySid((PSID)WorldSid, 0)) = SECURITY_WORLD_RID; + + Status = RtlQueryInformationAcl(Acl, + &AclSize, + sizeof(AclSize), + AclSizeInformation); + if (!NT_SUCCESS(Status)) + return Status; + + for (i = 0; i < AclSize.AceCount; i++) + { + Status = RtlGetAce(Acl, i, &LocalAce); + if (!NT_SUCCESS(Status)) + return Status; + + if (((PACE_HEADER)LocalAce)->AceType != ACCESS_ALLOWED_ACE_TYPE) + continue; + + if (RtlEqualSid((PSID)WorldSid, + (PSID)&((PACCESS_ALLOWED_ACE)LocalAce)->SidStart)) + { + *Ace = (PACCESS_ALLOWED_ACE)LocalAce; + return STATUS_SUCCESS; + } + } + + return STATUS_SUCCESS; +} + + +static ULONG -GetAccountFlags(ULONG AccountControl) +GetAccountFlags(ULONG AccountControl, + PACL Dacl) { + PACCESS_ALLOWED_ACE Ace = NULL; ULONG Flags = UF_SCRIPT; + NTSTATUS Status; + + if (Dacl != NULL) + { + Status = GetAllowedWorldAce(Dacl, &Ace); + if (NT_SUCCESS(Status)) + { + if (Ace == NULL) + { + Flags |= UF_PASSWD_CANT_CHANGE; + } + else if ((Ace->Mask & USER_CHANGE_PASSWORD) == 0) + { + Flags |= UF_PASSWD_CANT_CHANGE; + } + } + } if (AccountControl & USER_ACCOUNT_DISABLED) Flags |= UF_ACCOUNTDISABLE; @@ -79,8 +145,6 @@ if (AccountControl & USER_PASSWORD_NOT_REQUIRED) Flags |= UF_PASSWD_NOTREQD; - -// UF_PASSWD_CANT_CHANGE if (AccountControl & USER_ACCOUNT_AUTO_LOCKED) Flags |= UF_LOCKOUT; @@ -185,6 +249,87 @@ static +NET_API_STATUS +GetUserDacl(IN SAM_HANDLE UserHandle, + OUT PACL *Dacl) +{ + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; + PACL SamDacl; + PACL LocalDacl; + BOOLEAN Defaulted; + BOOLEAN Present; + ACL_SIZE_INFORMATION AclSize; + NET_API_STATUS ApiStatus; + NTSTATUS Status; + + TRACE("(%p %p)\n", UserHandle, Dacl); + + *Dacl = NULL; + + Status = SamQuerySecurityObject(UserHandle, + DACL_SECURITY_INFORMATION, + &SecurityDescriptor); + if (!NT_SUCCESS(Status)) + { + TRACE("SamQuerySecurityObject() failed (Status 0x%08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor, + &Present, + &SamDacl, + &Defaulted); + if (!NT_SUCCESS(Status)) + { + TRACE("RtlGetDaclSecurityDescriptor() failed (Status 0x%08lx)\n", Status); + ApiStatus = NERR_InternalError; + goto done; + } + + if (Present == FALSE) + { + TRACE("No DACL present\n"); + ApiStatus = NERR_Success; + goto done; + } + + Status = RtlQueryInformationAcl(SamDacl, + &AclSize, + sizeof(AclSize), + AclSizeInformation); + if (!NT_SUCCESS(Status)) + { + TRACE("RtlQueryInformationAcl() failed (Status 0x%08lx)\n", Status); + ApiStatus = NERR_InternalError; + goto done; + } + + LocalDacl = HeapAlloc(GetProcessHeap(), 0, AclSize.AclBytesInUse); + if (LocalDacl == NULL) + { + TRACE("Memory allocation failed\n"); + ApiStatus = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + + RtlCopyMemory(LocalDacl, SamDacl, AclSize.AclBytesInUse); + + *Dacl = LocalDacl; + + ApiStatus = NERR_Success; + +done: + if (SecurityDescriptor != NULL) + SamFreeMemory(SecurityDescriptor); + + TRACE("done (ApiStatus: 0x%08lx)\n", ApiStatus); + + return ApiStatus; +} + + +static VOID FreeUserInfo(PUSER_ALL_INFORMATION UserInfo) { @@ -238,6 +383,7 @@ UNICODE_STRING LogonServer = RTL_CONSTANT_STRING(L"\\\\*"); PUSER_ALL_INFORMATION UserInfo = NULL; LPVOID LocalBuffer = NULL; + PACL Dacl = NULL; PUSER_INFO_0 UserInfo0; PUSER_INFO_1 UserInfo1; PUSER_INFO_2 UserInfo2; @@ -264,6 +410,14 @@ goto done; } + if ((level == 1) || (level == 2) || (level == 3) || + (level == 4) || (level == 20) || (level == 23)) + { + ApiStatus = GetUserDacl(UserHandle, &Dacl); + if (ApiStatus != NERR_Success) + goto done; + } + switch (level) { case 0: @@ -531,7 +685,8 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - UserInfo1->usri1_flags = GetAccountFlags(UserInfo->UserAccountControl); + UserInfo1->usri1_flags = GetAccountFlags(UserInfo->UserAccountControl, + Dacl); if (UserInfo->ScriptPath.Length > 0) { @@ -586,7 +741,8 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - UserInfo2->usri2_flags = GetAccountFlags(UserInfo->UserAccountControl); + UserInfo2->usri2_flags = GetAccountFlags(UserInfo->UserAccountControl, + Dacl); if (UserInfo->ScriptPath.Length > 0) { @@ -734,7 +890,8 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - UserInfo3->usri3_flags = GetAccountFlags(UserInfo->UserAccountControl); + UserInfo3->usri3_flags = GetAccountFlags(UserInfo->UserAccountControl, + Dacl); if (UserInfo->ScriptPath.Length > 0) { @@ -911,7 +1068,8 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - UserInfo4->usri4_flags = GetAccountFlags(UserInfo->UserAccountControl); + UserInfo4->usri4_flags = GetAccountFlags(UserInfo->UserAccountControl, + Dacl); if (UserInfo->ScriptPath.Length > 0) { @@ -1267,7 +1425,8 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - UserInfo20->usri20_flags = GetAccountFlags(UserInfo->UserAccountControl); + UserInfo20->usri20_flags = GetAccountFlags(UserInfo->UserAccountControl, + Dacl); UserInfo20->usri20_user_id = RelativeId; break; @@ -1310,7 +1469,8 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - UserInfo23->usri23_flags = GetAccountFlags(UserInfo->UserAccountControl); + UserInfo23->usri23_flags = GetAccountFlags(UserInfo->UserAccountControl, + Dacl); /* FIXME: usri23_user_sid */ break; @@ -1319,6 +1479,9 @@ done: if (UserInfo != NULL) FreeUserInfo(UserInfo); + + if (Dacl != NULL) + HeapFree(GetProcessHeap(), 0, Dacl); if (ApiStatus == NERR_Success) { @@ -2530,7 +2693,7 @@ TRACE("RID: %lu\n", CurrentUser->RelativeId); Status = SamOpenUser(EnumContext->AccountDomainHandle, //BuiltinDomainHandle, - USER_READ_GENERAL | USER_READ_PREFERENCES | USER_READ_LOGON | USER_READ_ACCOUNT, + READ_CONTROL | USER_READ_GENERAL | USER_READ_PREFERENCES | USER_READ_LOGON | USER_READ_ACCOUNT, CurrentUser->RelativeId, &UserHandle); if (!NT_SUCCESS(Status)) @@ -2861,7 +3024,7 @@ /* Open the user object */ Status = SamOpenUser(AccountDomainHandle, - USER_READ_GENERAL | USER_READ_PREFERENCES | USER_READ_LOGON | USER_READ_ACCOUNT, + READ_CONTROL | USER_READ_GENERAL | USER_READ_PREFERENCES | USER_READ_LOGON | USER_READ_ACCOUNT, RelativeIds[0], &UserHandle); if (!NT_SUCCESS(Status))

1 0

[ekohl] 61102: [NTOSKRNL] - Create the Security directory and the LSA_AUTHENTICATION_INITIALIZED event in SepInitializationPhase1(). - Get rid of SeInitSRM().
by ekohl＠svn.reactos.org 26 Nov '13

26 Nov '13

Author: ekohl Date: Tue Nov 26 15:27:48 2013 New Revision: 61102 URL: http://svn.reactos.org/svn/reactos?rev=61102&view=rev Log: [NTOSKRNL] - Create the Security directory and the LSA_AUTHENTICATION_INITIALIZED event in SepInitializationPhase1(). - Get rid of SeInitSRM(). Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=61… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Tue Nov 26 15:27:48 2013 @@ -121,6 +121,10 @@ INIT_FUNCTION SepInitializationPhase1(VOID) { + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + HANDLE SecurityHandle; + HANDLE EventHandle; NTSTATUS Status; PAGED_CODE(); @@ -135,7 +139,42 @@ NULL); ASSERT(NT_SUCCESS(Status)); - /* FIXME: TODO \\ Security directory */ + /* TODO: Create a security desscriptor for the directory */ + + /* Create '\Security' directory */ + RtlInitUnicodeString(&Name, L"\\Security"); + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, + 0, + NULL); + + Status = ZwCreateDirectoryObject(&SecurityHandle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + ASSERT(NT_SUCCESS(Status)); + + /* Create 'LSA_AUTHENTICATION_INITIALIZED' event */ + RtlInitUnicodeString(&Name, L"LSA_AUTHENTICATION_INITIALIZED"); + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, + SecurityHandle, + SePublicDefaultSd); + + Status = ZwCreateEvent(&EventHandle, + GENERIC_WRITE, + &ObjectAttributes, + NotificationEvent, + FALSE); + ASSERT(NT_SUCCESS(Status)); + + Status = ZwClose(EventHandle); + ASSERT(NT_SUCCESS(Status)); + + Status = ZwClose(SecurityHandle); + ASSERT(NT_SUCCESS(Status)); + return TRUE; } @@ -167,60 +206,6 @@ 0); return FALSE; } -} - -BOOLEAN -NTAPI -INIT_FUNCTION -SeInitSRM(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING Name; - HANDLE DirectoryHandle; - HANDLE EventHandle; - NTSTATUS Status; - - /* Create '\Security' directory */ - RtlInitUnicodeString(&Name, L"\\Security"); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_PERMANENT, - 0, - NULL); - Status = ZwCreateDirectoryObject(&DirectoryHandle, - DIRECTORY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create 'Security' directory!\n"); - return FALSE; - } - - /* Create 'LSA_AUTHENTICATION_INITIALIZED' event */ - RtlInitUnicodeString(&Name, L"\\LSA_AUTHENTICATION_INITIALIZED"); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_PERMANENT, - DirectoryHandle, - SePublicDefaultSd); - Status = ZwCreateEvent(&EventHandle, - EVENT_ALL_ACCESS, - &ObjectAttributes, - SynchronizationEvent, - FALSE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create 'LSA_AUTHENTICATION_INITIALIZED' event!\n"); - NtClose(DirectoryHandle); - return FALSE; - } - - ZwClose(EventHandle); - ZwClose(DirectoryHandle); - - /* FIXME: Create SRM port and listener thread */ - - return TRUE; } NTSTATUS

1 0

[tfaber] 61101: [KERNEL32] - Fix wrong check for realtime priority class in CreateProcessInternalW - Fix double free in GetEnvironmentVariable[AW] - Fix broken sizeof usage ('X' is of type int!) - ...
by tfaber＠svn.reactos.org 26 Nov '13

26 Nov '13

Author: tfaber Date: Tue Nov 26 15:09:21 2013 New Revision: 61101 URL: http://svn.reactos.org/svn/reactos?rev=61101&view=rev Log: [KERNEL32] - Fix wrong check for realtime priority class in CreateProcessInternalW - Fix double free in GetEnvironmentVariable[AW] - Fix broken sizeof usage ('X' is of type int!) - Remove redundant casts and comparisons Modified: trunk/reactos/dll/win32/kernel32/client/environ.c trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/environ.c [iso-8859-1] Tue Nov 26 15:09:21 2013 @@ -83,10 +83,10 @@ if ((NT_SUCCESS(Status)) && !(nSize)) Status = STATUS_BUFFER_TOO_SMALL; /* Check if we didn't have enough space */ - if (!(NT_SUCCESS(Status)) && (Status == STATUS_BUFFER_TOO_SMALL)) + if (Status == STATUS_BUFFER_TOO_SMALL) { /* Fixup the length that the API returned */ - VarValueU.MaximumLength = VarValueU.Length + 2; + VarValueU.MaximumLength = VarValueU.Length + sizeof(UNICODE_NULL); /* Free old Unicode buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, VarValueU.Buffer); @@ -108,6 +108,7 @@ { /* Set failure status */ Status = STATUS_NO_MEMORY; + VarValueU.Buffer = NULL; } } else if (NT_SUCCESS(Status)) @@ -373,7 +374,7 @@ WINAPI FreeEnvironmentStringsA(IN LPSTR EnvironmentStrings) { - return (BOOL)RtlFreeHeap(RtlGetProcessHeap(), 0, EnvironmentStrings); + return RtlFreeHeap(RtlGetProcessHeap(), 0, EnvironmentStrings); } /* @@ -383,7 +384,7 @@ WINAPI FreeEnvironmentStringsW(IN LPWSTR EnvironmentStrings) { - return (BOOL)RtlFreeHeap(RtlGetProcessHeap(), 0, EnvironmentStrings); + return RtlFreeHeap(RtlGetProcessHeap(), 0, EnvironmentStrings); } /* @@ -443,7 +444,7 @@ Status = RtlExpandEnvironmentStrings_U(NULL, &SourceU, &DestU, &Length); /* Check if we didn't have enough space */ - if (!(NT_SUCCESS(Status)) && (Status == STATUS_BUFFER_TOO_SMALL)) + if (Status == STATUS_BUFFER_TOO_SMALL) { /* Fixup the length that the API returned */ DestU.MaximumLength = (SHORT)Length; @@ -468,6 +469,7 @@ { /* Set failure status */ Status = STATUS_NO_MEMORY; + DestU.Buffer = NULL; } } else if (NT_SUCCESS(Status)) @@ -518,8 +520,7 @@ NTSTATUS Status; USHORT UniSize; - UniSize = UNICODE_STRING_MAX_CHARS - 2; - if (nSize <= UniSize) UniSize = (USHORT)nSize; + UniSize = min(nSize, UNICODE_STRING_MAX_CHARS - 2); RtlInitUnicodeString(&Source, (LPWSTR)lpSrc); RtlInitEmptyUnicodeString(&Destination, lpDst, UniSize * sizeof(WCHAR)); Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Tue Nov 26 15:09:21 2013 @@ -3762,7 +3762,7 @@ } /* Account for the quotes and space between the two */ - n += ((sizeof('""') * 2) + sizeof(' ')); + n += sizeof("\" \"") - sizeof(ANSI_NULL); /* Convert to bytes, and make sure we don't overflow */ n *= sizeof(WCHAR); @@ -3923,7 +3923,7 @@ RealTimePrivilegeState = NULL; /* Is realtime priority being requested? */ - if (PriorityClass.PriorityClass == REALTIME_PRIORITY_CLASS) + if (PriorityClass.PriorityClass == PROCESS_PRIORITY_CLASS_REALTIME) { /* Check if the caller has real-time access, and enable it if so */ RealTimePrivilegeState = BasepIsRealtimeAllowed(TRUE);

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