Add IOCTLs to query instance, name and protocol

Signed-off-by: Owen Smith <owen.smith@citrix.com>
Renamed __ConsolePutQueue() to __ConsoleReadWrite().
PdoDispatchReadWriteClose() should mark pending IRPs.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/include/xencons_device.h b/include/xencons_device.h
index eaf57d8e29c1933b5cc50632525d117792a9e337..c9ae2efbbf8563fb22181a507adc8d505c294f72 100644 (file)
--- a/include/xencons_device.h
+++ b/include/xencons_device.h
@@ -36,4 +36,21 @@
 DEFINE_GUID(GUID_XENCONS_DEVICE,
             0xd3edd21, 0x8ef9, 0x4dff, 0x85, 0x6c, 0x8c, 0x68, 0xbf, 0x4f, 0xdc, 0xa3);
 
+#define __IOCTL_XENCONS_BEGIN   0x800
+
+#define IOCTL_XENCONS_GET_INSTANCE  CTL_CODE(FILE_DEVICE_UNKNOWN,       \
+                                             __IOCTL_XENCONS_BEGIN + 0, \
+                                             METHOD_BUFFERED,           \
+                                             FILE_ANY_ACCESS)
+
+#define IOCTL_XENCONS_GET_NAME      CTL_CODE(FILE_DEVICE_UNKNOWN,       \
+                                             __IOCTL_XENCONS_BEGIN + 1, \
+                                             METHOD_BUFFERED,           \
+                                             FILE_ANY_ACCESS)
+
+#define IOCTL_XENCONS_GET_PROTOCOL  CTL_CODE(FILE_DEVICE_UNKNOWN,       \
+                                             __IOCTL_XENCONS_BEGIN + 2, \
+                                             METHOD_BUFFERED,           \
+                                             FILE_ANY_ACCESS)
+
 #endif  // _XENCONS_DEVICE_H

diff --git a/src/xencons/console.c b/src/xencons/console.c
index cb5f70f25e5a83c1f61496225182db66f4f1c411..ed1fe53998e6216531ed91bb7aa8df8b77954985 100644 (file)
--- a/src/xencons/console.c
+++ b/src/xencons/console.c
@@ -36,6 +36,8 @@
 #include <ntstrsafe.h>
 #include <stdlib.h>
 
+#include <xencons_device.h>
+
 #include "driver.h"
 #include "console.h"
 #include "stream.h"
@@ -227,8 +229,8 @@ fail1:
     return status;
 }
 
-NTSTATUS
-ConsolePutQueue(
+static FORCEINLINE NTSTATUS
+__ConsoleReadWrite(
     IN  PXENCONS_CONSOLE    Console,
     IN  PIRP                Irp
     )
@@ -260,6 +262,112 @@ fail1:
     return status;
 }
 
+static FORCEINLINE NTSTATUS
+__ConsoleDeviceControl(
+    IN  PXENCONS_CONSOLE    Console,
+    IN  PIRP                Irp
+    )
+{
+    PIO_STACK_LOCATION      StackLocation;
+    ULONG                   IoControlCode;
+    ULONG                   InputBufferLength;
+    ULONG                   OutputBufferLength;
+    PVOID                   Buffer;
+    PCHAR                   Value;
+    ULONG                   Length;
+    NTSTATUS                status;
+
+    UNREFERENCED_PARAMETER(Console);
+
+    StackLocation = IoGetCurrentIrpStackLocation(Irp);
+    IoControlCode = StackLocation->Parameters.DeviceIoControl.IoControlCode;
+    InputBufferLength = StackLocation->Parameters.DeviceIoControl.InputBufferLength;
+    OutputBufferLength = StackLocation->Parameters.DeviceIoControl.OutputBufferLength;
+    Buffer = Irp->AssociatedIrp.SystemBuffer;
+
+    switch (IoControlCode) {
+    case IOCTL_XENCONS_GET_INSTANCE:
+        Value = "0";
+        break;
+    case IOCTL_XENCONS_GET_NAME:
+        Value = "default";
+        break;
+    case IOCTL_XENCONS_GET_PROTOCOL:
+        Value = "vt100";
+        break;
+    default:
+        Value = NULL;
+        break;
+    }
+
+    status = STATUS_NOT_SUPPORTED;
+    if (Value == NULL)
+        goto fail1;
+
+    status = STATUS_INVALID_PARAMETER;
+    if (InputBufferLength != 0)
+        goto fail2;
+
+    Length = (ULONG)strlen(Value) + 1;
+    Irp->IoStatus.Information = Length;
+
+    status = STATUS_INVALID_BUFFER_SIZE;
+    if (OutputBufferLength == 0)
+        goto fail3;
+
+    RtlZeroMemory(Buffer, OutputBufferLength);
+    if (OutputBufferLength < Length)
+        goto fail4;
+
+    RtlCopyMemory(Buffer, Value, Length);
+
+    return STATUS_SUCCESS;
+
+fail4:
+    Error("fail4\n");
+
+fail3:
+    Error("fail3\n");
+
+fail2:
+    Error("fail2\n");
+
+fail1:
+    Error("fail1 (%08x)\n", status);
+
+    return status;
+}
+
+NTSTATUS
+ConsolePutQueue(
+    IN  PXENCONS_CONSOLE    Console,
+    IN  PIRP                Irp
+    )
+{
+    PIO_STACK_LOCATION      StackLocation;
+    NTSTATUS                status;
+
+    StackLocation = IoGetCurrentIrpStackLocation(Irp);
+
+    switch (StackLocation->MajorFunction) {
+    case IRP_MJ_READ:
+    case IRP_MJ_WRITE:
+        status = __ConsoleReadWrite(Console, Irp);
+        break;
+
+    case IRP_MJ_DEVICE_CONTROL:
+        status = __ConsoleDeviceControl(Console, Irp);
+        break;
+
+    default:
+        ASSERT(FALSE);
+        status = STATUS_NOT_SUPPORTED;
+        break;
+    }
+
+    return status;
+}
+
 NTSTATUS
 ConsoleD3ToD0(
     IN  PXENCONS_CONSOLE    Console

diff --git a/src/xencons/pdo.c b/src/xencons/pdo.c
index 077c7e2ff6f62ce3b73b3ed697ef079aba58841c..a3fabdf017cdaaafbbf72e1e7c5bf828291a3684 100644 (file)
--- a/src/xencons/pdo.c
+++ b/src/xencons/pdo.c
@@ -1735,7 +1735,7 @@ PdoDispatchClose(
 }
 
 static DECLSPEC_NOINLINE NTSTATUS
-PdoDispatchReadWrite(
+PdoDispatchReadWriteControl(
     IN  PXENCONS_PDO    Pdo,
     IN  PIRP            Irp
     )
@@ -1743,17 +1743,16 @@ PdoDispatchReadWrite(
     NTSTATUS            status;
 
     status = ConsolePutQueue(Pdo->Console, Irp);
-    if (status != STATUS_PENDING)
-        goto fail1;
-
-    return STATUS_PENDING;
 
-fail1:
-    Error("fail1 (%08x)\n", status);
+    if (status == STATUS_PENDING) {
+        IoMarkIrpPending(Irp);
+        goto done;
+    }
 
     Irp->IoStatus.Status = status;
     IoCompleteRequest(Irp, IO_NO_INCREMENT);
 
+done:
     return status;
 }
 
@@ -1807,7 +1806,8 @@ PdoDispatch(
 
     case IRP_MJ_READ:
     case IRP_MJ_WRITE:
-        status = PdoDispatchReadWrite(Pdo, Irp);
+    case IRP_MJ_DEVICE_CONTROL:
+        status = PdoDispatchReadWriteControl(Pdo, Irp);
         break;
 
     default: