- kmtest: Don't use user mode types

- memtest: uh, no. ZwQuerySystemInformation does not return NO_ERROR

svn path=/trunk/; revision=37667

diff --git a/rostests/drivers/kmtest/ntos_io.c b/rostests/drivers/kmtest/ntos_io.c
index 55d6ff2..986098e 100644 (file)
--- a/rostests/drivers/kmtest/ntos_io.c
+++ b/rostests/drivers/kmtest/ntos_io.c
@@ -48,7 +48,7 @@ VOID NtoskrnlIoMdlTest()
 
     ok(Mdl == NULL,
       "IoAllocateMdl should fail allocation of 2Gb or more, but got Mdl=0x%X",
-      (UINT)Mdl);
+      (UINT32)Mdl);
 
     if (Mdl)
         IoFreeMdl(Mdl);
@@ -59,10 +59,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)Mdl->Next);
+        (UINT32)Mdl->Next);
     ok(Mdl->ByteCount == MdlSize,
         "Mdl->ByteCount should be equal to MdlSize, but is 0x%X",
-        (UINT)Mdl->ByteCount);
+        (UINT32)Mdl->ByteCount);
     // TODO: Check other fields of MDL struct
 
     IoFreeMdl(Mdl);
@@ -72,7 +72,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)Mdl, (UINT)Irp->MdlAddress);
+        (UINT32)Mdl, (UINT32)Irp->MdlAddress);
 
     IoFreeMdl(Mdl);
 

diff --git a/rostests/drivers/memtest/memtest.c b/rostests/drivers/memtest/memtest.c
index 823ce8c..8d20747 100644 (file)
--- a/rostests/drivers/memtest/memtest.c
+++ b/rostests/drivers/memtest/memtest.c
@@ -47,7 +47,7 @@ MonitorThread(PVOID Ignored)
         if (ZwQuerySystemInformation(SystemPerformanceInformation,
             (PVOID) &PerformanceInfo,
             sizeof(SYSTEM_PERFORMANCE_INFORMATION),
-            &Length) != NO_ERROR)
+            &Length) != STATUS_SUCCESS)
         {
             break;
         }