Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 64533: [NTOSKRNL] Kill MiZeroFillSection
by tkreuzer＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: tkreuzer Date: Sun Oct 5 08:49:15 2014 New Revision: 64533 URL: http://svn.reactos.org/svn/reactos?rev=64533&view=rev Log: [NTOSKRNL] Kill MiZeroFillSection Modified: trunk/reactos/ntoskrnl/cache/copysup.c trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/newmm.h Modified: trunk/reactos/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/copysup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/cache/copysup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/copysup.c [iso-8859-1] Sun Oct 5 08:49:15 2014 @@ -186,7 +186,6 @@ WriteBuf, Bcb->BaseAddress); - //MiZeroFillSection(WriteBuf, &CurrentOffset, WriteLen); RtlCopyMemory(WriteBuf, ((PCHAR)Buffer) + Count, WriteLen); Count += WriteLen; Length -= WriteLen; Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Sun Oct 5 08:49:15 2014 @@ -112,78 +112,6 @@ //DPRINT("MmUnlockSectionSegment(%p,%s:%d)\n", Segment, file, line); } -NTSTATUS -NTAPI -MiZeroFillSection(PVOID Address, PLARGE_INTEGER FileOffsetPtr, ULONG Length) -{ - PFN_NUMBER Page; - PMMSUPPORT AddressSpace; - PMEMORY_AREA MemoryArea; - PMM_SECTION_SEGMENT Segment; - LARGE_INTEGER FileOffset = *FileOffsetPtr, End, FirstMapped; - KIRQL OldIrql; - - DPRINT("MiZeroFillSection(Address %p, Offset 0x%I64x,Length 0x%lx)\n", - Address, - FileOffset.QuadPart, - Length); - - AddressSpace = MmGetKernelAddressSpace(); - - MmLockAddressSpace(AddressSpace); - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); - MmUnlockAddressSpace(AddressSpace); - if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_SECTION_VIEW || MemoryArea->DeleteInProgress) - { - return STATUS_NOT_MAPPED_DATA; - } - - Segment = MemoryArea->Data.SectionData.Segment; - End.QuadPart = FileOffset.QuadPart + Length; - End.LowPart = PAGE_ROUND_DOWN(End.LowPart); - FileOffset.LowPart = PAGE_ROUND_UP(FileOffset.LowPart); - FirstMapped.QuadPart = MemoryArea->Data.SectionData.ViewOffset.QuadPart; - DPRINT("Pulling zero pages for %08x%08x-%08x%08x\n", - FileOffset.u.HighPart, FileOffset.u.LowPart, - End.u.HighPart, End.u.LowPart); - - while (FileOffset.QuadPart < End.QuadPart) - { - PVOID CurrentAddress; - ULONG_PTR Entry; - - if (!NT_SUCCESS(MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &Page))) - break; - - MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); - - Entry = MmGetPageEntrySectionSegment(Segment, &FileOffset); - if (Entry == 0) - { - MmSetPageEntrySectionSegment(Segment, &FileOffset, MAKE_PFN_SSE(Page)); - CurrentAddress = ((PCHAR)MemoryArea->StartingAddress) + FileOffset.QuadPart - FirstMapped.QuadPart; - - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmReferencePage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - - MmCreateVirtualMapping(NULL, CurrentAddress, PAGE_READWRITE, &Page, 1); - MmInsertRmap(Page, NULL, CurrentAddress); - } - else - { - MmReleasePageMemoryConsumer(MC_CACHE, Page); - } - - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - - FileOffset.QuadPart += PAGE_SIZE; - } - return STATUS_SUCCESS; -} - /* MiFlushMappedSection Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] Sun Oct 5 08:49:15 2014 @@ -262,12 +262,6 @@ _In_ BOOLEAN Locked, _Inout_ PMM_REQUIRED_RESOURCES Required); -NTSTATUS -NTAPI -MiZeroFillSection(PVOID Address, - PLARGE_INTEGER FileOffsetPtr, - ULONG Length); - VOID MmPageOutDeleteMapping(PVOID Context, PEPROCESS Process,

1 0

[tkreuzer] 64532: [NTOSKRNL] Remove obsolete FreePage parameter from MmDeleteVirtualMapping
by tkreuzer＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: tkreuzer Date: Sun Oct 5 07:16:01 2014 New Revision: 64532 URL: http://svn.reactos.org/svn/reactos?rev=64532&view=rev Log: [NTOSKRNL] Remove obsolete FreePage parameter from MmDeleteVirtualMapping Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/swapout.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/amd64/page.c trunk/reactos/ntoskrnl/mm/arm/page.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/i386/pagepae.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/powerpc/page.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -771,7 +771,7 @@ DPRINT("Removing page %p:%I64x -> %x\n", Segment, Offset.QuadPart, Entry); MmSetSavedSwapEntryPage(Page, 0); MmDeleteRmap(Page, Process, Address); - MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); + MmDeleteVirtualMapping(Process, Address, NULL, NULL); MmReleasePageMemoryConsumer(MC_CACHE, Page); } if (SwapEntry != 0) Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -309,7 +309,7 @@ } MmDeleteRmap(Required->Page[0], Process, Address); - MmDeleteVirtualMapping(Process, Address, FALSE, Dirty, &OurPage); + MmDeleteVirtualMapping(Process, Address, Dirty, &OurPage); ASSERT(OurPage == Required->Page[0]); /* Note: this releases the reference held by this address space only. */ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -1158,7 +1158,6 @@ MmDeleteVirtualMapping( struct _EPROCESS *Process, PVOID Address, - BOOLEAN FreePage, BOOLEAN* WasDirty, PPFN_NUMBER Page ); Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -451,7 +451,6 @@ MmDeleteVirtualMapping( PEPROCESS Process, PVOID Address, - BOOLEAN FreePage, BOOLEAN* WasDirty, PPFN_NUMBER Page) { @@ -469,9 +468,6 @@ if (OldPte.u.Hard.Valid) { Pfn = OldPte.u.Hard.PageFrameNumber; - - //if (FreePage) - //MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); } else Pfn = 0; Modified: trunk/reactos/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -180,7 +180,6 @@ NTAPI MmDeleteVirtualMapping(IN PEPROCESS Process, IN PVOID Address, - IN BOOLEAN FreePage, OUT PBOOLEAN WasDirty, OUT PPFN_NUMBER Page) { Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -474,7 +474,6 @@ NTAPI MmDeleteVirtualMapping(IN PEPROCESS Process, IN PVOID Address, - IN BOOLEAN FreePage, OUT PBOOLEAN WasDirty, OUT PPFN_NUMBER Page) { Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -358,7 +358,7 @@ VOID NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping @@ -369,8 +369,8 @@ ULONG Pte; PULONG Pt; - DPRINT("MmDeleteVirtualMapping(%p, %p, %u, %p, %p)\n", - Process, Address, FreePage, WasDirty, Page); + DPRINT("MmDeleteVirtualMapping(%p, %p, %p, %p)\n", + Process, Address, WasDirty, Page); Pt = MmGetPageTableForProcess(Process, Address, FALSE); @@ -410,12 +410,6 @@ } Pfn = PTE_TO_PFN(Pte); - - if (FreePage) - { - MmReleasePageMemoryConsumer(MC_SYSTEM, Pfn); - Pfn = 0; - } } else { Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -622,7 +622,7 @@ VOID NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping @@ -632,7 +632,7 @@ PFN_NUMBER Pfn; DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n", - Process, Address, FreePage, WasDirty, Page); + Process, Address, WasDirty, Page); if (Ke386Pae) { ULONGLONG Pte; @@ -671,11 +671,6 @@ Pfn = 0; } - if (FreePage && WasValid) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); - } - /* * Return some information to the caller */ @@ -724,11 +719,6 @@ else { Pfn = 0; - } - - if (FreePage && WasValid) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); } /* Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=64… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -837,7 +837,7 @@ } else { - MmDeleteVirtualMapping(Process, (PVOID)Address, FALSE, &Dirty, &Page); + MmDeleteVirtualMapping(Process, (PVOID)Address, &Dirty, &Page); } if (FreePage != NULL) { Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -170,7 +170,7 @@ VOID NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping @@ -179,16 +179,11 @@ ppc_map_info_t info = { 0 }; DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n", - Process, Address, FreePage, WasDirty, Page); + Process, Address, WasDirty, Page); info.proc = Process ? (int)Process->UniqueProcessId : 0; info.addr = (vaddr_t)Address; MmuInqPage(&info, 1); - - if (FreePage && info.phys) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, info.phys >> PAGE_SHIFT); - } /* * Return some information to the caller Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -1763,7 +1763,7 @@ } MmDeleteRmap(OldPage, Process, PAddress); - MmDeleteVirtualMapping(Process, PAddress, FALSE, NULL, NULL); + MmDeleteVirtualMapping(Process, PAddress, NULL, NULL); MmCreatePageFileMapping(Process, PAddress, MM_WAIT_ENTRY); /* @@ -1836,7 +1836,6 @@ MmDeleteVirtualMapping(Process, Address, - FALSE, &WasDirty, &Page); if (WasDirty)

1 0

[tkreuzer] 64531: [NTOSKRNL] Apply indentation of 4 spaces, no code change.
by tkreuzer＠svn.reactos.org 05 Oct '14

05 Oct '14

Author: tkreuzer Date: Sun Oct 5 06:33:34 2014 New Revision: 64531 URL: http://svn.reactos.org/svn/reactos?rev=64531&view=rev Log: [NTOSKRNL] Apply indentation of 4 spaces, no code change. Modified: trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/region.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=64… Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=6… Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… Modified: trunk/reactos/ntoskrnl/mm/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/region.c?rev=6… Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=645… Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=…

1 0

[tkreuzer] 64530: [NTOSKRNL] Fix compilation with MI_TRACE_PFNS and MSVC
by tkreuzer＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: tkreuzer Date: Sat Oct 4 22:41:47 2014 New Revision: 64530 URL: http://svn.reactos.org/svn/reactos?rev=64530&view=rev Log: [NTOSKRNL] Fix compilation with MI_TRACE_PFNS and MSVC Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=645… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Oct 4 22:41:47 2014 @@ -709,10 +709,10 @@ /* Create a virtual mapping for this memory area */ MI_SET_USAGE(MI_USAGE_CACHE); #if MI_TRACE_PFNS - PWCHAR pos = NULL; - ULONG len = 0; if ((SharedCacheMap->FileObject) && (SharedCacheMap->FileObject->FileName.Buffer)) { + PWCHAR pos = NULL; + ULONG len = 0; pos = wcsrchr(SharedCacheMap->FileObject->FileName.Buffer, '\\'); len = wcslen(pos) * sizeof(WCHAR); if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos); Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sat Oct 4 22:41:47 2014 @@ -181,10 +181,10 @@ /* Some debug stuff */ MI_SET_USAGE(MI_USAGE_DRIVER_PAGE); #if MI_TRACE_PFNS - PWCHAR pos = NULL; - ULONG len = 0; if (FileName->Buffer) { + PWCHAR pos = NULL; + ULONG len = 0; pos = wcsrchr(FileName->Buffer, '\\'); len = wcslen(pos) * sizeof(WCHAR); if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos);

1 0

[jgardou] 64529: [USETUP] - Fix potential buffer overflow
by jgardou＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: jgardou Date: Sat Oct 4 21:24:16 2014 New Revision: 64529 URL: http://svn.reactos.org/svn/reactos?rev=64529&view=rev Log: [USETUP] - Fix potential buffer overflow Modified: trunk/reactos/base/setup/usetup/fslist.c Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] Sat Oct 4 21:24:16 2014 @@ -166,12 +166,12 @@ if (Item->FileSystem) { if (Item->QuickFormat) - sprintf(Buffer, MUIGetString(STRING_FORMATDISK1), Item->FileSystem); + snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK1), Item->FileSystem); else - sprintf(Buffer, MUIGetString(STRING_FORMATDISK2), Item->FileSystem); + snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK2), Item->FileSystem); } else - sprintf(Buffer, MUIGetString(STRING_KEEPFORMAT)); + snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_KEEPFORMAT)); if (ListEntry == &List->Selected->ListEntry) CONSOLE_SetInvertedTextXY(List->Left,

1 0

[tkreuzer] 64528: [NTOSKRNL] - Implement MiIncrementAvailablePages and MiDecrementAvailablePages factoring out duplicated code from a number of locations - Get rid of MiAllocatePfn. Any further com...
by tkreuzer＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: tkreuzer Date: Sat Oct 4 21:17:27 2014 New Revision: 64528 URL: http://svn.reactos.org/svn/reactos?rev=64528&view=rev Log: [NTOSKRNL] - Implement MiIncrementAvailablePages and MiDecrementAvailablePages factoring out duplicated code from a number of locations - Get rid of MiAllocatePfn. Any further comment would result in excessive use of curse words. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Oct 4 21:17:27 2014 @@ -1973,13 +1973,6 @@ IN PMMPFN Pfn ); -PFN_NUMBER -NTAPI -MiAllocatePfn( - IN PMMPTE PointerPte, - IN ULONG Protection -); - VOID NTAPI MiInitializePfn( Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Sat Oct 4 21:17:27 2014 @@ -65,6 +65,59 @@ /* FUNCTIONS ******************************************************************/ +static +VOID +MiIncrementAvailablePages( + VOID) +{ + /* Increment available pages */ + MmAvailablePages++; + + /* Check if we've reached the configured low memory threshold */ + if (MmAvailablePages == MmLowMemoryThreshold) + { + /* Clear the event, because now we're ABOVE the threshold */ + KeClearEvent(MiLowMemoryEvent); + } + else if (MmAvailablePages == MmHighMemoryThreshold) + { + /* Otherwise check if we reached the high threshold and signal the event */ + KeSetEvent(MiHighMemoryEvent, 0, FALSE); + } +} + +static +VOID +MiDecrementAvailablePages( + VOID) +{ + ASSERT(MmAvailablePages > 0); + + /* See if we hit any thresholds */ + if (MmAvailablePages == MmHighMemoryThreshold) + { + /* Clear the high memory event */ + KeClearEvent(MiHighMemoryEvent); + } + else if (MmAvailablePages == MmLowMemoryThreshold) + { + /* Signal the low memory event */ + KeSetEvent(MiLowMemoryEvent, 0, FALSE); + } + + /* One less page */ + MmAvailablePages--; + if (MmAvailablePages < MmMinimumFreePages) + { + /* FIXME: Should wake up the MPW and working set manager, if we had one */ + + DPRINT1("Running low on pages: %lu remaining\n", MmAvailablePages); + + /* Call RosMm and see if it can release any pages for us */ + MmRebalanceMemoryConsumers(); + } +} + VOID NTAPI MiZeroPhysicalPage(IN PFN_NUMBER PageFrameIndex) @@ -195,28 +248,8 @@ Entry->u1.Flink = Entry->u2.Blink = 0; ASSERT_LIST_INVARIANT(ListHead); - /* See if we hit any thresholds */ - if (MmAvailablePages == MmHighMemoryThreshold) - { - /* Clear the high memory event */ - KeClearEvent(MiHighMemoryEvent); - } - else if (MmAvailablePages == MmLowMemoryThreshold) - { - /* Signal the low memory event */ - KeSetEvent(MiLowMemoryEvent, 0, FALSE); - } - - /* One less page */ - if (--MmAvailablePages < MmMinimumFreePages) - { - /* FIXME: Should wake up the MPW and working set manager, if we had one */ - - DPRINT1("Running low on pages: %lu remaining\n", MmAvailablePages); - - /* Call RosMm and see if it can release any pages for us */ - MmRebalanceMemoryConsumers(); - } + /* Decrement number of available pages */ + MiDecrementAvailablePages(); #if MI_TRACE_PFNS ASSERT(MI_PFN_CURRENT_USAGE != MI_USAGE_NOT_SET); @@ -253,31 +286,12 @@ /* Get the exact list */ ListHead = &MmStandbyPageListByPriority[Pfn->u4.Priority]; - /* See if we hit any thresholds */ - if (MmAvailablePages == MmHighMemoryThreshold) - { - /* Clear the high memory event */ - KeClearEvent(MiHighMemoryEvent); - } - else if (MmAvailablePages == MmLowMemoryThreshold) - { - /* Signal the low memory event */ - KeSetEvent(MiLowMemoryEvent, 0, FALSE); - } + /* Decrement number of available pages */ + MiDecrementAvailablePages(); /* Decrease transition page counter */ ASSERT(Pfn->u3.e1.PrototypePte == 1); /* Only supported ARM3 case */ MmTransitionSharedPages--; - - /* One less page */ - if (--MmAvailablePages < MmMinimumFreePages) - { - /* FIXME: Should wake up the MPW and working set manager, if we had one */ - DPRINT1("Running low on pages: %lu remaining\n", MmAvailablePages); - - /* Call RosMm and see if it can release any pages for us */ - MmRebalanceMemoryConsumers(); - } } else if (ListHead == &MmModifiedPageListHead) { @@ -442,28 +456,8 @@ /* ReactOS Hack */ Pfn1->OriginalPte.u.Long = 0; - /* See if we hit any thresholds */ - if (MmAvailablePages == MmHighMemoryThreshold) - { - /* Clear the high memory event */ - KeClearEvent(MiHighMemoryEvent); - } - else if (MmAvailablePages == MmLowMemoryThreshold) - { - /* Signal the low memory event */ - KeSetEvent(MiLowMemoryEvent, 0, FALSE); - } - - /* One less page */ - if (--MmAvailablePages < MmMinimumFreePages) - { - /* FIXME: Should wake up the MPW and working set manager, if we had one */ - - DPRINT1("Running low on pages: %lu remaining\n", MmAvailablePages); - - /* Call RosMm and see if it can release any pages for us */ - MmRebalanceMemoryConsumers(); - } + /* Decrement number of available pages */ + MiDecrementAvailablePages(); #if MI_TRACE_PFNS //ASSERT(MI_PFN_CURRENT_USAGE != MI_USAGE_NOT_SET); @@ -664,20 +658,8 @@ Pfn1->u4.InPageError = 0; Pfn1->u4.AweAllocation = 0; - /* Increase available pages */ - MmAvailablePages++; - - /* Check if we've reached the configured low memory threshold */ - if (MmAvailablePages == MmLowMemoryThreshold) - { - /* Clear the event, because now we're ABOVE the threshold */ - KeClearEvent(MiLowMemoryEvent); - } - else if (MmAvailablePages == MmHighMemoryThreshold) - { - /* Otherwise check if we reached the high threshold and signal the event */ - KeSetEvent(MiHighMemoryEvent, 0, FALSE); - } + /* Increment number of available pages */ + MiIncrementAvailablePages(); /* Get the page color */ Color = PageFrameIndex & MmSecondaryColorMask; @@ -779,20 +761,8 @@ /* Move the page onto its new location */ Pfn1->u3.e1.PageLocation = StandbyPageList; - /* One more page on the system */ - MmAvailablePages++; - - /* Check if we've reached the configured low memory threshold */ - if (MmAvailablePages == MmLowMemoryThreshold) - { - /* Clear the event, because now we're ABOVE the threshold */ - KeClearEvent(MiLowMemoryEvent); - } - else if (MmAvailablePages == MmHighMemoryThreshold) - { - /* Otherwise check if we reached the high threshold and signal the event */ - KeSetEvent(MiHighMemoryEvent, 0, FALSE); - } + /* Increment number of available pages */ + MiIncrementAvailablePages(); } VOID @@ -919,20 +889,8 @@ /* For zero/free pages, we also have to handle the colored lists */ if (ListName <= StandbyPageList) { - /* One more page on the system */ - MmAvailablePages++; - - /* Check if we've reached the configured low memory threshold */ - if (MmAvailablePages == MmLowMemoryThreshold) - { - /* Clear the event, because now we're ABOVE the threshold */ - KeClearEvent(MiLowMemoryEvent); - } - else if (MmAvailablePages == MmHighMemoryThreshold) - { - /* Otherwise check if we reached the high threshold and signal the event */ - KeSetEvent(MiHighMemoryEvent, 0, FALSE); - } + /* Increment number of available pages */ + MiIncrementAvailablePages(); /* Sanity checks */ ASSERT(ListName == ZeroedPageList); @@ -1160,54 +1118,6 @@ /* Release the lock and return success */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); return STATUS_SUCCESS; -} - -PFN_NUMBER -NTAPI -MiAllocatePfn(IN PMMPTE PointerPte, - IN ULONG Protection) -{ - KIRQL OldIrql; - PFN_NUMBER PageFrameIndex; - MMPTE TempPte; - - /* Sanity check that we aren't passed a valid PTE */ - ASSERT(PointerPte->u.Hard.Valid == 0); - - /* Make an empty software PTE */ - MI_MAKE_SOFTWARE_PTE(&TempPte, MM_READWRITE); - - /* Lock the PFN database */ - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* Check if we're running low on pages */ - if (MmAvailablePages < 128) - { - DPRINT1("Warning, running low on memory: %lu pages left\n", MmAvailablePages); - - //MiEnsureAvailablePageOrWait(NULL, OldIrql); - - /* Call RosMm and see if it can release any pages for us */ - MmRebalanceMemoryConsumers(); - } - - /* Grab a page */ - ASSERT_LIST_INVARIANT(&MmFreePageListHead); - ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); - PageFrameIndex = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); - - /* Write the software PTE */ - MI_WRITE_INVALID_PTE(PointerPte, TempPte); - PointerPte->u.Soft.Protection |= Protection; - - /* Initialize its PFN entry */ - MiInitializePfn(PageFrameIndex, PointerPte, TRUE); - - /* Release the PFN lock and return the page */ - ASSERT_LIST_INVARIANT(&MmFreePageListHead); - ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - return PageFrameIndex; } VOID Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Sat Oct 4 21:17:27 2014 @@ -99,6 +99,8 @@ PMMPTE PointerPte, LastPte; PVOID DriverBase; MMPTE TempPte; + KIRQL OldIrql; + PFN_NUMBER PageFrameIndex; PAGED_CODE(); /* Detect session load */ @@ -173,30 +175,45 @@ *ImageBase = DriverBase; DPRINT1("Loading: %wZ at %p with %lx pages\n", FileName, DriverBase, PteCount); + /* Lock the PFN database */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Some debug stuff */ + MI_SET_USAGE(MI_USAGE_DRIVER_PAGE); +#if MI_TRACE_PFNS + PWCHAR pos = NULL; + ULONG len = 0; + if (FileName->Buffer) + { + pos = wcsrchr(FileName->Buffer, '\\'); + len = wcslen(pos) * sizeof(WCHAR); + if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos); + } +#endif + /* Loop the new driver PTEs */ TempPte = ValidKernelPte; while (PointerPte < LastPte) { - /* Allocate a page */ - MI_SET_USAGE(MI_USAGE_DRIVER_PAGE); -#if MI_TRACE_PFNS - PWCHAR pos = NULL; - ULONG len = 0; - if (FileName->Buffer) - { - pos = wcsrchr(FileName->Buffer, '\\'); - len = wcslen(pos) * sizeof(WCHAR); - if (pos) snprintf(MI_PFN_CURRENT_PROCESS_NAME, min(16, len), "%S", pos); - } -#endif - TempPte.u.Hard.PageFrameNumber = MiAllocatePfn(PointerPte, MM_EXECUTE); - - /* Write it */ + /* Make sure the PTE is not valid for whatever reason */ + ASSERT(PointerPte->u.Hard.Valid == 0); + + /* Grab a page */ + PageFrameIndex = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); + + /* Initialize its PFN entry */ + MiInitializePfn(PageFrameIndex, PointerPte, TRUE); + + /* Write the PTE */ + TempPte.u.Hard.PageFrameNumber = PageFrameIndex; MI_WRITE_VALID_PTE(PointerPte, TempPte); /* Move on */ PointerPte++; } + + /* Release the PFN lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); /* Copy the image */ RtlCopyMemory(DriverBase, Base, PteCount << PAGE_SHIFT);

1 0

[jgardou] 64527: [GCC/CMAKE] - Add a way to conditionally use the GCC stack protector. Just add -DSTACK_PROTECTOR:BOOL=TRUE as argument to configure.cmd/sh
by jgardou＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: jgardou Date: Sat Oct 4 20:26:14 2014 New Revision: 64527 URL: http://svn.reactos.org/svn/reactos?rev=64527&view=rev Log: [GCC/CMAKE] - Add a way to conditionally use the GCC stack protector. Just add -DSTACK_PROTECTOR:BOOL=TRUE as argument to configure.cmd/sh Added: trunk/reactos/lib/gcc_ssp/ trunk/reactos/lib/gcc_ssp/CMakeLists.txt (with props) trunk/reactos/lib/gcc_ssp/gcc_ssp.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/cmake/config.cmake trunk/reactos/cmake/gcc.cmake trunk/reactos/lib/CMakeLists.txt trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -210,6 +210,11 @@ target_link_libraries(freeldr_pe freeldr_common cportlib cmlib rtl libcntpr) target_link_libraries(freeldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr) +if (STACK_PROTECTOR) + target_link_libraries(freeldr_pe gcc_ssp) + target_link_libraries(freeldr_pe_dbg gcc_ssp) +endif() + add_dependencies(freeldr_pe asm) add_dependencies(freeldr_pe_dbg asm) @@ -266,6 +271,11 @@ target_link_libraries(setupldr_pe freeldr_common cportlib cmlib rtl libcntpr) target_link_libraries(setupldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr) +if (STACK_PROTECTOR) + target_link_libraries(setupldr_pe gcc_ssp) + target_link_libraries(setupldr_pe_dbg gcc_ssp) +endif() + add_dependencies(setupldr_pe asm) add_dependencies(setupldr_pe_dbg asm) Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=645… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -75,6 +75,9 @@ "Whether to enable PREFAST while compiling.") set(_VS_ANALYZE_ FALSE CACHE BOOL "Whether to enable static analysis while compiling.") +else() +set(STACK_PROTECTOR FALSE CACHE BOOL +"Whether to enbable the GCC stack checker while compiling") endif() set(USE_DUMMY_PSEH FALSE CACHE BOOL Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=64527&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -28,6 +28,10 @@ if(USE_DUMMY_PSEH) add_definitions(-D_USE_DUMMY_PSEH=1) +endif() + +if(STACK_PROTECTOR) + add_compile_flags(${MODULE} "-fstack-protector-all") endif() # Compiler Core @@ -281,6 +285,10 @@ add_target_link_flags(${MODULE} "-Wl,--wdmdriver") endif() endif() + + if(STACK_PROTECTOR) + target_link_libraries(${MODULE} gcc_ssp) + endif() endfunction() function(add_delay_importlibs _module) Modified: trunk/reactos/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/CMakeLists.txt?rev=645… ============================================================================== --- trunk/reactos/lib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -13,6 +13,9 @@ add_subdirectory(epsapi) add_subdirectory(fast486) add_subdirectory(fslib) +if (STACK_PROTECTOR) + add_subdirectory(gcc_ssp) +endif() add_subdirectory(lsalib) add_subdirectory(ppcmmu) add_subdirectory(pseh) Added: trunk/reactos/lib/gcc_ssp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/gcc_ssp/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/gcc_ssp/CMakeLists.txt (added) +++ trunk/reactos/lib/gcc_ssp/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -0,0 +1,2 @@ + +add_library(gcc_ssp STATIC gcc_ssp.c) Propchange: trunk/reactos/lib/gcc_ssp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/gcc_ssp/gcc_ssp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/gcc_ssp/gcc_ssp.c?rev=… ============================================================================== --- trunk/reactos/lib/gcc_ssp/gcc_ssp.c (added) +++ trunk/reactos/lib/gcc_ssp/gcc_ssp.c [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -0,0 +1,23 @@ + +#define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2 + +/* Should be random :-/ */ +void * __stack_chk_guard = (void*)0xf00df00d; + +#if 0 +void __stack_chk_guard_setup() +{ + unsigned char * p; + p = (unsigned char *)&__stack_chk_guard; // *** Notice that this takes the address of __stack_chk_guard *** + + /* If you have the ability to generate random numbers in your kernel then use them, + otherwise for 32-bit code: */ + *p = 0x00000aff; // *** p is &__stack_chk_guard so *p writes to __stack_chk_guard rather than *__stack_chk_guard *** +} +#endif + +void __stack_chk_fail() +{ + /* Like __fastfail */ + __asm__("int $0x29" : : "c"(FAST_FAIL_STACK_COOKIE_CHECK_FAILURE) : "memory"); +} Propchange: trunk/reactos/lib/gcc_ssp/gcc_ssp.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/reactos/lib/gcc_ssp/gcc_ssp.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/gcc_ssp/gcc_ssp.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -85,4 +85,8 @@ target_link_libraries(msvcrtex oldnames) endif() +if(STACK_PROTECTOR) + target_link_libraries(msvcrtex gcc_ssp) +endif() + add_dependencies(msvcrtex psdk asm) Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -44,6 +44,10 @@ wdmguid ioevent) +if(STACK_PROTECTOR) + target_link_libraries(ntoskrnl gcc_ssp) +endif() + add_importlibs(ntoskrnl hal kdcom bootvid) add_pch(ntoskrnl ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h NTOSKRNL_SOURCE) add_dependencies(ntoskrnl psdk bugcodes asm) Modified: trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLis… ============================================================================== --- trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntkrnlmp/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:26:14 2014 @@ -30,6 +30,10 @@ set_image_base(ntkrnlmp 0x80800000) endif() +if(STACK_PROTECTOR) + target_link_libraries(ntkrnlmp gcc_ssp) +endif() + target_link_libraries(ntkrnlmp cportlib csq

1 0

[jgardou] 64526: [CMAKE] - Introduce the kerneldll module type (like kernelmodedriver, but ending with .dll) and use it in various places - vfatx.dll whould in fact be a native DLL
by jgardou＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: jgardou Date: Sat Oct 4 20:25:57 2014 New Revision: 64526 URL: http://svn.reactos.org/svn/reactos?rev=64526&view=rev Log: [CMAKE] - Introduce the kerneldll module type (like kernelmodedriver, but ending with .dll) and use it in various places - vfatx.dll whould in fact be a native DLL Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/dll/win32/ufatx/CMakeLists.txt trunk/reactos/drivers/base/bootvid/CMakeLists.txt trunk/reactos/drivers/base/kdrosdbg/CMakeLists.txt trunk/reactos/drivers/hid/hidclass/CMakeLists.txt trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -518,7 +518,8 @@ # Set subsystem. Also take this as an occasion # to error out if someone gave a non existing type - if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) OR (${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) + if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) + OR (${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) set(__subsystem native) elseif(${TYPE} STREQUAL win32cui) set(__subsystem console) @@ -617,14 +618,16 @@ else() message(STATUS "${MODULE} has no base address") endif() - elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) + elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kernelmodedll)) set_image_base(${MODULE} 0x00010000) endif() # Now do some stuff which is specific to each type - if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) + if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kernelmodedll)) add_dependencies(${MODULE} bugcodes) - set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") + if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) + set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") + endif() endif() if(${TYPE} STREQUAL win32ocx) Modified: trunk/reactos/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -7,9 +7,9 @@ add_library(ufatx SHARED ${SOURCE}) -set_module_type(ufatx win32dll ENTRYPOINT 0 ) +target_link_libraries(ufatx vfatxlib) +set_module_type(ufatx nativedll ENTRYPOINT 0 ) -target_link_libraries(ufatx vfatxlib) add_importlibs(ufatx ntdll) add_dependencies(ufatx psdk) Modified: trunk/reactos/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/CMake… ============================================================================== --- trunk/reactos/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -19,12 +19,10 @@ bootvid.rc ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def) -set_entrypoint(bootvid 0) -set_subsystem(bootvid native) -set_image_base(bootvid 0x00010000) +set_module_type(bootvid kerneldll ENTRYPOINT 0) add_importlibs(bootvid ntoskrnl hal) add_pch(bootvid precomp.h SOURCE) -add_dependencies(bootvid psdk bugcodes) +add_dependencies(bootvid psdk) add_cd_file(TARGET bootvid DESTINATION reactos/system32 NO_CAB FOR all) Modified: trunk/reactos/drivers/base/kdrosdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdrosdbg/CMak… ============================================================================== --- trunk/reactos/drivers/base/kdrosdbg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdrosdbg/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -8,12 +8,10 @@ add_library(kdcom SHARED ${SOURCE}) -set_entrypoint(kdcom 0) -set_subsystem(kdcom native) -set_image_base(kdcom 0x00010000) +set_module_type(kdcom kerneldll ENTRYPOINT 0) add_importlibs(kdcom ntoskrnl hal) target_link_libraries(kdcom cportlib) -add_dependencies(kdcom psdk bugcodes) +add_dependencies(kdcom psdk) add_cd_file(TARGET kdcom DESTINATION reactos/system32 NO_CAB FOR all) Modified: trunk/reactos/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/CMake… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -13,12 +13,8 @@ hidclass.rc ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def) -set_entrypoint(hidclass 0) -set_subsystem(hidclass native) -set_target_properties(hidclass PROPERTIES SUFFIX ".sys") - +set_module_type(hidclass kernelmodedriver ENTRYPOINT 0) add_importlibs(hidclass ntoskrnl hidparse hal) -add_dependencies(hidclass bugcodes) add_pch(hidclass precomp.h SOURCE) add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/CMakeL… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -40,15 +40,11 @@ ks.rc ${CMAKE_CURRENT_BINARY_DIR}/ks.def) -set_target_properties(ks PROPERTIES SUFFIX ".sys") - -set_entrypoint(ks 0) -set_subsystem(ks native) -set_image_base(ks 0x00010000) +set_module_type(ks kernelmodedriver ENTRYPOINT 0) target_link_libraries(ks ${PSEH_LIB}) add_pch(ks precomp.h SOURCE) add_importlibs(ks ntoskrnl hal) -add_dependencies(ks psdk bugcodes) +add_dependencies(ks psdk) add_cd_file(TARGET ks DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -34,10 +34,8 @@ target_link_libraries(${_halname} libcntpr) add_importlibs(${_halname} ntoskrnl) #add_pch(${_halname} include/hal.h) - add_dependencies(${_halname} psdk bugcodes asm) - set_entrypoint(${_halname} HalInitSystem 8) - set_subsystem(${_halname} native) - set_image_base(${_halname} 0x00010000) + add_dependencies(${_halname} psdk asm) + set_module_type(${_halname} kerneldll ENTRYPOINT HalInitSystem 8) add_cd_file(TARGET ${_halname} DESTINATION reactos/system32 NO_CAB FOR all) if(MSVC) add_target_link_flags(${_halname} "/ignore:4216 /ignore:4078") Modified: trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -14,11 +14,10 @@ framebuf.rc ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def) +set_module_type(framebuf kerneldll ENTRYPOINT DrvEnableDriver 12) + add_pch(framebuf framebuf.h SOURCE) -set_entrypoint(framebuf DrvEnableDriver 12) -set_subsystem(framebuf native) -set_image_base(framebuf 0x00010000) target_link_libraries(framebuf libcntpr) add_importlibs(framebuf win32k) -add_dependencies(framebuf psdk bugcodes) +add_dependencies(framebuf psdk) add_cd_file(TARGET framebuf DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -19,11 +19,10 @@ vgaddi.rc ${CMAKE_CURRENT_BINARY_DIR}/vgaddi.def) -set_entrypoint(vgaddi DrvEnableDriver 12) -set_subsystem(vgaddi native) -set_image_base(vgaddi 0x00010000) +set_module_type(vgaddi kerneldll ENTRYPOINT DrvEnableDriver 12) + add_pch(vgaddi vgaddi.h SOURCE) add_importlibs(vgaddi win32k) target_link_libraries(vgaddi libcntpr) -add_dependencies(vgaddi psdk bugcodes) +add_dependencies(vgaddi psdk) add_cd_file(TARGET vgaddi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/ftfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt [iso-8859-1] Sat Oct 4 20:25:57 2014 @@ -16,9 +16,7 @@ freetype.rc ${CMAKE_CURRENT_BINARY_DIR}/ftfd.def) -set_entrypoint(ftfd FtfdEnableDriver 12) -set_subsystem(ftfd native) -set_image_base(ftfd 0x00010000) +set_module_type(ftfd kerneldll ENTRYPOINT FtfdEnableDriver 12) target_link_libraries(ftfd freetype

1 0

[jgardou] 64525: [KERNEL32] - Always allocate a guard page at the bottom of the stack. It doesn't depend on it being reserved or committed, it just has to be here.
by jgardou＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: jgardou Date: Sat Oct 4 20:25:35 2014 New Revision: 64525 URL: http://svn.reactos.org/svn/reactos?rev=64525&view=rev Log: [KERNEL32] - Always allocate a guard page at the bottom of the stack. It doesn't depend on it being reserved or committed, it just has to be here. Modified: trunk/reactos/dll/win32/kernel32/client/utils.c Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sat Oct 4 20:25:35 2014 @@ -358,7 +358,6 @@ NTSTATUS Status; PIMAGE_NT_HEADERS Headers; ULONG_PTR Stack; - BOOLEAN UseGuard; ULONG PageSize, Dummy, AllocationGranularity; SIZE_T StackReserveHeader, StackCommitHeader, GuardPageSize, GuaranteedStackCommit; DPRINT("BaseCreateStack (hProcess: %p, Max: %lx, Current: %lx)\n", @@ -426,18 +425,6 @@ /* Update the Stack Position */ Stack += StackReserve - StackCommit; - /* Check if we will need a guard page */ - if (StackReserve > StackCommit) - { - Stack -= PageSize; - StackCommit += PageSize; - UseGuard = TRUE; - } - else - { - UseGuard = FALSE; - } - /* Allocate memory for the stack */ Status = NtAllocateVirtualMemory(hProcess, (PVOID*)&Stack, @@ -457,25 +444,21 @@ InitialTeb->StackLimit = (PVOID)Stack; /* Create a guard page */ - if (UseGuard) - { - /* Set the guard page */ - GuardPageSize = PAGE_SIZE; - Status = NtProtectVirtualMemory(hProcess, - (PVOID*)&Stack, - &GuardPageSize, - PAGE_GUARD | PAGE_READWRITE, - &Dummy); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failure to set guard page\n"); - return Status; - } - - /* Update the Stack Limit keeping in mind the Guard Page */ - InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit + - GuardPageSize); - } + GuardPageSize = PageSize; + Status = NtProtectVirtualMemory(hProcess, + (PVOID*)&Stack, + &GuardPageSize, + PAGE_GUARD | PAGE_READWRITE, + &Dummy); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to set guard page\n"); + return Status; + } + + /* Update the Stack Limit keeping in mind the Guard Page */ + InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit + + GuardPageSize); /* We are done! */ return STATUS_SUCCESS;

1 0

[pschweitzer] 64524: [MSPAINT] - Check for correct allocation - Don't leak in case of file opening failure
by pschweitzer＠svn.reactos.org 04 Oct '14

04 Oct '14

Author: pschweitzer Date: Sat Oct 4 15:41:38 2014 New Revision: 64524 URL: http://svn.reactos.org/svn/reactos?rev=64524&view=rev Log: [MSPAINT] - Check for correct allocation - Don't leak in case of file opening failure Modified: trunk/reactos/base/applications/mspaint/dib.c Modified: trunk/reactos/base/applications/mspaint/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/dib.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/dib.c [iso-8859-1] Sat Oct 4 15:41:38 2014 @@ -72,11 +72,17 @@ bi.biYPelsPerMeter = vRes; buffer = HeapAlloc(GetProcessHeap(), 0, imgDataSize); + if (!buffer) + return; + GetDIBits(hDC, hBitmap, 0, bm.bmHeight, buffer, (LPBITMAPINFO) & bi, DIB_RGB_COLORS); hFile = CreateFile(FileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_SEQUENTIAL_SCAN, NULL); if (hFile == INVALID_HANDLE_VALUE) + { + HeapFree(GetProcessHeap(), 0, buffer); return; + } WriteFile(hFile, &bf, sizeof(BITMAPFILEHEADER), &dwBytesWritten, NULL); WriteFile(hFile, &bi, sizeof(BITMAPINFOHEADER), &dwBytesWritten, NULL);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs