ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert 19324 and part of 19325...

Browse Source 
svn path=/trunk/; revision=19328
This commit is contained in:
Hervé Poussineau
2005-11-18 20:35:42 +00:00
parent 1c7c84efbc
commit 0bfe9a412e
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/drivers/input/kbdclass/kbdclass.c
+3 -3
View File
@@ -329,7 +329,7 @@ cleanup:
DeviceExtension->ReadIsPending = FALSE;
DeviceExtension->InputCount = 0;
DeviceExtension->PortData = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->DataQueueSize * sizeof(KEYBOARD_INPUT_DATA));
Fdo->Flags |= DO_POWER_PAGABLE;
Fdo->Flags |= DO_POWER_PAGABLE | DO_BUFFERED_IO;
Fdo->Flags &= ~DO_DEVICE_INITIALIZING;
/* Add entry entry to HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\[DeviceBaseName] */
@@ -385,7 +385,7 @@ ClassCallback(
/* A read request is waiting for input, so go straight to it */
/* FIXME: use SEH */
RtlCopyMemory(
Irp->MdlAddress ? MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority) : Irp->UserBuffer,
Irp->MdlAddress ? MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority) : Irp->AssociatedIrp.SystemBuffer,
DataStart,
sizeof(KEYBOARD_INPUT_DATA));
@@ -585,7 +585,7 @@ ClassStartIo(
/* FIXME: use SEH */
RtlCopyMemory(
Irp->MdlAddress ? MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority) : Irp->UserBuffer,
Irp->AssociatedIrp.SystemBuffer,
DeviceExtension->PortData - DeviceExtension->InputCount,
sizeof(KEYBOARD_INPUT_DATA));
reactos/ntoskrnl/io/pnpmgr.c
-5
View File
@@ -2063,11 +2063,6 @@ IopActionInitChildServices(
}
#endif
if (DeviceNode->ServiceName.Length == 0)
/* We have a NULL driver for this device. We can't really do
* something with it, so state it is started... */
IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED);
if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED) &&
!IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) &&
!IopDeviceNodeHasFlag(DeviceNode, DNF_STARTED))