From: Thomas Faber <thomas.faber@reactos.org>
Date: Wed, 17 Aug 2011 12:04:15 +0000 (+0000)
Subject: [KMTESTS/IO]
X-Git-Tag: backups/GSoC_2011/KMTestSuite@60644~18
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=ee28aa087c8471b168db69a338a02cdb3100c336

[KMTESTS/IO]
- Rename IoDriverObject test to IoDeviceObject

svn path=/branches/GSoC_2011/KMTestSuite/; revision=53281
---

diff --git a/kmtests/CMakeLists.txt b/kmtests/CMakeLists.txt
index b4bd26d927a..a9487ea655d 100644
--- a/kmtests/CMakeLists.txt
+++ b/kmtests/CMakeLists.txt
@@ -68,7 +68,7 @@ list(APPEND KMTEST_SOURCE
     kmtest/testlist.c
 
     example/Example_user.c
-    ntos_io/IoDriverObject_user.c
+    ntos_io/IoDeviceObject_user.c
     rtl/RtlAvlTree.c
     rtl/RtlMemory.c
     rtl/RtlSplayTree.c
@@ -90,7 +90,7 @@ add_custom_target(kmtest_drivers)
 add_dependencies(kmtest_drivers
     kmtest_drv
     example_drv
-    iodriverobject_drv
+    iodeviceobject_drv
     iohelper_drv)
 
 add_custom_target(kmtest_all)
diff --git a/kmtests/directory.rbuild b/kmtests/directory.rbuild
index aee9227a5a4..7807604db3f 100644
--- a/kmtests/directory.rbuild
+++ b/kmtests/directory.rbuild
@@ -5,7 +5,7 @@
 		<xi:include href="example/example_drv.rbuild" />
 	</directory>
 	<directory name="ntos_io">
-		<xi:include href="ntos_io/iodriverobject_drv.rbuild" />
+		<xi:include href="ntos_io/iodeviceobject_drv.rbuild" />
 		<xi:include href="ntos_io/iohelper_drv.rbuild" />
 	</directory>
 	<xi:include href="kmtest.rbuild" />
diff --git a/kmtests/kmtest.rbuild b/kmtests/kmtest.rbuild
index 81071b5c0dd..46f3d23a0fa 100644
--- a/kmtests/kmtest.rbuild
+++ b/kmtests/kmtest.rbuild
@@ -14,7 +14,7 @@
 		<file>Example_user.c</file>
 	</directory>
 	<directory name="ntos_io">
-		<file>IoDriverObject_user.c</file>
+		<file>IoDeviceObject_user.c</file>
 	</directory>
 	<directory name="rtl">
 		<file>RtlAvlTree.c</file>
diff --git a/kmtests/kmtest/testlist.c b/kmtests/kmtest/testlist.c
index f6e8ce54a61..ad017c0578e 100644
--- a/kmtests/kmtest/testlist.c
+++ b/kmtests/kmtest/testlist.c
@@ -8,7 +8,7 @@
 #include <kmt_test.h>
 
 KMT_TESTFUNC Test_Example;
-KMT_TESTFUNC Test_IoDriverObject;
+KMT_TESTFUNC Test_IoDeviceObject;
 KMT_TESTFUNC Test_RtlAvlTree;
 KMT_TESTFUNC Test_RtlMemory;
 KMT_TESTFUNC Test_RtlSplayTree;
@@ -17,7 +17,7 @@ KMT_TESTFUNC Test_RtlSplayTree;
 const KMT_TEST TestList[] =
 {
     { "Example",            Test_Example },
-    { "IoDriverObject",     Test_IoDriverObject },
+    { "IoDeviceObject",     Test_IoDeviceObject },
     { "RtlAvlTree",         Test_RtlAvlTree },
     { "RtlMemory",          Test_RtlMemory },
     { "RtlSplayTree",       Test_RtlSplayTree },
diff --git a/kmtests/ntos_io/CMakeLists.txt b/kmtests/ntos_io/CMakeLists.txt
index 9d1f5e0f5f2..9b0640d7788 100644
--- a/kmtests/ntos_io/CMakeLists.txt
+++ b/kmtests/ntos_io/CMakeLists.txt
@@ -2,20 +2,20 @@ include_directories(
     ../include)
 
 #
-# IoDriverObject
+# IoDeviceObject
 #
-list(APPEND IODRIVEROBJECT_DRV_SOURCE
+list(APPEND IODEVICEOBJECT_DRV_SOURCE
     ../kmtest_drv/kmtest_standalone.c
-    IoDriverObject_drv.c)
+    IoDeviceObject_drv.c)
 
-add_library(iodriverobject_drv SHARED ${IODRIVEROBJECT_DRV_SOURCE})
+add_library(iodeviceobject_drv SHARED ${IODEVICEOBJECT_DRV_SOURCE})
 
-set_module_type(iodriverobject_drv kernelmodedriver)
-target_link_libraries(iodriverobject_drv kmtest_printf ${PSEH_LIB})
-add_importlibs(iodriverobject_drv ntoskrnl hal)
-set_property(TARGET iodriverobject_drv PROPERTY COMPILE_DEFINITIONS KMT_STANDALONE_DRIVER)
+set_module_type(iodeviceobject_drv kernelmodedriver)
+target_link_libraries(iodeviceobject_drv kmtest_printf ${PSEH_LIB})
+add_importlibs(iodeviceobject_drv ntoskrnl hal)
+set_property(TARGET iodeviceobject_drv PROPERTY COMPILE_DEFINITIONS KMT_STANDALONE_DRIVER)
 
-add_cd_file(TARGET iodriverobject_drv DESTINATION reactos/bin FOR all)
+add_cd_file(TARGET iodeviceobject_drv DESTINATION reactos/bin FOR all)
 
 #
 # IoHelper
diff --git a/kmtests/ntos_io/IoDriverObject_drv.c b/kmtests/ntos_io/IoDeviceObject_drv.c
similarity index 99%
rename from kmtests/ntos_io/IoDriverObject_drv.c
rename to kmtests/ntos_io/IoDeviceObject_drv.c
index 5d27ce45fe0..cd826092705 100644
--- a/kmtests/ntos_io/IoDriverObject_drv.c
+++ b/kmtests/ntos_io/IoDeviceObject_drv.c
@@ -39,7 +39,7 @@ TestEntry(
     UNREFERENCED_PARAMETER(RegistryPath);
     UNREFERENCED_PARAMETER(Flags);
 
-    *DeviceName = L"IoDriverObject";
+    *DeviceName = L"IoDeviceObject";
 
     KmtRegisterIrpHandler(IRP_MJ_CREATE, NULL, TestIrpHandler);
     KmtRegisterIrpHandler(IRP_MJ_CLOSE, NULL, TestIrpHandler);
diff --git a/kmtests/ntos_io/IoDriverObject_user.c b/kmtests/ntos_io/IoDeviceObject_user.c
similarity index 82%
rename from kmtests/ntos_io/IoDriverObject_user.c
rename to kmtests/ntos_io/IoDeviceObject_user.c
index 87f9bd040f7..f73d1ba47b5 100644
--- a/kmtests/ntos_io/IoDriverObject_user.c
+++ b/kmtests/ntos_io/IoDeviceObject_user.c
@@ -7,9 +7,9 @@
 
 #include <kmt_test.h>
 
-START_TEST(IoDriverObject)
+START_TEST(IoDeviceObject)
 {
-    KmtLoadDriver(L"IoDriverObject", FALSE);
+    KmtLoadDriver(L"IoDeviceObject", FALSE);
     KmtOpenDriver();
     KmtCloseDriver();
     KmtUnloadDriver();
diff --git a/kmtests/ntos_io/iodriverobject_drv.rbuild b/kmtests/ntos_io/iodeviceobject_drv.rbuild
similarity index 68%
rename from kmtests/ntos_io/iodriverobject_drv.rbuild
rename to kmtests/ntos_io/iodeviceobject_drv.rbuild
index d8fb06ce36e..037d838b6ad 100644
--- a/kmtests/ntos_io/iodriverobject_drv.rbuild
+++ b/kmtests/ntos_io/iodeviceobject_drv.rbuild
@@ -1,11 +1,11 @@
-<module name="iodriverobject_drv" type="kernelmodedriver" installbase="bin" installname="iodriverobject_drv.sys">
+<module name="iodeviceobject_drv" type="kernelmodedriver" installbase="bin" installname="iodeviceobject_drv.sys">
 	<include base="kmtest_drv">include</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<library>pseh</library>
 	<library>kmtest_printf</library>
 	<define name="KMT_STANDALONE_DRIVER" />
-	<file>IoDriverObject_drv.c</file>
+	<file>IoDeviceObject_drv.c</file>
 	<directory name="..">
 		<directory name="kmtest_drv">
 			<file>kmtest_standalone.c</file>