Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 56304: [NTOSKRNL] Use MiFillSystemPageDirectory on amd64, too
by tkreuzer＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: tkreuzer Date: Sun Apr 1 15:23:08 2012 New Revision: 56304 URL: http://svn.reactos.org/svn/reactos?rev=56304&view=rev Log: [NTOSKRNL] Use MiFillSystemPageDirectory on amd64, too Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/amd64/init.c Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Sun Apr 1 15:23:08 2012 @@ -256,6 +256,10 @@ #define MiPdeToPte(PDE) ((PMMPTE)MiPteToAddress(PDE)) #define MiPteToPde(PTE) ((PMMPDE)MiAddressToPte(PTE)) +#define MiPdeToPpe(Pde) ((PMMPPE)MiAddressToPte(Pde)) + +/* Sign extend 48 bits */ +#define MiProtoPteToPte(x) (PMMPTE)(((LONG64)(x)->u.Long) >> 16) FORCEINLINE VOID @@ -263,17 +267,13 @@ IN PMMPTE PointerPte) { /* Store the Address */ - NewPte->u.Long = (ULONG64)PointerPte; + NewPte->u.Long = (ULONG64)PointerPte << 16; /* Mark this as a prototype PTE */ NewPte->u.Proto.Prototype = 1; - NewPte->u.Proto.Valid = 1; - NewPte->u.Proto.ReadOnly = 0; - NewPte->u.Proto.Protection = 0; -} - -/* Sign extend 48 bits */ -#define MiProtoPteToPte(x) (PMMPTE)((LONG64)(x)->u.Proto.ProtoAddress) + + ASSERT(MiProtoPteToPte(NewPte) == PointerPte); +} VOID FORCEINLINE Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun Apr 1 15:23:08 2012 @@ -410,7 +410,6 @@ return STATUS_SUCCESS; } -#if (_MI_PAGING_LEVELS == 2) VOID NTAPI MiFillSystemPageDirectory(IN PVOID Base, @@ -418,7 +417,7 @@ { PMMPDE PointerPde, LastPde, SystemMapPde; MMPDE TempPde; - PFN_NUMBER PageFrameIndex; + PFN_NUMBER PageFrameIndex, ParentPage; KIRQL OldIrql; PAGED_CODE(); @@ -426,8 +425,13 @@ PointerPde = MiAddressToPde(Base); LastPde = MiAddressToPde((PVOID)((ULONG_PTR)Base + NumberOfBytes - 1)); +#if (_MI_PAGING_LEVELS == 2) /* Find the system double-mapped PDE that describes this mapping */ SystemMapPde = &MmSystemPagePtes[((ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)) / sizeof(MMPTE)]; +#else + /* We don't have a double mapping */ + SystemMapPde = PointerPde; +#endif /* Use the PDE template and loop the PDEs */ TempPde = ValidKernelPde; @@ -446,10 +450,15 @@ ASSERT(PageFrameIndex); TempPde.u.Hard.PageFrameNumber = PageFrameIndex; +#if (_MI_PAGING_LEVELS == 2) + ParentPage = MmSystemPageDirectory[(PointerPde - MiAddressToPde(NULL)) / PDE_COUNT]; +#else + ParentPage = MiPdeToPpe(PointerPde)->u.Hard.PageFrameNumber; +#endif /* Initialize its PFN entry, with the parent system page directory page table */ MiInitializePfnForOtherProcess(PageFrameIndex, (PMMPTE)PointerPde, - MmSystemPageDirectory[(PointerPde - MiAddressToPde(NULL)) / PDE_COUNT]); + ParentPage); /* Make the system PDE entry valid */ MI_WRITE_VALID_PDE(SystemMapPde, TempPde); @@ -468,7 +477,6 @@ PointerPde++; } } -#endif NTSTATUS NTAPI @@ -734,10 +742,8 @@ Base = MiInsertInSystemSpace(Session, Buckets, ControlArea); ASSERT(Base); -#if (_MI_PAGING_LEVELS == 2) /* Create the PDEs needed for this mapping, and double-map them if needed */ MiFillSystemPageDirectory(Base, Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE); -#endif /* Create the actual prototype PTEs for this mapping */ Status = MiAddMappedPtes(MiAddressToPte(Base), Modified: trunk/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/init.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Sun Apr 1 15:23:08 2012 @@ -241,6 +241,9 @@ /* Setup 1 PPE for hyper space */ MiMapPPEs((PVOID)HYPER_SPACE, (PVOID)HYPER_SPACE_END); + + /* Setup PPEs for system space view */ + MiMapPPEs(MiSystemViewStart, (PCHAR)MiSystemViewStart + MmSystemViewSize); /* Setup the mapping PDEs */ MiMapPDEs((PVOID)MI_MAPPING_RANGE_START, (PVOID)MI_MAPPING_RANGE_END);

1 0

[tkreuzer] 56303: [NDK] Make KTHREAD structure compatible to WS2003, Vista and Win7 for both x86 and amd64
by tkreuzer＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: tkreuzer Date: Sun Apr 1 14:29:15 2012 New Revision: 56303 URL: http://svn.reactos.org/svn/reactos?rev=56303&view=rev Log: [NDK] Make KTHREAD structure compatible to WS2003, Vista and Win7 for both x86 and amd64 Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Sun Apr 1 14:29:15 2012 @@ -688,49 +688,85 @@ typedef struct _KTHREAD { DISPATCHER_HEADER Header; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ ULONGLONG CycleTime; +#ifndef _WIN64 // [ ULONG HighCycleTime; +#endif // ] ULONGLONG QuantumTarget; -#else +#else // ][ LIST_ENTRY MutantListHead; -#endif +#endif // ] PVOID InitialStack; ULONG_PTR StackLimit; // FIXME: PVOID PVOID KernelStack; KSPIN_LOCK ThreadLock; +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + KWAIT_STATUS_REGISTER WaitRegister; + BOOLEAN Running; + BOOLEAN Alerted[2]; + union + { + struct + { + ULONG KernelStackResident:1; + ULONG ReadyTransition:1; + ULONG ProcessReadyQueue:1; + ULONG WaitNext:1; + ULONG SystemAffinityActive:1; + ULONG Alertable:1; + ULONG GdiFlushActive:1; + ULONG UserStackWalkActive:1; + ULONG ApcInterruptRequest:1; + ULONG ForceDeferSchedule:1; + ULONG QuantumEndMigrate:1; + ULONG UmsDirectedSwitchEnable:1; + ULONG TimerActive:1; + ULONG Reserved:19; + }; + LONG MiscFlags; + }; +#endif // ] union { KAPC_STATE ApcState; struct { -#ifdef _M_AMD64 - UCHAR ApcStateFill[43]; // 23 / 43 -#else - UCHAR ApcStateFill[23]; -#endif + UCHAR ApcStateFill[FIELD_OFFSET(KAPC_STATE, UserApcPending) + 1]; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ + SCHAR Priority; +#else // ][ UCHAR ApcQueueable; +#endif // ] + /* On x86, the following members "fall out" of the union */ volatile UCHAR NextProcessor; +#if (NTDDI_VERSION < NTDDI_WIN7) // [ volatile UCHAR DeferredProcessor; +#endif // ] +#if (NTDDI_VERSION < NTDDI_LONGHORN) // [ UCHAR AdjustReason; SCHAR AdjustIncrement; +#endif // ] }; }; KSPIN_LOCK ApcQueueLock; -#ifndef _M_AMD64 +#ifndef _M_AMD64 // [ ULONG ContextSwitches; volatile UCHAR State; UCHAR NpxState; KIRQL WaitIrql; KPROCESSOR_MODE WaitMode; -#endif +#endif // ] LONG_PTR WaitStatus; +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + PKWAIT_BLOCK WaitBlockList; +#else // ][ union { PKWAIT_BLOCK WaitBlockList; PKGATE GateObject; }; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ union { struct @@ -746,22 +782,23 @@ }; LONG MiscFlags; }; -#else +#else // ][ BOOLEAN Alertable; BOOLEAN WaitNext; -#endif +#endif // ] UCHAR WaitReason; SCHAR Priority; BOOLEAN EnableStackSwap; volatile UCHAR SwapBusy; BOOLEAN Alerted[MaximumMode]; +#endif // ] union { LIST_ENTRY WaitListEntry; SINGLE_LIST_ENTRY SwapListEntry; }; PKQUEUE Queue; -#ifndef _M_AMD64 +#ifndef _M_AMD64 // [ ULONG WaitTime; union { @@ -772,44 +809,60 @@ }; ULONG CombinedApcDisable; }; -#endif +#endif // ] struct _TEB *Teb; + +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + KTIMER Timer; +#else // ][ union { KTIMER Timer; struct { - UCHAR TimerFill[FIELD_OFFSET(KTIMER, Period) + sizeof(LONG)]; // 40 / 60 + UCHAR TimerFill[FIELD_OFFSET(KTIMER, Period) + sizeof(LONG)]; +#if !defined(_WIN64) // [ + }; + }; +#endif // ] union { struct { LONG AutoAlignment:1; LONG DisableBoost:1; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - LONG EtwStackTrace1ApcInserted:1; - LONG EtwStackTrace2ApcInserted:1; - LONG CycleChargePending:1; - LONG ReservedFlags:27; -#else +#if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ + ULONG EtwStackTraceApc1Inserted:1; + ULONG EtwStackTraceApc2Inserted:1; + ULONG CycleChargePending:1; + ULONG CalloutActive:1; + ULONG ApcQueueable:1; + ULONG EnableStackSwap:1; + ULONG GuiThread:1; + ULONG ReservedFlags:23; +#else // ][ LONG ReservedFlags:30; -#endif +#endif // ] }; LONG ThreadFlags; }; - }; - }; - union - { - KWAIT_BLOCK WaitBlock[THREAD_WAIT_OBJECTS + 1]; +#if defined(_WIN64) // [ + }; + }; +#endif // ] +#endif // ] + union + { + DECLSPEC_ALIGN(8) KWAIT_BLOCK WaitBlock[THREAD_WAIT_OBJECTS + 1]; +#if (NTDDI_VERSION < NTDDI_WIN7) // [ struct { UCHAR WaitBlockFill0[FIELD_OFFSET(KWAIT_BLOCK, SpareByte)]; // 32bit = 23, 64bit = 43 -#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ UCHAR IdealProcessor; -#else +#else // ][ BOOLEAN SystemAffinityActive; -#endif +#endif // ] }; struct { @@ -826,7 +879,8 @@ UCHAR WaitBlockFill3[3 * sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareByte)]; // 95 / 187 UCHAR LargeStack; }; -#ifdef _M_AMD64 +#endif // ] +#ifdef _M_AMD64 // [ struct { UCHAR WaitBlockFill4[FIELD_OFFSET(KWAIT_BLOCK, SpareLong)]; @@ -858,70 +912,103 @@ ULONG CombinedApcDisable; }; }; -#endif +#endif // ] }; LIST_ENTRY QueueListEntry; PKTRAP_FRAME TrapFrame; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ PVOID FirstArgument; -#endif + union // 2 elements, 0x8 bytes (sizeof) + { + PVOID CallbackStack; + ULONG64 CallbackDepth; + }; +#else // ][ PVOID CallbackStack; +#endif // ] +#if (NTDDI_VERSION < NTDDI_LONGHORN) || ((NTDDI_VERSION < NTDDI_WIN7) && !defined(_WIN64)) // [ PVOID ServiceTable; -#ifdef _M_AMD64 +#endif // ] +#if (NTDDI_VERSION < NTDDI_LONGHORN) && defined(_WIN64) // [ ULONG KernelLimit; -#endif +#endif // ] UCHAR ApcStateIndex; -#if (NTDDI_VERSION < NTDDI_LONGHORN) +#if (NTDDI_VERSION < NTDDI_LONGHORN) // [ UCHAR IdealProcessor; -#endif BOOLEAN Preempted; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - BOOLEAN CalloutActive; -#else BOOLEAN ProcessReadyQueue; -#ifdef _M_AMD64 +#ifdef _WIN64 // [ PVOID Win32kTable; ULONG Win32kLimit; -#endif +#endif // ] BOOLEAN KernelStackResident; -#endif +#endif // ] SCHAR BasePriority; SCHAR PriorityDecrement; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ + BOOLEAN Preempted; + UCHAR AdjustReason; + CHAR AdjustIncrement; + UINT8 Spare01; +#endif // ] CHAR Saturation; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ ULONG SystemCallNumber; +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + ULONG2 FreezeCount; +#else // ][ ULONG Spare2; -#endif +#endif // ] +#endif // ] KAFFINITY UserAffinity; struct _KPROCESS *Process; +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + GROUP_AFFINITY Affinity; + ULONG IdealProcessor; + ULONG UserIdealProcessor; +#else // ][ KAFFINITY Affinity; +#endif // ] PKAPC_STATE ApcStatePointer[2]; union { KAPC_STATE SavedApcState; struct { - UCHAR SavedApcStateFill[FIELD_OFFSET(KAPC_STATE, UserApcPending) + 1]; // 23 / 43 + UCHAR SavedApcStateFill[FIELD_OFFSET(KAPC_STATE, UserApcPending) + 1]; +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + UCHAR WaitReason; +#else // ][ CCHAR FreezeCount; +#endif // ] +#ifndef _WIN64 // [ + }; + }; +#endif // ] CCHAR SuspendCount; +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + CCHAR Spare1; +#else // ][ UCHAR UserIdealProcessor; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - union - { - struct - { - UCHAR ReservedBits0:1; - UCHAR SegmentsPresent:1; - UCHAR Reservedbits1:1; - }; - UCHAR NestedStateFlags; - }; -#else +#endif // ] +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ +#elif (NTDDI_VERSION >= NTDDI_LONGHORN) // ][ + UCHAR Spare3; +#else // ][ UCHAR CalloutActive; -#endif - UCHAR Iopl; - }; - }; +#endif // ] +#ifdef _WIN64 // [ + UCHAR CodePatchInProgress; + }; + }; +#endif // ] +#if defined(_M_IX86) // [ +#if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ + UCHAR OtherPlatformFill; +#else // ][ + UCHAR Iopl; +#endif // ] +#endif // ] PVOID Win32Thread; PVOID StackBase; union @@ -930,7 +1017,13 @@ struct { UCHAR SuspendApcFill0[1]; +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + UCHAR ResourceIndex; +#elif (NTDDI_VERSION >= NTDDI_LONGHORN) // ][ + CHAR Spare04; +#else // ][ SCHAR Quantum; +#endif // ] }; struct { @@ -959,35 +1052,52 @@ struct { UCHAR SuspendApcFill5[FIELD_OFFSET(KAPC, Inserted) + 1]; // 47 / 83 +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + UCHAR LargeStack; +#else // ][ UCHAR PowerState; +#endif // ] +#ifdef _WIN64 // [ ULONG UserTime; - }; - }; +#endif // ] + }; + }; +#ifndef _WIN64 // [ + ULONG UserTime; +#endif // ] union { KSEMAPHORE SuspendSemaphore; struct { UCHAR SuspendSemaphorefill[FIELD_OFFSET(KSEMAPHORE, Limit) + 4]; // 20 / 28 +#ifdef _WIN64 // [ ULONG SListFaultCount; - }; - }; +#endif // ] + }; + }; +#ifndef _WIN64 // [ + ULONG SListFaultCount; +#endif // ] LIST_ENTRY ThreadListEntry; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ LIST_ENTRY MutantListHead; -#endif +#endif // ] PVOID SListFaultAddress; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - PVOID MdlForLockedteb; -#endif -#ifdef _M_AMD64 +#ifdef _M_AMD64 // [ LONG64 ReadOperationCount; LONG64 WriteOperationCount; LONG64 OtherOperationCount; LONG64 ReadTransferCount; LONG64 WriteTransferCount; LONG64 OtherTransferCount; -#endif +#endif // ] +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + PKTHREAD_COUNTERS ThreadCounters; + PXSTATE_SAVE XStateSave; +#elif (NTDDI_VERSION >= NTDDI_LONGHORN) // ][ + PVOID MdlForLockedteb; +#endif // ] } KTHREAD; #define ASSERT_THREAD(object) \

1 0

[tkreuzer] 56302: [NTOSKRNL] Sort the C_ASSERTs and add some more.
by tkreuzer＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: tkreuzer Date: Sun Apr 1 14:15:00 2012 New Revision: 56302 URL: http://svn.reactos.org/svn/reactos?rev=56302&view=rev Log: [NTOSKRNL] Sort the C_ASSERTs and add some more. Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Sun Apr 1 14:15:00 2012 @@ -150,25 +150,30 @@ C_ASSERT(FIELD_OFFSET(KUSER_SHARED_DATA, SystemCall) == 0x300); C_ASSERT(FIELD_OFFSET(KTHREAD, InitialStack) == KTHREAD_INITIAL_STACK); +C_ASSERT(FIELD_OFFSET(KTHREAD, KernelStack) == KTHREAD_KERNEL_STACK); +C_ASSERT(FIELD_OFFSET(KTHREAD, SystemAffinityActive) == FIELD_OFFSET(KTHREAD, WaitBlock) + FIELD_OFFSET(KWAIT_BLOCK, SpareByte)); +C_ASSERT(FIELD_OFFSET(KTHREAD, ApcState.Process) == KTHREAD_APCSTATE_PROCESS); +C_ASSERT(FIELD_OFFSET(KTHREAD, ApcQueueable) == FIELD_OFFSET(KTHREAD, ApcState.UserApcPending) + 1); +C_ASSERT(FIELD_OFFSET(KTHREAD, ApcQueueable) == 0x3F); +C_ASSERT(FIELD_OFFSET(KTHREAD, NextProcessor) == 0x40); +C_ASSERT(FIELD_OFFSET(KTHREAD, DeferredProcessor) == 0x41); +C_ASSERT(FIELD_OFFSET(KTHREAD, AdjustReason) == 0x42); +C_ASSERT(FIELD_OFFSET(KTHREAD, NpxState) == KTHREAD_NPX_STATE); +C_ASSERT(FIELD_OFFSET(KTHREAD, Alertable) == 0x58); +C_ASSERT(FIELD_OFFSET(KTHREAD, SwapBusy) == 0x05D); C_ASSERT(FIELD_OFFSET(KTHREAD, Teb) == KTHREAD_TEB); -C_ASSERT(FIELD_OFFSET(KTHREAD, KernelStack) == KTHREAD_KERNEL_STACK); -C_ASSERT(FIELD_OFFSET(KTHREAD, NpxState) == KTHREAD_NPX_STATE); -C_ASSERT(FIELD_OFFSET(KTHREAD, SwapBusy) == 0x05D); C_ASSERT(FIELD_OFFSET(KTHREAD, Timer) == 0x078); C_ASSERT(FIELD_OFFSET(KTHREAD, ThreadFlags) == 0x0A0); C_ASSERT(FIELD_OFFSET(KTHREAD, WaitBlock) == 0x0A8); C_ASSERT(FIELD_OFFSET(KTHREAD, WaitBlockFill0) == 0x0A8); C_ASSERT(FIELD_OFFSET(KTHREAD, QueueListEntry) == 0x108); -C_ASSERT(FIELD_OFFSET(KTHREAD, ServiceTable) == KTHREAD_SERVICE_TABLE); C_ASSERT(FIELD_OFFSET(KTHREAD, PreviousMode) == KTHREAD_PREVIOUS_MODE); -C_ASSERT(FIELD_OFFSET(KTHREAD, TrapFrame) == KTHREAD_TRAP_FRAME); -C_ASSERT(FIELD_OFFSET(KTHREAD, CallbackStack) == KTHREAD_CALLBACK_STACK); -C_ASSERT(FIELD_OFFSET(KTHREAD, ApcState.Process) == KTHREAD_APCSTATE_PROCESS); -C_ASSERT(FIELD_OFFSET(KTHREAD, ApcQueueable) == FIELD_OFFSET(KTHREAD, ApcState.UserApcPending) + 1); -C_ASSERT(FIELD_OFFSET(KTHREAD, SystemAffinityActive) == FIELD_OFFSET(KTHREAD, WaitBlock) + FIELD_OFFSET(KWAIT_BLOCK, SpareByte)); C_ASSERT(FIELD_OFFSET(KTHREAD, PreviousMode) == FIELD_OFFSET(KTHREAD, WaitBlock) + sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareByte)); C_ASSERT(FIELD_OFFSET(KTHREAD, ResourceIndex) == FIELD_OFFSET(KTHREAD, WaitBlock) + 2*sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareByte)); C_ASSERT(FIELD_OFFSET(KTHREAD, LargeStack) == FIELD_OFFSET(KTHREAD, WaitBlock) + 3*sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareByte)); +C_ASSERT(FIELD_OFFSET(KTHREAD, TrapFrame) == KTHREAD_TRAP_FRAME); +C_ASSERT(FIELD_OFFSET(KTHREAD, CallbackStack) == KTHREAD_CALLBACK_STACK); +C_ASSERT(FIELD_OFFSET(KTHREAD, ServiceTable) == KTHREAD_SERVICE_TABLE); C_ASSERT(FIELD_OFFSET(KTHREAD, FreezeCount) == FIELD_OFFSET(KTHREAD, SavedApcState.UserApcPending) + 1); C_ASSERT(FIELD_OFFSET(KTHREAD, Quantum) == FIELD_OFFSET(KTHREAD, SuspendApc.SpareByte0)); C_ASSERT(FIELD_OFFSET(KTHREAD, QuantumReset) == FIELD_OFFSET(KTHREAD, SuspendApc.SpareByte1));

1 0

[tkreuzer] 56301: [NTOSKRNL] - Add a few more C_ASSERTs related to the KTHREAD structure layout
by tkreuzer＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: tkreuzer Date: Sun Apr 1 13:37:20 2012 New Revision: 56301 URL: http://svn.reactos.org/svn/reactos?rev=56301&view=rev Log: [NTOSKRNL] - Add a few more C_ASSERTs related to the KTHREAD structure layout Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Sun Apr 1 13:37:20 2012 @@ -148,19 +148,38 @@ #ifdef _M_IX86 C_ASSERT(FIELD_OFFSET(KUSER_SHARED_DATA, SystemCall) == 0x300); + C_ASSERT(FIELD_OFFSET(KTHREAD, InitialStack) == KTHREAD_INITIAL_STACK); C_ASSERT(FIELD_OFFSET(KTHREAD, Teb) == KTHREAD_TEB); C_ASSERT(FIELD_OFFSET(KTHREAD, KernelStack) == KTHREAD_KERNEL_STACK); C_ASSERT(FIELD_OFFSET(KTHREAD, NpxState) == KTHREAD_NPX_STATE); +C_ASSERT(FIELD_OFFSET(KTHREAD, SwapBusy) == 0x05D); +C_ASSERT(FIELD_OFFSET(KTHREAD, Timer) == 0x078); +C_ASSERT(FIELD_OFFSET(KTHREAD, ThreadFlags) == 0x0A0); +C_ASSERT(FIELD_OFFSET(KTHREAD, WaitBlock) == 0x0A8); +C_ASSERT(FIELD_OFFSET(KTHREAD, WaitBlockFill0) == 0x0A8); +C_ASSERT(FIELD_OFFSET(KTHREAD, QueueListEntry) == 0x108); C_ASSERT(FIELD_OFFSET(KTHREAD, ServiceTable) == KTHREAD_SERVICE_TABLE); C_ASSERT(FIELD_OFFSET(KTHREAD, PreviousMode) == KTHREAD_PREVIOUS_MODE); C_ASSERT(FIELD_OFFSET(KTHREAD, TrapFrame) == KTHREAD_TRAP_FRAME); C_ASSERT(FIELD_OFFSET(KTHREAD, CallbackStack) == KTHREAD_CALLBACK_STACK); C_ASSERT(FIELD_OFFSET(KTHREAD, ApcState.Process) == KTHREAD_APCSTATE_PROCESS); +C_ASSERT(FIELD_OFFSET(KTHREAD, ApcQueueable) == FIELD_OFFSET(KTHREAD, ApcState.UserApcPending) + 1); +C_ASSERT(FIELD_OFFSET(KTHREAD, SystemAffinityActive) == FIELD_OFFSET(KTHREAD, WaitBlock) + FIELD_OFFSET(KWAIT_BLOCK, SpareByte)); +C_ASSERT(FIELD_OFFSET(KTHREAD, PreviousMode) == FIELD_OFFSET(KTHREAD, WaitBlock) + sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareByte)); +C_ASSERT(FIELD_OFFSET(KTHREAD, ResourceIndex) == FIELD_OFFSET(KTHREAD, WaitBlock) + 2*sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareByte)); +C_ASSERT(FIELD_OFFSET(KTHREAD, LargeStack) == FIELD_OFFSET(KTHREAD, WaitBlock) + 3*sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareByte)); +C_ASSERT(FIELD_OFFSET(KTHREAD, FreezeCount) == FIELD_OFFSET(KTHREAD, SavedApcState.UserApcPending) + 1); +C_ASSERT(FIELD_OFFSET(KTHREAD, Quantum) == FIELD_OFFSET(KTHREAD, SuspendApc.SpareByte0)); +C_ASSERT(FIELD_OFFSET(KTHREAD, QuantumReset) == FIELD_OFFSET(KTHREAD, SuspendApc.SpareByte1)); +C_ASSERT(FIELD_OFFSET(KTHREAD, KernelTime) == FIELD_OFFSET(KTHREAD, SuspendApc.SpareLong0)); +C_ASSERT(FIELD_OFFSET(KTHREAD, TlsArray) == FIELD_OFFSET(KTHREAD, SuspendApc.SystemArgument1)); +C_ASSERT(FIELD_OFFSET(KTHREAD, LegoData) == FIELD_OFFSET(KTHREAD, SuspendApc.SystemArgument2)); +C_ASSERT(FIELD_OFFSET(KTHREAD, PowerState) == FIELD_OFFSET(KTHREAD, SuspendApc.Inserted) + 1); +C_ASSERT(sizeof(KTHREAD) == 0x1B8); + C_ASSERT(FIELD_OFFSET(KPROCESS, DirectoryTableBase) == KPROCESS_DIRECTORY_TABLE_BASE); -#endif - -#ifdef _M_IX86 + C_ASSERT(FIELD_OFFSET(KPCR, NtTib.ExceptionList) == KPCR_EXCEPTION_LIST); C_ASSERT(FIELD_OFFSET(KPCR, SelfPcr) == KPCR_SELF); C_ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR);

1 0

[tkreuzer] 56300: [NTOSKRNL] - If neccessary unlock the working set in MiMakeSystemAddressValid before calling MmAccessFault, fixes a failed ASSERT, when coming from NtFreeVirtualMemory - Remove du...
by tkreuzer＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: tkreuzer Date: Sun Apr 1 13:34:18 2012 New Revision: 56300 URL: http://svn.reactos.org/svn/reactos?rev=56300&view=rev Log: [NTOSKRNL] - If neccessary unlock the working set in MiMakeSystemAddressValid before calling MmAccessFault, fixes a failed ASSERT, when coming from NtFreeVirtualMemory - Remove duplicated ASSERT Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Apr 1 13:34:18 2012 @@ -917,7 +917,6 @@ //ASSERT(Process->Vm.Flags.AcquiredUnsafe == 0); /* Okay, now we can own it exclusively */ - ASSERT(Thread->OwnsProcessWorkingSetExclusive == FALSE); Thread->OwnsProcessWorkingSetExclusive = TRUE; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Apr 1 13:34:18 2012 @@ -34,7 +34,8 @@ IN PEPROCESS CurrentProcess) { NTSTATUS Status; - BOOLEAN LockChange = FALSE; + BOOLEAN WsWasLocked = FALSE, LockChange = FALSE; + PETHREAD CurrentThread = PsGetCurrentThread(); /* Must be a non-pool page table, since those are double-mapped already */ ASSERT(PageTableVirtualAddress > MM_HIGHEST_USER_ADDRESS); @@ -47,6 +48,14 @@ /* Check if the page table is valid */ while (!MmIsAddressValid(PageTableVirtualAddress)) { + /* Check if the WS is locked */ + if (CurrentThread->OwnsProcessWorkingSetExclusive) + { + /* Unlock the working set and remember it was locked */ + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + WsWasLocked = TRUE; + } + /* Fault it in */ Status = MmAccessFault(FALSE, PageTableVirtualAddress, KernelMode, NULL); if (!NT_SUCCESS(Status)) @@ -58,6 +67,9 @@ (ULONG_PTR)CurrentProcess, (ULONG_PTR)PageTableVirtualAddress); } + + /* Lock the working set again */ + if (WsWasLocked) MiLockProcessWorkingSet(CurrentProcess, CurrentThread); /* This flag will be useful later when we do better locking */ LockChange = TRUE;

1 0

[akhaldi] 56299: [CMAKE] * Implement the _clean targets for the ninja generator.
by akhaldi＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: akhaldi Date: Sun Apr 1 11:43:24 2012 New Revision: 56299 URL: http://svn.reactos.org/svn/reactos?rev=56299&view=rev Log: [CMAKE] * Implement the _clean targets for the ninja generator. Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sun Apr 1 11:43:24 2012 @@ -222,16 +222,20 @@ endfunction() # Create module_clean targets -function(add_clean_target target) - if(CMAKE_GENERATOR MATCHES "Unix Makefiles" OR CMAKE_GENERATOR MATCHES "MinGW Makefiles") - set(CLEAN_COMMAND make clean) - elseif(CMAKE_GENERATOR MATCHES "NMake Makefiles") - set(CLEAN_COMMAND nmake /nologo clean) - endif() - add_custom_target(${target}_clean - COMMAND ${CLEAN_COMMAND} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Cleaning ${target}") +function(add_clean_target _target) + set(_clean_working_directory ${CMAKE_CURRENT_BINARY_DIR}) + if(CMAKE_GENERATOR STREQUAL "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL "MinGW Makefiles") + set(_clean_command make clean) + elseif(CMAKE_GENERATOR STREQUAL "NMake Makefiles") + set(_clean_command nmake /nologo clean) + elseif(CMAKE_GENERATOR STREQUAL "Ninja") + set(_clean_command ninja -t clean ${_target}) + set(_clean_working_directory ${REACTOS_BINARY_DIR}) + endif() + add_custom_target(${_target}_clean + COMMAND ${_clean_command} + WORKING_DIRECTORY ${_clean_working_directory} + COMMENT "Cleaning ${_target}") endfunction() if(NOT MSVC_IDE)

1 0

[tkreuzer] 56297: [DESK] Fix a typo. Part of an old patch by Carlo Bramini. See issue #3158 for more details.
by tkreuzer＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: tkreuzer Date: Sun Apr 1 10:02:50 2012 New Revision: 56297 URL: http://svn.reactos.org/svn/reactos?rev=56297&view=rev Log: [DESK] Fix a typo. Part of an old patch by Carlo Bramini. See issue #3158 for more details. Modified: trunk/reactos/include/reactos/dll/desk/deskcplx.h Modified: trunk/reactos/include/reactos/dll/desk/deskcplx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/desk/d… ============================================================================== --- trunk/reactos/include/reactos/dll/desk/deskcplx.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/dll/desk/deskcplx.h [iso-8859-1] Sun Apr 1 10:02:50 2012 @@ -107,7 +107,7 @@ #ifdef UNICODE wcscpy(lpStr, lpRecvBuffer); #else - WideCharToMultiByte(CP_APC, 0, lpRecvBuffer, -1, lpStr, BufLen, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, lpRecvBuffer, -1, lpStr, BufLen, NULL, NULL); #endif }

1 0

[sir_richard] 56296: [NTOS]: Fix a typo spotted by Stefan.
by sir_richard＠svn.reactos.org 31 Mar '12

31 Mar '12

Author: sir_richard Date: Sat Mar 31 22:45:17 2012 New Revision: 56296 URL: http://svn.reactos.org/svn/reactos?rev=56296&view=rev Log: [NTOS]: Fix a typo spotted by Stefan. 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] Sat Mar 31 22:45:17 2012 @@ -1130,7 +1130,7 @@ MiCheckPdeForPagedPool(Address); #endif /* Has the code above changed anything -- is this now a valid PTE? */ - Status = (PointerPte->u.Hard.Valid == 1) ? STATUS_SUCCESS : STATUS_ACCESS_VIOLATION; + Status = (PointerPde->u.Hard.Valid == 1) ? STATUS_SUCCESS : STATUS_ACCESS_VIOLATION; /* Either this was a bogus VA or we've fixed up a paged pool PDE */ MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread);

1 0

[akhaldi] 56295: [CMAKE] * Revert back to the old def handling for now, we'll get to tackle that later.
by akhaldi＠svn.reactos.org 31 Mar '12

31 Mar '12

Author: akhaldi Date: Sat Mar 31 21:52:09 2012 New Revision: 56295 URL: http://svn.reactos.org/svn/reactos?rev=56295&view=rev Log: [CMAKE] * Revert back to the old def handling for now, we'll get to tackle that later. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=56295… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Mar 31 21:52:09 2012 @@ -153,9 +153,8 @@ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES EXTERNAL_OBJECT TRUE) - - if(__add_importlib) + + if(__add_importlib) # Generate the asm stub file and the export def file for import library add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_stubs.asm ${CMAKE_CURRENT_BINARY_DIR}/lib${_file}_exp.def

1 0

[akhaldi] 56294: [CMAKE] * Set the def file as an external object in msvc builds too.
by akhaldi＠svn.reactos.org 31 Mar '12

31 Mar '12

Author: akhaldi Date: Sat Mar 31 21:34:51 2012 New Revision: 56294 URL: http://svn.reactos.org/svn/reactos?rev=56294&view=rev Log: [CMAKE] * Set the def file as an external object in msvc builds too. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=56294… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Mar 31 21:34:51 2012 @@ -153,6 +153,7 @@ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def PROPERTIES EXTERNAL_OBJECT TRUE) if(__add_importlib) # Generate the asm stub file and the export def file for import library

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