Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

[mbosma] 25328: I got the thing with the flags wrong.
by mbosma＠svn.reactos.org 06 Jan '07

06 Jan '07

Author: mbosma Date: Sat Jan 6 08:03:56 2007 New Revision: 25328 URL: http://svn.reactos.org/svn/reactos?rev=25328&view=rev Log: I got the thing with the flags wrong. Modified: branches/cache_manager_rewrite/cc/pin.c Modified: branches/cache_manager_rewrite/cc/pin.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/pin.c?… ============================================================================== --- branches/cache_manager_rewrite/cc/pin.c (original) +++ branches/cache_manager_rewrite/cc/pin.c Sat Jan 6 08:03:56 2007 @@ -54,14 +54,15 @@ ASSERT (FileOffset); ASSERT (piBcb); ASSERT (pBuffer); - - if (Flags) - { - DPRINT1("No Flags implemented yet."); + ASSERT (Flags & MAP_WAIT); + + if (!(Flags & MAP_WAIT)) + { + DPRINT1("Reading without MAP_WAIT flag is not implented yet.\n"); *piBcb = NULL; *pBuffer = NULL; return FALSE; - } + } Bcb = FileObject->SectionObjectPointer->SharedCacheMap;

1 0

[mbosma] 25327: Make the file look more like the one in trunk.
by mbosma＠svn.reactos.org 06 Jan '07

06 Jan '07

Author: mbosma Date: Sat Jan 6 06:25:42 2007 New Revision: 25327 URL: http://svn.reactos.org/svn/reactos?rev=25327&view=rev Log: Make the file look more like the one in trunk. Modified: branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Sat Jan 6 06:25:42 2007 @@ -93,7 +93,6 @@ static KTIMER MmspWorkerThreadTimer; - static GENERIC_MAPPING MmpSectionMapping = { STANDARD_RIGHTS_READ | SECTION_MAP_READ | SECTION_QUERY, STANDARD_RIGHTS_WRITE | SECTION_MAP_WRITE, @@ -537,7 +536,6 @@ Segment->RawLength = NewLength; Segment->Length = PAGE_ROUND_UP(NewLength); } - VOID NTAPI @@ -643,7 +641,6 @@ Entry = MmGetPageEntrySectionSegment(Segment, Offset); if (Entry == 0) { - DPRINT1("%x\n", Offset); DPRINT1("Entry == 0 for MmUnsharePageEntrySectionSegment\n"); KEBUGCHECK(0); } @@ -1064,7 +1061,6 @@ BOOLEAN Locked) { PVOID PAddress; - ULONG SectionOffset; ULONG SegmentOffset; PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; @@ -1072,7 +1068,6 @@ ULONG Attributes; ULONG Entry; PMM_PAGEOP PageOp[4]; -// PMM_PAGEOP tmpPageOp; PVOID RegionBase; NTSTATUS Status = STATUS_SUCCESS; BOOL HasSwapEntry; @@ -1084,8 +1079,8 @@ AddressSpace, MemoryArea, Address, Locked); PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); - SegmentOffset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress; - SectionOffset = SegmentOffset + MemoryArea->Data.SectionData.ViewOffset; + SegmentOffset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset; Segment = MemoryArea->Data.SectionData.Segment; Section = MemoryArea->Data.SectionData.Section; @@ -1201,7 +1196,7 @@ 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } MmInsertRmap(Pfn[0], AddressSpace->Process, (PVOID)PAddress); @@ -1434,7 +1429,7 @@ Entry = MmGetPageEntrySectionSegment(Segment, SegmentOffset + i * PAGE_SIZE); if (Entry != 0) { - DbgPrint("Someone changed ppte entry while we slept\n"); + DPRINT1("Someone changed ppte entry while we slept\n"); KEBUGCHECK(0); } @@ -1455,7 +1450,7 @@ if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } for (i = 0; i < PageCount; i++) @@ -1513,7 +1508,7 @@ */ if (Entry != MmGetPageEntrySectionSegment(Segment, SegmentOffset)) { - DbgPrint("Someone changed ppte entry while we slept\n"); + DPRINT1("Someone changed ppte entry while we slept\n"); KEBUGCHECK(0); } @@ -1537,8 +1532,9 @@ 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); + return(Status); } MmInsertRmap(Pfn[0], AddressSpace->Process, (PVOID)PAddress); if (Locked) @@ -1569,7 +1565,7 @@ 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } MmInsertRmap(Pfn[0], AddressSpace->Process, (PVOID)PAddress); @@ -1743,7 +1739,7 @@ 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } MmInsertRmap(Pfn[0], AddressSpace->Process, (PVOID)PAddress); @@ -1860,7 +1856,7 @@ if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } for (i = 0; i < PageCount; i++) @@ -1894,7 +1890,7 @@ 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } MmInsertRmap(Pfn[0], AddressSpace->Process, (PVOID)PAddress); @@ -1926,7 +1922,7 @@ ULONG Entry1; NTSTATUS Status; PMM_PAGEOP PageOp; - PFN_TYPE Pfn; + PFN_TYPE Page; PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; @@ -2025,31 +2021,31 @@ { KEBUGCHECK(0); } - Pfn = PFN_FROM_SSE(Entry); - if (Pfn == 0) + Page = PFN_FROM_SSE(Entry); + if (Page == 0) { KEBUGCHECK(0); } - Pfn = PFN_FROM_SSE(Entry); + Page = PFN_FROM_SSE(Entry); MmSharePageEntrySectionSegment(Segment, Offset); Status = MmCreateVirtualMapping(AddressSpace->Process, Address, Attributes, - &Pfn, + &Page, 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } - MmInsertRmap(Pfn, AddressSpace->Process, (PVOID)PAddress); + MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); } if (Locked) { - MmLockPage(Pfn); + MmLockPage(Page); } MmUnlockSectionSegment(Segment); MmspCompleteAndReleasePageOp(PageOp); @@ -2073,10 +2069,9 @@ MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); - Status = MmRequestPageMemoryConsumer(MemoryArea->Type == MEMORY_AREA_CACHE_SEGMENT ? MC_CACHE : MC_USER, TRUE, &Pfn); + Status = MmRequestPageMemoryConsumer(MemoryArea->Type == MEMORY_AREA_CACHE_SEGMENT ? MC_CACHE : MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { - DPRINT("MmRequestPageMemoryConsumer failed (Status %x)\n", Status); /* * FIXME: What do we know in this case? */ @@ -2102,7 +2097,7 @@ Entry = MmGetPageEntrySectionSegment(Segment, Offset); if (Entry != 0) { - DbgPrint("Someone changed ppte entry while we slept\n"); + DPRINT1("Someone changed ppte entry while we slept\n"); KEBUGCHECK(0); } @@ -2110,31 +2105,30 @@ * Mark the offset within the section as having valid, in-memory * data */ - Entry = MAKE_SSE(Pfn << PAGE_SHIFT, 0); - DPRINT("%x\n", Pfn); - MmSharePage(Pfn); + Entry = MAKE_SSE(Page << PAGE_SHIFT, 0); + DPRINT("%x\n", Page); + MmSharePage(Page); MmSetPageEntrySectionSegment(Segment, Offset, Entry); MmUnlockSectionSegment(Segment); + Status = MmCreateVirtualMapping(AddressSpace->Process, PAddress, Attributes, - &Pfn, + &Page, 1); - if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } - MmInsertRmap(Pfn, AddressSpace->Process, PAddress); + MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); if (Locked) { - MmLockPage(Pfn); + MmLockPage(Page); } PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); - DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -2151,13 +2145,13 @@ MmUnlockAddressSpace(AddressSpace); - Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Pfn); + Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); if (!NT_SUCCESS(Status)) { KEBUGCHECK(0); } - Status = MmReadFromSwapPage(SwapEntry, Pfn); + Status = MmReadFromSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) { KEBUGCHECK(0); @@ -2176,7 +2170,7 @@ Entry1 = MmGetPageEntrySectionSegment(Segment, Offset); if (Entry != Entry1) { - DbgPrint("Someone changed ppte entry while we slept\n"); + DPRINT1("Someone changed ppte entry while we slept\n"); KEBUGCHECK(0); } @@ -2184,29 +2178,29 @@ * Mark the offset within the section as having valid, in-memory * data */ - Entry = MAKE_SSE(Pfn << PAGE_SHIFT, 0); - MmSharePage(Pfn); + Entry = MAKE_SSE(Page << PAGE_SHIFT, 0); + MmSharePage(Page); MmSetPageEntrySectionSegment(Segment, Offset, Entry); MmUnlockSectionSegment(Segment); /* * Save the swap entry. */ - MmSetSavedSwapEntryPage(Pfn, SwapEntry); + MmSetSavedSwapEntryPage(Page, SwapEntry); Status = MmCreateVirtualMapping(AddressSpace->Process, PAddress, Region->Protect, - &Pfn, + &Page, 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } - MmInsertRmap(Pfn, AddressSpace->Process, (PVOID)PAddress); + MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); if (Locked) { - MmLockPage(Pfn); + MmLockPage(Page); } PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); @@ -2220,7 +2214,7 @@ * take another reference to the page */ - Pfn = PFN_FROM_SSE(Entry); + Page = PFN_FROM_SSE(Entry); MmSharePageEntrySectionSegment(Segment, Offset); MmUnlockSectionSegment(Segment); @@ -2228,17 +2222,17 @@ Status = MmCreateVirtualMapping(AddressSpace->Process, PAddress, Attributes, - &Pfn, + &Page, 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } - MmInsertRmap(Pfn, AddressSpace->Process, (PVOID)PAddress); + MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); if (Locked) { - MmLockPage(Pfn); + MmLockPage(Page); } PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); @@ -2317,7 +2311,7 @@ if (!MmIsPagePresent(AddressSpace->Process, Address) || MmGetPageProtect(AddressSpace->Process, Address) & PAGE_READWRITE) { - DPRINT1("Address 0x%.8X\n", Address); + DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -2354,8 +2348,8 @@ (Region->Protect == PAGE_READWRITE || Region->Protect == PAGE_EXECUTE_READWRITE))) { - DPRINT1("Address 0x%.8X\n", Address); - return STATUS_UNSUCCESSFUL; + DPRINT("Address 0x%.8X\n", Address); + return(STATUS_UNSUCCESSFUL); } if (IS_SWAP_FROM_SSE(Entry) || @@ -2447,7 +2441,7 @@ } if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } if (Locked) @@ -2496,7 +2490,7 @@ if (!PageOutContext->Private) { MmLockSectionSegment(PageOutContext->Segment); - MmUnsharePageEntrySectionSegment(PageOutContext->Section, + MmUnsharePageEntrySectionSegment((PROS_SECTION_OBJECT)PageOutContext->Section, PageOutContext->Segment, PageOutContext->Offset, PageOutContext->WasDirty, @@ -2580,8 +2574,8 @@ */ Context.WasDirty = Entry & 0x2 ? TRUE : FALSE; if (Context.Segment->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || - IS_SWAP_FROM_SSE(Entry) || - PFN_FROM_SSE(Entry) != Page) + IS_SWAP_FROM_SSE(Entry) || + PFN_FROM_SSE(Entry) != Page) { Context.Private = TRUE; } @@ -2604,7 +2598,7 @@ if (!Context.Private && MmGetPageEntrySectionSegment(Context.Segment, Context.Offset) != 0) { if (!(Context.Segment->Flags & MM_PAGEFILE_SEGMENT) && - !(Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) + !(Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) { KEBUGCHECK(0); } @@ -2986,7 +2980,7 @@ { PMEMORY_AREA MemoryArea; PMM_SECTION_SEGMENT Segment; - BOOL DoCOW = FALSE; + BOOLEAN DoCOW = FALSE; ULONG i; MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); @@ -3097,7 +3091,7 @@ if (Section->AllocationAttributes & SEC_IMAGE) { Segment = MemoryArea->Data.SectionData.Segment; - Info->AllocationBase = (PBYTE)MemoryArea->StartingAddress - Segment->VirtualAddress; + Info->AllocationBase = (PUCHAR)MemoryArea->StartingAddress - Segment->VirtualAddress; Info->Type = MEM_IMAGE; } else @@ -3216,11 +3210,7 @@ } else { - InterlockedDecrementUL(&Section->Segment->ReferenceCount); - } - if (Section->FileObject != NULL) - { -// CcRosDereferenceCache(Section->FileObject); + (void)InterlockedDecrementUL(&Section->Segment->ReferenceCount); } } if (Section->FileObject != NULL) @@ -3271,7 +3261,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DbgPrint("Failed to create PhysicalMemory section\n"); + DPRINT1("Failed to create PhysicalMemory section\n"); KEBUGCHECK(0); } Status = ObInsertObject(PhysSection, @@ -3290,7 +3280,6 @@ return(STATUS_SUCCESS); } - VOID MmInitSectionImplementation2(VOID) { @@ -3316,7 +3305,7 @@ KeSetTimerEx(&MmspWorkerThreadTimer, DueTime, 5000, NULL); } -NTSTATUS +NTSTATUS INIT_FUNCTION NTAPI MmInitSectionImplementation(VOID) @@ -3346,8 +3335,6 @@ InitializeListHead(&DataSectionObjectListHead); DataSectionObjectCount = 0; ExInitializeFastMutex(&DataSectionObjectLock); - - return(STATUS_SUCCESS); } @@ -3506,7 +3493,6 @@ ObDereferenceObject(FileObject); return STATUS_FILE_INVALID; } - DPRINT("%I64x\n", UMaximumSize->QuadPart); MaximumSize = *UMaximumSize; } else @@ -3587,12 +3573,12 @@ TAG_MM_SECTION_SEGMENT); if (Segment == NULL) { + //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); ObDereferenceObject(Section); ObDereferenceObject(FileObject); return(STATUS_NO_MEMORY); } Section->Segment = Segment; - CHECKPOINT; Segment->ReferenceCount = 1; ExInitializeFastMutex(&Segment->Lock); Segment->FileOffset = 0; @@ -3658,15 +3644,13 @@ Segment->RawLength = MaximumSize.u.LowPart; Segment->Length = PAGE_ROUND_UP(Segment->RawLength); } - DPRINT("%x %x\n", Segment->RawLength, Segment->Length); } MmUnlockSectionSegment(Segment); Section->FileObject = FileObject; Section->MaximumSize = MaximumSize; ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&DataSectionObjectLock); -// CcRosReferenceCache(FileObject); - if(FileObject->Flags & FO_SYNCHRONOUS_IO) - KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); + //CcRosReferenceCache(FileObject); + //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); *SectionObject = Section; return(STATUS_SUCCESS); } @@ -4350,7 +4334,7 @@ * Check file access required */ if (SectionPageProtection & PAGE_READWRITE || - SectionPageProtection & PAGE_EXECUTE_READWRITE) + SectionPageProtection & PAGE_EXECUTE_READWRITE) { FileAccess = FILE_READ_DATA | FILE_WRITE_DATA; } @@ -4395,7 +4379,6 @@ */ Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes; - DPRINT("%x\n", Section->AllocationAttributes); ASSERT (FileObject->SectionObjectPointer); @@ -4438,9 +4421,7 @@ if (!NT_SUCCESS(StatusExeFmt)) { if(ImageSectionObject->Segments != NULL) - { ExFreePool(ImageSectionObject->Segments); - } ExFreePool(ImageSectionObject); ObDereferenceObject(Section); @@ -4482,11 +4463,8 @@ for (i = 0; i < ImageSectionObject->NrSegments; i++) { - InterlockedIncrementUL(&SectionSegments[i].ReferenceCount); - } - } - else - { + (void)InterlockedIncrementUL(&SectionSegments[i].ReferenceCount); + } } } else @@ -4499,13 +4477,12 @@ */ for (i = 0; i < ImageSectionObject->NrSegments; i++) { - InterlockedIncrementUL(&SectionSegments[i].ReferenceCount); + (void)InterlockedIncrementUL(&SectionSegments[i].ReferenceCount); } } Section->FileObject = FileObject; -// CcRosReferenceCache(FileObject); - if(FileObject->Flags & FO_SYNCHRONOUS_IO) - KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); + //CcRosReferenceCache(FileObject); + //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); *SectionObject = Section; DPRINT("%x\n", Section->AllocationAttributes); return STATUS_SUCCESS; @@ -4558,7 +4535,6 @@ AllocationAttributes, FileHandle, NULL); - if (NT_SUCCESS(Status)) { Status = ObInsertObject ((PVOID)SectionObject, @@ -4567,7 +4543,6 @@ 0, NULL, SectionHandle); - //ObDereferenceObject(SectionObject); } return Status; @@ -4681,7 +4656,6 @@ MArea->Data.SectionData.Segment = Segment; MArea->Data.SectionData.Section = Section; MArea->Data.SectionData.ViewOffset = ViewOffset; -// MArea->Data.SectionData.WriteCopyView = FALSE; MmInitializeRegion(&MArea->Data.SectionData.RegionListHead, ViewSize, 0, Protect); @@ -4832,7 +4806,6 @@ NULL); if (!NT_SUCCESS(Status)) { - ObDereferenceObject(Section); return(Status); } @@ -4852,7 +4825,7 @@ } Status = MmMapViewOfSection(Section, - Process, + (PEPROCESS)Process, (BaseAddress != NULL ? &SafeBaseAddress : NULL), ZeroBits, CommitSize, @@ -4898,8 +4871,6 @@ PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) { ULONG Entry; -// PFILE_OBJECT FileObject; -// PBCB Bcb; ULONG Offset; SWAPENTRY SavedSwapEntry; PMM_PAGEOP PageOp; @@ -4979,8 +4950,7 @@ else { MmDeleteRmap(Page, AddressSpace->Process, Address); - DPRINT("%x\n", Address); - MmUnsharePageEntrySectionSegment(Section, Segment, Offset, Dirty, TRUE); + MmUnsharePageEntrySectionSegment(Section, Segment, Offset, Dirty, FALSE); } } } @@ -5050,13 +5020,14 @@ PROS_SECTION_OBJECT Section; PMM_PAGEOP PageOp; ULONG_PTR Offset; + PVOID ImageBaseAddress = 0; DPRINT("Opening memory area Process %x BaseAddress %x\n", Process, BaseAddress); ASSERT(Process); - AddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; + AddressSpace = (PMADDRESS_SPACE)&(Process)->VadRoot; MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, @@ -5112,7 +5083,6 @@ ULONG NrSegments; PMM_IMAGE_SECTION_OBJECT ImageSectionObject; PMM_SECTION_SEGMENT SectionSegments; - PVOID ImageBaseAddress = 0; PMM_SECTION_SEGMENT Segment; Segment = MemoryArea->Data.SectionData.Segment; @@ -5124,8 +5094,7 @@ * and calculate the image base address */ for (i = 0; i < NrSegments; i++) { - // This field is RESERVED and not respected by Windows - //if (!(SectionSegments[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + if (!(SectionSegments[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) { if (Segment == &SectionSegments[i]) { @@ -5141,8 +5110,7 @@ for (i = 0; i < NrSegments; i++) { - // This field is RESERVED and not respected by Windows - //if (!(SectionSegments[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + if (!(SectionSegments[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) { PVOID SBaseAddress = (PVOID) ((char*)ImageBaseAddress + (ULONG_PTR)SectionSegments[i].VirtualAddress); @@ -5155,6 +5123,10 @@ { Status = MmUnmapViewOfSegment(AddressSpace, BaseAddress); } + + /* Notify debugger */ + if (ImageBaseAddress) DbgkUnMapViewOfSection(ImageBaseAddress); + MmUnlockAddressSpace(AddressSpace); return(STATUS_SUCCESS); } @@ -5557,7 +5529,7 @@ Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to allocate page\n"); + DPRINT1("Unable to allocate page\n"); KEBUGCHECK(0); } Status = MmCreateVirtualMapping (NULL, @@ -5567,7 +5539,7 @@ 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } } @@ -5657,7 +5629,7 @@ Section = (PROS_SECTION_OBJECT)SectionObject; - AddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; + AddressSpace = (PMADDRESS_SPACE)&(Process)->VadRoot; AllocationType |= (Section->AllocationAttributes & SEC_NO_CHANGE); @@ -5686,8 +5658,7 @@ ImageSize = 0; for (i = 0; i < NrSegments; i++) { - // This field is RESERVED and not respected by Windows - //if (!(SectionSegments[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + if (!(SectionSegments[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) { ULONG_PTR MaxExtent; MaxExtent = (ULONG_PTR)SectionSegments[i].VirtualAddress + @@ -5717,8 +5688,7 @@ for (i = 0; i < NrSegments; i++) { - // This field is RESERVED and not respected by Windows - //if (!(SectionSegments[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + if (!(SectionSegments[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) { PVOID SBaseAddress = (PVOID) ((char*)ImageBase + (ULONG_PTR)SectionSegments[i].VirtualAddress); @@ -5835,7 +5805,7 @@ * @unimplemented */ BOOLEAN STDCALL -MmDisableModifiedWriteOfSection (DWORD Unknown0) +MmDisableModifiedWriteOfSection (ULONG Unknown0) { UNIMPLEMENTED; return (FALSE); @@ -6001,8 +5971,8 @@ IN OUT PSIZE_T ViewSize ) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -6033,20 +6003,20 @@ IN PVOID MappedBase ) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* * @unimplemented */ NTSTATUS STDCALL -MmSetBankedSection (DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5) +MmSetBankedSection (ULONG Unknown0, + ULONG Unknown1, + ULONG Unknown2, + ULONG Unknown3, + ULONG Unknown4, + ULONG Unknown5) { UNIMPLEMENTED; return (STATUS_NOT_IMPLEMENTED); @@ -6108,7 +6078,6 @@ * * @implemented */ - NTSTATUS STDCALL MmCreateSection (OUT PVOID * Section, IN ACCESS_MASK DesiredAccess, @@ -6121,22 +6090,25 @@ { NTSTATUS Status; ULONG FileAccess; + ULONG Protection; BOOLEAN FileObjectCreated; PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; /* * Check the protection */ - ULONG Protection = SectionPageProtection & ~(PAGE_GUARD | PAGE_NOCACHE); + Protection = SectionPageProtection & ~(PAGE_GUARD|PAGE_NOCACHE); if (Protection != PAGE_NOACCESS && Protection != PAGE_READONLY && Protection != PAGE_READWRITE && Protection != PAGE_WRITECOPY && Protection != PAGE_EXECUTE && - Protection != PAGE_EXECUTE_READ && Protection != PAGE_EXECUTE_READWRITE && Protection != PAGE_EXECUTE_WRITECOPY) - { - CHECKPOINT1; - return STATUS_INVALID_PAGE_PROTECTION; + Protection != PAGE_EXECUTE_READ && + Protection != PAGE_EXECUTE_READWRITE && + Protection != PAGE_EXECUTE_WRITECOPY) + { + CHECKPOINT1; + return STATUS_INVALID_PAGE_PROTECTION; } if (AllocationAttributes & SEC_IMAGE &&

1 0

[mbosma] 25326: Two more formating and debug output changes from cc branch.
by mbosma＠svn.reactos.org 06 Jan '07

06 Jan '07

Author: mbosma Date: Sat Jan 6 05:50:53 2007 New Revision: 25326 URL: http://svn.reactos.org/svn/reactos?rev=25326&view=rev Log: Two more formating and debug output changes from cc branch. Modified: trunk/reactos/ntoskrnl/mm/section.c 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 (original) +++ trunk/reactos/ntoskrnl/mm/section.c Sat Jan 6 05:50:53 2007 @@ -1124,8 +1124,8 @@ SwapEntry = SWAPENTRY_FROM_SSE(Entry); /* - * Release all our locks and read in the page from disk - */ + * Release all our locks and read in the page from disk + */ MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); @@ -1242,6 +1242,8 @@ PMM_PAGEOP PageOp; PMM_REGION Region; ULONG Entry; + + DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address, Locked); /* * Check if the page has been paged out or has already been set readwrite

1 0

[arty] 25325: Allow PowerPC too.
by arty＠svn.reactos.org 06 Jan '07

06 Jan '07

Author: arty Date: Sat Jan 6 05:44:40 2007 New Revision: 25325 URL: http://svn.reactos.org/svn/reactos?rev=25325&view=rev Log: Allow PowerPC too. Modified: branches/powerpc/reactos/ntoskrnl/ldr/loader.c Modified: branches/powerpc/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ldr/lo… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ldr/loader.c (original) +++ branches/powerpc/reactos/ntoskrnl/ldr/loader.c Sat Jan 6 05:44:40 2007 @@ -714,7 +714,11 @@ CPRINT("Incorrect PE magic: %08x\n", PENtHeaders->Signature); return STATUS_UNSUCCESSFUL; } +#ifdef _M_IX86 if (PENtHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_I386) +#elif defined(_M_PPC) + if (PENtHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_POWERPC) +#endif { CPRINT("Incorrect Architechture: %04x\n", PENtHeaders->FileHeader.Machine); return STATUS_UNSUCCESSFUL;

1 0

[mbosma] 25324: Some formating and debug output changes based on cc branch.
by mbosma＠svn.reactos.org 06 Jan '07

06 Jan '07

Author: mbosma Date: Sat Jan 6 05:34:58 2007 New Revision: 25324 URL: http://svn.reactos.org/svn/reactos?rev=25324&view=rev Log: Some formating and debug output changes based on cc branch. Modified: trunk/reactos/ntoskrnl/mm/section.c 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 (original) +++ trunk/reactos/ntoskrnl/mm/section.c Sat Jan 6 05:34:58 2007 @@ -338,7 +338,7 @@ ULONG DirectoryOffset; ULONG TableOffset; - DPRINT("MmGetPageEntrySection(Offset %x)\n", Offset); + DPRINT("MmGetPageEntrySection(Segment %x, Offset %x)\n", Segment, Offset); if (Segment->Length <= NR_SECTION_PAGE_TABLES * PAGE_SIZE) { @@ -788,8 +788,8 @@ MmUnlockAddressSpace(AddressSpace); Status = MmspWaitForPageOpCompletionEvent(PageOp); /* - * Check for various strange conditions - */ + * Check for various strange conditions + */ if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op, status = %x\n", Status); @@ -802,8 +802,8 @@ } MmLockAddressSpace(AddressSpace); /* - * If this wasn't a pagein then restart the operation - */ + * If this wasn't a pagein then restart the operation + */ if (PageOp->OpType != MM_PAGEOP_PAGEIN) { MmspCompleteAndReleasePageOp(PageOp); @@ -823,9 +823,9 @@ } MmLockSectionSegment(Segment); /* - * If the completed fault was for another address space then set the - * page in this one. - */ + * If the completed fault was for another address space then set the + * page in this one. + */ if (!MmIsPagePresent(AddressSpace->Process, Address)) { Entry = MmGetPageEntrySectionSegment(Segment, Offset); @@ -835,7 +835,7 @@ { /* * The page was a private page in another or in our address space - */ + */ MmUnlockSectionSegment(Segment); MmspCompleteAndReleasePageOp(PageOp); return(STATUS_MM_RESTART_OPERATION); @@ -855,7 +855,7 @@ 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); @@ -881,7 +881,7 @@ /* * Sanity check - */ + */ if (Segment->Flags & MM_PAGEFILE_SEGMENT) { DPRINT1("Found a swaped out private page in a pagefile section.\n"); @@ -923,13 +923,13 @@ MmSetSavedSwapEntryPage(Page, SwapEntry); /* - * Add the page to the process's working set - */ + * Add the page to the process's working set + */ MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); /* - * Finish the operation - */ + * Finish the operation + */ if (Locked) { MmLockPage(Page); @@ -947,8 +947,8 @@ { MmUnlockSectionSegment(Segment); /* - * Just map the desired physical page - */ + * Just map the desired physical page + */ Page = Offset >> PAGE_SHIFT; Status = MmCreateVirtualMappingUnsafe(AddressSpace->Process, Address, @@ -963,16 +963,16 @@ } /* * Don't add an rmap entry since the page mapped could be for - * anything. - */ + * anything. + */ if (Locked) { MmLockPageUnsafe(Page); } /* - * Cleanup and release locks - */ + * Cleanup and release locks + */ PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); DPRINT("Address 0x%.8X\n", Address); @@ -1014,8 +1014,8 @@ } /* - * Cleanup and release locks - */ + * Cleanup and release locks + */ PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); DPRINT("Address 0x%.8X\n", Address); @@ -1030,13 +1030,13 @@ if (Entry == 0) { /* - * If the entry is zero (and it can't change because we have - * locked the segment) then we need to load the page. - */ + * If the entry is zero (and it can't change because we have + * locked the segment) then we need to load the page. + */ /* - * Release all our locks and read in the page from disk - */ + * Release all our locks and read in the page from disk + */ MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); @@ -1072,26 +1072,26 @@ return(Status); } /* - * Relock the address space and segment - */ + * 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. - */ + * 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) { - DbgPrint("Someone changed ppte entry while we slept\n"); + DPRINT1("Someone changed ppte entry while we slept\n"); KEBUGCHECK(0); } /* - * Mark the offset within the section as having valid, in-memory - * data - */ + * 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); @@ -1103,7 +1103,7 @@ 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); @@ -1124,8 +1124,8 @@ SwapEntry = SWAPENTRY_FROM_SSE(Entry); /* - * Release all our locks and read in the page from disk - */ + * Release all our locks and read in the page from disk + */ MmUnlockSectionSegment(Segment); MmUnlockAddressSpace(AddressSpace); @@ -1143,33 +1143,33 @@ } /* - * Relock the address space and segment - */ + * 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. - */ + * 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) { - DbgPrint("Someone changed ppte entry while we slept\n"); + DPRINT1("Someone changed ppte entry while we slept\n"); KEBUGCHECK(0); } /* - * Mark the offset within the section as having valid, in-memory - * data - */ + * 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); /* - * Save the swap entry. - */ + * Save the swap entry. + */ MmSetSavedSwapEntryPage(Page, SwapEntry); Status = MmCreateVirtualMapping(AddressSpace->Process, Address, @@ -1178,7 +1178,7 @@ 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); @@ -1195,8 +1195,8 @@ { /* * If the section offset is already in-memory and valid then just - * take another reference to the page - */ + * take another reference to the page + */ Page = PFN_FROM_SSE(Entry); @@ -1210,7 +1210,7 @@ 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress); @@ -1375,7 +1375,7 @@ } if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } if (Locked) @@ -2234,7 +2234,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DbgPrint("Failed to create PhysicalMemory section\n"); + DPRINT1("Failed to create PhysicalMemory section\n"); KEBUGCHECK(0); } Status = ObInsertObject(PhysSection, @@ -4417,7 +4417,7 @@ Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to allocate page\n"); + DPRINT1("Unable to allocate page\n"); KEBUGCHECK(0); } Status = MmCreateVirtualMapping (NULL, @@ -4427,7 +4427,7 @@ 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } }

1 0

[mbosma] 25323: DbgPrint => DPRINT1
by mbosma＠svn.reactos.org 06 Jan '07

06 Jan '07

Author: mbosma Date: Sat Jan 6 03:24:51 2007 New Revision: 25323 URL: http://svn.reactos.org/svn/reactos?rev=25323&view=rev Log: DbgPrint => DPRINT1 Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Sat Jan 6 03:24:51 2007 @@ -77,7 +77,7 @@ KeAcquireSpinLock(&PageListLock, &oldIrql); if (MmPageArray[Pfn].MapCount != 0) { - DbgPrint("Transfering mapped page.\n"); + DPRINT1("Transfering mapped page.\n"); KEBUGCHECK(0); } if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) @@ -407,7 +407,7 @@ 1); if (!NT_SUCCESS(Status)) { - DbgPrint("Unable to create virtual mapping\n"); + DPRINT1("Unable to create virtual mapping\n"); KEBUGCHECK(0); } } @@ -584,7 +584,7 @@ KeAcquireSpinLock(&PageListLock, &oldIrql); if (MmPageArray[Pfn].Flags.Type == MM_PHYSICAL_PAGE_FREE) { - DbgPrint("Mapping non-used page\n"); + DPRINT1("Mapping non-used page\n"); KEBUGCHECK(0); } MmPageArray[Pfn].MapCount++; @@ -603,12 +603,12 @@ KeAcquireSpinLock(&PageListLock, &oldIrql); if (MmPageArray[Pfn].Flags.Type == MM_PHYSICAL_PAGE_FREE) { - DbgPrint("Unmapping non-used page\n"); + DPRINT1("Unmapping non-used page\n"); KEBUGCHECK(0); } if (MmPageArray[Pfn].MapCount == 0) { - DbgPrint("Unmapping not mapped page\n"); + DPRINT1("Unmapping not mapped page\n"); KEBUGCHECK(0); } MmPageArray[Pfn].MapCount--; @@ -676,7 +676,7 @@ if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) { - DbgPrint("Referencing non-used page\n"); + DPRINT1("Referencing non-used page\n"); KEBUGCHECK(0); } @@ -716,7 +716,7 @@ if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) { - DbgPrint("Getting reference count for free page\n"); + DPRINT1("Getting reference count for free page\n"); KEBUGCHECK(0); } @@ -764,12 +764,12 @@ if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) { - DbgPrint("Dereferencing free page\n"); + DPRINT1("Dereferencing free page\n"); KEBUGCHECK(0); } if (MmPageArray[Pfn].ReferenceCount == 0) { - DbgPrint("Derefrencing page with reference count 0\n"); + DPRINT1("Derefrencing page with reference count 0\n"); KEBUGCHECK(0); } @@ -781,28 +781,28 @@ RemoveEntryList(&MmPageArray[Pfn].ListEntry); if (MmPageArray[Pfn].RmapListHead != NULL) { - DbgPrint("Freeing page with rmap entries.\n"); + DPRINT1("Freeing page with rmap entries.\n"); KEBUGCHECK(0); } if (MmPageArray[Pfn].MapCount != 0) { - DbgPrint("Freeing mapped page (0x%x count %d)\n", + DPRINT1("Freeing mapped page (0x%x count %d)\n", Pfn << PAGE_SHIFT, MmPageArray[Pfn].MapCount); KEBUGCHECK(0); } if (MmPageArray[Pfn].LockCount > 0) { - DbgPrint("Freeing locked page\n"); + DPRINT1("Freeing locked page\n"); KEBUGCHECK(0); } if (MmPageArray[Pfn].SavedSwapEntry != 0) { - DbgPrint("Freeing page with swap entry.\n"); + DPRINT1("Freeing page with swap entry.\n"); KEBUGCHECK(0); } if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) { - DbgPrint("Freeing page with flags %x\n", + DPRINT1("Freeing page with flags %x\n", MmPageArray[Pfn].Flags.Type); KEBUGCHECK(0); } @@ -837,7 +837,7 @@ if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) { - DbgPrint("Getting lock count for free page\n"); + DPRINT1("Getting lock count for free page\n"); KEBUGCHECK(0); } @@ -864,7 +864,7 @@ if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) { - DbgPrint("Locking free page\n"); + DPRINT1("Locking free page\n"); KEBUGCHECK(0); } @@ -903,7 +903,7 @@ if (MmPageArray[Pfn].Flags.Type != MM_PHYSICAL_PAGE_USED) { - DbgPrint("Unlocking free page\n"); + DPRINT1("Unlocking free page\n"); KEBUGCHECK(0); } @@ -948,12 +948,12 @@ if (PageDescriptor->Flags.Type != MM_PHYSICAL_PAGE_FREE) { - DbgPrint("Got non-free page from freelist\n"); + DPRINT1("Got non-free page from freelist\n"); KEBUGCHECK(0); } if (PageDescriptor->MapCount != 0) { - DbgPrint("Got mapped page from freelist\n"); + DPRINT1("Got mapped page from freelist\n"); KEBUGCHECK(0); } if (PageDescriptor->ReferenceCount != 0) @@ -981,7 +981,7 @@ } if (PageDescriptor->MapCount != 0) { - DbgPrint("Returning mapped page.\n"); + DPRINT1("Returning mapped page.\n"); KEBUGCHECK(0); } return PfnOffset; @@ -1164,13 +1164,13 @@ NULL); if (!NT_SUCCESS(Status)) { - DbgPrint("ZeroPageThread: Wait failed\n"); + DPRINT1("ZeroPageThread: Wait failed\n"); KEBUGCHECK(0); } if (ZeroPageThreadShouldTerminate) { - DbgPrint("ZeroPageThread: Terminating\n"); + DPRINT1("ZeroPageThread: Terminating\n"); return STATUS_SUCCESS; } Count = 0; @@ -1189,7 +1189,7 @@ KeAcquireSpinLock(&PageListLock, &oldIrql); if (PageDescriptor->MapCount != 0) { - DbgPrint("Mapped page on freelist.\n"); + DPRINT1("Mapped page on freelist.\n"); KEBUGCHECK(0); } PageDescriptor->Flags.Zero = 1;

1 0

[mbosma] 25322: Make difference between trunk and branch smaller by making use of the PVOID Variable in ExeFmtpReadFile.
by mbosma＠svn.reactos.org 06 Jan '07

06 Jan '07

Author: mbosma Date: Sat Jan 6 03:01:34 2007 New Revision: 25322 URL: http://svn.reactos.org/svn/reactos?rev=25322&view=rev Log: Make difference between trunk and branch smaller by making use of the PVOID Variable in ExeFmtpReadFile. Modified: branches/cache_manager_rewrite/headers.patch branches/cache_manager_rewrite/mm/elf.inc.h branches/cache_manager_rewrite/mm/pe.c branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/headers.patch URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/headers.p… ============================================================================== --- branches/cache_manager_rewrite/headers.patch (original) +++ branches/cache_manager_rewrite/headers.patch Sat Jan 6 03:01:34 2007 @@ -41,25 +41,14 @@ =================================================================== --- include/reactos/exeformat.h (revision 22988) +++ include/reactos/exeformat.h (working copy) -@@ -34,7 +34,8 @@ - +@@ -35,6 +35,7 @@ typedef NTSTATUS (NTAPI * PEXEFMT_CB_READ_FILE) ( -- IN PVOID File, -+ IN PFILE_OBJECT FileObject, + IN PVOID File, + ULONG SectorSize, IN PLARGE_INTEGER Offset, IN ULONG Length, OUT PVOID * Data, -@@ -51,7 +52,7 @@ - ( - IN CONST VOID * FileHeader, - IN SIZE_T FileHeaderSize, -- IN PVOID File, -+ IN PFILE_OBJECT FileObject, - OUT PMM_IMAGE_SECTION_OBJECT ImageSectionObject, - OUT PULONG Flags, - IN PEXEFMT_CB_READ_FILE ReadFileCb, Index: ntoskrnl/include/internal/cc.h =================================================================== --- ntoskrnl/include/internal/cc.h (revision 22988) Modified: branches/cache_manager_rewrite/mm/elf.inc.h URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/elf.in… ============================================================================== --- branches/cache_manager_rewrite/mm/elf.inc.h (original) +++ branches/cache_manager_rewrite/mm/elf.inc.h Sat Jan 6 03:01:34 2007 @@ -448,6 +448,7 @@ nReadStatus = ReadFileCb ( File, + ImageSectionObject->BytesPerSector, &lnOffset, cbPHdrSize, &pData, Modified: branches/cache_manager_rewrite/mm/pe.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pe.c?r… ============================================================================== --- branches/cache_manager_rewrite/mm/pe.c (original) +++ branches/cache_manager_rewrite/mm/pe.c Sat Jan 6 03:01:34 2007 @@ -144,7 +144,7 @@ */ NTSTATUS NTAPI PeFmtCreateSection(IN CONST VOID * FileHeader, IN SIZE_T FileHeaderSize, - IN PFILE_OBJECT FileObject, + IN PVOID File, OUT PMM_IMAGE_SECTION_OBJECT ImageSectionObject, OUT PULONG Flags, IN PEXEFMT_CB_READ_FILE ReadFileCb, @@ -172,7 +172,7 @@ ASSERT(FileHeader); ASSERT(FileHeaderSize > 0); - ASSERT(FileObject); + ASSERT(File); ASSERT(ImageSectionObject); ASSERT(ReadFileCb); ASSERT(AllocateSegmentsCb); @@ -241,7 +241,7 @@ lnOffset.QuadPart = pidhDosHeader->e_lfanew; /* read the header from the file */ - nStatus = ReadFileCb(FileObject, ImageSectionObject->BytesPerSector, &lnOffset, sizeof(IMAGE_NT_HEADERS64), &pData, &pBuffer, &cbReadSize); + nStatus = ReadFileCb(File, ImageSectionObject->BytesPerSector, &lnOffset, sizeof(IMAGE_NT_HEADERS64), &pData, &pBuffer, &cbReadSize); if(!NT_SUCCESS(nStatus)) DIE(("ReadFile failed, status %08X\n", nStatus)); @@ -523,7 +523,7 @@ lnOffset.QuadPart = cbSectionHeadersOffset; /* read the header from the file */ - nStatus = ReadFileCb(FileObject, ImageSectionObject->BytesPerSector, &lnOffset, cbSectionHeadersSize, &pData, &pBuffer, &cbReadSize); + nStatus = ReadFileCb(File, ImageSectionObject->BytesPerSector, &lnOffset, cbSectionHeadersSize, &pData, &pBuffer, &cbReadSize); if(!NT_SUCCESS(nStatus)) DIE(("ReadFile failed with status %08X\n", nStatus)); Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Sat Jan 6 03:01:34 2007 @@ -3679,7 +3679,7 @@ ( IN CONST VOID * FileHeader, IN SIZE_T FileHeaderSize, - IN PFILE_OBJECT FileObject, + IN PVOID File, OUT PMM_IMAGE_SECTION_OBJECT ImageSectionObject, OUT PULONG Flags, IN PEXEFMT_CB_READ_FILE ReadFileCb, @@ -3690,7 +3690,7 @@ ( IN CONST VOID * FileHeader, IN SIZE_T FileHeaderSize, - IN PFILE_OBJECT FileObject, + IN PVOID File, OUT PMM_IMAGE_SECTION_OBJECT ImageSectionObject, OUT PULONG Flags, IN PEXEFMT_CB_READ_FILE ReadFileCb, @@ -3732,8 +3732,8 @@ static NTSTATUS NTAPI -ExeFmtpReadFile(IN PFILE_OBJECT FileObject, - ULONG SectorSize, +ExeFmtpReadFile(IN PVOID File, + IN ULONG SectorSize, IN PLARGE_INTEGER Offset, IN ULONG Length, OUT PVOID * Data, @@ -3741,6 +3741,7 @@ OUT PULONG ReadSize) { NTSTATUS Status; + PFILE_OBJECT FileObject = (PFILE_OBJECT)File; LARGE_INTEGER FileOffset; ULONG AdjustOffset; ULONG OffsetAdjustment; @@ -4187,7 +4188,6 @@ */ Offset.QuadPart = 0; - /* FIXME: use FileObject instead of FileHandle */ Status = ExeFmtpReadFile (FileObject, FileFsSize.BytesPerSector, &Offset, @@ -4214,7 +4214,6 @@ ImageSectionObject->BytesPerSector = FileFsSize.BytesPerSector; Flags = 0; - /* FIXME: use FileObject instead of FileHandle */ Status = ExeFmtpLoaders[i](FileHeader, FileHeaderSize, FileObject,

1 0

[gedmurphy] 25321: forgot to clean up my mess
by gedmurphy＠svn.reactos.org 05 Jan '07

05 Jan '07

Author: gedmurphy Date: Sat Jan 6 01:59:33 2007 New Revision: 25321 URL: http://svn.reactos.org/svn/reactos?rev=25321&view=rev Log: forgot to clean up my mess Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c Sat Jan 6 01:59:33 2007 @@ -965,8 +965,6 @@ LoadString(hInst, IDS_MENU_DETAILS, szTemp, 256); AppendMenu(hViewMenu, MF_STRING, ID_VIEW_DETAILS, szTemp); -//RemoveMenu(hMenu, 3, MF_BYPOSITION); - if (GetMenuItemCount(hMenu) <= 4) { hSubMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_WINDOWSMENU));

1 0

[gedmurphy] 25320: fix a menu resource leak
by gedmurphy＠svn.reactos.org 05 Jan '07

05 Jan '07

Author: gedmurphy Date: Sat Jan 6 01:55:49 2007 New Revision: 25320 URL: http://svn.reactos.org/svn/reactos?rev=25320&view=rev Log: fix a menu resource leak Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c Sat Jan 6 01:55:49 2007 @@ -956,19 +956,21 @@ ShowWindow(hPerformancePage, SW_HIDE); BringWindowToTop(hApplicationPage); - LoadString(hInst, IDS_MENU_LARGEICONS, szTemp, 256); + LoadString(hInst, IDS_MENU_LARGEICONS, szTemp, 256); AppendMenu(hViewMenu, MF_STRING, ID_VIEW_LARGE, szTemp); - LoadString(hInst, IDS_MENU_SMALLICONS, szTemp, 256); + LoadString(hInst, IDS_MENU_SMALLICONS, szTemp, 256); AppendMenu(hViewMenu, MF_STRING, ID_VIEW_SMALL, szTemp); - LoadString(hInst, IDS_MENU_DETAILS, szTemp, 256); + LoadString(hInst, IDS_MENU_DETAILS, szTemp, 256); AppendMenu(hViewMenu, MF_STRING, ID_VIEW_DETAILS, szTemp); + +//RemoveMenu(hMenu, 3, MF_BYPOSITION); if (GetMenuItemCount(hMenu) <= 4) { hSubMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_WINDOWSMENU)); - LoadString(hInst, IDS_MENU_WINDOWS, szTemp, 256); + LoadString(hInst, IDS_MENU_WINDOWS, szTemp, 256); InsertMenu(hMenu, 3, MF_BYPOSITION|MF_POPUP, (UINT)hSubMenu, szTemp); DrawMenuBar(hMainWnd); @@ -1001,7 +1003,7 @@ CheckMenuItem(hOptionsMenu, ID_OPTIONS_SHOW16BITTASKS, MF_BYCOMMAND|MF_CHECKED); if (GetMenuItemCount(hMenu) > 4) { - RemoveMenu(hMenu, 3, MF_BYPOSITION); + DeleteMenu(hMenu, 3, MF_BYPOSITION); DrawMenuBar(hMainWnd); } /* @@ -1016,7 +1018,7 @@ ShowWindow(hPerformancePage, SW_SHOW); BringWindowToTop(hPerformancePage); if (GetMenuItemCount(hMenu) > 4) { - RemoveMenu(hMenu, 3, MF_BYPOSITION); + DeleteMenu(hMenu, 3, MF_BYPOSITION); DrawMenuBar(hMainWnd); } hSubMenu = CreatePopupMenu();

1 0

[cwittich] 25319: fix a warning
by cwittich＠svn.reactos.org 05 Jan '07

05 Jan '07

Author: cwittich Date: Sat Jan 6 00:02:15 2007 New Revision: 25319 URL: http://svn.reactos.org/svn/reactos?rev=25319&view=rev Log: fix a warning Modified: trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c (original) +++ trunk/reactos/base/system/winlogon/wlx.c Sat Jan 6 00:02:15 2007 @@ -165,7 +165,7 @@ if (PreviousWindowProc != NULL) return -1; PreviousWindowProc = dlgprc; - return (int)DialogBoxW(hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc); + return (int)DialogBoxW((HINSTANCE) hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc); } /*

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
41
Older →

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 January 2007