[KMTEST]

[reactos.git] / rostests / drivers / kmtest / ntos_io.c

diff --git a/rostests/drivers/kmtest/ntos_io.c b/rostests/drivers/kmtest/ntos_io.c
index aad2404..d49955b 100644 (file)
--- a/rostests/drivers/kmtest/ntos_io.c
+++ b/rostests/drivers/kmtest/ntos_io.c
@@ -29,12 +29,10 @@
 #define NDEBUG
 #include "debug.h"
 
-VOID NtoskrnlIoDeviceInterface();
-
 
 /* PUBLIC FUNCTIONS ***********************************************************/
 
-VOID NtoskrnlIoMdlTest()
+VOID NtoskrnlIoMdlTest(HANDLE KeyHandle)
 {
     PMDL Mdl;
     PIRP Irp;
@@ -48,7 +46,7 @@ VOID NtoskrnlIoMdlTest()
 
     ok(Mdl == NULL,
       "IoAllocateMdl should fail allocation of 2Gb or more, but got Mdl=0x%X",
-      (UINT_PTR)Mdl);
+      (UINT32)Mdl);
 
     if (Mdl)
         IoFreeMdl(Mdl);
@@ -59,10 +57,10 @@ VOID NtoskrnlIoMdlTest()
     ok(Mdl != NULL, "Mdl allocation failed");
     // Check fields of the allocated struct
     ok(Mdl->Next == NULL, "Mdl->Next should be NULL, but is 0x%X",
-        (UINT_PTR)Mdl->Next);
+        (UINT32)Mdl->Next);
     ok(Mdl->ByteCount == MdlSize,
         "Mdl->ByteCount should be equal to MdlSize, but is 0x%X",
-        (UINT_PTR)Mdl->ByteCount);
+        (UINT32)Mdl->ByteCount);
     // TODO: Check other fields of MDL struct
 
     IoFreeMdl(Mdl);
@@ -72,7 +70,7 @@ VOID NtoskrnlIoMdlTest()
     Mdl = IoAllocateMdl(VirtualAddress, MdlSize, FALSE, FALSE, Irp);
     ok(Mdl != NULL, "Mdl allocation failed");
     ok(Irp->MdlAddress == Mdl, "Irp->MdlAddress should be 0x%X, but is 0x%X",
-        (UINT_PTR)Mdl, (UINT_PTR)Irp->MdlAddress);
+        (UINT32)Mdl, (UINT32)Irp->MdlAddress);
 
     IoFreeMdl(Mdl);
 
@@ -81,10 +79,10 @@ VOID NtoskrnlIoMdlTest()
     IoFreeIrp(Irp);
     ExFreePool(VirtualAddress);
 
-    FinishTest("NTOSKRNL Io Mdl");
+    FinishTest(KeyHandle, L"IoMdlTest");
 }
 
-VOID NtoskrnlIoIrpTest()
+VOID NtoskrnlIoIrpTest(HANDLE KeyHandle)
 {
     USHORT size;
     IRP *iorp;
@@ -166,12 +164,5 @@ VOID NtoskrnlIoIrpTest()
         IoFreeIrp(iorp);
     }
 
-    FinishTest("NTOSKRNL Io Irp");
-}
-
-VOID NtoskrnlIoTests()
-{
-    NtoskrnlIoMdlTest();
-    NtoskrnlIoDeviceInterface();
-    NtoskrnlIoIrpTest();
+    FinishTest(KeyHandle, L"IoIrpTest");
 }