Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 57001: [NTOSKRNL]: When dispatching a prototype PTE fault, call MiCompleteProtoPteFault instead of directly calling MiResolveProtoPteFault. Also add support/detection for clustering.
by ion＠svn.reactos.org 31 Jul '12

31 Jul '12

Author: ion Date: Tue Jul 31 07:32:19 2012 New Revision: 57001 URL: http://svn.reactos.org/svn/reactos?rev=57001&view=rev Log: [NTOSKRNL]: When dispatching a prototype PTE fault, call MiCompleteProtoPteFault instead of directly calling MiResolveProtoPteFault. Also add support/detection for clustering. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Tue Jul 31 07:32:19 2012 @@ -841,12 +841,14 @@ IN BOOLEAN Recursive, IN PEPROCESS Process, IN PVOID TrapInformation, - IN PVOID Vad) + IN PMMVAD Vad) { MMPTE TempPte; KIRQL OldIrql, LockIrql; NTSTATUS Status; PMMPTE SuperProtoPte; + PMMPFN Pfn1; + PFN_NUMBER PageFrameIndex, PteCount, ProcessedPtes; DPRINT("ARM3 Page Fault Dispatcher for address: %p in process: %p\n", Address, Process); @@ -910,29 +912,73 @@ } else { - /* We currently only handle very limited paths */ - ASSERT(PointerPte->u.Soft.Prototype == 1); + /* We only handle the lookup path */ ASSERT(PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED); + + /* Is there a non-image VAD? */ + if ((Vad) && + (Vad->u.VadFlags.VadType != VadImageMap) && + !(Vad->u2.VadFlags2.ExtendableFile)) + { + /* One day, ReactOS will cluster faults */ + ASSERT(Address <= MM_HIGHEST_USER_ADDRESS); + DPRINT("Should cluster fault, but won't\n"); + } + + /* Only one PTE to handle for now */ + PteCount = 1; + ProcessedPtes = 0; /* Lock the PFN database */ LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - /* For our current usage, this should be true */ + /* We only handle the valid path */ ASSERT(SuperProtoPte->u.Hard.Valid == 1); - ASSERT(TempPte.u.Hard.Valid == 0); - - /* Resolve the fault -- this will release the PFN lock */ - Status = MiResolveProtoPteFault(StoreInstruction, + + /* Capture the PTE */ + TempPte = *PointerProtoPte; + + /* Loop to handle future case of clustered faults */ + while (TRUE) + { + /* For our current usage, this should be true */ + ASSERT(TempPte.u.Hard.Valid == 1); + ASSERT(TempPte.u.Soft.Prototype == 0); + ASSERT(TempPte.u.Soft.Transition == 0); + + /* Bump the share count on the PTE */ + PageFrameIndex = PFN_FROM_PTE(&TempPte); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); + Pfn1->u2.ShareCount++; + + /* One more done, was it the last? */ + if (++ProcessedPtes == PteCount) + { + /* Complete the fault */ + MiCompleteProtoPteFault(StoreInstruction, Address, PointerPte, PointerProtoPte, - NULL, - NULL, - NULL, - Process, LockIrql, - TrapInformation); - ASSERT(Status == STATUS_SUCCESS); + NULL); + + /* THIS RELEASES THE PFN LOCK! */ + break; + } + + /* No clustered faults yet */ + ASSERT(FALSE); + } + + /* Only path that we support for now */ + ASSERT(ProcessedPtes != 0); + + /* Bump the transition count */ + InterlockedExchangeAdd(&KeGetCurrentPrcb()->MmTransitionCount, ProcessedPtes); + ProcessedPtes--; + + /* Loop all the processing we did */ + ASSERT(ProcessedPtes == 0); /* Complete this as a transition fault */ ASSERT(OldIrql == KeGetCurrentIrql());

1 0

[ion] 57000: [NTOSKRNL]: Additional support for session space. A few more ASSERTs and paranoia. [NTOSKRNL]: Don't assume all prototype PTEs are cached, in fact none are in ReactOS at the moment! Th...
by ion＠svn.reactos.org 31 Jul '12

31 Jul '12

Author: ion Date: Tue Jul 31 07:11:52 2012 New Revision: 57000 URL: http://svn.reactos.org/svn/reactos?rev=57000&view=rev Log: [NTOSKRNL]: Additional support for session space. A few more ASSERTs and paranoia. [NTOSKRNL]: Don't assume all prototype PTEs are cached, in fact none are in ReactOS at the moment! This resulted in the wrong hardware caching bits for the PEB/TEB and NLS Data which are using ARM3 section code. [NTOSKRNL]: Also implement dirty page bit for prototype PTEs. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Tue Jul 31 07:11:52 2012 @@ -23,7 +23,7 @@ #endif LONG MmSystemLockPagesCount; - + /* PRIVATE FUNCTIONS **********************************************************/ PMMPTE @@ -305,8 +305,18 @@ /* Check if we need a zero page */ NeedZero = (OldIrql != MM_NOIRQL); - /* Get the next system page color */ - Color = MI_GET_NEXT_COLOR(); +#if 0 + /* Session-backed image views must be zeroed */ + if ((Process == HYDRA_PROCESS) && + ((MI_IS_SESSION_IMAGE_ADDRESS(Address)) || + ((Address >= (PVOID)MiSessionViewStart) && + (Address < (PVOID)MiSessionSpaceWs)))) + { + NeedZero = TRUE; + } +#endif + /* Hardcode unknown color */ + Color = 0xFFFFFFFF; } /* Check if the PFN database should be acquired */ @@ -332,31 +342,31 @@ if (!Process) MI_SET_PROCESS2("Kernel Demand 0"); /* Do we need a zero page? */ - if ((NeedZero) && (Process)) + if (Color != 0xFFFFFFFF) { /* Try to get one, if we couldn't grab a free page and zero it */ PageFrameNumber = MiRemoveZeroPageSafe(Color); - if (PageFrameNumber) - { - /* We got a genuine zero page, stop worrying about it */ - NeedZero = FALSE; - } - else + if (!PageFrameNumber) { /* We'll need a free page and zero it manually */ PageFrameNumber = MiRemoveAnyPage(Color); - } - } - else if (!NeedZero) - { - /* Process or system doesn't want a zero page, grab anything */ - PageFrameNumber = MiRemoveAnyPage(Color); + NeedZero = TRUE; + } } else { - /* System wants a zero page, obtain one */ - PageFrameNumber = MiRemoveZeroPage(Color); - NeedZero = FALSE; + /* Get a color, and see if we should grab a zero or non-zero page */ + Color = MI_GET_NEXT_COLOR(); + if (!NeedZero) + { + /* Process or system doesn't want a zero page, grab anything */ + PageFrameNumber = MiRemoveAnyPage(Color); + } + else + { + /* System wants a zero page, obtain one */ + PageFrameNumber = MiRemoveZeroPage(Color); + } } /* Initialize it */ @@ -434,6 +444,7 @@ ULONG_PTR Protection; PFN_NUMBER PageFrameIndex; PMMPFN Pfn1, Pfn2; + BOOLEAN OriginalProtection, DirtyPage; /* Must be called with an valid prototype PTE, with the PFN lock held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); @@ -458,13 +469,40 @@ { /* Get the protection from the PTE, there's no real Proto PTE data */ Protection = PointerPte->u.Soft.Protection; + + /* Remember that we did not use the proto protection */ + OriginalProtection = FALSE; } else { /* Get the protection from the original PTE link */ OriginalPte = &Pfn1->OriginalPte; Protection = OriginalPte->u.Soft.Protection; - } + + /* Remember that we used the original protection */ + OriginalProtection = TRUE; + + /* Check if this was a write on a read only proto */ + if ((StoreInstruction) && !(Protection & MM_READWRITE)) + { + /* Clear the flag */ + StoreInstruction = 0; + } + } + + /* Check if this was a write on a non-COW page */ + DirtyPage = FALSE; + if ((StoreInstruction) && ((Protection & MM_WRITECOPY) != MM_WRITECOPY)) + { + /* Then the page should be marked dirty */ + DirtyPage = TRUE; + + /* ReactOS check */ + ASSERT(Pfn1->OriginalPte.u.Soft.Prototype != 0); + } + + /* Not yet handled by ReactOS */ + ASSERT(LockedPfn == NULL); /* Release the PFN lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); @@ -472,6 +510,20 @@ /* Remove caching bits */ Protection &= ~(MM_NOCACHE | MM_NOACCESS); + /* Setup caching */ + if (Pfn1->u3.e1.CacheAttribute == MiWriteCombined) + { + /* Write combining, no caching */ + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_COMBINED(&TempPte); + } + else if (Pfn1->u3.e1.CacheAttribute == MiNonCached) + { + /* Write through, no caching */ + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_THROUGH(&TempPte); + } + /* Check if this is a kernel or user address */ if (Address < MmSystemRangeStart) { @@ -484,10 +536,17 @@ MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, Protection, PageFrameIndex); } + /* Set the dirty flag if needed */ + if (DirtyPage) TempPte.u.Hard.Dirty = TRUE; + /* Write the PTE */ MI_WRITE_VALID_PTE(PointerPte, TempPte); + /* Reset the protection if needed */ + if (OriginalProtection) Protection = MM_ZERO_ACCESS; + /* Return success */ + ASSERT(PointerPte == MiAddressToPte(Address)); return STATUS_SUCCESS; } @@ -823,31 +882,31 @@ /* Has the PTE been made valid yet? */ if (!SuperProtoPte->u.Hard.Valid) { - UNIMPLEMENTED; - while (TRUE); - } - else - { - /* Resolve the fault -- this will release the PFN lock */ - ASSERT(PointerPte->u.Hard.Valid == 0); - Status = MiResolveProtoPteFault(StoreInstruction, - Address, - PointerPte, - PointerProtoPte, - NULL, - NULL, - NULL, - Process, - LockIrql, - TrapInformation); - ASSERT(Status == STATUS_SUCCESS); - - /* Complete this as a transition fault */ - ASSERT(OldIrql == KeGetCurrentIrql()); - ASSERT(OldIrql <= APC_LEVEL); - ASSERT(KeAreAllApcsDisabled() == TRUE); - return Status; - } + ASSERT(FALSE); + } + else if (PointerPte->u.Hard.Valid == 1) + { + ASSERT(FALSE); + } + + /* Resolve the fault -- this will release the PFN lock */ + Status = MiResolveProtoPteFault(StoreInstruction, + Address, + PointerPte, + PointerProtoPte, + NULL, + NULL, + NULL, + Process, + LockIrql, + TrapInformation); + ASSERT(Status == STATUS_SUCCESS); + + /* Complete this as a transition fault */ + ASSERT(OldIrql == KeGetCurrentIrql()); + ASSERT(OldIrql <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled() == TRUE); + return Status; } else {

1 0

[ion] 56999: [NTOSKRNL]: Multiple fixes to faulting paths. Make some checks more explicit, support lock pages counter, update dirty bit when needed, and stub further support for session space.
by ion＠svn.reactos.org 31 Jul '12

31 Jul '12

Author: ion Date: Tue Jul 31 06:47:47 2012 New Revision: 56999 URL: http://svn.reactos.org/svn/reactos?rev=56999&view=rev Log: [NTOSKRNL]: Multiple fixes to faulting paths. Make some checks more explicit, support lock pages counter, update dirty bit when needed, and stub further support for session space. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Tue Jul 31 06:47:47 2012 @@ -17,10 +17,13 @@ /* GLOBALS ********************************************************************/ +#define HYDRA_PROCESS (PEPROCESS)1 #if MI_TRACE_PFNS BOOLEAN UserPdeFault = FALSE; #endif +LONG MmSystemLockPagesCount; + /* PRIVATE FUNCTIONS **********************************************************/ PMMPTE @@ -35,8 +38,70 @@ /* No prototype/section support for now */ *ProtoVad = NULL; - /* Check if this is a page table address */ - if (MI_IS_PAGE_TABLE_ADDRESS(VirtualAddress)) + /* User or kernel fault? */ + if (VirtualAddress <= MM_HIGHEST_USER_ADDRESS) + { + /* Special case for shared data */ + if (PAGE_ALIGN(VirtualAddress) == (PVOID)MM_SHARED_USER_DATA_VA) + { + /* It's a read-only page */ + *ProtectCode = MM_READONLY; + return MmSharedUserDataPte; + } + + /* Find the VAD, it might not exist if the address is bogus */ + Vad = MiLocateAddress(VirtualAddress); + if (!Vad) + { + /* Bogus virtual address */ + *ProtectCode = MM_NOACCESS; + return NULL; + } + + /* ReactOS does not handle physical memory VADs yet */ + ASSERT(Vad->u.VadFlags.VadType != VadDevicePhysicalMemory); + + /* Check if it's a section, or just an allocation */ + if (Vad->u.VadFlags.PrivateMemory) + { + /* ReactOS does not handle AWE VADs yet */ + ASSERT(Vad->u.VadFlags.VadType != VadAwe); + + /* This must be a TEB/PEB VAD */ + if (Vad->u.VadFlags.MemCommit) + { + /* It's committed, so return the VAD protection */ + *ProtectCode = (ULONG)Vad->u.VadFlags.Protection; + } + else + { + /* It has not yet been committed, so return no access */ + *ProtectCode = MM_NOACCESS; + } + + /* In both cases, return no PTE */ + return NULL; + } + else + { + /* ReactOS does not supoprt these VADs yet */ + ASSERT(Vad->u.VadFlags.VadType != VadImageMap); + ASSERT(Vad->u2.VadFlags2.ExtendableFile == 0); + + /* Return the proto VAD */ + *ProtoVad = Vad; + + /* Get the prototype PTE for this page */ + PointerPte = (((ULONG_PTR)VirtualAddress >> PAGE_SHIFT) - Vad->StartingVpn) + Vad->FirstPrototypePte; + ASSERT(PointerPte != NULL); + ASSERT(PointerPte <= Vad->LastContiguousPte); + + /* Return the Prototype PTE and the protection for the page mapping */ + *ProtectCode = (ULONG)Vad->u.VadFlags.Protection; + return PointerPte; + } + } + else if (MI_IS_PAGE_TABLE_ADDRESS(VirtualAddress)) { /* This should never happen, as these addresses are handled by the double-maping */ if (((PMMPTE)VirtualAddress >= MiAddressToPte(MmPagedPoolStart)) && @@ -51,61 +116,15 @@ *ProtectCode = MM_READWRITE; return NULL; } - - /* Should not be a session address */ - ASSERT(MI_IS_SESSION_ADDRESS(VirtualAddress) == FALSE); - - /* Special case for shared data */ - if (PAGE_ALIGN(VirtualAddress) == (PVOID)MM_SHARED_USER_DATA_VA) - { - /* It's a read-only page */ - *ProtectCode = MM_READONLY; - return MmSharedUserDataPte; - } - - /* Find the VAD, it might not exist if the address is bogus */ - Vad = MiLocateAddress(VirtualAddress); - if (!Vad) - { - /* Bogus virtual address */ - *ProtectCode = MM_NOACCESS; - return NULL; - } - - /* This must be a VM VAD */ - ASSERT(Vad->u.VadFlags.VadType == VadNone); - - /* Check if it's a section, or just an allocation */ - if (Vad->u.VadFlags.PrivateMemory) - { - /* This must be a TEB/PEB VAD */ - if (Vad->u.VadFlags.MemCommit) - { - /* It's committed, so return the VAD protection */ - *ProtectCode = (ULONG)Vad->u.VadFlags.Protection; - } - else - { - /* It has not yet been committed, so return no access */ - *ProtectCode = MM_NOACCESS; - } - return NULL; - } - else - { - /* Return the proto VAD */ - ASSERT(Vad->u2.VadFlags2.ExtendableFile == 0); - *ProtoVad = Vad; - - /* Get the prototype PTE for this page */ - PointerPte = (((ULONG_PTR)VirtualAddress >> PAGE_SHIFT) - Vad->StartingVpn) + Vad->FirstPrototypePte; - ASSERT(PointerPte <= Vad->LastContiguousPte); - ASSERT(PointerPte != NULL); - - /* Return the Prototype PTE and the protection for the page mapping */ - *ProtectCode = (ULONG)Vad->u.VadFlags.Protection; - return PointerPte; - } + else if (MI_IS_SESSION_ADDRESS(VirtualAddress)) + { + /* ReactOS does not have an image list yet, so bail out to failure case */ + ASSERT(IsListEmpty(&MmSessionSpace->ImageList)); + } + + /* Default case -- failure */ + *ProtectCode = MM_NOACCESS; + return NULL; } #if (_MI_PAGING_LEVELS == 2) @@ -132,19 +151,23 @@ NTSTATUS FASTCALL +MiCheckPdeForSessionSpace(IN PVOID Address) +{ + /* Code not yet tested */ + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +FASTCALL MiCheckPdeForPagedPool(IN PVOID Address) { PMMPDE PointerPde; NTSTATUS Status = STATUS_SUCCESS; - if (MI_IS_SESSION_ADDRESS(Address)) - { - DPRINT1("Unexpected session fault: %p %p %p\n", Address, MmSessionBase, MiSessionSpaceEnd); - } - - /* No session support in ReactOS yet */ - ASSERT(MI_IS_SESSION_ADDRESS(Address) == FALSE); - ASSERT(MI_IS_SESSION_PTE(Address) == FALSE); + /* Check session PDE */ + if (MI_IS_SESSION_ADDRESS(Address)) return MiCheckPdeForSessionSpace(Address); + if (MI_IS_SESSION_PTE(Address)) return MiCheckPdeForSessionSpace(Address); // // Check if this is a fault while trying to access the page table itself @@ -178,15 +201,11 @@ // if (PointerPde->u.Hard.Valid == 0) { -#ifdef _M_AMD64 - ASSERT(FALSE); -#else // // Copy it from our double-mapped system page directory // InterlockedExchangePte(PointerPde, MmSystemPagePtes[((ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)) / sizeof(MMPTE)].u.Long); -#endif } // @@ -260,12 +279,13 @@ MMPTE TempPte; BOOLEAN NeedZero = FALSE, HaveLock = FALSE; ULONG Color; + PMMPFN Pfn1; DPRINT("ARM3 Demand Zero Page Fault Handler for address: %p in process: %p\n", Address, Process); /* Must currently only be called by paging path */ - if ((Process) && (OldIrql == MM_NOIRQL)) + if ((Process > HYDRA_PROCESS) && (OldIrql == MM_NOIRQL)) { /* Sanity check */ ASSERT(MI_IS_PAGE_TABLE_ADDRESS(PointerPte)); @@ -299,15 +319,19 @@ /* We either manually locked the PFN DB, or already came with it locked */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - - /* Do we need a zero page? */ ASSERT(PointerPte->u.Hard.Valid == 0); + + /* Assert we have enough pages */ + ASSERT(MmAvailablePages >= 32); + #if MI_TRACE_PFNS if (UserPdeFault) MI_SET_USAGE(MI_USAGE_PAGE_TABLE); if (!UserPdeFault) MI_SET_USAGE(MI_USAGE_DEMAND_ZERO); #endif if (Process) MI_SET_PROCESS2(Process->ImageFileName); if (!Process) MI_SET_PROCESS2("Kernel Demand 0"); + + /* Do we need a zero page? */ if ((NeedZero) && (Process)) { /* Try to get one, if we couldn't grab a free page and zero it */ @@ -338,11 +362,18 @@ /* Initialize it */ MiInitializePfn(PageFrameNumber, PointerPte, TRUE); + /* Do we have the lock? */ + if (HaveLock) + { + /* Release it */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* Update performance counters */ + if (Process > HYDRA_PROCESS) Process->NumberOfPrivatePages++; + } + /* Increment demand zero faults */ - KeGetCurrentPrcb()->MmDemandZeroCount++; - - /* Release PFN lock if needed */ - if (HaveLock) KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + InterlockedIncrement(&KeGetCurrentPrcb()->MmDemandZeroCount); /* Zero the page if need be */ if (NeedZero) MiZeroPfn(PageFrameNumber); @@ -370,6 +401,17 @@ /* Write it */ MI_WRITE_VALID_PTE(PointerPte, TempPte); + + /* Did we manually acquire the lock */ + if (HaveLock) + { + /* Get the PFN entry */ + Pfn1 = MI_PFN_ELEMENT(PageFrameNumber); + + /* Windows does these sanity checks */ + ASSERT(Pfn1->u1.Event == 0); + ASSERT(Pfn1->u3.e1.PrototypePte == 0); + } // // It's all good now @@ -385,13 +427,13 @@ IN PMMPTE PointerPte, IN PMMPTE PointerProtoPte, IN KIRQL OldIrql, - IN PMMPFN Pfn1) + IN PMMPFN* LockedPfn) { MMPTE TempPte; PMMPTE OriginalPte, PageTablePte; ULONG_PTR Protection; PFN_NUMBER PageFrameIndex; - PMMPFN Pfn2; + PMMPFN Pfn1, Pfn2; /* Must be called with an valid prototype PTE, with the PFN lock held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); @@ -494,6 +536,9 @@ ASSERT(MmAvailablePages >= 0); ASSERT(Pfn1->u4.InPageError == 0); + /* ReactOS checks for this */ + ASSERT(MmAvailablePages > 32); + /* Was this a transition page in the valid list, or free/zero list? */ if (Pfn1->u3.e1.PageLocation == ActiveAndValid) { @@ -523,7 +568,8 @@ ASSERT(FALSE); } - /* FIXME: Update counter */ + /* Update counter */ + InterlockedIncrementSizeT(&MmSystemLockPagesCount); /* We must be the first reference */ NewRefCount = InterlockedIncrement16((PSHORT)&Pfn1->u3.e2.ReferenceCount); @@ -555,7 +601,8 @@ ASSERT(FALSE); } - /* FIXME: Update counter */ + /* Update counter */ + InterlockedDecrementSizeT(&MmSystemLockPagesCount); } } @@ -585,7 +632,18 @@ (MmProtectToPteMask[PointerPte->u.Trans.Protection]) | MiDetermineUserGlobalPteMask(PointerPte); - /* FIXME: Set dirty bit */ + /* Is the PTE writeable? */ + if (((Pfn1->u3.e1.Modified) && (TempPte.u.Hard.Write)) && + (TempPte.u.Hard.CopyOnWrite == 0)) + { + /* Make it dirty */ + TempPte.u.Hard.Dirty = TRUE; + } + else + { + /* Make it clean */ + TempPte.u.Hard.Dirty = FALSE; + } /* Write the valid PTE */ MI_WRITE_VALID_PTE(PointerPte, TempPte); @@ -654,12 +712,24 @@ { if (!PteContents.u.Proto.ReadOnly) { - /* FIXME: CHECK FOR ACCESS AND COW */ + /* FIXME: CHECK FOR ACCESS */ + + /* Check for copy on write page */ + if ((TempPte.u.Soft.Protection & MM_WRITECOPY) == MM_WRITECOPY) + { + /* Not yet supported */ + ASSERT(FALSE); + } } } else { - /* FIXME: Should check for COW */ + /* Check for copy on write page */ + if ((PteContents.u.Soft.Protection & MM_WRITECOPY) == MM_WRITECOPY) + { + /* Not yet supported */ + ASSERT(FALSE); + } } /* Check for clone PTEs */ @@ -815,7 +885,8 @@ // // The PTE must be invalid but not completely empty. It must also not be a - // prototype PTE as that scenario should've been handled above + // prototype PTE as that scenario should've been handled above. These are + // all Windows checks // ASSERT(TempPte.u.Hard.Valid == 0); ASSERT(TempPte.u.Soft.Prototype == 0); @@ -823,7 +894,7 @@ // // No transition or page file software PTEs in ARM3 yet, so this must be a - // demand zero page + // demand zero page. These are all ReactOS checks // ASSERT(TempPte.u.Soft.Transition == 0); ASSERT(TempPte.u.Soft.PageFileHigh == 0);

1 0

[akhaldi] 56998: * Align the stack on an 8-byte boundary for x86.
by akhaldi＠svn.reactos.org 30 Jul '12

30 Jul '12

Author: akhaldi Date: Mon Jul 30 22:28:05 2012 New Revision: 56998 URL: http://svn.reactos.org/svn/reactos?rev=56998&view=rev Log: * Align the stack on an 8-byte boundary for x86. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=56998&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Jul 30 22:28:05 2012 @@ -81,7 +81,7 @@ add_compile_flags("-fno-strict-aliasing") if(ARCH MATCHES i386) - add_compile_flags("-mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") + add_compile_flags("-mpreferred-stack-boundary=3 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") if(OPTIMIZE STREQUAL "1") add_compile_flags("-ftracer -momit-leaf-frame-pointer") endif()

1 0

[akhaldi] 56997: [FREELDR/SETUPLDR] * Leverage the object library option provided by CMake 2.8.8+ which will speed up the build even further. * These wrapping conditions will go away as soon as we ...
by akhaldi＠svn.reactos.org 30 Jul '12

30 Jul '12

Author: akhaldi Date: Mon Jul 30 16:57:55 2012 New Revision: 56997 URL: http://svn.reactos.org/svn/reactos?rev=56997&view=rev Log: [FREELDR/SETUPLDR] * Leverage the object library option provided by CMake 2.8.8+ which will speed up the build even further. * These wrapping conditions will go away as soon as we ship the new BE. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Mon Jul 30 16:57:55 2012 @@ -150,8 +150,12 @@ #TBD endif() -add_library(freeldr_common ${FREELDR_COMMON_SOURCE}) -add_dependencies(freeldr_common bugcodes) +if(CMAKE_VERSION VERSION_GREATER 2.8.7) + add_library(freeldr_common OBJECT ${FREELDR_COMMON_SOURCE}) +else() + add_library(freeldr_common ${FREELDR_COMMON_SOURCE}) + add_dependencies(freeldr_common bugcodes) +endif() if(ARCH MATCHES i386 AND NOT MSVC) list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S) @@ -162,12 +166,18 @@ freeldr.c rtl/libsupp.c) -if (NOT MSVC) +if(NOT MSVC) list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def) endif() -add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE}) -add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) + +if(CMAKE_VERSION VERSION_GREATER 2.8.7) + add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) + add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE}) +else() + add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE}) + add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) +endif() if(NOT MSVC) add_target_link_flags(freeldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") @@ -190,21 +200,13 @@ target_link_libraries(freeldr_pe_dbg mini_hal) endif() -target_link_libraries(freeldr_pe - freeldr_common - cportlib - rossym - cmlib - rtl - libcntpr) - -target_link_libraries(freeldr_pe_dbg - freeldr_common - cportlib - rossym - cmlib - rtl - libcntpr) +if(NOT CMAKE_VERSION VERSION_GREATER 2.8.7) + target_link_libraries(freeldr_pe freeldr_common) + target_link_libraries(freeldr_pe_dbg freeldr_common) +endif() + +target_link_libraries(freeldr_pe cportlib rossym cmlib rtl libcntpr) +target_link_libraries(freeldr_pe_dbg cportlib rossym cmlib rtl libcntpr) # add_pch(freeldr_pe include/freeldr.h) @@ -229,8 +231,13 @@ list(APPEND SETUPLDR_SOURCE windows/setupldr.c) endif() -add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) -add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) +if(CMAKE_VERSION VERSION_GREATER 2.8.7) + add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) + add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) +else() + add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) + add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) +endif() if(NOT MSVC) add_target_link_flags(setupldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") @@ -256,21 +263,13 @@ target_link_libraries(setupldr_pe_dbg mini_hal) endif() -target_link_libraries(setupldr_pe - freeldr_common - cportlib - rossym - cmlib - rtl - libcntpr) - -target_link_libraries(setupldr_pe_dbg - freeldr_common - cportlib - rossym - cmlib - rtl - libcntpr) +if(NOT CMAKE_VERSION VERSION_GREATER 2.8.7) + target_link_libraries(setupldr_pe freeldr_common) + target_link_libraries(setupldr_pe_dbg freeldr_common) +endif() + +target_link_libraries(setupldr_pe cportlib rossym cmlib rtl libcntpr) +target_link_libraries(setupldr_pe_dbg cportlib rossym cmlib rtl libcntpr) add_dependencies(setupldr_pe asm) add_dependencies(setupldr_pe_dbg asm) @@ -281,5 +280,4 @@ ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) - add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest)

1 0

[jgardou] 56996: [MSVCRTEX] - Add is(w)blank implementation
by jgardou＠svn.reactos.org 30 Jul '12

30 Jul '12

Author: jgardou Date: Mon Jul 30 12:56:25 2012 New Revision: 56996 URL: http://svn.reactos.org/svn/reactos?rev=56996&view=rev Log: [MSVCRTEX] - Add is(w)blank implementation Added: trunk/reactos/lib/sdk/crt/misc/isblank.c (with props) trunk/reactos/lib/sdk/crt/misc/iswblank.c (with props) Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake Added: trunk/reactos/lib/sdk/crt/misc/isblank.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/isblank.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/isblank.c (added) +++ trunk/reactos/lib/sdk/crt/misc/isblank.c [iso-8859-1] Mon Jul 30 12:56:25 2012 @@ -1,0 +1,7 @@ +#define __NO_CTYPE_LINES +#include <ctype.h> + +int __cdecl isblank (int _C) +{ + return (_isctype(_C, _BLANK) || _C == '\t'); +} Propchange: trunk/reactos/lib/sdk/crt/misc/isblank.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/misc/iswblank.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/iswblank.… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/iswblank.c (added) +++ trunk/reactos/lib/sdk/crt/misc/iswblank.c [iso-8859-1] Mon Jul 30 12:56:25 2012 @@ -1,0 +1,7 @@ +#define _CRT_WCTYPE_NOINLINE +#include <ctype.h> + +int __cdecl iswblank (wint_t _C) +{ + return (iswctype(_C, _BLANK) || _C == '\t'); +} Propchange: trunk/reactos/lib/sdk/crt/misc/iswblank.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Mon Jul 30 12:56:25 2012 @@ -36,6 +36,8 @@ startup/dllentry.c startup/reactos.c misc/fltused.c + misc/isblank.c + misc/iswblank.c misc/ofmt_stub.c )

1 0

[jgardou] 56995: [INCLUDE] - Add some more C99 math functions - Fix definition of __forceinline and FORCEINLINE for C99 - Fix and add definition of _aligned_malloc and _aligned_free - Fix definitio...
by jgardou＠svn.reactos.org 30 Jul '12

30 Jul '12

Author: jgardou Date: Mon Jul 30 12:55:13 2012 New Revision: 56995 URL: http://svn.reactos.org/svn/reactos?rev=56995&view=rev Log: [INCLUDE] - Add some more C99 math functions - Fix definition of __forceinline and FORCEINLINE for C99 - Fix and add definition of _aligned_malloc and _aligned_free - Fix definition of is(w)blank, as a C99 function, it is not in msvcrt.dll and has to be implemented in msvcrtex All of this taken from the mingw-w64 project Modified: trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/ctype.h trunk/reactos/include/crt/malloc.h trunk/reactos/include/crt/math.h trunk/reactos/include/crt/stdlib.h trunk/reactos/include/psdk/intsafe.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/_mingw.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -172,7 +172,11 @@ # endif # define __ptr32 # define __ptr64 -# define __forceinline extern __inline __attribute((always_inline)) +# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# define __forceinline extern inline __attribute__((__always_inline__,__gnu_inline__)) +# else +# define __forceinline extern __inline__ __attribute__((__always_inline__)) +# endif #endif #ifdef __cplusplus Modified: trunk/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=56… ============================================================================== --- trunk/reactos/include/crt/ctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/ctype.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -112,7 +112,7 @@ _CRTIMP int __cdecl __iscsymf(int _C); _CRTIMP int __cdecl __iscsym(int _C); #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) - _CRTIMP int __cdecl isblank(int _C); + int __cdecl isblank(int _C); #endif #endif /* !_CTYPE_DEFINED */ @@ -156,7 +156,7 @@ _CRTIMP int __cdecl is_wctype(wint_t _C,wctype_t _Type); #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES) - _CRTIMP int __cdecl iswblank(wint_t _C); + int __cdecl iswblank(wint_t _C); #endif #endif Modified: trunk/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/malloc.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/malloc.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/malloc.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -52,6 +52,18 @@ extern unsigned int _amblksiz; +/* Make sure that X86intrin.h doesn't produce here collisions. */ +#if (!defined (_XMMINTRIN_H_INCLUDED) && !defined (_MM_MALLOC_H_INCLUDED)) || defined(_aligned_malloc) +#define __DO_ALIGN_DEFINES +#endif + +#ifdef __DO_ALIGN_DEFINES +#pragma push_macro("_aligned_free") +#pragma push_macro("_aligned_malloc") +#undef _aligned_free +#undef _aligned_malloc +#endif + #define _mm_free(a) _aligned_free(a) #define _mm_malloc(a,b) _aligned_malloc(a,b) @@ -62,13 +74,25 @@ void *__cdecl malloc(size_t _Size); void *__cdecl realloc(void *_Memory,size_t _NewSize); _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size); - /* _CRTIMP void __cdecl _aligned_free(void *_Memory); - _CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment); */ + +#ifdef __DO_ALIGN_DEFINES + _CRTIMP void __cdecl _aligned_free(void *_Memory); + _CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment); +#endif + _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset); _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment); _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment); _CRTIMP void *__cdecl _aligned_offset_realloc(void *_Memory,size_t _Size,size_t _Alignment,size_t _Offset); _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset); +#endif + +#ifdef __DO_ALIGN_DEFINES +#undef __DO_ALIGN_DEFINES + +#pragma pop_macro("_aligned_malloc") +#pragma pop_macro("_aligned_free") + #endif #define _MAX_WAIT_MALLOC_CRT 60000 Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=569… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -240,8 +240,6 @@ #pragma pack(pop) -#endif /* !_INC_MATH */ - #if defined(_USE_MATH_DEFINES) && !defined(_MATH_DEFINES_DEFINED) #define _MATH_DEFINES_DEFINED @@ -261,41 +259,141 @@ #endif /* _USE_MATH_DEFINES */ +#ifdef __cplusplus +extern "C" { +#endif + #ifndef __NO_ISOCEXT #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ || !defined __STRICT_ANSI__ || defined __GLIBCPP__ - /* Inverse hyperbolic trig functions */ - /* 7.12.5.1 */ +/* 7.12.3.1 */ +/* + Return values for fpclassify. + These are based on Intel x87 fpu condition codes + in the high byte of status word and differ from + the return values for MS IEEE 754 extension _fpclass() +*/ +#define FP_NAN 0x0100 +#define FP_NORMAL 0x0400 +#define FP_INFINITE (FP_NAN | FP_NORMAL) +#define FP_ZERO 0x4000 +#define FP_SUBNORMAL (FP_NORMAL | FP_ZERO) +/* 0x0200 is signbit mask */ + +/* + We can't inline float or double, because we want to ensure truncation + to semantic type before classification. + (A normal long double value might become subnormal when + converted to double, and zero when converted to float.) +*/ + + extern int __cdecl __fpclassifyl (long double); + extern int __cdecl __fpclassifyf (float); + extern int __cdecl __fpclassify (double); + +#ifndef __CRT__NO_INLINE + __CRT_INLINE int __cdecl __fpclassifyl (long double x) { + unsigned short sw; + __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); + } + __CRT_INLINE int __cdecl __fpclassify (double x) { +#ifdef __x86_64__ + __mingw_dbl_type_t hlp; + unsigned int l, h; + + hlp.x = x; + h = hlp.lh.high; + l = hlp.lh.low | (h & 0xfffff); + h &= 0x7ff00000; + if ((h | l) == 0) + return FP_ZERO; + if (!h) + return FP_SUBNORMAL; + if (h == 0x7ff00000) + return (l ? FP_NAN : FP_INFINITE); + return FP_NORMAL; +#else + unsigned short sw; + __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); +#endif + } + __CRT_INLINE int __cdecl __fpclassifyf (float x) { +#ifdef __x86_64__ + __mingw_flt_type_t hlp; + + hlp.x = x; + hlp.val &= 0x7fffffff; + if (hlp.val == 0) + return FP_ZERO; + if (hlp.val < 0x800000) + return FP_SUBNORMAL; + if (hlp.val >= 0x7f800000) + return (hlp.val > 0x7f800000 ? FP_NAN : FP_INFINITE); + return FP_NORMAL; +#else + unsigned short sw; + __asm__ __volatile__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); +#endif + } +#endif + +#define fpclassify(x) (sizeof (x) == sizeof (float) ? __fpclassifyf (x) \ + : sizeof (x) == sizeof (double) ? __fpclassify (x) \ + : __fpclassifyl (x)) + +/* 7.12.3.2 */ +#define isfinite(x) ((fpclassify(x) & FP_NAN) == 0) + +/* 7.12.3.3 */ +#define isinf(x) (fpclassify(x) == FP_INFINITE) + +/* Inverse hyperbolic trig functions */ +/* 7.12.5.1 */ extern double __cdecl acosh (double); extern float __cdecl acoshf (float); extern long double __cdecl acoshl (long double); - /* 7.12.5.2 */ +/* 7.12.5.2 */ extern double __cdecl asinh (double); extern float __cdecl asinhf (float); extern long double __cdecl asinhl (long double); - /* 7.12.5.3 */ +/* 7.12.5.3 */ extern double __cdecl atanh (double); extern float __cdecl atanhf (float); extern long double __cdecl atanhl (long double); - /* 7.12.6.2 */ +/* 7.12.6.2 */ extern double __cdecl exp2(double); extern float __cdecl exp2f(float); extern long double __cdecl exp2l(long double); - /* 7.12.6.10 */ +/* 7.12.6.10 */ extern double __cdecl log2 (double); extern float __cdecl log2f (float); extern long double __cdecl log2l (long double); - /* 7.12.9.8 */ - /* round towards zero, regardless of fpu control word settings */ +/* 7.12.9.6 */ +/* round away from zero, regardless of fpu control word settings */ + extern double __cdecl round (double); + extern float __cdecl roundf (float); + extern long double __cdecl roundl (long double); + +/* 7.12.9.8 */ +/* round towards zero, regardless of fpu control word settings */ extern double __cdecl trunc (double); extern float __cdecl truncf (float); extern long double __cdecl truncl (long double); #endif /* __STDC_VERSION__ >= 199901L */ #endif /* __NO_ISOCEXT */ + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif /* !_INC_MATH */ Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -342,8 +342,17 @@ void *__cdecl malloc(size_t _Size); void *__cdecl realloc(void *_Memory,size_t _NewSize); _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size); - //_CRTIMP void __cdecl _aligned_free(void *_Memory); - //_CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment); +/* Make sure that X86intrin.h doesn't produce here collisions. */ +#if (!defined (_XMMINTRIN_H_INCLUDED) && !defined (_MM_MALLOC_H_INCLUDED)) || defined(_aligned_malloc) +#pragma push_macro("_aligned_free") +#pragma push_macro("_aligned_malloc") +#undef _aligned_free +#undef _aligned_malloc + _CRTIMP void __cdecl _aligned_free(void *_Memory); + _CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment); +#pragma pop_macro("_aligned_free") +#pragma pop_macro("_aligned_malloc") +#endif _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset); _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment); _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment); Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -31,7 +31,11 @@ #include <specstrings.h> #if defined(__GNUC__) && !defined(__forceinline) -#define __forceinline extern __inline __attribute((always_inline)) +# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# define __forceinline extern inline __attribute__((__always_inline__,__gnu_inline__)) +# else +# define __forceinline extern __inline__ __attribute__((__always_inline__)) +# endif #endif /* Handle ntintsafe here too */ Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -264,7 +264,11 @@ #elif defined(_MSC_VER) #define FORCEINLINE __inline #else /* __GNUC__ */ -#define FORCEINLINE extern __inline__ __attribute__((always_inline)) +# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# define FORCEINLINE extern inline __attribute__((__always_inline__,__gnu_inline__)) +# else +# define FORCEINLINE extern __inline__ __attribute__((__always_inline__)) +# endif #endif #endif /* FORCEINLINE */ Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Jul 30 12:55:13 2012 @@ -176,7 +176,11 @@ #elif (_MSC_VER) #define FORCEINLINE __inline #else -#define FORCEINLINE extern __inline__ __attribute__((always_inline)) +# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L) +# define FORCEINLINE extern inline __attribute__((__always_inline__,__gnu_inline__)) +# else +# define FORCEINLINE extern __inline__ __attribute__((__always_inline__)) +# endif #endif #endif

1 0

[tkreuzer] 56994: [WIN32K] Check if the dc surface is NULL instead of ASSERTing
by tkreuzer＠svn.reactos.org 30 Jul '12

30 Jul '12

Author: tkreuzer Date: Mon Jul 30 11:09:31 2012 New Revision: 56994 URL: http://svn.reactos.org/svn/reactos?rev=56994&view=rev Log: [WIN32K] Check if the dc surface is NULL instead of ASSERTing Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Mon Jul 30 11:09:31 2012 @@ -233,6 +233,12 @@ LONG i; PDC_ATTR pdcattr = dc->pdcattr; + psurf = dc->dclevel.pSurface; + if (!psurf) + { + return FALSE; + } + if (PATH_IsPathOpen(dc->dclevel)) return PATH_Polyline(dc, pt, Count); @@ -254,11 +260,6 @@ Points = EngAllocMem(0, Count * sizeof(POINT), GDITAG_TEMP); if (Points != NULL) { - psurf = dc->dclevel.pSurface; - /* FIXME: psurf can be NULL!!!! - Don't assert but handle this case gracefully! */ - ASSERT(psurf); - RtlCopyMemory(Points, pt, Count * sizeof(POINT)); IntLPtoDP(dc, Points, Count);

1 0

[hpoussin] 56993: [FREELDR] i386: support drives bigger than ~4GB See issue #6669 for more details.
by hpoussin＠svn.reactos.org 30 Jul '12

30 Jul '12

Author: hpoussin Date: Mon Jul 30 06:12:58 2012 New Revision: 56993 URL: http://svn.reactos.org/svn/reactos?rev=56993&view=rev Log: [FREELDR] i386: support drives bigger than ~4GB See issue #6669 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Mon Jul 30 06:12:58 2012 @@ -150,8 +150,7 @@ if (Position->LowPart & (Context->SectorSize - 1)) return EINVAL; - /* FIXME: take HighPart into account */ - Context->SectorNumber = Position->LowPart / Context->SectorSize; + Context->SectorNumber = (ULONG)(Position->QuadPart / Context->SectorSize); return ESUCCESS; }

1 0

[jgardou] 56992: [OPENGL32] - Fix build
by jgardou＠svn.reactos.org 30 Jul '12

30 Jul '12

Author: jgardou Date: Mon Jul 30 01:07:57 2012 New Revision: 56992 URL: http://svn.reactos.org/svn/reactos?rev=56992&view=rev Log: [OPENGL32] - Fix build Modified: trunk/reactos/dll/win32/opengl32/CMakeLists.txt Modified: trunk/reactos/dll/win32/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/CMakeLists.txt [iso-8859-1] Mon Jul 30 01:07:57 2012 @@ -1,6 +1,11 @@ spec2def(opengl32.dll opengl32.spec ADD_IMPORTLIB) + +add_definitions( + -D_GDI32_ # prevent gl* being declared __declspec(dllimport) in MS headers + -DBUILD_GL32 # declare gl* as __declspec(dllexport) in Mesa headers +) list(APPEND SOURCE font.c

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs