[KMTESTS]

- add kmt_platform.h that includes user or kernel headers as appropriate and allows Rtl tests to run in user mode without modification
- include kmt_platform.h from kmt_test.h, so that tests don't have to include separate headers. This also allows for a PCH

svn path=/branches/GSoC_2011/KMTestSuite/; revision=53021

diff --git a/kmtests/example/Example.c b/kmtests/example/Example.c
index ef8fb0e..1d2c39d 100644 (file)
--- a/kmtests/example/Example.c
+++ b/kmtests/example/Example.c
@@ -5,7 +5,6 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-#include <ntddk.h>
 #include <kmt_test.h>
 
 START_TEST(Example)

diff --git a/kmtests/example/Example_drv.c b/kmtests/example/Example_drv.c
index dd7504e..5a2a62e 100644 (file)
--- a/kmtests/example/Example_drv.c
+++ b/kmtests/example/Example_drv.c
@@ -5,8 +5,6 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-#include <ntddk.h>
-
 #include <kmt_test.h>
 
 //#define NDEBUG

diff --git a/kmtests/example/Example_user.c b/kmtests/example/Example_user.c
index 6f3d7bf..f462fc6 100644 (file)
--- a/kmtests/example/Example_user.c
+++ b/kmtests/example/Example_user.c
@@ -5,9 +5,6 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-#define UNICODE
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 #include <kmt_test.h>
 
 #include "Example.h"

diff --git a/kmtests/example/KernelType.c b/kmtests/example/KernelType.c
index 1c4b9ba..1df835f 100644 (file)
--- a/kmtests/example/KernelType.c
+++ b/kmtests/example/KernelType.c
@@ -5,7 +5,6 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-#include <ntddk.h>
 #include <kmt_test.h>
 
 START_TEST(KernelType)

diff --git a/kmtests/include/kmt_platform.h b/kmtests/include/kmt_platform.h
new file mode 100644 (file)
index 0000000..adb00e8
--- /dev/null
+++ b/kmtests/include/kmt_platform.h
@@ -0,0 +1,48 @@
+/*
+ * PROJECT:         ReactOS kernel-mode tests
+ * LICENSE:         GPLv2+ - See COPYING in the top level directory
+ * PURPOSE:         Kernel-Mode Test Suite platform declarations
+ * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
+ */
+
+#ifndef _KMTEST_PLATFORM_H_
+#define _KMTEST_PLATFORM_H_
+
+#if defined KMT_KERNEL_MODE || defined KMT_STANDALONE_DRIVER
+#include <ntddk.h>
+#include <ntifs.h>
+#include <ndk/ntndk.h>
+#include <ntstrsafe.h>
+
+#elif defined KMT_USER_MODE
+#define WIN32_LEAN_AND_MEAN
+#define WIN32_NO_STATUS
+#define UNICODE
+#include <windows.h>
+#include <ndk/ntndk.h>
+#include <strsafe.h>
+#include <winioctl.h>
+
+#ifdef KMT_EMULATE_KERNEL
+#define ok_irql(i)
+#ifdef __GNUC__
+#define KIRQL __attribute__((__unused__)) int
+#elif !defined __GNUC__
+#define KIRQL int
+#endif /* !defined __GNUC__ */
+
+#undef KeRaiseIrql
+#define KeRaiseIrql(new, old)
+#undef KeLowerIrql
+#define KeLowerIrql(i)
+#define ExAllocatePool(type, size)              HeapAlloc(GetProcessHeap(), 0, size)
+#define ExAllocatePoolWithTag(type, size, tag)  HeapAlloc(GetProcessHeap(), 0, size)
+#define ExFreePool(p)                           HeapFree(GetProcessHeap(), 0, p)
+#define ExFreePoolWithTag(p, tag)               HeapFree(GetProcessHeap(), 0, p)
+#endif /* defined KMT_EMULATE_KERNEL */
+
+#endif /* defined KMT_USER_MODE */
+
+#include <pseh/pseh2.h>
+
+#endif /* !defined _KMTEST_PLATFORM_H_ */

diff --git a/kmtests/include/kmt_test.h b/kmtests/include/kmt_test.h
index 134645a..60e3242 100644 (file)
--- a/kmtests/include/kmt_test.h
+++ b/kmtests/include/kmt_test.h
@@ -13,6 +13,8 @@
 #ifndef _KMTEST_TEST_H_
 #define _KMTEST_TEST_H_
 
+#include <kmt_platform.h>
+
 #include <stdarg.h>
 
 typedef VOID KMT_TESTFUNC(VOID);

diff --git a/kmtests/kmtest/kmtest.c b/kmtests/kmtest/kmtest.c
index 6ab7709..ab2bbc4 100644 (file)
--- a/kmtests/kmtest/kmtest.c
+++ b/kmtests/kmtest/kmtest.c
@@ -5,21 +5,16 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-#define UNICODE
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <strsafe.h>
-#include <winioctl.h>
+#define KMT_DEFINE_TEST_FUNCTIONS
+#include <kmt_test.h>
+
+#include "kmtest.h"
+#include <kmt_public.h>
 
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "kmtest.h"
-#include <kmt_public.h>
-#define KMT_DEFINE_TEST_FUNCTIONS
-#include <kmt_test.h>
-
 #define SERVICE_NAME        L"Kmtest"
 #define SERVICE_PATH        L"kmtest_drv.sys"
 #define SERVICE_DESCRIPTION L"ReactOS Kernel-Mode Test Suite Driver"

diff --git a/kmtests/kmtest/service.c b/kmtests/kmtest/service.c
index ace5d3b..9f32614 100644 (file)
--- a/kmtests/kmtest/service.c
+++ b/kmtests/kmtest/service.c
@@ -5,15 +5,11 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-#define UNICODE
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <strsafe.h>
+#include <kmt_test.h>
+#include "kmtest.h"
 
 #include <assert.h>
 
-#include "kmtest.h"
-
 #define SERVICE_ACCESS (SERVICE_START | SERVICE_STOP | DELETE)
 
 static SC_HANDLE ScmHandle;

diff --git a/kmtests/kmtest/support.c b/kmtests/kmtest/support.c
index b9b5d31..03c10af 100644 (file)
--- a/kmtests/kmtest/support.c
+++ b/kmtests/kmtest/support.c
@@ -5,17 +5,12 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-#define UNICODE
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <strsafe.h>
-#include <winioctl.h>
-
-#include <assert.h>
+#include <kmt_test.h>
 
 #include "kmtest.h"
 #include <kmt_public.h>
-#include <kmt_test.h>
+
+#include <assert.h>
 
 extern HANDLE KmtestHandle;
 

diff --git a/kmtests/kmtest/testlist.c b/kmtests/kmtest/testlist.c
index 745ed92..9f315d3 100644 (file)
--- a/kmtests/kmtest/testlist.c
+++ b/kmtests/kmtest/testlist.c
@@ -5,9 +5,6 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-#define WIN32_LEAN_AND_MEAN
-#define UNICODE
-#include <windows.h>
 #include <kmt_test.h>
 
 KMT_TESTFUNC Test_Example;

diff --git a/kmtests/ntos_ex/ExDoubleList.c b/kmtests/ntos_ex/ExDoubleList.c
index f582257..fb9251b 100644 (file)
--- a/kmtests/ntos_ex/ExDoubleList.c
+++ b/kmtests/ntos_ex/ExDoubleList.c
@@ -10,7 +10,6 @@ struct _LIST_ENTRY *__stdcall ExInterlockedInsertHeadList(struct _LIST_ENTRY *,
 struct _LIST_ENTRY *__stdcall ExInterlockedInsertTailList(struct _LIST_ENTRY *, struct _LIST_ENTRY *, unsigned long *);
 struct _LIST_ENTRY *__stdcall ExInterlockedRemoveHeadList(struct _LIST_ENTRY *, unsigned long *);
 
-#include <ntddk.h>
 #include <kmt_test.h>
 
 LIST_ENTRY Entries[5];

diff --git a/kmtests/ntos_ex/ExHardError.c b/kmtests/ntos_ex/ExHardError.c
index c07ab57..056c471 100644 (file)
--- a/kmtests/ntos_ex/ExHardError.c
+++ b/kmtests/ntos_ex/ExHardError.c
@@ -5,11 +5,6 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/exfuncs.h>
-#include <pseh/pseh2.h>
-
 #include <kmt_test.h>
 
 /* TODO: don't require user interaction, test Io* routines,

diff --git a/kmtests/ntos_ex/ExInterlocked.c b/kmtests/ntos_ex/ExInterlocked.c
index d8db0c7..ee266e2 100644 (file)
--- a/kmtests/ntos_ex/ExInterlocked.c
+++ b/kmtests/ntos_ex/ExInterlocked.c
@@ -25,9 +25,6 @@ __declspec(dllimport)   int             __stdcall   ExInterlockedDecrementLong(l
 __declspec(dllimport)   int             __stdcall   Exi386InterlockedIncrementLong(long *);
 __declspec(dllimport)   int             __stdcall   Exi386InterlockedDecrementLong(long *);
 
-#include <ntddk.h>
-#include <pseh/pseh2.h>
-
 #include <kmt_test.h>
 
 /* TODO: There are quite some changes needed for other architectures!

diff --git a/kmtests/ntos_ex/ExPools.c b/kmtests/ntos_ex/ExPools.c
index 3b55d4a..c635720 100644 (file)
--- a/kmtests/ntos_ex/ExPools.c
+++ b/kmtests/ntos_ex/ExPools.c
@@ -7,11 +7,6 @@
 
 /* TODO: PoolsCorruption tests fail because accessing invalid memory doesn't necessarily cause an access violation */
 
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/ntndk.h>
-/* SEH support with PSEH */
-#include <pseh/pseh2.h>
 #include <kmt_test.h>
 
 #define NDEBUG

diff --git a/kmtests/ntos_ex/ExResource.c b/kmtests/ntos_ex/ExResource.c
index 974e689..80bcfa9 100644 (file)
--- a/kmtests/ntos_ex/ExResource.c
+++ b/kmtests/ntos_ex/ExResource.c
@@ -5,11 +5,7 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/extypes.h>
 #include <kmt_test.h>
-#include <pseh/pseh2.h>
 
 //#define NDEBUG
 #include <debug.h>

diff --git a/kmtests/ntos_ex/ExSingleList.c b/kmtests/ntos_ex/ExSingleList.c
index b4b4b3e..ebce09a 100644 (file)
--- a/kmtests/ntos_ex/ExSingleList.c
+++ b/kmtests/ntos_ex/ExSingleList.c
@@ -9,7 +9,6 @@ struct _SINGLE_LIST_ENTRY;
 struct _SINGLE_LIST_ENTRY *__stdcall ExInterlockedPushEntryList(struct _SINGLE_LIST_ENTRY *, struct _SINGLE_LIST_ENTRY *, unsigned long *);
 struct _SINGLE_LIST_ENTRY *__stdcall ExInterlockedPopEntryList(struct _SINGLE_LIST_ENTRY *, unsigned long *);
 
-#include <ntddk.h>
 #include <kmt_test.h>
 
 SINGLE_LIST_ENTRY Entries[5];

diff --git a/kmtests/ntos_ex/ExTimer.c b/kmtests/ntos_ex/ExTimer.c
index d4ad836..566a7dc 100644 (file)
--- a/kmtests/ntos_ex/ExTimer.c
+++ b/kmtests/ntos_ex/ExTimer.c
@@ -5,9 +5,6 @@
  * PROGRAMMER:      Aleksey Bragin <aleksey@reactos.org>
  */
 
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/ntndk.h>
 #include <kmt_test.h>
 
 #define NDEBUG

diff --git a/kmtests/ntos_fsrtl/FsRtlExpression.c b/kmtests/ntos_fsrtl/FsRtlExpression.c
index 3249deb..da5479a 100644 (file)
--- a/kmtests/ntos_fsrtl/FsRtlExpression.c
+++ b/kmtests/ntos_fsrtl/FsRtlExpression.c
@@ -7,7 +7,6 @@
 
 /* TODO: most of these calls fail the Windows checked build's !islower assertion and others */
 
-#include <ntifs.h>
 #include <kmt_test.h>
 
 #define NDEBUG

diff --git a/kmtests/ntos_io/IoDeviceInterface.c b/kmtests/ntos_io/IoDeviceInterface.c
index 34434ff..98edc8f 100644 (file)
--- a/kmtests/ntos_io/IoDeviceInterface.c
+++ b/kmtests/ntos_io/IoDeviceInterface.c
@@ -7,8 +7,6 @@
 
 /* TODO: what's with the prototypes at the top, what's with the if-ed out part? Doesn't process most results */
 
-#include <ntifs.h>
-#include <ndk/iotypes.h>
 #include <kmt_test.h>
 
 #define NDEBUG

diff --git a/kmtests/ntos_io/IoIrp.c b/kmtests/ntos_io/IoIrp.c
index b247832..a96de5c 100644 (file)
--- a/kmtests/ntos_io/IoIrp.c
+++ b/kmtests/ntos_io/IoIrp.c
@@ -6,7 +6,6 @@
  */
 /* Based on code Copyright 2008 Etersoft (Alexander Morozov) */
 
-#include <ntddk.h>
 #include <kmt_test.h>
 
 #define NDEBUG

diff --git a/kmtests/ntos_io/IoMdl.c b/kmtests/ntos_io/IoMdl.c
index 46b2723..898761c 100644 (file)
--- a/kmtests/ntos_io/IoMdl.c
+++ b/kmtests/ntos_io/IoMdl.c
@@ -5,7 +5,6 @@
  * PROGRAMMER:      Aleksey Bragin <aleksey@reactos.org>
  */
 
-#include <ntddk.h>
 #include <kmt_test.h>
 
 #define NDEBUG

diff --git a/kmtests/ntos_ke/KeApc.c b/kmtests/ntos_ke/KeApc.c
index e365d33..e804874 100644 (file)
--- a/kmtests/ntos_ke/KeApc.c
+++ b/kmtests/ntos_ke/KeApc.c
@@ -5,9 +5,6 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/ketypes.h>
 #include <kmt_test.h>
 
 #define CheckApcs(KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, Irql) do    \

diff --git a/kmtests/ntos_ke/KeDpc.c b/kmtests/ntos_ke/KeDpc.c
index 5eacde6..b52c0db 100644 (file)
--- a/kmtests/ntos_ke/KeDpc.c
+++ b/kmtests/ntos_ke/KeDpc.c
@@ -5,11 +5,7 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/ketypes.h>
 #include <kmt_test.h>
-#include <pseh/pseh2.h>
 
 //#define NDEBUG
 #include <debug.h>

diff --git a/kmtests/ntos_ke/KeIrql.c b/kmtests/ntos_ke/KeIrql.c
index 2dd614c..27c4d36 100644 (file)
--- a/kmtests/ntos_ke/KeIrql.c
+++ b/kmtests/ntos_ke/KeIrql.c
@@ -8,11 +8,7 @@
 __declspec(dllimport) void __stdcall KeRaiseIrql(unsigned char, unsigned char *);
 __declspec(dllimport) void __stdcall KeLowerIrql(unsigned char);
 
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/ntndk.h>
 #include <kmt_test.h>
-#include <pseh/pseh2.h>
 
 #define NDEBUG
 #include <debug.h>

diff --git a/kmtests/ntos_ke/KeProcessor.c b/kmtests/ntos_ke/KeProcessor.c
index 64b27d5..fdf7e3b 100644 (file)
--- a/kmtests/ntos_ke/KeProcessor.c
+++ b/kmtests/ntos_ke/KeProcessor.c
@@ -7,9 +7,6 @@
 
 /* TODO: this test doesn't process any test results; it also takes very long */
 
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/ntndk.h>
 #include <kmt_test.h>
 
 #define NDEBUG

diff --git a/kmtests/ntos_ke/KeSpinLock.c b/kmtests/ntos_ke/KeSpinLock.c
index 35e5fb6..542053f 100644 (file)
--- a/kmtests/ntos_ke/KeSpinLock.c
+++ b/kmtests/ntos_ke/KeSpinLock.c
@@ -14,11 +14,7 @@ __declspec(dllimport) void __stdcall KeReleaseSpinLockFromDpcLevel(unsigned long
 
 /* this define makes KeInitializeSpinLock not use the inlined version */
 #define WIN9X_COMPAT_SPINLOCK
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/kefuncs.h>
 #include <kmt_test.h>
-#include <pseh/pseh2.h>
 #include <limits.h>
 
 //#define NDEBUG

diff --git a/kmtests/ntos_ob/ObCreate.c b/kmtests/ntos_ob/ObCreate.c
index 18bdba7..84d88e8 100644 (file)
--- a/kmtests/ntos_ob/ObCreate.c
+++ b/kmtests/ntos_ob/ObCreate.c
@@ -7,9 +7,6 @@
 
 /* TODO: this test terminates with an access violation in Windows */
 
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/ntndk.h>
 #include <kmt_test.h>
 
 #define NDEBUG

diff --git a/kmtests/rtl/RtlMemory.c b/kmtests/rtl/RtlMemory.c
index a46409c..c650a50 100644 (file)
--- a/kmtests/rtl/RtlMemory.c
+++ b/kmtests/rtl/RtlMemory.c
@@ -5,16 +5,7 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
-/* TODO: move this to some header */
-#ifdef KMT_USER_MODE
-#   include <windows.h>
-#   define ok_irql(i)
-#   define KIRQL int
-#   define KeRaiseIrql(new, old)
-#   define KeLowerIrql(i)
-#elif KMT_KERNEL_MODE
-#   include <ntddk.h>
-#endif
+#define KMT_EMULATE_KERNEL
 #include <kmt_test.h>
 
 START_TEST(RtlMemory)