Ros-diffs April 2012

ros-diffs@reactos.org

11 participants
156 discussions

[tkreuzer] 56444: [REACTOS] Create a branch for DIB rewrite
by tkreuzer＠svn.reactos.org 29 Apr '12

29 Apr '12

Author: tkreuzer Date: Sun Apr 29 11:09:08 2012 New Revision: 56444 URL: http://svn.reactos.org/svn/reactos?rev=56444&view=rev Log: [REACTOS] Create a branch for DIB rewrite Added: branches/dib_rewrite/ (props changed) - copied from r56443, trunk/reactos/ Propchange: branches/dib_rewrite/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Apr 29 11:09:08 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/dib_rewrite/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/dib_rewrite/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/dib_rewrite/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 29 11:09:08 2012 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/dib_rewrite/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Apr 29 11:09:08 2012 @@ -1,0 +1,15 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup:54809-54998 Propchange: branches/dib_rewrite/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[tkreuzer] 56443: [LSASRV] Initialize an uninitialized variable in AttributeSize. Fixes crashing advapi32_winetest lsa
by tkreuzer＠svn.reactos.org 29 Apr '12

29 Apr '12

Author: tkreuzer Date: Sun Apr 29 10:51:28 2012 New Revision: 56443 URL: http://svn.reactos.org/svn/reactos?rev=56443&view=rev Log: [LSASRV] Initialize an uninitialized variable in AttributeSize. Fixes crashing advapi32_winetest lsa Modified: trunk/reactos/dll/win32/lsasrv/policy.c Modified: trunk/reactos/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/policy.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] Sun Apr 29 10:51:28 2012 @@ -152,6 +152,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Domain Name */ + AttributeSize = 0; Status = LsapGetObjectAttribute((PLSA_DB_OBJECT)PolicyHandle, L"PolPrDmN", NULL, @@ -241,7 +242,7 @@ } } - return STATUS_SUCCESS; + return Status; }

1 0

[tkreuzer] 56442: [PSEH] Fix a serious bug in PSEH that could lead to stack corruption and was causing CSRSS to crash, when large amounts of text were output on the console. Background: PSEH used _...
by tkreuzer＠svn.reactos.org 28 Apr '12

28 Apr '12

Author: tkreuzer Date: Sat Apr 28 20:00:09 2012 New Revision: 56442 URL: http://svn.reactos.org/svn/reactos?rev=56442&view=rev Log: [PSEH] Fix a serious bug in PSEH that could lead to stack corruption and was causing CSRSS to crash, when large amounts of text were output on the console. Background: PSEH used __builtin_alloca to allocate an SEH registration frame on the stack on demand, ie only for the first try level. But there are some nasty things with __builtin_alloca: First it DOES NOT - as one might think - free the allocated memory, once the allocation "goes out of scope", like with local variables, but only on function exit. Therefore it cannot normally be used inside a loop. The trick that PSEH used to "fix" this problem, was to save the stack pointer and reset it back at the end. This is quite problematic, since the rest of the code might assume that the stack pointer is still where it was left off after the allocation. The other thing is that __builtin_alloca() can allocate the memory whenever it likes to. It can allocate everything on function entry or not allocate anything at all, when other stack variables that went out of scope have left enough space to be reused. In csrss it now happened that the allocation was done before the stack pointer was saved, so the memory could not be freed by restoring the old stack pointer value. That lead to slowly eating up the stack since the code was inside a loop. The allocation is now replaced with a variable sized array. The variable stays in scope until the _SEH2_END and will be automaticall cleaned up by the compiler. This also makes saving and restoring the stack pointer obsolete. Reliability++ Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sat Apr 28 20:00:09 2012 @@ -192,7 +192,6 @@ if(_SEHTopTryLevel) \ { \ _SEH2LeaveFrame(); \ - __asm__ __volatile__("mov %0, %%esp" : : "g" (_SEHStackPointer)); \ } #define __SEH_END_SCOPE_CHAIN \ @@ -219,16 +218,14 @@ static const int _SEH2ScopeKind = 0; \ volatile _SEH2TryLevel_t _SEHTryLevel; \ volatile _SEH2HandleTryLevel_t _SEHHandleTryLevel; \ - void * _SEHStackPointer; \ + _SEH2Frame_t _SEH2Frame[_SEHTopTryLevel ? 1 : 0]; \ volatile _SEH2TryLevel_t * _SEH2TryLevelP; \ _SEH2Frame_t * const _SEH2FrameP = _SEHTopTryLevel ? \ - ({ __asm__ __volatile__("mov %%esp, %0" : "=g" (_SEHStackPointer)); __builtin_alloca(sizeof(_SEH2Frame_t)); }) : \ - _SEHCurFrameP; \ + _SEH2Frame : _SEHCurFrameP; \ \ (void)_SEH2ScopeKind; \ (void)_SEHTryLevel; \ (void)_SEHHandleTryLevel; \ - (void)_SEHStackPointer; \ (void)_SEH2FrameP; \ (void)_SEH2TryLevelP; \ \

1 0

[arty] 56441: [NTOSKRNL] Remove PAGEOPs and use the argument to pass relevant information where needed, including generally a section page table entry or a PFN_NUMBER. In its place, the code looks ...
by arty＠svn.reactos.org 28 Apr '12

28 Apr '12

Author: arty Date: Sat Apr 28 02:56:31 2012 New Revision: 56441 URL: http://svn.reactos.org/svn/reactos?rev=56441&view=rev Log: [NTOSKRNL] Remove PAGEOPs and use the argument to pass relevant information where needed, including generally a section page table entry or a PFN_NUMBER. In its place, the code looks for an MM_WAIT_ENTRY in the appropriate place and waits, returning STATUS_MM_RESTART_OPERATION. Rather than copying the pagein and CoW operations in the PAGEOP contention case, we just punt back and restart the operation, resulting in simpler code. Modified: trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/cache/section/sptab.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Sat Apr 28 02:56:31 2012 @@ -229,7 +229,6 @@ mm/mmfault.c mm/mminit.c mm/pagefile.c - mm/pageop.c mm/region.c mm/rmap.c mm/section.c Modified: trunk/reactos/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/spt… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] Sat Apr 28 02:56:31 2012 @@ -215,8 +215,9 @@ ASSERT(!Entry || IS_SWAP_FROM_SSE(Entry)); MmDeleteSectionAssociation(PFN_FROM_SSE(OldEntry)); } else if (IS_SWAP_FROM_SSE(Entry)) { - ASSERT(!IS_SWAP_FROM_SSE(OldEntry)); - if (OldEntry) + ASSERT(!IS_SWAP_FROM_SSE(OldEntry) || + SWAPENTRY_FROM_SSE(OldEntry) == MM_WAIT_ENTRY); + if (OldEntry && SWAPENTRY_FROM_SSE(OldEntry) != MM_WAIT_ENTRY) MmDeleteSectionAssociation(PFN_FROM_SSE(OldEntry)); } else if (IS_SWAP_FROM_SSE(OldEntry)) { ASSERT(!IS_SWAP_FROM_SSE(Entry)); 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] Sat Apr 28 02:56:31 2012 @@ -49,7 +49,6 @@ struct _KTRAP_FRAME; struct _EPROCESS; struct _MM_RMAP_ENTRY; -struct _MM_PAGEOP; typedef ULONG_PTR SWAPENTRY; // @@ -83,12 +82,6 @@ #define MM_CORE_DUMP_TYPE_NONE (0x0) #define MM_CORE_DUMP_TYPE_MINIMAL (0x1) #define MM_CORE_DUMP_TYPE_FULL (0x2) - -#define MM_PAGEOP_PAGEIN (1) -#define MM_PAGEOP_PAGEOUT (2) -#define MM_PAGEOP_PAGESYNCH (3) -#define MM_PAGEOP_ACCESSFAULT (4) -#define MM_PAGEOP_CHANGEPROTECT (5) /* Number of list heads to use */ #define MI_FREE_POOL_LISTS 4 @@ -415,37 +408,6 @@ extern MMPFNLIST MmModifiedPageListHead; extern MMPFNLIST MmModifiedNoWritePageListHead; -typedef struct _MM_PAGEOP -{ - /* Type of operation. */ - ULONG OpType; - /* Number of threads interested in this operation. */ - ULONG ReferenceCount; - /* Event that will be set when the operation is completed. */ - KEVENT CompletionEvent; - /* Status of the operation once it is completed. */ - NTSTATUS Status; - /* TRUE if the operation was abandoned. */ - BOOLEAN Abandoned; - /* The memory area to be affected by the operation. */ - PMEMORY_AREA MArea; - ULONG Hash; - struct _MM_PAGEOP* Next; - struct _ETHREAD* Thread; - /* - * These fields are used to identify the operation if it is against a - * virtual memory area. - */ - HANDLE Pid; - PVOID Address; - /* - * These fields are used to identify the operation if it is against a - * section mapping. - */ - PMM_SECTION_SEGMENT Segment; - ULONGLONG Offset; -} MM_PAGEOP, *PMM_PAGEOP; - typedef struct _MM_MEMORY_CONSUMER { ULONG PagesUsed; @@ -937,7 +899,7 @@ PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID Address, - struct _MM_PAGEOP* PageOp + PFN_NUMBER Page ); NTSTATUS @@ -973,7 +935,7 @@ PMMSUPPORT AddressSpace, PMEMORY_AREA MArea, PVOID Address, - PMM_PAGEOP PageOp + PFN_NUMBER Page ); /* kmap.c ********************************************************************/ @@ -1006,38 +968,6 @@ PVOID FASTCALL MmSafeReadPtr(PVOID Source); - -/* pageop.c ******************************************************************/ - -VOID -NTAPI -MmReleasePageOp(PMM_PAGEOP PageOp); - -PMM_PAGEOP -NTAPI -MmGetPageOp( - PMEMORY_AREA MArea, - HANDLE Pid, - PVOID Address, - PMM_SECTION_SEGMENT Segment, - ULONGLONG Offset, - ULONG OpType, - BOOLEAN First -); - -PMM_PAGEOP -NTAPI -MmCheckForPageOp( - PMEMORY_AREA MArea, - HANDLE Pid, - PVOID Address, - PMM_SECTION_SEGMENT Segment, - ULONGLONG Offset -); - -VOID -NTAPI -MmInitializePageOp(VOID); /* process.c *****************************************************************/ @@ -1657,7 +1587,7 @@ PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID Address, - struct _MM_PAGEOP *PageOp + ULONG_PTR Entry ); NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sat Apr 28 02:56:31 2012 @@ -419,7 +419,6 @@ MiInitializeUserPfnBitmap(); MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); MmInitializeRmapList(); - MmInitializePageOp(); MmInitSectionImplementation(); MmInitPagingFile(); Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=564… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Sat Apr 28 02:56:31 2012 @@ -52,7 +52,6 @@ ULONG Type; PVOID Address; PEPROCESS Process; - PMM_PAGEOP PageOp; ULONGLONG Offset; NTSTATUS Status = STATUS_SUCCESS; @@ -126,17 +125,20 @@ Type = MemoryArea->Type; if (Type == MEMORY_AREA_SECTION_VIEW) { + ULONG Entry; Offset = MemoryArea->Data.SectionData.ViewOffset.QuadPart + ((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress); + + MmLockSectionSegment(MemoryArea->Data.SectionData.Segment); /* * Get or create a pageop */ - PageOp = MmGetPageOp(MemoryArea, NULL, 0, - MemoryArea->Data.SectionData.Segment, - Offset, MM_PAGEOP_PAGEOUT, TRUE); - if (PageOp == NULL) - { + Entry = MmGetPageEntrySectionSegment + (MemoryArea->Data.SectionData.Segment, (PLARGE_INTEGER)&Offset); + if (Entry && IS_SWAP_FROM_SSE(Entry) && SWAPENTRY_FROM_SSE(Entry) == MM_WAIT_ENTRY) + { + MmUnlockSectionSegment(MemoryArea->Data.SectionData.Segment); MmUnlockAddressSpace(AddressSpace); if (Address < MmSystemRangeStart) { @@ -145,17 +147,19 @@ } return(STATUS_UNSUCCESSFUL); } + + MmSetPageEntrySectionSegment(MemoryArea->Data.SectionData.Segment, (PLARGE_INTEGER)&Offset, MAKE_SWAP_SSE(MM_WAIT_ENTRY)); /* * Release locks now we have a page op. */ + MmUnlockSectionSegment(MemoryArea->Data.SectionData.Segment); MmUnlockAddressSpace(AddressSpace); /* * Do the actual page out work. */ - Status = MmPageOutSectionView(AddressSpace, MemoryArea, - Address, PageOp); + Status = MmPageOutSectionView(AddressSpace, MemoryArea, Address, Entry); } else if (Type == MEMORY_AREA_CACHE) { 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] Sat Apr 28 02:56:31 2012 @@ -127,6 +127,7 @@ BOOLEAN WasDirty; BOOLEAN Private; PEPROCESS CallingProcess; + ULONG_PTR SectionEntry; } MM_SECTION_PAGEOUT_CONTEXT; @@ -704,43 +705,6 @@ return nStatus; } -/* Note: Mmsp prefix denotes "Memory Manager Section Private". */ - -/* - * FUNCTION: Waits in kernel mode up to ten seconds for an MM_PAGEOP event. - * ARGUMENTS: PMM_PAGEOP which event we should wait for. - * RETURNS: Status of the wait. - */ -static NTSTATUS -MmspWaitForPageOpCompletionEvent(PMM_PAGEOP PageOp) -{ - LARGE_INTEGER Timeout; -#ifdef __GNUC__ /* TODO: Use other macro to check for suffix to use? */ - - Timeout.QuadPart = -100000000LL; // 10 sec -#else - - Timeout.QuadPart = -100000000; // 10 sec -#endif - - return KeWaitForSingleObject(&PageOp->CompletionEvent, 0, KernelMode, FALSE, &Timeout); -} - - -/* - * FUNCTION: Sets the page op completion event and releases the page op. - * ARGUMENTS: PMM_PAGEOP. - * RETURNS: In shorter time than it takes you to even read this - * description, so don't even think about geting a mug of coffee. - */ -static void -MmspCompleteAndReleasePageOp(PMM_PAGEOP PageOp) -{ - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); -} - - /* * FUNCTION: Waits in kernel mode indefinitely for a file object lock. * ARGUMENTS: PFILE_OBJECT to wait for. @@ -831,12 +795,12 @@ PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset, BOOLEAN Dirty, - BOOLEAN PageOut) -{ - ULONG_PTR Entry; + BOOLEAN PageOut, + ULONG_PTR *InEntry) +{ + ULONG_PTR Entry = InEntry ? *InEntry : MmGetPageEntrySectionSegment(Segment, Offset); BOOLEAN IsDirectMapped = FALSE; - Entry = MmGetPageEntrySectionSegment(Segment, Offset); if (Entry == 0) { DPRINT1("Entry == 0 for MmUnsharePageEntrySectionSegment\n"); @@ -844,7 +808,7 @@ } if (SHARE_COUNT_FROM_SSE(Entry) == 0) { - DPRINT1("Zero share count for unshare\n"); + DPRINT1("Zero share count for unshare (Seg %p Offset %x Page %x)\n", Segment, Offset->LowPart, PFN_FROM_SSE(Entry)); KeBugCheck(MEMORY_MANAGEMENT); } if (IS_SWAP_FROM_SSE(Entry)) @@ -913,10 +877,14 @@ * page without a rmap entry. */ MmSetPageEntrySectionSegment(Segment, Offset, Entry); + if (InEntry) *InEntry = Entry; + MiSetPageEvent(NULL, NULL); } else { MmSetPageEntrySectionSegment(Segment, Offset, 0); + if (InEntry) *InEntry = 0; + MiSetPageEvent(NULL, NULL); if (!IsDirectMapped) { MmReleasePageMemoryConsumer(MC_USER, Page); @@ -946,7 +914,9 @@ } } MmSetPageEntrySectionSegment(Segment, Offset, MAKE_SWAP_SSE(SavedSwapEntry)); + if (InEntry) *InEntry = MAKE_SWAP_SSE(SavedSwapEntry); MmSetSavedSwapEntryPage(Page, 0); + MiSetPageEvent(NULL, NULL); } MmReleasePageMemoryConsumer(MC_USER, Page); } @@ -959,7 +929,10 @@ } else { - MmSetPageEntrySectionSegment(Segment, Offset, Entry); + if (InEntry) + *InEntry = Entry; + else + MmSetPageEntrySectionSegment(Segment, Offset, Entry); } return(SHARE_COUNT_FROM_SSE(Entry) > 0); } @@ -1232,7 +1205,6 @@ ULONG_PTR Entry; ULONG_PTR Entry1; ULONG Attributes; - PMM_PAGEOP PageOp; PMM_REGION Region; BOOLEAN HasSwapEntry; PVOID PAddress; @@ -1270,7 +1242,7 @@ * Lock the segment */ MmLockSectionSegment(Segment); - + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); /* * Check if this page needs to be mapped COW */ @@ -1286,111 +1258,41 @@ } /* - * Get or create a page operation descriptor - */ - PageOp = MmGetPageOp(MemoryArea, NULL, 0, Segment, Offset.LowPart, MM_PAGEOP_PAGEIN, FALSE); - if (PageOp == NULL) - { - DPRINT1("MmGetPageOp failed\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* * Check if someone else is already handling this fault, if so wait * for them */ - if (PageOp->Thread != PsGetCurrentThread()) + if (Entry && IS_SWAP_FROM_SSE(Entry) && SWAPENTRY_FROM_SSE(Entry) == MM_WAIT_ENTRY) { MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); - Status = MmspWaitForPageOpCompletionEvent(PageOp); + MiWaitForPageEvent(NULL, NULL); + MmLockAddressSpace(AddressSpace); + DPRINT("Address 0x%.8X\n", Address); + return(STATUS_MM_RESTART_OPERATION); + } + + HasSwapEntry = MmIsPageSwapEntry(Process, Address); + + if (HasSwapEntry) + { + SWAPENTRY SwapEntry; /* - * Check for various strange conditions + * Is it a wait entry? */ - if (Status != STATUS_SUCCESS) - { - DPRINT1("Failed to wait for page op, status = %x\n", Status); - KeBugCheck(MEMORY_MANAGEMENT); - } - if (PageOp->Status == STATUS_PENDING) - { - DPRINT1("Woke for page op before completion\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - MmLockAddressSpace(AddressSpace); - /* - * If this wasn't a pagein then restart the operation - */ - if (PageOp->OpType != MM_PAGEOP_PAGEIN) - { - MmspCompleteAndReleasePageOp(PageOp); - DPRINT("Address 0x%.8X\n", Address); - return(STATUS_MM_RESTART_OPERATION); - } - - /* - * If the thread handling this fault has failed then we don't retry - */ - if (!NT_SUCCESS(PageOp->Status)) - { - Status = PageOp->Status; - MmspCompleteAndReleasePageOp(PageOp); - DPRINT("Address 0x%.8X\n", Address); - return(Status); - } - MmLockSectionSegment(Segment); - /* - * If the completed fault was for another address space then set the - * page in this one. - */ - if (!MmIsPagePresent(Process, Address)) - { - Entry = MmGetPageEntrySectionSegment(Segment, &Offset); - HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); - - if (PAGE_FROM_SSE(Entry) == 0 || HasSwapEntry) - { - /* - * The page was a private page in another or in our address space - */ - MmUnlockSectionSegment(Segment); - MmspCompleteAndReleasePageOp(PageOp); - return(STATUS_MM_RESTART_OPERATION); - } - - Page = PFN_FROM_SSE(Entry); - - MmSharePageEntrySectionSegment(Segment, &Offset); - - /* FIXME: Should we call MmCreateVirtualMappingUnsafe if - * (Section->AllocationAttributes & SEC_PHYSICALMEMORY) is true? - */ - Status = MmCreateVirtualMapping(Process, - PAddress, - Attributes, - &Page, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to create virtual mapping\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - MmInsertRmap(Page, Process, Address); - } - MmUnlockSectionSegment(Segment); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); - DPRINT("Address 0x%.8X\n", Address); - return(STATUS_SUCCESS); - } - - HasSwapEntry = MmIsPageSwapEntry(Process, Address); - if (HasSwapEntry) - { + MmGetPageFileMapping(Process, Address, &SwapEntry); + + if (SwapEntry == MM_WAIT_ENTRY) + { + MmUnlockSectionSegment(Segment); + MmUnlockAddressSpace(AddressSpace); + MiWaitForPageEvent(NULL, NULL); + MmLockAddressSpace(AddressSpace); + return STATUS_MM_RESTART_OPERATION; + } + /* * Must be private page we have swapped out. */ - SWAPENTRY SwapEntry; /* * Sanity check @@ -1445,8 +1347,7 @@ /* * Finish the operation */ - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(Process, Address); DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -1476,8 +1377,7 @@ /* * Cleanup and release locks */ - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(Process, Address); DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -1518,8 +1418,7 @@ /* * Cleanup and release locks */ - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(Process, Address); DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -1539,6 +1438,7 @@ /* * Release all our locks and read in the page from disk */ + MmSetPageEntrySectionSegment(Segment, &Offset, MAKE_SWAP_SSE(MM_WAIT_ENTRY)); MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); @@ -1573,11 +1473,64 @@ * Cleanup and release locks */ MmLockAddressSpace(AddressSpace); - PageOp->Status = Status; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(Process, Address); DPRINT("Address 0x%.8X\n", Address); return(Status); } + + /* + * Mark the offset within the section as having valid, in-memory + * data + */ + MmLockAddressSpace(AddressSpace); + MmLockSectionSegment(Segment); + Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); + MmSetPageEntrySectionSegment(Segment, &Offset, Entry); + MmUnlockSectionSegment(Segment); + + Status = MmCreateVirtualMapping(Process, + PAddress, + Attributes, + &Page, + 1); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to create virtual mapping\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + MmInsertRmap(Page, Process, Address); + + MiSetPageEvent(Process, Address); + DPRINT("Address 0x%.8X\n", Address); + return(STATUS_SUCCESS); + } + else if (IS_SWAP_FROM_SSE(Entry)) + { + SWAPENTRY SwapEntry; + + SwapEntry = SWAPENTRY_FROM_SSE(Entry); + + /* + * Release all our locks and read in the page from disk + */ + MmUnlockSectionSegment(Segment); + + MmUnlockAddressSpace(AddressSpace); + MI_SET_USAGE(MI_USAGE_SECTION); + if (Process) MI_SET_PROCESS2(Process->ImageFileName); + if (!Process) MI_SET_PROCESS2("Kernel Section"); + Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); + if (!NT_SUCCESS(Status)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + + Status = MmReadFromSwapPage(SwapEntry, Page); + if (!NT_SUCCESS(Status)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + /* * Relock the address space and segment */ @@ -1591,76 +1544,7 @@ Entry1 = MmGetPageEntrySectionSegment(Segment, &Offset); if (Entry != Entry1) { - DPRINT1("Someone changed ppte entry while we slept\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* - * Mark the offset within the section as having valid, in-memory - * data - */ - Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); - MmSetPageEntrySectionSegment(Segment, &Offset, Entry); - MmUnlockSectionSegment(Segment); - - Status = MmCreateVirtualMapping(Process, - PAddress, - Attributes, - &Page, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to create virtual mapping\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - MmInsertRmap(Page, Process, Address); - - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); - DPRINT("Address 0x%.8X\n", Address); - return(STATUS_SUCCESS); - } - else if (IS_SWAP_FROM_SSE(Entry)) - { - SWAPENTRY SwapEntry; - - SwapEntry = SWAPENTRY_FROM_SSE(Entry); - - /* - * Release all our locks and read in the page from disk - */ - MmUnlockSectionSegment(Segment); - - MmUnlockAddressSpace(AddressSpace); - MI_SET_USAGE(MI_USAGE_SECTION); - if (Process) MI_SET_PROCESS2(Process->ImageFileName); - if (!Process) MI_SET_PROCESS2("Kernel Section"); - Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - - Status = MmReadFromSwapPage(SwapEntry, Page); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* - * Relock the address space and segment - */ - MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); - - /* - * Check the entry. No one should change the status of a page - * that has a pending page-in. - */ - Entry1 = MmGetPageEntrySectionSegment(Segment, &Offset); - if (Entry != Entry1) - { - DPRINT1("Someone changed ppte entry while we slept\n"); + DPRINT1("Someone changed ppte entry while we slept (%x vs %x)\n", Entry, Entry1); KeBugCheck(MEMORY_MANAGEMENT); } @@ -1687,8 +1571,7 @@ KeBugCheck(MEMORY_MANAGEMENT); } MmInsertRmap(Page, Process, Address); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(Process, Address); DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -1715,8 +1598,7 @@ KeBugCheck(MEMORY_MANAGEMENT); } MmInsertRmap(Page, Process, Address); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(Process, Address); DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -1735,7 +1617,6 @@ NTSTATUS Status; PVOID PAddress; LARGE_INTEGER Offset; - PMM_PAGEOP PageOp; PMM_REGION Region; ULONG_PTR Entry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); @@ -1799,46 +1680,29 @@ /* * Get or create a pageop */ - PageOp = MmGetPageOp(MemoryArea, NULL, 0, Segment, Offset.LowPart, - MM_PAGEOP_ACCESSFAULT, FALSE); - if (PageOp == NULL) - { - DPRINT1("MmGetPageOp failed\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - + MmLockSectionSegment(Segment); + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); + /* * Wait for any other operations to complete */ - if (PageOp->Thread != PsGetCurrentThread()) - { - MmUnlockAddressSpace(AddressSpace); - Status = MmspWaitForPageOpCompletionEvent(PageOp); - /* - * Check for various strange conditions - */ - if (Status == STATUS_TIMEOUT) - { - DPRINT1("Failed to wait for page op, status = %x\n", Status); - KeBugCheck(MEMORY_MANAGEMENT); - } - if (PageOp->Status == STATUS_PENDING) - { - DPRINT1("Woke for page op before completion\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - /* - * Restart the operation - */ - MmLockAddressSpace(AddressSpace); - MmspCompleteAndReleasePageOp(PageOp); - DPRINT("Address 0x%.8X\n", Address); - return(STATUS_MM_RESTART_OPERATION); + if (Entry == SWAPENTRY_FROM_SSE(MM_WAIT_ENTRY)) + { + MmUnlockSectionSegment(Segment); + MmUnlockAddressSpace(AddressSpace); + MiWaitForPageEvent(NULL, NULL); + /* + * Restart the operation + */ + MmLockAddressSpace(AddressSpace); + DPRINT("Address 0x%.8X\n", Address); + return(STATUS_MM_RESTART_OPERATION); } /* * Release locks now we have the pageop */ + MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); /* @@ -1890,11 +1754,10 @@ MmDeleteRmap(OldPage, Process, PAddress); MmInsertRmap(NewPage, Process, PAddress); MmLockSectionSegment(Segment); - MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, FALSE, FALSE); + MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, FALSE, FALSE, NULL); MmUnlockSectionSegment(Segment); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(Process, Address); DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -1904,7 +1767,7 @@ { MM_SECTION_PAGEOUT_CONTEXT* PageOutContext; BOOLEAN WasDirty; - PFN_NUMBER Page; + PFN_NUMBER Page = 0; PageOutContext = (MM_SECTION_PAGEOUT_CONTEXT*)Context; if (Process) @@ -1928,7 +1791,8 @@ PageOutContext->Segment, &PageOutContext->Offset, PageOutContext->WasDirty, - TRUE); + TRUE, + &PageOutContext->SectionEntry); MmUnlockSectionSegment(PageOutContext->Segment); } if (Process) @@ -1940,21 +1804,17 @@ { MmReleasePageMemoryConsumer(MC_USER, Page); } - - DPRINT("PhysicalAddress %x, Address %x\n", Page << PAGE_SHIFT, Address); } NTSTATUS NTAPI MmPageOutSectionView(PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, - PVOID Address, - PMM_PAGEOP PageOp) + PVOID Address, ULONG_PTR Entry) { PFN_NUMBER Page; MM_SECTION_PAGEOUT_CONTEXT Context; SWAPENTRY SwapEntry; - ULONG_PTR Entry; ULONGLONG FileOffset; NTSTATUS Status; PFILE_OBJECT FileObject; @@ -1973,6 +1833,7 @@ */ Context.Segment = MemoryArea->Data.SectionData.Segment; Context.Section = MemoryArea->Data.SectionData.Section; + Context.SectionEntry = Entry; Context.CallingProcess = Process; Context.Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress @@ -1983,6 +1844,8 @@ FileObject = Context.Section->FileObject; DirectMapped = FALSE; + + MmLockSectionSegment(Context.Segment); #ifndef NEWCC if (FileObject != NULL && @@ -2035,16 +1898,14 @@ { DPRINT("Cannot page out locked section page: 0x%p (RefCount: %d)\n", Page, MmGetReferenceCountPage(Page)); - PageOp->Status = STATUS_UNSUCCESSFUL; - MmspCompleteAndReleasePageOp(PageOp); + MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); + MmUnlockSectionSegment(Context.Segment); return STATUS_UNSUCCESSFUL; } /* * Prepare the context structure for the rmap delete call. */ - MmLockSectionSegment(Context.Segment); - Entry = MmGetPageEntrySectionSegment(Context.Segment, &Context.Offset); MmUnlockSectionSegment(Context.Segment); Context.WasDirty = FALSE; if (Context.Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || @@ -2077,9 +1938,12 @@ } MmDeleteAllRmaps(Page, (PVOID)&Context, MmPageOutDeleteMapping); - MmLockSectionSegment(Context.Segment); - Entry = MmGetPageEntrySectionSegment(Context.Segment, &Context.Offset); - MmUnlockSectionSegment(Context.Segment); + + /* Since we passed in a surrogate, we'll get back the page entry + * state in our context. This is intended to make intermediate + * decrements of share count not release the wait entry. + */ + Entry = Context.SectionEntry; /* * If this wasn't a private page then we should have reduced the entry to @@ -2117,8 +1981,7 @@ MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, MAKE_SWAP_SSE(SwapEntry)); MmUnlockSectionSegment(Context.Segment); MmReleasePageMemoryConsumer(MC_USER, Page); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(NULL, NULL); return(STATUS_SUCCESS); } } @@ -2140,8 +2003,7 @@ MmUnlockSectionSegment(Context.Segment); } MmReleasePageMemoryConsumer(MC_USER, Page); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(NULL, NULL); return(STATUS_SUCCESS); } } @@ -2165,8 +2027,7 @@ KeBugCheckEx(MEMORY_MANAGEMENT, Status, (ULONG_PTR)Bcb, (ULONG_PTR)FileOffset, (ULONG_PTR)Address); } #endif - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(NULL, NULL); return(STATUS_SUCCESS); } else if (!Context.WasDirty && !DirectMapped && !Context.Private) @@ -2178,13 +2039,12 @@ KeBugCheckEx(MEMORY_MANAGEMENT, SwapEntry, Page, (ULONG_PTR)Process, (ULONG_PTR)Address); } MmReleasePageMemoryConsumer(MC_USER, Page); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(NULL, NULL); return(STATUS_SUCCESS); } else if (!Context.WasDirty && Context.Private && SwapEntry != 0) { - DPRINT1("Not dirty and private and not swapped (%p:%p)\n", Process, Address); + DPRINT("Not dirty and private and not swapped (%p:%p)\n", Process, Address); MmSetSavedSwapEntryPage(Page, 0); MmLockAddressSpace(AddressSpace); Status = MmCreatePageFileMapping(Process, @@ -2197,8 +2057,7 @@ KeBugCheckEx(MEMORY_MANAGEMENT, Status, (ULONG_PTR)Process, (ULONG_PTR)Address, SwapEntry); } MmReleasePageMemoryConsumer(MC_USER, Page); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(NULL, NULL); return(STATUS_SUCCESS); } @@ -2253,8 +2112,7 @@ MmUnlockSectionSegment(Context.Segment); } MmUnlockAddressSpace(AddressSpace); - PageOp->Status = STATUS_UNSUCCESSFUL; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(NULL, NULL); return(STATUS_PAGEFILE_QUOTA); } } @@ -2299,8 +2157,7 @@ MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); } MmUnlockAddressSpace(AddressSpace); - PageOp->Status = STATUS_UNSUCCESSFUL; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(NULL, NULL); return(STATUS_UNSUCCESSFUL); } @@ -2308,12 +2165,13 @@ * Otherwise we have succeeded. */ DPRINT("MM: Wrote section page 0x%.8X to swap!\n", Page << PAGE_SHIFT); - MmLockSectionSegment(Context.Segment); MmSetSavedSwapEntryPage(Page, 0); if (Context.Segment->Flags & MM_PAGEFILE_SEGMENT || Context.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED) { + MmLockSectionSegment(Context.Segment); MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, MAKE_SWAP_SSE(SwapEntry)); + MmUnlockSectionSegment(Context.Segment); } else { @@ -2323,9 +2181,11 @@ if (Context.Private) { MmLockAddressSpace(AddressSpace); + MmLockSectionSegment(Context.Segment); Status = MmCreatePageFileMapping(Process, Address, SwapEntry); + MmUnlockSectionSegment(Context.Segment); MmUnlockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { @@ -2335,13 +2195,15 @@ } else { + MmLockAddressSpace(AddressSpace); + MmLockSectionSegment(Context.Segment); Entry = MAKE_SWAP_SSE(SwapEntry); MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); - } - - MmUnlockSectionSegment(Context.Segment); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MmUnlockSectionSegment(Context.Segment); + MmUnlockAddressSpace(AddressSpace); + } + + MiSetPageEvent(NULL, NULL); return(STATUS_SUCCESS); } @@ -2350,7 +2212,7 @@ MmWritePageSectionView(PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID Address, - PMM_PAGEOP PageOp) + ULONG PageEntry) { LARGE_INTEGER Offset; PROS_SECTION_OBJECT Section; @@ -2447,12 +2309,16 @@ */ if (DirectMapped && !Private) { + LARGE_INTEGER SOffset; ASSERT(SwapEntry == 0); + SOffset.QuadPart = Offset.QuadPart + Segment->Image.FileOffset; #ifndef NEWCC - CcRosMarkDirtyCacheSegment(Bcb, (ULONG)(Offset.QuadPart + Segment->Image.FileOffset)); + CcRosMarkDirtyCacheSegment(Bcb, Offset.LowPart); #endif - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MmLockSectionSegment(Segment); + MmSetPageEntrySectionSegment(Segment, &Offset, PageEntry); + MmUnlockSectionSegment(Segment); + MiSetPageEvent(NULL, NULL); return(STATUS_SUCCESS); } @@ -2465,8 +2331,7 @@ if (SwapEntry == 0) { MmSetDirtyAllRmaps(Page); - PageOp->Status = STATUS_UNSUCCESSFUL; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(NULL, NULL); return(STATUS_PAGEFILE_QUOTA); } MmSetSavedSwapEntryPage(Page, SwapEntry); @@ -2481,8 +2346,7 @@ DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", Status); MmSetDirtyAllRmaps(Page); - PageOp->Status = STATUS_UNSUCCESSFUL; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(NULL, NULL); return(STATUS_UNSUCCESSFUL); } @@ -2490,8 +2354,7 @@ * Otherwise we have succeeded. */ DPRINT("MM: Wrote section page 0x%.8X to swap!\n", Page << PAGE_SHIFT); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); + MiSetPageEvent(NULL, NULL); return(STATUS_SUCCESS); } @@ -4039,8 +3902,6 @@ PBCB Bcb; LARGE_INTEGER Offset; SWAPENTRY SavedSwapEntry; - PMM_PAGEOP PageOp; - NTSTATUS Status; PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; PMMSUPPORT AddressSpace; @@ -4057,27 +3918,18 @@ Section = MemoryArea->Data.SectionData.Section; Segment = MemoryArea->Data.SectionData.Segment; - PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset.LowPart); - - while (PageOp) + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); + while (Entry && IS_SWAP_FROM_SSE(Entry) && SWAPENTRY_FROM_SSE(Entry) == MM_WAIT_ENTRY) { MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); - Status = MmspWaitForPageOpCompletionEvent(PageOp); - if (Status != STATUS_SUCCESS) - { - DPRINT1("Failed to wait for page op, status = %x\n", Status); - KeBugCheck(MEMORY_MANAGEMENT); - } + MiWaitForPageEvent(NULL, NULL); MmLockAddressSpace(AddressSpace); MmLockSectionSegment(Segment); - MmspCompleteAndReleasePageOp(PageOp); - PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset.LowPart); - } - - Entry = MmGetPageEntrySectionSegment(Segment, &Offset); + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); + } /* * For a dirty, datafile, non-private page mark it as dirty in the @@ -4136,7 +3988,7 @@ else { MmDeleteRmap(Page, Process, Address); - MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, Dirty, FALSE); + MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, Dirty, FALSE, NULL); } } } @@ -4208,9 +4060,7 @@ PMEMORY_AREA MemoryArea; PMMSUPPORT AddressSpace; PROS_SECTION_OBJECT Section; - PMM_PAGEOP PageOp; - ULONG_PTR Offset; - PVOID ImageBaseAddress = 0; + PVOID ImageBaseAddress = 0; DPRINT("Opening memory area Process %x BaseAddress %x\n", Process, BaseAddress); @@ -4232,40 +4082,6 @@ } MemoryArea->DeleteInProgress = TRUE; - - while (MemoryArea->PageOpCount) - { - Offset = PAGE_ROUND_UP((ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress); - - while (Offset) - { - Offset -= PAGE_SIZE; - PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, - MemoryArea->Data.SectionData.Segment, - Offset + MemoryArea->Data.SectionData.ViewOffset.QuadPart); - if (PageOp) - { - MmUnlockAddressSpace(AddressSpace); - Status = MmspWaitForPageOpCompletionEvent(PageOp); - if (Status != STATUS_SUCCESS) - { - DPRINT1("Failed to wait for page op, status = %x\n", Status); - KeBugCheck(MEMORY_MANAGEMENT); - } - MmLockAddressSpace(AddressSpace); - MmspCompleteAndReleasePageOp(PageOp); - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, - BaseAddress); - if (MemoryArea == NULL || - MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) - { - MmUnlockAddressSpace(AddressSpace); - return STATUS_NOT_MAPPED_VIEW; - } - break; - } - } - } Section = MemoryArea->Data.SectionData.Section;

1 0

[tkreuzer] 56440: [WIN32K] When a DC has the default palette selected, use the color value from PALETTERGB() directly instead of looking it up in the dc palette (just as the code was before). Fixes...
by tkreuzer＠svn.reactos.org 27 Apr '12

27 Apr '12

Author: tkreuzer Date: Fri Apr 27 17:18:30 2012 New Revision: 56440 URL: http://svn.reactos.org/svn/reactos?rev=56440&view=rev Log: [WIN32K] When a DC has the default palette selected, use the color value from PALETTERGB() directly instead of looking it up in the dc palette (just as the code was before). Fixes skipped bitmap winetests Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Fri Apr 27 17:18:30 2012 @@ -41,12 +41,20 @@ case 0x02: /* PALETTERGB */ - /* First find the nearest index in the dc palette */ - ppalDC = pdc->dclevel.ppal; - index = PALETTE_ulGetNearestIndex(ppalDC, crColor & 0xFFFFFF); - - /* Get the RGB value */ - crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); + if (pdc->dclevel.hpal != StockObjects[DEFAULT_PALETTE]) + { + /* First find the nearest index in the dc palette */ + ppalDC = pdc->dclevel.ppal; + index = PALETTE_ulGetNearestIndex(ppalDC, crColor & 0xFFFFFF); + + /* Get the RGB value */ + crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); + } + else + { + /* Use the pure color */ + crColor = crColor & 0x00FFFFFF; + } break; case 0x10: /* DIBINDEX */

1 0

[tkreuzer] 56439: [WIN32K] - In NtGdiSetPixel, return the real RGB value, which is the target format color translated back to RGB, not the desired RGB value. Fixes a few bitmap winetest. - Handle a...
by tkreuzer＠svn.reactos.org 27 Apr '12

27 Apr '12

Author: tkreuzer Date: Fri Apr 27 16:46:12 2012 New Revision: 56439 URL: http://svn.reactos.org/svn/reactos?rev=56439&view=rev Log: [WIN32K] - In NtGdiSetPixel, return the real RGB value, which is the target format color translated back to RGB, not the desired RGB value. Fixes a few bitmap winetest. - Handle a too large index in PALETTE_ulGetRGBColorFromIndex Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/palette.h Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Fri Apr 27 16:46:12 2012 @@ -37,7 +37,6 @@ /* Get the RGB value */ crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); - *pcrColor = crColor; break; case 0x02: /* PALETTERGB */ @@ -48,7 +47,6 @@ /* Get the RGB value */ crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, index); - *pcrColor = crColor; break; case 0x10: /* DIBINDEX */ @@ -62,10 +60,7 @@ /* Translate the color to RGB for the caller */ ppalSurface = pdc->dclevel.pSurface->ppal; - if (index < ppalSurface->NumColors) - *pcrColor = PALETTE_ulGetRGBColorFromIndex(ppalSurface, index); - else - *pcrColor = 0; + *pcrColor = PALETTE_ulGetRGBColorFromIndex(ppalSurface, index); return index; default: @@ -74,17 +69,27 @@ } /* Initialize an XLATEOBJ from RGB to the target surface */ + ppalSurface = pdc->dclevel.pSurface->ppal; + EXLATEOBJ_vInitialize(&exlo, &gpalRGB, ppalSurface, 0xFFFFFF, 0, 0); + + /* Translate the color to the target format */ + ulColor = XLATEOBJ_iXlate(&exlo.xlo, crColor); + + /* Cleanup the XLATEOBJ */ + EXLATEOBJ_vCleanup(&exlo); + + /* Initialize an XLATEOBJ from the target surface to RGB */ EXLATEOBJ_vInitialize(&exlo, + ppalSurface, &gpalRGB, - pdc->dclevel.pSurface->ppal, 0, pdc->pdcattr->crBackgroundClr, pdc->pdcattr->crForegroundClr); - /* Translate the color to the target format */ - ulColor = XLATEOBJ_iXlate(&exlo.xlo, crColor); - - /* Cleanup and return the RGB value */ + /* Translate the color back to RGB */ + *pcrColor = XLATEOBJ_iXlate(&exlo.xlo, ulColor); + + /* Cleanup and return the target format color */ EXLATEOBJ_vCleanup(&exlo); return ulColor; } Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Fri Apr 27 16:46:12 2012 @@ -100,6 +100,7 @@ ULONG PALETTE_ulGetRGBColorFromIndex(PPALETTE ppal, ULONG ulIndex) { + if (ulIndex >= ppal->NumColors) return 0; return RGB(ppal->IndexedColors[ulIndex].peRed, ppal->IndexedColors[ulIndex].peGreen, ppal->IndexedColors[ulIndex].peBlue);

1 0

[tfaber] 56438: [RTL] - Do not null terminate buffer before initializing its length in RtlDosSearchPath_Ustr. Use unicode string functions made for this purpose instead. See issue #7010 for more de...
by tfaber＠svn.reactos.org 27 Apr '12

27 Apr '12

Author: tfaber Date: Fri Apr 27 11:04:09 2012 New Revision: 56438 URL: http://svn.reactos.org/svn/reactos?rev=56438&view=rev Log: [RTL] - Do not null terminate buffer before initializing its length in RtlDosSearchPath_Ustr. Use unicode string functions made for this purpose instead. See issue #7010 for more details. Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=56438&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Fri Apr 27 11:04:09 2012 @@ -2400,20 +2400,12 @@ } /* Copy the filename */ - RtlCopyMemory(StaticCandidateString.Buffer, - FileNameString->Buffer, - FileNameString->Length); + RtlCopyUnicodeString(&StaticCandidateString, FileNameString); /* Copy the extension */ - RtlCopyMemory(&StaticCandidateString.Buffer[FileNameString->Length / sizeof(WCHAR)], - ExtensionString->Buffer, - ExtensionString->Length); - - /* Now NULL-terminate */ - StaticCandidateString.Buffer[StaticCandidateString.Length / sizeof(WCHAR)] = UNICODE_NULL; - - /* Finalize the length of the string to make it valid */ - StaticCandidateString.Length = FileNameString->Length + ExtensionString->Length; + RtlAppendUnicodeStringToString(&StaticCandidateString, + ExtensionString); + DPRINT("SB: %wZ\n", &StaticCandidateString); /* And check if this file now exists */

1 0

[tkreuzer] 56437: [WIN32K] In NtGdiGetPixel check if the requested pixel is inside the boundaries of the surface, and return CLR_INVALID if not.
by tkreuzer＠svn.reactos.org 27 Apr '12

27 Apr '12

Author: tkreuzer Date: Fri Apr 27 10:12:26 2012 New Revision: 56437 URL: http://svn.reactos.org/svn/reactos?rev=56437&view=rev Log: [WIN32K] In NtGdiGetPixel check if the requested pixel is inside the boundaries of the surface, and return CLR_INVALID if not. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Fri Apr 27 10:12:26 2012 @@ -1109,8 +1109,7 @@ _In_ INT y) { PDC pdc; - ULONG ulRGBColor; - BOOL bResult = FALSE; + ULONG ulRGBColor = CLR_INVALID; POINTL ptlSrc; PSURFACE psurfSrc, psurfDest; @@ -1119,7 +1118,7 @@ if (!pdc) { EngSetLastError(ERROR_INVALID_HANDLE); - return -1; + return CLR_INVALID; } /* Check if the DC has no surface (empty mem or info DC) */ @@ -1127,8 +1126,7 @@ if (psurfSrc == NULL) { /* Fail! */ - DC_UnlockDc(pdc); - return -1; + goto leave; } /* Get the logical coordinates */ @@ -1139,6 +1137,14 @@ IntLPtoDP(pdc, &ptlSrc, 1); ptlSrc.x += pdc->ptlDCOrig.x; ptlSrc.y += pdc->ptlDCOrig.y; + + /* Check if the pixel is outside the surface */ + if ((ptlSrc.x >= psurfSrc->SurfObj.sizlBitmap.cx) || + (ptlSrc.y >= psurfSrc->SurfObj.sizlBitmap.cy)) + { + /* Fail! */ + goto leave; + } /* Allocate a surface */ psurfDest = SURFACE_AllocSurface(STYPE_BITMAP, 1, 1, BMF_32BPP); @@ -1159,12 +1165,12 @@ RGB(0,0,0)); /* Call the copy bits function */ - bResult = IntEngCopyBits(&psurfDest->SurfObj, - &psurfSrc->SurfObj, - NULL, - &exlo.xlo, - &rclDest, - &ptlSrc); + EngCopyBits(&psurfDest->SurfObj, + &psurfSrc->SurfObj, + NULL, + &exlo.xlo, + &rclDest, + &ptlSrc); /* Cleanup the XLATEOBJ */ EXLATEOBJ_vCleanup(&exlo); @@ -1174,10 +1180,11 @@ GDIOBJ_vDeleteObject(&psurfDest->BaseObject); } +leave: /* Unlock the DC */ DC_UnlockDc(pdc); /* Return the new RGB color or -1 on failure */ - return bResult ? ulRGBColor : -1; -} - + return ulRGBColor; +} +

1 0

[tkreuzer] 56436: [WIN32K] Fix initialization of XLATEOBJ in NtGdiGetPixel. Fixes GetPixel regressions.
by tkreuzer＠svn.reactos.org 27 Apr '12

27 Apr '12

Author: tkreuzer Date: Fri Apr 27 09:31:24 2012 New Revision: 56436 URL: http://svn.reactos.org/svn/reactos?rev=56436&view=rev Log: [WIN32K] Fix initialization of XLATEOBJ in NtGdiGetPixel. Fixes GetPixel regressions. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Fri Apr 27 09:31:24 2012 @@ -1151,7 +1151,12 @@ EXLATEOBJ exlo; /* Translate from the source palette to RGB color */ - EXLATEOBJ_vInitialize(&exlo, psurfSrc->ppal, &gpalRGB, 0, 0, 0); + EXLATEOBJ_vInitialize(&exlo, + psurfSrc->ppal, + &gpalRGB, + 0, + RGB(0xff,0xff,0xff), + RGB(0,0,0)); /* Call the copy bits function */ bResult = IntEngCopyBits(&psurfDest->SurfObj,

1 0

[tfaber] 56435: [KMTEST] - Fix GCC build
by tfaber＠svn.reactos.org 27 Apr '12

27 Apr '12

Author: tfaber Date: Fri Apr 27 08:50:57 2012 New Revision: 56435 URL: http://svn.reactos.org/svn/reactos?rev=56435&view=rev Log: [KMTEST] - Fix GCC build Modified: trunk/rostests/kmtests/include/kmt_platform.h Modified: trunk/rostests/kmtests/include/kmt_platform.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_platf… ============================================================================== --- trunk/rostests/kmtests/include/kmt_platform.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_platform.h [iso-8859-1] Fri Apr 27 08:50:57 2012 @@ -49,6 +49,7 @@ #include <pseh/pseh2.h> #include <limits.h> +#include <malloc.h> #include <stdarg.h> #endif /* !defined _KMTEST_PLATFORM_H_ */

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 April 2012