Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 56314: [NDK] A number of fixes for Vista/Win7, now all C_ASSERTs pass
by tkreuzer＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: tkreuzer Date: Sun Apr 1 22:25:05 2012 New Revision: 56314 URL: http://svn.reactos.org/svn/reactos?rev=56314&view=rev Log: [NDK] A number of fixes for Vista/Win7, now all C_ASSERTs pass 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 22:25:05 2012 @@ -682,6 +682,42 @@ UCHAR Spare:2; } KEXECUTE_OPTIONS, *PKEXECUTE_OPTIONS; +#if (NTDDI_VERSION >= NTDDI_WIN7) +typedef union _KWAIT_STATUS_REGISTER +{ + UCHAR Flags; + struct + { + UCHAR State:2; + UCHAR Affinity:1; + UCHAR Priority:1; + UCHAR Apc:1; + UCHAR UserApc:1; + UCHAR Alert:1; + UCHAR Unused:1; + }; +} KWAIT_STATUS_REGISTER, *PKWAIT_STATUS_REGISTER; + +typedef struct _COUNTER_READING +{ + enum _HARDWARE_COUNTER_TYPE Type; + ULONG Index; + ULONG64 Start; + ULONG64 Total; +}COUNTER_READING, *PCOUNTER_READING; + +typedef struct _KTHREAD_COUNTERS +{ + ULONG64 WaitReasonBitMap; + struct _THREAD_PERFORMANCE_DATA* UserData; + ULONG Flags; + ULONG ContextSwitches; + ULONG64 CycleTimeBias; + ULONG64 HardwareCounters; + COUNTER_READING HwCounter[16]; +}KTHREAD_COUNTERS, *PKTHREAD_COUNTERS; +#endif + // // Kernel Thread (KTHREAD) // @@ -735,15 +771,20 @@ UCHAR ApcStateFill[FIELD_OFFSET(KAPC_STATE, UserApcPending) + 1]; #if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ SCHAR Priority; +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + /* On x86, the following members "fall out" of the union */ + volatile ULONG NextProcessor; + volatile ULONG DeferredProcessor; +#else // ][ + /* On x86, the following members "fall out" of the union */ + volatile USHORT NextProcessor; + volatile USHORT DeferredProcessor; +#endif // ] #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 // ] @@ -787,8 +828,10 @@ BOOLEAN WaitNext; #endif // ] UCHAR WaitReason; +#if (NTDDI_VERSION < NTDDI_LONGHORN) SCHAR Priority; BOOLEAN EnableStackSwap; +#endif // ] volatile UCHAR SwapBusy; BOOLEAN Alerted[MaximumMode]; #endif // ] @@ -824,13 +867,14 @@ #if !defined(_WIN64) // [ }; }; +#endif // ] #endif // ] union { struct { - LONG AutoAlignment:1; - LONG DisableBoost:1; + ULONG AutoAlignment:1; + ULONG DisableBoost:1; #if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ ULONG EtwStackTraceApc1Inserted:1; ULONG EtwStackTraceApc2Inserted:1; @@ -846,9 +890,15 @@ }; LONG ThreadFlags; }; +#if defined(_WIN64) && (NTDDI_VERSION < NTDDI_WIN7) // [ + }; + }; +#endif // ] +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ #if defined(_WIN64) // [ - }; - }; + ULONG Spare0; +#else // ][ + PVOID ServiceTable; #endif // ] #endif // ] union @@ -899,9 +949,21 @@ UCHAR WaitBlockFill6[2 * sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareLong)]; ULONG WaitTime; }; - struct - { +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + struct + { + UCHAR WaitBlockFill7[168]; + PVOID TebMappedLowVa; + struct _UMS_CONTROL_BLOCK* Ucb; + }; +#endif // ] + struct + { +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + UCHAR WaitBlockFill8[188]; +#else // ][ UCHAR WaitBlockFill7[3 * sizeof(KWAIT_BLOCK) + FIELD_OFFSET(KWAIT_BLOCK, SpareLong)]; +#endif // ] union { struct @@ -921,7 +983,7 @@ union // 2 elements, 0x8 bytes (sizeof) { PVOID CallbackStack; - ULONG64 CallbackDepth; + ULONG_PTR CallbackDepth; }; #else // ][ PVOID CallbackStack; @@ -949,24 +1011,30 @@ BOOLEAN Preempted; UCHAR AdjustReason; CHAR AdjustIncrement; - UINT8 Spare01; +#if (NTDDI_VERSION >= NTDDI_WIN7) + UCHAR PreviousMode; +#else + UCHAR Spare01; +#endif #endif // ] CHAR Saturation; #if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ ULONG SystemCallNumber; #if (NTDDI_VERSION >= NTDDI_WIN7) // [ - ULONG2 FreezeCount; -#else // ][ - ULONG Spare2; -#endif // ] -#endif // ] - KAFFINITY UserAffinity; + ULONG FreezeCount; +#else // ][ + ULONG Spare02; +#endif // ] +#endif // ] +#if (NTDDI_VERSION >= NTDDI_WIN7) // [ + GROUP_AFFINITY UserAffinity; struct _KPROCESS *Process; -#if (NTDDI_VERSION >= NTDDI_WIN7) // [ GROUP_AFFINITY Affinity; ULONG IdealProcessor; ULONG UserIdealProcessor; #else // ][ + KAFFINITY UserAffinity; + struct _KPROCESS *Process; KAFFINITY Affinity; #endif // ] PKAPC_STATE ApcStatePointer[2]; @@ -993,7 +1061,7 @@ #endif // ] #if (NTDDI_VERSION >= NTDDI_WIN7) // [ #elif (NTDDI_VERSION >= NTDDI_LONGHORN) // ][ - UCHAR Spare3; + UCHAR Spare03; #else // ][ UCHAR CalloutActive; #endif // ] @@ -1096,7 +1164,7 @@ PKTHREAD_COUNTERS ThreadCounters; PXSTATE_SAVE XStateSave; #elif (NTDDI_VERSION >= NTDDI_LONGHORN) // ][ - PVOID MdlForLockedteb; + PVOID MdlForLockedTeb; #endif // ] } KTHREAD; @@ -1159,9 +1227,9 @@ }; ULONG StackCount; LIST_ENTRY ProcessListEntry; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#if (NTDDI_VERSION >= NTDDI_LONGHORN) // [ ULONGLONG CycleTime; -#endif +#endif // ] } KPROCESS; #define ASSERT_PROCESS(object) \

1 0

[tkreuzer] 56313: [NDK] Add structure layout tests for KTHREAD
by tkreuzer＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: tkreuzer Date: Sun Apr 1 22:19:32 2012 New Revision: 56313 URL: http://svn.reactos.org/svn/reactos?rev=56313&view=rev Log: [NDK] Add structure layout tests for KTHREAD Added: trunk/reactos/include/ndk/tests/ (with props) trunk/reactos/include/ndk/tests/CMakeLists.txt (with props) trunk/reactos/include/ndk/tests/win2003_x64.c (with props) trunk/reactos/include/ndk/tests/win2003_x86.c (with props) trunk/reactos/include/ndk/tests/win7_x64.c (with props) trunk/reactos/include/ndk/tests/win7_x86.c (with props) trunk/reactos/include/ndk/tests/winvista_x64.c (with props) trunk/reactos/include/ndk/tests/winvista_x86.c (with props) Propchange: trunk/reactos/include/ndk/tests/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Apr 1 22:19:32 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/include/ndk/tests/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/include/ndk/tests/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/include/ndk/tests/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/include/ndk/tests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/CMakeLis… ============================================================================== --- trunk/reactos/include/ndk/tests/CMakeLists.txt (added) +++ trunk/reactos/include/ndk/tests/CMakeLists.txt [iso-8859-1] Sun Apr 1 22:19:32 2012 @@ -1,0 +1,12 @@ + +if(ARCH MATCHES amd64) +add_library(ndk_tests + win2003_x64.c + winvista_x64.c + win7_x64.c) +else() +add_library(ndk_tests + win2003_x86.c + winvista_x86.c + win7_x86.c) +endif() Propchange: trunk/reactos/include/ndk/tests/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/ndk/tests/win2003_x64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/win2003_… ============================================================================== --- trunk/reactos/include/ndk/tests/win2003_x64.c (added) +++ trunk/reactos/include/ndk/tests/win2003_x64.c [iso-8859-1] Sun Apr 1 22:19:32 2012 @@ -1,0 +1,121 @@ +/* Version definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WS03SP1 +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WS03 + +#include <ntifs.h> +#include <ndk/ntndk.h> + +#define C_ASSERT_FIELD(Type, Offset, MemberType, MemberName) C_ASSERT(FIELD_OFFSET(Type, MemberName) == Offset); + +/* KTHREAD */ +C_ASSERT_FIELD(KTHREAD, 0x000, DISPATCHER_HEADER, Header) +C_ASSERT_FIELD(KTHREAD, 0x018, LIST_ENTRY, MutantListHead) +C_ASSERT_FIELD(KTHREAD, 0x028, PVOID, InitialStack) +C_ASSERT_FIELD(KTHREAD, 0x030, PVOID, StackLimit) +C_ASSERT_FIELD(KTHREAD, 0x038, PVOID, KernelStack) +C_ASSERT_FIELD(KTHREAD, 0x040, ULONG64, ThreadLock) +C_ASSERT_FIELD(KTHREAD, 0x048, KAPC_STATE, ApcState) +C_ASSERT_FIELD(KTHREAD, 0x048, UCHAR, ApcStateFill) +C_ASSERT_FIELD(KTHREAD, 0x073, UCHAR, ApcQueueable) +C_ASSERT_FIELD(KTHREAD, 0x074, UCHAR, NextProcessor) +C_ASSERT_FIELD(KTHREAD, 0x075, UCHAR, DeferredProcessor) +C_ASSERT_FIELD(KTHREAD, 0x076, UCHAR, AdjustReason) +C_ASSERT_FIELD(KTHREAD, 0x077, CHAR, AdjustIncrement) +C_ASSERT_FIELD(KTHREAD, 0x078, ULONG64, ApcQueueLock) +C_ASSERT_FIELD(KTHREAD, 0x080, LONG64, WaitStatus) +C_ASSERT_FIELD(KTHREAD, 0x088, KWAIT_BLOCK*, WaitBlockList) +C_ASSERT_FIELD(KTHREAD, 0x088, KGATE*, GateObject) +C_ASSERT_FIELD(KTHREAD, 0x090, UCHAR, Alertable) +C_ASSERT_FIELD(KTHREAD, 0x091, UCHAR, WaitNext) +C_ASSERT_FIELD(KTHREAD, 0x092, UCHAR, WaitReason) +C_ASSERT_FIELD(KTHREAD, 0x093, CHAR, Priority) +C_ASSERT_FIELD(KTHREAD, 0x094, UCHAR, EnableStackSwap) +C_ASSERT_FIELD(KTHREAD, 0x095, UCHAR, SwapBusy) +C_ASSERT_FIELD(KTHREAD, 0x096, UCHAR, Alerted) +C_ASSERT_FIELD(KTHREAD, 0x098, LIST_ENTRY, WaitListEntry) +C_ASSERT_FIELD(KTHREAD, 0x098, SINGLE_LIST_ENTRY, SwapListEntry) +C_ASSERT_FIELD(KTHREAD, 0x0A8, KQUEUE*, Queue) +C_ASSERT_FIELD(KTHREAD, 0x0B0, PVOID, Teb) +C_ASSERT_FIELD(KTHREAD, 0x0B8, KTIMER, Timer) +C_ASSERT_FIELD(KTHREAD, 0x0B8, UCHAR, TimerFill) +C_ASSERT_FIELD(KTHREAD, 0x0F4, LONG, ThreadFlags) +C_ASSERT_FIELD(KTHREAD, 0x0F8, KWAIT_BLOCK, WaitBlock) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill0) +C_ASSERT_FIELD(KTHREAD, 0x123, UCHAR, SystemAffinityActive) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill1) +C_ASSERT_FIELD(KTHREAD, 0x153, CHAR, PreviousMode) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill2) +C_ASSERT_FIELD(KTHREAD, 0x183, UCHAR, ResourceIndex) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill3) +C_ASSERT_FIELD(KTHREAD, 0x1B3, UCHAR, LargeStack) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill4) +C_ASSERT_FIELD(KTHREAD, 0x124, ULONG, ContextSwitches) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill5) +C_ASSERT_FIELD(KTHREAD, 0x154, UCHAR, State) +C_ASSERT_FIELD(KTHREAD, 0x155, UCHAR, NpxState) +C_ASSERT_FIELD(KTHREAD, 0x156, UCHAR, WaitIrql) +C_ASSERT_FIELD(KTHREAD, 0x157, CHAR, WaitMode) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill6) +C_ASSERT_FIELD(KTHREAD, 0x184, ULONG, WaitTime) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill7) +C_ASSERT_FIELD(KTHREAD, 0x1B4, SHORT, KernelApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1B6, SHORT, SpecialApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1B4, ULONG, CombinedApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1B8, LIST_ENTRY, QueueListEntry) +C_ASSERT_FIELD(KTHREAD, 0x1C8, KTRAP_FRAME*, TrapFrame) +C_ASSERT_FIELD(KTHREAD, 0x1D0, PVOID, CallbackStack) +C_ASSERT_FIELD(KTHREAD, 0x1D8, PVOID, ServiceTable) +C_ASSERT_FIELD(KTHREAD, 0x1E0, ULONG, KernelLimit) +C_ASSERT_FIELD(KTHREAD, 0x1E4, UCHAR, ApcStateIndex) +C_ASSERT_FIELD(KTHREAD, 0x1E5, UCHAR, IdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x1E6, UCHAR, Preempted) +C_ASSERT_FIELD(KTHREAD, 0x1E7, UCHAR, ProcessReadyQueue) +C_ASSERT_FIELD(KTHREAD, 0x1E8, PVOID, Win32kTable) +C_ASSERT_FIELD(KTHREAD, 0x1F0, ULONG, Win32kLimit) +C_ASSERT_FIELD(KTHREAD, 0x1F4, UCHAR, KernelStackResident) +C_ASSERT_FIELD(KTHREAD, 0x1F5, CHAR, BasePriority) +C_ASSERT_FIELD(KTHREAD, 0x1F6, CHAR, PriorityDecrement) +C_ASSERT_FIELD(KTHREAD, 0x1F7, CHAR, Saturation) +C_ASSERT_FIELD(KTHREAD, 0x1F8, ULONG64, UserAffinity) +C_ASSERT_FIELD(KTHREAD, 0x200, KPROCESS*, Process) +C_ASSERT_FIELD(KTHREAD, 0x208, ULONG64, Affinity) +C_ASSERT_FIELD(KTHREAD, 0x210, KAPC_STATE*, ApcStatePointer) +C_ASSERT_FIELD(KTHREAD, 0x220, KAPC_STATE, SavedApcState) +C_ASSERT_FIELD(KTHREAD, 0x220, UCHAR, SavedApcStateFill) +C_ASSERT_FIELD(KTHREAD, 0x24B, CHAR, FreezeCount) +C_ASSERT_FIELD(KTHREAD, 0x24C, CHAR, SuspendCount) +C_ASSERT_FIELD(KTHREAD, 0x24D, UCHAR, UserIdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x24E, UCHAR, CalloutActive) +C_ASSERT_FIELD(KTHREAD, 0x24F, UCHAR, CodePatchInProgress) +C_ASSERT_FIELD(KTHREAD, 0x250, PVOID, Win32Thread) +C_ASSERT_FIELD(KTHREAD, 0x258, PVOID, StackBase) +C_ASSERT_FIELD(KTHREAD, 0x260, KAPC, SuspendApc) +C_ASSERT_FIELD(KTHREAD, 0x260, UCHAR, SuspendApcFill0) +C_ASSERT_FIELD(KTHREAD, 0x261, CHAR, Quantum) +C_ASSERT_FIELD(KTHREAD, 0x260, UCHAR, SuspendApcFill1) +C_ASSERT_FIELD(KTHREAD, 0x263, UCHAR, QuantumReset) +C_ASSERT_FIELD(KTHREAD, 0x260, UCHAR, SuspendApcFill2) +C_ASSERT_FIELD(KTHREAD, 0x264, ULONG, KernelTime) +C_ASSERT_FIELD(KTHREAD, 0x260, UCHAR, SuspendApcFill3) +C_ASSERT_FIELD(KTHREAD, 0x2A0, PVOID, TlsArray) +C_ASSERT_FIELD(KTHREAD, 0x260, UCHAR, SuspendApcFill4) +C_ASSERT_FIELD(KTHREAD, 0x2A8, PVOID, LegoData) +C_ASSERT_FIELD(KTHREAD, 0x260, UCHAR, SuspendApcFill5) +C_ASSERT_FIELD(KTHREAD, 0x2B3, UCHAR, PowerState) +C_ASSERT_FIELD(KTHREAD, 0x2B4, ULONG, UserTime) +C_ASSERT_FIELD(KTHREAD, 0x2B8, KSEMAPHORE, SuspendSemaphore) +C_ASSERT_FIELD(KTHREAD, 0x2B8, UCHAR, SuspendSemaphorefill) +C_ASSERT_FIELD(KTHREAD, 0x2D4, ULONG, SListFaultCount) +C_ASSERT_FIELD(KTHREAD, 0x2D8, LIST_ENTRY, ThreadListEntry) +C_ASSERT_FIELD(KTHREAD, 0x2E8, PVOID, SListFaultAddress) +C_ASSERT_FIELD(KTHREAD, 0x2F0, LONG64, ReadOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x2F8, LONG64, WriteOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x300, LONG64, OtherOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x308, LONG64, ReadTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x310, LONG64, WriteTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x318, LONG64, OtherTransferCount) + + + Propchange: trunk/reactos/include/ndk/tests/win2003_x64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/ndk/tests/win2003_x86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/win2003_… ============================================================================== --- trunk/reactos/include/ndk/tests/win2003_x86.c (added) +++ trunk/reactos/include/ndk/tests/win2003_x86.c [iso-8859-1] Sun Apr 1 22:19:32 2012 @@ -1,0 +1,88 @@ +/* Version definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WS03SP1 +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WS03 + +#include <ntifs.h> +#include <ndk/ntndk.h> + +#define C_ASSERT_FIELD(Type, Offset, MemberType, MemberName) C_ASSERT(FIELD_OFFSET(Type, MemberName) == Offset); + +/* KTHREAD */ +C_ASSERT_FIELD(KTHREAD, 0x000, DISPATCHER_HEADER, Header) +C_ASSERT_FIELD(KTHREAD, 0x010, LIST_ENTRY, MutantListHead) +C_ASSERT_FIELD(KTHREAD, 0x018, PVOID, InitialStack) +C_ASSERT_FIELD(KTHREAD, 0x01C, PVOID, StackLimit) +C_ASSERT_FIELD(KTHREAD, 0x020, PVOID, KernelStack) +C_ASSERT_FIELD(KTHREAD, 0x024, ULONG, ThreadLock) +C_ASSERT_FIELD(KTHREAD, 0x028, KAPC_STATE, ApcState) +C_ASSERT_FIELD(KTHREAD, 0x028, UCHAR, ApcStateFill) +C_ASSERT_FIELD(KTHREAD, 0x03F, UCHAR, ApcQueueable) +C_ASSERT_FIELD(KTHREAD, 0x040, UCHAR, NextProcessor) +C_ASSERT_FIELD(KTHREAD, 0x041, UCHAR, DeferredProcessor) +C_ASSERT_FIELD(KTHREAD, 0x042, UCHAR, AdjustReason) +C_ASSERT_FIELD(KTHREAD, 0x043, CHAR, AdjustIncrement) +C_ASSERT_FIELD(KTHREAD, 0x044, ULONG, ApcQueueLock) +C_ASSERT_FIELD(KTHREAD, 0x048, ULONG, ContextSwitches) +C_ASSERT_FIELD(KTHREAD, 0x04C, UCHAR, State) +C_ASSERT_FIELD(KTHREAD, 0x04D, UCHAR, NpxState) +C_ASSERT_FIELD(KTHREAD, 0x04E, UCHAR, WaitIrql) +C_ASSERT_FIELD(KTHREAD, 0x04F, CHAR, WaitMode) +C_ASSERT_FIELD(KTHREAD, 0x050, LONG, WaitStatus) +C_ASSERT_FIELD(KTHREAD, 0x054, PKWAIT_BLOCK, WaitBlockList) +C_ASSERT_FIELD(KTHREAD, 0x054, PKGATE, GateObject) +C_ASSERT_FIELD(KTHREAD, 0x058, UCHAR, Alertable) +C_ASSERT_FIELD(KTHREAD, 0x059, UCHAR, WaitNext) +C_ASSERT_FIELD(KTHREAD, 0x05A, UCHAR, WaitReason) +C_ASSERT_FIELD(KTHREAD, 0x05B, CHAR, Priority) +C_ASSERT_FIELD(KTHREAD, 0x05C, UCHAR, EnableStackSwap) +C_ASSERT_FIELD(KTHREAD, 0x05D, UCHAR, SwapBusy) +C_ASSERT_FIELD(KTHREAD, 0x05E, UCHAR, Alerted) +C_ASSERT_FIELD(KTHREAD, 0x060, LIST_ENTRY, WaitListEntry) +C_ASSERT_FIELD(KTHREAD, 0x060, SINGLE_LIST_ENTRY, SwapListEntry) +C_ASSERT_FIELD(KTHREAD, 0x068, KQUEUE*, Queue) +C_ASSERT_FIELD(KTHREAD, 0x06C, ULONG, WaitTime) +C_ASSERT_FIELD(KTHREAD, 0x070, INT16, KernelApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x072, INT16, SpecialApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x070, ULONG, CombinedApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x074, PVOID, Teb) +C_ASSERT_FIELD(KTHREAD, 0x078, KTIMER, Timer) +C_ASSERT_FIELD(KTHREAD, 0x078, UCHAR, TimerFill) +//C_ASSERT_FIELD(KTHREAD, 0x0A0, LONG, AutoAlignment) +//C_ASSERT_FIELD(KTHREAD, 0x0A0, LONG, DisableBoost) +//C_ASSERT_FIELD(KTHREAD, 0x0A0, LONG, ReservedFlags) +C_ASSERT_FIELD(KTHREAD, 0x0A0, LONG, ThreadFlags) +C_ASSERT_FIELD(KTHREAD, 0x0A8, KWAIT_BLOCK, WaitBlock) +C_ASSERT_FIELD(KTHREAD, 0x0A8, UCHAR, WaitBlockFill0) +C_ASSERT_FIELD(KTHREAD, 0x0BF, UCHAR, SystemAffinityActive) +C_ASSERT_FIELD(KTHREAD, 0x0A8, UCHAR, WaitBlockFill1) +C_ASSERT_FIELD(KTHREAD, 0x0D7, CHAR, PreviousMode) +C_ASSERT_FIELD(KTHREAD, 0x0A8, UCHAR, WaitBlockFill2) +C_ASSERT_FIELD(KTHREAD, 0x0EF, UCHAR, ResourceIndex) +C_ASSERT_FIELD(KTHREAD, 0x0A8, UCHAR, WaitBlockFill3) +C_ASSERT_FIELD(KTHREAD, 0x107, UCHAR, LargeStack) +C_ASSERT_FIELD(KTHREAD, 0x108, LIST_ENTRY, QueueListEntry) +C_ASSERT_FIELD(KTHREAD, 0x110, PKTRAP_FRAME, TrapFrame) +C_ASSERT_FIELD(KTHREAD, 0x114, PVOID, CallbackStack) +C_ASSERT_FIELD(KTHREAD, 0x118, PVOID, ServiceTable) +C_ASSERT_FIELD(KTHREAD, 0x11C, UCHAR, ApcStateIndex) +C_ASSERT_FIELD(KTHREAD, 0x11D, UCHAR, IdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x11E, UCHAR, Preempted) +C_ASSERT_FIELD(KTHREAD, 0x11F, UCHAR, ProcessReadyQueue) +C_ASSERT_FIELD(KTHREAD, 0x120, UCHAR, KernelStackResident) +C_ASSERT_FIELD(KTHREAD, 0x121, CHAR, BasePriority) +C_ASSERT_FIELD(KTHREAD, 0x122, CHAR, PriorityDecrement) +C_ASSERT_FIELD(KTHREAD, 0x123, CHAR, Saturation) +C_ASSERT_FIELD(KTHREAD, 0x124, ULONG, UserAffinity) +C_ASSERT_FIELD(KTHREAD, 0x128, PKPROCESS, Process) +C_ASSERT_FIELD(KTHREAD, 0x12C, ULONG, Affinity) +C_ASSERT_FIELD(KTHREAD, 0x130, PKAPC_STATE, ApcStatePointer) +C_ASSERT_FIELD(KTHREAD, 0x138, KAPC_STATE, SavedApcState) +C_ASSERT_FIELD(KTHREAD, 0x138, UCHAR, SavedApcStateFill) +C_ASSERT_FIELD(KTHREAD, 0x14F, CHAR, FreezeCount) +C_ASSERT_FIELD(KTHREAD, 0x150, CHAR, SuspendCount) +C_ASSERT_FIELD(KTHREAD, 0x151, UCHAR, UserIdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x152, UCHAR, CalloutActive) +C_ASSERT_FIELD(KTHREAD, 0x153, UCHAR, Iopl) + Propchange: trunk/reactos/include/ndk/tests/win2003_x86.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/ndk/tests/win7_x64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/win7_x64… ============================================================================== --- trunk/reactos/include/ndk/tests/win7_x64.c (added) +++ trunk/reactos/include/ndk/tests/win7_x64.c [iso-8859-1] Sun Apr 1 22:19:32 2012 @@ -1,0 +1,113 @@ +/* Version definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WIN7 +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WIN7 + +#include <ntifs.h> +#include <ndk/ntndk.h> + +#define C_ASSERT_FIELD(Type, Offset, MemberType, MemberName) C_ASSERT(FIELD_OFFSET(Type, MemberName) == Offset); + +/* KTHREAD */ + +C_ASSERT_FIELD(KTHREAD, 0x000, DISPATCHER_HEADER, Header) +C_ASSERT_FIELD(KTHREAD, 0x018, ULONG64, CycleTime) +C_ASSERT_FIELD(KTHREAD, 0x020, ULONG64, QuantumTarget) +C_ASSERT_FIELD(KTHREAD, 0x028, PVOID, InitialStack) +C_ASSERT_FIELD(KTHREAD, 0x030, PVOID, StackLimit) +C_ASSERT_FIELD(KTHREAD, 0x038, PVOID, KernelStack) +C_ASSERT_FIELD(KTHREAD, 0x040, ULONG64, ThreadLock) +C_ASSERT_FIELD(KTHREAD, 0x048, KWAIT_STATUS_REGISTER, WaitRegister) +C_ASSERT_FIELD(KTHREAD, 0x049, UCHAR, Running) +C_ASSERT_FIELD(KTHREAD, 0x04A, UCHAR, Alerted) +C_ASSERT_FIELD(KTHREAD, 0x04C, LONG, MiscFlags) +C_ASSERT_FIELD(KTHREAD, 0x050, KAPC_STATE, ApcState) +C_ASSERT_FIELD(KTHREAD, 0x050, UCHAR, ApcStateFill) +C_ASSERT_FIELD(KTHREAD, 0x07B, CHAR, Priority) +C_ASSERT_FIELD(KTHREAD, 0x07C, ULONG, NextProcessor) +C_ASSERT_FIELD(KTHREAD, 0x080, ULONG, DeferredProcessor) +C_ASSERT_FIELD(KTHREAD, 0x088, ULONG64, ApcQueueLock) +C_ASSERT_FIELD(KTHREAD, 0x090, LONG64, WaitStatus) +C_ASSERT_FIELD(KTHREAD, 0x098, KWAIT_BLOCK*, WaitBlockList) +C_ASSERT_FIELD(KTHREAD, 0x0A0, LIST_ENTRY, WaitListEntry) +C_ASSERT_FIELD(KTHREAD, 0x0A0, SINGLE_LIST_ENTRY, SwapListEntry) +C_ASSERT_FIELD(KTHREAD, 0x0B0, KQUEUE*, Queue) +C_ASSERT_FIELD(KTHREAD, 0x0B8, PVOID, Teb) +C_ASSERT_FIELD(KTHREAD, 0x0C0, KTIMER, Timer) +C_ASSERT_FIELD(KTHREAD, 0x100, LONG, ThreadFlags) +C_ASSERT_FIELD(KTHREAD, 0x104, ULONG, Spare0) +C_ASSERT_FIELD(KTHREAD, 0x108, KWAIT_BLOCK, WaitBlock) +C_ASSERT_FIELD(KTHREAD, 0x108, UCHAR, WaitBlockFill4) +C_ASSERT_FIELD(KTHREAD, 0x134, ULONG, ContextSwitches) +C_ASSERT_FIELD(KTHREAD, 0x108, UCHAR, WaitBlockFill5) +C_ASSERT_FIELD(KTHREAD, 0x164, UCHAR, State) +C_ASSERT_FIELD(KTHREAD, 0x165, CHAR, NpxState) +C_ASSERT_FIELD(KTHREAD, 0x166, UCHAR, WaitIrql) +C_ASSERT_FIELD(KTHREAD, 0x167, CHAR, WaitMode) +C_ASSERT_FIELD(KTHREAD, 0x108, UCHAR, WaitBlockFill6) +C_ASSERT_FIELD(KTHREAD, 0x194, ULONG, WaitTime) +C_ASSERT_FIELD(KTHREAD, 0x108, UCHAR, WaitBlockFill7) +C_ASSERT_FIELD(KTHREAD, 0x1B0, PVOID, TebMappedLowVa) +C_ASSERT_FIELD(KTHREAD, 0x1B8, UMS_CONTROL_BLOCK*, Ucb) +C_ASSERT_FIELD(KTHREAD, 0x108, UCHAR, WaitBlockFill8) +C_ASSERT_FIELD(KTHREAD, 0x1C4, SHORT, KernelApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1C6, SHORT, SpecialApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1C4, ULONG, CombinedApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1C8, LIST_ENTRY, QueueListEntry) +C_ASSERT_FIELD(KTHREAD, 0x1D8, KTRAP_FRAME*, TrapFrame) +C_ASSERT_FIELD(KTHREAD, 0x1E0, PVOID, FirstArgument) +C_ASSERT_FIELD(KTHREAD, 0x1E8, PVOID, CallbackStack) +C_ASSERT_FIELD(KTHREAD, 0x1E8, ULONG64, CallbackDepth) +C_ASSERT_FIELD(KTHREAD, 0x1F0, UCHAR, ApcStateIndex) +C_ASSERT_FIELD(KTHREAD, 0x1F1, CHAR, BasePriority) +C_ASSERT_FIELD(KTHREAD, 0x1F2, CHAR, PriorityDecrement) +C_ASSERT_FIELD(KTHREAD, 0x1F3, UCHAR, Preempted) +C_ASSERT_FIELD(KTHREAD, 0x1F4, UCHAR, AdjustReason) +C_ASSERT_FIELD(KTHREAD, 0x1F5, CHAR, AdjustIncrement) +C_ASSERT_FIELD(KTHREAD, 0x1F6, CHAR, PreviousMode) +C_ASSERT_FIELD(KTHREAD, 0x1F7, CHAR, Saturation) +C_ASSERT_FIELD(KTHREAD, 0x1F8, ULONG, SystemCallNumber) +C_ASSERT_FIELD(KTHREAD, 0x1FC, ULONG, FreezeCount) +C_ASSERT_FIELD(KTHREAD, 0x200, GROUP_AFFINITY, UserAffinity) +C_ASSERT_FIELD(KTHREAD, 0x210, KPROCESS*, Process) +C_ASSERT_FIELD(KTHREAD, 0x218, GROUP_AFFINITY, Affinity) +C_ASSERT_FIELD(KTHREAD, 0x228, ULONG, IdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x22C, ULONG, UserIdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x230, KAPC_STATE*, ApcStatePointer) +C_ASSERT_FIELD(KTHREAD, 0x240, KAPC_STATE, SavedApcState) +C_ASSERT_FIELD(KTHREAD, 0x240, UCHAR, SavedApcStateFill) +C_ASSERT_FIELD(KTHREAD, 0x26B, UCHAR, WaitReason) +C_ASSERT_FIELD(KTHREAD, 0x26C, CHAR, SuspendCount) +C_ASSERT_FIELD(KTHREAD, 0x26D, CHAR, Spare1) +C_ASSERT_FIELD(KTHREAD, 0x26E, UCHAR, CodePatchInProgress) +C_ASSERT_FIELD(KTHREAD, 0x270, PVOID, Win32Thread) +C_ASSERT_FIELD(KTHREAD, 0x278, PVOID, StackBase) +C_ASSERT_FIELD(KTHREAD, 0x280, KAPC, SuspendApc) +C_ASSERT_FIELD(KTHREAD, 0x280, UCHAR, SuspendApcFill0) +C_ASSERT_FIELD(KTHREAD, 0x281, UCHAR, ResourceIndex) +C_ASSERT_FIELD(KTHREAD, 0x280, UCHAR, SuspendApcFill1) +C_ASSERT_FIELD(KTHREAD, 0x283, UCHAR, QuantumReset) +C_ASSERT_FIELD(KTHREAD, 0x280, UCHAR, SuspendApcFill2) +C_ASSERT_FIELD(KTHREAD, 0x284, ULONG, KernelTime) +C_ASSERT_FIELD(KTHREAD, 0x280, UCHAR, SuspendApcFill3) +C_ASSERT_FIELD(KTHREAD, 0x2C0, KPRCB*, WaitPrcb) +C_ASSERT_FIELD(KTHREAD, 0x280, UCHAR, SuspendApcFill4) +C_ASSERT_FIELD(KTHREAD, 0x2C8, PVOID, LegoData) +C_ASSERT_FIELD(KTHREAD, 0x280, UCHAR, SuspendApcFill5) +C_ASSERT_FIELD(KTHREAD, 0x2D3, UCHAR, LargeStack) +C_ASSERT_FIELD(KTHREAD, 0x2D4, ULONG, UserTime) +C_ASSERT_FIELD(KTHREAD, 0x2D8, KSEMAPHORE, SuspendSemaphore) +C_ASSERT_FIELD(KTHREAD, 0x2D8, UCHAR, SuspendSemaphorefill) +C_ASSERT_FIELD(KTHREAD, 0x2F4, ULONG, SListFaultCount) +C_ASSERT_FIELD(KTHREAD, 0x2F8, LIST_ENTRY, ThreadListEntry) +C_ASSERT_FIELD(KTHREAD, 0x308, LIST_ENTRY, MutantListHead) +C_ASSERT_FIELD(KTHREAD, 0x318, PVOID, SListFaultAddress) +C_ASSERT_FIELD(KTHREAD, 0x320, LONG64, ReadOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x328, LONG64, WriteOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x330, LONG64, OtherOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x338, LONG64, ReadTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x340, LONG64, WriteTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x348, LONG64, OtherTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x350, KTHREAD_COUNTERS*, ThreadCounters) +C_ASSERT_FIELD(KTHREAD, 0x358, XSTATE_SAVE*, XStateSave) Propchange: trunk/reactos/include/ndk/tests/win7_x64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/ndk/tests/win7_x86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/win7_x86… ============================================================================== --- trunk/reactos/include/ndk/tests/win7_x86.c (added) +++ trunk/reactos/include/ndk/tests/win7_x86.c [iso-8859-1] Sun Apr 1 22:19:32 2012 @@ -1,0 +1,100 @@ +/* Version definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WIN7 +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WIN7 + +#include <ntifs.h> +#include <ndk/ntndk.h> + +#define C_ASSERT_FIELD(Type, Offset, MemberType, MemberName) C_ASSERT(FIELD_OFFSET(Type, MemberName) == Offset); + +/* KTHREAD */ +C_ASSERT_FIELD(KTHREAD, 0x000, DISPATCHER_HEADER, Header) +C_ASSERT_FIELD(KTHREAD, 0x010, ULONG64, CycleTime) +C_ASSERT_FIELD(KTHREAD, 0x018, ULONG, HighCycleTime) +C_ASSERT_FIELD(KTHREAD, 0x020, ULONG64, QuantumTarget) +C_ASSERT_FIELD(KTHREAD, 0x028, PVOID, InitialStack) +C_ASSERT_FIELD(KTHREAD, 0x02C, PVOID, StackLimit) +C_ASSERT_FIELD(KTHREAD, 0x030, PVOID, KernelStack) +C_ASSERT_FIELD(KTHREAD, 0x034, ULONG, ThreadLock) +C_ASSERT_FIELD(KTHREAD, 0x038, KWAIT_STATUS_REGISTER, WaitRegister) +C_ASSERT_FIELD(KTHREAD, 0x039, UCHAR, Running) +C_ASSERT_FIELD(KTHREAD, 0x03A, UCHAR, Alerted) +C_ASSERT_FIELD(KTHREAD, 0x03C, LONG, MiscFlags) +C_ASSERT_FIELD(KTHREAD, 0x040, KAPC_STATE, ApcState) +C_ASSERT_FIELD(KTHREAD, 0x040, UCHAR, ApcStateFill) +C_ASSERT_FIELD(KTHREAD, 0x057, CHAR, Priority) +C_ASSERT_FIELD(KTHREAD, 0x058, ULONG, NextProcessor) +C_ASSERT_FIELD(KTHREAD, 0x05C, ULONG, DeferredProcessor) +C_ASSERT_FIELD(KTHREAD, 0x060, ULONG, ApcQueueLock) +C_ASSERT_FIELD(KTHREAD, 0x064, ULONG, ContextSwitches) +C_ASSERT_FIELD(KTHREAD, 0x068, UCHAR, State) +C_ASSERT_FIELD(KTHREAD, 0x069, CHAR, NpxState) +C_ASSERT_FIELD(KTHREAD, 0x06A, UCHAR, WaitIrql) +C_ASSERT_FIELD(KTHREAD, 0x06B, CHAR, WaitMode) +C_ASSERT_FIELD(KTHREAD, 0x06C, LONG, WaitStatus) +C_ASSERT_FIELD(KTHREAD, 0x070, KWAIT_BLOCK*, WaitBlockList) +C_ASSERT_FIELD(KTHREAD, 0x074, LIST_ENTRY, WaitListEntry) +C_ASSERT_FIELD(KTHREAD, 0x074, SINGLE_LIST_ENTRY, SwapListEntry) +C_ASSERT_FIELD(KTHREAD, 0x07C, KQUEUE*, Queue) +C_ASSERT_FIELD(KTHREAD, 0x080, ULONG, WaitTime) +C_ASSERT_FIELD(KTHREAD, 0x084, SHORT, KernelApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x086, SHORT, SpecialApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x084, ULONG, CombinedApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x088, PVOID, Teb) +C_ASSERT_FIELD(KTHREAD, 0x090, KTIMER, Timer) +C_ASSERT_FIELD(KTHREAD, 0x0B8, LONG, ThreadFlags) +C_ASSERT_FIELD(KTHREAD, 0x0BC, PVOID, ServiceTable) +C_ASSERT_FIELD(KTHREAD, 0x0C0, KWAIT_BLOCK, WaitBlock) +C_ASSERT_FIELD(KTHREAD, 0x120, LIST_ENTRY, QueueListEntry) +C_ASSERT_FIELD(KTHREAD, 0x128, KTRAP_FRAME*, TrapFrame) +C_ASSERT_FIELD(KTHREAD, 0x12C, PVOID, FirstArgument) +C_ASSERT_FIELD(KTHREAD, 0x130, PVOID, CallbackStack) +C_ASSERT_FIELD(KTHREAD, 0x130, ULONG, CallbackDepth) +C_ASSERT_FIELD(KTHREAD, 0x134, UCHAR, ApcStateIndex) +C_ASSERT_FIELD(KTHREAD, 0x135, CHAR, BasePriority) +C_ASSERT_FIELD(KTHREAD, 0x136, CHAR, PriorityDecrement) +C_ASSERT_FIELD(KTHREAD, 0x137, UCHAR, Preempted) +C_ASSERT_FIELD(KTHREAD, 0x138, UCHAR, AdjustReason) +C_ASSERT_FIELD(KTHREAD, 0x139, CHAR, AdjustIncrement) +C_ASSERT_FIELD(KTHREAD, 0x13A, CHAR, PreviousMode) +C_ASSERT_FIELD(KTHREAD, 0x13B, CHAR, Saturation) +C_ASSERT_FIELD(KTHREAD, 0x13C, ULONG, SystemCallNumber) +C_ASSERT_FIELD(KTHREAD, 0x140, ULONG, FreezeCount) +C_ASSERT_FIELD(KTHREAD, 0x144, GROUP_AFFINITY, UserAffinity) +C_ASSERT_FIELD(KTHREAD, 0x150, KPROCESS*, Process) +C_ASSERT_FIELD(KTHREAD, 0x154, GROUP_AFFINITY, Affinity) +C_ASSERT_FIELD(KTHREAD, 0x160, ULONG, IdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x164, ULONG, UserIdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x168, KAPC_STATE*, ApcStatePointer) +C_ASSERT_FIELD(KTHREAD, 0x170, KAPC_STATE, SavedApcState) +C_ASSERT_FIELD(KTHREAD, 0x170, UCHAR, SavedApcStateFill) +C_ASSERT_FIELD(KTHREAD, 0x187, UCHAR, WaitReason) +C_ASSERT_FIELD(KTHREAD, 0x188, CHAR, SuspendCount) +C_ASSERT_FIELD(KTHREAD, 0x189, CHAR, Spare1) +C_ASSERT_FIELD(KTHREAD, 0x18A, UCHAR, OtherPlatformFill) +C_ASSERT_FIELD(KTHREAD, 0x18C, PVOID, Win32Thread) +C_ASSERT_FIELD(KTHREAD, 0x190, PVOID, StackBase) +C_ASSERT_FIELD(KTHREAD, 0x194, KAPC, SuspendApc) +C_ASSERT_FIELD(KTHREAD, 0x194, UCHAR, SuspendApcFill0) +C_ASSERT_FIELD(KTHREAD, 0x195, UCHAR, ResourceIndex) +C_ASSERT_FIELD(KTHREAD, 0x194, UCHAR, SuspendApcFill1) +C_ASSERT_FIELD(KTHREAD, 0x197, UCHAR, QuantumReset) +C_ASSERT_FIELD(KTHREAD, 0x194, UCHAR, SuspendApcFill2) +C_ASSERT_FIELD(KTHREAD, 0x198, ULONG, KernelTime) +C_ASSERT_FIELD(KTHREAD, 0x194, UCHAR, SuspendApcFill3) +C_ASSERT_FIELD(KTHREAD, 0x1B8, KPRCB*, WaitPrcb) +C_ASSERT_FIELD(KTHREAD, 0x194, UCHAR, SuspendApcFill4) +C_ASSERT_FIELD(KTHREAD, 0x1BC, PVOID, LegoData) +C_ASSERT_FIELD(KTHREAD, 0x194, UCHAR, SuspendApcFill5) +C_ASSERT_FIELD(KTHREAD, 0x1C3, UCHAR, LargeStack) +C_ASSERT_FIELD(KTHREAD, 0x1C4, ULONG, UserTime) +C_ASSERT_FIELD(KTHREAD, 0x1C8, KSEMAPHORE, SuspendSemaphore) +C_ASSERT_FIELD(KTHREAD, 0x1C8, UCHAR, SuspendSemaphorefill) +C_ASSERT_FIELD(KTHREAD, 0x1DC, ULONG, SListFaultCount) +C_ASSERT_FIELD(KTHREAD, 0x1E0, LIST_ENTRY, ThreadListEntry) +C_ASSERT_FIELD(KTHREAD, 0x1E8, LIST_ENTRY, MutantListHead) +C_ASSERT_FIELD(KTHREAD, 0x1F0, PVOID, SListFaultAddress) +C_ASSERT_FIELD(KTHREAD, 0x1F4, KTHREAD_COUNTERS*, ThreadCounters) +C_ASSERT_FIELD(KTHREAD, 0x1F8, XSTATE_SAVE*, XStateSave) Propchange: trunk/reactos/include/ndk/tests/win7_x86.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/ndk/tests/winvista_x64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/winvista… ============================================================================== --- trunk/reactos/include/ndk/tests/winvista_x64.c (added) +++ trunk/reactos/include/ndk/tests/winvista_x64.c [iso-8859-1] Sun Apr 1 22:19:32 2012 @@ -1,0 +1,116 @@ +/* Version definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_VISTA +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_VISTA + +#include <ntifs.h> +#include <ndk/ntndk.h> + +#define C_ASSERT_FIELD(Type, Offset, MemberType, MemberName) C_ASSERT(FIELD_OFFSET(Type, MemberName) == Offset); + +/* KTHREAD */ +C_ASSERT_FIELD(KTHREAD, 0x000, DISPATCHER_HEADER, Header) +C_ASSERT_FIELD(KTHREAD, 0x018, ULONG64, CycleTime) +C_ASSERT_FIELD(KTHREAD, 0x020, ULONG64, QuantumTarget) +C_ASSERT_FIELD(KTHREAD, 0x028, PVOID, InitialStack) +C_ASSERT_FIELD(KTHREAD, 0x030, PVOID, StackLimit) +C_ASSERT_FIELD(KTHREAD, 0x038, PVOID, KernelStack) +C_ASSERT_FIELD(KTHREAD, 0x040, ULONG64, ThreadLock) +C_ASSERT_FIELD(KTHREAD, 0x048, KAPC_STATE, ApcState) +C_ASSERT_FIELD(KTHREAD, 0x048, UCHAR, ApcStateFill) +C_ASSERT_FIELD(KTHREAD, 0x073, CHAR, Priority) +C_ASSERT_FIELD(KTHREAD, 0x074, USHORT, NextProcessor) +C_ASSERT_FIELD(KTHREAD, 0x076, USHORT, DeferredProcessor) +C_ASSERT_FIELD(KTHREAD, 0x078, ULONG64, ApcQueueLock) +C_ASSERT_FIELD(KTHREAD, 0x080, LONG64, WaitStatus) +C_ASSERT_FIELD(KTHREAD, 0x088, KWAIT_BLOCK*, WaitBlockList) +C_ASSERT_FIELD(KTHREAD, 0x088, KGATE*, GateObject) +C_ASSERT_FIELD(KTHREAD, 0x090, LONG, MiscFlags) +C_ASSERT_FIELD(KTHREAD, 0x094, UCHAR, WaitReason) +C_ASSERT_FIELD(KTHREAD, 0x095, UCHAR, SwapBusy) +C_ASSERT_FIELD(KTHREAD, 0x096, UCHAR, Alerted) +C_ASSERT_FIELD(KTHREAD, 0x098, LIST_ENTRY, WaitListEntry) +C_ASSERT_FIELD(KTHREAD, 0x098, SINGLE_LIST_ENTRY, SwapListEntry) +C_ASSERT_FIELD(KTHREAD, 0x0A8, KQUEUE*, Queue) +C_ASSERT_FIELD(KTHREAD, 0x0B0, PVOID, Teb) +C_ASSERT_FIELD(KTHREAD, 0x0B8, KTIMER, Timer) +C_ASSERT_FIELD(KTHREAD, 0x0B8, UCHAR, TimerFill) +C_ASSERT_FIELD(KTHREAD, 0x0F4, LONG, ThreadFlags) +C_ASSERT_FIELD(KTHREAD, 0x0F8, KWAIT_BLOCK, WaitBlock) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill0) +C_ASSERT_FIELD(KTHREAD, 0x123, UCHAR, IdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill1) +C_ASSERT_FIELD(KTHREAD, 0x153, CHAR, PreviousMode) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill2) +C_ASSERT_FIELD(KTHREAD, 0x183, UCHAR, ResourceIndex) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill3) +C_ASSERT_FIELD(KTHREAD, 0x1B3, UCHAR, LargeStack) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill4) +C_ASSERT_FIELD(KTHREAD, 0x124, ULONG, ContextSwitches) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill5) +C_ASSERT_FIELD(KTHREAD, 0x154, UCHAR, State) +C_ASSERT_FIELD(KTHREAD, 0x155, UCHAR, NpxState) +C_ASSERT_FIELD(KTHREAD, 0x156, UCHAR, WaitIrql) +C_ASSERT_FIELD(KTHREAD, 0x157, CHAR, WaitMode) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill6) +C_ASSERT_FIELD(KTHREAD, 0x184, ULONG, WaitTime) +C_ASSERT_FIELD(KTHREAD, 0x0F8, UCHAR, WaitBlockFill7) +C_ASSERT_FIELD(KTHREAD, 0x1B4, SHORT, KernelApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1B6, SHORT, SpecialApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1B4, ULONG, CombinedApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x1B8, LIST_ENTRY, QueueListEntry) +C_ASSERT_FIELD(KTHREAD, 0x1C8, KTRAP_FRAME*, TrapFrame) +C_ASSERT_FIELD(KTHREAD, 0x1D0, PVOID, FirstArgument) +C_ASSERT_FIELD(KTHREAD, 0x1D8, PVOID, CallbackStack) +C_ASSERT_FIELD(KTHREAD, 0x1D8, ULONG64, CallbackDepth) +C_ASSERT_FIELD(KTHREAD, 0x1E0, UCHAR, ApcStateIndex) +C_ASSERT_FIELD(KTHREAD, 0x1E1, CHAR, BasePriority) +C_ASSERT_FIELD(KTHREAD, 0x1E2, CHAR, PriorityDecrement) +C_ASSERT_FIELD(KTHREAD, 0x1E3, UCHAR, Preempted) +C_ASSERT_FIELD(KTHREAD, 0x1E4, UCHAR, AdjustReason) +C_ASSERT_FIELD(KTHREAD, 0x1E5, CHAR, AdjustIncrement) +C_ASSERT_FIELD(KTHREAD, 0x1E6, UCHAR, Spare01) +C_ASSERT_FIELD(KTHREAD, 0x1E7, CHAR, Saturation) +C_ASSERT_FIELD(KTHREAD, 0x1E8, ULONG, SystemCallNumber) +C_ASSERT_FIELD(KTHREAD, 0x1EC, ULONG, Spare02) +C_ASSERT_FIELD(KTHREAD, 0x1F0, ULONG64, UserAffinity) +C_ASSERT_FIELD(KTHREAD, 0x1F8, KPROCESS*, Process) +C_ASSERT_FIELD(KTHREAD, 0x200, ULONG64, Affinity) +C_ASSERT_FIELD(KTHREAD, 0x208, KAPC_STATE*, ApcStatePointer) +C_ASSERT_FIELD(KTHREAD, 0x218, KAPC_STATE, SavedApcState) +C_ASSERT_FIELD(KTHREAD, 0x218, UCHAR, SavedApcStateFill) +C_ASSERT_FIELD(KTHREAD, 0x243, CHAR, FreezeCount) +C_ASSERT_FIELD(KTHREAD, 0x244, CHAR, SuspendCount) +C_ASSERT_FIELD(KTHREAD, 0x245, UCHAR, UserIdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x246, UCHAR, Spare03) +C_ASSERT_FIELD(KTHREAD, 0x247, UCHAR, CodePatchInProgress) +C_ASSERT_FIELD(KTHREAD, 0x248, PVOID, Win32Thread) +C_ASSERT_FIELD(KTHREAD, 0x250, PVOID, StackBase) +C_ASSERT_FIELD(KTHREAD, 0x258, KAPC, SuspendApc) +C_ASSERT_FIELD(KTHREAD, 0x258, UCHAR, SuspendApcFill0) +C_ASSERT_FIELD(KTHREAD, 0x259, CHAR, Spare04) +C_ASSERT_FIELD(KTHREAD, 0x258, UCHAR, SuspendApcFill1) +C_ASSERT_FIELD(KTHREAD, 0x25B, UCHAR, QuantumReset) +C_ASSERT_FIELD(KTHREAD, 0x258, UCHAR, SuspendApcFill2) +C_ASSERT_FIELD(KTHREAD, 0x25C, ULONG, KernelTime) +C_ASSERT_FIELD(KTHREAD, 0x258, UCHAR, SuspendApcFill3) +C_ASSERT_FIELD(KTHREAD, 0x298, KPRCB*, WaitPrcb) +C_ASSERT_FIELD(KTHREAD, 0x258, UCHAR, SuspendApcFill4) +C_ASSERT_FIELD(KTHREAD, 0x2A0, PVOID, LegoData) +C_ASSERT_FIELD(KTHREAD, 0x258, UCHAR, SuspendApcFill5) +C_ASSERT_FIELD(KTHREAD, 0x2AB, UCHAR, PowerState) +C_ASSERT_FIELD(KTHREAD, 0x2AC, ULONG, UserTime) +C_ASSERT_FIELD(KTHREAD, 0x2B0, KSEMAPHORE, SuspendSemaphore) +C_ASSERT_FIELD(KTHREAD, 0x2B0, UCHAR, SuspendSemaphorefill) +C_ASSERT_FIELD(KTHREAD, 0x2CC, ULONG, SListFaultCount) +C_ASSERT_FIELD(KTHREAD, 0x2D0, LIST_ENTRY, ThreadListEntry) +C_ASSERT_FIELD(KTHREAD, 0x2E0, LIST_ENTRY, MutantListHead) +C_ASSERT_FIELD(KTHREAD, 0x2F0, PVOID, SListFaultAddress) +C_ASSERT_FIELD(KTHREAD, 0x2F8, LONG64, ReadOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x300, LONG64, WriteOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x308, LONG64, OtherOperationCount) +C_ASSERT_FIELD(KTHREAD, 0x310, LONG64, ReadTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x318, LONG64, WriteTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x320, LONG64, OtherTransferCount) +C_ASSERT_FIELD(KTHREAD, 0x328, PVOID, MdlForLockedTeb) Propchange: trunk/reactos/include/ndk/tests/winvista_x64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/ndk/tests/winvista_x86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/winvista… ============================================================================== --- trunk/reactos/include/ndk/tests/winvista_x86.c (added) +++ trunk/reactos/include/ndk/tests/winvista_x86.c [iso-8859-1] Sun Apr 1 22:19:32 2012 @@ -1,0 +1,110 @@ +/* Version definitions */ +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_VISTA +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_VISTA + +#include <ntifs.h> +#include <ndk/ntndk.h> + +#define C_ASSERT_FIELD(Type, Offset, MemberType, MemberName) C_ASSERT(FIELD_OFFSET(Type, MemberName) == Offset); + +/* KTHREAD */ +C_ASSERT_FIELD(KTHREAD, 0x000, DISPATCHER_HEADER, Header) +C_ASSERT_FIELD(KTHREAD, 0x010, UINT64, CycleTime) +C_ASSERT_FIELD(KTHREAD, 0x018, ULONG, HighCycleTime) +C_ASSERT_FIELD(KTHREAD, 0x020, UINT64, QuantumTarget) +C_ASSERT_FIELD(KTHREAD, 0x028, PVOID, InitialStack) +C_ASSERT_FIELD(KTHREAD, 0x02C, PVOID, StackLimit) +C_ASSERT_FIELD(KTHREAD, 0x030, PVOID, KernelStack) +C_ASSERT_FIELD(KTHREAD, 0x034, ULONG, ThreadLock) +C_ASSERT_FIELD(KTHREAD, 0x038, KAPC_STATE, ApcState) +C_ASSERT_FIELD(KTHREAD, 0x038, UCHAR, ApcStateFill) +C_ASSERT_FIELD(KTHREAD, 0x04F, CHAR, Priority) +C_ASSERT_FIELD(KTHREAD, 0x050, USHORT, NextProcessor) +C_ASSERT_FIELD(KTHREAD, 0x052, USHORT, DeferredProcessor) +C_ASSERT_FIELD(KTHREAD, 0x054, ULONG, ApcQueueLock) +C_ASSERT_FIELD(KTHREAD, 0x058, ULONG, ContextSwitches) +C_ASSERT_FIELD(KTHREAD, 0x05C, UCHAR, State) +C_ASSERT_FIELD(KTHREAD, 0x05D, UCHAR, NpxState) +C_ASSERT_FIELD(KTHREAD, 0x05E, UCHAR, WaitIrql) +C_ASSERT_FIELD(KTHREAD, 0x05F, CHAR, WaitMode) +C_ASSERT_FIELD(KTHREAD, 0x060, LONG32, WaitStatus) +C_ASSERT_FIELD(KTHREAD, 0x064, KWAIT_BLOCK*, WaitBlockList) +C_ASSERT_FIELD(KTHREAD, 0x064, KGATE*, GateObject) +C_ASSERT_FIELD(KTHREAD, 0x068, LONG, MiscFlags) +C_ASSERT_FIELD(KTHREAD, 0x06C, UCHAR, WaitReason) +C_ASSERT_FIELD(KTHREAD, 0x06D, UCHAR, SwapBusy) +C_ASSERT_FIELD(KTHREAD, 0x06E, UCHAR, Alerted) +C_ASSERT_FIELD(KTHREAD, 0x070, LIST_ENTRY, WaitListEntry) +C_ASSERT_FIELD(KTHREAD, 0x070, SINGLE_LIST_ENTRY, SwapListEntry) +C_ASSERT_FIELD(KTHREAD, 0x078, KQUEUE*, Queue) +C_ASSERT_FIELD(KTHREAD, 0x07C, ULONG, WaitTime) +C_ASSERT_FIELD(KTHREAD, 0x080, INT16, KernelApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x082, INT16, SpecialApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x080, ULONG, CombinedApcDisable) +C_ASSERT_FIELD(KTHREAD, 0x084, PVOID, Teb) +C_ASSERT_FIELD(KTHREAD, 0x088, KTIMER, Timer) +C_ASSERT_FIELD(KTHREAD, 0x088, UCHAR, TimerFill) +C_ASSERT_FIELD(KTHREAD, 0x0B0, LONG32, ThreadFlags) +C_ASSERT_FIELD(KTHREAD, 0x0B8, KWAIT_BLOCK, WaitBlock) +C_ASSERT_FIELD(KTHREAD, 0x0B8, UCHAR, WaitBlockFill0) +C_ASSERT_FIELD(KTHREAD, 0x0CF, UCHAR, IdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x0B8, UCHAR, WaitBlockFill1) +C_ASSERT_FIELD(KTHREAD, 0x0E7, CHAR, PreviousMode) +C_ASSERT_FIELD(KTHREAD, 0x0B8, UCHAR, WaitBlockFill2) +C_ASSERT_FIELD(KTHREAD, 0x0FF, UCHAR, ResourceIndex) +C_ASSERT_FIELD(KTHREAD, 0x0B8, UCHAR, WaitBlockFill3) +C_ASSERT_FIELD(KTHREAD, 0x117, UCHAR, LargeStack) +C_ASSERT_FIELD(KTHREAD, 0x118, LIST_ENTRY, QueueListEntry) +C_ASSERT_FIELD(KTHREAD, 0x120, KTRAP_FRAME*, TrapFrame) +C_ASSERT_FIELD(KTHREAD, 0x124, PVOID, FirstArgument) +C_ASSERT_FIELD(KTHREAD, 0x128, PVOID, CallbackStack) +C_ASSERT_FIELD(KTHREAD, 0x128, ULONG, CallbackDepth) +C_ASSERT_FIELD(KTHREAD, 0x12C, PVOID, ServiceTable) +C_ASSERT_FIELD(KTHREAD, 0x130, UCHAR, ApcStateIndex) +C_ASSERT_FIELD(KTHREAD, 0x131, CHAR, BasePriority) +C_ASSERT_FIELD(KTHREAD, 0x132, CHAR, PriorityDecrement) +C_ASSERT_FIELD(KTHREAD, 0x133, UCHAR, Preempted) +C_ASSERT_FIELD(KTHREAD, 0x134, UCHAR, AdjustReason) +C_ASSERT_FIELD(KTHREAD, 0x135, CHAR, AdjustIncrement) +C_ASSERT_FIELD(KTHREAD, 0x136, UCHAR, Spare01) +C_ASSERT_FIELD(KTHREAD, 0x137, CHAR, Saturation) +C_ASSERT_FIELD(KTHREAD, 0x138, ULONG, SystemCallNumber) +C_ASSERT_FIELD(KTHREAD, 0x13C, ULONG, Spare02) +C_ASSERT_FIELD(KTHREAD, 0x140, ULONG, UserAffinity) +C_ASSERT_FIELD(KTHREAD, 0x144, KPROCESS*, Process) +C_ASSERT_FIELD(KTHREAD, 0x148, ULONG, Affinity) +C_ASSERT_FIELD(KTHREAD, 0x14C, KAPC_STATE*, ApcStatePointer) +C_ASSERT_FIELD(KTHREAD, 0x154, KAPC_STATE, SavedApcState) +C_ASSERT_FIELD(KTHREAD, 0x154, UCHAR, SavedApcStateFill) +C_ASSERT_FIELD(KTHREAD, 0x16B, CHAR, FreezeCount) +C_ASSERT_FIELD(KTHREAD, 0x16C, CHAR, SuspendCount) +C_ASSERT_FIELD(KTHREAD, 0x16D, UCHAR, UserIdealProcessor) +C_ASSERT_FIELD(KTHREAD, 0x16E, UCHAR, Spare03) +C_ASSERT_FIELD(KTHREAD, 0x16F, UCHAR, OtherPlatformFill) +C_ASSERT_FIELD(KTHREAD, 0x170, PVOID, Win32Thread) +C_ASSERT_FIELD(KTHREAD, 0x174, PVOID, StackBase) +C_ASSERT_FIELD(KTHREAD, 0x178, KAPC, SuspendApc) +C_ASSERT_FIELD(KTHREAD, 0x178, UCHAR, SuspendApcFill0) +C_ASSERT_FIELD(KTHREAD, 0x179, CHAR, Spare04) +C_ASSERT_FIELD(KTHREAD, 0x178, UCHAR, SuspendApcFill1) +C_ASSERT_FIELD(KTHREAD, 0x17B, UCHAR, QuantumReset) +C_ASSERT_FIELD(KTHREAD, 0x178, UCHAR, SuspendApcFill2) +C_ASSERT_FIELD(KTHREAD, 0x17C, ULONG, KernelTime) +C_ASSERT_FIELD(KTHREAD, 0x178, UCHAR, SuspendApcFill3) +C_ASSERT_FIELD(KTHREAD, 0x19C, KPRCB*, WaitPrcb) +C_ASSERT_FIELD(KTHREAD, 0x178, UCHAR, SuspendApcFill4) +C_ASSERT_FIELD(KTHREAD, 0x1A0, PVOID, LegoData) +C_ASSERT_FIELD(KTHREAD, 0x178, UCHAR, SuspendApcFill5) +C_ASSERT_FIELD(KTHREAD, 0x1A7, UCHAR, PowerState) +C_ASSERT_FIELD(KTHREAD, 0x1A8, ULONG, UserTime) +C_ASSERT_FIELD(KTHREAD, 0x1AC, KSEMAPHORE, SuspendSemaphore) +C_ASSERT_FIELD(KTHREAD, 0x1AC, UCHAR, SuspendSemaphorefill) +C_ASSERT_FIELD(KTHREAD, 0x1C0, ULONG, SListFaultCount) +C_ASSERT_FIELD(KTHREAD, 0x1C4, LIST_ENTRY, ThreadListEntry) +C_ASSERT_FIELD(KTHREAD, 0x1CC, LIST_ENTRY, MutantListHead) +C_ASSERT_FIELD(KTHREAD, 0x1D4, PVOID, SListFaultAddress) +C_ASSERT_FIELD(KTHREAD, 0x1D8, PVOID, MdlForLockedTeb) + + Propchange: trunk/reactos/include/ndk/tests/winvista_x86.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 56312: [USERINIT] * Remove an unneeded include. * Improve the cmake file a bit.
by akhaldi＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: akhaldi Date: Sun Apr 1 22:03:14 2012 New Revision: 56312 URL: http://svn.reactos.org/svn/reactos?rev=56312&view=rev Log: [USERINIT] * Remove an unneeded include. * Improve the cmake file a bit. Modified: trunk/reactos/base/system/userinit/CMakeLists.txt trunk/reactos/base/system/userinit/userinit.c Modified: trunk/reactos/base/system/userinit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/CMake… ============================================================================== --- trunk/reactos/base/system/userinit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/CMakeLists.txt [iso-8859-1] Sun Apr 1 22:03:14 2012 @@ -1,11 +1,6 @@ - -include_directories(.) -set_rc_compiler() add_executable(userinit userinit.c userinit.rc) - target_link_libraries(userinit wine) - set_module_type(userinit win32gui UNICODE) add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET userinit DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Sun Apr 1 22:03:14 2012 @@ -31,7 +31,6 @@ #include <undocuser.h> #include "resource.h" #include <wine/debug.h> -#include <win32k/ntusrtyp.h> WINE_DEFAULT_DEBUG_CHANNEL(userinit);

1 0

[akhaldi] 56311: * Reorganize the whole ReactOS codebase into a new layout. Discussing it will only waste time, so we better have it then talk about it after. * Put ntoskrnl and ntdll in the same f...
by akhaldi＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: akhaldi Date: Sun Apr 1 20:42:43 2012 New Revision: 56311 URL: http://svn.reactos.org/svn/reactos?rev=56311&view=rev Log: * Reorganize the whole ReactOS codebase into a new layout. Discussing it will only waste time, so we better have it then talk about it after. * Put ntoskrnl and ntdll in the same folder, because they both start with nt. * Place hal next to acpi, they both deal with hardware stuff. * Move mountmgr next to usb drivers. * Put the rtl next to the crt, and share as much as possible between the two. * I'm just kidding, you know, April's fool and all ;) Here's the real deal: [WIN32SS] * And finally, integrate win32k itself into the new file layout. Now the subsystem modules are located close to each other (like gdi32 and ntgdi, or user32 and ntuser). * Thanks go to the subsystem team for coming up with this nice layout, hopefully this will scale to the whole codebase layout soon. * Special thanks to Smiley for coming up with this cool idea :) Added: trunk/reactos/win32ss/gdi/dib/ - copied from r56306, trunk/reactos/subsystems/win32/win32k/dib/ trunk/reactos/win32ss/gdi/diblib/ - copied from r56306, trunk/reactos/subsystems/win32/win32k/diblib/ trunk/reactos/win32ss/gdi/eng/ - copied from r56306, trunk/reactos/subsystems/win32/win32k/eng/ trunk/reactos/win32ss/gdi/eng/device.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/device.h trunk/reactos/win32ss/gdi/eng/driverobj.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/driverobj.h trunk/reactos/win32ss/gdi/eng/eng.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/eng.h trunk/reactos/win32ss/gdi/eng/engevent.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/engevent.h trunk/reactos/win32ss/gdi/eng/engobjects.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/engobjects.h trunk/reactos/win32ss/gdi/eng/floatobj.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/floatobj.h trunk/reactos/win32ss/gdi/eng/inteng.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/inteng.h trunk/reactos/win32ss/gdi/eng/ldevobj.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/ldevobj.h trunk/reactos/win32ss/gdi/eng/mouse.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/mouse.h trunk/reactos/win32ss/gdi/eng/pdevobj.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/pdevobj.h trunk/reactos/win32ss/gdi/eng/stubs.c - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/win32ss/gdi/eng/surface.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/surface.h trunk/reactos/win32ss/gdi/eng/umpdstubs.c - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/stubs/umpdstubs.c trunk/reactos/win32ss/gdi/eng/xlateobj.h - copied, changed from r56306, trunk/reactos/subsystems/win32/win32k/include/xlateobj.h trunk/reactos/win32ss/gdi/ntgdi/ - copied from r56306, trunk/reactos/subsystems/win32/win32k/objects/ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/win32ss/gdi/ntgdi/brush.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/win32ss/gdi/ntgdi/cliprgn.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/cliprgn.h trunk/reactos/win32ss/gdi/ntgdi/color.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/color.h trunk/reactos/win32ss/gdi/ntgdi/coord.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/coord.h trunk/reactos/win32ss/gdi/ntgdi/dc.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/win32ss/gdi/ntgdi/dib.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/dib.h trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/gdidebug.h trunk/reactos/win32ss/gdi/ntgdi/gdifloat.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/gdifloat.h trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/win32ss/gdi/ntgdi/intgdi.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/win32ss/gdi/ntgdi/misc.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/win32ss/gdi/ntgdi/paint.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/paint.h trunk/reactos/win32ss/gdi/ntgdi/palette.h - copied, changed from r56306, trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/win32ss/gdi/ntgdi/path.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/path.h trunk/reactos/win32ss/gdi/ntgdi/pen.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/pen.h trunk/reactos/win32ss/gdi/ntgdi/rect.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/rect.h trunk/reactos/win32ss/gdi/ntgdi/region.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/win32ss/gdi/ntgdi/text.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/win32ss/gdi/ntgdi/xformobj.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/xformobj.h trunk/reactos/win32ss/napi.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/napi.h trunk/reactos/win32ss/pch.h - copied, changed from r56306, trunk/reactos/subsystems/win32/win32k/pch.h trunk/reactos/win32ss/reactx/ntddraw/ - copied from r56306, trunk/reactos/subsystems/win32/win32k/ntddraw/ trunk/reactos/win32ss/reactx/ntddraw/intddraw.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/win32ss/sys-stubs.S - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/sys-stubs.S trunk/reactos/win32ss/user/ntuser/ - copied from r56306, trunk/reactos/subsystems/win32/win32k/ntuser/ trunk/reactos/win32ss/user/ntuser/accelerator.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/accelerator.h trunk/reactos/win32ss/user/ntuser/callback.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/callback.h trunk/reactos/win32ss/user/ntuser/caret.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/caret.h trunk/reactos/win32ss/user/ntuser/class.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/win32ss/user/ntuser/clipboard.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/clipboard.h trunk/reactos/win32ss/user/ntuser/csr.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/csr.h trunk/reactos/win32ss/user/ntuser/cursoricon.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/win32ss/user/ntuser/dce.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/win32ss/user/ntuser/desktop.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/win32ss/user/ntuser/focus.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/focus.h trunk/reactos/win32ss/user/ntuser/guicheck.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/guicheck.h trunk/reactos/win32ss/user/ntuser/hook.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/hook.h trunk/reactos/win32ss/user/ntuser/hotkey.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/hotkey.h trunk/reactos/win32ss/user/ntuser/input.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/win32ss/user/ntuser/main.c - copied, changed from r56306, trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/win32ss/user/ntuser/menu.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/menu.h trunk/reactos/win32ss/user/ntuser/misc/ - copied from r56306, trunk/reactos/subsystems/win32/win32k/misc/ trunk/reactos/win32ss/user/ntuser/mmcopy.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/mmcopy.h trunk/reactos/win32ss/user/ntuser/monitor.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/monitor.h trunk/reactos/win32ss/user/ntuser/msgqueue.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/win32ss/user/ntuser/ntuser.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/ntuser.h trunk/reactos/win32ss/user/ntuser/object.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/object.h trunk/reactos/win32ss/user/ntuser/painting.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/painting.h trunk/reactos/win32ss/user/ntuser/prop.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/prop.h trunk/reactos/win32ss/user/ntuser/scroll.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/scroll.h trunk/reactos/win32ss/user/ntuser/sysparams.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/sysparams.h trunk/reactos/win32ss/user/ntuser/tags.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/win32ss/user/ntuser/timer.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/win32ss/user/ntuser/useratom.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/useratom.h trunk/reactos/win32ss/user/ntuser/userfuncs.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/userfuncs.h trunk/reactos/win32ss/user/ntuser/vis.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/vis.h trunk/reactos/win32ss/user/ntuser/win32.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/win32ss/user/ntuser/win32kdebug.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h trunk/reactos/win32ss/user/ntuser/window.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/win32ss/user/ntuser/winpos.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/winpos.h trunk/reactos/win32ss/user/ntuser/winsta.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/win32ss/w32ksvc.db - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/w32ksvc.db trunk/reactos/win32ss/w32ksvc.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/w32ksvc.h trunk/reactos/win32ss/win32k.h - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/win32k.h trunk/reactos/win32ss/win32k.rc - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/win32k.rc trunk/reactos/win32ss/win32k.spec - copied unchanged from r56306, trunk/reactos/subsystems/win32/win32k/win32k.spec trunk/reactos/win32ss/win32kp.h - copied, changed from r56306, trunk/reactos/subsystems/win32/win32k/include/win32kp.h Removed: trunk/reactos/subsystems/win32/win32k/ Modified: trunk/reactos/subsystems/win32/CMakeLists.txt trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/drivers/videoprt/event.c Modified: trunk/reactos/subsystems/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/CMakeList… ============================================================================== --- trunk/reactos/subsystems/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/CMakeLists.txt [iso-8859-1] Sun Apr 1 20:42:43 2012 @@ -1,3 +1,2 @@ add_subdirectory(csrss) -add_subdirectory(win32k) Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sun Apr 1 20:42:43 2012 @@ -1,6 +1,222 @@ + +set(USE_DIBLIB FALSE) add_subdirectory(drivers) +add_subdirectory(gdi/diblib) add_subdirectory(gdi/gdi32) add_subdirectory(reactx) add_subdirectory(user/user32) add_subdirectory(user/win32csr) + +spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) + +include_directories( + . + include + ${REACTOS_SOURCE_DIR}/ntoskrnl/include + ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/include/reactos/drivers) + +add_definitions( + -DLANGPACK + -D_WIN32K_) + +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib) + +list(APPEND GENDIB_FILES + ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib8gen.c + ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib16gen.c + ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib32gen.c) + +add_custom_command( + OUTPUT ${GENDIB_FILES} + COMMAND native-gendib ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib + DEPENDS native-gendib) + +list(APPEND SOURCE + gdi/dib/alphablend.c + gdi/dib/dib1bpp.c + gdi/dib/dib4bpp.c + gdi/dib/dib8bpp.c + gdi/dib/dib16bpp.c + gdi/dib/dib24bpp.c + gdi/dib/dib32bpp.c + gdi/dib/floodfill.c + gdi/dib/stretchblt.c + gdi/eng/alphablend.c + gdi/eng/bitblt.c + gdi/eng/engbrush.c + gdi/eng/engevent.c + gdi/eng/clip.c + gdi/eng/debug.c + gdi/eng/device.c + gdi/eng/driverobj.c + gdi/eng/error.c + gdi/eng/float.c + gdi/eng/gradient.c + gdi/eng/lineto.c + gdi/eng/ldevobj.c + gdi/eng/mapping.c + gdi/eng/mem.c + gdi/eng/engmisc.c + gdi/eng/mouse.c + gdi/eng/paint.c + gdi/eng/pdevobj.c + gdi/eng/perfcnt.c + gdi/eng/rlecomp.c + gdi/eng/semaphor.c + gdi/eng/sort.c + gdi/eng/string.c + gdi/eng/stretchblt.c + gdi/eng/surface.c + gdi/eng/transblt.c + gdi/eng/engwindow.c + gdi/eng/xlate.c + user/ntuser/main.c + user/ntuser/misc/file.c + user/ntuser/misc/math.c + user/ntuser/misc/rtlstr.c + user/ntuser/misc/copy.c + user/ntuser/misc/registry.c + user/ntuser/misc/usrheap.c + reactx/ntddraw/ddraw.c + reactx/ntddraw/dd.c + reactx/ntddraw/ddsurf.c + reactx/ntddraw/d3d.c + reactx/ntddraw/dvp.c + reactx/ntddraw/mocomp.c + reactx/ntddraw/eng.c + reactx/ntddraw/dxeng.c + user/ntuser/accelerator.c + user/ntuser/callback.c + user/ntuser/callproc.c + user/ntuser/caret.c + user/ntuser/class.c + user/ntuser/clipboard.c + user/ntuser/csr.c + user/ntuser/cursoricon.c + user/ntuser/defwnd.c + user/ntuser/desktop.c + user/ntuser/display.c + user/ntuser/event.c + user/ntuser/focus.c + user/ntuser/guicheck.c + user/ntuser/hook.c + user/ntuser/hotkey.c + user/ntuser/input.c + user/ntuser/keyboard.c + user/ntuser/kbdlayout.c + user/ntuser/menu.c + user/ntuser/message.c + user/ntuser/metric.c + user/ntuser/misc.c + user/ntuser/monitor.c + user/ntuser/mouse.c + user/ntuser/msgqueue.c + user/ntuser/ntstubs.c + user/ntuser/ntuser.c + user/ntuser/painting.c + user/ntuser/prop.c + user/ntuser/scrollbar.c + user/ntuser/session.c + user/ntuser/simplecall.c + user/ntuser/sysparams.c + user/ntuser/timer.c + user/ntuser/useratom.c + user/ntuser/vis.c + user/ntuser/windc.c + user/ntuser/window.c + user/ntuser/winpos.c + user/ntuser/winsta.c + user/ntuser/object.c + gdi/ntgdi/arc.c + gdi/ntgdi/bezier.c + gdi/ntgdi/bitblt.c + gdi/ntgdi/bitmaps.c + gdi/ntgdi/brush.c + gdi/ntgdi/cliprgn.c + gdi/ntgdi/coord.c + gdi/ntgdi/dcattr.c + gdi/ntgdi/dclife.c + gdi/ntgdi/dcobjs.c + gdi/ntgdi/dcstate.c + gdi/ntgdi/dcutil.c + gdi/ntgdi/device.c + gdi/ntgdi/dibobj.c + gdi/ntgdi/drawing.c + gdi/ntgdi/fillshap.c + gdi/ntgdi/font.c + gdi/ntgdi/freetype.c + gdi/ntgdi/gdibatch.c + gdi/ntgdi/gdidbg.c + gdi/ntgdi/gdiobj.c + gdi/ntgdi/gdipool.c + gdi/ntgdi/icm.c + gdi/ntgdi/line.c + gdi/ntgdi/metafile.c + gdi/ntgdi/palette.c + gdi/ntgdi/path.c + gdi/ntgdi/pen.c + gdi/ntgdi/polyfill.c + gdi/ntgdi/print.c + gdi/ntgdi/rect.c + gdi/ntgdi/region.c + gdi/ntgdi/stockobj.c + gdi/ntgdi/text.c + gdi/ntgdi/wingl.c + gdi/ntgdi/xformobj.c + gdi/eng/stubs.c + gdi/eng/umpdstubs.c + win32k.rc) + +if(USE_DIBLIB) + add_definitions(-D_USE_DIBLIB_) + list(APPEND SOURCE + gdi/dib/dib_new.c + gdi/eng/bitblt_new.c) +else() + list(APPEND SOURCE + gdi/dib/dib.c + gdi/eng/copybits.c + ${GENDIB_FILES}) +endif() + +if(ARCH MATCHES i386) +list(APPEND SOURCE + gdi/dib/i386/dib24bpp_hline.s + gdi/dib/i386/dib32bpp_hline.s + gdi/dib/i386/dib32bpp_colorfill.s + gdi/eng/i386/floatobj.S + user/ntuser/misc/i386/cos_asm.s + user/ntuser/misc/i386/sin_asm.s + user/ntuser/misc/i386/atan2_asm.s + user/ntuser/misc/i386/floor_asm.s + user/ntuser/misc/i386/ceil_asm.s) +else() +list(APPEND SOURCE + gdi/dib/dib24bppc.c + gdi/dib/dib32bppc.c) +endif() + +add_library(win32k SHARED + ${CMAKE_CURRENT_BINARY_DIR}/win32k.def + ${SOURCE}) + +set_module_type(win32k kernelmodedriver) + +target_link_libraries(win32k + ${PSEH_LIB} + dxguid + libcntpr) + +if(USE_DIBLIB) + target_link_libraries(win32k diblib) +endif() + +add_importlibs(win32k ntoskrnl hal ftfd) +add_pch(win32k pch.h) +add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all) + +add_library(win32ksys sys-stubs.S) +set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h) Modified: trunk/reactos/win32ss/drivers/videoprt/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/e… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/event.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/event.c [iso-8859-1] Sun Apr 1 20:42:43 2012 @@ -9,7 +9,7 @@ /* INCLUDES *******************************************************************/ #include "videoprt.h" -#include "../../subsystems/win32/win32k/include/engevent.h" +#include "../../gdi/eng/engevent.h" /* PUBLIC FUNCTIONS ***********************************************************/ Copied: trunk/reactos/win32ss/gdi/eng/xlateobj.h (from r56306, trunk/reactos/subsystems/win32/win32k/include/xlateobj.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/xlateobj.h… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/xlateobj.h [iso-8859-1] Sun Apr 1 20:42:43 2012 @@ -54,7 +54,7 @@ void DbgCmpXlate(XLATEOBJ *pxlo1, XLATEOBJ *pxlo2); -VOID NTAPI EXLATEOBJ_vInitialize(PEXLATEOBJ pexlo, PALETTE *ppalSrc, PALETTE *ppalDst, ULONG, ULONG, ULONG); +VOID NTAPI EXLATEOBJ_vInitialize(PEXLATEOBJ pexlo, PPALETTE ppalSrc, PPALETTE ppalDst, ULONG, ULONG, ULONG); VOID NTAPI EXLATEOBJ_vInitXlateFromDCs(PEXLATEOBJ pexlo, PDC pdcSrc, PDC pdcDst); VOID NTAPI EXLATEOBJ_vInitSrcMonoXlate(PEXLATEOBJ pexlo, PPALETTE ppalDst, ULONG Color0, ULONG Color1); VOID NTAPI EXLATEOBJ_vCleanup(PEXLATEOBJ pexlo); Copied: trunk/reactos/win32ss/gdi/ntgdi/palette.h (from r56306, trunk/reactos/subsystems/win32/win32k/include/palette.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Sun Apr 1 20:42:43 2012 @@ -48,7 +48,7 @@ ULONG ulGreenShift; ULONG ulBlueShift; HDEV hPDev; -} PALETTE, *PPALETTE; +} PALETTE; extern PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565, *gppalDefault; extern PPALETTE appalSurfaceDefault[]; @@ -104,3 +104,4 @@ ppal->IndexedColors[ulIndex].peGreen, ppal->IndexedColors[ulIndex].peBlue); } + Copied: trunk/reactos/win32ss/pch.h (from r56306, trunk/reactos/subsystems/win32/win32k/pch.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?p2=trunk/rea… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Sun Apr 1 20:42:43 2012 @@ -97,6 +97,6 @@ #include <freetype/freetype.h> /* Internal Win32K header */ -#include "include/win32kp.h" +#include "win32kp.h" #endif /* __W32K_H */ Copied: trunk/reactos/win32ss/user/ntuser/main.c (from r56306, trunk/reactos/subsystems/win32/win32k/main/dllmain.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sun Apr 1 20:42:43 2012 @@ -7,7 +7,7 @@ */ #include <win32k.h> -#include <include/napi.h> +#include <napi.h> #define NDEBUG #include <debug.h> Copied: trunk/reactos/win32ss/win32kp.h (from r56306, trunk/reactos/subsystems/win32/win32k/include/win32kp.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/win32kp.h?p2=trunk… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/win32kp.h [iso-8859-1] Sun Apr 1 20:42:43 2012 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Graphics Subsystem - * FILE: subsys/win32k/include/win32k.h + * FILE: win32ss/win32kp.h * PURPOSE: Internal Win32K Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ @@ -27,79 +27,80 @@ #define DBG_ENABLE_SERVICE_HOOKS 0 /* Misc headers */ -#include <include/win32kdebug.h> -#include <include/mmcopy.h> -#include <include/tags.h> -#include <include/rect.h> -#include <include/misc.h> +#include "user/ntuser/win32kdebug.h" +#include "user/ntuser/mmcopy.h" +#include "user/ntuser/tags.h" +#include "gdi/ntgdi/rect.h" +#include "gdi/ntgdi/misc.h" /* Internal NtGdi Headers */ typedef struct _DC *PDC; -#include <include/gdiobj.h> -#include <include/surface.h> -#include <include/pdevobj.h> -#include <include/ldevobj.h> -#include <include/xformobj.h> -#include <include/bitmaps.h> -#include <include/engobjects.h> -#include <include/eng.h> -#include <include/brush.h> -#include <include/color.h> -#include <include/driverobj.h> -#include <include/palette.h> -#include <include/region.h> -#include <include/dc.h> -#include <include/dib.h> -#include <include/xlateobj.h> -#include <include/cliprgn.h> -#include <include/inteng.h> -#include <include/intgdi.h> -#include <include/intddraw.h> -#include <include/paint.h> -#include <include/text.h> -#include <include/engevent.h> -#include <include/device.h> -#include <include/pen.h> -#include <include/cliprgn.h> -#include <include/coord.h> -#include <include/gdifloat.h> -#include <include/path.h> -#include <include/floatobj.h> -#include <dib/dib.h> -#include <include/mouse.h> +typedef struct _PALETTE *PPALETTE; +#include "gdi/ntgdi/gdiobj.h" +#include "gdi/eng/surface.h" +#include "gdi/eng/pdevobj.h" +#include "gdi/eng/ldevobj.h" +#include "gdi/eng/device.h" +#include "gdi/eng/driverobj.h" +#include "gdi/eng/engobjects.h" +#include "gdi/eng/eng.h" +#include "gdi/eng/engevent.h" +#include "gdi/eng/inteng.h" +#include "gdi/eng/xlateobj.h" +#include "gdi/eng/floatobj.h" +#include "gdi/eng/mouse.h" +#include "gdi/ntgdi/xformobj.h" +#include "gdi/ntgdi/brush.h" +#include "gdi/ntgdi/color.h" +#include "gdi/ntgdi/bitmaps.h" +#include "gdi/ntgdi/palette.h" +#include "gdi/ntgdi/region.h" +#include "gdi/ntgdi/dc.h" +#include "gdi/ntgdi/dib.h" +#include "gdi/ntgdi/cliprgn.h" +#include "gdi/ntgdi/intgdi.h" +#include "gdi/ntgdi/paint.h" +#include "gdi/ntgdi/text.h" +#include "gdi/ntgdi/pen.h" +#include "gdi/ntgdi/cliprgn.h" +#include "gdi/ntgdi/coord.h" +#include "gdi/ntgdi/gdifloat.h" +#include "gdi/ntgdi/path.h" +#include "gdi/dib/dib.h" +#include "reactx/ntddraw/intddraw.h" /* Internal NtUser Headers */ typedef struct _DESKTOP *PDESKTOP; -#include <include/win32.h> -#include <include/object.h> -#include <include/ntuser.h> -#include <include/cursoricon.h> -#include <include/accelerator.h> -#include <include/hook.h> -#include <include/clipboard.h> -#include <include/winsta.h> -#include <include/msgqueue.h> -#include <include/desktop.h> -#include <include/dce.h> -#include <include/focus.h> -#include <include/hotkey.h> -#include <include/input.h> -#include <include/menu.h> -#include <include/monitor.h> -#include <include/timer.h> -#include <include/caret.h> -#include <include/painting.h> -#include <include/class.h> -#include <include/window.h> -#include <include/sysparams.h> -#include <include/prop.h> -#include <include/guicheck.h> -#include <include/useratom.h> -#include <include/vis.h> -#include <include/userfuncs.h> -#include <include/scroll.h> -#include <include/csr.h> -#include <include/winpos.h> -#include <include/callback.h> +#include "user/ntuser/win32.h" +#include "user/ntuser/object.h" +#include "user/ntuser/ntuser.h" +#include "user/ntuser/cursoricon.h" +#include "user/ntuser/accelerator.h" +#include "user/ntuser/hook.h" +#include "user/ntuser/clipboard.h" +#include "user/ntuser/winsta.h" +#include "user/ntuser/msgqueue.h" +#include "user/ntuser/desktop.h" +#include "user/ntuser/dce.h" +#include "user/ntuser/focus.h" +#include "user/ntuser/hotkey.h" +#include "user/ntuser/input.h" +#include "user/ntuser/menu.h" +#include "user/ntuser/monitor.h" +#include "user/ntuser/timer.h" +#include "user/ntuser/caret.h" +#include "user/ntuser/painting.h" +#include "user/ntuser/class.h" +#include "user/ntuser/window.h" +#include "user/ntuser/sysparams.h" +#include "user/ntuser/prop.h" +#include "user/ntuser/guicheck.h" +#include "user/ntuser/useratom.h" +#include "user/ntuser/vis.h" +#include "user/ntuser/userfuncs.h" +#include "user/ntuser/scroll.h" +#include "user/ntuser/csr.h" +#include "user/ntuser/winpos.h" +#include "user/ntuser/callback.h" -#include <include/gdidebug.h> +#include "gdi/ntgdi/gdidebug.h"

1 0

[akhaldi] 56310: [WIN32SS] * Move winsrv into win32ss/user/winsrv.
by akhaldi＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: akhaldi Date: Sun Apr 1 18:37:49 2012 New Revision: 56310 URL: http://svn.reactos.org/svn/reactos?rev=56310&view=rev Log: [WIN32SS] * Move winsrv into win32ss/user/winsrv. Added: trunk/reactos/win32ss/user/winsrv/ - copied from r56306, trunk/reactos/subsystems/win/winsrv/ Removed: trunk/reactos/subsystems/win/winsrv/

1 0

[akhaldi] 56309: [WIN32SS] * Move win32csr into win32ss/user/win32csr.
by akhaldi＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: akhaldi Date: Sun Apr 1 18:36:08 2012 New Revision: 56309 URL: http://svn.reactos.org/svn/reactos?rev=56309&view=rev Log: [WIN32SS] * Move win32csr into win32ss/user/win32csr. Added: trunk/reactos/win32ss/user/win32csr/ - copied from r56306, trunk/reactos/subsystems/win32/csrss/win32csr/ Removed: trunk/reactos/subsystems/win32/csrss/win32csr/ Modified: trunk/reactos/subsystems/win32/csrss/CMakeLists.txt trunk/reactos/win32ss/CMakeLists.txt Modified: trunk/reactos/subsystems/win32/csrss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/CMa… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/CMakeLists.txt [iso-8859-1] Sun Apr 1 18:36:08 2012 @@ -13,4 +13,3 @@ add_cd_file(TARGET csrss DESTINATION reactos/system32 FOR all) add_subdirectory(csrsrv) -add_subdirectory(win32csr) Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sun Apr 1 18:36:08 2012 @@ -3,3 +3,4 @@ add_subdirectory(gdi/gdi32) add_subdirectory(reactx) add_subdirectory(user/user32) +add_subdirectory(user/win32csr)

1 0

[akhaldi] 56308: [WIN32SS] * Move ReactX modules into win32ss/reactx.
by akhaldi＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: akhaldi Date: Sun Apr 1 18:17:07 2012 New Revision: 56308 URL: http://svn.reactos.org/svn/reactos?rev=56308&view=rev Log: [WIN32SS] * Move ReactX modules into win32ss/reactx. Added: trunk/reactos/win32ss/reactx/ - copied from r56306, trunk/reactos/drivers/directx/ Removed: trunk/reactos/drivers/directx/ Modified: trunk/reactos/drivers/CMakeLists.txt trunk/reactos/win32ss/CMakeLists.txt Modified: trunk/reactos/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] Sun Apr 1 18:17:07 2012 @@ -3,7 +3,6 @@ add_subdirectory(battery) add_subdirectory(bluetooth) add_subdirectory(bus) -add_subdirectory(directx) add_subdirectory(filesystems) add_subdirectory(filters) add_subdirectory(hid) Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sun Apr 1 18:17:07 2012 @@ -1,4 +1,5 @@ add_subdirectory(drivers) add_subdirectory(gdi/gdi32) +add_subdirectory(reactx) add_subdirectory(user/user32)

1 0

[akhaldi] 56307: [WIN32SS] * Move the drivers into win32ss/drivers.
by akhaldi＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: akhaldi Date: Sun Apr 1 17:57:24 2012 New Revision: 56307 URL: http://svn.reactos.org/svn/reactos?rev=56307&view=rev Log: [WIN32SS] * Move the drivers into win32ss/drivers. Added: trunk/reactos/win32ss/drivers/ - copied from r56304, trunk/reactos/drivers/video/ Removed: trunk/reactos/drivers/video/ Modified: trunk/reactos/drivers/CMakeLists.txt trunk/reactos/win32ss/CMakeLists.txt Modified: trunk/reactos/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] Sun Apr 1 17:57:24 2012 @@ -15,6 +15,5 @@ add_subdirectory(setup) add_subdirectory(storage) add_subdirectory(usb) -add_subdirectory(video) add_subdirectory(wdm) add_subdirectory(wmi) Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sun Apr 1 17:57:24 2012 @@ -1,3 +1,4 @@ +add_subdirectory(drivers) add_subdirectory(gdi/gdi32) add_subdirectory(user/user32)

1 0

[akhaldi] 56306: [USER32_WSPRINTF] * Add a missing dependency on psdk, revealed by the previous commit.
by akhaldi＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: akhaldi Date: Sun Apr 1 17:32:55 2012 New Revision: 56306 URL: http://svn.reactos.org/svn/reactos?rev=56306&view=rev Log: [USER32_WSPRINTF] * Add a missing dependency on psdk, revealed by the previous commit. Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sun Apr 1 17:32:55 2012 @@ -37,6 +37,7 @@ string/mbstowcs_nt.c string/wcstombs_nt.c) +add_dependencies(user32_wsprintf psdk) add_target_compile_definitions(user32_wsprintf _USER32_WSPRINTF) add_library(getopt misc/getopt.c)

1 0

[akhaldi] 56305: [WIN32SS] * Initialize the subsystem restructure. Start by bringing-in gdi32 and user32. Brought to you by the awesome Subsystem Team.
by akhaldi＠svn.reactos.org 01 Apr '12

01 Apr '12

Author: akhaldi Date: Sun Apr 1 17:27:38 2012 New Revision: 56305 URL: http://svn.reactos.org/svn/reactos?rev=56305&view=rev Log: [WIN32SS] * Initialize the subsystem restructure. Start by bringing-in gdi32 and user32. Brought to you by the awesome Subsystem Team. Added: trunk/reactos/win32ss/ (with props) trunk/reactos/win32ss/CMakeLists.txt (with props) trunk/reactos/win32ss/gdi/ (with props) trunk/reactos/win32ss/gdi/gdi32/ - copied from r56304, trunk/reactos/dll/win32/gdi32/ trunk/reactos/win32ss/user/ (with props) trunk/reactos/win32ss/user/user32/ - copied from r56304, trunk/reactos/dll/win32/user32/ Removed: trunk/reactos/dll/win32/gdi32/ trunk/reactos/dll/win32/user32/ Modified: trunk/reactos/CMakeLists.txt trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=56305&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Apr 1 17:27:38 2012 @@ -234,6 +234,7 @@ add_subdirectory(modules) add_subdirectory(ntoskrnl) add_subdirectory(subsystems) + add_subdirectory(win32ss) file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos) Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sun Apr 1 17:27:38 2012 @@ -39,7 +39,6 @@ add_subdirectory(faultrep) add_subdirectory(fmifs) add_subdirectory(fusion) -add_subdirectory(gdi32) add_subdirectory(gdiplus) add_subdirectory(getuname) add_subdirectory(glu32) @@ -200,7 +199,6 @@ add_subdirectory(updspapi) add_subdirectory(url) add_subdirectory(urlmon) -add_subdirectory(user32) add_subdirectory(userenv) add_subdirectory(usp10) add_subdirectory(uxtheme) Propchange: trunk/reactos/win32ss/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Apr 1 17:27:38 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/win32ss/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/win32ss/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/win32ss/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt (added) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sun Apr 1 17:27:38 2012 @@ -1,0 +1,3 @@ + +add_subdirectory(gdi/gdi32) +add_subdirectory(user/user32) Propchange: trunk/reactos/win32ss/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/win32ss/gdi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Apr 1 17:27:38 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/win32ss/gdi/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/win32ss/gdi/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/win32ss/gdi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/win32ss/user/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Apr 1 17:27:38 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/win32ss/user/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/win32ss/user/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/win32ss/user/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

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