[ros-diffs] [tfaber] 53021: [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_te...

Author: tfaber
Date: Mon Aug  1 21:53:52 2011
New Revision: 53021

URL: http://svn.reactos.org/svn/reactos?rev=53021&view=rev
Log:
[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

Added:
    branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h   (with props)
Modified:
    branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c
    branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c
    branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c
    branches/GSoC_2011/KMTestSuite/kmtests/example/KernelType.c
    branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h
    branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c
    branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c
    branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c
    branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExDoubleList.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExPools.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSingleList.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExTimer.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/FsRtlExpression.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDeviceInterface.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoIrp.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoMdl.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeIrql.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeProcessor.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObCreate.c
    branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlMemory.c

Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -5,7 +5,6 @@
  * PROGRAMMER:      Thomas Faber <thfabba(a)gmx.de>
  */
 
-#include <ntddk.h>
 #include <kmt_test.h>
 
 START_TEST(Example)

Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -4,8 +4,6 @@
  * PURPOSE:         Kernel-Mode Test Suite Example Test Driver
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
-
-#include <ntddk.h>
 
 #include <kmt_test.h>
 

Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -5,9 +5,6 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
-#define UNICODE
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 #include <kmt_test.h>
 
 #include "Example.h"

Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/KernelType.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/example/KernelType.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/example/KernelType.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -5,7 +5,6 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
-#include <ntddk.h>
 #include <kmt_test.h>
 
 START_TEST(KernelType)

Added: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h (added)
+++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -1,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 &lt;thfabba(a)gmx.de&gt;
+ */
+
+#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_ */

Propchange: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -12,6 +12,8 @@
 
 #ifndef _KMTEST_TEST_H_
 #define _KMTEST_TEST_H_
+
+#include <kmt_platform.h>
 
 #include <stdarg.h>
 

Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -5,20 +5,15 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
-#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"

Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -5,14 +5,10 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
-#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)
 

Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -5,17 +5,12 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
-#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;
 

Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -5,9 +5,6 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
-#define WIN32_LEAN_AND_MEAN
-#define UNICODE
-#include <windows.h>
 #include <kmt_test.h>
 
 KMT_TESTFUNC Test_Example;

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExDoubleList.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExDoubleList.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExDoubleList.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -10,7 +10,6 @@
 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];

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -4,11 +4,6 @@
  * PURPOSE:         Kernel-Mode Test Suite Hard error message test
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
-
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/exfuncs.h>
-#include <pseh/pseh2.h>
 
 #include <kmt_test.h>
 

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1]
(original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -24,9 +24,6 @@
 __declspec(dllimport)   int             __stdcall   ExInterlockedDecrementLong(long *,
void *);
 __declspec(dllimport)   int             __stdcall   Exi386InterlockedIncrementLong(long
*);
 __declspec(dllimport)   int             __stdcall   Exi386InterlockedDecrementLong(long
*);
-
-#include <ntddk.h>
-#include <pseh/pseh2.h>
 
 #include <kmt_test.h>
 

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExPools.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExPools.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExPools.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -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

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -5,11 +5,7 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/extypes.h>
 #include <kmt_test.h>
-#include <pseh/pseh2.h>
 
 //#define NDEBUG
 #include <debug.h>

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSingleList.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSingleList.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSingleList.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -9,7 +9,6 @@
 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];

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExTimer.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExTimer.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExTimer.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -5,9 +5,6 @@
  * PROGRAMMER:      Aleksey Bragin &lt;aleksey(a)reactos.org&gt;
  */
 
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/ntndk.h>
 #include <kmt_test.h>
 
 #define NDEBUG

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/FsRtlExpression.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1]
(original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] Mon
Aug  1 21:53:52 2011
@@ -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

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDeviceInterface.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDeviceInterface.c [iso-8859-1]
(original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDeviceInterface.c [iso-8859-1] Mon
Aug  1 21:53:52 2011
@@ -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

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoIrp.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoIrp.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoIrp.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -6,7 +6,6 @@
  */
 /* Based on code Copyright 2008 Etersoft (Alexander Morozov) */
 
-#include <ntddk.h>
 #include <kmt_test.h>
 
 #define NDEBUG

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoMdl.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoMdl.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoMdl.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -5,7 +5,6 @@
  * PROGRAMMER:      Aleksey Bragin &lt;aleksey(a)reactos.org&gt;
  */
 
-#include <ntddk.h>
 #include <kmt_test.h>
 
 #define NDEBUG

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -5,9 +5,6 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/ketypes.h>
 #include <kmt_test.h>
 
 #define CheckApcs(KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, Irql) do   
\

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -5,11 +5,7 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
-#include <ntddk.h>
-#include <ntifs.h>
-#include <ndk/ketypes.h>
 #include <kmt_test.h>
-#include <pseh/pseh2.h>
 
 //#define NDEBUG
 #include <debug.h>

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeIrql.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeIrql.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeIrql.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -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>

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeProcessor.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeProcessor.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeProcessor.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -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

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -14,11 +14,7 @@
 
 /* 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

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObCreate.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObCreate.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObCreate.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -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

Modified: branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlMemory.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/r…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlMemory.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlMemory.c [iso-8859-1] Mon Aug  1
21:53:52 2011
@@ -5,16 +5,7 @@
  * PROGRAMMER:      Thomas Faber &lt;thfabba(a)gmx.de&gt;
  */
 
-/* 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)