Forgetting to save really sucks. Sorry again for the wasted commit.

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

diff --git a/rostests/drivers/kmtest/deviface_test.c b/rostests/drivers/kmtest/deviface_test.c
index 7e34258..2e27349 100644 (file)
--- a/rostests/drivers/kmtest/deviface_test.c
+++ b/rostests/drivers/kmtest/deviface_test.c
@@ -22,56 +22,56 @@
 
 /* INCLUDES *******************************************************************/
 
-#include <ddk/ntddk.h>
+#include <ddk/ntifs.h>
 #include <ndk/iotypes.h>
 #include "kmtest.h"
 
-//#define NDEBUG
+#define NDEBUG
 #include "debug.h"
 
 /* PRIVATE FUNCTIONS **********************************************************/
 
-NTSTATUS STDCALL
-(*IoGetDeviceInterfaces_Func)(
+NTSTATUS
+(NTAPI *IoGetDeviceInterfaces_Func)(
    IN CONST GUID *InterfaceClassGuid,
    IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL,
    IN ULONG Flags,
    OUT PWSTR *SymbolicLinkList);
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 ReactOS_IoGetDeviceInterfaces(
    IN CONST GUID *InterfaceClassGuid,
    IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL,
    IN ULONG Flags,
    OUT PWSTR *SymbolicLinkList);
 
-VOID FASTCALL DeviceInterfaceTest_Func()
+VOID DeviceInterfaceTest_Func()
 {
    NTSTATUS Status;
    PWSTR SymbolicLinkList;
    PWSTR SymbolicLinkListPtr;
    GUID Guid = {0x378de44c, 0x56ef, 0x11d1, {0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd}};
 
-   Status = IoGetDeviceInterfaces_Func(
+   Status = IoGetDeviceInterfaces(
       &Guid,
       NULL,
       0,
       &SymbolicLinkList);
 
+   ok(NT_SUCCESS(Status),
+         "IoGetDeviceInterfaces failed with status 0x%X\n",
+         (unsigned int)Status);
    if (!NT_SUCCESS(Status))
    {
-      DPRINT(
-         "[PnP Test] IoGetDeviceInterfaces failed with status 0x%X\n",
-         Status);
       return;
    }
 
-   DPRINT("[PnP Test] IoGetDeviceInterfaces results:\n");
+   DPRINT("IoGetDeviceInterfaces results:\n");
    for (SymbolicLinkListPtr = SymbolicLinkList;
         SymbolicLinkListPtr[0] != 0 && SymbolicLinkListPtr[1] != 0;
         SymbolicLinkListPtr += wcslen(SymbolicLinkListPtr) + 1)
    {
-      DPRINT("[PnP Test] %S\n", SymbolicLinkListPtr);
+      DPRINT1("Symbolic Link: %S\n", SymbolicLinkListPtr);
    }
 
 #if 0
@@ -102,7 +102,7 @@ VOID FASTCALL DeviceInterfaceTest_Func()
    ExFreePool(SymbolicLinkList);
 }
 
-VOID RegisterDI_Test()
+VOID RegisterDI_Test(HANDLE KeyHandle)
 {
     GUID Guid = {0x378de44c, 0x56ef, 0x11d1, {0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd}};
     DEVICE_OBJECT DeviceObject;
@@ -111,6 +111,8 @@ VOID RegisterDI_Test()
     UNICODE_STRING SymbolicLinkName;
     NTSTATUS Status;
 
+    StartTest();
+
     RtlInitUnicodeString(&SymbolicLinkName, L"");
 
     // Prepare our surrogate of a Device Object
@@ -132,23 +134,8 @@ VOID RegisterDI_Test()
 
     ok(Status == STATUS_INVALID_DEVICE_REQUEST,
         "IoRegisterDeviceInterface returned 0x%08lX\n", Status);
-}
 
-VOID FASTCALL NtoskrnlIoDeviceInterface()
-{
-    StartTest();
-
-    // Test IoRegisterDeviceInterface() failures now
-    RegisterDI_Test();
-
-/*
-    DPRINT("Calling DeviceInterfaceTest_Func with native functions\n");
-    IoGetDeviceInterfaces_Func = IoGetDeviceInterfaces;
-    DeviceInterfaceTest_Func();
-    DPRINT("Calling DeviceInterfaceTest_Func with ReactOS functions\n");
-    IoGetDeviceInterfaces_Func = ReactOS_IoGetDeviceInterfaces;
     DeviceInterfaceTest_Func();
-*/
 
-    FinishTest("NTOSKRNL Io Device Interface Test");
+    FinishTest(KeyHandle, L"IoDeviceInterfaceTest");
 }