[ros-diffs] [tfaber] 54355: [KMTESTS] - Fix some typos in previous commit - Make the driver object accessible to tests

[tfaber at svn.reactos.org]

Author: tfaber
Date: Sat Nov 12 00:21:57 2011
New Revision: 54355

URL: http://svn.reactos.org/svn/reactos?rev=54355&view=rev
Log:
[KMTESTS]
- Fix some typos in previous commit
- Make the driver object accessible to tests

Modified:
    trunk/rostests/kmtests/include/kmt_test.h
    trunk/rostests/kmtests/kmtest_drv/kmtest_drv.c
    trunk/rostests/kmtests/ntos_ex/ExFastMutex.c
    trunk/rostests/kmtests/ntos_ke/KeIrql.c

Modified: trunk/rostests/kmtests/include/kmt_test.h
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_test.h?rev=54355&r1=54354&r2=54355&view=diff
==============================================================================
--- trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] (original)
+++ trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] Sat Nov 12 00:21:57 2011
@@ -83,6 +83,7 @@
 extern BOOLEAN KmtIsCheckedBuild;
 extern BOOLEAN KmtIsMultiProcessorBuild;
 extern PCSTR KmtMajorFunctionNames[];
+extern PDRIVER_OBJECT KmtDriverObject;
 
 VOID KmtSetIrql(IN KIRQL NewIrql);
 BOOLEAN KmtAreInterruptsEnabled(VOID);

Modified: trunk/rostests/kmtests/kmtest_drv/kmtest_drv.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/kmtest_drv.c?rev=54355&r1=54354&r2=54355&view=diff
==============================================================================
--- trunk/rostests/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] (original)
+++ trunk/rostests/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] Sat Nov 12 00:21:57 2011
@@ -28,6 +28,7 @@
 
 /* Globals */
 static PDEVICE_OBJECT MainDeviceObject;
+PDRIVER_OBJECT KmtDriverObject = NULL;
 
 /* Entry */
 /**
@@ -62,6 +63,7 @@
     Prcb = KeGetCurrentPrcb();
     KmtIsCheckedBuild = (Prcb->BuildType & PRCB_BUILD_DEBUG) != 0;
     KmtIsMultiProcessorBuild = (Prcb->BuildType & PRCB_BUILD_UNIPROCESSOR) == 0;
+    KmtDriverObject = DriverObject;
 
     RtlInitUnicodeString(&DeviceName, KMTEST_DEVICE_DRIVER_PATH);
     Status = IoCreateDevice(DriverObject, sizeof(KMT_DEVICE_EXTENSION),

Modified: trunk/rostests/kmtests/ntos_ex/ExFastMutex.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExFastMutex.c?rev=54355&r1=54354&r2=54355&view=diff
==============================================================================
--- trunk/rostests/kmtests/ntos_ex/ExFastMutex.c [iso-8859-1] (original)
+++ trunk/rostests/kmtests/ntos_ex/ExFastMutex.c [iso-8859-1] Sat Nov 12 00:21:57 2011
@@ -44,7 +44,7 @@
     ExReleaseFastMutex(Mutex);
     CheckMutex(Mutex, 1L, NULL, 0LU, OriginalIrql, OriginalIrql);
 
-#ifdef _M_X86
+#ifdef _M_IX86
     /* ntoskrnl's fastcall version */
     ExiAcquireFastMutex(Mutex);
     CheckMutex(Mutex, 0L, Thread, 0LU, OriginalIrql, APC_LEVEL);

Modified: trunk/rostests/kmtests/ntos_ke/KeIrql.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeIrql.c?rev=54355&r1=54354&r2=54355&view=diff
==============================================================================
--- trunk/rostests/kmtests/ntos_ke/KeIrql.c [iso-8859-1] (original)
+++ trunk/rostests/kmtests/ntos_ke/KeIrql.c [iso-8859-1] Sat Nov 12 00:21:57 2011
@@ -96,7 +96,7 @@
     /* on x86, you can raise to _any_ possible KIRQL value */
     /* on x64, anything with more than the least significant 4 bits set bugchecked, last time I tried */
     /* TODO: other platforms? */
-#if defined _M_X86
+#if defined _M_IX86
     for (Irql = PASSIVE_LEVEL; Irql <= (KIRQL)-1; ++Irql)
     {
         DPRINT("Raising to %u\n", Irql);
@@ -105,7 +105,7 @@
         KeLowerIrql(Irql2);
         ok_irql(PrevIrql);
     }
-#endif /* defined _M_X86 */
+#endif /* defined _M_IX86 */
 
     /* test KeRaiseIrqlToDpcLevel */
     ok_irql(PASSIVE_LEVEL);