[KMTESTS:IO]

- Properly free handles in driver (spotted by Thomas)
- Remove dead code in driver (spotted by Thomas)
- Send an IOCTL to stop on symlinks to allow more precise tests

svn path=/trunk/; revision=69336

diff --git a/rostests/kmtests/ntos_io/IoCreateFile.h b/rostests/kmtests/ntos_io/IoCreateFile.h
index 903ffc1..d2b08dc 100644 (file)
--- a/rostests/kmtests/ntos_io/IoCreateFile.h
+++ b/rostests/kmtests/ntos_io/IoCreateFile.h
@@ -8,7 +8,7 @@
 #ifndef _KMTEST_IOCREATEFILE_H_
 #define _KMTEST_IOCREATEFILE_H_
 
 #ifndef _KMTEST_IOCREATEFILE_H_
 #define _KMTEST_IOCREATEFILE_H_
 

-#define IOCTL_CREATE_SYMLINK    1
-#define IOCTL_CREATE_NO_SYMLINK 2
+#define IOCTL_CALL_CREATE     1
+#define IOCTL_DISABLE_SYMLINK 2

 
 #endif /* !defined _KMTEST_IOCREATEFILE_H_ */
 
 #endif /* !defined _KMTEST_IOCREATEFILE_H_ */

diff --git a/rostests/kmtests/ntos_io/IoCreateFile_drv.c b/rostests/kmtests/ntos_io/IoCreateFile_drv.c
index 2101ad0..33c295a 100644 (file)
--- a/rostests/kmtests/ntos_io/IoCreateFile_drv.c
+++ b/rostests/kmtests/ntos_io/IoCreateFile_drv.c
@@ -57,6 +57,8 @@ TestUnload(
     PAGED_CODE();
 }
 
     PAGED_CODE();
 }
 

+static volatile long gNoLinks = FALSE;
+

 static
 NTSTATUS
 TestIrpHandler(
 static
 NTSTATUS
 TestIrpHandler(


@@ -80,7 +82,7 @@ TestIrpHandler(
     if (IoStack->MajorFunction == IRP_MJ_CREATE)
     {
         ok((IoStack->Parameters.Create.Options & FILE_OPEN_REPARSE_POINT) == 0, "FILE_OPEN_REPARSE_POINT set\n");
     if (IoStack->MajorFunction == IRP_MJ_CREATE)
     {
         ok((IoStack->Parameters.Create.Options & FILE_OPEN_REPARSE_POINT) == 0, "FILE_OPEN_REPARSE_POINT set\n");

-        ok((IoStack->Flags == 0) || (IoStack->Flags == SL_STOP_ON_SYMLINK), "IoStack->Flags = %lx\n", IoStack->Flags);
+        ok((IoStack->Flags == 0 && !gNoLinks) || (IoStack->Flags == SL_STOP_ON_SYMLINK && gNoLinks), "IoStack->Flags = %lx\n", IoStack->Flags);

 
         if (IoStack->FileObject->FileName.Length >= 2 * sizeof(WCHAR))
         {
 
         if (IoStack->FileObject->FileName.Length >= 2 * sizeof(WCHAR))
         {


@@ -155,17 +157,8 @@ TestIrpHandler(
         Status = STATUS_SUCCESS;
     }
 
         Status = STATUS_SUCCESS;
     }
 

-    if (Status == STATUS_PENDING)
-    {
-        IoMarkIrpPending(Irp);
-        IoCompleteRequest(Irp, IO_NO_INCREMENT);
-        Status = STATUS_PENDING;
-    }
-    else
-    {
-        Irp->IoStatus.Status = Status;
-        IoCompleteRequest(Irp, IO_NO_INCREMENT);
-    }
+    Irp->IoStatus.Status = Status;
+    IoCompleteRequest(Irp, IO_NO_INCREMENT);

 
     return Status;
 }
 
     return Status;
 }


@@ -176,8 +169,7 @@ static UNICODE_STRING DocumentsAndSettings = RTL_CONSTANT_STRING(L"\\Documents a
 static
 NTSTATUS
 TestIoCreateFile(
 static
 NTSTATUS
 TestIoCreateFile(

-    IN PUNICODE_STRING Path,
-    IN BOOLEAN NoLinks)
+    IN PUNICODE_STRING Path)

 {
     OBJECT_ATTRIBUTES ObjectAttributes;
     IO_STATUS_BLOCK IoStatusBlock;
 {
     OBJECT_ATTRIBUTES ObjectAttributes;
     IO_STATUS_BLOCK IoStatusBlock;


@@ -203,7 +195,7 @@ TestIoCreateFile(
                           0,
                           CreateFileTypeNone,
                           NULL,
                           0,
                           CreateFileTypeNone,
                           NULL,

-                          IO_NO_PARAMETER_CHECKING | (NoLinks ? IO_STOP_ON_SYMLINK : 0));
+                          IO_NO_PARAMETER_CHECKING | (gNoLinks ? IO_STOP_ON_SYMLINK : 0));

     if (NT_SUCCESS(Status))
     {
         NTSTATUS IntStatus;
     if (NT_SUCCESS(Status))
     {
         NTSTATUS IntStatus;


@@ -222,7 +214,9 @@ TestIoCreateFile(
                "Expected: %wZ or %wZ. Opened: %wZ\n", &FileObjectFileName, &DocumentsAndSettings, &FileObject->FileName);
             ObDereferenceObject(FileObject);
         }
                "Expected: %wZ or %wZ. Opened: %wZ\n", &FileObjectFileName, &DocumentsAndSettings, &FileObject->FileName);
             ObDereferenceObject(FileObject);
         }

-        NtClose(Handle);
+
+        IntStatus = ObCloseHandle(Handle, KernelMode);
+        ok_eq_hex(IntStatus, STATUS_SUCCESS);

     }
 
     return Status;
     }
 
     return Status;


@@ -243,8 +237,16 @@ TestMessageHandler(
 
     switch (ControlCode)
     {
 
     switch (ControlCode)
     {

-        case IOCTL_CREATE_SYMLINK:
-        case IOCTL_CREATE_NO_SYMLINK:
+        case IOCTL_DISABLE_SYMLINK:
+        {
+            if (InterlockedExchange(&gNoLinks, TRUE) == TRUE)
+            {
+                Status = STATUS_UNSUCCESSFUL;
+            }
+
+            break;
+        }
+        case IOCTL_CALL_CREATE:

         {
             ANSI_STRING Path;
             UNICODE_STRING PathW;
         {
             ANSI_STRING Path;
             UNICODE_STRING PathW;


@@ -256,7 +258,7 @@ TestMessageHandler(
             Status = RtlAnsiStringToUnicodeString(&PathW, &Path, TRUE);
             ok_eq_hex(Status, STATUS_SUCCESS);
 
             Status = RtlAnsiStringToUnicodeString(&PathW, &Path, TRUE);
             ok_eq_hex(Status, STATUS_SUCCESS);
 

-            Status = TestIoCreateFile(&PathW, (ControlCode == IOCTL_CREATE_NO_SYMLINK));
+            Status = TestIoCreateFile(&PathW);

 
             RtlFreeUnicodeString(&PathW);
 
 
             RtlFreeUnicodeString(&PathW);
 

diff --git a/rostests/kmtests/ntos_io/IoCreateFile_user.c b/rostests/kmtests/ntos_io/IoCreateFile_user.c
index 858cba4..86ae2d8 100644 (file)
--- a/rostests/kmtests/ntos_io/IoCreateFile_user.c
+++ b/rostests/kmtests/ntos_io/IoCreateFile_user.c
@@ -21,18 +21,21 @@ START_TEST(IoCreateFile)
     KmtLoadDriver(L"IoCreateFile", FALSE);
     KmtOpenDriver();
 
     KmtLoadDriver(L"IoCreateFile", FALSE);
     KmtOpenDriver();
 

-    Error = KmtSendStringToDriver(IOCTL_CREATE_SYMLINK, NonSymlinkedFileName);
+    Error = KmtSendStringToDriver(IOCTL_CALL_CREATE, NonSymlinkedFileName);

     ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error);
     ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error);

-    Error = KmtSendStringToDriver(IOCTL_CREATE_SYMLINK, SymlinkedFileName);
+    Error = KmtSendStringToDriver(IOCTL_CALL_CREATE, SymlinkedFileName);

     ok(Error == ERROR_CANT_ACCESS_FILE, "Expected ERROR_CANT_ACCESS_FILE, got %lx\n", Error); /* FIXME */
     ok(Error == ERROR_CANT_ACCESS_FILE, "Expected ERROR_CANT_ACCESS_FILE, got %lx\n", Error); /* FIXME */

-    Error = KmtSendStringToDriver(IOCTL_CREATE_SYMLINK, MountedPointFileName);
+    Error = KmtSendStringToDriver(IOCTL_CALL_CREATE, MountedPointFileName);

     ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error);
 
     ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error);
 

-    Error = KmtSendStringToDriver(IOCTL_CREATE_NO_SYMLINK, NonSymlinkedFileName);
+    Error = KmtSendToDriver(IOCTL_DISABLE_SYMLINK);

     ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error);
     ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error);

-    Error = KmtSendStringToDriver(IOCTL_CREATE_NO_SYMLINK, SymlinkedFileName);
+
+    Error = KmtSendStringToDriver(IOCTL_CALL_CREATE, NonSymlinkedFileName);
+    ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error);
+    Error = KmtSendStringToDriver(IOCTL_CALL_CREATE, SymlinkedFileName);

     ok(Error == ERROR_MR_MID_NOT_FOUND, "Expected ERROR_MR_MID_NOT_FOUND, got %lx\n", Error);
     ok(Error == ERROR_MR_MID_NOT_FOUND, "Expected ERROR_MR_MID_NOT_FOUND, got %lx\n", Error);

-    Error = KmtSendStringToDriver(IOCTL_CREATE_NO_SYMLINK, MountedPointFileName);
+    Error = KmtSendStringToDriver(IOCTL_CALL_CREATE, MountedPointFileName);

     ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error);
 
     KmtCloseDriver();
     ok(Error == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %lx\n", Error);
 
     KmtCloseDriver();