Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 67471: [NDK] - Move definition of TIMER_TABLE_ENTRY from ntoskrnl to NDK - Add definitions of KTIMER_TABLE, KDPC_LIST, SYNCH_COUNTERS
by tkreuzer＠svn.reactos.org 28 Apr '15

28 Apr '15

Author: tkreuzer Date: Tue Apr 28 21:26:56 2015 New Revision: 67471 URL: http://svn.reactos.org/svn/reactos?rev=67471&view=rev Log: [NDK] - Move definition of TIMER_TABLE_ENTRY from ntoskrnl to NDK - Add definitions of KTIMER_TABLE, KDPC_LIST, SYNCH_COUNTERS Modified: trunk/reactos/include/ndk/amd64/ketypes.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Tue Apr 28 21:26:56 2015 @@ -906,21 +906,6 @@ ULONG64 Return; } KSWITCH_FRAME, *PKSWITCH_FRAME; -#if 0 -typedef struct _KTIMER_TABLE_ENTRY -{ - ULONG_PTR Lock; - LIST_ENTRY Entry; - ULARGE_INTEGER Time; -} KTIMER_TABLE_ENTRY, *PKTIMER_TABLE_ENTRY; - -typedef struct _KTIMER_TABLE -{ - KTIMER* TimerExpiry[64]; - KTIMER_TABLE_ENTRY TimerEntries[256]; -} KTIMER_TABLE, *PKTIMER_TABLE; -#endif - // // Inline function to get current KPRCB // 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] Tue Apr 28 21:26:56 2015 @@ -629,19 +629,97 @@ InsertApcEnvironment } KAPC_ENVIRONMENT; +typedef struct _KTIMER_TABLE_ENTRY +{ +#if (NTDDI_VERSION >= NTDDI_LONGHORN) || defined(_M_ARM) || defined(_M_AMD64) + KSPIN_LOCK Lock; +#endif + LIST_ENTRY Entry; + ULARGE_INTEGER Time; +} KTIMER_TABLE_ENTRY, *PKTIMER_TABLE_ENTRY; + +typedef struct _KTIMER_TABLE +{ + PKTIMER TimerExpiry[64]; + KTIMER_TABLE_ENTRY TimerEntries[256]; +} KTIMER_TABLE, *PKTIMER_TABLE; + +typedef struct _KDPC_LIST +{ + SINGLE_LIST_ENTRY ListHead; + SINGLE_LIST_ENTRY* LastEntry; +} KDPC_LIST, *PKDPC_LIST; + +typedef struct _SYNCH_COUNTERS +{ + ULONG SpinLockAcquireCount; + ULONG SpinLockContentionCount; + ULONG SpinLockSpinCount; + ULONG IpiSendRequestBroadcastCount; + ULONG IpiSendRequestRoutineCount; + ULONG IpiSendSoftwareInterruptCount; + ULONG ExInitializeResourceCount; + ULONG ExReInitializeResourceCount; + ULONG ExDeleteResourceCount; + ULONG ExecutiveResourceAcquiresCount; + ULONG ExecutiveResourceContentionsCount; + ULONG ExecutiveResourceReleaseExclusiveCount; + ULONG ExecutiveResourceReleaseSharedCount; + ULONG ExecutiveResourceConvertsCount; + ULONG ExAcqResExclusiveAttempts; + ULONG ExAcqResExclusiveAcquiresExclusive; + ULONG ExAcqResExclusiveAcquiresExclusiveRecursive; + ULONG ExAcqResExclusiveWaits; + ULONG ExAcqResExclusiveNotAcquires; + ULONG ExAcqResSharedAttempts; + ULONG ExAcqResSharedAcquiresExclusive; + ULONG ExAcqResSharedAcquiresShared; + ULONG ExAcqResSharedAcquiresSharedRecursive; + ULONG ExAcqResSharedWaits; + ULONG ExAcqResSharedNotAcquires; + ULONG ExAcqResSharedStarveExclusiveAttempts; + ULONG ExAcqResSharedStarveExclusiveAcquiresExclusive; + ULONG ExAcqResSharedStarveExclusiveAcquiresShared; + ULONG ExAcqResSharedStarveExclusiveAcquiresSharedRecursive; + ULONG ExAcqResSharedStarveExclusiveWaits; + ULONG ExAcqResSharedStarveExclusiveNotAcquires; + ULONG ExAcqResSharedWaitForExclusiveAttempts; + ULONG ExAcqResSharedWaitForExclusiveAcquiresExclusive; + ULONG ExAcqResSharedWaitForExclusiveAcquiresShared; + ULONG ExAcqResSharedWaitForExclusiveAcquiresSharedRecursive; + ULONG ExAcqResSharedWaitForExclusiveWaits; + ULONG ExAcqResSharedWaitForExclusiveNotAcquires; + ULONG ExSetResOwnerPointerExclusive; + ULONG ExSetResOwnerPointerSharedNew; + ULONG ExSetResOwnerPointerSharedOld; + ULONG ExTryToAcqExclusiveAttempts; + ULONG ExTryToAcqExclusiveAcquires; + ULONG ExBoostExclusiveOwner; + ULONG ExBoostSharedOwners; + ULONG ExEtwSynchTrackingNotificationsCount; + ULONG ExEtwSynchTrackingNotificationsAccountedCount; +} SYNCH_COUNTERS, *PSYNCH_COUNTERS; + // // PRCB DPC Data // typedef struct _KDPC_DATA { +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + KDPC_LIST DpcList; +#else LIST_ENTRY DpcListHead; +#endif ULONG_PTR DpcLock; -#ifdef _M_AMD64 +#if defined(_M_AMD64) || defined(_M_ARM) volatile LONG DpcQueueDepth; #else volatile ULONG DpcQueueDepth; #endif ULONG DpcCount; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) || defined(_M_ARM) + PKDPC ActiveDpc; +#endif } KDPC_DATA, *PKDPC_DATA; // Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Apr 28 21:26:56 2015 @@ -53,12 +53,6 @@ LONGLONG TSCDelta; ULONG MHz; } KI_SAMPLE_MAP, *PKI_SAMPLE_MAP; - -typedef struct _KTIMER_TABLE_ENTRY -{ - LIST_ENTRY Entry; - ULARGE_INTEGER Time; -} KTIMER_TABLE_ENTRY, *PKTIMER_TABLE_ENTRY; #define MAX_TIMER_DPCS 16

1 0

[tkreuzer] 67470: [NDK] Use portable definitions for service table constants. (Moved from ARM specific definition in ntoskrnl internal header, with a fixed value for TABLE_NUMBER_BITS, which is 1, ...
by tkreuzer＠svn.reactos.org 28 Apr '15

28 Apr '15

Author: tkreuzer Date: Tue Apr 28 21:26:37 2015 New Revision: 67470 URL: http://svn.reactos.org/svn/reactos?rev=67470&view=rev Log: [NDK] Use portable definitions for service table constants. (Moved from ARM specific definition in ntoskrnl internal header, with a fixed value for TABLE_NUMBER_BITS, which is 1, not 3) Modified: trunk/reactos/include/ndk/amd64/ketypes.h trunk/reactos/include/ndk/i386/asm.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Tue Apr 28 21:26:37 2015 @@ -157,15 +157,6 @@ #define PRCB_MAJOR_VERSION 1 #define PRCB_BUILD_DEBUG 1 #define PRCB_BUILD_UNIPROCESSOR 2 - -// -// Service Table -// -#define NUMBER_SERVICE_TABLES 2 -#define SERVICE_NUMBER_MASK 0xFFF -#define SERVICE_TABLE_SHIFT 7 -#define SERVICE_TABLE_MASK 0x20 -#define SERVICE_TABLE_TEST 0x20 // // HAL Variables Modified: trunk/reactos/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/asm.h?rev… ============================================================================== --- trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] Tue Apr 28 21:26:37 2015 @@ -611,11 +611,6 @@ // // System Call Table definitions // -#define NUMBER_SERVICE_TABLES 0x0002 -#define SERVICE_NUMBER_MASK 0x0FFF -#define SERVICE_TABLE_SHIFT 0x0008 -#define SERVICE_TABLE_MASK 0x0010 -#define SERVICE_TABLE_TEST 0x0010 #define SERVICE_DESCRIPTOR_BASE 0x0000 #define SERVICE_DESCRIPTOR_COUNT 0x0004 #define SERVICE_DESCRIPTOR_LIMIT 0x0008 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] Tue Apr 28 21:26:37 2015 @@ -28,6 +28,66 @@ #include <potypes.h> #include <ifssupp.h> #endif + +// +// A system call ID is formatted as such: +// .________________________________________________________________. +// | 14 | 13 | 12 | 11 | 10 | 9 | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | +// |--------------|-------------------------------------------------| +// | TABLE NUMBER | TABLE OFFSET | +// \----------------------------------------------------------------/ +// +// The table number is then used as an index into the service descriptor table. +#define TABLE_NUMBER_BITS 1 +#define TABLE_OFFSET_BITS 12 + +// +// There are 2 tables (kernel and shadow, used by Win32K) +// +#define NUMBER_SERVICE_TABLES 2 +#define NTOS_SERVICE_INDEX 0 +#define WIN32K_SERVICE_INDEX 1 + +// +// NB. From assembly code, the table number must be computed as an offset into +// the service descriptor table. +// +// Each entry into the table is 16 bytes long on 32-bit architectures, and +// 32 bytes long on 64-bit architectures. +// +// Thus, Table Number 1 is offset 16 (0x10) on x86, and offset 32 (0x20) on +// x64. +// +#ifdef _WIN64 +#define BITS_PER_ENTRY 5 // (1 << 5) = 32 bytes +#else +#define BITS_PER_ENTRY 4 // (1 << 4) = 16 bytes +#endif + +// +// We want the table number, but leave some extra bits to we can have the offset +// into the descriptor table. +// +#define SERVICE_TABLE_SHIFT (12 - BITS_PER_ENTRY) + +// +// Now the table number (as an offset) is corrupted with part of the table offset +// This mask will remove the extra unwanted bits, and give us the offset into the +// descriptor table proper. +// +#define SERVICE_TABLE_MASK (((1 << TABLE_NUMBER_BITS) - 1) << BITS_PER_ENTRY) + +// +// To get the table offset (ie: the service call number), just keep the 12 bits +// +#define SERVICE_NUMBER_MASK ((1 << TABLE_OFFSET_BITS) - 1) + +// +// We'll often need to check if this is a graphics call. This is done by comparing +// the table number offset with the known Win32K table number offset. +// This is usually index 1, so table number offset 0x10 (x86) or 0x20 (x64) +// +#define SERVICE_TABLE_TEST (WIN32K_SERVICE_INDEX << BITS_PER_ENTRY) // // Context Record Flags Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Apr 28 21:26:37 2015 @@ -159,70 +159,6 @@ /* One of the Reserved Wait Blocks, this one is for the Thread's Timer */ #define TIMER_WAIT_BLOCK 0x3L -#ifdef _M_ARM // FIXME: remove this once our headers are cleaned up -// -// A system call ID is formatted as such: -// .________________________________________________________________. -// | 14 | 13 | 12 | 11 | 10 | 9 | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | -// |--------------|-------------------------------------------------| -// | TABLE NUMBER | TABLE OFFSET | -// \----------------------------------------------------------------/ -// -// -// The table number is then used as an index into the service descriptor table. -#define TABLE_NUMBER_BITS 3 -#define TABLE_OFFSET_BITS 12 - -// -// There are 2 tables (kernel and shadow, used by Win32K) -// -#define NUMBER_SERVICE_TABLES 2 -#define NTOS_SERVICE_INDEX 0 -#define WIN32K_SERVICE_INDEX 1 - -// -// NB. From assembly code, the table number must be computed as an offset into -// the service descriptor table. -// -// Each entry into the table is 16 bytes long on 32-bit architectures, and -// 32 bytes long on 64-bit architectures. -// -// Thus, Table Number 1 is offset 16 (0x10) on x86, and offset 32 (0x20) on -// x64. -// -#ifdef _WIN64 -#define BITS_PER_ENTRY 5 // (1 << 5) = 32 bytes -#else -#define BITS_PER_ENTRY 4 // (1 << 4) = 16 bytes -#endif - -// -// We want the table number, but leave some extra bits to we can have the offset -// into the descriptor table. -// -#define SERVICE_TABLE_SHIFT (12 - BITS_PER_ENTRY) - -// -// Now the table number (as an offset) is corrupted with part of the table offset -// This mask will remove the extra unwanted bits, and give us the offset into the -// descriptor table proper. -// -#define SERVICE_TABLE_MASK (((1 << TABLE_NUMBER_BITS) - 1) << BITS_PER_ENTRY) - -// -// To get the table offset (ie: the service call number), just keep the 12 bits -// -#define SERVICE_NUMBER_MASK ((1 << TABLE_OFFSET_BITS) - 1) - -// -// We'll often need to check if this is a graphics call. This is done by comparing -// the table number offset with the known Win32K table number offset. -// This is usually index 1, so table number offset 0x10 (x86) or 0x20 (x64) -// -#define SERVICE_TABLE_TEST (WIN32K_SERVICE_INDEX << BITS_PER_ENTRY) - -#endif - #define KTS_SYSCALL_BIT (((KTRAP_STATE_BITS) { { .SystemCall = TRUE } }).Bits) #define KTS_PM_BIT (((KTRAP_STATE_BITS) { { .PreviousMode = TRUE } }).Bits) #define KTS_SEG_BIT (((KTRAP_STATE_BITS) { { .Segments = TRUE } }).Bits)

1 0

[tkreuzer] 67469: [NDK] - Move _MMPTE definition to arch specific files - Fix _MMPTE_HARDWARE on arm (struct, not union!)
by tkreuzer＠svn.reactos.org 28 Apr '15

28 Apr '15

Author: tkreuzer Date: Tue Apr 28 21:26:15 2015 New Revision: 67469 URL: http://svn.reactos.org/svn/reactos?rev=67469&view=rev Log: [NDK] - Move _MMPTE definition to arch specific files - Fix _MMPTE_HARDWARE on arm (struct, not union!) Modified: trunk/reactos/include/ndk/amd64/mmtypes.h trunk/reactos/include/ndk/arm/mmtypes.h trunk/reactos/include/ndk/i386/mmtypes.h trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/amd64/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/mmtypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] Tue Apr 28 21:26:15 2015 @@ -208,6 +208,24 @@ #endif } MMPTE_HARDWARE_LARGEPAGE, *PMMPTE_HARDWARE_LARGEPAGE; +typedef struct _MMPTE +{ + union + { + ULONG_PTR Long; + HARDWARE_PTE Flush; + MMPTE_HARDWARE Hard; + MMPTE_PROTOTYPE Proto; + MMPTE_SOFTWARE Soft; + MMPTE_TRANSITION Trans; + MMPTE_SUBSECTION Subsect; + MMPTE_LIST List; + } u; +} MMPTE, *PMMPTE, + MMPDE, *PMMPDE, + MMPPE, *PMMPPE, + MMPXE, *PMMPXE; + #ifdef __cplusplus }; // extern "C" #endif Modified: trunk/reactos/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/mmtypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] Tue Apr 28 21:26:15 2015 @@ -164,7 +164,7 @@ ULONG Prototype:1; } MMPTE_LIST; -typedef union _MMPTE_HARDWARE +typedef struct _MMPTE_HARDWARE { ULONG NoExecute:1; ULONG Valid:1; @@ -178,6 +178,28 @@ ULONG NonGlobal:1; ULONG PageFrameNumber:20; } MMPTE_HARDWARE, *PMMPTE_HARDWARE; + + +// +// Use the right PTE structure +// +#define HARDWARE_PTE HARDWARE_PTE_ARMV6 +#define PHARDWARE_PTE PHARDWARE_PTE_ARMV6 + +typedef struct _MMPTE +{ + union + { + ULONG_PTR Long; + HARDWARE_PTE Flush; + MMPTE_HARDWARE Hard; + MMPTE_PROTOTYPE Proto; + MMPTE_SOFTWARE Soft; + MMPTE_TRANSITION Trans; + MMPTE_SUBSECTION Subsect; + MMPTE_LIST List; + } u; +} MMPTE, *PMMPTE; typedef union _MMPDE_HARDWARE { @@ -200,12 +222,6 @@ } u; } MMPDE, *PMMPDE; -// -// Use the right PTE structure -// -#define HARDWARE_PTE HARDWARE_PTE_ARMV6 -#define PHARDWARE_PTE PHARDWARE_PTE_ARMV6 - #ifdef __cplusplus }; // extern "C" #endif Modified: trunk/reactos/include/ndk/i386/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/mmtypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] Tue Apr 28 21:26:15 2015 @@ -181,6 +181,22 @@ #define HARDWARE_PTE HARDWARE_PTE_X86 #define PHARDWARE_PTE PHARDWARE_PTE_X86 +typedef struct _MMPTE +{ + union + { + ULONG_PTR Long; + HARDWARE_PTE Flush; + MMPTE_HARDWARE Hard; + MMPTE_PROTOTYPE Proto; + MMPTE_SOFTWARE Soft; + MMPTE_TRANSITION Trans; + MMPTE_SUBSECTION Subsect; + MMPTE_LIST List; + } u; +} MMPTE, *PMMPTE, + MMPDE, *PMMPDE; + #ifdef __cplusplus }; // extern "C" #endif Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Tue Apr 28 21:26:15 2015 @@ -375,24 +375,6 @@ } SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; #ifndef NTOS_MODE_USER - -// -// PTE Structures -// -typedef struct _MMPTE -{ - union - { - ULONG_PTR Long; - HARDWARE_PTE Flush; - MMPTE_HARDWARE Hard; - MMPTE_PROTOTYPE Proto; - MMPTE_SOFTWARE Soft; - MMPTE_TRANSITION Trans; - MMPTE_SUBSECTION Subsect; - MMPTE_LIST List; - } u; -} MMPTE, *PMMPTE; // // Section Extension Information

1 0

[tkreuzer] 67468: [PSDK] Update sdkddkver.h with latest version constants up to windows 10.
by tkreuzer＠svn.reactos.org 28 Apr '15

28 Apr '15

Author: tkreuzer Date: Tue Apr 28 21:25:57 2015 New Revision: 67468 URL: http://svn.reactos.org/svn/reactos?rev=67468&view=rev Log: [PSDK] Update sdkddkver.h with latest version constants up to windows 10. Modified: trunk/reactos/include/psdk/sdkddkver.h Modified: trunk/reactos/include/psdk/sdkddkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sdkddkver.h?r… ============================================================================== --- trunk/reactos/include/psdk/sdkddkver.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sdkddkver.h [iso-8859-1] Tue Apr 28 21:25:57 2015 @@ -25,6 +25,10 @@ #define _WIN32_WINNT_WS08 0x0600 #define _WIN32_WINNT_LONGHORN 0x0600 #define _WIN32_WINNT_WIN7 0x0601 +#define _WIN32_WINNT_WIN8 0x0602 +#define _WIN32_WINNT_WINBLUE 0x0603 +#define _WIN32_WINNT_WINTHRESHOLD 0x0A00 +#define _WIN32_WINNT_WIN10 0x0A00 /* _WIN32_IE */ #define _WIN32_IE_IE20 0x0200 @@ -40,6 +44,9 @@ #define _WIN32_IE_IE60SP2 0x0603 #define _WIN32_IE_IE70 0x0700 #define _WIN32_IE_IE80 0x0800 +#define _WIN32_IE_IE90 0x0900 +#define _WIN32_IE_IE100 0x0A00 +#define _WIN32_IE_IE110 0x0A00 /* Mappings Between IE Version and Windows Version */ #define _WIN32_IE_NT4 _WIN32_IE_IE20 @@ -65,6 +72,10 @@ #define _WIN32_IE_WIN6 _WIN32_IE_IE70 #define _WIN32_IE_LONGHORN _WIN32_IE_IE70 #define _WIN32_IE_WIN7 _WIN32_IE_IE80 +#define _WIN32_IE_WIN8 _WIN32_IE_IE100 +#define _WIN32_IE_WINBLUE _WIN32_IE_IE100 +#define _WIN32_IE_WINTHRESHOLD _WIN32_IE_IE110 +#define _WIN32_IE_WIN10 _WIN32_IE_IE110 /* NTDDI_VERSION */ #define NTDDI_WIN2K 0x05000000 @@ -99,6 +110,9 @@ #define NTDDI_WS08SP4 NTDDI_WIN6SP4 #define NTDDI_WIN7 0x06010000 #define NTDDI_WIN8 0x06020000 +#define NTDDI_WINBLUE 0x06030000 +#define NTDDI_WINTHRESHOLD 0x0A000000 +#define NTDDI_WIN10 0x0A000000 /* Version Fields in NTDDI_VERSION */ #define OSVERSION_MASK 0xFFFF0000UL @@ -147,12 +161,18 @@ #elif (_WIN32_WINNT <= _WIN32_WINNT_WINXP) #define _WIN32_IE _WIN32_IE_IE60 #elif (_WIN32_WINNT <= _WIN32_WINNT_WS03) -#define _WIN32_IE 0x0602 +#define _WIN32_IE _WIN32_IE_WS03 +#elif (_WIN32_WINNT <= _WIN32_WINNT_VISTA) +#define _WIN32_IE _WIN32_IE_IE70 +#elif (_WIN32_WINNT <= _WIN32_WINNT_WIN7) +#define _WIN32_IE _WIN32_IE_IE80 +#elif (_WIN32_WINNT <= _WIN32_WINNT_WIN8) +#define _WIN32_IE _WIN32_IE_IE100 #else -#define _WIN32_IE 0x0700 +#define _WIN32_IE _WIN32_IE_IE110 #endif #else -#define _WIN32_IE 0x0700 +#define _WIN32_IE _WIN32_IE_IE110 #endif #endif

1 0

[tkreuzer] 67467: [FREELDR] Hey Arch, hyperspace is not the page table range! Rename HYPER_SPACE_ENTRY to SELFMAP_ENTRY.
by tkreuzer＠svn.reactos.org 28 Apr '15

28 Apr '15

Author: tkreuzer Date: Tue Apr 28 21:25:43 2015 New Revision: 67467 URL: http://svn.reactos.org/svn/reactos?rev=67467&view=rev Log: [FREELDR] Hey Arch, hyperspace is not the page table range! Rename HYPER_SPACE_ENTRY to SELFMAP_ENTRY. Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] Tue Apr 28 21:25:43 2015 @@ -14,8 +14,6 @@ #include <debug.h> //extern ULONG LoaderPagesSpanned; - -#define HYPER_SPACE_ENTRY 0x1EE DBG_DEFAULT_CHANNEL(WINDOWS); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] Tue Apr 28 21:25:43 2015 @@ -17,7 +17,7 @@ #undef KIP0PCRADDRESS #define KIP0PCRADDRESS 0xffdff000 -#define HYPER_SPACE_ENTRY 0x300 +#define SELFMAP_ENTRY 0x300 // This is needed only for SetProcessorContext routine #pragma pack(2) @@ -93,9 +93,9 @@ PDE = (PHARDWARE_PTE)Buffer; // Map the page directory at 0xC0000000 (maps itself) - PDE[HYPER_SPACE_ENTRY].PageFrameNumber = (ULONG)PDE >> MM_PAGE_SHIFT; - PDE[HYPER_SPACE_ENTRY].Valid = 1; - PDE[HYPER_SPACE_ENTRY].Write = 1; + PDE[SELFMAP_ENTRY].PageFrameNumber = (ULONG)PDE >> MM_PAGE_SHIFT; + PDE[SELFMAP_ENTRY].Valid = 1; + PDE[SELFMAP_ENTRY].Write = 1; // The last PDE slot is allocated for HAL's memory mapping (Virtual Addresses 0xFFC00000 - 0xFFFFFFFF) HalPageTable = (PHARDWARE_PTE)&Buffer[MM_PAGE_SIZE*1]; @@ -204,8 +204,8 @@ PHARDWARE_PTE KernelPT; PFN_NUMBER Entry = (Page >> 10) + (KSEG0_BASE >> 22); - /* Don't unmap hyperspace or HAL entries */ - if (Entry == HYPER_SPACE_ENTRY || Entry == 1023) + /* Don't unmap page directory or HAL entries */ + if (Entry == SELFMAP_ENTRY || Entry == 1023) return; if (PDE[Entry].Valid)

1 0

[tkreuzer] 67466: [NTOSKRNL] Fix MSVC warnings.
by tkreuzer＠svn.reactos.org 28 Apr '15

28 Apr '15

Author: tkreuzer Date: Tue Apr 28 21:25:21 2015 New Revision: 67466 URL: http://svn.reactos.org/svn/reactos?rev=67466&view=rev Log: [NTOSKRNL] Fix MSVC warnings. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/lpc/reply.c trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Tue Apr 28 21:25:21 2015 @@ -87,7 +87,7 @@ 0, REG_LINK, TargetKeyName, - wcslen(TargetKeyName) * sizeof(WCHAR)); + (ULONG)wcslen(TargetKeyName) * sizeof(WCHAR)); /* Close the link key handle */ ObCloseHandle(TargetKeyHandle, KernelMode); Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Tue Apr 28 21:25:21 2015 @@ -203,7 +203,7 @@ Length = DataBuffer->MountPointReparseBuffer.SubstituteNameLength; /* Check we don't overflow */ - if ((MAXUSHORT - DataBuffer->Reserved) <= (Length + sizeof(UNICODE_NULL))) + if (((ULONG)MAXUSHORT - DataBuffer->Reserved) <= (Length + sizeof(UNICODE_NULL))) { Irp->IoStatus.Status = STATUS_IO_REPARSE_DATA_INVALID; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Tue Apr 28 21:25:21 2015 @@ -219,7 +219,7 @@ PDEVICE_OBJECT DeviceObject = NULL; GUID FilterGuid; PZZWSTR SymbolicLinkList = NULL, LinkList; - ULONG TotalLength; + SIZE_T TotalLength; _SEH2_TRY { Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Tue Apr 28 21:25:21 2015 @@ -762,7 +762,7 @@ PORT_MESSAGE CapturedMessage; PLPCP_PORT_OBJECT Port = NULL; PETHREAD ClientThread = NULL; - ULONG LocalReturnlength; + SIZE_T LocalReturnlength; PLPCP_MESSAGE InfoMessage; PLPCP_DATA_INFO DataInfo; PVOID DataInfoBaseAddress; 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] Tue Apr 28 21:25:21 2015 @@ -972,7 +972,15 @@ /* Loop each PDE while holding the working set lock */ // MiLockWorkingSet(PsGetCurrentThread(), // &MmSessionSpace->GlobalVirtualAddress->Vm); -#ifndef _M_AMD64 +#ifdef _M_AMD64 +_WARN("MiSessionCommitPageTables halfplemented for amd64") + DBG_UNREFERENCED_LOCAL_VARIABLE(OldIrql); + DBG_UNREFERENCED_LOCAL_VARIABLE(Color); + DBG_UNREFERENCED_LOCAL_VARIABLE(TempPte); + DBG_UNREFERENCED_LOCAL_VARIABLE(Pfn1); + DBG_UNREFERENCED_LOCAL_VARIABLE(PageFrameNumber); + ASSERT(FALSE); +#else while (StartPde <= EndPde) { /* Check if we already have a page table */ @@ -2170,6 +2178,7 @@ ASSERT(SystemMapPde->u.Hard.Valid == 1); MI_WRITE_VALID_PDE(PointerPde, *SystemMapPde); #else + DBG_UNREFERENCED_LOCAL_VARIABLE(SystemMapPde); ASSERT(FALSE); #endif }

1 0

[cwittich] 67465: spelling fixes no code changes
by cwittich＠svn.reactos.org 28 Apr '15

28 Apr '15

Author: cwittich Date: Tue Apr 28 19:22:43 2015 New Revision: 67465 URL: http://svn.reactos.org/svn/reactos?rev=67465&view=rev Log: spelling fixes no code changes Modified: trunk/reactos/lib/drivers/libusb/common_interfaces.h trunk/reactos/lib/drivers/libusb/hub_controller.cpp Modified: trunk/reactos/lib/drivers/libusb/common_interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/common_… ============================================================================== --- trunk/reactos/lib/drivers/libusb/common_interfaces.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/common_interfaces.h [iso-8859-1] Tue Apr 28 19:22:43 2015 @@ -25,7 +25,7 @@ //--------------------------------------------------------------------------- // -// Object Hierachy +// Object Hierarchy // -------------------------------------------------------------------- // | IRootHCDController | // | IHCDController Intel USB Universal Host Controller - 3A37 | @@ -673,7 +673,7 @@ // // AbortPipe // -// Description: aborts all pending requsts +// Description: aborts all pending requests virtual NTSTATUS AbortPipe(IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor) = 0; @@ -681,7 +681,7 @@ // // GetMaxPacketSize // -// Description: aborts all pending requsts +// Description: aborts all pending requests virtual UCHAR GetMaxPacketSize() = 0; }; Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Tue Apr 28 19:22:43 2015 @@ -327,7 +327,7 @@ // - // If theres a flag in PortChange return TRUE so the SCE Irp will be completed + // If there's a flag in PortChange return TRUE so the SCE Irp will be completed // if (PortChange != 0) {

1 0

[tfaber] 67464: [NTOS:MM] - Consistently return STATUS_INVALID_IMAGE_PROTECT from PeFmtCreateSection if the PE signature is missing. Patch by V. CORE-9618 #resolve
by tfaber＠svn.reactos.org 28 Apr '15

28 Apr '15

Author: tfaber Date: Tue Apr 28 07:07:57 2015 New Revision: 67464 URL: http://svn.reactos.org/svn/reactos?rev=67464&view=rev Log: [NTOS:MM] - Consistently return STATUS_INVALID_IMAGE_PROTECT from PeFmtCreateSection if the PE signature is missing. Patch by V. CORE-9618 #resolve Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Apr 28 07:07:57 2015 @@ -330,11 +330,13 @@ { ULONG cbOptHeaderOffsetSize = 0; - nStatus = STATUS_INVALID_IMAGE_FORMAT; + nStatus = STATUS_INVALID_IMAGE_PROTECT; /* don't trust an invalid NT header */ if(pinhNtHeader->Signature != IMAGE_NT_SIGNATURE) DIE(("The file isn't a PE executable, Signature is %X\n", pinhNtHeader->Signature)); + + nStatus = STATUS_INVALID_IMAGE_FORMAT; if(!Intsafe_AddULong32(&cbOptHeaderOffsetSize, pidhDosHeader->e_lfanew, FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader))) DIE(("The DOS stub is too large, e_lfanew is %X\n", pidhDosHeader->e_lfanew));

1 0

[aandrejevic] 67463: [FAST486] The segment loading/storing MOV is always 16-bit and ignores OPSIZE.
by aandrejevic＠svn.reactos.org 28 Apr '15

28 Apr '15

Author: aandrejevic Date: Tue Apr 28 00:56:56 2015 New Revision: 67463 URL: http://svn.reactos.org/svn/reactos?rev=67463&view=rev Log: [FAST486] The segment loading/storing MOV is always 16-bit and ignores OPSIZE. Modified: trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Tue Apr 28 00:56:56 2015 @@ -3832,16 +3832,13 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeMovStoreSeg) { - BOOLEAN OperandSize, AddressSize; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; FAST486_MOD_REG_RM ModRegRm; - OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; - /* Make sure this is the right instruction */ ASSERT(Opcode == 0x8C); TOGGLE_ADSIZE(AddressSize); - TOGGLE_OPSIZE(OperandSize); /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -3857,20 +3854,10 @@ return; } - if (OperandSize) - { - Fast486WriteModrmDwordOperands(State, - &ModRegRm, - FALSE, - State->SegmentRegs[ModRegRm.Register].Selector); - } - else - { - Fast486WriteModrmWordOperands(State, - &ModRegRm, - FALSE, - State->SegmentRegs[ModRegRm.Register].Selector); - } + Fast486WriteModrmWordOperands(State, + &ModRegRm, + FALSE, + State->SegmentRegs[ModRegRm.Register].Selector); } FAST486_OPCODE_HANDLER(Fast486OpcodeLea) @@ -3921,16 +3908,14 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeMovLoadSeg) { - BOOLEAN OperandSize, AddressSize; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; FAST486_MOD_REG_RM ModRegRm; - - OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + USHORT Selector; /* Make sure this is the right instruction */ ASSERT(Opcode == 0x8E); TOGGLE_ADSIZE(AddressSize); - TOGGLE_OPSIZE(OperandSize); /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -3947,37 +3932,16 @@ return; } - if (OperandSize) - { - ULONG Selector; - - if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, NULL, &Selector)) - { - /* Exception occurred */ - return; - } - - if (!Fast486LoadSegment(State, ModRegRm.Register, LOWORD(Selector))) - { - /* Exception occurred */ - return; - } - } - else - { - USHORT Selector; - - if (!Fast486ReadModrmWordOperands(State, &ModRegRm, NULL, &Selector)) - { - /* Exception occurred */ - return; - } - - if (!Fast486LoadSegment(State, ModRegRm.Register, Selector)) - { - /* Exception occurred */ - return; - } + if (!Fast486ReadModrmWordOperands(State, &ModRegRm, NULL, &Selector)) + { + /* Exception occurred */ + return; + } + + if (!Fast486LoadSegment(State, ModRegRm.Register, Selector)) + { + /* Exception occurred */ + return; } if ((INT)ModRegRm.Register == FAST486_REG_SS)

1 0

[aandrejevic] 67462: [NTVDM] In DosAllocateMemory, when the "last fit" allocation strategy is selected, split the block so that the last part of it is used.
by aandrejevic＠svn.reactos.org 27 Apr '15

27 Apr '15

Author: aandrejevic Date: Mon Apr 27 18:23:39 2015 New Revision: 67462 URL: http://svn.reactos.org/svn/reactos?rev=67462&view=rev Log: [NTVDM] In DosAllocateMemory, when the "last fit" allocation strategy is selected, split the block so that the last part of it is used. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Mon Apr 27 18:23:39 2015 @@ -57,7 +57,7 @@ WORD DosAllocateMemory(WORD Size, WORD *MaxAvailable) { WORD Result = 0, Segment = FIRST_MCB_SEGMENT, MaxSize = 0; - PDOS_MCB CurrentMcb, NextMcb; + PDOS_MCB CurrentMcb; BOOLEAN SearchUmb = FALSE; DPRINT("DosAllocateMemory: Size 0x%04X\n", Size); @@ -159,16 +159,37 @@ if (CurrentMcb->Size > Size) { /* It is, split it into two blocks */ - NextMcb = SEGMENT_TO_MCB(Result + Size + 1); - - /* Initialize the new MCB structure */ - NextMcb->BlockType = CurrentMcb->BlockType; - NextMcb->Size = CurrentMcb->Size - Size - 1; - NextMcb->OwnerPsp = 0; - - /* Update the current block */ - CurrentMcb->BlockType = 'M'; - CurrentMcb->Size = Size; + if ((DosAllocStrategy & 0x3F) != DOS_ALLOC_LAST_FIT) + { + PDOS_MCB NextMcb = SEGMENT_TO_MCB(Result + Size + 1); + + /* Initialize the new MCB structure */ + NextMcb->BlockType = CurrentMcb->BlockType; + NextMcb->Size = CurrentMcb->Size - Size - 1; + NextMcb->OwnerPsp = 0; + + /* Update the current block */ + CurrentMcb->BlockType = 'M'; + CurrentMcb->Size = Size; + } + else + { + /* Save the location of the current MCB */ + PDOS_MCB PreviousMcb = CurrentMcb; + + /* Move the current MCB higher */ + Result += CurrentMcb->Size - Size; + CurrentMcb = SEGMENT_TO_MCB(Result); + + /* Initialize the new MCB structure */ + CurrentMcb->BlockType = PreviousMcb->BlockType; + CurrentMcb->Size = Size; + CurrentMcb->OwnerPsp = 0; + + /* Update the previous block */ + PreviousMcb->BlockType = 'M'; + PreviousMcb->Size -= Size + 1; + } } /* Take ownership of the block */

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