Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 66281: [KMTESTS] - Add KmtGetSystemRoutineAddress and use it to avoid importing functions that are not available in some versions of Windows. This allows running kmtests on Windows XP SP3 ...
by tfaber＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: tfaber Date: Sun Feb 15 10:23:21 2015 New Revision: 66281 URL: http://svn.reactos.org/svn/reactos?rev=66281&view=rev Log: [KMTESTS] - Add KmtGetSystemRoutineAddress and use it to avoid importing functions that are not available in some versions of Windows. This allows running kmtests on Windows XP SP3 (and probably Server 2003 SP0/SP2). Note that failures on XP are still not valid bugs, this is purely for convenience! Dedicated to Jérôme. ROSTESTS-150 Modified: trunk/rostests/kmtests/include/kmt_test.h trunk/rostests/kmtests/include/kmt_test_kernel.h trunk/rostests/kmtests/kmtest_drv/testlist.c trunk/rostests/kmtests/ntos_ex/ExFastMutex.c trunk/rostests/kmtests/ntos_ex/ExResource.c trunk/rostests/kmtests/ntos_ke/KeApc.c trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c trunk/rostests/kmtests/ntos_ke/KeMutex.c trunk/rostests/kmtests/ntos_ke/KeSpinLock.c Modified: trunk/rostests/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_test.… ============================================================================== --- trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -132,6 +132,7 @@ BOOLEAN KmtAreInterruptsEnabled(VOID); ULONG KmtGetPoolTag(PVOID Memory); USHORT KmtGetPoolType(PVOID Memory); +PVOID KmtGetSystemRoutineAddress(IN PCWSTR RoutineName); PKTHREAD KmtStartThread(IN PKSTART_ROUTINE StartRoutine, IN PVOID StartContext OPTIONAL); VOID KmtFinishThread(IN PKTHREAD Thread OPTIONAL, IN PKEVENT Event OPTIONAL); #elif defined KMT_USER_MODE Modified: trunk/rostests/kmtests/include/kmt_test_kernel.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_test_… ============================================================================== --- trunk/rostests/kmtests/include/kmt_test_kernel.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_test_kernel.h [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -126,6 +126,13 @@ return Header->PoolType; } +PVOID KmtGetSystemRoutineAddress(IN PCWSTR RoutineName) +{ + UNICODE_STRING RoutineNameString; + RtlInitUnicodeString(&RoutineNameString, (PWSTR)RoutineName); + return MmGetSystemRoutineAddress(&RoutineNameString); +} + PKTHREAD KmtStartThread(IN PKSTART_ROUTINE StartRoutine, IN PVOID StartContext OPTIONAL) { NTSTATUS Status; Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -94,7 +94,7 @@ { "KeIrql", Test_KeIrql }, { "KeMutex", Test_KeMutex }, { "-KeProcessor", Test_KeProcessor }, - { "KeSpinLock", Test_KeSpinLock }, + { "KeSpinLock", Test_KeSpinLock }, { "KeTimer", Test_KeTimer }, { "-KernelType", Test_KernelType }, { "MmSection", Test_MmSection }, Modified: trunk/rostests/kmtests/ntos_ex/ExFastMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExFastMut… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExFastMutex.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExFastMutex.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -10,9 +10,23 @@ //#define NDEBUG #include <debug.h> -NTKERNELAPI VOID FASTCALL ExiAcquireFastMutex(IN OUT PFAST_MUTEX FastMutex); -NTKERNELAPI VOID FASTCALL ExiReleaseFastMutex(IN OUT PFAST_MUTEX FastMutex); -NTKERNELAPI BOOLEAN FASTCALL ExiTryToAcquireFastMutex(IN OUT PFAST_MUTEX FastMutex); +static +VOID +(FASTCALL +*pExEnterCriticalRegionAndAcquireFastMutexUnsafe)( + _Inout_ PFAST_MUTEX FastMutex +); + +static +VOID +(FASTCALL +*pExReleaseFastMutexUnsafeAndLeaveCriticalRegion)( + _Inout_ PFAST_MUTEX FastMutex +); + +static VOID (FASTCALL *pExiAcquireFastMutex)(IN OUT PFAST_MUTEX FastMutex); +static VOID (FASTCALL *pExiReleaseFastMutex)(IN OUT PFAST_MUTEX FastMutex); +static BOOLEAN (FASTCALL *pExiTryToAcquireFastMutex)(IN OUT PFAST_MUTEX FastMutex); #define CheckMutex(Mutex, ExpectedCount, ExpectedOwner, \ ExpectedContention, ExpectedOldIrql, \ @@ -44,15 +58,18 @@ ExReleaseFastMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, OriginalIrql, OriginalIrql); -#ifdef _M_IX86 /* ntoskrnl's fastcall version */ - ExiAcquireFastMutex(Mutex); - CheckMutex(Mutex, 0L, Thread, 0LU, OriginalIrql, APC_LEVEL); - ok_bool_false(ExiTryToAcquireFastMutex(Mutex), "ExiTryToAcquireFastMutex returned"); - CheckMutex(Mutex, 0L, Thread, 0LU, OriginalIrql, APC_LEVEL); - ExiReleaseFastMutex(Mutex); - CheckMutex(Mutex, 1L, NULL, 0LU, OriginalIrql, OriginalIrql); -#endif + if (!skip(pExiAcquireFastMutex && + pExiReleaseFastMutex && + pExiTryToAcquireFastMutex, "No fastcall fast mutex functions\n")) + { + pExiAcquireFastMutex(Mutex); + CheckMutex(Mutex, 0L, Thread, 0LU, OriginalIrql, APC_LEVEL); + ok_bool_false(pExiTryToAcquireFastMutex(Mutex), "ExiTryToAcquireFastMutex returned"); + CheckMutex(Mutex, 0L, Thread, 0LU, OriginalIrql, APC_LEVEL); + pExiReleaseFastMutex(Mutex); + CheckMutex(Mutex, 1L, NULL, 0LU, OriginalIrql, OriginalIrql); + } /* try to acquire */ ok_bool_true(ExTryToAcquireFastMutex(Mutex), "ExTryToAcquireFastMutex returned"); @@ -61,9 +78,14 @@ CheckMutex(Mutex, 1L, NULL, 0LU, OriginalIrql, OriginalIrql); /* shortcut functions with critical region */ - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(Mutex); - ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(Mutex); + if (!skip(pExEnterCriticalRegionAndAcquireFastMutexUnsafe && + pExReleaseFastMutexUnsafeAndLeaveCriticalRegion, + "Shortcut functions not available")) + { + pExEnterCriticalRegionAndAcquireFastMutexUnsafe(Mutex); + ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + pExReleaseFastMutexUnsafeAndLeaveCriticalRegion(Mutex); + } /* acquire/release unsafe */ if (!KmtIsCheckedBuild || OriginalIrql == APC_LEVEL) @@ -291,6 +313,13 @@ FAST_MUTEX Mutex; KIRQL Irql; + pExEnterCriticalRegionAndAcquireFastMutexUnsafe = KmtGetSystemRoutineAddress(L"ExEnterCriticalRegionAndAcquireFastMutexUnsafe"); + pExReleaseFastMutexUnsafeAndLeaveCriticalRegion = KmtGetSystemRoutineAddress(L"ExReleaseFastMutexUnsafeAndLeaveCriticalRegion"); + + pExiAcquireFastMutex = KmtGetSystemRoutineAddress(L"ExiAcquireFastMutex"); + pExiReleaseFastMutex = KmtGetSystemRoutineAddress(L"ExiReleaseFastMutex"); + pExiTryToAcquireFastMutex = KmtGetSystemRoutineAddress(L"ExiTryToAcquireFastMutex"); + memset(&Mutex, 0x55, sizeof Mutex); ExInitializeFastMutex(&Mutex); CheckMutex(&Mutex, 1L, NULL, 0LU, 0x55555555LU, PASSIVE_LEVEL); Modified: trunk/rostests/kmtests/ntos_ex/ExResource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExResourc… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExResource.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExResource.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -9,6 +9,49 @@ //#define NDEBUG #include <debug.h> + +static +_IRQL_requires_max_(APC_LEVEL) +_Acquires_lock_(_Global_critical_region_) +PVOID +(NTAPI +*pExEnterCriticalRegionAndAcquireResourceShared)( + _Inout_ _Requires_lock_not_held_(*_Curr_) _Acquires_shared_lock_(*_Curr_) + PERESOURCE Resource); + +static +_IRQL_requires_max_(APC_LEVEL) +_Acquires_lock_(_Global_critical_region_) +PVOID +(NTAPI +*pExEnterCriticalRegionAndAcquireResourceExclusive)( + _Inout_ _Requires_lock_not_held_(*_Curr_) _Acquires_exclusive_lock_(*_Curr_) + PERESOURCE Resource); + +static +_IRQL_requires_max_(APC_LEVEL) +_Acquires_lock_(_Global_critical_region_) +PVOID +(NTAPI +*pExEnterCriticalRegionAndAcquireSharedWaitForExclusive)( + _Inout_ _Requires_lock_not_held_(*_Curr_) _Acquires_lock_(*_Curr_) + PERESOURCE Resource); + +static +_IRQL_requires_max_(DISPATCH_LEVEL) +_Releases_lock_(_Global_critical_region_) +VOID +(FASTCALL +*pExReleaseResourceAndLeaveCriticalRegion)( + _Inout_ _Requires_lock_held_(*_Curr_) _Releases_lock_(*_Curr_) + PERESOURCE Resource); + +static +_IRQL_requires_min_(PASSIVE_LEVEL) +_IRQL_requires_max_(DISPATCH_LEVEL) +BOOLEAN +(NTAPI +*pKeAreAllApcsDisabled)(VOID); /* TODO: This is getting pretty long, make it somehow easier to read if possible */ @@ -137,65 +180,83 @@ LONG Count = 0; ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_uint(KeAreAllApcsDisabled(), AreApcsDisabled); - + if (pKeAreAllApcsDisabled) + ok_eq_uint(pKeAreAllApcsDisabled(), AreApcsDisabled); + + if (skip(pExEnterCriticalRegionAndAcquireResourceShared && + pExEnterCriticalRegionAndAcquireSharedWaitForExclusive && + pExEnterCriticalRegionAndAcquireResourceExclusive && + pExReleaseResourceAndLeaveCriticalRegion, "No shortcuts\n")) + { + return; + } /* ExEnterCriticalRegionAndAcquireResourceShared, ExEnterCriticalRegionAndAcquireSharedWaitForExclusive */ Count = 0; - Ret = ExEnterCriticalRegionAndAcquireResourceShared(Res); ++Count; + Ret = pExEnterCriticalRegionAndAcquireResourceShared(Res); ++Count; ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); - CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); - - Ret = ExEnterCriticalRegionAndAcquireResourceShared(Res); ++Count; + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + + Ret = pExEnterCriticalRegionAndAcquireResourceShared(Res); ++Count; ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); - CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); - - ExEnterCriticalRegionAndAcquireSharedWaitForExclusive(Res); ++Count; + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + + pExEnterCriticalRegionAndAcquireSharedWaitForExclusive(Res); ++Count; ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); while (Count-- > 1) { - ExReleaseResourceAndLeaveCriticalRegion(Res); + pExReleaseResourceAndLeaveCriticalRegion(Res); ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); } - ExReleaseResourceAndLeaveCriticalRegion(Res); + pExReleaseResourceAndLeaveCriticalRegion(Res); ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); /* ExEnterCriticalRegionAndAcquireResourceExclusive */ Count = 0; ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); - Ret = ExEnterCriticalRegionAndAcquireResourceExclusive(Res); ++Count; + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); + Ret = pExEnterCriticalRegionAndAcquireResourceExclusive(Res); ++Count; ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, TRUE, Count, 0LU, 0LU); - Ret = ExEnterCriticalRegionAndAcquireResourceExclusive(Res); ++Count; + Ret = pExEnterCriticalRegionAndAcquireResourceExclusive(Res); ++Count; ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, TRUE, Count, 0LU, 0LU); - ExReleaseResourceAndLeaveCriticalRegion(Res); --Count; + pExReleaseResourceAndLeaveCriticalRegion(Res); --Count; ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_bool(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, TRUE, Count, 0LU, 0LU); - ExReleaseResourceAndLeaveCriticalRegion(Res); --Count; + pExReleaseResourceAndLeaveCriticalRegion(Res); --Count; ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); - ok_eq_uint(KeAreAllApcsDisabled(), AreApcsDisabled); + if (pKeAreAllApcsDisabled) + ok_eq_uint(pKeAreAllApcsDisabled(), AreApcsDisabled); CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); } @@ -400,6 +461,17 @@ ERESOURCE Res; KIRQL Irql; + pExEnterCriticalRegionAndAcquireResourceShared = KmtGetSystemRoutineAddress(L"ExEnterCriticalRegionAndAcquireResourceShared"); + pExEnterCriticalRegionAndAcquireSharedWaitForExclusive = KmtGetSystemRoutineAddress(L"ExEnterCriticalRegionAndAcquireSharedWaitForExclusive"); + pExEnterCriticalRegionAndAcquireResourceExclusive = KmtGetSystemRoutineAddress(L"ExEnterCriticalRegionAndAcquireResourceExclusive"); + pExReleaseResourceAndLeaveCriticalRegion = KmtGetSystemRoutineAddress(L"ExReleaseResourceAndLeaveCriticalRegion"); + pKeAreAllApcsDisabled = KmtGetSystemRoutineAddress(L"KeAreAllApcsDisabled"); + + if (skip(pKeAreAllApcsDisabled != NULL, "KeAreAllApcsDisabled unavailable\n")) + { + /* We can live without this function here */ + } + /* this must be true even with the different structure versions */ ASSERT(sizeof(ERESOURCE) == sizeof(ERESOURCE_2K3)); Modified: trunk/rostests/kmtests/ntos_ke/KeApc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeApc.c?r… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeApc.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeApc.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -7,11 +7,33 @@ #include <kmt_test.h> +static +_IRQL_requires_min_(PASSIVE_LEVEL) +_IRQL_requires_max_(DISPATCH_LEVEL) +BOOLEAN +(NTAPI +*pKeAreAllApcsDisabled)(VOID); + +static +_Acquires_lock_(_Global_critical_region_) +_IRQL_requires_max_(APC_LEVEL) +VOID +(NTAPI +*pKeEnterGuardedRegion)(VOID); + +static +_Releases_lock_(_Global_critical_region_) +_IRQL_requires_max_(APC_LEVEL) +VOID +(NTAPI +*pKeLeaveGuardedRegion)(VOID); + #define CheckApcs(KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, Irql) do \ { \ ok_eq_bool(KeAreApcsDisabled(), KernelApcsDisabled || SpecialApcsDisabled); \ ok_eq_int(Thread->KernelApcDisable, KernelApcsDisabled); \ - ok_eq_bool(KeAreAllApcsDisabled(), AllApcsDisabled); \ + if (pKeAreAllApcsDisabled) \ + ok_eq_bool(pKeAreAllApcsDisabled(), AllApcsDisabled); \ ok_eq_int(Thread->SpecialApcDisable, SpecialApcsDisabled); \ ok_irql(Irql); \ } while (0) @@ -19,7 +41,18 @@ START_TEST(KeApc) { KIRQL Irql; - PKTHREAD Thread = KeGetCurrentThread(); + PKTHREAD Thread; + + pKeAreAllApcsDisabled = KmtGetSystemRoutineAddress(L"KeAreAllApcsDisabled"); + pKeEnterGuardedRegion = KmtGetSystemRoutineAddress(L"KeEnterGuardedRegion"); + pKeLeaveGuardedRegion = KmtGetSystemRoutineAddress(L"KeLeaveGuardedRegion"); + + if (skip(pKeAreAllApcsDisabled != NULL, "KeAreAllApcsDisabled unavailable\n")) + { + /* We can live without this function here */ + } + + Thread = KeGetCurrentThread(); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); @@ -38,37 +71,41 @@ CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); /* guarded region */ - KeEnterGuardedRegion(); - CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); - KeEnterGuardedRegion(); - CheckApcs(0, -2, TRUE, PASSIVE_LEVEL); - KeEnterGuardedRegion(); - CheckApcs(0, -3, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(0, -2, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - - /* mix them */ - KeEnterGuardedRegion(); - CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); - KeEnterCriticalRegion(); - CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); - KeLeaveCriticalRegion(); - CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - - KeEnterCriticalRegion(); - CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); - KeEnterGuardedRegion(); - CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); - KeLeaveCriticalRegion(); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + if (!skip(pKeEnterGuardedRegion && + pKeLeaveGuardedRegion, "Guarded regions not available\n")) + { + pKeEnterGuardedRegion(); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); + pKeEnterGuardedRegion(); + CheckApcs(0, -2, TRUE, PASSIVE_LEVEL); + pKeEnterGuardedRegion(); + CheckApcs(0, -3, TRUE, PASSIVE_LEVEL); + pKeLeaveGuardedRegion(); + CheckApcs(0, -2, TRUE, PASSIVE_LEVEL); + pKeLeaveGuardedRegion(); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); + pKeLeaveGuardedRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + /* mix them */ + pKeEnterGuardedRegion(); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); + KeEnterCriticalRegion(); + CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); + pKeLeaveGuardedRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + KeEnterCriticalRegion(); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + pKeEnterGuardedRegion(); + CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); + pKeLeaveGuardedRegion(); + CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + } /* leave without entering */ if (!KmtIsCheckedBuild) @@ -78,19 +115,23 @@ KeEnterCriticalRegion(); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(0, 1, TRUE, PASSIVE_LEVEL); - KeEnterGuardedRegion(); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - - KeLeaveCriticalRegion(); - CheckApcs(1, 0, FALSE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(1, 1, TRUE, PASSIVE_LEVEL); - KeEnterCriticalRegion(); - CheckApcs(0, 1, TRUE, PASSIVE_LEVEL); - KeEnterGuardedRegion(); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + if (!skip(pKeEnterGuardedRegion && + pKeLeaveGuardedRegion, "Guarded regions not available\n")) + { + pKeLeaveGuardedRegion(); + CheckApcs(0, 1, TRUE, PASSIVE_LEVEL); + pKeEnterGuardedRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + KeLeaveCriticalRegion(); + CheckApcs(1, 0, FALSE, PASSIVE_LEVEL); + pKeLeaveGuardedRegion(); + CheckApcs(1, 1, TRUE, PASSIVE_LEVEL); + KeEnterCriticalRegion(); + CheckApcs(0, 1, TRUE, PASSIVE_LEVEL); + pKeEnterGuardedRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + } } /* manually disable APCs */ @@ -130,38 +171,42 @@ CheckApcs(0, 0, TRUE, HIGH_LEVEL); /* Ke*GuardedRegion assert at > APC_LEVEL */ - if (!KmtIsCheckedBuild) + if (!KmtIsCheckedBuild && + !skip(pKeEnterGuardedRegion && + pKeLeaveGuardedRegion, "Guarded regions not available\n")) { - KeEnterGuardedRegion(); + pKeEnterGuardedRegion(); CheckApcs(0, -1, TRUE, HIGH_LEVEL); - KeLeaveGuardedRegion(); + pKeLeaveGuardedRegion(); } CheckApcs(0, 0, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - if (!KmtIsCheckedBuild) + if (!KmtIsCheckedBuild && + !skip(pKeEnterGuardedRegion && + pKeLeaveGuardedRegion, "Guarded regions not available\n")) { KeRaiseIrql(HIGH_LEVEL, &Irql); CheckApcs(0, 0, TRUE, HIGH_LEVEL); KeEnterCriticalRegion(); CheckApcs(-1, 0, TRUE, HIGH_LEVEL); - KeEnterGuardedRegion(); + pKeEnterGuardedRegion(); CheckApcs(-1, -1, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); CheckApcs(-1, -1, TRUE, PASSIVE_LEVEL); KeLeaveCriticalRegion(); CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); - CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); - - KeEnterGuardedRegion(); + pKeLeaveGuardedRegion(); + CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); + + pKeEnterGuardedRegion(); CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); KeRaiseIrql(HIGH_LEVEL, &Irql); CheckApcs(0, -1, TRUE, HIGH_LEVEL); KeEnterCriticalRegion(); CheckApcs(-1, -1, TRUE, HIGH_LEVEL); - KeLeaveGuardedRegion(); + pKeLeaveGuardedRegion(); CheckApcs(-1, 0, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); @@ -172,13 +217,13 @@ CheckApcs(-1, 0, FALSE, PASSIVE_LEVEL); KeRaiseIrql(HIGH_LEVEL, &Irql); CheckApcs(-1, 0, TRUE, HIGH_LEVEL); - KeEnterGuardedRegion(); + pKeEnterGuardedRegion(); CheckApcs(-1, -1, TRUE, HIGH_LEVEL); KeLeaveCriticalRegion(); CheckApcs(0, -1, TRUE, HIGH_LEVEL); KeLowerIrql(Irql); CheckApcs(0, -1, TRUE, PASSIVE_LEVEL); - KeLeaveGuardedRegion(); + pKeLeaveGuardedRegion(); CheckApcs(0, 0, FALSE, PASSIVE_LEVEL); } Modified: trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeGuarded… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -9,6 +9,86 @@ #define NDEBUG #include <debug.h> + +static +_IRQL_requires_min_(PASSIVE_LEVEL) +_IRQL_requires_max_(DISPATCH_LEVEL) +BOOLEAN +(NTAPI +*pKeAreAllApcsDisabled)(VOID); + +static +_Acquires_lock_(_Global_critical_region_) +_Requires_lock_not_held_(*Mutex) +_Acquires_lock_(*Mutex) +_IRQL_requires_max_(APC_LEVEL) +_IRQL_requires_min_(PASSIVE_LEVEL) +VOID +(FASTCALL +*pKeAcquireGuardedMutex)( + _Inout_ PKGUARDED_MUTEX GuardedMutex); + +static +_Requires_lock_not_held_(*FastMutex) +_Acquires_lock_(*FastMutex) +_IRQL_requires_max_(APC_LEVEL) +_IRQL_requires_min_(PASSIVE_LEVEL) +VOID +(FASTCALL +*pKeAcquireGuardedMutexUnsafe)( + _Inout_ PKGUARDED_MUTEX GuardedMutex); + +static +_Acquires_lock_(_Global_critical_region_) +_IRQL_requires_max_(APC_LEVEL) +VOID +(NTAPI +*pKeEnterGuardedRegion)(VOID); + +static +_Releases_lock_(_Global_critical_region_) +_IRQL_requires_max_(APC_LEVEL) +VOID +(NTAPI +*pKeLeaveGuardedRegion)(VOID); + +static +_IRQL_requires_max_(APC_LEVEL) +_IRQL_requires_min_(PASSIVE_LEVEL) +VOID +(FASTCALL +*pKeInitializeGuardedMutex)( + _Out_ PKGUARDED_MUTEX GuardedMutex); + +static +_Requires_lock_held_(*FastMutex) +_Releases_lock_(*FastMutex) +_IRQL_requires_max_(APC_LEVEL) +VOID +(FASTCALL +*pKeReleaseGuardedMutexUnsafe)( + _Inout_ PKGUARDED_MUTEX GuardedMutex); + +static +_Releases_lock_(_Global_critical_region_) +_Requires_lock_held_(*Mutex) +_Releases_lock_(*Mutex) +_IRQL_requires_max_(APC_LEVEL) +VOID +(FASTCALL +*pKeReleaseGuardedMutex)( + _Inout_ PKGUARDED_MUTEX GuardedMutex); + +static +_Must_inspect_result_ +_Success_(return != FALSE) +_IRQL_requires_max_(APC_LEVEL) +_Post_satisfies_(return == 1 || return == 0) +BOOLEAN +(FASTCALL +*pKeTryToAcquireGuardedMutex)( + _When_ (return, _Requires_lock_not_held_(*_Curr_) _Acquires_exclusive_lock_(*_Curr_)) _Acquires_lock_(_Global_critical_region_) + _Inout_ PKGUARDED_MUTEX GuardedMutex); #define CheckMutex(Mutex, ExpectedCount, ExpectedOwner, ExpectedContention, \ ExpectedKernelApcDisable, ExpectedSpecialApcDisable, \ @@ -25,7 +105,7 @@ ok_eq_int((Mutex)->SpecialApcDisable, 0x5555); \ ok_eq_bool(KeAreApcsDisabled(), KernelApcsDisabled || SpecialApcsDisabled); \ ok_eq_int(Thread->KernelApcDisable, KernelApcsDisabled); \ - ok_eq_bool(KeAreAllApcsDisabled(), AllApcsDisabled); \ + ok_eq_bool(pKeAreAllApcsDisabled(), AllApcsDisabled); \ ok_eq_int(Thread->SpecialApcDisable, SpecialApcsDisabled); \ ok_irql(ExpectedIrql); \ } while (0) @@ -48,17 +128,17 @@ if (!KmtIsCheckedBuild || OriginalIrql <= APC_LEVEL) { /* acquire/release normally */ - KeAcquireGuardedMutex(Mutex); + pKeAcquireGuardedMutex(Mutex); CheckMutex(Mutex, 0L, Thread, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled - 1, TRUE, OriginalIrql); - ok_bool_false(KeTryToAcquireGuardedMutex(Mutex), "KeTryToAcquireGuardedMutex returned"); + ok_bool_false(pKeTryToAcquireGuardedMutex(Mutex), "KeTryToAcquireGuardedMutex returned"); CheckMutex(Mutex, 0L, Thread, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled - 1, TRUE, OriginalIrql); - KeReleaseGuardedMutex(Mutex); + pKeReleaseGuardedMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); /* try to acquire */ - ok_bool_true(KeTryToAcquireGuardedMutex(Mutex), "KeTryToAcquireGuardedMutex returned"); + ok_bool_true(pKeTryToAcquireGuardedMutex(Mutex), "KeTryToAcquireGuardedMutex returned"); CheckMutex(Mutex, 0L, Thread, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled - 1, TRUE, OriginalIrql); - KeReleaseGuardedMutex(Mutex); + pKeReleaseGuardedMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); } else @@ -69,9 +149,9 @@ if (!KmtIsCheckedBuild || OriginalIrql == APC_LEVEL || SpecialApcsDisabled < 0) { /* acquire/release unsafe */ - KeAcquireGuardedMutexUnsafe(Mutex); + pKeAcquireGuardedMutexUnsafe(Mutex); CheckMutex(Mutex, 0L, Thread, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); - KeReleaseGuardedMutexUnsafe(Mutex); + pKeReleaseGuardedMutexUnsafe(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); } @@ -79,29 +159,29 @@ if (!KmtIsCheckedBuild) { /* mismatched acquire/release */ - KeAcquireGuardedMutex(Mutex); + pKeAcquireGuardedMutex(Mutex); CheckMutex(Mutex, 0L, Thread, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled - 1, TRUE, OriginalIrql); - KeReleaseGuardedMutexUnsafe(Mutex); + pKeReleaseGuardedMutexUnsafe(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled - 1, TRUE, OriginalIrql); - KeLeaveGuardedRegion(); + pKeLeaveGuardedRegion(); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); - KeAcquireGuardedMutexUnsafe(Mutex); + pKeAcquireGuardedMutexUnsafe(Mutex); CheckMutex(Mutex, 0L, Thread, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); - KeReleaseGuardedMutex(Mutex); + pKeReleaseGuardedMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled + 1, OriginalIrql >= APC_LEVEL || SpecialApcsDisabled != -1, OriginalIrql); - KeEnterGuardedRegion(); + pKeEnterGuardedRegion(); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); /* release without acquire */ - KeReleaseGuardedMutexUnsafe(Mutex); + pKeReleaseGuardedMutexUnsafe(Mutex); CheckMutex(Mutex, 0L, NULL, 0LU, 0x5555, SpecialApcsDisabled - 1, KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, OriginalIrql); - KeReleaseGuardedMutex(Mutex); + pKeReleaseGuardedMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled, KernelApcsDisabled, SpecialApcsDisabled + 1, OriginalIrql >= APC_LEVEL || SpecialApcsDisabled != -1, OriginalIrql); - KeReleaseGuardedMutex(Mutex); + pKeReleaseGuardedMutex(Mutex); /* TODO: here we see that Mutex->Count isn't actually just a count. Test the bits correctly! */ CheckMutex(Mutex, 0L, NULL, 0LU, 0x5555, SpecialApcsDisabled, KernelApcsDisabled, SpecialApcsDisabled + 2, OriginalIrql >= APC_LEVEL || SpecialApcsDisabled != -2, OriginalIrql); - KeReleaseGuardedMutex(Mutex); + pKeReleaseGuardedMutex(Mutex); CheckMutex(Mutex, 1L, NULL, 0LU, 0x5555, SpecialApcsDisabled, KernelApcsDisabled, SpecialApcsDisabled + 3, OriginalIrql >= APC_LEVEL || SpecialApcsDisabled != -3, OriginalIrql); Thread->SpecialApcDisable -= 3; } @@ -242,10 +322,10 @@ LARGE_INTEGER Timeout; Timeout.QuadPart = -50 * 1000 * 10; /* 50 ms */ - InitThreadData(&ThreadData, Mutex, KeAcquireGuardedMutex, NULL, KeReleaseGuardedMutex); - InitThreadData(&ThreadData2, Mutex, KeAcquireGuardedMutex, NULL, KeReleaseGuardedMutex); - InitThreadData(&ThreadDataUnsafe, Mutex, KeAcquireGuardedMutexUnsafe, NULL, KeReleaseGuardedMutexUnsafe); - InitThreadData(&ThreadDataTry, Mutex, NULL, KeTryToAcquireGuardedMutex, KeReleaseGuardedMutex); + InitThreadData(&ThreadData, Mutex, pKeAcquireGuardedMutex, NULL, pKeReleaseGuardedMutex); + InitThreadData(&ThreadData2, Mutex, pKeAcquireGuardedMutex, NULL, pKeReleaseGuardedMutex); + InitThreadData(&ThreadDataUnsafe, Mutex, pKeAcquireGuardedMutexUnsafe, NULL, pKeReleaseGuardedMutexUnsafe); + InitThreadData(&ThreadDataTry, Mutex, NULL, pKeTryToAcquireGuardedMutex, pKeReleaseGuardedMutex); /* have a thread acquire the mutex */ Status = StartThread(&ThreadData, NULL, PASSIVE_LEVEL, FALSE, FALSE); @@ -337,6 +417,29 @@ }; int i; + pKeAreAllApcsDisabled = KmtGetSystemRoutineAddress(L"KeAreAllApcsDisabled"); + pKeInitializeGuardedMutex = KmtGetSystemRoutineAddress(L"KeInitializeGuardedMutex"); + pKeAcquireGuardedMutex = KmtGetSystemRoutineAddress(L"KeAcquireGuardedMutex"); + pKeAcquireGuardedMutexUnsafe = KmtGetSystemRoutineAddress(L"KeAcquireGuardedMutexUnsafe"); + pKeEnterGuardedRegion = KmtGetSystemRoutineAddress(L"KeEnterGuardedRegion"); + pKeLeaveGuardedRegion = KmtGetSystemRoutineAddress(L"KeLeaveGuardedRegion"); + pKeReleaseGuardedMutex = KmtGetSystemRoutineAddress(L"KeReleaseGuardedMutex"); + pKeReleaseGuardedMutexUnsafe = KmtGetSystemRoutineAddress(L"KeReleaseGuardedMutexUnsafe"); + pKeTryToAcquireGuardedMutex = KmtGetSystemRoutineAddress(L"KeTryToAcquireGuardedMutex"); + + if (skip(pKeAreAllApcsDisabled && + pKeInitializeGuardedMutex && + pKeAcquireGuardedMutex && + pKeAcquireGuardedMutexUnsafe && + pKeEnterGuardedRegion && + pKeLeaveGuardedRegion && + pKeReleaseGuardedMutex && + pKeReleaseGuardedMutexUnsafe && + pKeTryToAcquireGuardedMutex, "No guarded mutexes\n")) + { + return; + } + for (i = 0; i < sizeof TestIterations / sizeof TestIterations[0]; ++i) { trace("Run %d\n", i); @@ -345,7 +448,7 @@ Thread->SpecialApcDisable = TestIterations[i].SpecialApcsDisabled; RtlFillMemory(&Mutex, sizeof Mutex, 0x55); - KeInitializeGuardedMutex(&Mutex); + pKeInitializeGuardedMutex(&Mutex); CheckMutex(&Mutex, 1L, NULL, 0LU, 0x5555, 0x5555, TestIterations[i].KernelApcsDisabled, TestIterations[i].SpecialApcsDisabled, TestIterations[i].AllApcsDisabled, TestIterations[i].Irql); TestGuardedMutex(&Mutex, TestIterations[i].KernelApcsDisabled, TestIterations[i].SpecialApcsDisabled, TestIterations[i].AllApcsDisabled, TestIterations[i].Irql); @@ -356,6 +459,6 @@ trace("Concurrent test\n"); RtlFillMemory(&Mutex, sizeof Mutex, 0x55); - KeInitializeGuardedMutex(&Mutex); + pKeInitializeGuardedMutex(&Mutex); TestGuardedMutexConcurrent(&Mutex); } Modified: trunk/rostests/kmtests/ntos_ke/KeMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeMutex.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeMutex.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeMutex.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -6,6 +6,13 @@ */ #include <kmt_test.h> + +static +_IRQL_requires_min_(PASSIVE_LEVEL) +_IRQL_requires_max_(DISPATCH_LEVEL) +BOOLEAN +(NTAPI +*pKeAreAllApcsDisabled)(VOID); #define ULONGS_PER_POINTER (sizeof(PVOID) / sizeof(ULONG)) #define MUTANT_SIZE (2 + 6 * ULONGS_PER_POINTER) @@ -55,7 +62,8 @@ { \ ok_eq_bool(KeAreApcsDisabled(), KernelApcsDisabled || SpecialApcsDisabled); \ ok_eq_int(Thread->KernelApcDisable, KernelApcsDisabled); \ - ok_eq_bool(KeAreAllApcsDisabled(), AllApcsDisabled); \ + if (pKeAreAllApcsDisabled) \ + ok_eq_bool(pKeAreAllApcsDisabled(), AllApcsDisabled); \ ok_eq_int(Thread->SpecialApcDisable, SpecialApcsDisabled); \ ok_irql(Irql); \ } while (0) @@ -137,6 +145,12 @@ START_TEST(KeMutex) { + pKeAreAllApcsDisabled = KmtGetSystemRoutineAddress(L"KeAreAllApcsDisabled"); + if (skip(pKeAreAllApcsDisabled != NULL, "KeAreAllApcsDisabled unavailable\n")) + { + /* We can live without this function here */ + } + TestMutant(); TestMutex(); } Modified: trunk/rostests/kmtests/ntos_ke/KeSpinLock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeSpinLoc… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] Sun Feb 15 10:23:21 2015 @@ -20,19 +20,36 @@ //#define NDEBUG #include <debug.h> -/* TODO: these are documented for Vista+ */ -NTKERNELAPI +static +_Must_inspect_result_ +_IRQL_requires_min_(DISPATCH_LEVEL) +_Post_satisfies_(return == 1 || return == 0) +BOOLEAN +(FASTCALL +*pKeTryToAcquireSpinLockAtDpcLevel)( + _Inout_ _Requires_lock_not_held_(*_Curr_) + _When_(return!=0, _Acquires_lock_(*_Curr_)) + PKSPIN_LOCK SpinLock); + +static VOID -FASTCALL -KeAcquireInStackQueuedSpinLockForDpc( +(FASTCALL +*pKeAcquireInStackQueuedSpinLockForDpc)( IN OUT PKSPIN_LOCK SpinLock, OUT PKLOCK_QUEUE_HANDLE LockHandle); -NTKERNELAPI +static VOID -FASTCALL -KeReleaseInStackQueuedSpinLockForDpc( +(FASTCALL +*pKeReleaseInStackQueuedSpinLockForDpc)( IN PKLOCK_QUEUE_HANDLE LockHandle); + +static +_Must_inspect_result_ +BOOLEAN +(FASTCALL +*pKeTestSpinLock)( + _In_ PKSPIN_LOCK SpinLock); /* TODO: multiprocessor testing */ @@ -119,8 +136,8 @@ DEFINE_RELEASE(ReleaseForDpc, TRUE, KeReleaseSpinLockForDpc(SpinLock, CheckData->Irql)) #endif -DEFINE_ACQUIRE(AcquireInStackForDpc, FALSE, KeAcquireInStackQueuedSpinLockForDpc(SpinLock, &CheckData->QueueHandle)) -DEFINE_RELEASE(ReleaseInStackForDpc, FALSE, KeReleaseInStackQueuedSpinLockForDpc(&CheckData->QueueHandle)) +DEFINE_ACQUIRE(AcquireInStackForDpc, FALSE, pKeAcquireInStackQueuedSpinLockForDpc(SpinLock, &CheckData->QueueHandle)) +DEFINE_RELEASE(ReleaseInStackForDpc, FALSE, pKeReleaseInStackQueuedSpinLockForDpc(&CheckData->QueueHandle)) #ifdef _X86_ DEFINE_ACQUIRE(AcquireInt, FALSE, KiAcquireSpinLock(SpinLock)) @@ -142,7 +159,7 @@ return Ret; } BOOLEAN TryNoRaise(PKSPIN_LOCK SpinLock, PCHECK_DATA CheckData) { - BOOLEAN Ret = KeTryToAcquireSpinLockAtDpcLevel(SpinLock); + BOOLEAN Ret = pKeTryToAcquireSpinLockAtDpcLevel(SpinLock); return Ret; } @@ -197,7 +214,7 @@ #define CheckSpinLock(SpinLock, CheckData, Value) do \ { \ - BOOLEAN Ret = SpinLock ? KeTestSpinLock(SpinLock) : TRUE; \ + BOOLEAN Ret = SpinLock && pKeTestSpinLock ? pKeTestSpinLock(SpinLock) : TRUE; \ KIRQL ExpectedIrql = (CheckData)->OriginalIrql; \ \ switch ((CheckData)->Check) \ @@ -257,7 +274,10 @@ } if (CheckData->AcquireNoRaise && - (CheckData->OriginalIrql >= DISPATCH_LEVEL || !KmtIsCheckedBuild)) + (CheckData->OriginalIrql >= DISPATCH_LEVEL || !KmtIsCheckedBuild) && + (CheckData->AcquireNoRaise != AcquireInStackForDpc || + !skip(pKeAcquireInStackQueuedSpinLockForDpc && + pKeReleaseInStackQueuedSpinLockForDpc, "No DPC spinlock functions\n"))) { /* acquire/release without irql change */ CheckData->AcquireNoRaise(SpinLock, CheckData); @@ -279,7 +299,8 @@ CheckData->IsAcquired = FALSE; KmtSetIrql(CheckData->OriginalIrql); - if (CheckData->TryAcquireNoRaise) + if (CheckData->TryAcquireNoRaise && + !skip(pKeTryToAcquireSpinLockAtDpcLevel != NULL, "KeTryToAcquireSpinLockAtDpcLevel unavailable\n")) { CheckSpinLock(SpinLock, CheckData, 0); ok_bool_true(CheckData->TryAcquireNoRaise(SpinLock, CheckData), "TryAcquireNoRaise returned"); @@ -320,7 +341,14 @@ { CheckQueue, SynchIrql, AcquireQueuedSynch, ReleaseQueued, TryQueuedSynch, NULL, NULL, NULL, LockQueuePfnLock }, }; int i, iIrql; - PKPRCB Prcb = KeGetCurrentPrcb(); + PKPRCB Prcb; + + pKeTryToAcquireSpinLockAtDpcLevel = KmtGetSystemRoutineAddress(L"KeTryToAcquireSpinLockAtDpcLevel"); + pKeAcquireInStackQueuedSpinLockForDpc = KmtGetSystemRoutineAddress(L"KeAcquireInStackQueuedSpinLockForDpc"); + pKeReleaseInStackQueuedSpinLockForDpc = KmtGetSystemRoutineAddress(L"KeReleaseInStackQueuedSpinLockForDpc"); + pKeTestSpinLock = KmtGetSystemRoutineAddress(L"KeTestSpinLock"); + + Prcb = KeGetCurrentPrcb(); /* KeInitializeSpinLock */ memset(&SpinLock, 0x55, sizeof SpinLock); @@ -328,17 +356,20 @@ ok_eq_ulongptr(SpinLock, 0); /* KeTestSpinLock */ - ok_bool_true(KeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); - SpinLock = 1; - ok_bool_false(KeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); - SpinLock = 2; - ok_bool_false(KeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); - SpinLock = (ULONG_PTR)-1; - ok_bool_false(KeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); - SpinLock = (ULONG_PTR)1 << (sizeof(ULONG_PTR) * CHAR_BIT - 1); - ok_bool_false(KeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); - SpinLock = 0; - ok_bool_true(KeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + if (!skip(pKeTestSpinLock != NULL, "KeTestSpinLock unavailable\n")) + { + ok_bool_true(pKeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + SpinLock = 1; + ok_bool_false(pKeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + SpinLock = 2; + ok_bool_false(pKeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + SpinLock = (ULONG_PTR)-1; + ok_bool_false(pKeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + SpinLock = (ULONG_PTR)1 << (sizeof(ULONG_PTR) * CHAR_BIT - 1); + ok_bool_false(pKeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + SpinLock = 0; + ok_bool_true(pKeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); + } /* on UP none of the following functions actually looks at the spinlock! */ if (!KmtIsMultiProcessorBuild && !KmtIsCheckedBuild)

1 0

[jimtabor] 66280: [User32] - Move notify window event to a better location for passing wine msg:test_winevents. See CORE-7447.
by jimtabor＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: jimtabor Date: Sun Feb 15 10:14:18 2015 New Revision: 66280 URL: http://svn.reactos.org/svn/reactos?rev=66280&view=rev Log: [User32] - Move notify window event to a better location for passing wine msg:test_winevents. See CORE-7447. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Sun Feb 15 10:14:18 2015 @@ -95,9 +95,6 @@ RtlInitLargeUnicodeString((PLARGE_UNICODE_STRING)&lsString, String, 0); } Ret = NtUserDefSetText(hWnd, (String ? &lsString : NULL)); - - if (Ret) - IntNotifyWinEvent(EVENT_OBJECT_NAMECHANGE, hWnd, OBJID_WINDOW, CHILDID_SELF, 0); return Ret; } @@ -1402,7 +1399,10 @@ DefSetText(hWnd, (PCWSTR)lParam, TRUE); if ((GetWindowLongPtrW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) + { UserPaintCaption(hWnd); + IntNotifyWinEvent(EVENT_OBJECT_NAMECHANGE, hWnd, OBJID_WINDOW, CHILDID_SELF, 0); + } Result = 1; break; }

1 0

[pschweitzer] 66279: [BOOTDATA] Errm... Spotted by Giannis
by pschweitzer＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: pschweitzer Date: Sun Feb 15 10:02:57 2015 New Revision: 66279 URL: http://svn.reactos.org/svn/reactos?rev=66279&view=rev Log: [BOOTDATA] Errm... Spotted by Giannis Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Feb 15 10:02:57 2015 @@ -1933,15 +1933,15 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Type",0x00010001,0x00000020 -; ReactOS Installer Service -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Description",0x00000000,"ReactOS Installer Service" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","DisplayName",0x00000000,"ReactOS Installer Service" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Group",0x00000000,"Installation Infrastructure" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","ImagePath",0x00020000,"%SystemRoot%\system32\msiexec.exe /V" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Type",0x00010001,0x00000020 +; Windows Installer Service +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS Installer" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Group",0x00000000,"Windows Installer" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ImagePath",0x00020000,"system32\msiexec.exe /V" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Type",0x00010001,0x00000020 ; Sound Blaster (NT4) ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound Blaster (NT4)" @@ -2014,16 +2014,6 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 -; Windows Installer Service -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","DisplayName",0x00000000,"ReactOS Installer" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000000,"Controls installation, maintenance, and removal of software packaged as an msi (Windows Installer)" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Group",0x00000000,"Windows Installer" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ImagePath",0x00020000,"system32\msiexec.exe /V" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Type",0x00010001,0x00000020 - ; ControlSet selection settings HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001 HKLM,"SYSTEM\Select","Default",0x00010001,0x00000001

1 0

[pschweitzer] 66278: [BOOTDATA] msiexec can be used as a service (and might be required by some MSIs)
by pschweitzer＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: pschweitzer Date: Sun Feb 15 09:59:29 2015 New Revision: 66278 URL: http://svn.reactos.org/svn/reactos?rev=66278&view=rev Log: [BOOTDATA] msiexec can be used as a service (and might be required by some MSIs) Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Feb 15 09:59:29 2015 @@ -1933,6 +1933,16 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Type",0x00010001,0x00000020 +; ReactOS Installer Service +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Description",0x00000000,"ReactOS Installer Service" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","DisplayName",0x00000000,"ReactOS Installer Service" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Group",0x00000000,"Installation Infrastructure" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","ImagePath",0x00020000,"%SystemRoot%\system32\msiexec.exe /V" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Type",0x00010001,0x00000020 + ; Sound Blaster (NT4) ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound Blaster (NT4)" ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001

1 0

[tfaber] 66277: [KMTESTS:KE] - Enable KeSpinLock test that apparently never made it into testlist.c for some reason?
by tfaber＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: tfaber Date: Sun Feb 15 09:29:32 2015 New Revision: 66277 URL: http://svn.reactos.org/svn/reactos?rev=66277&view=rev Log: [KMTESTS:KE] - Enable KeSpinLock test that apparently never made it into testlist.c for some reason? Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sun Feb 15 09:29:32 2015 @@ -36,6 +36,7 @@ KMT_TESTFUNC Test_KeIrql; KMT_TESTFUNC Test_KeMutex; KMT_TESTFUNC Test_KeProcessor; +KMT_TESTFUNC Test_KeSpinLock; KMT_TESTFUNC Test_KeTimer; KMT_TESTFUNC Test_KernelType; KMT_TESTFUNC Test_MmSection; @@ -93,6 +94,7 @@ { "KeIrql", Test_KeIrql }, { "KeMutex", Test_KeMutex }, { "-KeProcessor", Test_KeProcessor }, + { "KeSpinLock", Test_KeSpinLock }, { "KeTimer", Test_KeTimer }, { "-KernelType", Test_KernelType }, { "MmSection", Test_MmSection },

1 0

[janderwald] 66276: [INF] - add wdmaudio.inf
by janderwald＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: janderwald Date: Sun Feb 15 09:03:08 2015 New Revision: 66276 URL: http://svn.reactos.org/svn/reactos?rev=66276&view=rev Log: [INF] - add wdmaudio.inf Added: trunk/reactos/media/inf/wdmaudio.inf (with props) Modified: trunk/reactos/media/inf/CMakeLists.txt Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Sun Feb 15 09:03:08 2015 @@ -39,6 +39,7 @@ usb.inf usbport.inf usbstor.inf + wdmaudio.inf xboxdisp.inf) foreach(item ${INF_FILES}) Added: trunk/reactos/media/inf/wdmaudio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/wdmaudio.inf?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/inf/wdmaudio.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[hbelusca] 66275: [WINLOGON][USER32] Fix the explanations of how Windows/ReactOS should shut down (it's winlogon itself that calls NtShutdownSystem, not something else; that story about "SMSS API #...
by hbelusca＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: hbelusca Date: Sun Feb 15 02:07:23 2015 New Revision: 66275 URL: http://svn.reactos.org/svn/reactos?rev=66275&view=rev Log: [WINLOGON][USER32] Fix the explanations of how Windows/ReactOS should shut down (it's winlogon itself that calls NtShutdownSystem, not something else; that story about "SMSS API #1" concerns the SMSS API SmpSessionCompleteApi called by the helper function SmSessionComplete which is in turn called by CSRSS function CsrDereferenceNtSession, when all win32 processes are gone, as it should). The webpage http://www.reactos.org/wiki/ShutdownProcess should be corrected for. [USER32] Whitespace fixes for winstation code. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/win32ss/user/user32/misc/exit.c trunk/reactos/win32ss/user/user32/misc/winsta.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun Feb 15 02:07:23 2015 @@ -898,7 +898,8 @@ /* Destroy SAS window */ UninitializeSAS(Session); - FIXME("FIXME: Call SMSS API #1\n"); + /* Now we can shut down NT */ + ERR("Shutting down NT...\n"); RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &Old); if (wlxAction == WLX_SAS_ACTION_SHUTDOWN_REBOOT) { Modified: trunk/reactos/win32ss/user/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] Sun Feb 15 02:07:23 2015 @@ -17,10 +17,10 @@ * * - App (usually explorer) calls ExitWindowsEx() * - ExitWindowsEx() sends a message to CSRSS - * - CSRSS impersonates the caller and sends a message to a hidden WinLogon window - * - WinLogon checks if the caller has the required privileges - * - WinLogon enters pending log-out state - * - WinLogon impersonates the interactive user and calls ExitWindowsEx() again, + * - CSRSS impersonates the caller and sends a message to a hidden Winlogon window + * - Winlogon checks if the caller has the required privileges + * - Winlogon enters pending log-out state + * - Winlogon impersonates the interactive user and calls ExitWindowsEx() again, * passing some special internal flags * - CSRSS loops over all processes of the interactive user (sorted by their * SetProcessShutdownParameters() level), sending WM_QUERYENDSESSION and @@ -39,28 +39,24 @@ * If the handler doesn't respond in time the same activities as for GUI * apps (i.e. display dialog box etc) take place. This also happens if * the handler returns TRUE. - * - This ends the processing for the first ExitWindowsEx() call from WinLogon. - * Execution continues in WinLogon, which calls ExitWindowsEx() again to + * - This ends the processing for the first ExitWindowsEx() call from Winlogon. + * Execution continues in Winlogon, which calls ExitWindowsEx() again to * terminate COM processes in the interactive user's session. - * - WinLogon stops impersonating the interactive user (whose processes are + * - Winlogon stops impersonating the interactive user (whose processes are * all dead by now). and enters log-out state - * - If the ExitWindowsEx() request was for a logoff, WinLogon sends a SAS - * event (to display the "press ctrl+alt+del") to the GINA. WinLogon then + * - If the ExitWindowsEx() request was for a logoff, Winlogon sends a SAS + * event (to display the "press ctrl+alt+del") to the GINA. Winlogon then * waits for the GINA to send a SAS event to login. - * - If the ExitWindowsEx() request was for shutdown/restart, WinLogon calls + * - If the ExitWindowsEx() request was for shutdown/restart, Winlogon calls * ExitWindowsEx() again in the system process context. * - CSRSS goes through the motions of sending WM_QUERYENDSESSION/WM_ENDSESSION * to GUI processes running in the system process context but won't display * dialog boxes or kill threads/processes. Same for console processes, * using the CTRL_SHUTDOWN_EVENT. The Service Control Manager is one of * these console processes and has a special timeout value WaitToKillServiceTimeout. - * - WinLogon issues a "InitiateSystemShutdown" request to the SM (SMSS API # 1) - * - the SM propagates the shutdown request to every environment subsystem it - * started since bootstrap time (still active ones, of course) - * - each environment subsystem, on shutdown request, releases every resource - * it aquired during its life (processes, memory etc), then dies - * - when every environment subsystem has gone to bed, the SM actually initiates - * the kernel and executive shutdown by calling NtShutdownSystem. + * - After CSRSS has finished its pass notifying processes that system is shutting down, + * Winlogon finishes the shutdown process by calling the executive subsystem + * function NtShutdownSystem. */ typedef struct Modified: trunk/reactos/win32ss/user/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/w… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/winsta.c [iso-8859-1] Sun Feb 15 02:07:23 2015 @@ -19,9 +19,9 @@ */ HWINSTA WINAPI CreateWindowStationA(LPCSTR lpwinsta, - DWORD dwReserved, - ACCESS_MASK dwDesiredAccess, - LPSECURITY_ATTRIBUTES lpsa) + DWORD dwReserved, + ACCESS_MASK dwDesiredAccess, + LPSECURITY_ATTRIBUTES lpsa) { UNICODE_STRING WindowStationNameU; HWINSTA hWinSta; @@ -53,55 +53,55 @@ */ HWINSTA WINAPI CreateWindowStationW(LPCWSTR lpwinsta, - DWORD dwReserved, - ACCESS_MASK dwDesiredAccess, - LPSECURITY_ATTRIBUTES lpsa) -{ - UNICODE_STRING WindowStationName; - UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hWindowStationsDir; - NTSTATUS Status; - HWINSTA hwinsta; - - /* Open WindowStations directory */ - InitializeObjectAttributes(&ObjectAttributes, - &WindowStationsDir, - OBJ_CASE_INSENSITIVE, - 0, - 0); - - Status = NtOpenDirectoryObject(&hWindowStationsDir, - DIRECTORY_CREATE_OBJECT, - &ObjectAttributes); - if(!NT_SUCCESS(Status)) - { - ERR("Failed to open WindowStations directory\n"); - return NULL; - } - - RtlInitUnicodeString(&WindowStationName, lpwinsta); - - /* Create the window station object */ - InitializeObjectAttributes(&ObjectAttributes, - &WindowStationName, - OBJ_CASE_INSENSITIVE, - hWindowStationsDir, - 0); - - /* Check if the handle should be inheritable */ - if (lpsa && lpsa->bInheritHandle) - { - ObjectAttributes.Attributes |= OBJ_INHERIT; - } - - hwinsta = NtUserCreateWindowStation(&ObjectAttributes, - dwDesiredAccess, - 0, 0, 0, 0, 0); - - NtClose(hWindowStationsDir); - - return hwinsta; + DWORD dwReserved, + ACCESS_MASK dwDesiredAccess, + LPSECURITY_ATTRIBUTES lpsa) +{ + UNICODE_STRING WindowStationName; + UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hWindowStationsDir; + NTSTATUS Status; + HWINSTA hwinsta; + + /* Open WindowStations directory */ + InitializeObjectAttributes(&ObjectAttributes, + &WindowStationsDir, + OBJ_CASE_INSENSITIVE, + 0, + 0); + + Status = NtOpenDirectoryObject(&hWindowStationsDir, + DIRECTORY_CREATE_OBJECT, + &ObjectAttributes); + if(!NT_SUCCESS(Status)) + { + ERR("Failed to open WindowStations directory\n"); + return NULL; + } + + RtlInitUnicodeString(&WindowStationName, lpwinsta); + + /* Create the window station object */ + InitializeObjectAttributes(&ObjectAttributes, + &WindowStationName, + OBJ_CASE_INSENSITIVE, + hWindowStationsDir, + 0); + + /* Check if the handle should be inheritable */ + if (lpsa && lpsa->bInheritHandle) + { + ObjectAttributes.Attributes |= OBJ_INHERIT; + } + + hwinsta = NtUserCreateWindowStation(&ObjectAttributes, + dwDesiredAccess, + 0, 0, 0, 0, 0); + + NtClose(hWindowStationsDir); + + return hwinsta; } /* @@ -110,87 +110,78 @@ BOOL FASTCALL EnumNamesW(HWINSTA WindowStation, NAMEENUMPROCW EnumFunc, - LPARAM Context, + LPARAM Context, BOOL Desktops) { - char Buffer[256]; - PVOID NameList; - PWCHAR Name; - NTSTATUS Status; - ULONG RequiredSize; - ULONG CurrentEntry, EntryCount; - BOOL Ret; - - /* - * Check parameters - */ - if (NULL == WindowStation && Desktops) - { - WindowStation = GetProcessWindowStation(); - } - - /* - * Try with fixed-size buffer - */ - Status = NtUserBuildNameList(WindowStation, sizeof(Buffer), Buffer, &RequiredSize); - if (NT_SUCCESS(Status)) - { - /* Fixed-size buffer is large enough */ - NameList = (PWCHAR) Buffer; - } - else if (Status == STATUS_BUFFER_TOO_SMALL) - { - /* Allocate a larger buffer */ - NameList = HeapAlloc(GetProcessHeap(), 0, RequiredSize); - if (NULL == NameList) - { - return FALSE; - } - /* Try again */ - Status = NtUserBuildNameList(WindowStation, RequiredSize, NameList, NULL); - if (! NT_SUCCESS(Status)) - { - HeapFree(GetProcessHeap(), 0, NameList); - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - } - else - { - /* Some unrecognized error occured */ - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - /* - * Enum the names one by one - */ - EntryCount = *((DWORD *) NameList); - Name = (PWCHAR) ((PCHAR) NameList + sizeof(DWORD)); - Ret = TRUE; - for (CurrentEntry = 0; CurrentEntry < EntryCount && Ret; ++CurrentEntry) - { - Ret = (*EnumFunc)(Name, Context); - Name += wcslen(Name) + 1; - } - - /* - * Cleanup - */ - if (NameList != Buffer) - { - HeapFree(GetProcessHeap(), 0, NameList); - } - - return Ret; + CHAR Buffer[256]; + PVOID NameList; + PWCHAR Name; + NTSTATUS Status; + ULONG RequiredSize; + ULONG CurrentEntry, EntryCount; + BOOL Ret; + + /* Check parameters */ + if (WindowStation == NULL && Desktops) + { + WindowStation = GetProcessWindowStation(); + } + + /* Try with fixed-size buffer */ + Status = NtUserBuildNameList(WindowStation, sizeof(Buffer), Buffer, &RequiredSize); + if (NT_SUCCESS(Status)) + { + /* Fixed-size buffer is large enough */ + NameList = (PWCHAR) Buffer; + } + else if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Allocate a larger buffer */ + NameList = HeapAlloc(GetProcessHeap(), 0, RequiredSize); + if (NameList == NULL) + return FALSE; + + /* Try again */ + Status = NtUserBuildNameList(WindowStation, RequiredSize, NameList, NULL); + if (!NT_SUCCESS(Status)) + { + HeapFree(GetProcessHeap(), 0, NameList); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + else + { + /* Some unrecognized error occured */ + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + /* Enum the names one by one */ + EntryCount = *((DWORD *) NameList); + Name = (PWCHAR) ((PCHAR) NameList + sizeof(DWORD)); + Ret = TRUE; + for (CurrentEntry = 0; CurrentEntry < EntryCount && Ret; ++CurrentEntry) + { + Ret = (*EnumFunc)(Name, Context); + Name += wcslen(Name) + 1; + } + + /* Cleanup */ + if (NameList != Buffer) + { + HeapFree(GetProcessHeap(), 0, NameList); + } + + return Ret; } /* For W->A conversion */ typedef struct tagENUMNAMESASCIICONTEXT { - NAMEENUMPROCA UserEnumFunc; - LPARAM UserContext; + NAMEENUMPROCA UserEnumFunc; + LPARAM UserContext; } ENUMNAMESASCIICONTEXT, *PENUMNAMESASCIICONTEXT; /* @@ -200,65 +191,59 @@ BOOL CALLBACK EnumNamesCallback(LPWSTR Name, LPARAM Param) { - PENUMNAMESASCIICONTEXT Context = (PENUMNAMESASCIICONTEXT) Param; - char FixedNameA[32]; - LPSTR NameA; - int Len; - BOOL Ret; - - /* - * Determine required size of Ascii string and see if we can use - * fixed buffer - */ - Len = WideCharToMultiByte(CP_ACP, 0, Name, -1, NULL, 0, NULL, NULL); - if (Len <= 0) - { - /* Some strange error occured */ - return FALSE; - } - else if (Len <= sizeof(FixedNameA)) - { - /* Fixed-size buffer is large enough */ - NameA = FixedNameA; - } - else - { - /* Allocate a larger buffer */ - NameA = HeapAlloc(GetProcessHeap(), 0, Len); - if (NULL == NameA) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - } - - /* - * Do the Unicode ->Ascii conversion - */ - if (0 == WideCharToMultiByte(CP_ACP, 0, Name, -1, NameA, Len, NULL, NULL)) - { - /* Something went wrong, clean up */ - if (NameA != FixedNameA) - { - HeapFree(GetProcessHeap(), 0, NameA); - } - return FALSE; - } - - /* - * Call user callback - */ - Ret = Context->UserEnumFunc(NameA, Context->UserContext); - - /* - * Clean up - */ - if (NameA != FixedNameA) - { - HeapFree(GetProcessHeap(), 0, NameA); - } - - return Ret; + PENUMNAMESASCIICONTEXT Context = (PENUMNAMESASCIICONTEXT) Param; + CHAR FixedNameA[32]; + LPSTR NameA; + INT Len; + BOOL Ret; + + /* + * Determine required size of Ascii string and see + * if we can use fixed buffer. + */ + Len = WideCharToMultiByte(CP_ACP, 0, Name, -1, NULL, 0, NULL, NULL); + if (Len <= 0) + { + /* Some strange error occured */ + return FALSE; + } + else if (Len <= sizeof(FixedNameA)) + { + /* Fixed-size buffer is large enough */ + NameA = FixedNameA; + } + else + { + /* Allocate a larger buffer */ + NameA = HeapAlloc(GetProcessHeap(), 0, Len); + if (NULL == NameA) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + + /* Do the Unicode ->Ascii conversion */ + if (0 == WideCharToMultiByte(CP_ACP, 0, Name, -1, NameA, Len, NULL, NULL)) + { + /* Something went wrong, clean up */ + if (NameA != FixedNameA) + { + HeapFree(GetProcessHeap(), 0, NameA); + } + return FALSE; + } + + /* Call user callback */ + Ret = Context->UserEnumFunc(NameA, Context->UserContext); + + /* Cleanup */ + if (NameA != FixedNameA) + { + HeapFree(GetProcessHeap(), 0, NameA); + } + + return Ret; } /* @@ -267,15 +252,15 @@ BOOL FASTCALL EnumNamesA(HWINSTA WindowStation, NAMEENUMPROCA EnumFunc, - LPARAM Context, + LPARAM Context, BOOL Desktops) { - ENUMNAMESASCIICONTEXT PrivateContext; - - PrivateContext.UserEnumFunc = EnumFunc; - PrivateContext.UserContext = Context; - - return EnumNamesW(WindowStation, EnumNamesCallback, (LPARAM) &PrivateContext, Desktops); + ENUMNAMESASCIICONTEXT PrivateContext; + + PrivateContext.UserEnumFunc = EnumFunc; + PrivateContext.UserContext = Context; + + return EnumNamesW(WindowStation, EnumNamesCallback, (LPARAM) &PrivateContext, Desktops); } /* @@ -283,9 +268,9 @@ */ BOOL WINAPI EnumWindowStationsA(WINSTAENUMPROCA EnumFunc, - LPARAM Context) -{ - return EnumNamesA(NULL, EnumFunc, Context, FALSE); + LPARAM Context) +{ + return EnumNamesA(NULL, EnumFunc, Context, FALSE); } @@ -294,9 +279,9 @@ */ BOOL WINAPI EnumWindowStationsW(WINSTAENUMPROCW EnumFunc, - LPARAM Context) -{ - return EnumNamesW(NULL, EnumFunc, Context, FALSE); + LPARAM Context) +{ + return EnumNamesW(NULL, EnumFunc, Context, FALSE); } @@ -305,8 +290,8 @@ */ HWINSTA WINAPI OpenWindowStationA(LPCSTR lpszWinSta, - BOOL fInherit, - ACCESS_MASK dwDesiredAccess) + BOOL fInherit, + ACCESS_MASK dwDesiredAccess) { UNICODE_STRING WindowStationNameU; HWINSTA hWinSta; @@ -340,48 +325,48 @@ BOOL fInherit, ACCESS_MASK dwDesiredAccess) { - UNICODE_STRING WindowStationName; - UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hWindowStationsDir; - NTSTATUS Status; - HWINSTA hwinsta; - - /* Open WindowStations directory */ - InitializeObjectAttributes(&ObjectAttributes, - &WindowStationsDir, - OBJ_CASE_INSENSITIVE, - 0, - 0); - - Status = NtOpenDirectoryObject(&hWindowStationsDir, - DIRECTORY_TRAVERSE, - &ObjectAttributes); - if(!NT_SUCCESS(Status)) - { - ERR("Failed to open WindowStations directory\n"); - return NULL; - } - - /* Open the window station object */ - RtlInitUnicodeString(&WindowStationName, lpszWinSta); - - InitializeObjectAttributes(&ObjectAttributes, - &WindowStationName, - OBJ_CASE_INSENSITIVE, - hWindowStationsDir, - 0); - - if( fInherit ) - { - ObjectAttributes.Attributes |= OBJ_INHERIT; - } - - hwinsta = NtUserOpenWindowStation(&ObjectAttributes, dwDesiredAccess); - - NtClose(hWindowStationsDir); - - return hwinsta; + UNICODE_STRING WindowStationName; + UNICODE_STRING WindowStationsDir = RTL_CONSTANT_STRING(L"\\Windows\\WindowStations"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hWindowStationsDir; + NTSTATUS Status; + HWINSTA hwinsta; + + /* Open WindowStations directory */ + InitializeObjectAttributes(&ObjectAttributes, + &WindowStationsDir, + OBJ_CASE_INSENSITIVE, + 0, + 0); + + Status = NtOpenDirectoryObject(&hWindowStationsDir, + DIRECTORY_TRAVERSE, + &ObjectAttributes); + if(!NT_SUCCESS(Status)) + { + ERR("Failed to open WindowStations directory\n"); + return NULL; + } + + /* Open the window station object */ + RtlInitUnicodeString(&WindowStationName, lpszWinSta); + + InitializeObjectAttributes(&ObjectAttributes, + &WindowStationName, + OBJ_CASE_INSENSITIVE, + hWindowStationsDir, + 0); + + if(fInherit) + { + ObjectAttributes.Attributes |= OBJ_INHERIT; + } + + hwinsta = NtUserOpenWindowStation(&ObjectAttributes, dwDesiredAccess); + + NtClose(hWindowStationsDir); + + return hwinsta; } @@ -390,15 +375,12 @@ */ BOOL WINAPI -SetWindowStationUser( - HWINSTA hWindowStation, - PLUID pluid, - PSID psid, - DWORD size - ) -{ - return NtUserSetWindowStationUser(hWindowStation, pluid, psid, size); +SetWindowStationUser(HWINSTA hWindowStation, + PLUID pluid, + PSID psid, + DWORD size) +{ + return NtUserSetWindowStationUser(hWindowStation, pluid, psid, size); } /* EOF */ -

1 0

[tkreuzer] 66274: [NTOSKRNL] Demote the "HACK: RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n" from DPRINT1 to DPRINT, since it's massively spamming the log. See CORE-9184
by tkreuzer＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: tkreuzer Date: Sun Feb 15 00:26:41 2015 New Revision: 66274 URL: http://svn.reactos.org/svn/reactos?rev=66274&view=rev Log: [NTOSKRNL] Demote the "HACK: RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n" from DPRINT1 to DPRINT, since it's massively spamming the log. See CORE-9184 Modified: trunk/reactos/ntoskrnl/se/accesschk.c Modified: trunk/reactos/ntoskrnl/se/accesschk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/accesschk.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/accesschk.c [iso-8859-1] Sun Feb 15 00:26:41 2015 @@ -250,7 +250,7 @@ /* Fail if some rights have not been granted */ if (RemainingAccess != 0) { - DPRINT1("HACK: RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", RemainingAccess, DesiredAccess); + DPRINT("HACK: RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", RemainingAccess, DesiredAccess); #if 0 /* HACK HACK HACK */ Status = STATUS_ACCESS_DENIED;

1 0

[tkreuzer] 66273: [WIN32K] In NtGdiGetDIBitsInternal limit the size of what is being copied back to to usermode to the cjMaxInfo parameter. Fixes crash of Firefox when downloading files. CORE-8895 ...
by tkreuzer＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: tkreuzer Date: Sun Feb 15 00:05:50 2015 New Revision: 66273 URL: http://svn.reactos.org/svn/reactos?rev=66273&view=rev Log: [WIN32K] In NtGdiGetDIBitsInternal limit the size of what is being copied back to to usermode to the cjMaxInfo parameter. Fixes crash of Firefox when downloading files. CORE-8895 #resolve Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sun Feb 15 00:05:50 2015 @@ -674,7 +674,7 @@ RGBQUAD* rgbQuads; VOID* colorPtr; - DPRINT("Entered NtGdiGetDIBitsInternal()\n"); + DPRINT("Entered GreGetDIBitsInternal()\n"); if ((Usage && Usage != DIB_PAL_COLORS) || !Info || !hBitmap) return 0; @@ -1090,7 +1090,7 @@ _SEH2_TRY { /* Copy the data back */ - cjMaxInfo = DIB_BitmapInfoSize(pbmi, (WORD)iUsage); + cjMaxInfo = min(cjMaxInfo, DIB_BitmapInfoSize(pbmi, (WORD)iUsage)); ProbeForWrite(pbmiUser, cjMaxInfo, 1); RtlCopyMemory(pbmiUser, pbmi, cjMaxInfo); }

1 0

[pschweitzer] 66272: [NTFS] Query the value of NtfsMftZoneReservation on mount. Not used yet. CORE-8725
by pschweitzer＠svn.reactos.org 14 Feb '15

14 Feb '15

Author: pschweitzer Date: Sat Feb 14 20:55:47 2015 New Revision: 66272 URL: http://svn.reactos.org/svn/reactos?rev=66272&view=rev Log: [NTFS] Query the value of NtfsMftZoneReservation on mount. Not used yet. CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sat Feb 14 20:55:47 2015 @@ -168,6 +168,28 @@ static +ULONG +NtfsQueryMftZoneReservation(VOID) +{ + ULONG ZoneReservation = 1; + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].Name = L"NtfsMftZoneReservation"; + QueryTable[0].EntryContext = &ZoneReservation; + + RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, + L"FileSystem", + QueryTable, + NULL, + NULL); + + return ZoneReservation; +} + + +static NTSTATUS NtfsGetVolumeData(PDEVICE_OBJECT DeviceObject, PDEVICE_EXTENSION DeviceExt) @@ -361,6 +383,8 @@ } ExFreePool(VolumeRecord); + + NtfsInfo->MftZoneReservation = NtfsQueryMftZoneReservation(); return Status; } Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sat Feb 14 20:55:47 2015 @@ -75,6 +75,7 @@ UCHAR MinorVersion; USHORT Flags; + ULONG MftZoneReservation; } NTFS_INFO, *PNTFS_INFO; #define NTFS_TYPE_CCB '20SF'

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