Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[arty] 44944: Fix failure case for pageout (including pulling a page that's being swapped out), Reorder operations on not present to handle wait entries properly. Fix some balancer issues and initialize rmap earlier, as there's no reason to wait.

by arty＠svn.reactos.org

Author: arty Date: Tue Jan 5 16:15:30 2010 New Revision: 44944 URL: http://svn.reactos.org/svn/reactos?rev=44944&view=rev Log: Fix failure case for pageout (including pulling a page that's being swapped out), Reorder operations on not present to handle wait entries properly. Fix some balancer issues and initialize rmap earlier, as there's no reason to wait. Removed: branches/arty-newcc/ntoskrnl/mm/pageop.c Modified: branches/arty-newcc/ntoskrnl/mm/anonmem.c branches/arty-newcc/ntoskrnl/mm/balance.c branches/arty-newcc/ntoskrnl/mm/elf.inc.h branches/arty-newcc/ntoskrnl/mm/elf32.c branches/arty-newcc/ntoskrnl/mm/mmfault.c branches/arty-newcc/ntoskrnl/mm/mminit.c branches/arty-newcc/ntoskrnl/mm/rmap.c branches/arty-newcc/ntoskrnl/mm/section/fault.c branches/arty-newcc/ntoskrnl/mm/section/pagefile.c Modified: branches/arty-newcc/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/anonmem.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/anonmem.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -790,49 +790,12 @@ { PLIST_ENTRY current_entry; PMM_REGION current; - ULONG i; DPRINT("MmFreeVirtualMemory(Process %p MemoryArea %p)\n", Process, MemoryArea); /* Mark this memory area as about to be deleted. */ MemoryArea->DeleteInProgress = TRUE; - - /* - * Wait for any ongoing paging operations. Notice that since we have - * flagged this memory area as deleted no more page ops will be added. - */ - if (MemoryArea->PageOpCount > 0) - { - ULONG_PTR MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; - - for (i = 0; i < nPages && MemoryArea->PageOpCount != 0; ++i) - { - PMM_PAGEOP PageOp; - PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, - (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), - NULL, 0); - if (PageOp != NULL) - { - NTSTATUS Status; - MmUnlockAddressSpace(&Process->Vm); - Status = KeWaitForSingleObject(&PageOp->CompletionEvent, - 0, - KernelMode, - FALSE, - NULL); - if (Status != STATUS_SUCCESS) - { - DPRINT1("Failed to wait for page op\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - MmLockAddressSpace(&Process->Vm); - MmReleasePageOp(PageOp); - } - } - } /* Free all the individual segments. */ current_entry = MemoryArea->Data.VirtualMemoryData.RegionListHead.Flink; Modified: branches/arty-newcc/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/balance.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -31,6 +31,7 @@ /* GLOBALS ******************************************************************/ +BOOLEAN MiBalancerInitialized = FALSE; MM_MEMORY_CONSUMER MiMemoryConsumers[MC_MAXIMUM]; /*static*/ ULONG MiMinimumAvailablePages = 128; static ULONG MiNrTotalPages; @@ -170,8 +171,9 @@ MiIsBalancerThread(VOID) { return - PsGetCurrentThread()->Cid.UniqueThread == - MiBalancerThreadId.UniqueThread; + !MiBalancerInitialized || + (PsGetCurrentThread()->Cid.UniqueThread == + MiBalancerThreadId.UniqueThread); } /* @@ -284,6 +286,8 @@ WaitObjects[0] = &MiBalancerEvent; WaitObjects[1] = &MiBalancerTimer; + + MiBalancerInitialized = TRUE; while (1) { @@ -335,23 +339,14 @@ { KPRIORITY Priority; NTSTATUS Status; -#if !defined(__GNUC__) - - LARGE_INTEGER dummyJunkNeeded; - dummyJunkNeeded.QuadPart = -20000000; /* 2 sec */ - ; -#endif - + LARGE_INTEGER BalancerInterval; + BalancerInterval.QuadPart = -20000000; /* 2 sec */ KeInitializeEvent(&MiBalancerEvent, SynchronizationEvent, FALSE); KeInitializeEvent(&MiBalancerContinue, SynchronizationEvent, FALSE); KeInitializeTimerEx(&MiBalancerTimer, SynchronizationTimer); KeSetTimerEx(&MiBalancerTimer, -#if defined(__GNUC__) - (LARGE_INTEGER)(LONGLONG)-20000000LL, /* 2 sec */ -#else - dummyJunkNeeded, -#endif + BalancerInterval, 2000, /* 2 sec */ NULL); Modified: branches/arty-newcc/ntoskrnl/mm/elf.inc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/elf.inc.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/elf.inc.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/elf.inc.h [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -8,8 +8,6 @@ #endif #include <elf/elf.h> - -#define IMAGE_SUBSYSTEM_WINDOWS_CUI 3 /* TODO: Intsafe should be made into a library, as it's generally useful */ static __inline BOOLEAN Intsafe_CanAddULongPtr Modified: branches/arty-newcc/ntoskrnl/mm/elf32.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/elf32.c?… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/elf32.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/elf32.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -9,8 +9,6 @@ #include <ntoskrnl.h> #define __ELF_WORD_SIZE 32 #include "elf.inc.h" - -#define IMAGE_FILE_MACHINE_UNKNOWN 0 extern NTSTATUS NTAPI Elf64FmtCreateSection ( Modified: branches/arty-newcc/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mmfault.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/mmfault.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -161,6 +161,7 @@ if (Status == STATUS_SUCCESS + 1) { // Wait page ... + DPRINT1("Waiting for %x\n", Address); if (!NT_SUCCESS (KeWaitForSingleObject (&MmWaitPageEvent, @@ -169,6 +170,7 @@ FALSE, NULL))) ASSERT(FALSE); + DPRINT1("Restarting fault %x\n", Address); Status = STATUS_MM_RESTART_OPERATION; } else if (Status == STATUS_MORE_PROCESSING_REQUIRED) @@ -341,6 +343,7 @@ if (Status == STATUS_SUCCESS + 1) { // Wait page ... + DPRINT1("Waiting for %x\n", Address); if (!NT_SUCCESS (KeWaitForSingleObject (&MmWaitPageEvent, @@ -349,6 +352,7 @@ FALSE, NULL))) ASSERT(FALSE); + DPRINT1("Done waiting for %x\n", Address); Status = STATUS_MM_RESTART_OPERATION; } else if (Status == STATUS_MORE_PROCESSING_REQUIRED) Modified: branches/arty-newcc/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mminit.c… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/mminit.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -467,7 +467,10 @@ /* Dump the address space */ MiDbgDumpAddressSpace(); - + + /* Initialize rmap implementation */ + MmInitializeRmapList(); + /* Initialize paged pool */ MmInitializePagedPool(); @@ -496,8 +499,6 @@ } else if (Phase == 1) { - MmInitializeRmapList(); - MmInitializePageOp(); MmInitSectionImplementation(); MmInitPagingFile(); Removed: branches/arty-newcc/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/pageop.c… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/pageop.c (removed) @@ -1,268 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/pageop.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES ****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, MmInitializePageOp) -#endif - - -/* GLOBALS *******************************************************************/ - -#define PAGEOP_HASH_TABLE_SIZE (32) - -static KSPIN_LOCK MmPageOpHashTableLock; -static PMM_PAGEOP MmPageOpHashTable[PAGEOP_HASH_TABLE_SIZE]; -static NPAGED_LOOKASIDE_LIST MmPageOpLookasideList; - -/* FUNCTIONS *****************************************************************/ - -VOID -NTAPI -MmReleasePageOp(PMM_PAGEOP PageOp) -/* - * FUNCTION: Release a reference to a page operation descriptor - */ -{ - KIRQL oldIrql; - PMM_PAGEOP PrevPageOp; - - KeAcquireSpinLock(&MmPageOpHashTableLock, &oldIrql); - PageOp->ReferenceCount--; - if (PageOp->ReferenceCount > 0) - { - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return; - } - (void)InterlockedDecrementUL(&PageOp->MArea->PageOpCount); - PrevPageOp = MmPageOpHashTable[PageOp->Hash]; - if (PrevPageOp == PageOp) - { - MmPageOpHashTable[PageOp->Hash] = PageOp->Next; - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - ExFreeToNPagedLookasideList(&MmPageOpLookasideList, PageOp); - return; - } - while (PrevPageOp->Next != NULL) - { - if (PrevPageOp->Next == PageOp) - { - PrevPageOp->Next = PageOp->Next; - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - ExFreeToNPagedLookasideList(&MmPageOpLookasideList, PageOp); - return; - } - PrevPageOp = PrevPageOp->Next; - } - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - KeBugCheck(MEMORY_MANAGEMENT); -} - -PMM_PAGEOP -NTAPI -MmCheckForPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, - PMM_SECTION_SEGMENT Segment, ULONG Offset) -{ - ULONG_PTR Hash; - KIRQL oldIrql; - PMM_PAGEOP PageOp; - - /* - * Calcuate the hash value for pageop structure - */ - if (MArea->Type == MEMORY_AREA_SECTION_VIEW) - { - Hash = (((ULONG_PTR)Segment) | (((ULONG_PTR)Offset) / PAGE_SIZE)); - } - else - { - Hash = (((ULONG_PTR)Pid) | (((ULONG_PTR)Address) / PAGE_SIZE)); - } - Hash = Hash % PAGEOP_HASH_TABLE_SIZE; - - KeAcquireSpinLock(&MmPageOpHashTableLock, &oldIrql); - - /* - * Check for an existing pageop structure - */ - PageOp = MmPageOpHashTable[Hash]; - while (PageOp != NULL) - { - if (MArea->Type == MEMORY_AREA_SECTION_VIEW) - { - if (PageOp->Segment == Segment && - PageOp->Offset == Offset) - { - break; - } - } - else - { - if (PageOp->Pid == Pid && - PageOp->Address == Address) - { - break; - } - } - PageOp = PageOp->Next; - } - - /* - * If we found an existing pageop then increment the reference count - * and return it. - */ - if (PageOp != NULL) - { - PageOp->ReferenceCount++; - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return(PageOp); - } - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return(NULL); -} - -PMM_PAGEOP -NTAPI -MmGetPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, - PMM_SECTION_SEGMENT Segment, ULONG Offset, ULONG OpType, BOOLEAN First) -/* - * FUNCTION: Get a page operation descriptor corresponding to - * the memory area and either the segment, offset pair or the - * pid, address pair. - */ -{ - ULONG_PTR Hash; - KIRQL oldIrql; - PMM_PAGEOP PageOp; - - /* - * Calcuate the hash value for pageop structure - */ - if (MArea->Type == MEMORY_AREA_SECTION_VIEW) - { - Hash = (((ULONG_PTR)Segment) | (((ULONG_PTR)Offset) / PAGE_SIZE)); - } - else - { - Hash = (((ULONG_PTR)Pid) | (((ULONG_PTR)Address) / PAGE_SIZE)); - } - Hash = Hash % PAGEOP_HASH_TABLE_SIZE; - - KeAcquireSpinLock(&MmPageOpHashTableLock, &oldIrql); - - /* - * Check for an existing pageop structure - */ - PageOp = MmPageOpHashTable[Hash]; - while (PageOp != NULL) - { - if (MArea->Type == MEMORY_AREA_SECTION_VIEW) - { - if (PageOp->Segment == Segment && - PageOp->Offset == Offset) - { - break; - } - } - else - { - if (PageOp->Pid == Pid && - PageOp->Address == Address) - { - break; - } - } - PageOp = PageOp->Next; - } - - /* - * If we found an existing pageop then increment the reference count - * and return it. - */ - if (PageOp != NULL) - { - if (First) - { - PageOp = NULL; - } - else - { - PageOp->ReferenceCount++; - } - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return(PageOp); - } - - /* - * Otherwise add a new pageop. - */ - PageOp = ExAllocateFromNPagedLookasideList(&MmPageOpLookasideList); - if (PageOp == NULL) - { - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - KeBugCheck(MEMORY_MANAGEMENT); - return(NULL); - } - - if (MArea->Type != MEMORY_AREA_SECTION_VIEW) - { - PageOp->Pid = Pid; - PageOp->Address = Address; - } - else - { - PageOp->Segment = Segment; - PageOp->Offset = Offset; - } - PageOp->ReferenceCount = 1; - PageOp->Next = MmPageOpHashTable[Hash]; - PageOp->Hash = Hash; - PageOp->Thread = PsGetCurrentThread(); - PageOp->Abandoned = FALSE; - PageOp->Status = STATUS_PENDING; - PageOp->OpType = OpType; - PageOp->MArea = MArea; - KeInitializeEvent(&PageOp->CompletionEvent, NotificationEvent, FALSE); - MmPageOpHashTable[Hash] = PageOp; - (void)InterlockedIncrementUL(&MArea->PageOpCount); - - KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - return(PageOp); -} - -VOID -INIT_FUNCTION -NTAPI -MmInitializePageOp(VOID) -{ - memset(MmPageOpHashTable, 0, sizeof(MmPageOpHashTable)); - KeInitializeSpinLock(&MmPageOpHashTableLock); - - ExInitializeNPagedLookasideList (&MmPageOpLookasideList, - NULL, - NULL, - 0, - sizeof(MM_PAGEOP), - TAG_MM_PAGEOP, - 50); -} - - - - - - - - - Modified: branches/arty-newcc/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/rmap.c?r… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -342,19 +342,30 @@ { DPRINT("About to finalize section page %x %s\n", Page, Dirty ? "dirty" : "clean"); - Evicted = - NT_SUCCESS(Status) && - NT_SUCCESS(MmFinalizeSectionPageOut(Segment, &FileOffset, Page, Dirty)); - - if (!Evicted && SectionPage) - { - DPRINT - ("Failed to page out, replacing %x at %x in segment %x\n", - SectionPage, FileOffset.LowPart, Segment); + if (MmGetRmapListHeadPage(Page)) + { + DPRINT1("Page %x was re-acquired while we were evicting it\n", Page); MmLockSectionSegment(Segment); MiSetPageEntrySectionSegment(Segment, &FileOffset, Dirty ? DIRTY_SSE(MAKE_PFN_SSE(SectionPage)) : MAKE_PFN_SSE(SectionPage)); MmUnlockSectionSegment(Segment); KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); + } + else + { + Evicted = + NT_SUCCESS(Status) && + NT_SUCCESS(MmFinalizeSectionPageOut(Segment, &FileOffset, Page, Dirty)); + + if (!Evicted && SectionPage) + { + DPRINT1 + ("Failed to page out, replacing %x at %x in segment %x\n", + SectionPage, FileOffset.LowPart, Segment); + MmLockSectionSegment(Segment); + MiSetPageEntrySectionSegment(Segment, &FileOffset, Dirty ? DIRTY_SSE(MAKE_PFN_SSE(SectionPage)) : MAKE_PFN_SSE(SectionPage)); + MmUnlockSectionSegment(Segment); + KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); + } } } Modified: branches/arty-newcc/ntoskrnl/mm/section/fault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/fault.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/fault.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -71,7 +71,7 @@ PMM_REGION Region; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - DPRINT1("Not Present: %p %p (%p-%p)\n", AddressSpace, Address, MemoryArea->StartingAddress, MemoryArea->EndingAddress); + DPRINT("Not Present: %p %p (%p-%p)\n", AddressSpace, Address, MemoryArea->StartingAddress, MemoryArea->EndingAddress); /* * There is a window between taking the page fault and locking the @@ -115,6 +115,7 @@ { DPRINT("FileName %wZ\n", &Segment->FileObject->FileName); } + DPRINT("Total Offset %08x%08x\n", TotalOffset.HighPart, TotalOffset.LowPart); /* @@ -151,8 +152,73 @@ DPRINT("Normal %x\n", Attributes); } -grab_page: - if (Entry && !IS_SWAP_FROM_SSE(Entry)) + if (Required->State && Required->Page[0]) + { + DPRINT("Have file and page, set page in section @ %x\n", TotalOffset.LowPart); + Status = MiSetPageEntrySectionSegment + (Segment, &TotalOffset, Entry = MAKE_PFN_SSE(Required->Page[0])); + if (NT_SUCCESS(Status)) + { + MmReferencePage(Required->Page[0]); + Status = MmCreateVirtualMapping(Process, Address, Attributes, Required->Page, 1); + if (NT_SUCCESS(Status)) + { + MmInsertRmap(Required->Page[0], Process, Address); + } + else + { + MmDereferencePage(Required->Page[0]); + } + } + MmUnlockSectionSegment(Segment); + DPRINT("XXX Set Event %x\n", Status); + KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); + DPRINT1("Status %x\n", Status); + return Status; + } + else if (MmIsPageSwapEntry(Process, Address)) + { + SWAPENTRY SwapEntry; + MmGetPageFileMapping(Process, Address, &SwapEntry); + if (SwapEntry == MM_WAIT_ENTRY) + { + DPRINT1("Wait for page entry in section\n"); + return STATUS_SUCCESS + 1; + } + else + { + DPRINT("Swap in\n"); + MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); + Required->State = 7; + Required->Consumer = Consumer; + Required->SwapEntry = SwapEntry; + Required->DoAcquisition = MiSwapInPage; + MmUnlockSectionSegment(Segment); + return STATUS_MORE_PROCESSING_REQUIRED; + } + } + else if (IS_SWAP_FROM_SSE(Entry)) + { + SWAPENTRY SwapEntry = SWAPENTRY_FROM_SSE(Entry); + if (SwapEntry == MM_WAIT_ENTRY) + { + DPRINT1("Wait for page entry in section\n"); + return STATUS_SUCCESS + 1; + } + else + { + DPRINT("Swap in\n"); + MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); + MiSetPageEntrySectionSegment(Segment, &TotalOffset, MAKE_SWAP_SSE(MM_WAIT_ENTRY)); + Required->State = 7; + Required->Consumer = Consumer; + Required->SwapEntry = SwapEntry; + Required->DoAcquisition = MiSwapInPage; + MmUnlockSectionSegment(Segment); + return STATUS_MORE_PROCESSING_REQUIRED; + } + } + else if (Entry && !IS_SWAP_FROM_SSE(Entry)) { PFN_TYPE Page = PFN_FROM_SSE(Entry); DPRINT("Page %x\n", Page); @@ -166,23 +232,10 @@ DPRINT("XXX Set Event %x\n", Status); KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); MmUnlockSectionSegment(Segment); + DPRINT1("Status %x\n", Status); return Status; } - - if (Required->State && Required->Page[0]) - { - DPRINT("Have file and page, set page in section @ %x\n", TotalOffset.LowPart); - Status = MiSetPageEntrySectionSegment - (Segment, &TotalOffset, Entry = MAKE_PFN_SSE(Required->Page[0])); - if (NT_SUCCESS(Status)) - { - goto grab_page; - } - MmUnlockSectionSegment(Segment); - return Status; - } - - if (Entry == 0) + else { DPRINT("Get page into section\n"); /* @@ -213,17 +266,6 @@ MmUnlockSectionSegment(Segment); return STATUS_MORE_PROCESSING_REQUIRED; } - } - else - { - DPRINT("Swap in\n"); - Required->State = 7; - Required->Consumer = Consumer; - Required->SwapEntry = SWAPENTRY_FROM_SSE(Entry); - MiSetPageEntrySectionSegment(Segment, &TotalOffset, MAKE_SWAP_SSE(MM_WAIT_ENTRY)); - Required->DoAcquisition = MiSwapInPage; - MmUnlockSectionSegment(Segment); - return STATUS_MORE_PROCESSING_REQUIRED; } } @@ -311,6 +353,7 @@ DPRINT("Set in section @ %x\n", Offset.LowPart); Status = MiSetPageEntrySectionSegment (Segment, &Offset, MAKE_PFN_SSE(Page)); + KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); } if (Required->State & 2) @@ -330,6 +373,7 @@ if (Required->State & 4) { DPRINT("Take a reference\n"); + Status = STATUS_SUCCESS; MmReferencePage(Page); } @@ -349,8 +393,7 @@ MmUnlockSectionSegment(Segment); return STATUS_MORE_PROCESSING_REQUIRED; } - - if (HasSwapEntry) + else if (HasSwapEntry) { MmGetPageFileMapping(Process, (PVOID)PAddress, &Required->SwapEntry); if (Required->SwapEntry == MM_WAIT_ENTRY) @@ -363,28 +406,18 @@ * Must be private page we have swapped out. */ DPRINT("Private swapped out page\n"); + MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); Required->State = 2; Required->Consumer = MC_USER; - MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); Required->DoAcquisition = MiSwapInPage; MmUnlockSectionSegment(Segment); return STATUS_MORE_PROCESSING_REQUIRED; } - - /* - * Map anonymous memory for BSS sections - */ - if (Entry == 0 || - (Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) || - Offset.QuadPart >= PAGE_ROUND_UP(Segment->RawLength.QuadPart)) - { - DPRINT("BSS Page\n"); - Required->State = 2; - Required->Amount = 1; - Required->Consumer = MC_USER; - Required->DoAcquisition = MiGetOnePage; - MmUnlockSectionSegment(Segment); - return STATUS_MORE_PROCESSING_REQUIRED; + else if (IS_SWAP_FROM_SSE(Entry) && SWAPENTRY_FROM_SSE(Entry) == MM_WAIT_ENTRY) + { + DPRINT("Waiting\n"); + MmUnlockSectionSegment(Segment); + return STATUS_SUCCESS + 1; } else if (IS_SWAP_FROM_SSE(Entry)) { @@ -394,6 +427,21 @@ MmGetPageFileMapping(Process, (PVOID)PAddress, &Required->SwapEntry); MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); Required->DoAcquisition = MiSwapInPage; + MmUnlockSectionSegment(Segment); + return STATUS_MORE_PROCESSING_REQUIRED; + } + /* + * Map anonymous memory for BSS sections + */ + else if (Entry == 0 && + ((Segment->Image.Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) || + Offset.QuadPart >= PAGE_ROUND_UP(Segment->RawLength.QuadPart))) + { + DPRINT("BSS Page\n"); + Required->State = 2; + Required->Amount = 1; + Required->Consumer = MC_USER; + Required->DoAcquisition = MiGetOnePage; MmUnlockSectionSegment(Segment); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -690,6 +738,7 @@ /* * Write the page to the pagefile */ + DPRINT1("Writing swap entry: %x %x\n", SwapEntry, Page); Status = MmWriteToSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) { @@ -749,15 +798,22 @@ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); if (SwapEntry == MM_WAIT_ENTRY) { + DPRINT1 + ("SwapEntry is a WAIT, our swap to is %x, State is %x for (%x:%x) on page %x\n", + Required->SwapEntry, + Required->State, + Process, + Address, + OurPage); if (Required->SwapEntry || (Required->State & 2)) { - MmDeleteRmap(OurPage, Process, Address); Status = MmCreatePageFileMapping(Process, Address, Required->SwapEntry); MmSetSavedSwapEntryPage(OurPage, 0); ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + MmDeleteRmap(OurPage, Process, Address); MmDereferencePage(OurPage); + MmUnlockSectionSegment(Segment); KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); - MmUnlockSectionSegment(Segment); ASSERT(KeGetCurrentIrql() <= APC_LEVEL); DPRINT("XXX Set Event %x\n", Status); return Status; @@ -780,37 +836,34 @@ { Required->State |= 2; Required->SwapEntry = MmAllocSwapPage(); - if (!Required->SwapEntry) return STATUS_PAGEFILE_QUOTA; + if (!Required->SwapEntry) + { + MmUnlockSectionSegment(Segment); + return STATUS_PAGEFILE_QUOTA; + } + DPRINT1("MiWriteSwapPage (%x -> %x)\n", OurPage, Required->SwapEntry); Required->DoAcquisition = MiWriteSwapPage; MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); MmUnlockSectionSegment(Segment); return STATUS_MORE_PROCESSING_REQUIRED; } - else if (!Required->SwapEntry) - { + else + { + DPRINT1("Out of swap space for page %x\n", OurPage); MmUnlockSectionSegment(Segment); return STATUS_PAGEFILE_QUOTA; } - MmDeleteRmap(OurPage, Process, Address); - MmCreatePageFileMapping(Process, Address, Required->SwapEntry); - MmDereferencePage(OurPage); - MmUnlockSectionSegment(Segment); - return STATUS_SUCCESS; } else { BOOLEAN Dirty = !!MmIsDirtyPageRmap(OurPage); Required->State |= Dirty; DPRINT("Public page evicting %x (dirty %d)\n", OurPage, Required->State & 1); - if (Dirty) - { - DPRINT("Setting segment page dirty\n"); - MiSetPageEntrySectionSegment(Segment, &TotalOffset, DIRTY_SSE(Entry)); - } + MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); MmDeleteRmap(OurPage, Process, Address); - MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); MmDereferencePage(OurPage); MmUnlockSectionSegment(Segment); + KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); return STATUS_SUCCESS; } } Modified: branches/arty-newcc/ntoskrnl/mm/section/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] Tue Jan 5 16:15:30 2010 @@ -153,24 +153,20 @@ BOOLEAN Dirty) { NTSTATUS Status = STATUS_SUCCESS; - SWAPENTRY Swap; - + BOOLEAN WriteZero = FALSE; + SWAPENTRY Swap = MmGetSavedSwapEntryPage(Page); + + MmLockSectionSegment(Segment); if (Dirty) { - DPRINT("Finalize (dirty) Segment %x\n", Segment); + DPRINT1("Finalize (dirty) Segment %x Page %x\n", Segment, Page); DPRINT("Segment->FileObject %x\n", Segment->FileObject); DPRINT("Segment->Flags %x\n", Segment->Flags); if (Segment->FileObject && !(Segment->Flags & MM_IMAGE_SEGMENT)) { - DPRINT("Segment %x FileObject %x\n", Segment, Segment->FileObject, &Segment); + DPRINT1("Segment %x FileObject %x Offset %x\n", Segment, Segment->FileObject, FileOffset->LowPart); Status = MiWriteBackPage(Segment->FileObject, FileOffset, PAGE_SIZE, Page); - if (NT_SUCCESS(Status)) - { - DPRINT("Write zero to %x:%x %x\n", Segment, FileOffset->LowPart, Page); - MmLockSectionSegment(Segment); - MiSetPageEntrySectionSegment(Segment, FileOffset, 0); - MmUnlockSectionSegment(Segment); - } + WriteZero = NT_SUCCESS(Status); } else { @@ -185,29 +181,36 @@ } DPRINT("Status %x\n", Status); - if (NT_SUCCESS(Status)) - { - DPRINT("Set Swap entry\n"); - MmLockSectionSegment(Segment); - MiSetPageEntrySectionSegment(Segment, FileOffset, MAKE_SWAP_SSE(Swap)); - MmUnlockSectionSegment(Segment); - } + WriteZero = NT_SUCCESS(Status); } } else { - DPRINT("Write zero to %x:%x (%x)\n", Segment, FileOffset->LowPart, Page); - MmLockSectionSegment(Segment); - MiSetPageEntrySectionSegment(Segment, FileOffset, 0); - MmUnlockSectionSegment(Segment); + WriteZero = TRUE; } DPRINT("Status %x\n", Status); + + if (WriteZero) + { + DPRINT1("Setting page entry in segment %x:%x to swap %x\n", Segment, FileOffset->LowPart, Swap); + MiSetPageEntrySectionSegment(Segment, FileOffset, Swap ? MAKE_SWAP_SSE(Swap) : 0); + } + else + { + DPRINT1("Setting page entry in segment %x:%x to page %x\n", Segment, FileOffset->LowPart, Page); + MiSetPageEntrySectionSegment + (Segment, FileOffset, Page ? (Dirty ? DIRTY_SSE(MAKE_PFN_SSE(Page)) : MAKE_PFN_SSE(Page)) : 0); + } + if (NT_SUCCESS(Status)) { + DPRINT1("Removing page %x for real\n", Page); MmSetSavedSwapEntryPage(Page, 0); MmDereferencePage(Page); } + + MmUnlockSectionSegment(Segment); KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE);

14 years, 8 months

[jimtabor] 44943: [gdi32] - Run full Attribute and GdiBatch for Region support. Leaving Enh/Meta and mirroring support for regions.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jan 5 04:05:50 2010 New Revision: 44943 URL: http://svn.reactos.org/svn/reactos?rev=44943&view=rev Log: [gdi32] - Run full Attribute and GdiBatch for Region support. Leaving Enh/Meta and mirroring support for regions. Modified: trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Tue Jan 5 04:05:50 2010 @@ -104,7 +104,6 @@ FASTCALL DeleteRegion( HRGN hRgn ) { -#if 0 PRGN_ATTR Rgn_Attr; if ((GdiGetHandleUserData((HGDIOBJ) hRgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) && @@ -128,7 +127,6 @@ } } } -#endif return NtGdiDeleteObjectApp((HGDIOBJ) hRgn); } @@ -204,7 +202,6 @@ HRGN hSrc2, INT CombineMode) { -#if 0 PRGN_ATTR pRgn_Attr_Dest = NULL; PRGN_ATTR pRgn_Attr_Src1 = NULL; PRGN_ATTR pRgn_Attr_Src2 = NULL; @@ -218,9 +215,8 @@ !pRgn_Attr_Dest || !pRgn_Attr_Src1 || pRgn_Attr_Src1->Flags > SIMPLEREGION ) -#endif return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); -#if 0 + /* Handle COPY and use only src1. */ if ( CombineMode == RGN_COPY ) { @@ -274,19 +270,29 @@ DPRINT1("RGN_COPY was handled! CombineMode %d\n",CombineMode); return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); } - - if ( pRgn_Attr_Src1->Flags != NULLREGION && - pRgn_Attr_Src2->Flags != NULLREGION ) + /* Now handle DIFF. */ + if ( pRgn_Attr_Src1->Flags == NULLREGION ) + { + if (SetRectRgn( hDest, 0, 0, 0, 0)) + return NULLREGION; + goto ERROR_Exit; + } + + if ( pRgn_Attr_Src2->Flags != NULLREGION ) { Complexity = ComplexityFromRects( &pRgn_Attr_Src1->Rect, &pRgn_Attr_Src2->Rect); - /* If same or overlapping and norm just go K. */ - if (Complexity == SAME_RGN || Complexity == OVERLAPPING_RGN) - return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + + if ( Complexity != DIFF_RGN ) + { + if ( Complexity != INVERTED_RGN) + /* If same or overlapping and norm just go K. */ + return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); + + if (SetRectRgn( hDest, 0, 0, 0, 0)) + return NULLREGION; + goto ERROR_Exit; + } } - /* Just NULL rgn. */ - if (SetRectRgn( hDest, 0, 0, 0, 0)) - return NULLREGION; - goto ERROR_Exit; } else /* Handle OR or XOR. */ { @@ -389,7 +395,6 @@ /* Even on error the flag is set dirty and force server side to redraw. */ pRgn_Attr_Dest->AttrFlags |= ATTR_RGN_DIRTY; return ERROR; -#endif } /* @@ -634,13 +639,11 @@ GetRgnBox(HRGN hrgn, LPRECT prcOut) { -#if 0 PRGN_ATTR Rgn_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) -#endif return NtGdiGetRgnBox(hrgn, prcOut); -#if 0 + if (Rgn_Attr->Flags == NULLREGION) { prcOut->left = 0; @@ -656,7 +659,6 @@ RtlCopyMemory( prcOut, &Rgn_Attr->Rect, sizeof(RECT)); } return Rgn_Attr->Flags; -#endif } /* @@ -747,14 +749,12 @@ int nXOffset, int nYOffset) { -#if 0 PRGN_ATTR pRgn_Attr; int nLeftRect, nTopRect, nRightRect, nBottomRect; if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) -#endif return NtGdiOffsetRgn(hrgn,nXOffset,nYOffset); -#if 0 + if ( pRgn_Attr->Flags == NULLREGION) return pRgn_Attr->Flags; @@ -792,7 +792,6 @@ } } return pRgn_Attr->Flags; -#endif } /* @@ -804,13 +803,11 @@ int x, int y) { -#if 0 PRGN_ATTR pRgn_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) -#endif return NtGdiPtInRegion(hrgn,x,y); -#if 0 + if ( pRgn_Attr->Flags == NULLREGION) return FALSE; @@ -818,7 +815,6 @@ return NtGdiPtInRegion(hrgn,x,y); return INRECT( pRgn_Attr->Rect, x, y); -#endif } /* @@ -829,14 +825,12 @@ RectInRegion(HRGN hrgn, LPCRECT prcl) { -#if 0 PRGN_ATTR pRgn_Attr; RECTL rc; if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr)) -#endif return NtGdiRectInRegion(hrgn, (LPRECT) prcl); -#if 0 + if ( pRgn_Attr->Flags == NULLREGION) return FALSE; @@ -870,7 +864,6 @@ return TRUE; return FALSE; -#endif } /* @@ -896,13 +889,11 @@ int nRightRect, int nBottomRect) { -#if 0 PRGN_ATTR Rgn_Attr; if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) -#endif return NtGdiSetRectRgn(hrgn, nLeftRect, nTopRect, nRightRect, nBottomRect); -#if 0 + if ((nLeftRect == nRightRect) || (nTopRect == nBottomRect)) { Rgn_Attr->AttrFlags |= ATTR_RGN_DIRTY; @@ -931,7 +922,6 @@ Rgn_Attr->AttrFlags |= ATTR_RGN_DIRTY ; Rgn_Attr->Flags = SIMPLEREGION; return TRUE; -#endif } /*

14 years, 8 months

[tkreuzer] 44942: [HAL] Move x86bios.c into amd64 folder

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 5 01:59:00 2010 New Revision: 44942 URL: http://svn.reactos.org/svn/reactos?rev=44942&view=rev Log: [HAL] Move x86bios.c into amd64 folder Added: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86bios.c - copied unchanged from r44937, branches/ros-amd64-bringup/reactos/hal/halx86/generic/x86bios.c Removed: branches/ros-amd64-bringup/reactos/hal/halx86/generic/x86bios.c Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild Removed: branches/ros-amd64-bringup/reactos/hal/halx86/generic/x86bios.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/x86bios.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/x86bios.c (removed) @@ -1,317 +1,0 @@ -/* - * PROJECT: ReactOS HAL - * LICENSE: See COPYING in the top level directory - * FILE: hal/halamd64/generic/x86bios.c - * PURPOSE: - * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <hal.h> -//#define NDEBUG -#include <debug.h> - -/* This page serves as fallback for pages used by Mm */ -#define DEFAULT_PAGE 0x21 - -/* GLOBALS *******************************************************************/ - -BOOLEAN x86BiosIsInitialized; -LONG x86BiosBufferIsAllocated = 0; -PUCHAR x86BiosMemoryMapping; - -VOID -NTAPI -HalInitializeBios(ULONG Unknown, PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PPFN_NUMBER PfnArray; - PFN_NUMBER Pfn, Last; - PMEMORY_ALLOCATION_DESCRIPTOR Descriptor; - PLIST_ENTRY ListEntry; - PMDL Mdl; - - /* Allocate an MDL for 1MB */ - Mdl = IoAllocateMdl(NULL, 0x100000, FALSE, FALSE, NULL); - if (!Mdl) - { - ASSERT(FALSE); - } - - /* Get pointer to the pfn array */ - PfnArray = MmGetMdlPfnArray(Mdl); - - /* Fill the array with low memory PFNs */ - for (Pfn = 0; Pfn < 0x100; Pfn++) - { - PfnArray[Pfn] = Pfn; - } - - /* Loop the memory descriptors */ - for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - ListEntry != &LoaderBlock->MemoryDescriptorListHead; - ListEntry = ListEntry->Flink) - { - /* Get the memory descriptor */ - Descriptor = CONTAINING_RECORD(ListEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Check if the memory is in the low range */ - if (Descriptor->BasePage < 0x100) - { - /* Check if the memory type is firmware */ - if (Descriptor->MemoryType != LoaderFirmwarePermanent && - Descriptor->MemoryType != LoaderFirmwarePermanent) - { - /* It's something else, so don't use it! */ - Last = min(Descriptor->BasePage + Descriptor->PageCount, 0x100); - for (Pfn = Descriptor->BasePage; Pfn < Last; Pfn++) - { - /* Set each page to the default page */ - PfnArray[Pfn] = DEFAULT_PAGE; - } - } - } - } - - /* Map the MDL to system space */ - x86BiosMemoryMapping = MmGetSystemAddressForMdlSafe(Mdl, HighPagePriority); - ASSERT(x86BiosMemoryMapping); - - DPRINT1("memory: %p, %p\n", *(PVOID*)x86BiosMemoryMapping, *(PVOID*)(x86BiosMemoryMapping + 8)); - - x86BiosIsInitialized = TRUE; -} - -NTSTATUS -NTAPI -x86BiosAllocateBuffer ( - ULONG *Size, - USHORT *Segment, - USHORT *Offset) -{ - /* Check if the system is initialized and the buffer is large enough */ - if (!x86BiosIsInitialized || *Size > PAGE_SIZE) - { - /* Something was wrong, fail! */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Check if the buffer is already allocated */ - if (InterlockedBitTestAndSet(&x86BiosBufferIsAllocated, 0)) - { - /* Buffer was already allocated, fail */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* The buffer is sufficient, return hardcoded address and size */ - *Size = PAGE_SIZE; - *Segment = 0x2000; - *Offset = 0; - - return STATUS_SUCCESS;; -} - -NTSTATUS -NTAPI -x86BiosFreeBuffer ( - USHORT Segment, - USHORT Offset) -{ - /* Check if the system is initialized and if the address matches */ - if (!x86BiosIsInitialized || Segment != 0x2000 || Offset != 0) - { - /* Something was wrong, fail */ - return STATUS_INVALID_PARAMETER; - } - - /* Check if the buffer was allocated */ - if (!InterlockedBitTestAndReset(&x86BiosBufferIsAllocated, 0)) - { - /* It was not, fail */ - return STATUS_INVALID_PARAMETER; - } - - /* Buffer is freed, nothing more to do */ - return STATUS_SUCCESS;; -} - -NTSTATUS -NTAPI -x86BiosReadMemory ( - USHORT Segment, - USHORT Offset, - PVOID Buffer, - ULONG Size) -{ - ULONG_PTR Address; - - /* Calculate the physical address */ - Address = (Segment << 4) + Offset; - - /* Check if it's valid */ - if (!x86BiosIsInitialized || Address + Size > 0x100000) - { - /* Invalid */ - return STATUS_INVALID_PARAMETER; - } - - /* Copy the memory to the buffer */ - RtlCopyMemory(Buffer, x86BiosMemoryMapping + Address, Size); - - /* Return success */ - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -x86BiosWriteMemory ( - USHORT Segment, - USHORT Offset, - PVOID Buffer, - ULONG Size) -{ - ULONG_PTR Address; - - /* Calculate the physical address */ - Address = (Segment << 4) + Offset; - - /* Check if it's valid */ - if (!x86BiosIsInitialized || Address + Size > 0x100000) - { - /* Invalid */ - return STATUS_INVALID_PARAMETER; - } - - /* Copy the memory from the buffer */ - RtlCopyMemory(x86BiosMemoryMapping + Address, Buffer, Size); - - /* Return success */ - return STATUS_SUCCESS; -} - -typedef struct -{ - union - { - ULONG Eax; - USHORT Ax; - struct - { - UCHAR Al; - UCHAR Ah; - }; - }; - union - { - ULONG Ecx; - USHORT Cx; - struct - { - UCHAR Cl; - UCHAR Ch; - }; - }; - union - { - ULONG Edx; - USHORT Dx; - struct - { - UCHAR Dl; - UCHAR Dh; - }; - }; - union - { - ULONG Ebx; - USHORT Bx; - struct - { - UCHAR Bl; - UCHAR Bh; - }; - }; - ULONG Ebp; - ULONG Esi; - ULONG Edi; - USHORT SegDs; - USHORT SegEs; - - /* Extended */ - union - { - ULONG Eip; - USHORT Ip; - }; - - union - { - ULONG Esp; - USHORT Sp; - }; - -} X86_REGISTERS, *PX86_REGISTERS; - -enum -{ - X86_VMFLAGS_RETURN_ON_IRET = 1, -}; - -typedef struct -{ - union - { - X86_BIOS_REGISTERS BiosRegisters; - X86_REGISTERS Registers; - }; - - struct - { - ULONG ReturnOnIret:1; - } Flags; - - PVOID MemBuffer; -} X86_VM_STATE, *PX86_VM_STATE; - -BOOLEAN -NTAPI -x86BiosCall ( - ULONG InterruptNumber, - X86_BIOS_REGISTERS *Registers) -{ - X86_VM_STATE VmState; - - /* Zero the VmState */ - RtlZeroMemory(&VmState, sizeof(VmState)); - - /* Copy the registers */ - VmState.BiosRegisters = *Registers; - - /* Set the physical memory buffer */ - VmState.MemBuffer = x86BiosMemoryMapping; - - /* Initialize IP from the interrupt vector table */ - VmState.Registers.Ip = ((PUSHORT)x86BiosMemoryMapping)[InterruptNumber]; - - /* Make the function return on IRET */ - VmState.Flags.ReturnOnIret = 1; - - /* Call the x86 emulator */ -// x86Emulator(&VmState); - - /* Copy registers back to caller */ - *Registers = VmState.BiosRegisters; - - return TRUE; -} - -BOOLEAN -NTAPI -HalpBiosDisplayReset(VOID) -{ - UNIMPLEMENTED; - return TRUE; -} - Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Tue Jan 5 01:59:00 2010 @@ -36,7 +36,6 @@ </directory> </if> <if property="ARCH" value="amd64"> - <file>x86bios.c</file> <directory name="amd64"> <file>halinit.c</file> <file>irq.s</file> @@ -44,6 +43,7 @@ <file>pic.c</file> <file>systimer.S</file> <file>usage.c</file> + <file>x86bios.c</file> </directory> </if> </directory>

14 years, 8 months

[tkreuzer] 44941: [LSALIB] Fix ULONG -> pointer cast

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 5 01:26:54 2010 New Revision: 44941 URL: http://svn.reactos.org/svn/reactos?rev=44941&view=rev Log: [LSALIB] Fix ULONG -> pointer cast Modified: branches/ros-amd64-bringup/reactos/lib/lsalib/lsa.c Modified: branches/ros-amd64-bringup/reactos/lib/lsalib/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/l… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/lsalib/lsa.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/lsalib/lsa.c [iso-8859-1] Tue Jan 5 01:26:54 2010 @@ -264,8 +264,8 @@ 0, Reply->d.LogonUserReply.ProfileBufferLength); memcpy(*ProfileBuffer, - (PVOID)((ULONG)Reply->d.LogonUserReply.Data + - (ULONG)Reply->d.LogonUserReply.ProfileBuffer), + (PVOID)((ULONG_PTR)Reply->d.LogonUserReply.Data + + (ULONG_PTR)Reply->d.LogonUserReply.ProfileBuffer), Reply->d.LogonUserReply.ProfileBufferLength); *LogonId = Reply->d.LogonUserReply.LogonId; *Token = Reply->d.LogonUserReply.Token;

14 years, 8 months

[tkreuzer] 44940: [MM] Add missing MmHyperspaceEnd, remove some unused variables

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 5 01:24:03 2010 New Revision: 44940 URL: http://svn.reactos.org/svn/reactos?rev=44940&view=rev Log: [MM] Add missing MmHyperspaceEnd, remove some unused variables Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Tue Jan 5 01:24:03 2010 @@ -60,6 +60,7 @@ PVOID MmNonPagedPoolStart; PVOID MmNonPagedPoolExpansionStart; PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; // 0xFFFFFAE000000000 +PVOID MmHyperSpaceEnd = (PVOID)HYPER_SPACE_END; PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; // FIXME: ULONG64 @@ -367,7 +368,6 @@ { ULONG64 PageFrameOffset; MMPTE TmplPte, *Pte; - PFN_NUMBER PageCount; /* HACK: don't use freeldr debug print anymore */ FrLdrDbgPrint = NoDbgPrint; @@ -592,13 +592,13 @@ NTAPI MiBuildPhysicalMemoryBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - PPHYSICAL_MEMORY_DESCRIPTOR Buffer, NewBuffer; + PPHYSICAL_MEMORY_DESCRIPTOR Buffer; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; PLIST_ENTRY ListEntry; PFN_NUMBER NextPage = -1; PULONG Bitmap; ULONG Runs = 0; - ULONG Size, i; + ULONG Size; /* Calculate size for the PFN bitmap */ Size = ROUND_UP(MmHighestPhysicalPage + 1, sizeof(ULONG)); @@ -676,8 +676,6 @@ { PMMPTE Pte; MMPTE TmplPte; - PFN_NUMBER PageFrameIndex; - KIRQL OldIrql; ULONG Size, BitMapSize; /* Default size for paged pool is 4 times non paged pool */ @@ -823,10 +821,6 @@ } else if (Phase == 1) { - PMMPTE Pte; - ULONG OldCount; - PPHYSICAL_MEMORY_RUN Run; - /* The PFN database was created, restore the free descriptor */ *MxFreeDescriptor = MxOldFreeDescriptor;

14 years, 8 months

[tkreuzer] 44939: [HAL] Include the correct architecture specific headers

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 5 01:14:07 2010 New Revision: 44939 URL: http://svn.reactos.org/svn/reactos?rev=44939&view=rev Log: [HAL] Include the correct architecture specific headers Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/hal.h Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/include/hal.h [iso-8859-1] Tue Jan 5 01:14:07 2010 @@ -30,11 +30,13 @@ /* Internal kernel headers */ #include "internal/pci.h" #define KeGetCurrentThread _KeGetCurrentThread +#ifdef _M_AMD64 +#include <internal/amd64/ke.h> +#include <internal/amd64/mm.h> +#include "internal/amd64/intrin_i.h" +#else #include <internal/i386/ke.h> #include <internal/i386/mm.h> -#ifdef _M_AMD64 -#include "internal/amd64/intrin_i.h" -#else #include "internal/i386/intrin_i.h" #endif

14 years, 8 months

[tkreuzer] 44938: Sync to trunk (r44933)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 5 01:11:08 2010 New Revision: 44938 URL: http://svn.reactos.org/svn/reactos?rev=44938&view=rev Log: Sync to trunk (r44933) Added: branches/ros-amd64-bringup/reactos/base/applications/magnify/lang/ja-JP.rc - copied unchanged from r44933, trunk/reactos/base/applications/magnify/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/base/applications/shutdown/lang/ja-JP.rc - copied unchanged from r44933, trunk/reactos/base/applications/shutdown/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/base/applications/sndrec32/lang/ja-JP.rc - copied unchanged from r44933, trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/base/system/runonce/lang/ja-JP.rc - copied unchanged from r44933, trunk/reactos/base/system/runonce/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/authport.c - copied unchanged from r44933, trunk/reactos/dll/win32/lsasrv/authport.c branches/ros-amd64-bringup/reactos/drivers/base/nmidebug/ - copied from r44933, trunk/reactos/drivers/base/nmidebug/ branches/ros-amd64-bringup/reactos/lib/lsalib/ (props changed) - copied from r44933, trunk/reactos/lib/lsalib/ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/callconv.s - copied unchanged from r44933, trunk/reactos/ntoskrnl/include/internal/i386/callconv.s branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ppool.c - copied unchanged from r44933, trunk/reactos/ntoskrnl/mm/ppool.c branches/ros-amd64-bringup/reactos/subsystems/ntvdm/lang/zh-CN.rc - copied unchanged from r44933, trunk/reactos/subsystems/ntvdm/lang/zh-CN.rc branches/ros-amd64-bringup/reactos/subsystems/ntvdm/lang/zh-TW.rc - copied unchanged from r44933, trunk/reactos/subsystems/ntvdm/lang/zh-TW.rc branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/lang/ja-JP.rc - copied unchanged from r44933, trunk/reactos/subsystems/win32/csrss/win32csr/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/lang/zh-CN.rc - copied unchanged from r44933, trunk/reactos/subsystems/win32/csrss/win32csr/lang/zh-CN.rc branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/lang/zh-TW.rc - copied unchanged from r44933, trunk/reactos/subsystems/win32/csrss/win32csr/lang/zh-TW.rc Removed: branches/ros-amd64-bringup/reactos/dll/win32/secur32/lsa.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/dbgpool.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pool.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rpoolmgr.h Modified: branches/ros-amd64-bringup/reactos/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/cacls/cacls.c branches/ros-amd64-bringup/reactos/base/applications/charmap/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/base/applications/downloader/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/fontview/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/magnify/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/magnify/rsrc.rc branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/dependencies_tv2.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/propsheet_depends.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/stop.c branches/ros-amd64-bringup/reactos/base/applications/paint/globalvar.h branches/ros-amd64-bringup/reactos/base/applications/paint/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/base/applications/paint/main.c branches/ros-amd64-bringup/reactos/base/applications/paint/winproc.c branches/ros-amd64-bringup/reactos/base/applications/rapps/lang/de-DE.rc branches/ros-amd64-bringup/reactos/base/applications/rapps/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/base/applications/shutdown/rsrc.rc branches/ros-amd64-bringup/reactos/base/applications/sndrec32/rsrc.rc branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/en-US.rc branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/fr-FR.rc branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/ko-KR.rc branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/nl-NL.rc branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/ro-RO.rc branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/sk-SK.rc branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/uk-UA.rc branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/zh-CN.rc branches/ros-amd64-bringup/reactos/base/applications/taskmgr/taskmgr.c branches/ros-amd64-bringup/reactos/base/applications/winver/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/write/ (props changed) branches/ros-amd64-bringup/reactos/base/services/telnetd/ (props changed) branches/ros-amd64-bringup/reactos/base/services/umpnpmgr/umpnpmgr.c branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/ja-JP.h branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/utility.cpp branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/utility.h branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/xmlstorage.h branches/ros-amd64-bringup/reactos/base/system/runonce/rsrc.rc branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c branches/ros-amd64-bringup/reactos/baseaddress.rbuild branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_i386.inf branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/ (props changed) branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/ (props changed) branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/i386/wlmemory.c branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/ (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.c (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.rbuild (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.rc (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.spec (props changed) branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll.pspec branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec (props changed) branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec (props changed) branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/cred.c branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/eventlog.c branches/ros-amd64-bringup/reactos/dll/win32/cabinet/fdi.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/cert.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/chain.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crl.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/ctl.c branches/ros-amd64-bringup/reactos/dll/win32/crypt32/store.c branches/ros-amd64-bringup/reactos/dll/win32/devmgr/advprop.c branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/bg-BG.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/cs-CZ.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/de-DE.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/el-GR.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/en-US.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/es-ES.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/fr-FR.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/hu-HU.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/id-ID.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/it-IT.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/no-NO.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/pl-PL.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/pt-BR.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/ro-RO.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/ru-RU.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/sk-SK.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/uk-UA.rc branches/ros-amd64-bringup/reactos/dll/win32/devmgr/resource.h branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/misc.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus_private.h branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphics.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/image.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/region.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/env.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/i386/fiber.S branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.c branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.h branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/sndrcv.c branches/ros-amd64-bringup/reactos/dll/win32/secur32/secur32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/setupapi/cfgmgr.c branches/ros-amd64-bringup/reactos/dll/win32/setupapi/misc.c branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi_private.h branches/ros-amd64-bringup/reactos/dll/win32/setupapi/stubs.c branches/ros-amd64-bringup/reactos/dll/win32/syssetup/lang/ja-JP.rc branches/ros-amd64-bringup/reactos/dll/win32/user32/controls/combo.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/bitmap.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/icon.c branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/legacy.c branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/mmixer.c branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/wdmaud.c branches/ros-amd64-bringup/reactos/drivers/base/directory.rbuild branches/ros-amd64-bringup/reactos/drivers/filesystems/mup/create.c branches/ros-amd64-bringup/reactos/drivers/filesystems/mup/mup.c branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/connectivity.c branches/ros-amd64-bringup/reactos/drivers/multimedia/audio/sb16_nt4.old/ (props changed) branches/ros-amd64-bringup/reactos/drivers/multimedia/audio/sndblst.old/ (props changed) branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/ (props changed) branches/ros-amd64-bringup/reactos/drivers/video/font/ftfd/ (props changed) branches/ros-amd64-bringup/reactos/hal/halx86/generic/bios.c branches/ros-amd64-bringup/reactos/hal/halx86/generic/i386/v86.s branches/ros-amd64-bringup/reactos/hal/halx86/generic/misc.c branches/ros-amd64-bringup/reactos/hal/halx86/include/hal.h branches/ros-amd64-bringup/reactos/hal/halx86/include/halp.h branches/ros-amd64-bringup/reactos/include/crt/crtdefs.h branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h (props changed) branches/ros-amd64-bringup/reactos/include/crt/string.h branches/ros-amd64-bringup/reactos/include/ddk/cfg.h branches/ros-amd64-bringup/reactos/include/ddk/cfgmgr32.h branches/ros-amd64-bringup/reactos/include/ddk/winddk.h branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S (props changed) branches/ros-amd64-bringup/reactos/include/ndk/halfuncs.h branches/ros-amd64-bringup/reactos/include/ndk/i386/asm.h branches/ros-amd64-bringup/reactos/include/ndk/i386/ketypes.h branches/ros-amd64-bringup/reactos/include/psdk/gdiplusenums.h branches/ros-amd64-bringup/reactos/include/psdk/gdiplusflat.h branches/ros-amd64-bringup/reactos/include/psdk/gdiplusimaging.h branches/ros-amd64-bringup/reactos/include/psdk/winbase.h branches/ros-amd64-bringup/reactos/include/reactos/idl/pnp.idl branches/ros-amd64-bringup/reactos/include/reactos/subsys/lsass/lsass.h branches/ros-amd64-bringup/reactos/include/reactos/version.h branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmixer/controls.c branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmixer/mixer.c branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmixer/mmixer.h branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmixer/priv.h branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmixer/sup.c branches/ros-amd64-bringup/reactos/lib/lib.rbuild branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ (props changed) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ctime.c branches/ros-amd64-bringup/reactos/media/inf/machine.inf branches/ros-amd64-bringup/reactos/ntoskrnl/config/cmparse.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c branches/ros-amd64-bringup/reactos/ntoskrnl/ex/time.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/asmmacro.S branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke_x.h branches/ros-amd64-bringup/reactos/ntoskrnl/io/pnpmgr/plugplay.c branches/ros-amd64-bringup/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_cli.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/irqobj.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/trap.s branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/expool.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pagfault.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pool.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/procsup.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/virtual.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild branches/ros-amd64-bringup/reactos/subsystems/ntvdm/rsrc.rc branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/rsrc.rc branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/eng/engwindow.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/eng/stretchblt.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/brush.h branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/dc.h branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/intgdi.h branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/region.h branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/main/dllmain.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/cursoricon.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/painting.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/window.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/winpos.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/bitblt.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/brush.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/cliprgn.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dcattr.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dclife.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dcstate.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/gdiobj.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/region.c branches/ros-amd64-bringup/reactos/tools/hpp/ (props changed) branches/ros-amd64-bringup/reactos/tools/rbuild_helper/ (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.mak (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/base/applications/cacls/cacls.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/charmap/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/dependencies_tv2.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/propsheet_depends.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/paint/globalvar.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/paint/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/utility.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/utility.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/utility/xmlstorage.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/system/runonce/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/basea… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/windows/i386/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/cred.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/cert.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/chain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/crl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/ctl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/devmgr/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/env.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/i386/fiber.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Removed: branches/ros-amd64-bringup/reactos/dll/win32/secur32/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/secur32/secur32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/drivers/base/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/filesystems/mup/create.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/i386/v86.s URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ddk/cfg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/gdiplusenums.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/gdiplusimaging.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/reactos/subsys/lsass/lsass.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… Modified: branches/ros-amd64-bringup/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… Modified: branches/ros-amd64-bringup/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/l… Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ctime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/time.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/dbgpool.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rpoolmgr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/subsystems/ntvdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dcattr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy…

14 years, 8 months

[tkreuzer] 44937: [KE] Improve KiDoubleFaultAbort

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 5 00:00:35 2010 New Revision: 44937 URL: http://svn.reactos.org/svn/reactos?rev=44937&view=rev Log: [KE] Improve KiDoubleFaultAbort Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Tue Jan 5 00:00:35 2010 @@ -32,6 +32,9 @@ _MsgInvalidOpcodeFault: .ascii "General protection fault at %p!\n\0" + +_MsgDoubleFault: +.ascii "Double fault at %p, rbp=%p!\n\0" _MsgTrapInfo: .ascii "Trap: %s at %p\n\0" @@ -430,20 +433,23 @@ push 0 .allocstack 0x8 - /* Reserve stack space for parameters */ - sub rsp, 0x28 - .allocstack 0x28 + ENTER_TRAP_FRAME TRAPFLAG_ALL + + lea rcx, _MsgDoubleFault[rip] + mov rdx, [rbp + KTRAP_FRAME_FaultAddress] + mov r8, rbp + call _FrLdrDbgPrint[rip] /* Bugcheck code UNEXPECTED_KERNEL_MODE_TRAP */ mov rcx, 0x0000007F /* Set double fault parameters */ - mov rdx, 0x00000008 + mov rdx, 0x00000008 // EXCEPTION_DOUBLE_FAULT mov r8, 0 mov r9, 0 - mov qword ptr [rsp + 0x20], 0 - - call _KeBugCheckEx + mov [rbp + KTRAP_FRAME_P5], rbp // trap frame (HACKY) + push 0 + call _KeBugCheckWithTf jmp $ .endproc @@ -773,8 +779,13 @@ .proc KiUnexpectedInterrupt .pushframe 0 - push 0 - .allocstack 0x8 + /* Push pseudo error code */ + push 0 + .allocstack 0x8 + + cli + + ENTER_TRAP_FRAME TRAPFLAG_ALL lea rcx, _MsgUnexpectedInterrupt[rip] call _FrLdrDbgPrint[rip]

14 years, 8 months

[tkreuzer] 44936: [HAL] Remove hacks

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 4 23:54:12 2010 New Revision: 44936 URL: http://svn.reactos.org/svn/reactos?rev=44936&view=rev Log: [HAL] Remove hacks Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c [iso-8859-1] Mon Jan 4 23:54:12 2010 @@ -121,9 +121,9 @@ HalQuerySystemInformation = HaliQuerySystemInformation; HalSetSystemInformation = HaliSetSystemInformation; HalInitPnpDriver = NULL; // FIXME: TODO -// HalGetDmaAdapter = HalpGetDmaAdapter; + HalGetDmaAdapter = HalpGetDmaAdapter; HalGetInterruptTranslator = NULL; // FIXME: TODO -// HalResetDisplay = HalpBiosDisplayReset; + HalResetDisplay = HalpBiosDisplayReset; DPRINT1("HalInitSystem 4\n");

14 years, 8 months

[tkreuzer] 44935: compile x86Bios functions only for amd64

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 4 23:51:34 2010 New Revision: 44935 URL: http://svn.reactos.org/svn/reactos?rev=44935&view=rev Log: compile x86Bios functions only for amd64 Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Mon Jan 4 23:51:34 2010 @@ -24,7 +24,6 @@ <file>reboot.c</file> <file>sysinfo.c</file> <file>timer.c</file> - <file>x86bios.c</file> <if property="ARCH" value="i386"> <file>bios.c</file> <file>halinit.c</file> @@ -37,6 +36,7 @@ </directory> </if> <if property="ARCH" value="amd64"> + <file>x86bios.c</file> <directory name="amd64"> <file>halinit.c</file> <file>irq.s</file>

14 years, 8 months

← Newer
1
...
40
41
42
43
44
45
46
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010