Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[hyperion] 12734: Relaxed the validity checks for PE executables yet more (no limitation for the file layout anymore, as the memory manager doesn't really care and executables seen in the wild tend to be pretty eccentric). Documented with an ASSERT the fact that the file offset cannot overflow (MAXULONG + MAXULONG < MAXLONGLONG)

by hyperion＠svn.reactos.com

Relaxed the validity checks for PE executables yet more (no limitation for the file layout anymore, as the memory manager doesn't really care and executables seen in the wild tend to be pretty eccentric). Documented with an ASSERT the fact that the file offset cannot overflow (MAXULONG + MAXULONG < MAXLONGLONG) Modified: trunk/reactos/ntoskrnl/mm/pe.c _____ Modified: trunk/reactos/ntoskrnl/mm/pe.c --- trunk/reactos/ntoskrnl/mm/pe.c 2005-01-02 19:36:33 UTC (rev 12733) +++ trunk/reactos/ntoskrnl/mm/pe.c 2005-01-02 20:09:39 UTC (rev 12734) @@ -74,6 +74,19 @@ return Addend1 <= (MAXULONG_PTR - Addend2); } +#ifndef MAXLONGLONG +#define MAXLONGLONG ((LONGLONG)((~((ULONGLONG)0)) >> 1)) +#endif + +static __inline BOOLEAN Intsafe_CanAddLong64 +( + IN LONG64 Addend1, + IN LONG64 Addend2 +) +{ + return Addend1 <= (MAXLONGLONG - Addend2); +} + static __inline BOOLEAN Intsafe_CanAddULong32 ( IN ULONG Addend1, @@ -210,7 +223,7 @@ LARGE_INTEGER lnOffset; PVOID pBuffer; ULONG nPrevVirtualEndOfSegment; - ULONG nPrevFileEndOfSegment; + ULONG nFileSizeOfHeaders; ULONG i; ASSERT(FileHeader); @@ -623,7 +636,7 @@ ASSERT(IsAligned(cbHeadersSize, nFileAlignment)); - if(!AlignUp(&nPrevFileEndOfSegment, cbHeadersSize, nFileAlignment)) + if(!AlignUp(&nFileSizeOfHeaders, cbHeadersSize, nFileAlignment)) DIE(("Cannot align the size of the section headers\n")); if(!AlignUp(&nPrevVirtualEndOfSegment, cbHeadersSize, nSectionAlignment)) @@ -632,7 +645,7 @@ pssSegments[0].FileOffset = 0; pssSegments[0].Protection = PAGE_READONLY; pssSegments[0].Length = nPrevVirtualEndOfSegment; - pssSegments[0].RawLength = nPrevFileEndOfSegment; + pssSegments[0].RawLength = nFileSizeOfHeaders; pssSegments[0].VirtualAddress = 0; pssSegments[0].Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA; pssSegments[0].WriteCopy = TRUE; @@ -665,12 +678,6 @@ if(!IsAligned(pishSectionHeaders[i].PointerToRawData, nFileAlignment)) DIE(("PointerToRawData[%u] is not aligned\n", i)); - /* sections must be contiguous, ordered by base address and non-overlapping */ -#if 0 - if(pishSectionHeaders[i].PointerToRawData != nPrevFileEndOfSegment) - DIE(("File gap between section %u and the previous\n", i)); -#endif - /* conversion */ pssSegments[i].FileOffset = pishSectionHeaders[i].PointerToRawData; pssSegments[i].RawLength = pishSectionHeaders[i].SizeOfRawData; @@ -681,6 +688,8 @@ ASSERT(pssSegments[i].RawLength == 0); } + ASSERT(Intsafe_CanAddLong64(pssSegments[i].FileOffset, pssSegments[i].RawLength)); + nCharacteristics = pishSectionHeaders[i].Characteristics; /* no explicit protection */ @@ -716,13 +725,6 @@ pssSegments[i].VirtualAddress = pishSectionHeaders[i].VirtualAddress; pssSegments[i].Characteristics = pishSectionHeaders[i].Characteristics; - /* ensure the executable is no larger than 4GB */ - if(pssSegments[i].RawLength != 0) - { - if(!Intsafe_AddULong32(&nPrevFileEndOfSegment, pssSegments[i].FileOffset, pssSegments[i].RawLength)) - DIE(("The executable is larger than 4GB\n")); - } - /* ensure the memory image is no larger than 4GB */ if(!Intsafe_AddULong32(&nPrevVirtualEndOfSegment, pssSegments[i].VirtualAddress, pssSegments[i].Length)) DIE(("The image is larger than 4GB\n"));

19 years, 11 months

[navaraf] 12733: Don't flush cache on ATAPI devices.

by navaraf＠svn.reactos.com

Don't flush cache on ATAPI devices. Modified: branches/ros-branch-0_2_5/reactos/drivers/storage/atapi/atapi.c _____ Modified: branches/ros-branch-0_2_5/reactos/drivers/storage/atapi/atapi.c --- branches/ros-branch-0_2_5/reactos/drivers/storage/atapi/atapi.c 2005-01-02 19:27:53 UTC (rev 12732) +++ branches/ros-branch-0_2_5/reactos/drivers/storage/atapi/atapi.c 2005-01-02 19:36:33 UTC (rev 12733) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: atapi.c,v 1.56 2004/11/18 08:32:32 gvg Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS ATAPI miniport driver @@ -2224,6 +2224,17 @@ DPRINT("SCSIOP_SYNCRONIZE_CACHE: TargetId: %lu\n", Srb->TargetId); + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_ATAPI) + { + /* NOTE: Don't flush the cache for ATAPI devices. Although + * the ATAPI-6 standard allows that, it has been experimentally + * proved that it can damage some broken LG drives. Afterall + * it doesn't make sense to flush cache on devices we don't + * write to. + */ + return STATUS_SUCCESS; + } + /* Wait for BUSY to clear */ for (Retries = 0; Retries < IDE_MAX_BUSY_RETRIES; Retries++) {

19 years, 11 months

[navaraf] 12732: Disable debugging message.

by navaraf＠svn.reactos.com

Disable debugging message. Modified: trunk/reactos/tools/mkhive/reginf.c _____ Modified: trunk/reactos/tools/mkhive/reginf.c --- trunk/reactos/tools/mkhive/reginf.c 2005-01-02 19:14:52 UTC (rev 12731) +++ trunk/reactos/tools/mkhive/reginf.c 2005-01-02 19:27:53 UTC (rev 12732) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: reginf.c,v 1.8 2004/12/30 16:02:12 royce Exp $ +/* $Id$ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS hive maker * FILE: tools/mkhive/reginf.h @@ -298,7 +298,7 @@ { ULONG dw = Str ? strtoul (Str, NULL, 0) : 0; - DPRINT1("setting dword %s to %lx\n", ValueName, dw); + DPRINT("setting dword %s to %lx\n", ValueName, dw); RegSetValue (KeyHandle, ValueName, @@ -308,7 +308,7 @@ } else { - DPRINT1 ("setting value %s to %s\n", ValueName, Str); + DPRINT("setting value %s to %s\n", ValueName, Str); if (Str) {

19 years, 11 months

[navaraf] 12731: Rename MmOpenMemoryAreaBy[Address/Region] to MmLocateMemoryAreaBy[Address/Region].

by navaraf＠svn.reactos.com

Rename MmOpenMemoryAreaBy[Address/Region] to MmLocateMemoryAreaBy[Address/Region]. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/drvlck.c Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/mdl.c Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/rmap.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-01-02 18:04:59 UTC (rev 12730) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-01-02 19:14:52 UTC (rev 12731) @@ -377,11 +377,11 @@ PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL); PMEMORY_AREA STDCALL -MmOpenMemoryAreaByAddress( +MmLocateMemoryAreaByAddress( PMADDRESS_SPACE AddressSpace, PVOID Address); -ULONG STDCALL +ULONG_PTR STDCALL MmFindGapAtAddress( PMADDRESS_SPACE AddressSpace, PVOID Address); @@ -404,7 +404,7 @@ MmDumpMemoryAreas(PMADDRESS_SPACE AddressSpace); PMEMORY_AREA STDCALL -MmOpenMemoryAreaByRegion( +MmLocateMemoryAreaByRegion( PMADDRESS_SPACE AddressSpace, PVOID Address, ULONG_PTR Length); _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2005-01-02 18:04:59 UTC (rev 12730) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2005-01-02 19:14:52 UTC (rev 12731) @@ -580,8 +580,7 @@ if (PBaseAddress != 0) { - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, - BaseAddress); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); if (MemoryArea != NULL) { @@ -813,8 +812,7 @@ AddressSpace = &Process->AddressSpace; MmLockAddressSpace(AddressSpace); - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, - BaseAddress); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); if (MemoryArea == NULL) { MmUnlockAddressSpace(AddressSpace); _____ Modified: trunk/reactos/ntoskrnl/mm/drvlck.c --- trunk/reactos/ntoskrnl/mm/drvlck.c 2005-01-02 18:04:59 UTC (rev 12730) +++ trunk/reactos/ntoskrnl/mm/drvlck.c 2005-01-02 19:14:52 UTC (rev 12731) @@ -50,7 +50,7 @@ MmLockPagableCodeSection(IN PVOID AddressWithinSection) { PVOID Handle; - Handle = MmOpenMemoryAreaByAddress(NULL,AddressWithinSection); + Handle = MmLocateMemoryAreaByAddress(NULL,AddressWithinSection); MmLockPagableSectionByHandle(Handle); return(Handle); } @@ -64,7 +64,7 @@ MmLockPagableDataSection(IN PVOID AddressWithinSection) { PVOID Handle; - Handle = MmOpenMemoryAreaByAddress(NULL, AddressWithinSection); + Handle = MmLocateMemoryAreaByAddress(NULL, AddressWithinSection); MmLockPagableSectionByHandle(Handle); return(Handle); } _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2005-01-02 18:04:59 UTC (rev 12730) +++ trunk/reactos/ntoskrnl/mm/marea.c 2005-01-02 19:14:52 UTC (rev 12731) @@ -197,13 +197,13 @@ } PMEMORY_AREA STDCALL -MmOpenMemoryAreaByAddress( +MmLocateMemoryAreaByAddress( PMADDRESS_SPACE AddressSpace, PVOID Address) { PMEMORY_AREA Node = AddressSpace->MemoryAreaRoot; - DPRINT("MmOpenMemoryAreaByAddress(AddressSpace %x, Address %x)\n", + DPRINT("MmLocateMemoryAreaByAddress(AddressSpace %x, Address %x)\n", AddressSpace, Address); if (!(KdDebugState & KD_DEBUG_SCREEN)) @@ -217,18 +217,18 @@ Node = Node->RightChild; else { - DPRINT("MmOpenMemoryAreaByAddress(%x): %x [%x - %x]\n", + DPRINT("MmLocateMemoryAreaByAddress(%x): %x [%x - %x]\n", Address, Node, Node->StartingAddress, Node->EndingAddress); return Node; } } - DPRINT("MmOpenMemoryAreaByAddress(%x): 0\n", Address); + DPRINT("MmLocateMemoryAreaByAddress(%x): 0\n", Address); return NULL; } PMEMORY_AREA STDCALL -MmOpenMemoryAreaByRegion( +MmLocateMemoryAreaByRegion( PMADDRESS_SPACE AddressSpace, PVOID Address, ULONG_PTR Length) @@ -250,7 +250,7 @@ if (Node->StartingAddress >= Address && Node->StartingAddress < Extent) { - DPRINT("MmOpenMemoryAreaByRegion(%x - %x): %x - %x\n", + DPRINT("MmLocateMemoryAreaByRegion(%x - %x): %x - %x\n", Address, Address + Length, Node->StartingAddress, Node->EndingAddress); return Node; @@ -258,7 +258,7 @@ if (Node->EndingAddress > Address && Node->EndingAddress < Extent) { - DPRINT("MmOpenMemoryAreaByRegion(%x - %x): %x - %x\n", + DPRINT("MmLocateMemoryAreaByRegion(%x - %x): %x - %x\n", Address, Address + Length, Node->StartingAddress, Node->EndingAddress); return Node; @@ -266,14 +266,14 @@ if (Node->StartingAddress <= Address && Node->EndingAddress >= Extent) { - DPRINT("MmOpenMemoryAreaByRegion(%x - %x): %x - %x\n", + DPRINT("MmLocateMemoryAreaByRegion(%x - %x): %x - %x\n", Address, Address + Length, Node->StartingAddress, Node->EndingAddress); return Node; } if (Node->StartingAddress >= Extent) { - DPRINT("Finished MmOpenMemoryAreaByRegion() = NULL\n"); + DPRINT("Finished MmLocateMemoryAreaByRegion() = NULL\n"); return NULL; } } @@ -866,14 +866,14 @@ { PMEMORY_AREA MemoryArea; - DPRINT("MmFreeMemoryArea(AddressSpace %x, BaseAddress %x, Length %x," - "FreePageContext %d)\n",AddressSpace,BaseAddress,Length, + DPRINT("MmFreeMemoryArea(AddressSpace %x, BaseAddress %x, " + "FreePageContext %d)\n", AddressSpace, BaseAddress, FreePageContext); MmVerifyMemoryAreas(AddressSpace); - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, - BaseAddress); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, + BaseAddress); if (MemoryArea == NULL) { KEBUGCHECK(0); @@ -974,9 +974,9 @@ ASSERT(((ULONG_PTR)*BaseAddress/BoundaryAddressMultiple.QuadPart) == ((DWORD_PTR)EndAddress/BoundaryAddressMultiple.QuadPart)); } - if (MmOpenMemoryAreaByRegion(AddressSpace, - *BaseAddress, - tmpLength)!=NULL) + if (MmLocateMemoryAreaByRegion(AddressSpace, + *BaseAddress, + tmpLength) != NULL) { DPRINT("Memory area already occupied\n"); return STATUS_CONFLICTING_ADDRESSES; @@ -1016,7 +1016,7 @@ MmVerifyMemoryAreas(AddressSpace); - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, BaseAddress); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); if (MemoryArea != NULL) { Entry = MemoryArea->Data.VirtualMemoryData.RegionListHead.Flink; _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-01-02 18:04:59 UTC (rev 12730) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-01-02 19:14:52 UTC (rev 12731) @@ -409,7 +409,7 @@ ASSERT(Mdl->Process == PsGetCurrentProcess()); - Marea = MmOpenMemoryAreaByAddress( &Mdl->Process->AddressSpace, BaseAddress ); + Marea = MmLocateMemoryAreaByAddress( &Mdl->Process->AddressSpace, BaseAddress ); if (Marea == NULL) { DPRINT1( "Couldn't open memory area when unmapping user-space pages!\n" ); _____ Modified: trunk/reactos/ntoskrnl/mm/mm.c --- trunk/reactos/ntoskrnl/mm/mm.c 2005-01-02 18:04:59 UTC (rev 12730) +++ trunk/reactos/ntoskrnl/mm/mm.c 2005-01-02 19:14:52 UTC (rev 12731) @@ -187,8 +187,8 @@ } MmLockAddressSpace(AddressSpace); - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, - VirtualAddress); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, + VirtualAddress); if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { @@ -247,7 +247,7 @@ } do { - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, (PVOID)Address); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)Address); if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { if (!FromMdl) @@ -374,7 +374,7 @@ */ do { - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, (PVOID)Address); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)Address); if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { if (!FromMdl) _____ Modified: trunk/reactos/ntoskrnl/mm/rmap.c --- trunk/reactos/ntoskrnl/mm/rmap.c 2005-01-02 18:04:59 UTC (rev 12730) +++ trunk/reactos/ntoskrnl/mm/rmap.c 2005-01-02 19:14:52 UTC (rev 12731) @@ -117,7 +117,7 @@ * freed or paged out after we read the rmap entry.) */ MmLockAddressSpace(AddressSpace); - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, Address); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { MmUnlockAddressSpace(AddressSpace); @@ -242,7 +242,7 @@ } MmLockAddressSpace(AddressSpace); - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, Address); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); if (MemoryArea == NULL || MemoryArea->DeleteInProgress) { MmUnlockAddressSpace(AddressSpace); _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-01-02 18:04:59 UTC (rev 12730) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-01-02 19:14:52 UTC (rev 12731) @@ -1829,7 +1829,7 @@ BOOL DoCOW = FALSE; ULONG i; - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, BaseAddress); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); Segment = MemoryArea->Data.SectionData.Segment; if ((Segment->WriteCopy || MemoryArea->Data.SectionData.WriteCopyView) && @@ -3688,8 +3688,8 @@ PMM_REGION CurrentRegion; PLIST_ENTRY RegionListHead; - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, - BaseAddress); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, + BaseAddress); if (MemoryArea == NULL) { return(STATUS_UNSUCCESSFUL); @@ -3749,8 +3749,8 @@ ASSERT(Process); AddressSpace = &Process->AddressSpace; - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, - BaseAddress); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, + BaseAddress); if (MemoryArea == NULL || MemoryArea->Type != MEMORY_AREA_SECTION_VIEW || MemoryArea->DeleteInProgress) @@ -4209,8 +4209,8 @@ } /* Check there is enough space to map the section at that point. */ - if (MmOpenMemoryAreaByRegion(AddressSpace, (PVOID)ImageBase, - PAGE_ROUND_UP(ImageSize)) != NULL) + if (MmLocateMemoryAreaByRegion(AddressSpace, (PVOID)ImageBase, + PAGE_ROUND_UP(ImageSize)) != NULL) { /* Fail if the user requested a fixed base address. */ if ((*BaseAddress) != NULL) _____ Modified: trunk/reactos/ntoskrnl/mm/virtual.c --- trunk/reactos/ntoskrnl/mm/virtual.c 2005-01-02 18:04:59 UTC (rev 12730) +++ trunk/reactos/ntoskrnl/mm/virtual.c 2005-01-02 19:14:52 UTC (rev 12731) @@ -160,8 +160,7 @@ AddressSpace = MmGetKernelAddressSpace(); } MmLockAddressSpace(AddressSpace); - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, - Address); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); switch(VirtualMemoryInformationClass) { case MemoryBasicInformation: @@ -405,8 +404,7 @@ AddressSpace = &Process->AddressSpace; MmLockAddressSpace(AddressSpace); - MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, - BaseAddress); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); if (MemoryArea == NULL) { MmUnlockAddressSpace(AddressSpace);

19 years, 11 months

[navaraf] 12730: Implement ExtCreateRegion.

by navaraf＠svn.reactos.com

Implement ExtCreateRegion. Modified: trunk/reactos/include/win32k/region.h Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/subsys/win32k/objects/region.c _____ Modified: trunk/reactos/include/win32k/region.h --- trunk/reactos/include/win32k/region.h 2005-01-02 18:00:31 UTC (rev 12729) +++ trunk/reactos/include/win32k/region.h 2005-01-02 18:04:59 UTC (rev 12730) @@ -79,9 +79,9 @@ HRGN STDCALL -NtGdiExtCreateRegion(CONST PXFORM Xform, - DWORD Count, - CONST PROSRGNDATA RgnData); +NtGdiExtCreateRegion(CONST XFORM *Xform, + DWORD Count, + CONST RGNDATA *RgnData); BOOL STDCALL _____ Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2005-01-02 18:00:31 UTC (rev 12729) +++ trunk/reactos/lib/gdi32/gdi32.def 2005-01-02 18:04:59 UTC (rev 12730) @@ -1,4 +1,4 @@ -; $Id: gdi32.def,v 1.13 2004/12/30 02:32:23 navaraf Exp $ +; $Id$ ; ; gdi32.def ; @@ -168,7 +168,7 @@ EudcUnloadLinkW@8 ExcludeClipRect@20=NtGdiExcludeClipRect@20 ExtCreatePen@20=NtGdiExtCreatePen@20 -ExtCreateRegion@12 +ExtCreateRegion@12=NtGdiExtCreateRegion@12 ExtEscape@24=NtGdiExtEscape@24 ExtFloodFill@20=NtGdiExtFloodFill@20 ExtSelectClipRgn@12=NtGdiExtSelectClipRgn@12 _____ Modified: trunk/reactos/subsys/win32k/objects/region.c --- trunk/reactos/subsys/win32k/objects/region.c 2005-01-02 18:00:31 UTC (rev 12729) +++ trunk/reactos/subsys/win32k/objects/region.c 2005-01-02 18:04:59 UTC (rev 12730) @@ -113,7 +113,7 @@ * the y-x-banding that's so nice to have... */ -/* $Id: region.c,v 1.64 2004/12/12 01:40:38 weiden Exp $ */ +/* $Id$ */ #include <w32k.h> #include <win32k/float.h> @@ -2224,12 +2224,57 @@ HRGN STDCALL -NtGdiExtCreateRegion(CONST PXFORM Xform, - DWORD Count, - CONST PROSRGNDATA RgnData) +NtGdiExtCreateRegion(CONST XFORM *Xform, + DWORD Count, + CONST RGNDATA *RgnData) { - UNIMPLEMENTED; - return 0; + HRGN hRgn; + RGNDATA SafeRgnData; + PROSRGNDATA Region; + NTSTATUS Status; + + if (Count < FIELD_OFFSET(RGNDATA, Buffer)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return NULL; + } + + Status = MmCopyFromCaller(&SafeRgnData, RgnData, min(Count, sizeof(RGNDATA))); + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return NULL; + } + + hRgn = RGNDATA_AllocRgn(SafeRgnData.rdh.nCount); + if (hRgn == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + Region = RGNDATA_LockRgn(hRgn); + if (Region == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + RtlCopyMemory(&Region->rdh, &SafeRgnData, FIELD_OFFSET(RGNDATA, Buffer)); + + Status = MmCopyFromCaller(Region->Buffer, RgnData->Buffer, + Count - FIELD_OFFSET(RGNDATA, Buffer)); + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RGNDATA_UnlockRgn(hRgn); + NtGdiDeleteObject(hRgn); + return NULL; + } + + RGNDATA_UnlockRgn(hRgn); + + return hRgn; } BOOL

19 years, 11 months

[navaraf] 12729: Allocate enough bytes for the adapter object.

by navaraf＠svn.reactos.com

Allocate enough bytes for the adapter object. Modified: trunk/reactos/hal/halx86/generic/adapter.c _____ Modified: trunk/reactos/hal/halx86/generic/adapter.c --- trunk/reactos/hal/halx86/generic/adapter.c 2005-01-02 17:55:06 UTC (rev 12728) +++ trunk/reactos/hal/halx86/generic/adapter.c 2005-01-02 18:00:31 UTC (rev 12729) @@ -1,4 +1,4 @@ -/* $Id: adapter.c,v 1.1 2004/12/03 20:10:43 gvg Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -203,7 +203,7 @@ /* Check if this is the Master Adapter, in which case we need to allocate the bitmap */ if (IsMaster) { /* Size due to the Bitmap + Bytes in the Bitmap Buffer (8 bytes, 64 bits)*/ - BitmapSize = sizeof(RTL_BITMAP) + AllowedMapRegisters / 8; + BitmapSize = sizeof(RTL_BITMAP) + (AllowedMapRegisters + 7) / 8; /* We will put the Bitmap Buffer after the Adapter Object for simplicity */ ObjectSize = sizeof(ADAPTER_OBJECT) + BitmapSize;

19 years, 11 months

[navaraf] 12728: Change the MEMORY_AREAs to be stored it a binary search tree instead of linked list. Thanks to Royce Mitchell III and Mike Nordell for helping me.

by navaraf＠svn.reactos.com

Change the MEMORY_AREAs to be stored it a binary search tree instead of linked list. Thanks to Royce Mitchell III and Mike Nordell for helping me. Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/aspace.c Modified: trunk/reactos/ntoskrnl/mm/cont.c Modified: trunk/reactos/ntoskrnl/mm/drvlck.c Modified: trunk/reactos/ntoskrnl/mm/iospace.c Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/mdl.c Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ncache.c Modified: trunk/reactos/ntoskrnl/mm/pe.c Modified: trunk/reactos/ntoskrnl/mm/rmap.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/ps/w32call.c _____ Modified: trunk/reactos/ntoskrnl/cc/view.c --- trunk/reactos/ntoskrnl/cc/view.c 2005-01-02 17:47:07 UTC (rev 12727) +++ trunk/reactos/ntoskrnl/cc/view.c 2005-01-02 17:55:06 UTC (rev 12728) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: view.c,v 1.79 2004/10/22 20:11:12 ekohl Exp $ +/* $Id$ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/view.c @@ -813,8 +813,7 @@ #else MmLockAddressSpace(MmGetKernelAddressSpace()); MmFreeMemoryArea(MmGetKernelAddressSpace(), - CacheSeg->BaseAddress, - CacheSeg->Bcb->CacheSegmentSize, + CacheSeg->MemoryArea, CcFreeCachePage, NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-01-02 17:47:07 UTC (rev 12727) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-01-02 17:55:06 UTC (rev 12728) @@ -184,15 +184,17 @@ #endif /* __USE_W32API */ -typedef struct +typedef struct _MEMORY_AREA { + PVOID StartingAddress; + PVOID EndingAddress; + struct _MEMORY_AREA *Parent; + struct _MEMORY_AREA *LeftChild; + struct _MEMORY_AREA *RightChild; ULONG Type; - PVOID BaseAddress; - ULONG Length; ULONG Attributes; - LIST_ENTRY Entry; ULONG LockCount; - struct _EPROCESS* Process; + struct _EPROCESS* Process; /* FIXME: We don't need this! */ BOOLEAN DeleteInProgress; ULONG PageOpCount; union @@ -215,7 +217,7 @@ typedef struct _MADDRESS_SPACE { - LIST_ENTRY MAreaListHead; + PMEMORY_AREA MemoryAreaRoot; FAST_MUTEX Lock; PVOID LowestAddress; struct _EPROCESS* Process; @@ -333,6 +335,10 @@ LIST_ENTRY RegionListEntry; } MM_REGION, *PMM_REGION; +typedef VOID (*PMM_FREE_PAGE_FUNC)(PVOID Context, PMEMORY_AREA MemoryArea, + PVOID Address, PFN_TYPE Page, + SWAPENTRY SwapEntry, BOOLEAN Dirty); + /* FUNCTIONS */ /* aspace.c ******************************************************************/ @@ -354,49 +360,68 @@ /* marea.c *******************************************************************/ -NTSTATUS MmCreateMemoryArea(struct _EPROCESS* Process, - PMADDRESS_SPACE AddressSpace, - ULONG Type, - PVOID* BaseAddress, - ULONG Length, - ULONG Attributes, - MEMORY_AREA** Result, - BOOL FixedAddress, - BOOL TopDown, - PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL); +NTSTATUS INIT_FUNCTION +MmInitMemoryAreas(VOID); -MEMORY_AREA* MmOpenMemoryAreaByAddress(PMADDRESS_SPACE AddressSpace, - PVOID Address); +NTSTATUS STDCALL +MmCreateMemoryArea( + struct _EPROCESS* Process, + PMADDRESS_SPACE AddressSpace, + ULONG Type, + PVOID *BaseAddress, + ULONG_PTR Length, + ULONG Attributes, + PMEMORY_AREA *Result, + BOOLEAN FixedAddress, + BOOLEAN TopDown, + PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL); -ULONG MmFindGapAtAddress(PMADDRESS_SPACE AddressSpace, - PVOID Address); +PMEMORY_AREA STDCALL +MmOpenMemoryAreaByAddress( + PMADDRESS_SPACE AddressSpace, + PVOID Address); -NTSTATUS MmInitMemoryAreas(VOID); +ULONG STDCALL +MmFindGapAtAddress( + PMADDRESS_SPACE AddressSpace, + PVOID Address); -NTSTATUS MmFreeMemoryArea(PMADDRESS_SPACE AddressSpace, - PVOID BaseAddress, - ULONG Length, - VOID (*FreePage)(PVOID Context, MEMORY_AREA* MemoryArea, - PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, - BOOLEAN Dirty), - PVOID FreePageContext); +NTSTATUS STDCALL +MmFreeMemoryArea( + PMADDRESS_SPACE AddressSpace, + PMEMORY_AREA MemoryArea, + PMM_FREE_PAGE_FUNC FreePage, + PVOID FreePageContext); -VOID MmDumpMemoryAreas(PLIST_ENTRY ListHead); +NTSTATUS STDCALL +MmFreeMemoryAreaByPtr( + PMADDRESS_SPACE AddressSpace, + PVOID BaseAddress, + PMM_FREE_PAGE_FUNC FreePage, + PVOID FreePageContext); -NTSTATUS MmLockMemoryArea(MEMORY_AREA* MemoryArea); +VOID STDCALL +MmDumpMemoryAreas(PMADDRESS_SPACE AddressSpace); -NTSTATUS MmUnlockMemoryArea(MEMORY_AREA* MemoryArea); +PMEMORY_AREA STDCALL +MmOpenMemoryAreaByRegion( + PMADDRESS_SPACE AddressSpace, + PVOID Address, + ULONG_PTR Length); -MEMORY_AREA* MmOpenMemoryAreaByRegion(PMADDRESS_SPACE AddressSpace, - PVOID Address, - ULONG Length); +PVOID STDCALL +MmFindGap( + PMADDRESS_SPACE AddressSpace, + ULONG_PTR Length, + ULONG_PTR Granularity, + BOOLEAN TopDown); -PVOID MmFindGap(PMADDRESS_SPACE AddressSpace, ULONG Length, ULONG Granularity, BOOL TopDown); +VOID STDCALL +MmReleaseMemoryAreaIfDecommitted( + PEPROCESS Process, + PMADDRESS_SPACE AddressSpace, + PVOID BaseAddress); -void MmReleaseMemoryAreaIfDecommitted(PEPROCESS Process, - PMADDRESS_SPACE AddressSpace, - PVOID BaseAddress); - /* npool.c *******************************************************************/ VOID MiDebugDumpNonPagedPool(BOOLEAN NewOnly); _____ Modified: trunk/reactos/ntoskrnl/ke/bug.c --- trunk/reactos/ntoskrnl/ke/bug.c 2005-01-02 17:47:07 UTC (rev 12727) +++ trunk/reactos/ntoskrnl/ke/bug.c 2005-01-02 17:55:06 UTC (rev 12728) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: bug.c,v 1.48 2004/12/12 17:42:00 hbirr Exp $ +/* $Id$ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/bug.c @@ -116,6 +116,11 @@ Ke386DisableInterrupts(); DebugLogDumpMessages(); + if (MmGetKernelAddressSpace()->Lock.Owner == KeGetCurrentThread()) + { + MmUnlockAddressSpace(MmGetKernelAddressSpace()); + } + if (KeGetCurrentIrql() < DISPATCH_LEVEL) { KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-01-02 17:47:07 UTC (rev 12727) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-01-02 17:55:06 UTC (rev 12728) @@ -320,7 +320,7 @@ { KeRosPrintAddress((PVOID)Frame[1]); Frame = (PULONG)Frame[0]; - DbgPrint(" "); + DbgPrint("\n"); } #else DbgPrint("Frames: "); @@ -663,7 +663,7 @@ break; StackBase = Frame; Frame = (PULONG)Frame[0]; - DbgPrint(" "); + DbgPrint("\n"); } } _SEH_HANDLE _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-01-02 17:47:07 UTC (rev 12727) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-01-02 17:55:06 UTC (rev 12728) @@ -90,11 +90,10 @@ if (Thread->StackLimit != (ULONG_PTR)&init_stack) { MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryArea(MmGetKernelAddressSpace(), - (PVOID)Thread->StackLimit, - MM_STACK_SIZE, - KeFreeStackPage, - NULL); + MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), + (PVOID)Thread->StackLimit, + KeFreeStackPage, + NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } Thread->StackLimit = 0; _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2005-01-02 17:47:07 UTC (rev 12727) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2005-01-02 17:55:06 UTC (rev 12728) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: anonmem.c,v 1.34 2004/12/19 16:16:57 navaraf Exp $ +/* $Id$ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/anonmem.c @@ -261,7 +261,7 @@ /* * Get the segment corresponding to the virtual address */ - Region = MmFindRegion(MemoryArea->BaseAddress, + Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.VirtualMemoryData.RegionListHead, Address, NULL); if (Region->Type == MEM_RESERVE || Region->Protect == PAGE_NOACCESS) @@ -525,6 +525,7 @@ { PEPROCESS Process; MEMORY_AREA* MemoryArea; + ULONG_PTR MemoryAreaLength; ULONG Type; NTSTATUS Status; PMADDRESS_SPACE AddressSpace; @@ -582,40 +583,44 @@ MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, BaseAddress); - if (MemoryArea != NULL && - MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY && - MemoryArea->Length >= RegionSize) + if (MemoryArea != NULL) { - Status = - MmAlterRegion(AddressSpace, - MemoryArea->BaseAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, RegionSize, - Type, Protect, MmModifyAttributes); - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - DPRINT("NtAllocateVirtualMemory() = %x\n",Status); - return(Status); + MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY && + MemoryAreaLength >= RegionSize) + { + Status = + MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, RegionSize, + Type, Protect, MmModifyAttributes); + MmUnlockAddressSpace(AddressSpace); + ObDereferenceObject(Process); + DPRINT("NtAllocateVirtualMemory() = %x\n",Status); + return(Status); + } + else if (MemoryAreaLength >= RegionSize) + { + Status = + MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + &MemoryArea->Data.SectionData.RegionListHead, + BaseAddress, RegionSize, + Type, Protect, MmModifyAttributes); + MmUnlockAddressSpace(AddressSpace); + ObDereferenceObject(Process); + DPRINT("NtAllocateVirtualMemory() = %x\n",Status); + return(Status); + } + else + { + MmUnlockAddressSpace(AddressSpace); + ObDereferenceObject(Process); + return(STATUS_UNSUCCESSFUL); + } } - else if (MemoryArea != NULL && MemoryArea->Length >= RegionSize) - { - Status = - MmAlterRegion(AddressSpace, - MemoryArea->BaseAddress, - &MemoryArea->Data.SectionData.RegionListHead, - BaseAddress, RegionSize, - Type, Protect, MmModifyAttributes); - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - DPRINT("NtAllocateVirtualMemory() = %x\n",Status); - return(Status); - } - else if (MemoryArea != NULL) - { - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_UNSUCCESSFUL); - } } Status = MmCreateMemoryArea(Process, @@ -626,7 +631,7 @@ Protect, &MemoryArea, PBaseAddress != 0, - (AllocationType & MEM_TOP_DOWN), + (AllocationType & MEM_TOP_DOWN) == MEM_TOP_DOWN, BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { @@ -635,18 +640,22 @@ DPRINT("NtAllocateVirtualMemory() = %x\n",Status); return(Status); } + + MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + MmInitialiseRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, - MemoryArea->Length, Type, Protect); + MemoryAreaLength, Type, Protect); if ((AllocationType & MEM_COMMIT) && ((Protect & PAGE_READWRITE) || (Protect & PAGE_EXECUTE_READWRITE))) { - MmReserveSwapPages(MemoryArea->Length); + MmReserveSwapPages(MemoryAreaLength); } *UBaseAddress = BaseAddress; - *URegionSize = MemoryArea->Length; + *URegionSize = MemoryAreaLength; DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); MmUnlockAddressSpace(AddressSpace); @@ -702,7 +711,11 @@ */ if (MemoryArea->PageOpCount > 0) { - for (i = 0; i < PAGE_ROUND_UP(MemoryArea->Length) / PAGE_SIZE; i++) + ULONG_PTR MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + + /* FiN TODO: Optimize loop counter! */ + for (i = 0; i < PAGE_ROUND_UP(MemoryAreaLength) / PAGE_SIZE; i++) { PMM_PAGEOP PageOp; @@ -712,7 +725,7 @@ } PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, - (char*)MemoryArea->BaseAddress + (i * PAGE_SIZE), + (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), NULL, 0); if (PageOp != NULL) { @@ -745,8 +758,7 @@ /* Actually free the memory area. */ MmFreeMemoryArea(&Process->AddressSpace, - MemoryArea->BaseAddress, - 0, + MemoryArea, MmFreeVirtualMemoryPage, (PVOID)Process); } @@ -814,7 +826,7 @@ { case MEM_RELEASE: /* We can only free a memory area in one step. */ - if (MemoryArea->BaseAddress != BaseAddress || + if (MemoryArea->StartingAddress != BaseAddress || MemoryArea->Type != MEMORY_AREA_VIRTUAL_MEMORY) { MmUnlockAddressSpace(AddressSpace); @@ -829,7 +841,7 @@ case MEM_DECOMMIT: Status = MmAlterRegion(AddressSpace, - MemoryArea->BaseAddress, + MemoryArea->StartingAddress, &MemoryArea->Data.VirtualMemoryData.RegionListHead, BaseAddress, RegionSize, @@ -856,11 +868,11 @@ PMM_REGION Region; NTSTATUS Status; - Region = MmFindRegion(MemoryArea->BaseAddress, + Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.VirtualMemoryData.RegionListHead, BaseAddress, NULL); *OldProtect = Region->Protect; - Status = MmAlterRegion(AddressSpace, MemoryArea->BaseAddress, + Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, &MemoryArea->Data.VirtualMemoryData.RegionListHead, BaseAddress, Length, Region->Type, Protect, MmModifyAttributes); @@ -878,11 +890,11 @@ Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address); - Region = MmFindRegion(MemoryArea->BaseAddress, + Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.VirtualMemoryData.RegionListHead, Address, &RegionBase); Info->BaseAddress = RegionBase; - Info->AllocationBase = MemoryArea->BaseAddress; + Info->AllocationBase = MemoryArea->StartingAddress; Info->AllocationProtect = MemoryArea->Attributes; Info->RegionSize = (char*)RegionBase + Region->Length - (char*)Info->BaseAddress; Info->State = Region->Type; _____ Modified: trunk/reactos/ntoskrnl/mm/aspace.c --- trunk/reactos/ntoskrnl/mm/aspace.c 2005-01-02 17:47:07 UTC (rev 12727) +++ trunk/reactos/ntoskrnl/mm/aspace.c 2005-01-02 17:55:06 UTC (rev 12728) @@ -68,7 +68,7 @@ MmInitializeAddressSpace(PEPROCESS Process, PMADDRESS_SPACE AddressSpace) { - InitializeListHead(&AddressSpace->MAreaListHead); + AddressSpace->MemoryAreaRoot = NULL; ExInitializeFastMutex(&AddressSpace->Lock); if (Process != NULL) { _____ Modified: trunk/reactos/ntoskrnl/mm/cont.c --- trunk/reactos/ntoskrnl/mm/cont.c 2005-01-02 17:47:07 UTC (rev 12727) +++ trunk/reactos/ntoskrnl/mm/cont.c 2005-01-02 17:55:06 UTC (rev 12728) @@ -1,4 +1,4 @@ -/* $Id: cont.c,v 1.35 2004/10/22 20:38:22 ekohl Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -42,7 +42,7 @@ { PMEMORY_AREA MArea; NTSTATUS Status; - PVOID BaseAddress = 0; + PVOID BaseAddress = NULL; PFN_TYPE PBase; ULONG Attributes; ULONG i; @@ -83,8 +83,7 @@ { MmLockAddressSpace(MmGetKernelAddressSpace()); MmFreeMemoryArea(MmGetKernelAddressSpace(), - BaseAddress, - 0, + MArea, NULL, NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); @@ -174,11 +173,10 @@ MmFreeContiguousMemory(IN PVOID BaseAddress) { MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryArea(MmGetKernelAddressSpace(), - BaseAddress, - 0, - MmFreeContinuousPage, - NULL); + MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), + BaseAddress, + MmFreeContinuousPage, + NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } @@ -260,11 +258,10 @@ IN MEMORY_CACHING_TYPE CacheType) { MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryArea(MmGetKernelAddressSpace(), - BaseAddress, - NumberOfBytes, - MmFreeContinuousPage, - NULL); + MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), + BaseAddress, + MmFreeContinuousPage, + NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } _____ Modified: trunk/reactos/ntoskrnl/mm/drvlck.c --- trunk/reactos/ntoskrnl/mm/drvlck.c 2005-01-02 17:47:07 UTC (rev 12727) +++ trunk/reactos/ntoskrnl/mm/drvlck.c 2005-01-02 17:55:06 UTC (rev 12728) @@ -1,4 +1,4 @@ -/* $Id: drvlck.c,v 1.6 2004/08/15 16:39:06 chorns Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -64,7 +64,7 @@ MmLockPagableDataSection(IN PVOID AddressWithinSection) { PVOID Handle; - Handle = MmOpenMemoryAreaByAddress(NULL,AddressWithinSection); + Handle = MmOpenMemoryAreaByAddress(NULL, AddressWithinSection); MmLockPagableSectionByHandle(Handle); return(Handle); } _____ Modified: trunk/reactos/ntoskrnl/mm/iospace.c --- trunk/reactos/ntoskrnl/mm/iospace.c 2005-01-02 17:47:07 UTC (rev 12727) +++ trunk/reactos/ntoskrnl/mm/iospace.c 2005-01-02 17:55:06 UTC (rev 12728) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: iospace.c,v 1.30 2004/08/15 16:39:07 chorns Exp $ +/* $Id$ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/iospace.c @@ -127,7 +127,7 @@ KEBUGCHECK(0); } } - return ((PVOID)((char*)Result + Offset)); + return (PVOID)((ULONG_PTR)Result + Offset); } @@ -160,16 +160,17 @@ IN ULONG NumberOfBytes) { ULONG Offset; - Offset = (ULONG_PTR)BaseAddress % PAGE_SIZE; - BaseAddress = (PVOID)((PUCHAR)BaseAddress - Offset); + PVOID Address = BaseAddress; + + Offset = (ULONG_PTR)Address % PAGE_SIZE; + Address -= Offset; NumberOfBytes += Offset; MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryArea(MmGetKernelAddressSpace(), - BaseAddress, - NumberOfBytes, - NULL, - NULL); + MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), + Address, + NULL, + NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2005-01-02 17:47:07 UTC (rev 12727) +++ trunk/reactos/ntoskrnl/mm/marea.c 2005-01-02 17:55:06 UTC (rev 12728) @@ -35,331 +35,590 @@ #define TAG_MAREA TAG('M', 'A', 'R', 'E') +/* #define VALIDATE_MEMORY_AREAS */ + /* FUNCTIONS *****************************************************************/ -VOID MmDumpMemoryAreas(PLIST_ENTRY ListHead) +/** + * @name MmIterateFirstNode + * + * @param Node + * Head node of the MEMORY_AREA tree. + * + * @return The leftmost MEMORY_AREA node (ie. the one with lowest + * address) + */ + +static PMEMORY_AREA MmIterateFirstNode(PMEMORY_AREA Node) { - PLIST_ENTRY current_entry; - MEMORY_AREA* current; + while (Node->LeftChild != NULL) + Node = Node->LeftChild; + return Node; +} + +/** + * @name MmIterateNextNode + * + * @param Node + * Current node in the tree. + * + * @return Next node in the tree (sorted by address). + */ + +static PMEMORY_AREA MmIterateNextNode(PMEMORY_AREA Node) +{ + if (Node->RightChild != NULL) + { + Node = Node->RightChild; + while (Node->LeftChild != NULL) + Node = Node->LeftChild; + } + else + { + PMEMORY_AREA TempNode = NULL; + + do + { + /* Check if we're at the end of tree. */ + if (Node->Parent == NULL) + return NULL; + + TempNode = Node; + Node = Node->Parent; + } + while (TempNode == Node->RightChild); + } + return Node; +} + +/** + * @name MmIterateFirstNode + * + * @param Node + * Head node of the MEMORY_AREA tree. + * + * @return The rightmost MEMORY_AREA node (ie. the one with highest + * address) + */ + +static PMEMORY_AREA MmIterateLastNode(PMEMORY_AREA Node) +{ + while (Node->RightChild != NULL) + Node = Node->RightChild; + + return Node; +} + +/** + * @name MmIterateNextNode + * + * @param Node + * Current node in the tree. + * + * @return Previous node in the tree (sorted by address). + */ + +static PMEMORY_AREA MmIteratePrevNode(PMEMORY_AREA Node) +{ + if (Node->LeftChild != NULL) + { + Node = Node->LeftChild; + while (Node->RightChild != NULL) + Node = Node->RightChild; + } + else + { + PMEMORY_AREA TempNode = NULL; + + do + { + /* Check if we're at the end of tree. */ + if (Node->Parent == NULL) + return NULL; + + TempNode = Node; + Node = Node->Parent; + } + while (TempNode == Node->LeftChild); + } + return Node; +} + +#ifdef VALIDATE_MEMORY_AREAS +static VOID MmVerifyMemoryAreas(PMADDRESS_SPACE AddressSpace) +{ + PMEMORY_AREA Node; + + ASSERT(AddressSpace != NULL); + + /* Special case for empty tree. */ + if (AddressSpace->MemoryAreaRoot == NULL) + return; + + /* Traverse the tree from left to right. */ + for (Node = MmIterateFirstNode(AddressSpace->MemoryAreaRoot); + Node != NULL; + Node = MmIterateNextNode(Node)) + { + /* FiN: The starting address can be NULL if someone explicitely asks + * for NULL address. */ + ASSERT(Node->StartingAddress >= AddressSpace->LowestAddress || + Node->StartingAddress == NULL); + ASSERT(Node->EndingAddress >= Node->StartingAddress); + } +} +#else +#define MmVerifyMemoryAreas(x) +#endif + +VOID STDCALL +MmDumpMemoryAreas(PMADDRESS_SPACE AddressSpace) +{ + PMEMORY_AREA Node; + DbgPrint("MmDumpMemoryAreas()\n"); + + /* Special case for empty tree. */ + if (AddressSpace->MemoryAreaRoot == NULL) + return; - current_entry = ListHead->Flink; - while (current_entry!=ListHead) + /* Traverse the tree from left to right. */ + for (Node = MmIterateFirstNode(AddressSpace->MemoryAreaRoot); + Node != NULL; + Node = MmIterateNextNode(Node)) { - current = CONTAINING_RECORD(current_entry,MEMORY_AREA,Entry); - DbgPrint("Base %x Length %x End %x Attributes %x Flink %x\n", - current->BaseAddress,current->Length, - (char*)current->BaseAddress+current->Length,current->Attributes, - current->Entry.Flink); - current_entry = current_entry->Flink; + DbgPrint("Start %x End %x Attributes %x\n", + Node->StartingAddress, Node->EndingAddress, + Node->Attributes); } + DbgPrint("Finished MmDumpMemoryAreas()\n"); } -MEMORY_AREA* MmOpenMemoryAreaByAddress(PMADDRESS_SPACE AddressSpace, - PVOID Address) +PMEMORY_AREA STDCALL +MmOpenMemoryAreaByAddress( + PMADDRESS_SPACE AddressSpace, + PVOID Address) { - PLIST_ENTRY current_entry; - MEMORY_AREA* current; - PLIST_ENTRY previous_entry; + PMEMORY_AREA Node = AddressSpace->MemoryAreaRoot; DPRINT("MmOpenMemoryAreaByAddress(AddressSpace %x, Address %x)\n", - AddressSpace, Address); + AddressSpace, Address); - previous_entry = &AddressSpace->MAreaListHead; - current_entry = AddressSpace->MAreaListHead.Flink; - while (current_entry != &AddressSpace->MAreaListHead) + if (!(KdDebugState & KD_DEBUG_SCREEN)) + MmVerifyMemoryAreas(AddressSpace); + + while (Node != NULL) { - current = CONTAINING_RECORD(current_entry, - MEMORY_AREA, - Entry); - ASSERT(current_entry->Blink->Flink == current_entry); - ASSERT(current_entry->Flink->Blink == current_entry); - ASSERT(previous_entry->Flink == current_entry); - if (current->BaseAddress <= Address && - (PVOID)((char*)current->BaseAddress + current->Length) > Address) + if (Address < Node->StartingAddress) + Node = Node->LeftChild; + else if (Address >= Node->EndingAddress) + Node = Node->RightChild; + else { - DPRINT("%s() = %x\n",__FUNCTION__,current); - return(current); + DPRINT("MmOpenMemoryAreaByAddress(%x): %x [%x - %x]\n", + Address, Node, Node->StartingAddress, Node->EndingAddress); + return Node; } - if (current->BaseAddress > Address) - { - DPRINT("%s() = NULL\n",__FUNCTION__); - return(NULL); - } - previous_entry = current_entry; - current_entry = current_entry->Flink; } - DPRINT("%s() = NULL\n",__FUNCTION__); - return(NULL); + + DPRINT("MmOpenMemoryAreaByAddress(%x): 0\n", Address); + return NULL; } -MEMORY_AREA* MmOpenMemoryAreaByRegion(PMADDRESS_SPACE AddressSpace, - PVOID Address, - ULONG Length) +PMEMORY_AREA STDCALL +MmOpenMemoryAreaByRegion( + PMADDRESS_SPACE AddressSpace, + PVOID Address, + ULONG_PTR Length) { - PLIST_ENTRY current_entry; - MEMORY_AREA* current; - ULONG Extent; + PMEMORY_AREA Node; + PVOID Extent = (PVOID)((ULONG_PTR)Address + Length); - DPRINT("MmOpenMemoryByRegion(AddressSpace %x, Address %x, Length %x)\n", - AddressSpace, Address, Length); + MmVerifyMemoryAreas(AddressSpace); - current_entry = AddressSpace->MAreaListHead.Flink; - while (current_entry != &AddressSpace->MAreaListHead) + /* Special case for empty tree. */ + if (AddressSpace->MemoryAreaRoot == NULL) + return NULL; + + /* Traverse the tree from left to right. */ + for (Node = MmIterateFirstNode(AddressSpace->MemoryAreaRoot); + Node != NULL; + Node = MmIterateNextNode(Node)) { - current = CONTAINING_RECORD(current_entry, - MEMORY_AREA, - Entry); - DPRINT("current->BaseAddress %x current->Length %x\n", - current->BaseAddress,current->Length); - if (current->BaseAddress >= Address && - current->BaseAddress < (PVOID)((char*)Address+Length)) + if (Node->StartingAddress >= Address && + Node->StartingAddress < Extent) { - DPRINT("Finished MmOpenMemoryAreaByRegion() = %x\n", - current); - return(current); + DPRINT("MmOpenMemoryAreaByRegion(%x - %x): %x - %x\n", + Address, Address + Length, Node->StartingAddress, + Node->EndingAddress); + return Node; } - Extent = (ULONG)current->BaseAddress + current->Length; - if (Extent > (ULONG)Address && - Extent < (ULONG)((char*)Address+Length)) + if (Node->EndingAddress > Address && + Node->EndingAddress < Extent) { - DPRINT("Finished MmOpenMemoryAreaByRegion() = %x\n", - current); - return(current); + DPRINT("MmOpenMemoryAreaByRegion(%x - %x): %x - %x\n", + Address, Address + Length, Node->StartingAddress, + Node->EndingAddress); + return Node; } - if (current->BaseAddress <= Address && - Extent >= (ULONG)((char*)Address+Length)) + if (Node->StartingAddress <= Address && + Node->EndingAddress >= Extent) { - DPRINT("Finished MmOpenMemoryAreaByRegion() = %x\n", - current); - return(current); + DPRINT("MmOpenMemoryAreaByRegion(%x - %x): %x - %x\n", + Address, Address + Length, Node->StartingAddress, + Node->EndingAddress); + return Node; } - if (current->BaseAddress >= (PVOID)((char*)Address+Length)) + if (Node->StartingAddress >= Extent) { - DPRINT("Finished MmOpenMemoryAreaByRegion()= NULL\n",0); - return(NULL); + DPRINT("Finished MmOpenMemoryAreaByRegion() = NULL\n"); + return NULL; } - current_entry = current_entry->Flink; } - DPRINT("Finished MmOpenMemoryAreaByRegion() = NULL\n",0); - return(NULL); + + return NULL; } -static VOID MmInsertMemoryArea(PMADDRESS_SPACE AddressSpace, - MEMORY_AREA* marea) +/* + * @name MmCompressHelper + * + * This is helper of MmRebalanceTree. Performs a compression transformation + * count times, starting at root. + */ + +static VOID +MmCompressHelper( + PMADDRESS_SPACE AddressSpace, + ULONG Count) { - PLIST_ENTRY ListHead; - PLIST_ENTRY current_entry; - PLIST_ENTRY inserted_entry = &marea->Entry; - MEMORY_AREA* current; - MEMORY_AREA* next; + PMEMORY_AREA Root = NULL; + PMEMORY_AREA Red = AddressSpace->MemoryAreaRoot; + PMEMORY_AREA Black = Red->LeftChild; - DPRINT("MmInsertMemoryArea(marea %x)\n", marea); - DPRINT("marea->BaseAddress %x\n", marea->BaseAddress); - DPRINT("marea->Length %x\n", marea->Length); + while (Count--) + { + if (Root) + Root->LeftChild = Black; + else + AddressSpace->MemoryAreaRoot = Black; + Black->Parent = Root; + Red->LeftChild = Black->RightChild; + if (Black->RightChild) + Black->RightChild->Parent = Red; + Black->RightChild = Red; + Red->Parent = Black; + Root = Black; - ListHead = &AddressSpace->MAreaListHead; - - current_entry = ListHead->Flink; - if (IsListEmpty(ListHead)) - { - InsertHeadList(ListHead,&marea->Entry); - return; - } - current = CONTAINING_RECORD(current_entry,MEMORY_AREA,Entry); - if (current->BaseAddress > marea->BaseAddress) - { - InsertHeadList(ListHead,&marea->Entry); - return; - } - while (current_entry->Flink!=ListHead) - { - current = CONTAINING_RECORD(current_entry,MEMORY_AREA,Entry); - next = CONTAINING_RECORD(current_entry->Flink,MEMORY_AREA,Entry); - if (current->BaseAddress < marea->BaseAddress && - current->Entry.Flink==ListHead) + if (Count) { - current_entry->Flink = inserted_entry; - inserted_entry->Flink=ListHead; - inserted_entry->Blink=current_entry; - ListHead->Blink = inserted_entry; - return; + Red = Root->LeftChild; + Black = Red->LeftChild; } - if (current->BaseAddress < marea->BaseAddress && [truncated at 1000 lines; 1533 more skipped]

19 years, 11 months

[fireball] 12727: Removed file/folder

by fireball＠svn.reactos.com

Removed file/folder Deleted: trunk/reactos/hooks/

19 years, 11 months

[fireball] 12726: Removed file/folder

by fireball＠svn.reactos.com

Removed file/folder Deleted: trunk/reactos/README.txt _____ Deleted: trunk/reactos/README.txt --- trunk/reactos/README.txt 2005-01-02 17:46:46 UTC (rev 12725) +++ trunk/reactos/README.txt 2005-01-02 17:46:51 UTC (rev 12726) @@ -1,9 +0,0 @@ -This is a Subversion repository; use the 'svnadmin' tool to examine -it. Do not add, delete, or modify files here unless you know how -to avoid corrupting the repository. - -If the directory "db" contains a Berkeley DB environment, -you may need to tweak the values in "db/DB_CONFIG" to match the -requirements of your site. - -Visit http://subversion.tigris.org/ for more information.

19 years, 11 months

[fireball] 12725: Removed file/folder

by fireball＠svn.reactos.com

Removed file/folder Deleted: trunk/reactos/format _____ Deleted: trunk/reactos/format --- trunk/reactos/format 2005-01-02 17:46:36 UTC (rev 12724) +++ trunk/reactos/format 2005-01-02 17:46:46 UTC (rev 12725) @@ -1 +0,0 @@ -3

19 years, 11 months

← Newer
1
...
62
63
64
65
66
67
68
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005