Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 57231: [NTOSKRNL] - Print a warning in several cases where a wait may fail in an unexpected way
by cgutman＠svn.reactos.org 03 Sep '12

03 Sep '12

Author: cgutman Date: Mon Sep 3 22:19:05 2012 New Revision: 57231 URL: http://svn.reactos.org/svn/reactos?rev=57231&view=rev Log: [NTOSKRNL] - Print a warning in several cases where a wait may fail in an unexpected way Modified: trunk/reactos/ntoskrnl/ob/obwait.c Modified: trunk/reactos/ntoskrnl/ob/obwait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] Mon Sep 3 22:19:05 2012 @@ -165,6 +165,7 @@ { /* Fail, handle is invalid */ Status = STATUS_INVALID_HANDLE; + DPRINT1("Invalid handle passed to NtWaitForMultipleObjects\n"); goto Quickie; } @@ -174,6 +175,7 @@ { /* Unlock the entry and fail */ ExUnlockHandleTableEntry(HandleTable, HandleEntry); + DPRINT1("Handle does not have SYNCHRONIZE access\n"); Status = STATUS_ACCESS_DENIED; goto Quickie; } @@ -228,6 +230,7 @@ { /* Fail */ Status = STATUS_INVALID_PARAMETER_MIX; + DPRINT1("Passed a duplicate object to NtWaitForMultipleObjects\n"); goto Quickie; } } @@ -417,6 +420,10 @@ /* Dereference the Object */ ObDereferenceObject(Object); } + else + { + DPRINT1("Failed to reference the handle with status 0x%x\n", Status); + } /* Return the status */ return Status;

1 0

[cgutman] 57230: [MSAFD] - Fix access rights on socket events
by cgutman＠svn.reactos.org 03 Sep '12

03 Sep '12

Author: cgutman Date: Mon Sep 3 22:00:16 2012 New Revision: 57230 URL: http://svn.reactos.org/svn/reactos?rev=57230&view=rev Log: [MSAFD] - Fix access rights on socket events Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/event.c trunk/reactos/dll/win32/msafd/misc/sndrcv.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Sep 3 22:00:16 2012 @@ -409,7 +409,7 @@ /* Create the Wait Event */ Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -615,7 +615,7 @@ } Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -737,7 +737,7 @@ return 0; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -863,7 +863,7 @@ } Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -1062,7 +1062,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -1447,7 +1447,7 @@ int SocketDataLength; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -1682,7 +1682,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -1764,7 +1764,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -1867,7 +1867,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -2443,7 +2443,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -2510,7 +2510,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); @@ -2592,7 +2592,7 @@ HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); Modified: trunk/reactos/dll/win32/msafd/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/event… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] Mon Sep 3 22:00:16 2012 @@ -27,7 +27,7 @@ BOOLEAN BlockMode; HANDLE SockEvent; - Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, + Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, NULL, 1, FALSE ); if( !NT_SUCCESS(Status) ) return -1; @@ -146,7 +146,7 @@ AFD_DbgPrint(MID_TRACE,("Called (lpNetworkEvents %x)\n", lpNetworkEvents)); - Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, + Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, NULL, 1, FALSE ); if( !NT_SUCCESS(Status) ) { Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Mon Sep 3 22:00:16 2012 @@ -123,7 +123,7 @@ return SOCKET_ERROR; } - Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, + Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, NULL, 1, FALSE ); if( !NT_SUCCESS(Status) ) @@ -292,7 +292,7 @@ lpErrno); } - Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, + Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, NULL, 1, FALSE ); if( !NT_SUCCESS(Status) ) @@ -442,7 +442,7 @@ return SOCKET_ERROR; } - Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, + Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, NULL, 1, FALSE ); if( !NT_SUCCESS(Status) ) @@ -616,7 +616,7 @@ } Status = NtCreateEvent(&SockEvent, - GENERIC_READ | GENERIC_WRITE, + EVENT_ALL_ACCESS, NULL, 1, FALSE); if (!NT_SUCCESS(Status))

1 0

[ion] 57229: [NTOSKRNL]: Fix a stupid bug in MiProtectVirtualMemory which was causing empty PTEs whose protection was being set to remain zero PTEs, instead of demand-zero PTEs, but still acquire a...
by ion＠svn.reactos.org 03 Sep '12

03 Sep '12

Author: ion Date: Mon Sep 3 16:29:31 2012 New Revision: 57229 URL: http://svn.reactos.org/svn/reactos?rev=57229&view=rev Log: [NTOSKRNL]: Fix a stupid bug in MiProtectVirtualMemory which was causing empty PTEs whose protection was being set to remain zero PTEs, instead of demand-zero PTEs, but still acquire a page table reference. When they were later touched in the page fault code, and made into demand-zero PTEs, they'd get referenced again, thus Aleksey hacked away all the referencing code to work around this (causing PDEs to disappear...) [NTOSKRNL]: Restore the page table reference counting mechanism, and put it in a macro to be cleaner. Also use macros for testing PD boundaries, instead of math-by-hand. 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 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] Mon Sep 3 16:29:31 2012 @@ -1619,6 +1619,41 @@ } } +FORCEINLINE +VOID +MiIncrementPageTableReferences(IN PVOID Address) +{ + PUSHORT RefCount; + + RefCount = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]; + + *RefCount += 1; + ASSERT(*RefCount <= PTE_PER_PAGE); +} + +FORCEINLINE +VOID +MiDecrementPageTableReferences(IN PVOID Address) +{ + PUSHORT RefCount; + + RefCount = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]; + + *RefCount -= 1; + ASSERT(*RefCount < PTE_PER_PAGE); +} + +FORCEINLINE +USHORT +MiQueryPageTableReferences(IN PVOID Address) +{ + PUSHORT RefCount; + + RefCount = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]; + + return *RefCount; +} + BOOLEAN NTAPI MmArmInitSystem( 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] Mon Sep 3 16:29:31 2012 @@ -1684,8 +1684,7 @@ if (Address <= MM_HIGHEST_USER_ADDRESS) { /* Add an additional page table reference */ - MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + MiIncrementPageTableReferences(Address); } /* Did we get a prototype PTE back? */ 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] Mon Sep 3 16:29:31 2012 @@ -1821,7 +1821,6 @@ PMMPDE PointerPde; PMMPFN Pfn1; ULONG ProtectionMask, QuotaCharge = 0; - PUSHORT UsedPageTableEntries; PETHREAD Thread = PsGetCurrentThread(); PAGED_CODE(); @@ -1914,9 +1913,7 @@ // This used to be a zero PTE and it no longer is, so we must add a // reference to the pagetable. // - UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(MiPteToAddress(PointerPte))]; - (*UsedPageTableEntries)++; - ASSERT((*UsedPageTableEntries) <= PTE_COUNT); + MiIncrementPageTableReferences(MiPteToAddress(PointerPte)); // // Create the demand-zero prototype PTE 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] Mon Sep 3 16:29:31 2012 @@ -589,10 +589,8 @@ TempPte = *PointerPte; if (TempPte.u.Long) { - DPRINT("Decrement used PTEs by address: %lx\n", Va); - (*UsedPageTableEntries)--; + *UsedPageTableEntries -= 1; ASSERT((*UsedPageTableEntries) < PTE_COUNT); - DPRINT("Refs: %lx\n", (*UsedPageTableEntries)); /* Check if the PTE is actually mapped in */ if (TempPte.u.Long & 0xFFFFFC01) @@ -653,14 +651,10 @@ /* The PDE should still be valid at this point */ ASSERT(PointerPde->u.Hard.Valid == 1); - DPRINT("Should check if handles for: %p are zero (PDE: %lx)\n", Va, PointerPde->u.Hard.PageFrameNumber); - if (!(*UsedPageTableEntries)) - { - DPRINT("They are!\n"); + if (*UsedPageTableEntries == 0) + { if (PointerPde->u.Long != 0) { - DPRINT("PDE active: %lx in %16s\n", PointerPde->u.Hard.PageFrameNumber, CurrentProcess->ImageFileName); - /* Delete the PTE proper */ MiDeletePte(PointerPde, MiPteToAddress(PointerPde), @@ -1880,7 +1874,6 @@ ULONG_PTR StartingAddress, EndingAddress; PMMPTE PointerPde, PointerPte, LastPte; MMPTE PteContents; - //PUSHORT UsedPageTableEntries; PMMPFN Pfn1; ULONG ProtectionMask, OldProtect; BOOLEAN Committed; @@ -2050,24 +2043,23 @@ while (PointerPte <= LastPte) { /* Check if we've crossed a PDE boundary and make the new PDE valid too */ - if ((((ULONG_PTR)PointerPte) & (SYSTEM_PD_SIZE - 1)) == 0) + if (MiIsPteOnPdeBoundary(PointerPte)) { PointerPde = MiAddressToPte(PointerPte); MiMakePdeExistAndMakeValid(PointerPde, Process, MM_NOIRQL); } - /* Capture the PTE and see what we're dealing with */ + /* Capture the PTE and check if it was empty */ PteContents = *PointerPte; if (PteContents.u.Long == 0) { /* This used to be a zero PTE and it no longer is, so we must add a reference to the pagetable. */ - //UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(MiPteToAddress(PointerPte))]; - //(*UsedPageTableEntries)++; - //ASSERT((*UsedPageTableEntries) <= PTE_COUNT); - DPRINT1("HACK: Not increasing UsedPageTableEntries count!\n"); - } - else if (PteContents.u.Hard.Valid == 1) + MiIncrementPageTableReferences(MiPteToAddress(PointerPte)); + } + + /* Check what kind of PTE we are dealing with */ + if (PteContents.u.Hard.Valid == 1) { /* Get the PFN entry */ Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(&PteContents)); @@ -2080,8 +2072,11 @@ (NewAccessProtection & PAGE_GUARD)) { /* The page should be in the WS and we should make it transition now */ - UNIMPLEMENTED; - //continue; + DPRINT1("Making valid page invalid is not yet supported!\n"); + Status = STATUS_NOT_IMPLEMENTED; + /* Unlock the working set */ + MiUnlockProcessWorkingSetUnsafe(Process, Thread); + goto FailPath; } /* Write the protection mask and write it with a TLB flush */ @@ -2270,7 +2265,6 @@ ULONG PteCount = 0; PMMPFN Pfn1; MMPTE PteContents; - PUSHORT UsedPageTableEntries; PETHREAD CurrentThread = PsGetCurrentThread(); // @@ -2292,7 +2286,7 @@ // // Check if we've crossed a PDE boundary // - if ((((ULONG_PTR)PointerPte) & (SYSTEM_PD_SIZE - 1)) == 0) + if (MiIsPteOnPdeBoundary(PointerPte)) { // // Get the new PDE and flush the valid PTEs we had built up until @@ -2383,9 +2377,7 @@ // This used to be a zero PTE and it no longer is, so we must add a // reference to the pagetable. // - UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(StartingAddress)]; - (*UsedPageTableEntries)++; - ASSERT((*UsedPageTableEntries) <= PTE_COUNT); + MiIncrementPageTableReferences(StartingAddress); // // Next, we account for decommitted PTEs and make the PTE as such @@ -3648,7 +3640,6 @@ PMEMORY_AREA MemoryArea; PFN_NUMBER PageCount; PMMVAD Vad, FoundVad; - PUSHORT UsedPageTableEntries; NTSTATUS Status; PMMSUPPORT AddressSpace; PVOID PBaseAddress; @@ -4268,7 +4259,7 @@ // // Have we crossed into a new page table? // - if (!(((ULONG_PTR)PointerPte) & (SYSTEM_PD_SIZE - 1))) + if (MiIsPteOnPdeBoundary(PointerPte)) { // // Get the PDE and now make it valid too @@ -4286,9 +4277,7 @@ // First increment the count of pages in the page table for this // process // - UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(MiPteToAddress(PointerPte))]; - (*UsedPageTableEntries)++; - ASSERT((*UsedPageTableEntries) <= PTE_COUNT); + MiIncrementPageTableReferences(MiPteToAddress(PointerPte)); // // And now write the invalid demand-zero PTE as requested

1 0

[ion] 57228: [NTOSKRNL]: Implement correct locking and unlocking of the working set, one of the biggest blunders in ARM3 so far. [NTOSKRNL]: Implement MiDereferenceControlArea to avoid leaking CAs ...
by ion＠svn.reactos.org 03 Sep '12

03 Sep '12

Author: ion Date: Mon Sep 3 06:23:31 2012 New Revision: 57228 URL: http://svn.reactos.org/svn/reactos?rev=57228&view=rev Log: [NTOSKRNL]: Implement correct locking and unlocking of the working set, one of the biggest blunders in ARM3 so far. [NTOSKRNL]: Implement MiDereferenceControlArea to avoid leaking CAs in failure cases. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c 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] Mon Sep 3 06:23:31 2012 @@ -1718,17 +1718,13 @@ MmLockAddressSpace(PMMSUPPORT AddressSpace) { KeAcquireGuardedMutex(&CONTAINING_RECORD(AddressSpace, EPROCESS, Vm)->AddressCreationLock); - //ASSERT(Thread->OwnsProcessAddressSpaceExclusive == 0); - //Thread->OwnsProcessAddressSpaceExclusive = TRUE; } FORCEINLINE VOID MmUnlockAddressSpace(PMMSUPPORT AddressSpace) { - //ASSERT(Thread->OwnsProcessAddressSpaceExclusive == 1); KeReleaseGuardedMutex(&CONTAINING_RECORD(AddressSpace, EPROCESS, Vm)->AddressCreationLock); - //Thread->OwnsProcessAddressSpaceExclusive = 0; } FORCEINLINE 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] Mon Sep 3 06:23:31 2012 @@ -1041,6 +1041,14 @@ MI_WS_OWNER(IN PEPROCESS Process) { /* Check if this process is the owner, and that the thread owns the WS */ + if (PsGetCurrentThread()->OwnsProcessWorkingSetExclusive == 0) + { + DPRINT1("Thread: %p is not an owner\n", PsGetCurrentThread()); + } + if (KeGetCurrentThread()->ApcState.Process != &Process->Pcb) + { + DPRINT1("Current thread %p is attached to another process %p\n", PsGetCurrentThread(), Process); + } return ((KeGetCurrentThread()->ApcState.Process == &Process->Pcb) && ((PsGetCurrentThread()->OwnsProcessWorkingSetExclusive) || (PsGetCurrentThread()->OwnsProcessWorkingSetShared))); @@ -1083,6 +1091,13 @@ IN PFN_NUMBER PageFrameIndex ); +FORCEINLINE +BOOLEAN +MI_IS_WS_UNSAFE(IN PEPROCESS Process) +{ + return (Process->Vm.Flags.AcquiredUnsafe == TRUE); +} + // // Locks the working set for the given process // @@ -1099,12 +1114,57 @@ KeEnterGuardedRegion(); ASSERT(!MM_ANY_WS_LOCK_HELD(Thread)); - /* FIXME: Actually lock it (we can't because Vm is used by MAREAs) */ - - /* FIXME: This also can't be checked because Vm is used by MAREAs) */ - //ASSERT(Process->Vm.Flags.AcquiredUnsafe == 0); - - /* Okay, now we can own it exclusively */ + /* Lock the working set */ + ExAcquirePushLockExclusive(&Process->Vm.WorkingSetMutex); + + /* Now claim that we own the lock */ + ASSERT(!MI_IS_WS_UNSAFE(Process)); + ASSERT(Thread->OwnsProcessWorkingSetExclusive == FALSE); + Thread->OwnsProcessWorkingSetExclusive = TRUE; +} + +FORCEINLINE +VOID +MiLockProcessWorkingSetShared(IN PEPROCESS Process, + IN PETHREAD Thread) +{ + /* Shouldn't already be owning the process working set */ + ASSERT(Thread->OwnsProcessWorkingSetShared == FALSE); + ASSERT(Thread->OwnsProcessWorkingSetExclusive == FALSE); + + /* Block APCs, make sure that still nothing is already held */ + KeEnterGuardedRegion(); + ASSERT(!MM_ANY_WS_LOCK_HELD(Thread)); + + /* Lock the working set */ + ExAcquirePushLockShared(&Process->Vm.WorkingSetMutex); + + /* Now claim that we own the lock */ + ASSERT(!MI_IS_WS_UNSAFE(Process)); + ASSERT(Thread->OwnsProcessWorkingSetShared == FALSE); + ASSERT(Thread->OwnsProcessWorkingSetExclusive == FALSE); + Thread->OwnsProcessWorkingSetShared = TRUE; +} + +FORCEINLINE +VOID +MiLockProcessWorkingSetUnsafe(IN PEPROCESS Process, + IN PETHREAD Thread) +{ + /* Shouldn't already be owning the process working set */ + ASSERT(Thread->OwnsProcessWorkingSetExclusive == FALSE); + + /* APCs must be blocked, make sure that still nothing is already held */ + ASSERT(KeAreAllApcsDisabled() == TRUE); + ASSERT(!MM_ANY_WS_LOCK_HELD(Thread)); + + /* Lock the working set */ + ExAcquirePushLockExclusive(&Process->Vm.WorkingSetMutex); + + /* Now claim that we own the lock */ + ASSERT(!MI_IS_WS_UNSAFE(Process)); + Process->Vm.Flags.AcquiredUnsafe = 1; + ASSERT(Thread->OwnsProcessWorkingSetExclusive == FALSE); Thread->OwnsProcessWorkingSetExclusive = TRUE; } @@ -1116,19 +1176,43 @@ MiUnlockProcessWorkingSet(IN PEPROCESS Process, IN PETHREAD Thread) { - /* Make sure this process really is owner, and it was a safe acquisition */ + /* Make sure we are the owner of a safe acquisition */ ASSERT(MI_WS_OWNER(Process)); - /* This can't be checked because Vm is used by MAREAs) */ - //ASSERT(Process->Vm.Flags.AcquiredUnsafe == 0); + ASSERT(!MI_IS_WS_UNSAFE(Process)); /* The thread doesn't own it anymore */ ASSERT(Thread->OwnsProcessWorkingSetExclusive == TRUE); Thread->OwnsProcessWorkingSetExclusive = FALSE; - /* FIXME: Actually release it (we can't because Vm is used by MAREAs) */ - - /* Unblock APCs */ + /* Release the lock and re-enable APCs */ + ExReleasePushLockExclusive(&Process->Vm.WorkingSetMutex); KeLeaveGuardedRegion(); +} + +// +// Unlocks the working set for the given process +// +FORCEINLINE +VOID +MiUnlockProcessWorkingSetUnsafe(IN PEPROCESS Process, + IN PETHREAD Thread) +{ + /* Make sure we are the owner of an unsafe acquisition */ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled() == TRUE); + ASSERT(MI_WS_OWNER(Process)); + ASSERT(MI_IS_WS_UNSAFE(Process)); + + /* No longer unsafe */ + Process->Vm.Flags.AcquiredUnsafe = 0; + + /* The thread doesn't own it anymore */ + ASSERT(Thread->OwnsProcessWorkingSetExclusive == TRUE); + Thread->OwnsProcessWorkingSetExclusive = FALSE; + + /* Release the lock but don't touch APC state */ + ExReleasePushLockExclusive(&Process->Vm.WorkingSetMutex); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); } // @@ -1148,7 +1232,8 @@ /* Thread shouldn't already be owning something */ ASSERT(!MM_ANY_WS_LOCK_HELD(Thread)); - /* FIXME: Actually lock it (we can't because Vm is used by MAREAs) */ + /* Lock this working set */ + ExAcquirePushLockExclusive(&WorkingSet->WorkingSetMutex); /* Which working set is this? */ if (WorkingSet == &MmSystemCacheWs) @@ -1208,10 +1293,66 @@ Thread->OwnsProcessWorkingSetExclusive = FALSE; } - /* FIXME: Actually release it (we can't because Vm is used by MAREAs) */ + /* Release the working set lock */ + ExReleasePushLockExclusive(&WorkingSet->WorkingSetMutex); /* Unblock APCs */ KeLeaveGuardedRegion(); +} + +FORCEINLINE +VOID +MiUnlockProcessWorkingSetForFault(IN PEPROCESS Process, + IN PETHREAD Thread, + IN BOOLEAN Safe, + IN BOOLEAN Shared) +{ + ASSERT(MI_WS_OWNER(Process)); + + /* Check if the current owner is unsafe */ + if (MI_IS_WS_UNSAFE(Process)) + { + /* Release unsafely */ + MiUnlockProcessWorkingSetUnsafe(Process, Thread); + Safe = FALSE; + Shared = FALSE; + } + else if (Thread->OwnsProcessWorkingSetExclusive == 1) + { + /* Owner is safe and exclusive, release normally */ + MiUnlockProcessWorkingSet(Process, Thread); + Safe = TRUE; + Shared = FALSE; + } + else + { + /* Owner is shared (implies safe), release normally */ + ASSERT(FALSE); + Safe = TRUE; + Shared = TRUE; + } +} + +FORCEINLINE +VOID +MiLockProcessWorkingSetForFault(IN PEPROCESS Process, + IN PETHREAD Thread, + IN BOOLEAN Safe, + IN BOOLEAN Shared) +{ + ASSERT(Shared == FALSE); + + /* Check if this was a safe lock or not */ + if (Safe) + { + /* Reacquire safely */ + MiLockProcessWorkingSet(Process, Thread); + } + else + { + /* Reacquire unsafely */ + MiLockProcessWorkingSetUnsafe(Process, Thread); + } } // 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] Mon Sep 3 06:23:31 2012 @@ -135,7 +135,7 @@ Status = STATUS_SUCCESS; /* Pretend as if we own the working set */ - MiLockProcessWorkingSet(Process, Thread); + MiLockProcessWorkingSetUnsafe(Process, Thread); /* Insert the VAD */ ASSERT(Vad->EndingVpn >= Vad->StartingVpn); @@ -147,7 +147,7 @@ MiInsertNode(&Process->VadRoot, (PVOID)Vad, Parent, Result); /* Release the working set */ - MiUnlockProcessWorkingSet(Process, Thread); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); /* Release the address space lock */ KeReleaseGuardedMutex(&Process->AddressCreationLock); @@ -195,7 +195,7 @@ ASSERT(Vad->u2.VadFlags2.MultipleSecured == FALSE); /* Lock the working set */ - MiLockProcessWorkingSet(Process, Thread); + MiLockProcessWorkingSetUnsafe(Process, Thread); /* Remove this VAD from the tree */ ASSERT(VadTree->NumberGenericTableElements >= 1); @@ -205,7 +205,7 @@ MiDeleteVirtualAddresses((ULONG_PTR)Teb, TebEnd, NULL); /* Release the working set */ - MiUnlockProcessWorkingSet(Process, Thread); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); /* Remove the VAD */ ExFreePool(Vad); @@ -1338,9 +1338,11 @@ /* Lock the process address space from changes */ MmLockAddressSpace(&Process->Vm); + MiLockProcessWorkingSetUnsafe(Process, Thread); /* VM is deleted now */ Process->VmDeleted = TRUE; + MiUnlockProcessWorkingSetUnsafe(Process, Thread); /* Enumerate the VADs */ VadTree = &Process->VadRoot; @@ -1350,7 +1352,7 @@ Vad = (PMMVAD)VadTree->BalancedRoot.RightChild; /* Lock the working set */ - MiLockProcessWorkingSet(Process, Thread); + MiLockProcessWorkingSetUnsafe(Process, Thread); /* Remove this VAD from the tree */ ASSERT(VadTree->NumberGenericTableElements >= 1); @@ -1373,7 +1375,7 @@ Vad); /* Release the working set */ - MiUnlockProcessWorkingSet(Process, Thread); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); } /* Skip ARM3 fake VADs, they'll be freed by MmDeleteProcessAddresSpace */ @@ -1388,8 +1390,16 @@ ExFreePool(Vad); } + /* Lock the working set */ + MiLockProcessWorkingSetUnsafe(Process, Thread); + ASSERT(Process->CloneRoot == NULL); + ASSERT(Process->PhysicalVadRoot == NULL); + /* Delete the shared user data section */ MiDeleteVirtualAddresses(USER_SHARED_DATA, USER_SHARED_DATA, NULL); + + /* Release the working set */ + MiUnlockProcessWorkingSetUnsafe(Process, Thread); /* Release the address space */ MmUnlockAddressSpace(&Process->Vm); 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] Mon Sep 3 06:23:31 2012 @@ -84,22 +84,22 @@ ULONG MmCompatibleProtectionMask[8] = { PAGE_NOACCESS, - + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY, - + PAGE_NOACCESS | PAGE_EXECUTE, - + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_EXECUTE | PAGE_EXECUTE_READ, - + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_READWRITE, - + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY, - + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_READWRITE | PAGE_EXECUTE | PAGE_EXECUTE_READ | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY, - + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_EXECUTE | PAGE_EXECUTE_READ | PAGE_EXECUTE_WRITECOPY }; @@ -713,11 +713,29 @@ VOID NTAPI +MiDereferenceControlArea(IN PCONTROL_AREA ControlArea) +{ + KIRQL OldIrql; + + /* Lock the PFN database */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Drop reference counts */ + ControlArea->NumberOfMappedViews--; + ControlArea->NumberOfUserReferences--; + + /* Check if it's time to delete the CA. This releases the lock */ + MiCheckControlArea(ControlArea, OldIrql); +} + +VOID +NTAPI MiRemoveMappedView(IN PEPROCESS CurrentProcess, IN PMMVAD Vad) { KIRQL OldIrql; PCONTROL_AREA ControlArea; + PETHREAD CurrentThread = PsGetCurrentThread(); /* Get the control area */ ControlArea = Vad->ControlArea; @@ -734,7 +752,7 @@ Vad); /* Release the working set */ - MiUnlockProcessWorkingSet(CurrentProcess, PsGetCurrentThread()); + MiUnlockProcessWorkingSetUnsafe(CurrentProcess, CurrentThread); /* Lock the PFN database */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); @@ -760,6 +778,8 @@ PVOID DbgBase = NULL; SIZE_T RegionSize; NTSTATUS Status; + PETHREAD CurrentThread = PsGetCurrentThread(); + PEPROCESS CurrentProcess = PsGetCurrentProcess(); PAGED_CODE(); /* Check for Mm Region */ @@ -771,7 +791,7 @@ } /* Check if we should attach to the process */ - if (PsGetCurrentProcess() != Process) + if (CurrentProcess != Process) { /* The process is different, do an attach */ KeStackAttachProcess(&Process->Pcb, &ApcState); @@ -837,13 +857,13 @@ /* FIXME: Remove VAD charges */ /* Lock the working set */ - MiLockWorkingSet(PsGetCurrentThread(), &Process->Vm); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); /* Remove the VAD */ ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); - /* Remove the PTEs for this view */ + /* Remove the PTEs for this view, which also releases the working set lock */ MiRemoveMappedView(Process, Vad); /* FIXME: Remove commitment */ @@ -1205,7 +1225,8 @@ &Process->VadRoot)) { DPRINT1("Conflict with SEC_BASED or manually based section!\n"); - return STATUS_CONFLICTING_ADDRESSES; // FIXME: CA Leak + MiDereferenceControlArea(ControlArea); + return STATUS_CONFLICTING_ADDRESSES; } } @@ -1213,7 +1234,11 @@ /* FIXME: we are allocating a LONG VAD for ReactOS compatibility only */ ASSERT((AllocationType & MEM_RESERVE) == 0); /* ARM3 does not support this */ Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD_LONG), 'ldaV'); - if (!Vad) return STATUS_INSUFFICIENT_RESOURCES; /* FIXME: CA Leak */ + if (!Vad) + { + MiDereferenceControlArea(ControlArea); + return STATUS_INSUFFICIENT_RESOURCES; + } RtlZeroMemory(Vad, sizeof(MMVAD_LONG)); Vad->u4.Banked = (PVOID)0xDEADBABE; @@ -1244,13 +1269,13 @@ Status = STATUS_SUCCESS; /* Pretend as if we own the working set */ - MiLockProcessWorkingSet(Process, Thread); + MiLockProcessWorkingSetUnsafe(Process, Thread); /* Insert the VAD */ MiInsertVad((PMMVAD)Vad, Process); /* Release the working set */ - MiUnlockProcessWorkingSet(Process, Thread); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); /* Windows stores this for accounting purposes, do so as well */ if (!Segment->u2.FirstMappedVa) Segment->u2.FirstMappedVa = (PVOID)StartAddress; @@ -1797,7 +1822,7 @@ PMMPFN Pfn1; ULONG ProtectionMask, QuotaCharge = 0; PUSHORT UsedPageTableEntries; - //PETHREAD Thread = PsGetCurrentThread(); + PETHREAD Thread = PsGetCurrentThread(); PAGED_CODE(); // @@ -1829,7 +1854,7 @@ // // Get the PTE and PDE for the address, as well as the final PTE // - //MiLockProcessWorkingSet(Thread, Process); + MiLockProcessWorkingSetUnsafe(Process, Thread); PointerPde = MiAddressToPde(StartingAddress); PointerPte = MiAddressToPte(StartingAddress); LastPte = MiAddressToPte(EndingAddress); @@ -1943,7 +1968,7 @@ // // Unlock the working set and update quota charges if needed, then return // - //MiUnlockProcessWorkingSet(Thread, Process); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); if ((QuotaCharge > 0) && (!DontCharge)) { FoundVad->u.VadFlags.CommitCharge -= QuotaCharge; 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] Mon Sep 3 06:23:31 2012 @@ -205,7 +205,7 @@ IN PEPROCESS CurrentProcess) { NTSTATUS Status; - BOOLEAN WsWasLocked = FALSE, LockChange = FALSE; + BOOLEAN WsShared = FALSE, WsSafe = FALSE, LockChange = FALSE; PETHREAD CurrentThread = PsGetCurrentThread(); /* Must be a non-pool page table, since those are double-mapped already */ @@ -219,13 +219,11 @@ /* Check if the page table is valid */ while (!MmIsAddressValid(PageTableVirtualAddress)) { - /* Check if the WS is locked */ - if (CurrentThread->OwnsProcessWorkingSetExclusive) - { - /* Unlock the working set and remember it was locked */ - MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); - WsWasLocked = TRUE; - } + /* Release the working set lock */ + MiUnlockProcessWorkingSetForFault(CurrentProcess, + CurrentThread, + WsSafe, + WsShared); /* Fault it in */ Status = MmAccessFault(FALSE, PageTableVirtualAddress, KernelMode, NULL); @@ -240,7 +238,10 @@ } /* Lock the working set again */ - if (WsWasLocked) MiLockProcessWorkingSet(CurrentProcess, CurrentThread); + MiLockProcessWorkingSetForFault(CurrentProcess, + CurrentThread, + WsSafe, + WsShared); /* This flag will be useful later when we do better locking */ LockChange = TRUE; @@ -1884,8 +1885,9 @@ ULONG ProtectionMask, OldProtect; BOOLEAN Committed; NTSTATUS Status = STATUS_SUCCESS; - - /* Calcualte base address for the VAD */ + PETHREAD Thread = PsGetCurrentThread(); + + /* Calculate base address for the VAD */ StartingAddress = (ULONG_PTR)PAGE_ALIGN((*BaseAddress)); EndingAddress = (((ULONG_PTR)*BaseAddress + *NumberOfBytesToProtect - 1) | (PAGE_SIZE - 1)); @@ -1896,7 +1898,7 @@ DPRINT1("Invalid protection mask\n"); return STATUS_INVALID_PAGE_PROTECTION; } - + /* Check for ROS specific memory area */ MemoryArea = MmLocateMemoryAreaByAddress(&Process->Vm, *BaseAddress); if ((MemoryArea) && (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)) @@ -2006,7 +2008,8 @@ goto FailPath; } - //MiLockProcessWorkingSet(Thread, Process); + /* Lock the working set */ + MiLockProcessWorkingSetUnsafe(Process, Thread); /* Check if all pages in this range are committed */ Committed = MiIsEntireRangeCommitted(StartingAddress, @@ -2018,7 +2021,7 @@ /* Fail */ DPRINT1("The entire range is not committed\n"); Status = STATUS_NOT_COMMITTED; - //MiUnlockProcessWorkingSet(Thread, Process); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); goto FailPath; } @@ -2105,7 +2108,7 @@ } /* Unlock the working set */ - //MiUnlockProcessWorkingSet(Thread, Process); + MiUnlockProcessWorkingSetUnsafe(Process, Thread); } /* Unlock the address space */ @@ -2278,7 +2281,7 @@ PointerPde = MiAddressToPde(StartingAddress); PointerPte = MiAddressToPte(StartingAddress); if (Vad->u.VadFlags.MemCommit) CommitPte = MiAddressToPte(Vad->EndingVpn << PAGE_SHIFT); - MiLockWorkingSet(CurrentThread, &Process->Vm); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); // // Make the PDE valid, and now loop through each page's worth of data @@ -2403,7 +2406,7 @@ // release the working set and return the commit reduction accounting. // if (PteCount) MiProcessValidPteList(ValidPteList, PteCount); - MiUnlockWorkingSet(CurrentThread, &Process->Vm); + MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); return CommitReduction; } @@ -3992,10 +3995,10 @@ // // Lock the working set and insert the VAD into the process VAD tree // - MiLockProcessWorkingSet(Process, CurrentThread); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); Vad->ControlArea = NULL; // For Memory-Area hack MiInsertVad(Vad, Process); - MiUnlockProcessWorkingSet(Process, CurrentThread); + MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); // // Update the virtual size of the process, and if this is now the highest @@ -4254,7 +4257,7 @@ // // Lock the working set while we play with user pages and page tables // - //MiLockWorkingSet(CurrentThread, AddressSpace); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); // // Make the current page table valid, and then loop each page within it @@ -4335,7 +4338,7 @@ // the target process if it was not the current process. Also dereference the // target process if this wasn't the case. // - //MiUnlockProcessWorkingSet(Process, CurrentThread); + MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); Status = STATUS_SUCCESS; FailPath: MmUnlockAddressSpace(AddressSpace); @@ -4584,7 +4587,7 @@ // // Finally lock the working set and remove the VAD from the VAD tree // - MiLockWorkingSet(CurrentThread, AddressSpace); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); } @@ -4614,7 +4617,7 @@ // the code path above when the caller sets a zero region size // and the whole VAD is destroyed // - MiLockWorkingSet(CurrentThread, AddressSpace); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); } @@ -4653,7 +4656,7 @@ // and then change the ending address of the VAD to be a bit // smaller. // - MiLockWorkingSet(CurrentThread, AddressSpace); + MiLockProcessWorkingSetUnsafe(Process, CurrentThread); CommitReduction = MiCalculatePageCommitment(StartingAddress, EndingAddress, Vad, @@ -4695,7 +4698,7 @@ // around with process pages. // MiDeleteVirtualAddresses(StartingAddress, EndingAddress, NULL); - MiUnlockWorkingSet(CurrentThread, AddressSpace); + MiUnlockProcessWorkingSetUnsafe(Process, CurrentThread); Status = STATUS_SUCCESS; FinalPath:

1 0

[ion] 57227: [NTOSKRNL]: Make executive init functions fail if something didn't work, intstead of silently failing. [NTOSKRNL]: Fix Win32k object initialization, fixes boot.
by ion＠svn.reactos.org 03 Sep '12

03 Sep '12

Author: ion Date: Mon Sep 3 01:12:58 2012 New Revision: 57227 URL: http://svn.reactos.org/svn/reactos?rev=57227&view=rev Log: [NTOSKRNL]: Make executive init functions fail if something didn't work, intstead of silently failing. [NTOSKRNL]: Fix Win32k object initialization, fixes boot. Modified: trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/evtpair.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/keyedevt.c trunk/reactos/ntoskrnl/ex/mutant.c trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/ex/sem.c trunk/reactos/ntoskrnl/ex/timer.c trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -37,13 +37,14 @@ /* FUNCTIONS *****************************************************************/ -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpInitializeEventImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; DPRINT("Creating Event Object Type\n"); /* Create the Event Object Type */ @@ -55,7 +56,9 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventObjectType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + return TRUE; } /* Modified: trunk/reactos/ntoskrnl/ex/evtpair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/evtpair.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -31,13 +31,14 @@ /* FUNCTIONS *****************************************************************/ -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpInitializeEventPairImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; DPRINT("Creating Event Pair Object Type\n"); /* Create the Event Pair Object Type */ @@ -50,7 +51,9 @@ ObjectTypeInitializer.ValidAccessMask = EVENT_PAIR_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventPairObjectType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventPairObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + return TRUE; } NTSTATUS Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=572… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -662,32 +662,68 @@ ExpInitializePushLocks(); /* Initialize events and event pairs */ - ExpInitializeEventImplementation(); - ExpInitializeEventPairImplementation(); + if (ExpInitializeEventImplementation() == FALSE) + { + DPRINT1("Executive: Event initialization failed\n"); + return FALSE; + } + if (ExpInitializeEventPairImplementation() == FALSE) + { + DPRINT1("Executive: Event Pair initialization failed\n"); + return FALSE; + } /* Initialize mutants */ - ExpInitializeMutantImplementation(); + if (ExpInitializeMutantImplementation() == FALSE) + { + DPRINT1("Executive: Mutant initialization failed\n"); + return FALSE; + } /* Initialize callbacks */ - ExpInitializeCallbacks(); - + if (ExpInitializeCallbacks() == FALSE) + { + DPRINT1("Executive: Callback initialization failed\n"); + return FALSE; + } + /* Initialize semaphores */ - ExpInitializeSemaphoreImplementation(); - + if (ExpInitializeSemaphoreImplementation() == FALSE) + { + DPRINT1("Executive: Semaphore initialization failed\n"); + return FALSE; + } + /* Initialize timers */ - ExpInitializeTimerImplementation(); - + if (ExpInitializeTimerImplementation() == FALSE) + { + DPRINT1("Executive: Timer initialization failed\n"); + return FALSE; + } + /* Initialize profiling */ - ExpInitializeProfileImplementation(); - + if (ExpInitializeProfileImplementation() == FALSE) + { + DPRINT1("Executive: Profile initialization failed\n"); + return FALSE; + } + /* Initialize UUIDs */ ExpInitUuids(); /* Initialize keyed events */ - ExpInitializeKeyedEventImplementation(); - + if (ExpInitializeKeyedEventImplementation() == FALSE) + { + DPRINT1("Executive: Keyed event initialization failed\n"); + return FALSE; + } + /* Initialize Win32K */ - ExpWin32kInit(); + if (ExpWin32kInit() == FALSE) + { + DPRINT1("Executive: Win32 initialization failed\n"); + return FALSE; + } return TRUE; } Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/keyedevt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -32,7 +32,7 @@ _In_ ACCESS_MASK AccessMask, _In_ POBJECT_ATTRIBUTES ObjectAttributes, _In_ ULONG Flags); - + #define KeGetCurrentProcess() ((PKPROCESS)PsGetCurrentProcess()) /* GLOBALS *******************************************************************/ @@ -51,7 +51,8 @@ /* FUNCTIONS *****************************************************************/ -VOID +BOOLEAN +INIT_FUNCTION NTAPI ExpInitializeKeyedEventImplementation(VOID) { @@ -74,7 +75,7 @@ &ObjectTypeInitializer, NULL, &ExKeyedEventObjectType); - if (!NT_SUCCESS(Status)) return; + if (!NT_SUCCESS(Status)) return FALSE; /* Create the out of memory event for critical sections */ InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_PERMANENT, NULL, NULL); @@ -92,11 +93,10 @@ (PVOID*)&ExpCritSecOutOfMemoryEvent, NULL); ZwClose(EventHandle); - } - else - { - DPRINT1("Failed to create keyed event: %lx\n", Status); - } + return TRUE; + } + + return FALSE; } VOID Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -50,13 +50,14 @@ FALSE); } -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpInitializeMutantImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; DPRINT("Creating Mutant Object Type\n"); /* Create the Event Pair Object Type */ @@ -68,7 +69,9 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.DeleteProcedure = ExpDeleteMutant; ObjectTypeInitializer.ValidAccessMask = MUTANT_ALL_ACCESS; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExMutantObjectType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExMutantObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + return TRUE; } /* Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -61,13 +61,14 @@ if (Profile->Process) ObDereferenceObject(Profile->Process); } -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpInitializeProfileImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; DPRINT("Creating Profile Object Type\n"); /* Initialize the Mutex to lock the States */ @@ -83,7 +84,9 @@ ObjectTypeInitializer.DeleteProcedure = ExpDeleteProfile; ObjectTypeInitializer.ValidAccessMask = PROFILE_ALL_ACCESS; ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExProfileObjectType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExProfileObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + return TRUE; } NTSTATUS Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=5722… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -37,13 +37,14 @@ /* FUNCTIONS *****************************************************************/ -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpInitializeSemaphoreImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; DPRINT("Creating Semaphore Object Type\n"); /* Create the Event Pair Object Type */ @@ -55,7 +56,9 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObjectTypeInitializer.ValidAccessMask = SEMAPHORE_ALL_ACCESS; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExSemaphoreObjectType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExSemaphoreObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + return TRUE; } /* Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/timer.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -216,13 +216,14 @@ ObDereferenceObjectEx(Timer, DerefsToDo); } -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpInitializeTimerImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; /* Create the Timer Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); @@ -234,11 +235,13 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = TIMER_ALL_ACCESS; ObjectTypeInitializer.DeleteProcedure = ExpDeleteTimer; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExTimerType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExTimerType); + if (!NT_SUCCESS(Status)) return FALSE; /* Initialize the Wait List and Lock */ KeInitializeSpinLock(&ExpWakeListLock); InitializeListHead(&ExpWakeList); + return TRUE; } /* PUBLIC FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -133,13 +133,14 @@ ExpDesktopObjectDelete(&Parameters); } -VOID +BOOLEAN INIT_FUNCTION NTAPI ExpWin32kInit(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + NTSTATUS Status; DPRINT("Creating Win32 Object Types\n"); /* Create the window station Object Type */ @@ -151,16 +152,17 @@ ObjectTypeInitializer.DeleteProcedure = ExpWinStaObjectDelete; ObjectTypeInitializer.ParseProcedure = ExpWinStaObjectParse; ObjectTypeInitializer.OkayToCloseProcedure = ExpWindowStationOkToClose; - ObjectTypeInitializer.MaintainHandleCount = TRUE; ObjectTypeInitializer.SecurityRequired = TRUE; ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK | OBJ_PERMANENT | OBJ_EXCLUSIVE; - ObCreateObjectType(&Name, - &ObjectTypeInitializer, - NULL, - &ExWindowStationObjectType); - + ObjectTypeInitializer.ValidAccessMask = STANDARD_RIGHTS_REQUIRED; + Status = ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &ExWindowStationObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + /* Create desktop object type */ RtlInitUnicodeString(&Name, L"Desktop"); ObjectTypeInitializer.GenericMapping = ExpDesktopMapping; @@ -171,6 +173,9 @@ &ObjectTypeInitializer, NULL, &ExDesktopObjectType); + if (!NT_SUCCESS(Status)) return FALSE; + + return TRUE; } /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Mon Sep 3 01:12:58 2012 @@ -140,7 +140,7 @@ /* INITIALIZATION FUNCTIONS *************************************************/ -VOID +BOOLEAN NTAPI ExpWin32kInit(VOID); @@ -202,31 +202,31 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock ); -VOID +BOOLEAN NTAPI ExpInitializeEventImplementation(VOID); -VOID +BOOLEAN NTAPI ExpInitializeKeyedEventImplementation(VOID); -VOID +BOOLEAN NTAPI ExpInitializeEventPairImplementation(VOID); -VOID +BOOLEAN NTAPI ExpInitializeSemaphoreImplementation(VOID); -VOID +BOOLEAN NTAPI ExpInitializeMutantImplementation(VOID); -VOID +BOOLEAN NTAPI ExpInitializeTimerImplementation(VOID); -VOID +BOOLEAN NTAPI ExpInitializeProfileImplementation(VOID);

1 0

[ion] 57226: [NTOSKRNL]: Fixed keyed event initialization.
by ion＠svn.reactos.org 03 Sep '12

03 Sep '12

Author: ion Date: Mon Sep 3 00:33:05 2012 New Revision: 57226 URL: http://svn.reactos.org/svn/reactos?rev=57226&view=rev Log: [NTOSKRNL]: Fixed keyed event initialization. Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/keyedevt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] Mon Sep 3 00:33:05 2012 @@ -25,11 +25,14 @@ } HashTable[NUM_KEY_HASH_BUCKETS]; } EX_KEYED_EVENT, *PEX_KEYED_EVENT; -VOID -NTAPI -ExpInitializeKeyedEvent( - _Out_ PEX_KEYED_EVENT KeyedEvent); - +NTSTATUS +NTAPI +ZwCreateKeyedEvent( + _Out_ PHANDLE OutHandle, + _In_ ACCESS_MASK AccessMask, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ ULONG Flags); + #define KeGetCurrentProcess() ((PKPROCESS)PsGetCurrentProcess()) /* GLOBALS *******************************************************************/ @@ -46,7 +49,6 @@ EVENT_ALL_ACCESS }; - /* FUNCTIONS *****************************************************************/ VOID @@ -55,49 +57,46 @@ { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer = {0}; UNICODE_STRING TypeName = RTL_CONSTANT_STRING(L"KeyedEvent"); - NTSTATUS Status; + UNICODE_STRING Name = RTL_CONSTANT_STRING(L"\\KernelObjects\\CritSecOutOfMemoryEvent"); + NTSTATUS Status; + HANDLE EventHandle; + OBJECT_ATTRIBUTES ObjectAttributes; /* Set up the object type initializer */ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.GenericMapping = ExpKeyedEventMapping; ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; - //ObjectTypeInitializer.DeleteProcedure = ???; - //ObjectTypeInitializer.OkayToCloseProcedure = ???; + ObjectTypeInitializer.UseDefaultObject = TRUE; /* Create the keyed event object type */ Status = ObCreateObjectType(&TypeName, &ObjectTypeInitializer, NULL, &ExKeyedEventObjectType); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - // FIXME - KeBugCheck(0); - } - - /* Create the global keyed event for critical sections on low memory */ - Status = ObCreateObject(KernelMode, - ExKeyedEventObjectType, - NULL, - UserMode, - NULL, - sizeof(EX_KEYED_EVENT), - 0, - 0, - (PVOID*)&ExpCritSecOutOfMemoryEvent); - - /* Check for success */ - if (!NT_SUCCESS(Status)) - { - // FIXME - KeBugCheck(0); - } - - /* Initalize the keyed event */ - ExpInitializeKeyedEvent(ExpCritSecOutOfMemoryEvent); + if (!NT_SUCCESS(Status)) return; + + /* Create the out of memory event for critical sections */ + InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_PERMANENT, NULL, NULL); + Status = ZwCreateKeyedEvent(&EventHandle, + EVENT_ALL_ACCESS, + &ObjectAttributes, + 0); + if (NT_SUCCESS(Status)) + { + /* Take a reference so we can get rid of the handle */ + Status = ObReferenceObjectByHandle(EventHandle, + EVENT_ALL_ACCESS, + ExKeyedEventObjectType, + KernelMode, + (PVOID*)&ExpCritSecOutOfMemoryEvent, + NULL); + ZwClose(EventHandle); + } + else + { + DPRINT1("Failed to create keyed event: %lx\n", Status); + } } VOID

1 0

[ion] 57225: [NTOSKRNL]: Fix what should be at least 40 KmTest:ob failures, by correctly using the right attributes, security mappings, flags, names, etc... for the object types. This probably fixe...
by ion＠svn.reactos.org 02 Sep '12

02 Sep '12

Author: ion Date: Sun Sep 2 22:06:42 2012 New Revision: 57225 URL: http://svn.reactos.org/svn/reactos?rev=57225&view=rev Log: [NTOSKRNL]: Fix what should be at least 40 KmTest:ob failures, by correctly using the right attributes, security mappings, flags, names, etc... for the object types. This probably fixes countless subtle bugs in applications/drivers that were non-obvious before, especially now that Device names are case insensitive, or that asking for certain GENERIC rights translates correctly. Thank you thfabba (Thomas Fabber) for one of the most useful, yet ignored, tests in our suite. Hope this makes it up to you. Modified: trunk/reactos/include/ndk/extypes.h trunk/reactos/include/ndk/lpctypes.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/evtpair.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/keyedevt.c trunk/reactos/ntoskrnl/ex/mutant.c trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/ex/sem.c trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/io/iomgr/iocomp.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/lpc/port.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -82,10 +82,10 @@ // // Callback Object Access Mask // -#define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x0001) -#define CALLBACK_EXECUTE (STANDARD_RIGHTS_EXECUTE|SYNCHRONIZE|0x0001) -#define CALLBACK_WRITE (STANDARD_RIGHTS_WRITE|SYNCHRONIZE|0x0001) -#define CALLBACK_READ (STANDARD_RIGHTS_READ|SYNCHRONIZE|0x0001) +#define CALLBACK_MODIFY_STATE 0x0001 +#define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ + SYNCHRONIZE | \ + CALLBACK_MODIFY_STATE) // // Event Object Access Masks Modified: trunk/reactos/include/ndk/lpctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lpctypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/lpctypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/lpctypes.h [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -44,7 +44,9 @@ // Port Object Access Masks // #define PORT_CONNECT 0x1 -#define PORT_ALL_ACCESS 0x1 +#define PORT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ + SYNCHRONIZE | \ + PORT_CONNECT) // // Port Object Flags Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -415,6 +415,21 @@ PMMPTE PrototypePte; MMPTE ThePtes[1]; } SEGMENT, *PSEGMENT; + +typedef struct _MAPPED_FILE_SEGMENT +{ + struct _CONTROL_AREA *ControlArea; + ULONG TotalNumberOfPtes; + ULONG NonExtendedPtes; + ULONG Spare0; + UINT64 SizeOfSegment; + MMPTE SegmentPteTemplate; + SIZE_T NumberOfCommittedPages; + PMMEXTEND_INFO ExtendInfo; + SEGMENT_FLAGS SegmentFlags; + PVOID BasedAddress; + struct _MSUBSECTION *LastSubsectionHint; +} MAPPED_FILE_SEGMENT, *PMAPPED_FILE_SEGMENT; // // Event Counter Structure Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -866,6 +866,7 @@ ObjectTypeInitializer.QueryNameProcedure = CmpQueryKeyName; ObjectTypeInitializer.CloseProcedure = CmpCloseKeyObject; ObjectTypeInitializer.SecurityRequired = TRUE; + ObjectTypeInitializer.InvalidAttributes = OBJ_EXCLUSIVE | OBJ_PERMANENT; /* Create it */ return ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &CmpKeyObjectType); Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -1495,7 +1495,7 @@ ObjectTypeInitializer.GenericMapping = DbgkDebugObjectMapping; ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = DEBUG_OBJECT_ALL_ACCESS; - ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.SecurityRequired = TRUE; ObjectTypeInitializer.CloseProcedure = DbgkpCloseObject; ObjectTypeInitializer.DeleteProcedure = DbgkpDeleteObject; ObCreateObjectType(&Name, Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/callback.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -17,9 +17,9 @@ /* Mapping for Callback Object */ GENERIC_MAPPING ExpCallbackMapping = { - CALLBACK_READ, - CALLBACK_WRITE, - CALLBACK_EXECUTE, + STANDARD_RIGHTS_READ, + STANDARD_RIGHTS_WRITE | CALLBACK_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, CALLBACK_ALL_ACCESS }; Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -23,10 +23,11 @@ GENERIC_MAPPING ExpEventMapping = { - STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE, - STANDARD_RIGHTS_WRITE | SYNCHRONIZE | EVENT_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | EVENT_QUERY_STATE, - EVENT_ALL_ACCESS}; + STANDARD_RIGHTS_READ | EVENT_QUERY_STATE, + STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + EVENT_ALL_ACCESS +}; static const INFORMATION_CLASS_INFO ExEventInfoClass[] = { @@ -53,6 +54,7 @@ ObjectTypeInitializer.GenericMapping = ExpEventMapping; ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventObjectType); } Modified: trunk/reactos/ntoskrnl/ex/evtpair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/evtpair.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -23,8 +23,8 @@ GENERIC_MAPPING ExEventPairMapping = { - STANDARD_RIGHTS_READ, - STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_READ | SYNCHRONIZE, + STANDARD_RIGHTS_WRITE | SYNCHRONIZE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, EVENT_PAIR_ALL_ACCESS }; @@ -49,6 +49,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_PAIR_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventPairObjectType); } Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=572… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -664,14 +664,13 @@ /* Initialize events and event pairs */ ExpInitializeEventImplementation(); ExpInitializeEventPairImplementation(); - ExpInitializeKeyedEventImplementation(); - + + /* Initialize mutants */ + ExpInitializeMutantImplementation(); + /* Initialize callbacks */ ExpInitializeCallbacks(); - /* Initialize mutants */ - ExpInitializeMutantImplementation(); - /* Initialize semaphores */ ExpInitializeSemaphoreImplementation(); @@ -683,6 +682,9 @@ /* Initialize UUIDs */ ExpInitUuids(); + + /* Initialize keyed events */ + ExpInitializeKeyedEventImplementation(); /* Initialize Win32K */ ExpWin32kInit(); Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/keyedevt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -42,7 +42,7 @@ { STANDARD_RIGHTS_READ | EVENT_QUERY_STATE, STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | EVENT_QUERY_STATE, + STANDARD_RIGHTS_EXECUTE, EVENT_ALL_ACCESS }; @@ -60,7 +60,8 @@ /* Set up the object type initializer */ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.GenericMapping = ExpKeyedEventMapping; - ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.PoolType = PagedPool; + ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; //ObjectTypeInitializer.DeleteProcedure = ???; //ObjectTypeInitializer.OkayToCloseProcedure = ???; Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -23,9 +23,9 @@ GENERIC_MAPPING ExpMutantMapping = { - STANDARD_RIGHTS_READ | SYNCHRONIZE | MUTANT_QUERY_STATE, - STANDARD_RIGHTS_WRITE | SYNCHRONIZE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | MUTANT_QUERY_STATE, + STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE, + STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, MUTANT_ALL_ACCESS }; Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/profile.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -82,6 +82,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.DeleteProcedure = ExpDeleteProfile; ObjectTypeInitializer.ValidAccessMask = PROFILE_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExProfileObjectType); } Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=5722… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sem.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -23,9 +23,9 @@ GENERIC_MAPPING ExSemaphoreMapping = { - STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE, - STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | SEMAPHORE_QUERY_STATE, + STANDARD_RIGHTS_READ | SEMAPHORE_QUERY_STATE, + STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, SEMAPHORE_ALL_ACCESS }; Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -151,6 +151,11 @@ ObjectTypeInitializer.DeleteProcedure = ExpWinStaObjectDelete; ObjectTypeInitializer.ParseProcedure = ExpWinStaObjectParse; ObjectTypeInitializer.OkayToCloseProcedure = ExpWindowStationOkToClose; + ObjectTypeInitializer.MaintainHandleCount = TRUE; + ObjectTypeInitializer.SecurityRequired = TRUE; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK | + OBJ_PERMANENT | + OBJ_EXCLUSIVE; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -19,9 +19,9 @@ GENERIC_MAPPING IopCompletionMapping = { - STANDARD_RIGHTS_READ | IO_COMPLETION_QUERY_STATE, - STANDARD_RIGHTS_WRITE | IO_COMPLETION_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | IO_COMPLETION_QUERY_STATE, + STANDARD_RIGHTS_READ | IO_COMPLETION_QUERY_STATE, + STANDARD_RIGHTS_WRITE | IO_COMPLETION_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, IO_COMPLETION_ALL_ACCESS }; Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -273,6 +273,7 @@ ObjectTypeInitializer.DeleteProcedure = IopDeleteDevice; ObjectTypeInitializer.ParseProcedure = IopParseDevice; ObjectTypeInitializer.SecurityProcedure = IopSecurityFile; + ObjectTypeInitializer.CaseInsensitive = TRUE; if (!NT_SUCCESS(ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, Modified: trunk/reactos/ntoskrnl/lpc/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/port.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -14,17 +14,17 @@ /* GLOBALS *******************************************************************/ -POBJECT_TYPE LpcPortObjectType; +POBJECT_TYPE LpcPortObjectType, LpcWaitablePortObjectType; ULONG LpcpMaxMessageSize; PAGED_LOOKASIDE_LIST LpcpMessagesLookaside; KGUARDED_MUTEX LpcpLock; ULONG LpcpTraceLevel = 0; ULONG LpcpNextMessageId = 1, LpcpNextCallbackId = 1; -static GENERIC_MAPPING LpcpPortMapping = +static GENERIC_MAPPING LpcpPortMapping = { - STANDARD_RIGHTS_READ, - STANDARD_RIGHTS_WRITE, + READ_CONTROL | PORT_CONNECT, + DELETE | PORT_CONNECT, 0, PORT_ALL_ACCESS }; @@ -46,18 +46,29 @@ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Port"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(LPCP_PORT_OBJECT); - ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(LPCP_NONPAGED_PORT_QUEUE); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(LPCP_NONPAGED_PORT_QUEUE); + ObjectTypeInitializer.DefaultPagedPoolCharge = FIELD_OFFSET(LPCP_PORT_OBJECT, WaitEvent); ObjectTypeInitializer.GenericMapping = LpcpPortMapping; ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.CloseProcedure = LpcpClosePort; ObjectTypeInitializer.DeleteProcedure = LpcpDeletePort; ObjectTypeInitializer.ValidAccessMask = PORT_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_VALID_ATTRIBUTES & ~OBJ_CASE_INSENSITIVE; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &LpcPortObjectType); + + RtlInitUnicodeString(&Name, L"WaitablePort"); + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.DefaultNonPagedPoolCharge += sizeof(LPCP_PORT_OBJECT); + ObjectTypeInitializer.DefaultPagedPoolCharge = 0; + ObjectTypeInitializer.UseDefaultObject = FALSE; + ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &LpcWaitablePortObjectType); /* Allocate the LPC lookaside list */ LpcpMaxMessageSize = LPCP_MAX_MESSAGE_SIZE; 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] Sun Sep 2 22:06:42 2012 @@ -2766,6 +2766,7 @@ ObjectTypeInitializer.DeleteProcedure = MmpDeleteSection; ObjectTypeInitializer.CloseProcedure = MmpCloseSection; ObjectTypeInitializer.ValidAccessMask = SECTION_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &MmSectionObjectType); MmCreatePhysicalMemorySection(); Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -202,6 +202,7 @@ /* Create the Directory Type */ RtlInitUnicodeString(&Name, L"Directory"); + ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.ValidAccessMask = DIRECTORY_ALL_ACCESS; ObjectTypeInitializer.CaseInsensitive = TRUE; ObjectTypeInitializer.MaintainTypeList = FALSE; @@ -209,6 +210,7 @@ ObjectTypeInitializer.DeleteProcedure = NULL; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_DIRECTORY); ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObDirectoryType); + ObDirectoryType->TypeInfo.ValidAccessMask &= ~SYNCHRONIZE; /* Create 'symbolic link' object type */ RtlInitUnicodeString(&Name, L"SymbolicLink"); @@ -218,6 +220,7 @@ ObjectTypeInitializer.ParseProcedure = ObpParseSymbolicLink; ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObSymbolicLinkType); + ObSymbolicLinkType->TypeInfo.ValidAccessMask &= ~SYNCHRONIZE; /* Phase 0 initialization complete */ ObpInitializationPhase++; Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -1027,11 +1027,11 @@ POBJECT_TYPE LocalObjectType; ULONG HeaderSize; NTSTATUS Status; - CHAR Tag[4]; OBP_LOOKUP_CONTEXT Context; PWCHAR p; ULONG i; UNICODE_STRING ObjectName; + ANSI_STRING AnsiName; POBJECT_HEADER_CREATOR_INFO CreatorInfo; /* Verify parameters */ @@ -1136,12 +1136,22 @@ } else { - /* Set Tag */ - Tag[0] = (CHAR)TypeName->Buffer[0]; - Tag[1] = (CHAR)TypeName->Buffer[1]; - Tag[2] = (CHAR)TypeName->Buffer[2]; - Tag[3] = (CHAR)TypeName->Buffer[3]; - LocalObjectType->Key = *(PULONG)Tag; + /* Convert the tag to ASCII */ + Status = RtlUnicodeStringToAnsiString(&AnsiName, TypeName, TRUE); + if (NT_SUCCESS(Status)) + { + /* For every missing character, use a space */ + for (i = 3; i >= AnsiName.Length; i--) AnsiName.Buffer[i] = ' '; + + /* Set the key and free the converted name */ + LocalObjectType->Key = *(PULONG)AnsiName.Buffer; + ExFreePool(AnsiName.Buffer); + } + else + { + /* Just copy the characters */ + LocalObjectType->Key = *(PULONG)TypeName->Buffer; + } } /* Set up the type information */ Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=5722… ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -40,9 +40,13 @@ GENERIC_MAPPING PspJobMapping = { STANDARD_RIGHTS_READ | JOB_OBJECT_QUERY, - STANDARD_RIGHTS_WRITE | JOB_OBJECT_ASSIGN_PROCESS | JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_TERMINATE | JOB_OBJECT_SET_SECURITY_ATTRIBUTES, + + STANDARD_RIGHTS_WRITE | JOB_OBJECT_ASSIGN_PROCESS | + JOB_OBJECT_SET_ATTRIBUTES | JOB_OBJECT_TERMINATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, - STANDARD_RIGHTS_ALL | JOB_OBJECT_ALL_ACCESS + + STANDARD_RIGHTS_ALL | THREAD_ALL_ACCESS // bug fixed only in vista }; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=57… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sun Sep 2 22:06:42 2012 @@ -500,8 +500,7 @@ /* Initialize Object Initializer */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK | - OBJ_PERMANENT | + ObjectTypeInitializer.InvalidAttributes = OBJ_PERMANENT | OBJ_EXCLUSIVE | OBJ_OPENIF; ObjectTypeInitializer.PoolType = NonPagedPool; @@ -529,6 +528,7 @@ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(EJOB); ObjectTypeInitializer.GenericMapping = PspJobMapping; + ObjectTypeInitializer.InvalidAttributes = 0; ObjectTypeInitializer.ValidAccessMask = JOB_OBJECT_ALL_ACCESS; ObjectTypeInitializer.DeleteProcedure = PspDeleteJob; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &PsJobType);

1 0

[ion] 57224: [NTOSKRNL]: Missed the one ASSERT that mattered...
by ion＠svn.reactos.org 02 Sep '12

02 Sep '12

Author: ion Date: Sun Sep 2 21:46:50 2012 New Revision: 57224 URL: http://svn.reactos.org/svn/reactos?rev=57224&view=rev Log: [NTOSKRNL]: Missed the one ASSERT that mattered... Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h 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] Sun Sep 2 21:46:50 2012 @@ -1367,8 +1367,13 @@ /* On ARM3 pages, we should see a valid share count */ ASSERT((Pfn1->u2.ShareCount != 0) && (Pfn1->u3.e1.PageLocation == ActiveAndValid)); - /* We don't support mapping a prototype page yet */ - ASSERT((Pfn1->u3.e1.PrototypePte == 0) && (Pfn1->OriginalPte.u.Soft.Prototype == 0)); + /* Is it a prototype PTE? */ + if ((Pfn1->u3.e1.PrototypePte == 1) && + (Pfn1->OriginalPte.u.Soft.Prototype == 1)) + { + /* FIXME: We should charge commit */ + DPRINT1("Not charging commit for prototype PTE\n"); + } } /* More locked pages! */

1 0

[ion] 57223: [NTOSKRNL]: Warn, but do not ASSERT, about the fact that we don't have commit charges yet. Fixes OllyDbg2 assertions (and probably others too).
by ion＠svn.reactos.org 02 Sep '12

02 Sep '12

Author: ion Date: Sun Sep 2 20:56:55 2012 New Revision: 57223 URL: http://svn.reactos.org/svn/reactos?rev=57223&view=rev Log: [NTOSKRNL]: Warn, but do not ASSERT, about the fact that we don't have commit charges yet. Fixes OllyDbg2 assertions (and probably others too). Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h 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] Sun Sep 2 20:56:55 2012 @@ -94,8 +94,8 @@ #endif // -// Protection Bits part of the internal memory manager Protection Mask -// Taken from http://www.reactos.org/wiki/Techwiki:Memory_management_in_the_Windows_XP_ke… +// Protection Bits part of the internal memory manager Protection Mask, from: +// http://reactos.org/wiki/Techwiki:Memory_management_in_the_Windows_XP_kernel // and public assertions. // #define MM_ZERO_ACCESS 0 @@ -1263,8 +1263,8 @@ if ((Pfn1->u3.e1.PrototypePte == 1) && (Pfn1->OriginalPte.u.Soft.Prototype == 1)) { - /* We don't handle this */ - ASSERT(FALSE); + /* FIXME: We should return commit */ + DPRINT1("Not returning commit for prototype PTE\n"); } /* Update the counter */ @@ -1301,8 +1301,8 @@ if ((Pfn1->u3.e1.PrototypePte == 1) && (Pfn1->OriginalPte.u.Soft.Prototype == 1)) { - /* We don't handle this */ - ASSERT(FALSE); + /* FIXME: We should return commit */ + DPRINT1("Not returning commit for prototype PTE\n"); } /* Update the counter, and drop a reference the long way */ @@ -1407,8 +1407,8 @@ if ((Pfn1->u3.e1.PrototypePte == 1) && (Pfn1->OriginalPte.u.Soft.Prototype == 1)) { - /* We don't handle this */ - ASSERT(FALSE); + /* FIXME: We should charge commit */ + DPRINT1("Not charging commit for prototype PTE\n"); } /* More locked pages! */ @@ -1456,8 +1456,8 @@ if ((Pfn1->u3.e1.PrototypePte == 1) && (Pfn1->OriginalPte.u.Soft.Prototype == 1)) { - /* We don't handle this */ - ASSERT(FALSE); + /* FIXME: We should charge commit */ + DPRINT1("Not charging commit for prototype PTE\n"); } /* More locked pages! */

1 0

[ion] 57222: [NTOSKRNL]: No longer force PAGE_READWRITE for allocations. Seems Mm is now mature enough to handle this. Tried with some winetests and they look happier.
by ion＠svn.reactos.org 02 Sep '12

02 Sep '12

Author: ion Date: Sun Sep 2 20:49:31 2012 New Revision: 57222 URL: http://svn.reactos.org/svn/reactos?rev=57222&view=rev Log: [NTOSKRNL]: No longer force PAGE_READWRITE for allocations. Seems Mm is now mature enough to handle this. Tried with some winetests and they look happier. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/section.c 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] Sun Sep 2 20:49:31 2012 @@ -81,6 +81,29 @@ (CHAR)MM_INVALID_PROTECTION }; +ULONG MmCompatibleProtectionMask[8] = +{ + PAGE_NOACCESS, + + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY, + + PAGE_NOACCESS | PAGE_EXECUTE, + + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_EXECUTE | + PAGE_EXECUTE_READ, + + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_READWRITE, + + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY, + + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_READWRITE | + PAGE_EXECUTE | PAGE_EXECUTE_READ | PAGE_EXECUTE_READWRITE | + PAGE_EXECUTE_WRITECOPY, + + PAGE_NOACCESS | PAGE_READONLY | PAGE_WRITECOPY | PAGE_EXECUTE | + PAGE_EXECUTE_READ | PAGE_EXECUTE_WRITECOPY +}; + MMSESSION MmSession; KGUARDED_MUTEX MmSectionCommitMutex; MM_AVL_TABLE MmSectionBasedRoot; @@ -88,6 +111,29 @@ PVOID MmHighSectionBase; /* PRIVATE FUNCTIONS **********************************************************/ + +BOOLEAN +NTAPI +MiIsProtectionCompatible(IN ULONG SectionPageProtection, + IN ULONG NewSectionPageProtection) +{ + ULONG ProtectionMask, CompatibleMask; + + /* Calculate the protection mask and make sure it's valid */ + ProtectionMask = MiMakeProtectionMask(SectionPageProtection); + if (ProtectionMask == MM_INVALID_PROTECTION) + { + DPRINT1("Invalid protection mask\n"); + return FALSE; + } + + /* Calculate the compatible mask */ + CompatibleMask = MmCompatibleProtectionMask[ProtectionMask & 0x7] | + PAGE_GUARD | PAGE_NOCACHE | PAGE_WRITECOMBINE; + + /* See if the mapping protection is compatible with the create protection */ + return ((CompatibleMask | NewSectionPageProtection) == CompatibleMask); +} ACCESS_MASK NTAPI @@ -2424,9 +2470,6 @@ NTSTATUS Status; PAGED_CODE(); - /* Force PAGE_READWRITE for everything, for now */ - Protect = PAGE_READWRITE; - /* Get the segment and control area */ Section = (PSECTION)SectionObject; ControlArea = Section->Segment->ControlArea; @@ -2438,14 +2481,12 @@ ASSERT((AllocationType & MEM_RESERVE) == 0); ASSERT(ControlArea->u.Flags.PhysicalMemory == 0); -#if 0 - /* FIXME: Check if the mapping protection is compatible with the create */ + /* Check if the mapping protection is compatible with the create */ if (!MiIsProtectionCompatible(Section->InitialPageProtection, Protect)) { DPRINT1("Mapping protection is incompatible\n"); return STATUS_SECTION_PROTECTION; } -#endif /* Check if the offset and size would cause an overflow */ if (((ULONG64)SectionOffset->QuadPart + *ViewSize) < 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] Sun Sep 2 20:49:31 2012 @@ -3738,11 +3738,6 @@ return STATUS_INVALID_PARAMETER_6; } } - - // - // Force PAGE_READWRITE for everything, for now - // - Protect = PAGE_READWRITE; /* Calculate the protection mask and make sure it's valid */ ProtectionMask = MiMakeProtectionMask(Protect); 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] Sun Sep 2 20:49:31 2012 @@ -4986,7 +4986,11 @@ #endif else { - ASSERT(AllocationAttributes & SEC_PHYSICALMEMORY); + if ((AllocationAttributes & SEC_PHYSICALMEMORY) == 0) + { + DPRINT1("Invalid path: %lx %p %p\n", AllocationAttributes, FileObject, FileHandle); + } +// ASSERT(AllocationAttributes & SEC_PHYSICALMEMORY); Status = MmCreatePageFileSection(SectionObject, DesiredAccess, ObjectAttributes,

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