[FASTFAT] Fix size checking in VfatGetFileNameInformation()

[reactos.git] / drivers / input / kbdclass / kbdclass.c

diff --git a/drivers/input/kbdclass/kbdclass.c b/drivers/input/kbdclass/kbdclass.c
index ec8de66..c18b0c7 100644 (file)
--- a/drivers/input/kbdclass/kbdclass.c
+++ b/drivers/input/kbdclass/kbdclass.c
@@ -7,9 +7,13 @@
  * PROGRAMMERS:     Hervé Poussineau (hpoussin@reactos.org)
  */
 
-#define INITGUID
 #include "kbdclass.h"
 
+#include <stdio.h>
+#include <pseh/pseh2.h>
+#include <kbdmou.h>
+#include <debug.h>
+
 static DRIVER_UNLOAD DriverUnload;
 static DRIVER_DISPATCH ClassCreate;
 static DRIVER_DISPATCH ClassClose;
@@ -189,15 +193,18 @@ IrpStub(
        IN PIRP Irp)
 {
        NTSTATUS Status = STATUS_NOT_SUPPORTED;
+       PPORT_DEVICE_EXTENSION DeviceExtension;
 
-       if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO)
+       DeviceExtension = DeviceObject->DeviceExtension;
+       if (!DeviceExtension->Common.IsClassDO)
        {
                /* Forward some IRPs to lower device */
                switch (IoGetCurrentIrpStackLocation(Irp)->MajorFunction)
                {
-                       case IRP_MJ_PNP:
-                       case IRP_MJ_INTERNAL_DEVICE_CONTROL:
-                               return ForwardIrpAndForget(DeviceObject, Irp);
+                       case IRP_MJ_POWER:
+                               PoStartNextPowerIrp(Irp);
+                               IoSkipCurrentIrpStackLocation(Irp);
+                               return PoCallDriver(DeviceExtension->LowerDevice, Irp);
                        default:
                        {
                                ERR_(CLASS_NAME, "Port DO stub for major function 0x%lx\n",
@@ -602,7 +609,7 @@ DestroyPortDriver(
 
        /* Remove from ClassDeviceExtension->ListHead list */
        KeAcquireSpinLock(&ClassDeviceExtension->ListSpinLock, &OldIrql);
-       RemoveHeadList(DeviceExtension->ListEntry.Blink);
+       RemoveEntryList(&DeviceExtension->ListEntry);
        KeReleaseSpinLock(&ClassDeviceExtension->ListSpinLock, OldIrql);
 
        /* Remove entry from HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\[DeviceBaseName] */
@@ -700,7 +707,7 @@ ClassAddDevice(
        Fdo->Flags &= ~DO_DEVICE_INITIALIZING;
 
        /* Register interface ; ignore the error (if any) as having
-        * a registred interface is not so important... */
+        * a registered interface is not so important... */
        Status = IoRegisterDeviceInterface(
                Pdo,
                &GUID_DEVINTERFACE_KEYBOARD,
@@ -861,7 +868,6 @@ ClassPnp(
                        IoCompleteRequest(Irp, IO_NO_INCREMENT);
                        return Status;
                        
-               case IRP_MN_REMOVE_DEVICE:
                case IRP_MN_STOP_DEVICE:
                        if (DeviceExtension->FileHandle)
                        {
@@ -870,6 +876,17 @@ ClassPnp(
                        }
                        Status = STATUS_SUCCESS;
                        break;
+            
+        case IRP_MN_REMOVE_DEVICE:
+            if (DeviceExtension->FileHandle)
+                       {
+                               ZwClose(DeviceExtension->FileHandle);
+                               DeviceExtension->FileHandle = NULL;
+                       }
+            IoSkipCurrentIrpStackLocation(Irp);
+                   Status = IoCallDriver(DeviceExtension->LowerDevice, Irp);
+            DestroyPortDriver(DeviceObject);
+                       return Status;
 
                default:
                        Status = Irp->IoStatus.Status;