Ros-diffs May 2013

ros-diffs@reactos.org

16 participants
234 discussions

[tfaber] 59010: [HIDUSB] - Plug a memory leak in HidUsb_GetReportDescriptor - Do not try to free in the middle of a pool block on IRP_MN_STOP_DEVICE - Implement HidPower - Do not access an IRP afte...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 12 18:24:12 2013 New Revision: 59010 URL: http://svn.reactos.org/svn/reactos?rev=59010&view=rev Log: [HIDUSB] - Plug a memory leak in HidUsb_GetReportDescriptor - Do not try to free in the middle of a pool block on IRP_MN_STOP_DEVICE - Implement HidPower - Do not access an IRP after completing it in HidCreate - Do not waste a stack location in HidSystemControl Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun May 12 18:24:12 2013 @@ -312,16 +312,16 @@ ASSERT(IoStack->MajorFunction == IRP_MJ_CREATE || IoStack->MajorFunction == IRP_MJ_CLOSE); // + // informational debug print + // + DPRINT("HIDUSB Request: %x\n", IoStack->MajorFunction); + + // // complete request // Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - - // - // informal debug print - // - DPRINT("HIDUSB Request: %x\n", IoStack->MajorFunction); // // done @@ -715,6 +715,11 @@ Irp->IoStatus.Information = Length; // + // free the report buffer + // + ExFreePoolWithTag(Report, HIDUSB_TAG); + + // // done // return Status; @@ -909,9 +914,12 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + PHID_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceExtension->NextDeviceObject, Irp); } NTSTATUS @@ -928,9 +936,9 @@ DeviceExtension = DeviceObject->DeviceExtension; // - // copy stack location - // - IoCopyCurrentIrpStackLocationToNext(Irp); + // skip stack location + // + IoSkipCurrentIrpStackLocation(Irp); // // submit request @@ -1721,15 +1729,6 @@ } // - // free resources - // - if (HidDeviceExtension->HidDescriptor) - { - ExFreePoolWithTag(HidDeviceExtension->HidDescriptor, HIDUSB_TAG); - HidDeviceExtension->HidDescriptor = NULL; - } - - // // done // IoCompleteRequest(Irp, IO_NO_INCREMENT);

11 years, 7 months

[tfaber] 59009: [HIDUSB] - Use pool tagging

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 12 17:59:14 2013 New Revision: 59009 URL: http://svn.reactos.org/svn/reactos?rev=59009&view=rev Log: [HIDUSB] - Use pool tagging Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c trunk/reactos/drivers/hid/hidusb/hidusb.h Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun May 12 17:59:14 2013 @@ -142,7 +142,7 @@ // // allocate urb // - Urb = ExAllocatePool(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST)); + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST), HIDUSB_URB_TAG); if (!Urb) { // @@ -167,7 +167,7 @@ // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // done @@ -194,7 +194,7 @@ // // allocate urb // - Urb = ExAllocatePool(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST)); + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST), HIDUSB_URB_TAG); if (!Urb) { // @@ -226,7 +226,7 @@ // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // done @@ -410,7 +410,7 @@ ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); IoFreeWorkItem(ResetContext->WorkItem); IoCompleteRequest(ResetContext->Irp, IO_NO_INCREMENT); - ExFreePool(ResetContext); + ExFreePoolWithTag(ResetContext, HIDUSB_TAG); } @@ -460,7 +460,7 @@ // // free the urb // - ExFreePool(Context); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // finish completion @@ -477,7 +477,7 @@ // // allocate reset context // - ResetContext = (PHID_USB_RESET_CONTEXT)ExAllocatePool(NonPagedPool, sizeof(HID_USB_RESET_CONTEXT)); + ResetContext = ExAllocatePoolWithTag(NonPagedPool, sizeof(HID_USB_RESET_CONTEXT), HIDUSB_TAG); if (ResetContext) { // @@ -500,7 +500,7 @@ // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // defer completion @@ -510,13 +510,13 @@ // // free context // - ExFreePool(ResetContext); + ExFreePoolWithTag(ResetContext, HIDUSB_TAG); } // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // complete request @@ -564,7 +564,7 @@ // // lets allocate urb // - Urb = (PURB)ExAllocatePool(NonPagedPool, sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER)); + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), HIDUSB_URB_TAG); if (!Urb) { // @@ -1068,7 +1068,7 @@ // // allocate urb // - Urb = (PURB)ExAllocatePool(NonPagedPool, UrbLength); + Urb = ExAllocatePoolWithTag(NonPagedPool, UrbLength, HIDUSB_URB_TAG); if (!Urb) { // @@ -1085,13 +1085,13 @@ // // allocate buffer // - *UrbBuffer = ExAllocatePool(NonPagedPool, *UrbBufferLength); + *UrbBuffer = ExAllocatePoolWithTag(NonPagedPool, *UrbBufferLength, HIDUSB_TAG); if (!*UrbBuffer) { // // no memory // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1132,14 +1132,14 @@ // // free allocated buffer // - ExFreePool(*UrbBuffer); + ExFreePoolWithTag(*UrbBuffer, HIDUSB_TAG); *UrbBuffer = NULL; } // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); *UrbBufferLength = 0; return Status; } @@ -1154,14 +1154,14 @@ // // free allocated buffer // - ExFreePool(*UrbBuffer); + ExFreePoolWithTag(*UrbBuffer, HIDUSB_TAG); *UrbBuffer = NULL; } // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); *UrbBufferLength = 0; return STATUS_UNSUCCESSFUL; } @@ -1174,7 +1174,7 @@ // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // completed successfully @@ -1257,7 +1257,7 @@ // // copy interface info // - HidDeviceExtension->InterfaceInfo = (PUSBD_INTERFACE_INFORMATION)ExAllocatePool(NonPagedPool, Urb->UrbSelectConfiguration.Interface.Length); + HidDeviceExtension->InterfaceInfo = ExAllocatePoolWithTag(NonPagedPool, Urb->UrbSelectConfiguration.Interface.Length, HIDUSB_TAG); if (HidDeviceExtension->InterfaceInfo) { // @@ -1270,7 +1270,7 @@ // // free urb request // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, 0); // // done @@ -1296,7 +1296,7 @@ // // allocate urb // - Urb = ExAllocatePool(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), HIDUSB_URB_TAG); if (!Urb) { // @@ -1334,7 +1334,7 @@ // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // print status @@ -1372,7 +1372,7 @@ // // allocate urb // - Urb = ExAllocatePool(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), HIDUSB_URB_TAG); if (!Urb) { // @@ -1410,7 +1410,7 @@ // // free urb // - ExFreePool(Urb); + ExFreePoolWithTag(Urb, HIDUSB_URB_TAG); // // boot protocol active 0x00 disabled 0x1 @@ -1502,7 +1502,7 @@ // // delete partial configuration descriptor // - ExFreePool(HidDeviceExtension->ConfigurationDescriptor); + ExFreePoolWithTag(HidDeviceExtension->ConfigurationDescriptor, HIDUSB_TAG); HidDeviceExtension->ConfigurationDescriptor = NULL; // @@ -1648,7 +1648,7 @@ // if (HidDeviceExtension->ConfigurationDescriptor) { - ExFreePool(HidDeviceExtension->ConfigurationDescriptor); + ExFreePoolWithTag(HidDeviceExtension->ConfigurationDescriptor, HIDUSB_TAG); HidDeviceExtension->ConfigurationDescriptor = NULL; } @@ -1725,7 +1725,7 @@ // if (HidDeviceExtension->HidDescriptor) { - ExFreePool(HidDeviceExtension->HidDescriptor); + ExFreePoolWithTag(HidDeviceExtension->HidDescriptor, HIDUSB_TAG); HidDeviceExtension->HidDescriptor = NULL; } Modified: trunk/reactos/drivers/hid/hidusb/hidusb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.h [iso-8859-1] Sun May 12 17:59:14 2013 @@ -86,3 +86,6 @@ #define USB_SET_IDLE_REQUEST 0xA #define USB_GET_PROTOCOL_REQUEST 0x3 + +#define HIDUSB_TAG 'UdiH' +#define HIDUSB_URB_TAG 'rUiH'

11 years, 7 months

[tfaber] 59008: [HIDCLASS] - Get rid of HidClass_GetSystemAddress - More minor fixes

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 12 17:16:41 2013 New Revision: 59008 URL: http://svn.reactos.org/svn/reactos?rev=59008&view=rev Log: [HIDCLASS] - Get rid of HidClass_GetSystemAddress - More minor fixes Modified: trunk/reactos/drivers/hid/hidclass/fdo.c trunk/reactos/drivers/hid/hidclass/hidclass.c Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] Sun May 12 17:16:41 2013 @@ -20,7 +20,7 @@ // // set event // - KeSetEvent((PRKEVENT)Context, 0, FALSE); + KeSetEvent(Context, 0, FALSE); // // completion is done in the HidClassFDO_QueryCapabilities routine @@ -131,7 +131,7 @@ // // signal event // - KeSetEvent((PRKEVENT)Context, 0, FALSE); + KeSetEvent(Context, 0, FALSE); // // done @@ -447,7 +447,7 @@ // allocate result // DeviceRelations = ExAllocatePoolWithTag(NonPagedPool, - sizeof(DEVICE_RELATIONS) + (FDODeviceExtension->DeviceRelations->Count-1) * sizeof(PDEVICE_OBJECT), + sizeof(DEVICE_RELATIONS) + (FDODeviceExtension->DeviceRelations->Count - 1) * sizeof(PDEVICE_OBJECT), HIDCLASS_TAG); if (!DeviceRelations) { Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/hidcl… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sun May 12 17:16:41 2013 @@ -354,31 +354,6 @@ return STATUS_SUCCESS; } -PVOID -HidClass_GetSystemAddress( - IN PMDL ReportMDL) -{ - // - // sanity check - // - ASSERT(ReportMDL); - - if (ReportMDL->MdlFlags & (MDL_SOURCE_IS_NONPAGED_POOL | MDL_MAPPED_TO_SYSTEM_VA)) - { - // - // buffer is non paged pool - // - return ReportMDL->MappedSystemVa; - } - else - { - // - // map mdl - // - return MmMapLockedPages(ReportMDL, KernelMode); - } -} - NTSTATUS NTAPI HidClass_ReadCompleteIrp( @@ -415,7 +390,7 @@ // // get address // - Address = HidClass_GetSystemAddress(IrpContext->OriginalIrp->MdlAddress); + Address = MmGetSystemAddressForMdlSafe(IrpContext->OriginalIrp->MdlAddress, NormalPagePriority); if (Address) { // @@ -1060,7 +1035,6 @@ // return IoCallDriver(CommonDeviceExtension->HidDeviceExtension.NextDeviceObject, Irp); } - NTSTATUS NTAPI @@ -1119,7 +1093,10 @@ } /* now allocate the driver object extension */ - Status = IoAllocateDriverObjectExtension(MinidriverRegistration->DriverObject, (PVOID)ClientIdentificationAddress, sizeof(HIDCLASS_DRIVER_EXTENSION), (PVOID*)&DriverExtension); + Status = IoAllocateDriverObjectExtension(MinidriverRegistration->DriverObject, + ClientIdentificationAddress, + sizeof(HIDCLASS_DRIVER_EXTENSION), + (PVOID *)&DriverExtension); if (!NT_SUCCESS(Status)) { /* failed to allocate driver extension */ @@ -1140,7 +1117,7 @@ /* copy driver dispatch routines */ RtlCopyMemory(DriverExtension->MajorFunction, MinidriverRegistration->DriverObject->MajorFunction, - sizeof(PDRIVER_DISPATCH) * (IRP_MJ_MAXIMUM_FUNCTION+1)); + sizeof(PDRIVER_DISPATCH) * (IRP_MJ_MAXIMUM_FUNCTION + 1)); /* initialize lock */ KeInitializeSpinLock(&DriverExtension->Lock);

11 years, 7 months

[tfaber] 59007: [HIDUSB] - Remove unnecessary casts

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 12 17:03:24 2013 New Revision: 59007 URL: http://svn.reactos.org/svn/reactos?rev=59007&view=rev Log: [HIDUSB] - Remove unnecessary casts Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun May 12 17:03:24 2013 @@ -54,7 +54,7 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; // // init result @@ -94,7 +94,7 @@ // // store result buffer // - IoStack->Parameters.Others.Argument1 = (PVOID)PortStatus; + IoStack->Parameters.Others.Argument1 = PortStatus; // // call driver @@ -128,8 +128,8 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // get interrupt pipe handle @@ -188,8 +188,8 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // allocate urb @@ -247,7 +247,7 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; // // init event @@ -345,12 +345,12 @@ // // get context // - ResetContext = (PHID_USB_RESET_CONTEXT)Ctx; + ResetContext = Ctx; // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)ResetContext->DeviceObject->DeviceExtension; + DeviceExtension = ResetContext->DeviceObject->DeviceExtension; // // get port status @@ -429,7 +429,7 @@ // // get urb // - Urb = (PURB)Context; + Urb = Context; ASSERT(Urb); DPRINT("[HIDUSB] HidUsb_ReadReportCompletion %p Status %x Urb Status %x\n", Irp, Irp->IoStatus, Urb->UrbHeader.Status); @@ -471,8 +471,8 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // allocate reset context @@ -540,8 +540,8 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // get current stack location @@ -615,13 +615,13 @@ IoStack->Parameters.DeviceIoControl.InputBufferLength = 0; IoStack->Parameters.DeviceIoControl.OutputBufferLength = 0; IoStack->Parameters.DeviceIoControl.Type3InputBuffer = NULL; - IoStack->Parameters.Others.Argument1 = (PVOID)Urb; + IoStack->Parameters.Others.Argument1 = Urb; // // set completion routine // - IoSetCompletionRoutine(Irp, HidUsb_ReadReportCompletion, (PVOID)Urb, TRUE, TRUE, TRUE); + IoSetCompletionRoutine(Irp, HidUsb_ReadReportCompletion, Urb, TRUE, TRUE, TRUE); // // call driver @@ -646,8 +646,8 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // sanity checks @@ -737,8 +737,8 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // get current stack location @@ -765,7 +765,7 @@ DPRINT("[HIDUSB] IOCTL_HID_GET_DEVICE_ATTRIBUTES\n"); ASSERT(HidDeviceExtension->DeviceDescriptor); Irp->IoStatus.Information = sizeof(HID_DESCRIPTOR); - Attributes = (PHID_DEVICE_ATTRIBUTES)Irp->UserBuffer; + Attributes = Irp->UserBuffer; Attributes->Size = sizeof(HID_DEVICE_ATTRIBUTES); Attributes->VendorID = HidDeviceExtension->DeviceDescriptor->idVendor; Attributes->ProductID = HidDeviceExtension->DeviceDescriptor->idProduct; @@ -925,7 +925,7 @@ // // get hid device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; // // copy stack location @@ -948,7 +948,7 @@ // // signal event // - KeSetEvent((PRKEVENT)Context, 0, FALSE); + KeSetEvent(Context, 0, FALSE); // // done @@ -977,8 +977,8 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // build irp @@ -1008,12 +1008,12 @@ // // store urb // - IoStack->Parameters.Others.Argument1 = (PVOID)Urb; + IoStack->Parameters.Others.Argument1 = Urb; // // set completion routine // - IoSetCompletionRoutine(Irp, Hid_PnpCompletion, (PVOID)&Event, TRUE, TRUE, TRUE); + IoSetCompletionRoutine(Irp, Hid_PnpCompletion, &Event, TRUE, TRUE, TRUE); // // call driver @@ -1196,8 +1196,8 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // now parse the descriptors @@ -1290,8 +1290,8 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // allocate urb @@ -1357,8 +1357,8 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; ASSERT(HidDeviceExtension->InterfaceInfo); if (HidDeviceExtension->InterfaceInfo->SubClass != 0x1) @@ -1442,8 +1442,8 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // get device descriptor @@ -1621,8 +1621,8 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // get current stack location @@ -1708,7 +1708,7 @@ // KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - IoSetCompletionRoutine(Irp, Hid_PnpCompletion, (PVOID)&Event, TRUE, TRUE, TRUE); + IoSetCompletionRoutine(Irp, Hid_PnpCompletion, &Event, TRUE, TRUE, TRUE); // // send irp and wait for completion @@ -1742,7 +1742,7 @@ // KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - IoSetCompletionRoutine(Irp, Hid_PnpCompletion, (PVOID)&Event, TRUE, TRUE, TRUE); + IoSetCompletionRoutine(Irp, Hid_PnpCompletion, &Event, TRUE, TRUE, TRUE); // // send irp and wait for completion @@ -1775,7 +1775,7 @@ // KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - IoSetCompletionRoutine(Irp, Hid_PnpCompletion, (PVOID)&Event, TRUE, TRUE, TRUE); + IoSetCompletionRoutine(Irp, Hid_PnpCompletion, &Event, TRUE, TRUE, TRUE); // // send irp and wait for completion @@ -1836,8 +1836,8 @@ // // get device extension // - DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; + HidDeviceExtension = DeviceExtension->MiniDeviceExtension; // // init event

11 years, 7 months

[tfaber] 59006: [HIDUSB] - The usual... fix some whitespace

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 12 16:59:26 2013 New Revision: 59006 URL: http://svn.reactos.org/svn/reactos?rev=59006&view=rev Log: [HIDUSB] - The usual... fix some whitespace Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c trunk/reactos/drivers/hid/hidusb/hidusb.h Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun May 12 16:59:26 2013 @@ -16,21 +16,21 @@ { ULONG Index; - // - // sanity check - // - ASSERT(InterfaceInformation->NumberOfPipes); - - for(Index = 0; Index < InterfaceInformation->NumberOfPipes; Index++) - { - //DPRINT1("[HIDUSB] EndpointAddress %x PipeType %x PipeHandle %x\n", InterfaceInformation->Pipes[Index].EndpointAddress, InterfaceInformation->Pipes[Index].PipeType, InterfaceInformation->Pipes[Index].PipeHandle); - if (InterfaceInformation->Pipes[Index].PipeType == UsbdPipeTypeInterrupt && (InterfaceInformation->Pipes[Index].EndpointAddress & USB_ENDPOINT_DIRECTION_MASK)) - { - // - // found handle - // - return &InterfaceInformation->Pipes[Index]; - } + // + // sanity check + // + ASSERT(InterfaceInformation->NumberOfPipes); + + for (Index = 0; Index < InterfaceInformation->NumberOfPipes; Index++) + { + //DPRINT1("[HIDUSB] EndpointAddress %x PipeType %x PipeHandle %x\n", InterfaceInformation->Pipes[Index].EndpointAddress, InterfaceInformation->Pipes[Index].PipeType, InterfaceInformation->Pipes[Index].PipeHandle); + if (InterfaceInformation->Pipes[Index].PipeType == UsbdPipeTypeInterrupt && (InterfaceInformation->Pipes[Index].EndpointAddress & USB_ENDPOINT_DIRECTION_MASK)) + { + // + // found handle + // + return &InterfaceInformation->Pipes[Index]; + } } // @@ -69,7 +69,15 @@ // // build irp // - Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_GET_PORT_STATUS, DeviceExtension->NextDeviceObject, NULL, 0, NULL, 0, TRUE, &Event, &IoStatus); + Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_GET_PORT_STATUS, + DeviceExtension->NextDeviceObject, + NULL, + 0, + NULL, + 0, + TRUE, + &Event, + &IoStatus); if (!Irp) { // @@ -88,23 +96,23 @@ // IoStack->Parameters.Others.Argument1 = (PVOID)PortStatus; - // - // call driver - // - Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - if (Status == STATUS_PENDING) - { - // - // wait for completion - // - KeWaitForSingleObject(&Event, Executive, KernelMode, 0, NULL); - return IoStatus.Status; - } - - // - // done - // - return Status; + // + // call driver + // + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + // + // wait for completion + // + KeWaitForSingleObject(&Event, Executive, KernelMode, 0, NULL); + return IoStatus.Status; + } + + // + // done + // + return Status; } NTSTATUS @@ -249,7 +257,15 @@ // // build irp // - Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_RESET_PORT, DeviceExtension->NextDeviceObject, NULL, 0, NULL, 0, TRUE, &Event, &IoStatusBlock); + Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_RESET_PORT, + DeviceExtension->NextDeviceObject, + NULL, + 0, + NULL, + 0, + TRUE, + &Event, + &IoStatusBlock); if (!Irp) { // @@ -646,7 +662,14 @@ // FIXME: support old hid version // BufferLength = HidDeviceExtension->HidDescriptor->DescriptorList[0].wReportLength; - Status = Hid_GetDescriptor(DeviceObject, URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), &Report, &BufferLength, HidDeviceExtension->HidDescriptor->DescriptorList[0].bReportType, 0, HidDeviceExtension->InterfaceInfo->InterfaceNumber); + Status = Hid_GetDescriptor(DeviceObject, + URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE, + sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), + &Report, + &BufferLength, + HidDeviceExtension->HidDescriptor->DescriptorList[0].bReportType, + 0, + HidDeviceExtension->InterfaceInfo->InterfaceNumber); if (!NT_SUCCESS(Status)) { // @@ -654,7 +677,14 @@ // try with old hid version // BufferLength = HidDeviceExtension->HidDescriptor->DescriptorList[0].wReportLength; - Status = Hid_GetDescriptor(DeviceObject, URB_FUNCTION_GET_DESCRIPTOR_FROM_ENDPOINT, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), &Report, &BufferLength, HidDeviceExtension->HidDescriptor->DescriptorList[0].bReportType, 0, 0 /* FIXME*/); + Status = Hid_GetDescriptor(DeviceObject, + URB_FUNCTION_GET_DESCRIPTOR_FROM_ENDPOINT, + sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), + &Report, + &BufferLength, + HidDeviceExtension->HidDescriptor->DescriptorList[0].bReportType, + 0, + 0 /* FIXME*/); if (!NT_SUCCESS(Status)) { DPRINT("[HIDUSB] failed to get report descriptor with %x\n", Status); @@ -715,7 +745,7 @@ // IoStack = IoGetCurrentIrpStackLocation(Irp); - switch(IoStack->Parameters.DeviceIoControl.IoControlCode) + switch (IoStack->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_HID_GET_DEVICE_ATTRIBUTES: { @@ -926,7 +956,6 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - NTSTATUS Hid_DispatchUrb( IN PDEVICE_OBJECT DeviceObject, @@ -951,11 +980,18 @@ DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; - // // build irp // - Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_SUBMIT_URB, DeviceExtension->NextDeviceObject, NULL, 0, NULL, 0, TRUE, &Event, &IoStatus); + Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_SUBMIT_URB, + DeviceExtension->NextDeviceObject, + NULL, + 0, + NULL, + 0, + TRUE, + &Event, + &IoStatus); if (!Irp) { // @@ -1021,7 +1057,7 @@ IN USHORT UrbLength, IN OUT PVOID *UrbBuffer, IN OUT PULONG UrbBufferLength, - IN UCHAR DescriptorType, + IN UCHAR DescriptorType, IN UCHAR Index, IN USHORT LanguageIndex) { @@ -1079,7 +1115,7 @@ // // set urb function // - Urb->UrbHeader.Function = UrbFunction; + Urb->UrbHeader.Function = UrbFunction; // // dispatch urb @@ -1278,7 +1314,7 @@ // format urb // UsbBuildVendorRequest(Urb, - URB_FUNCTION_CLASS_INTERFACE, + URB_FUNCTION_CLASS_INTERFACE, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), 0, 0, @@ -1333,7 +1369,6 @@ return; } - // // allocate urb // @@ -1355,7 +1390,7 @@ // format urb // UsbBuildVendorRequest(Urb, - URB_FUNCTION_CLASS_INTERFACE, + URB_FUNCTION_CLASS_INTERFACE, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), USBD_TRANSFER_DIRECTION_IN, 0, @@ -1414,7 +1449,14 @@ // get device descriptor // DescriptorLength = sizeof(USB_DEVICE_DESCRIPTOR); - Status = Hid_GetDescriptor(DeviceObject, URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), (PVOID*)&HidDeviceExtension->DeviceDescriptor, &DescriptorLength, USB_DEVICE_DESCRIPTOR_TYPE, 0, 0); + Status = Hid_GetDescriptor(DeviceObject, + URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE, + sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), + (PVOID *)&HidDeviceExtension->DeviceDescriptor, + &DescriptorLength, + USB_DEVICE_DESCRIPTOR_TYPE, + 0, + 0); if (!NT_SUCCESS(Status)) { // @@ -1428,7 +1470,14 @@ // now get the configuration descriptor // DescriptorLength = sizeof(USB_CONFIGURATION_DESCRIPTOR); - Status = Hid_GetDescriptor(DeviceObject, URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), (PVOID*)&HidDeviceExtension->ConfigurationDescriptor, &DescriptorLength, USB_CONFIGURATION_DESCRIPTOR_TYPE, 0, 0); + Status = Hid_GetDescriptor(DeviceObject, + URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE, + sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), + (PVOID *)&HidDeviceExtension->ConfigurationDescriptor, + &DescriptorLength, + USB_CONFIGURATION_DESCRIPTOR_TYPE, + 0, + 0); if (!NT_SUCCESS(Status)) { // @@ -1459,7 +1508,14 @@ // // get full configuration descriptor // - Status = Hid_GetDescriptor(DeviceObject, URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), (PVOID*)&HidDeviceExtension->ConfigurationDescriptor, &DescriptorLength, USB_CONFIGURATION_DESCRIPTOR_TYPE, 0, 0); + Status = Hid_GetDescriptor(DeviceObject, + URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE, + sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), + (PVOID *)&HidDeviceExtension->ConfigurationDescriptor, + &DescriptorLength, + USB_CONFIGURATION_DESCRIPTOR_TYPE, + 0, + 0); if (!NT_SUCCESS(Status)) { // @@ -1577,7 +1633,7 @@ // // handle requests based on request type // - switch(IoStack->MinorFunction) + switch (IoStack->MinorFunction) { case IRP_MN_REMOVE_DEVICE: { @@ -1586,7 +1642,7 @@ // IoSkipCurrentIrpStackLocation(Irp); Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - + // // free resources // Modified: trunk/reactos/drivers/hid/hidusb/hidusb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.h [iso-8859-1] Sun May 12 16:59:26 2013 @@ -46,7 +46,7 @@ // PHID_DESCRIPTOR HidDescriptor; -}HID_USB_DEVICE_EXTENSION, *PHID_USB_DEVICE_EXTENSION; +} HID_USB_DEVICE_EXTENSION, *PHID_USB_DEVICE_EXTENSION; typedef struct { @@ -65,7 +65,7 @@ // PDEVICE_OBJECT DeviceObject; -}HID_USB_RESET_CONTEXT, *PHID_USB_RESET_CONTEXT; +} HID_USB_RESET_CONTEXT, *PHID_USB_RESET_CONTEXT; NTSTATUS @@ -75,7 +75,7 @@ IN USHORT UrbLength, IN OUT PVOID *UrbBuffer, IN OUT PULONG UrbBufferLength, - IN UCHAR DescriptorType, + IN UCHAR DescriptorType, IN UCHAR Index, IN USHORT LanguageIndex); @@ -86,4 +86,3 @@ #define USB_SET_IDLE_REQUEST 0xA #define USB_GET_PROTOCOL_REQUEST 0x3 -

11 years, 7 months

[tfaber] 59005: [HIDCLASS] - Use pool tagging

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 12 15:44:58 2013 New Revision: 59005 URL: http://svn.reactos.org/svn/reactos?rev=59005&view=rev Log: [HIDCLASS] - Use pool tagging Modified: trunk/reactos/drivers/hid/hidclass/fdo.c trunk/reactos/drivers/hid/hidclass/hidclass.c trunk/reactos/drivers/hid/hidclass/pdo.c trunk/reactos/drivers/hid/hidclass/precomp.h Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] Sun May 12 15:44:58 2013 @@ -294,7 +294,9 @@ // // now allocate space for the report descriptor // - FDODeviceExtension->ReportDescriptor = (PUCHAR)ExAllocatePool(NonPagedPool, FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength); + FDODeviceExtension->ReportDescriptor = ExAllocatePoolWithTag(NonPagedPool, + FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength, + HIDCLASS_TAG); if (!FDODeviceExtension->ReportDescriptor) { // @@ -444,7 +446,9 @@ // // allocate result // - DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS) + (FDODeviceExtension->DeviceRelations->Count-1) * sizeof(PDEVICE_OBJECT)); + DeviceRelations = ExAllocatePoolWithTag(NonPagedPool, + sizeof(DEVICE_RELATIONS) + (FDODeviceExtension->DeviceRelations->Count-1) * sizeof(PDEVICE_OBJECT), + HIDCLASS_TAG); if (!DeviceRelations) { // Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/hidcl… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sun May 12 15:44:58 2013 @@ -184,7 +184,7 @@ // // allocate context // - Context = (PHIDCLASS_FILEOP_CONTEXT)ExAllocatePool(NonPagedPool, sizeof(HIDCLASS_FILEOP_CONTEXT)); + Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(HIDCLASS_FILEOP_CONTEXT), HIDCLASS_TAG); if (!Context) { // @@ -344,7 +344,7 @@ // // free context // - ExFreePool(IrpContext); + ExFreePoolWithTag(IrpContext, HIDCLASS_TAG); // // complete request @@ -462,7 +462,7 @@ // // free input report buffer // - ExFreePool(IrpContext->InputReportBuffer); + ExFreePoolWithTag(IrpContext->InputReportBuffer, HIDCLASS_TAG); // // remove us from pending list @@ -517,7 +517,7 @@ // // free irp context // - ExFreePool(IrpContext); + ExFreePoolWithTag(IrpContext, HIDCLASS_TAG); // // done @@ -611,7 +611,7 @@ // // allocate completion context // - IrpContext = ExAllocatePool(NonPagedPool, sizeof(HIDCLASS_IRP_CONTEXT)); + IrpContext = ExAllocatePoolWithTag(NonPagedPool, sizeof(HIDCLASS_IRP_CONTEXT), HIDCLASS_TAG); if (!IrpContext) { // @@ -673,14 +673,14 @@ // // allocate buffer // - IrpContext->InputReportBuffer = ExAllocatePool(NonPagedPool, IrpContext->InputReportBufferLength); + IrpContext->InputReportBuffer = ExAllocatePoolWithTag(NonPagedPool, IrpContext->InputReportBufferLength, HIDCLASS_TAG); if (!IrpContext->InputReportBuffer) { // // no memory // IoFreeIrp(Irp); - ExFreePool(IrpContext); + ExFreePoolWithTag(IrpContext, HIDCLASS_TAG); return STATUS_INSUFFICIENT_RESOURCES; } Modified: trunk/reactos/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/pdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] Sun May 12 15:44:58 2013 @@ -98,7 +98,7 @@ // // allocate new buffer // - NewBuffer = (LPWSTR)ExAllocatePool(NonPagedPool, (Length + 1) * sizeof(WCHAR)); + NewBuffer = ExAllocatePoolWithTag(NonPagedPool, (Length + 1) * sizeof(WCHAR), HIDCLASS_TAG); if (!NewBuffer) { // @@ -127,7 +127,7 @@ // // free old buffer // - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, 0); // // store result @@ -249,12 +249,12 @@ // // free old buffer // - ExFreePool((PVOID)Irp->IoStatus.Information); + ExFreePoolWithTag((PVOID)Irp->IoStatus.Information, 0); // // allocate buffer // - Ptr = (LPWSTR)ExAllocatePool(NonPagedPool, (Offset + 1) * sizeof(WCHAR)); + Ptr = ExAllocatePoolWithTag(NonPagedPool, (Offset + 1) * sizeof(WCHAR), HIDCLASS_TAG); if (!Ptr) { // @@ -294,7 +294,7 @@ // // allocate buffer // - Buffer = ExAllocatePool(NonPagedPool, 5 * sizeof(WCHAR)); + Buffer = ExAllocatePoolWithTag(NonPagedPool, 5 * sizeof(WCHAR), HIDCLASS_TAG); if (!Buffer) { // @@ -322,7 +322,7 @@ { LPWSTR Buffer; - Buffer = (LPWSTR)ExAllocatePool(NonPagedPool, 2 * sizeof(WCHAR)); + Buffer = ExAllocatePoolWithTag(NonPagedPool, 2 * sizeof(WCHAR), HIDCLASS_TAG); if (!Buffer) { // @@ -437,7 +437,7 @@ // // // - BusInformation = (PPNP_BUS_INFORMATION)ExAllocatePool(NonPagedPool, sizeof(PNP_BUS_INFORMATION)); + BusInformation = ExAllocatePoolWithTag(NonPagedPool, sizeof(PNP_BUS_INFORMATION), HIDCLASS_TAG); // // fill in result @@ -478,7 +478,7 @@ // // allocate device relations // - DeviceRelation = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS)); + DeviceRelation = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEVICE_RELATIONS), HIDCLASS_TAG); if (!DeviceRelation) { // @@ -649,7 +649,7 @@ // first allocate device relations // Length = sizeof(DEVICE_RELATIONS) + sizeof(PDEVICE_OBJECT) * FDODeviceExtension->Common.DeviceDescription.CollectionDescLength; - DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, Length); + DeviceRelations = ExAllocatePoolWithTag(NonPagedPool, Length, HIDCLASS_TAG); if (!DeviceRelations) { // @@ -760,7 +760,7 @@ // // free device relations // - ExFreePool(DeviceRelations); + ExFreePoolWithTag(DeviceRelations, HIDCLASS_TAG); return Status; } Modified: trunk/reactos/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/preco… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/precomp.h [iso-8859-1] Sun May 12 15:44:58 2013 @@ -10,6 +10,8 @@ #include <wdmguid.h> #include <debug.h> +#define HIDCLASS_TAG 'CdiH' + typedef struct { PDRIVER_OBJECT DriverObject;

11 years, 7 months

[tfaber] 59004: [HIDCLASS] - Remove unnecessary casts - Fix DllInitialize/DllUnload prototype

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 12 15:31:01 2013 New Revision: 59004 URL: http://svn.reactos.org/svn/reactos?rev=59004&view=rev Log: [HIDCLASS] - Remove unnecessary casts - Fix DllInitialize/DllUnload prototype Modified: trunk/reactos/drivers/hid/hidclass/fdo.c trunk/reactos/drivers/hid/hidclass/hidclass.c trunk/reactos/drivers/hid/hidclass/pdo.c Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] Sun May 12 15:31:01 2013 @@ -42,7 +42,7 @@ // // get device extension // - FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + FDODeviceExtension = DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); // @@ -77,7 +77,7 @@ // // set completion routine // - IoSetCompletionRoutine(Irp, HidClassFDO_QueryCapabilitiesCompletionRoutine, (PVOID)&Event, TRUE, TRUE, TRUE); + IoSetCompletionRoutine(Irp, HidClassFDO_QueryCapabilitiesCompletionRoutine, &Event, TRUE, TRUE, TRUE); // // init capabilities @@ -158,7 +158,7 @@ // // get device extension // - CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + CommonDeviceExtension = DeviceObject->DeviceExtension; // // set completion routine @@ -218,7 +218,7 @@ // // get device extension // - FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + FDODeviceExtension = DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); // @@ -343,7 +343,7 @@ // // get device extension // - FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + FDODeviceExtension = DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); // @@ -438,7 +438,7 @@ // // get device extension // - FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + FDODeviceExtension = DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); // @@ -495,7 +495,7 @@ // // get device extension // - FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + FDODeviceExtension = DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); // @@ -566,7 +566,7 @@ // // get device extension // - FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + FDODeviceExtension = DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); // Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/hidcl… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sun May 12 15:31:01 2013 @@ -13,18 +13,19 @@ static LPWSTR ClientIdentificationAddress = L"HIDCLASS"; static ULONG HidClassDeviceNumber = 0; -ULONG -NTAPI -DllInitialize(ULONG Unknown) -{ - return 0; -} - -ULONG -NTAPI -DllUnload() -{ - return 0; +NTSTATUS +NTAPI +DllInitialize( + IN PUNICODE_STRING RegistryPath) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +DllUnload(VOID) +{ + return STATUS_SUCCESS; } NTSTATUS @@ -51,7 +52,7 @@ RtlInitUnicodeString(&DeviceName, CharDeviceName); /* get driver object extension */ - DriverExtension = (PHIDCLASS_DRIVER_EXTENSION) IoGetDriverObjectExtension(DriverObject, ClientIdentificationAddress); + DriverExtension = IoGetDriverObjectExtension(DriverObject, ClientIdentificationAddress); if (!DriverExtension) { /* device removed */ @@ -72,7 +73,7 @@ } /* get device extension */ - FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)NewDeviceObject->DeviceExtension; + FDODeviceExtension = NewDeviceObject->DeviceExtension; /* zero device extension */ RtlZeroMemory(FDODeviceExtension, sizeof(HIDCLASS_FDO_EXTENSION)); @@ -139,7 +140,7 @@ // // get device extension // - CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + CommonDeviceExtension = DeviceObject->DeviceExtension; if (CommonDeviceExtension->IsFDO) { #ifndef __REACTOS__ @@ -169,7 +170,7 @@ // // get device extension // - PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)CommonDeviceExtension; + PDODeviceExtension = DeviceObject->DeviceExtension; // // get stack location @@ -208,7 +209,7 @@ // store context // ASSERT(IoStack->FileObject); - IoStack->FileObject->FsContext = (PVOID)Context; + IoStack->FileObject->FsContext = Context; // // done @@ -235,7 +236,7 @@ // // get device extension // - CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + CommonDeviceExtension = DeviceObject->DeviceExtension; // // is it a FDO request @@ -264,7 +265,7 @@ // // get irp context // - IrpContext = (PHIDCLASS_FILEOP_CONTEXT)IoStack->FileObject->FsContext; + IrpContext = IoStack->FileObject->FsContext; ASSERT(IrpContext); // @@ -322,7 +323,7 @@ // // get irp // - ListIrp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); + ListIrp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); // // free the irp @@ -396,7 +397,7 @@ // // get irp context // - IrpContext = (PHIDCLASS_IRP_CONTEXT)Ctx; + IrpContext = Ctx; DPRINT("HidClass_ReadCompleteIrp Irql %lu\n", KeGetCurrentIrql()); DPRINT("HidClass_ReadCompleteIrp Status %lx\n", Irp->IoStatus.Status); @@ -414,7 +415,7 @@ // // get address // - Address = (PUCHAR)HidClass_GetSystemAddress(IrpContext->OriginalIrp->MdlAddress); + Address = HidClass_GetSystemAddress(IrpContext->OriginalIrp->MdlAddress); if (Address) { // @@ -550,7 +551,7 @@ // // get irp // - Irp = (PIRP)CONTAINING_RECORD(ListEntry, IRP, Tail.Overlay.ListEntry); + Irp = CONTAINING_RECORD(ListEntry, IRP, Tail.Overlay.ListEntry); } // @@ -610,7 +611,7 @@ // // allocate completion context // - IrpContext = (PHIDCLASS_IRP_CONTEXT)ExAllocatePool(NonPagedPool, sizeof(HIDCLASS_IRP_CONTEXT)); + IrpContext = ExAllocatePool(NonPagedPool, sizeof(HIDCLASS_IRP_CONTEXT)); if (!IrpContext) { // @@ -623,7 +624,7 @@ // // get device extension // - PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + PDODeviceExtension = DeviceObject->DeviceExtension; ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); // @@ -733,7 +734,7 @@ // // get device extension // - CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + CommonDeviceExtension = DeviceObject->DeviceExtension; ASSERT(CommonDeviceExtension->IsFDO == FALSE); // @@ -745,7 +746,7 @@ // // get context // - Context = (PHIDCLASS_FILEOP_CONTEXT)IoStack->FileObject->FsContext; + Context = IoStack->FileObject->FsContext; ASSERT(Context); // @@ -855,7 +856,7 @@ // // get device extension // - CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + CommonDeviceExtension = DeviceObject->DeviceExtension; // // only PDO are supported @@ -876,7 +877,7 @@ // // get pdo device extension // - PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + PDODeviceExtension = DeviceObject->DeviceExtension; // // get stack location @@ -903,7 +904,7 @@ // // get output buffer // - CollectionInformation = (PHID_COLLECTION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + CollectionInformation = Irp->AssociatedIrp.SystemBuffer; ASSERT(CollectionInformation); // @@ -1010,7 +1011,7 @@ // // get common device extension // - CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + CommonDeviceExtension = DeviceObject->DeviceExtension; // // check type of device object @@ -1042,7 +1043,7 @@ // // get common device extension // - CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + CommonDeviceExtension = DeviceObject->DeviceExtension; // // FIXME: support PDO Modified: trunk/reactos/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/pdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] Sun May 12 15:31:01 2013 @@ -152,7 +152,7 @@ // // get device extension // - PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + PDODeviceExtension = DeviceObject->DeviceExtension; ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); // @@ -288,7 +288,7 @@ // // get device extension // - PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + PDODeviceExtension = DeviceObject->DeviceExtension; ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); // @@ -359,7 +359,7 @@ // // get device extension // - PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + PDODeviceExtension = DeviceObject->DeviceExtension; ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); // @@ -406,7 +406,7 @@ Status = HidClassPDO_HandleQueryCompatibleId(DeviceObject, Irp); break; } - + DPRINT1("[HIDCLASS]: IRP_MN_QUERY_ID IdType %x unimplemented\n", IoStack->Parameters.QueryId.IdType); Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; @@ -642,7 +642,7 @@ // // get device extension // - FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + FDODeviceExtension = DeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->Common.IsFDO); // @@ -696,7 +696,7 @@ // // get device extension // - PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; + PDODeviceExtension = PDODeviceObject->DeviceExtension; // // init device extension

11 years, 7 months

[tfaber] 59003: [HIDCLASS] - Fix some whitespace

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun May 12 15:23:34 2013 New Revision: 59003 URL: http://svn.reactos.org/svn/reactos?rev=59003&view=rev Log: [HIDCLASS] - Fix some whitespace Modified: trunk/reactos/drivers/hid/hidclass/fdo.c trunk/reactos/drivers/hid/hidclass/hidclass.c trunk/reactos/drivers/hid/hidclass/pdo.c trunk/reactos/drivers/hid/hidclass/precomp.h Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] Sun May 12 15:23:34 2013 @@ -7,6 +7,7 @@ * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ + #include "precomp.h" NTSTATUS @@ -221,7 +222,7 @@ ASSERT(FDODeviceExtension->Common.IsFDO); // - // lets allocate irp + // let's allocate irp // Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); if (!Irp) @@ -262,7 +263,7 @@ } // - // lets get device attributes + // let's get device attributes // IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_HID_GET_DEVICE_ATTRIBUTES; IoStack->Parameters.DeviceIoControl.OutputBufferLength = sizeof(HID_DEVICE_ATTRIBUTES); @@ -290,7 +291,6 @@ ASSERT(FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength > 0); ASSERT(FDODeviceExtension->HidDescriptor.DescriptorList[0].bReportType == HID_REPORT_DESCRIPTOR_TYPE); - // // now allocate space for the report descriptor // @@ -359,7 +359,7 @@ } // - // lets start the lower device too + // let's start the lower device too // IoSkipCurrentIrpStackLocation(Irp); Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); @@ -372,7 +372,7 @@ } // - // lets get the descriptors + // let's get the descriptors // Status = HidClassFDO_GetDescriptors(DeviceObject); if (!NT_SUCCESS(Status)) @@ -457,7 +457,7 @@ // // copy device objects // - for(Index = 0; Index < FDODeviceExtension->DeviceRelations->Count; Index++) + for (Index = 0; Index < FDODeviceExtension->DeviceRelations->Count; Index++) { // // reference pdo @@ -573,7 +573,7 @@ // get current irp stack location // IoStack = IoGetCurrentIrpStackLocation(Irp); - switch(IoStack->MinorFunction) + switch (IoStack->MinorFunction) { case IRP_MN_START_DEVICE: { @@ -596,7 +596,7 @@ // set status to success and fall through // Irp->IoStatus.Status = STATUS_SUCCESS; - } + } default: { // Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/hidcl… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sun May 12 15:23:34 2013 @@ -40,7 +40,6 @@ PHIDCLASS_FDO_EXTENSION FDODeviceExtension; ULONG DeviceExtensionSize; PHIDCLASS_DRIVER_EXTENSION DriverExtension; - /* increment device number */ InterlockedIncrement((PLONG)&HidClassDeviceNumber); @@ -313,7 +312,7 @@ // // now free all irps // - while(!IsListEmpty(&IrpContext->IrpCompletedListHead)) + while (!IsListEmpty(&IrpContext->IrpCompletedListHead)) { // // remove head irp @@ -335,9 +334,6 @@ // release lock // KeReleaseSpinLock(&IrpContext->Lock, OldLevel); - - - // // remove context @@ -429,13 +425,15 @@ // // get collection description // - CollectionDescription = HidClassPDO_GetCollectionDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, IrpContext->FileOp->DeviceExtension->CollectionNumber); + CollectionDescription = HidClassPDO_GetCollectionDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, + IrpContext->FileOp->DeviceExtension->CollectionNumber); ASSERT(CollectionDescription); // // get report description // - ReportDescription = HidClassPDO_GetReportDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, IrpContext->FileOp->DeviceExtension->CollectionNumber); + ReportDescription = HidClassPDO_GetReportDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, + IrpContext->FileOp->DeviceExtension->CollectionNumber); ASSERT(ReportDescription); if (CollectionDescription && ReportDescription) @@ -638,13 +636,15 @@ // // get collection description // - CollectionDescription = HidClassPDO_GetCollectionDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, IrpContext->FileOp->DeviceExtension->CollectionNumber); + CollectionDescription = HidClassPDO_GetCollectionDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, + IrpContext->FileOp->DeviceExtension->CollectionNumber); ASSERT(CollectionDescription); // // get report description // - ReportDescription = HidClassPDO_GetReportDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, IrpContext->FileOp->DeviceExtension->CollectionNumber); + ReportDescription = HidClassPDO_GetReportDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, + IrpContext->FileOp->DeviceExtension->CollectionNumber); ASSERT(ReportDescription); // @@ -664,7 +664,6 @@ } - // // store report length // @@ -712,7 +711,6 @@ return STATUS_SUCCESS; } - NTSTATUS NTAPI HidClass_Read( @@ -757,21 +755,25 @@ if (Context->StopInProgress) { - // - // stop in progress - // - DPRINT1("[HIDCLASS] Stop In Progress\n"); - Irp->IoStatus.Status = STATUS_CANCELLED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_CANCELLED; - - } - + // + // stop in progress + // + DPRINT1("[HIDCLASS] Stop In Progress\n"); + Irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_CANCELLED; + } // // build irp request // - Status = HidClass_BuildIrp(DeviceObject, Irp, Context, IOCTL_HID_READ_REPORT, IoStack->Parameters.Read.Length, &NewIrp, &NewIrpContext); + Status = HidClass_BuildIrp(DeviceObject, + Irp, + Context, + IOCTL_HID_READ_REPORT, + IoStack->Parameters.Read.Length, + &NewIrp, + &NewIrpContext); if (!NT_SUCCESS(Status)) { // @@ -814,7 +816,7 @@ IoMarkIrpPending(Irp); // - // lets dispatch the request + // let's dispatch the request // ASSERT(Context->DeviceExtension); Status = Context->DeviceExtension->Common.DriverExtension->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL](Context->DeviceExtension->FDODeviceObject, NewIrp); @@ -881,7 +883,7 @@ // IoStack = IoGetCurrentIrpStackLocation(Irp); - switch(IoStack->Parameters.DeviceIoControl.IoControlCode) + switch (IoStack->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_HID_GET_COLLECTION_INFORMATION: { @@ -907,7 +909,8 @@ // // get collection description // - CollectionDescription = HidClassPDO_GetCollectionDescription(&CommonDeviceExtension->DeviceDescription, PDODeviceExtension->CollectionNumber); + CollectionDescription = HidClassPDO_GetCollectionDescription(&CommonDeviceExtension->DeviceDescription, + PDODeviceExtension->CollectionNumber); ASSERT(CollectionDescription); // @@ -932,7 +935,8 @@ // // get collection description // - CollectionDescription = HidClassPDO_GetCollectionDescription(&CommonDeviceExtension->DeviceDescription, PDODeviceExtension->CollectionNumber); + CollectionDescription = HidClassPDO_GetCollectionDescription(&CommonDeviceExtension->DeviceDescription, + PDODeviceExtension->CollectionNumber); ASSERT(CollectionDescription); // @@ -985,7 +989,6 @@ return STATUS_NOT_IMPLEMENTED; } - NTSTATUS NTAPI HidClass_Power( @@ -1075,7 +1078,7 @@ // // dispatch request based on major function // - switch(IoStack->MajorFunction) + switch (IoStack->MajorFunction) { case IRP_MJ_CREATE: return HidClass_Create(DeviceObject, Irp); @@ -1134,7 +1137,9 @@ DriverExtension->DriverUnload = MinidriverRegistration->DriverObject->DriverUnload; /* copy driver dispatch routines */ - RtlCopyMemory(DriverExtension->MajorFunction, MinidriverRegistration->DriverObject->MajorFunction, sizeof(PDRIVER_DISPATCH) * (IRP_MJ_MAXIMUM_FUNCTION+1)); + RtlCopyMemory(DriverExtension->MajorFunction, + MinidriverRegistration->DriverObject->MajorFunction, + sizeof(PDRIVER_DISPATCH) * (IRP_MJ_MAXIMUM_FUNCTION+1)); /* initialize lock */ KeInitializeSpinLock(&DriverExtension->Lock); Modified: trunk/reactos/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/pdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] Sun May 12 15:23:34 2013 @@ -7,6 +7,7 @@ * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ + #include "precomp.h" PHIDP_COLLECTION_DESC @@ -42,7 +43,7 @@ { ULONG Index; - for(Index = 0; Index < DeviceDescription->ReportIDsLength; Index++) + for (Index = 0; Index < DeviceDescription->ReportIDsLength; Index++) { if (DeviceDescription->ReportIDs[Index].CollectionNumber == CollectionNumber) { @@ -151,8 +152,8 @@ // // get device extension // - PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); // // copy current stack location @@ -196,7 +197,7 @@ if (CollectionDescription->UsagePage == HID_USAGE_PAGE_GENERIC) { - switch(CollectionDescription->Usage) + switch (CollectionDescription->Usage) { case HID_USAGE_GENERIC_POINTER: case HID_USAGE_GENERIC_MOUSE: @@ -253,7 +254,7 @@ // // allocate buffer // - Ptr = (LPWSTR)ExAllocatePool(NonPagedPool, (Offset +1)* sizeof(WCHAR)); + Ptr = (LPWSTR)ExAllocatePool(NonPagedPool, (Offset + 1) * sizeof(WCHAR)); if (!Ptr) { // @@ -287,9 +288,8 @@ // // get device extension // - PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); - + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); // // allocate buffer @@ -370,47 +370,47 @@ // // handle request // - switch(IoStack->MinorFunction) + switch (IoStack->MinorFunction) { case IRP_MN_QUERY_ID: { - if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID) - { - // - // handle query device id - // - Status = HidClassPDO_HandleQueryDeviceId(DeviceObject, Irp); - break; - } - else if (IoStack->Parameters.QueryId.IdType == BusQueryHardwareIDs) - { - // - // handle instance id - // - Status = HidClassPDO_HandleQueryHardwareId(DeviceObject, Irp); - break; - } - else if (IoStack->Parameters.QueryId.IdType == BusQueryInstanceID) - { - // - // handle instance id - // - Status = HidClassPDO_HandleQueryInstanceId(DeviceObject, Irp); - break; - } - else if (IoStack->Parameters.QueryId.IdType == BusQueryCompatibleIDs) - { - // - // handle instance id - // - Status = HidClassPDO_HandleQueryCompatibleId(DeviceObject, Irp); - break; - } - - DPRINT1("[HIDCLASS]: IRP_MN_QUERY_ID IdType %x unimplemented\n", IoStack->Parameters.QueryId.IdType); - Status = STATUS_NOT_SUPPORTED; - Irp->IoStatus.Information = 0; - break; + if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID) + { + // + // handle query device id + // + Status = HidClassPDO_HandleQueryDeviceId(DeviceObject, Irp); + break; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryHardwareIDs) + { + // + // handle instance id + // + Status = HidClassPDO_HandleQueryHardwareId(DeviceObject, Irp); + break; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryInstanceID) + { + // + // handle instance id + // + Status = HidClassPDO_HandleQueryInstanceId(DeviceObject, Irp); + break; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryCompatibleIDs) + { + // + // handle instance id + // + Status = HidClassPDO_HandleQueryCompatibleId(DeviceObject, Irp); + break; + } + + DPRINT1("[HIDCLASS]: IRP_MN_QUERY_ID IdType %x unimplemented\n", IoStack->Parameters.QueryId.IdType); + Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + break; } case IRP_MN_QUERY_CAPABILITIES: { @@ -426,7 +426,9 @@ // // copy capabilities // - RtlCopyMemory(IoStack->Parameters.DeviceCapabilities.Capabilities, &PDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); + RtlCopyMemory(IoStack->Parameters.DeviceCapabilities.Capabilities, + &PDODeviceExtension->Capabilities, + sizeof(DEVICE_CAPABILITIES)); Status = STATUS_SUCCESS; break; } @@ -436,7 +438,7 @@ // // BusInformation = (PPNP_BUS_INFORMATION)ExAllocatePool(NonPagedPool, sizeof(PNP_BUS_INFORMATION)); - + // // fill in result // @@ -510,7 +512,10 @@ // // now register the device interface // - Status = IoRegisterDeviceInterface(PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject, &GUID_DEVINTERFACE_HID, NULL, &PDODeviceExtension->DeviceInterface); + Status = IoRegisterDeviceInterface(PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject, + &GUID_DEVINTERFACE_HID, + NULL, + &PDODeviceExtension->DeviceInterface); DPRINT("[HIDCLASS] IoRegisterDeviceInterfaceState Status %x\n", Status); if (NT_SUCCESS(Status)) { @@ -533,22 +538,22 @@ if (PDODeviceExtension->DeviceInterface.Length != 0) IoSetDeviceInterfaceState(&PDODeviceExtension->DeviceInterface, FALSE); - // - // remove us from the fdo's pdo list - // - bFound = FALSE; - for(Index = 0; Index < PDODeviceExtension->FDODeviceExtension->DeviceRelations->Count; Index++) - { - if (PDODeviceExtension->FDODeviceExtension->DeviceRelations->Objects[Index] == DeviceObject) - { - // - // remove us - // - bFound = TRUE; - PDODeviceExtension->FDODeviceExtension->DeviceRelations->Objects[Index] = NULL; - break; - } - } + // + // remove us from the fdo's pdo list + // + bFound = FALSE; + for (Index = 0; Index < PDODeviceExtension->FDODeviceExtension->DeviceRelations->Count; Index++) + { + if (PDODeviceExtension->FDODeviceExtension->DeviceRelations->Objects[Index] == DeviceObject) + { + // + // remove us + // + bFound = TRUE; + PDODeviceExtension->FDODeviceExtension->DeviceRelations->Objects[Index] = NULL; + break; + } + } /* Complete the IRP */ Irp->IoStatus.Status = STATUS_SUCCESS; @@ -659,15 +664,21 @@ RtlZeroMemory(DeviceRelations, Length); // - // lets create a PDO for top level collection + // let's create a PDO for top level collection // Index = 0; do { // - // lets create the device object - // - Status = IoCreateDevice(FDODeviceExtension->Common.DriverExtension->DriverObject, sizeof(HIDCLASS_PDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_UNKNOWN, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &PDODeviceObject); + // let's create the device object + // + Status = IoCreateDevice(FDODeviceExtension->Common.DriverExtension->DriverObject, + sizeof(HIDCLASS_PDO_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_UNKNOWN, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &PDODeviceObject); if (!NT_SUCCESS(Status)) { // @@ -724,10 +735,10 @@ // // move to next - // + // Index++; - }while(Index < FDODeviceExtension->Common.DeviceDescription.CollectionDescLength); + } while(Index < FDODeviceExtension->Common.DeviceDescription.CollectionDescLength); // @@ -738,7 +749,7 @@ // // failed // - for(Index = 0; Index < DeviceRelations->Count; Index++) + for (Index = 0; Index < DeviceRelations->Count; Index++) { // // delete device @@ -762,4 +773,4 @@ // done // return STATUS_SUCCESS; -} +} Modified: trunk/reactos/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/preco… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/precomp.h [iso-8859-1] Sun May 12 15:23:34 2013 @@ -20,7 +20,7 @@ PDRIVER_UNLOAD DriverUnload; KSPIN_LOCK Lock; -}HIDCLASS_DRIVER_EXTENSION, *PHIDCLASS_DRIVER_EXTENSION; +} HIDCLASS_DRIVER_EXTENSION, *PHIDCLASS_DRIVER_EXTENSION; typedef struct { @@ -49,7 +49,7 @@ // HID_DEVICE_ATTRIBUTES Attributes; -}HIDCLASS_COMMON_DEVICE_EXTENSION, *PHIDCLASS_COMMON_DEVICE_EXTENSION; +} HIDCLASS_COMMON_DEVICE_EXTENSION, *PHIDCLASS_COMMON_DEVICE_EXTENSION; typedef struct { @@ -78,7 +78,7 @@ // PDEVICE_RELATIONS DeviceRelations; -}HIDCLASS_FDO_EXTENSION, *PHIDCLASS_FDO_EXTENSION; +} HIDCLASS_FDO_EXTENSION, *PHIDCLASS_FDO_EXTENSION; typedef struct { @@ -98,7 +98,7 @@ ULONG CollectionNumber; // - // device interface + // device interface // UNICODE_STRING DeviceInterface; @@ -112,7 +112,7 @@ // PHIDCLASS_FDO_EXTENSION FDODeviceExtension; -}HIDCLASS_PDO_DEVICE_EXTENSION, *PHIDCLASS_PDO_DEVICE_EXTENSION; +} HIDCLASS_PDO_DEVICE_EXTENSION, *PHIDCLASS_PDO_DEVICE_EXTENSION; typedef struct __HIDCLASS_FILEOP_CONTEXT__ { @@ -146,7 +146,7 @@ // KEVENT IrpReadComplete; -}HIDCLASS_FILEOP_CONTEXT, *PHIDCLASS_FILEOP_CONTEXT; +} HIDCLASS_FILEOP_CONTEXT, *PHIDCLASS_FILEOP_CONTEXT; typedef struct { @@ -175,7 +175,7 @@ // PIO_WORKITEM CompletionWorkItem; -}HIDCLASS_IRP_CONTEXT, *PHIDCLASS_IRP_CONTEXT; +} HIDCLASS_IRP_CONTEXT, *PHIDCLASS_IRP_CONTEXT; /* fdo.c */ NTSTATUS

11 years, 7 months

[ekohl] 59002: [WINLOGON] Wait for the LSA server to complete its initialization before initializing the GINA dll. This change is required because future changes to MSGINAs logon code will require ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun May 12 13:24:37 2013 New Revision: 59002 URL: http://svn.reactos.org/svn/reactos?rev=59002&view=rev Log: [WINLOGON] Wait for the LSA server to complete its initialization before initializing the GINA dll. This change is required because future changes to MSGINAs logon code will require access to the LSA. Modified: trunk/reactos/base/system/winlogon/winlogon.c Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sun May 12 13:24:37 2013 @@ -363,6 +363,9 @@ ExitProcess(1); } + /* Wait for the LSA server */ + WaitForLsass(); + /* Load and initialize gina */ if (!GinaInit(WLSession)) { @@ -373,9 +376,6 @@ } DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); - - /* Wait for the LSA server */ - WaitForLsass(); #if 0 /* Connect to NetLogon service (lsass.exe) */

11 years, 7 months

[hbelusca] 59001: [CONSRV] - Use new helpers ConsoleAllocHeap and ConsoleFreeHeap instead of RtlAllocateHeap and RtlFreeHeap, to be able to use also debug heaps etc... - Initialize completely CONSO...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 12 00:20:15 2013 New Revision: 59001 URL: http://svn.reactos.org/svn/reactos?rev=59001&view=rev Log: [CONSRV] - Use new helpers ConsoleAllocHeap and ConsoleFreeHeap instead of RtlAllocateHeap and RtlFreeHeap, to be able to use also debug heaps etc... - Initialize completely CONSOLE and CONSOLE_SCREEN_BUFFER structures to avoid using unitializing fields, that can be prone to bugs. - Do not unnecessarily lock the per-process IO handles table. - Validate the console pointers when calling SrvCloseHandle / SrvVerifyConsoleIoHandle / SrvDuplicateHandle (so that we are sure to do valid operations for console applications, and fail properly for GUI ones). - Fix a bug caught by [TheFlash] which unveiled only on livecds (why??) as random CSR heap corruptions. It was caused by corrupting the heap by freeing invalid IO handles when freeing the handles table inherited by default when starting a console application. I reworked the initialization code a bit and the freeing code to fix this problem. This bug was diagnosed with the help of Thomas Faber's debug heap (see http://www.reactos.org/wiki/User:ThFabba/Debug_Heap ), that I've augmented a bit (with dumping functions when a heap block was found invalid). - Now reenable the CSR heap usage. CORE-7157 #resolve #comment Resolved in revision 59001. Thanks for your help :D Added: trunk/reactos/win32ss/user/consrv/heap.h (with props) Modified: trunk/reactos/win32ss/user/consrv/alias.c trunk/reactos/win32ss/user/consrv/coninput.c trunk/reactos/win32ss/user/consrv/conoutput.c trunk/reactos/win32ss/user/consrv/console.c trunk/reactos/win32ss/user/consrv/consrv.h trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/consrv/handle.c trunk/reactos/win32ss/user/consrv/handle.h trunk/reactos/win32ss/user/consrv/include/conio.h trunk/reactos/win32ss/user/consrv/init.c trunk/reactos/win32ss/user/consrv/lineinput.c trunk/reactos/win32ss/user/consrv/settings.c Modified: trunk/reactos/win32ss/user/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/alias.… ============================================================================== --- trunk/reactos/win32ss/user/consrv/alias.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/alias.c [iso-8859-1] Sun May 12 00:20:15 2013 @@ -57,7 +57,7 @@ PALIAS_HEADER Entry; UINT dwLength = wcslen(lpExeName) + 1; - Entry = RtlAllocateHeap(ConSrvHeap, 0, sizeof(ALIAS_HEADER) + sizeof(WCHAR) * dwLength); + Entry = ConsoleAllocHeap(0, sizeof(ALIAS_HEADER) + sizeof(WCHAR) * dwLength); if (!Entry) return Entry; Entry->lpExeName = (LPCWSTR)(Entry + 1); @@ -134,7 +134,7 @@ dwSource = wcslen(lpSource) + 1; dwTarget = wcslen(lpTarget) + 1; - Entry = RtlAllocateHeap(ConSrvHeap, 0, sizeof(ALIAS_ENTRY) + sizeof(WCHAR) * (dwSource + dwTarget)); + Entry = ConsoleAllocHeap(0, sizeof(ALIAS_ENTRY) + sizeof(WCHAR) * (dwSource + dwTarget)); if (!Entry) return Entry; Entry->lpSource = (LPCWSTR)(Entry + 1); @@ -247,7 +247,7 @@ if (CurEntry == Entry) { *LastLink = Entry->Next; - RtlFreeHeap(ConSrvHeap, 0, Entry); + ConsoleFreeHeap(Entry); return; } LastLink = &CurEntry->Next; @@ -266,9 +266,9 @@ for (Entry = Header->Data; Entry; Entry = NextEntry) { NextEntry = Entry->Next; - RtlFreeHeap(ConSrvHeap, 0, Entry); - } - RtlFreeHeap(ConSrvHeap, 0, Header); + ConsoleFreeHeap(Entry); + } + ConsoleFreeHeap(Header); } } Modified: trunk/reactos/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/coninp… ============================================================================== --- trunk/reactos/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/coninput.c [iso-8859-1] Sun May 12 00:20:15 2013 @@ -100,7 +100,7 @@ } /* add event to the queue */ - ConInRec = RtlAllocateHeap(ConSrvHeap, 0, sizeof(ConsoleInput)); + ConInRec = ConsoleAllocHeap(0, sizeof(ConsoleInput)); if (ConInRec == NULL) return STATUS_INSUFFICIENT_RESOURCES; ConInRec->InputEvent = *InputEvent; @@ -129,7 +129,7 @@ { CurrentEntry = RemoveHeadList(&Console->InputBuffer.InputEvents); Event = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); - RtlFreeHeap(ConSrvHeap, 0, Event); + ConsoleFreeHeap(Event); } CloseHandle(Console->InputBuffer.ActiveEvent); @@ -324,7 +324,7 @@ { PGET_INPUT_INFO CapturedInputInfo; - CapturedInputInfo = RtlAllocateHeap(ConSrvHeap, 0, sizeof(GET_INPUT_INFO)); + CapturedInputInfo = ConsoleAllocHeap(0, sizeof(GET_INPUT_INFO)); if (!CapturedInputInfo) return STATUS_NO_MEMORY; RtlMoveMemory(CapturedInputInfo, InputInfo, sizeof(GET_INPUT_INFO)); @@ -336,7 +336,7 @@ CapturedInputInfo, NULL)) { - RtlFreeHeap(ConSrvHeap, 0, CapturedInputInfo); + ConsoleFreeHeap(CapturedInputInfo); return STATUS_NO_MEMORY; } } @@ -407,7 +407,7 @@ if (Status != STATUS_PENDING) { WaitApiMessage->Status = Status; - RtlFreeHeap(ConSrvHeap, 0, InputInfo); + ConsoleFreeHeap(InputInfo); } return (Status == STATUS_PENDING ? FALSE : TRUE); @@ -466,7 +466,7 @@ if (Wait) // TRUE --> Read, we remove inputs from the buffer ; FALSE --> Peek, we keep inputs. { RemoveEntryList(&Input->ListEntry); - RtlFreeHeap(ConSrvHeap, 0, Input); + ConsoleFreeHeap(Input); } } @@ -539,7 +539,7 @@ if (Status != STATUS_PENDING) { WaitApiMessage->Status = Status; - RtlFreeHeap(ConSrvHeap, 0, InputInfo); + ConsoleFreeHeap(InputInfo); } return (Status == STATUS_PENDING ? FALSE : TRUE); @@ -569,7 +569,7 @@ { /* Starting a new line */ Console->LineMaxSize = (WORD)max(256, nNumberOfCharsToRead); - Console->LineBuffer = RtlAllocateHeap(ConSrvHeap, 0, Console->LineMaxSize * sizeof(WCHAR)); + Console->LineBuffer = ConsoleAllocHeap(0, Console->LineMaxSize * sizeof(WCHAR)); if (Console->LineBuffer == NULL) { return STATUS_NO_MEMORY; @@ -612,7 +612,7 @@ LineInputKeyDown(Console, &Input->InputEvent.Event.KeyEvent); ReadConsoleRequest->ControlKeyState = Input->InputEvent.Event.KeyEvent.dwControlKeyState; } - RtlFreeHeap(ConSrvHeap, 0, Input); + ConsoleFreeHeap(Input); } /* Check if we have a complete line to read from */ @@ -640,7 +640,7 @@ if (Console->LinePos == Console->LineSize) { /* Entire line has been read */ - RtlFreeHeap(ConSrvHeap, 0, Console->LineBuffer); + ConsoleFreeHeap(Console->LineBuffer); Console->LineBuffer = NULL; } @@ -684,7 +684,7 @@ /* Did read something */ WaitForMoreToRead = FALSE; } - RtlFreeHeap(ConSrvHeap, 0, Input); + ConsoleFreeHeap(Input); } } @@ -862,7 +862,7 @@ { CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); Event = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); - RtlFreeHeap(ConSrvHeap, 0, Event); + ConsoleFreeHeap(Event); } ResetEvent(InputBuffer->ActiveEvent); Modified: trunk/reactos/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conout… ============================================================================== --- trunk/reactos/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/conoutput.c [iso-8859-1] Sun May 12 00:20:15 2013 @@ -83,21 +83,19 @@ if (Console == NULL || Buffer == NULL) return STATUS_INVALID_PARAMETER; - *Buffer = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CONSOLE_SCREEN_BUFFER)); + *Buffer = ConsoleAllocHeap(HEAP_ZERO_MEMORY, sizeof(CONSOLE_SCREEN_BUFFER)); if (NULL == *Buffer) { return STATUS_INSUFFICIENT_RESOURCES; } - (*Buffer)->Header.Type = SCREEN_BUFFER; - (*Buffer)->Header.Console = Console; - (*Buffer)->Header.HandleCount = 0; + ConSrvInitObject(&(*Buffer)->Header, SCREEN_BUFFER, Console); (*Buffer)->ScreenBufferSize = ScreenBufferSize; - (*Buffer)->Buffer = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY, (*Buffer)->ScreenBufferSize.X * (*Buffer)->ScreenBufferSize.Y * 2); + (*Buffer)->Buffer = ConsoleAllocHeap(HEAP_ZERO_MEMORY, (*Buffer)->ScreenBufferSize.X * (*Buffer)->ScreenBufferSize.Y * 2); if (NULL == (*Buffer)->Buffer) { - RtlFreeHeap(ConSrvHeap, 0, *Buffer); + ConsoleFreeHeap(*Buffer); return STATUS_INSUFFICIENT_RESOURCES; } @@ -105,6 +103,7 @@ (*Buffer)->ShowY = 0; (*Buffer)->VirtualY = 0; + (*Buffer)->CursorBlinkOn = (*Buffer)->ForceCursorOff = FALSE; (*Buffer)->CursorInfo.bVisible = (IsCursorVisible && (CursorSize != 0)); (*Buffer)->CursorInfo.dwSize = min(max(CursorSize, 0), 100); @@ -437,7 +436,7 @@ if (!ConioIsBufferResizeSupported(Console)) return STATUS_NOT_SUPPORTED; - Buffer = RtlAllocateHeap(ConSrvHeap, 0, Size.X * Size.Y * 2); + Buffer = ConsoleAllocHeap(0, Size.X * Size.Y * 2); if (!Buffer) return STATUS_NO_MEMORY; DPRINT1("Resizing (%d,%d) to (%d,%d)\n", ScreenBuffer->ScreenBufferSize.X, ScreenBuffer->ScreenBufferSize.Y, Size.X, Size.Y); @@ -487,7 +486,7 @@ } (void)InterlockedExchangePointer((PVOID volatile*)&ScreenBuffer->Buffer, Buffer); - RtlFreeHeap(ConSrvHeap, 0, OldBuffer); + ConsoleFreeHeap(OldBuffer); ScreenBuffer->ScreenBufferSize = Size; ScreenBuffer->VirtualY = 0; @@ -538,8 +537,8 @@ } } - RtlFreeHeap(ConSrvHeap, 0, Buffer->Buffer); - RtlFreeHeap(ConSrvHeap, 0, Buffer); + ConsoleFreeHeap(Buffer->Buffer); + ConsoleFreeHeap(Buffer); } VOID FASTCALL @@ -986,7 +985,7 @@ * TODO: Do NOT loop up to NumCodesToRead, but stop before * if we are going to overflow... */ - for (i = 0; i < ReadOutputCodeRequest->NumCodesToRead; ++i) + for (i = 0; i < min(ReadOutputCodeRequest->NumCodesToRead, Buff->ScreenBufferSize.X * Buff->ScreenBufferSize.Y * 2); ++i) { Code = Buff->Buffer[2 * (Xpos + Ypos * Buff->ScreenBufferSize.X) + (CodeType == CODE_ATTRIBUTE ? 1 : 0)]; Modified: trunk/reactos/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consol… ============================================================================== --- trunk/reactos/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/console.c [iso-8859-1] Sun May 12 00:20:15 2013 @@ -59,7 +59,7 @@ SIZE_T Size = (wcslen(Source) + 1) * sizeof(WCHAR); if (Size > MAXUSHORT) return FALSE; - UniDest->Buffer = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY, Size); + UniDest->Buffer = ConsoleAllocHeap(HEAP_ZERO_MEMORY, Size); if (UniDest->Buffer == NULL) return FALSE; RtlCopyMemory(UniDest->Buffer, Source, Size); @@ -75,7 +75,7 @@ { if (UnicodeString->Buffer) { - RtlFreeHeap(ConSrvHeap, 0, UnicodeString->Buffer); + ConsoleFreeHeap(UnicodeString->Buffer); RtlZeroMemory(UnicodeString, sizeof(UNICODE_STRING)); } } @@ -310,7 +310,7 @@ NTSTATUS Status = STATUS_SUCCESS; PCONSOLE ProcessConsole; - RtlEnterCriticalSection(&ProcessData->HandleTableLock); + // RtlEnterCriticalSection(&ProcessData->HandleTableLock); ProcessConsole = ProcessData->Console; if (ConSrvValidateConsole(ProcessConsole, CONSOLE_RUNNING, LockConsole)) @@ -324,7 +324,7 @@ Status = STATUS_INVALID_HANDLE; } - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + // RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return Status; } @@ -485,7 +485,7 @@ PCONSOLE Console; PCONSOLE_SCREEN_BUFFER NewBuffer; BOOL GuiMode; - WCHAR Title[128]; + WCHAR DefaultTitle[128]; WCHAR IconPath[MAX_PATH + 1] = L""; INT iIcon = 0; @@ -495,7 +495,7 @@ /* * Allocate a console structure */ - Console = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY, sizeof(CONSOLE)); + Console = ConsoleAllocHeap(HEAP_ZERO_MEMORY, sizeof(CONSOLE)); if (NULL == Console) { DPRINT1("Not enough memory for console creation.\n"); @@ -576,17 +576,18 @@ * Initialize the console */ Console->State = CONSOLE_INITIALIZING; + Console->ReferenceCount = 0; InitializeCriticalSection(&Console->Lock); - Console->ReferenceCount = 0; InitializeListHead(&Console->ProcessList); + RtlZeroMemory(&Console->TermIFace, sizeof(Console->TermIFace)); + memcpy(Console->Colors, ConsoleInfo.Colors, sizeof(ConsoleInfo.Colors)); Console->ConsoleSize = ConsoleInfo.ConsoleSize; /* * Initialize the input buffer */ - Console->InputBuffer.Header.Type = INPUT_BUFFER; - Console->InputBuffer.Header.Console = Console; + ConSrvInitObject(&Console->InputBuffer.Header, INPUT_BUFFER, Console); SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); SecurityAttributes.lpSecurityDescriptor = NULL; @@ -595,17 +596,25 @@ if (NULL == Console->InputBuffer.ActiveEvent) { DeleteCriticalSection(&Console->Lock); - RtlFreeHeap(ConSrvHeap, 0, Console); + ConsoleFreeHeap(Console); return STATUS_UNSUCCESSFUL; } + Console->InputBuffer.InputBufferSize = 0; // FIXME! + InitializeListHead(&Console->InputBuffer.InputEvents); + InitializeListHead(&Console->InputBuffer.ReadWaitQueue); Console->InputBuffer.Mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT; + Console->QuickEdit = ConsoleInfo.QuickEdit; Console->InsertMode = ConsoleInfo.InsertMode; - InitializeListHead(&Console->InputBuffer.ReadWaitQueue); - InitializeListHead(&Console->InputBuffer.InputEvents); Console->LineBuffer = NULL; + Console->LineMaxSize = Console->LineSize = Console->LinePos = 0; + Console->LineComplete = Console->LineUpPressed = Console->LineInsertToggle = FALSE; + // LineWakeupMask + // Selection + // dwSelectionCursor + Console->CodePage = GetOEMCP(); Console->OutputCodePage = GetOEMCP(); @@ -625,16 +634,20 @@ DPRINT1("ConSrvCreateScreenBuffer: failed, Status = 0x%08lx\n", Status); CloseHandle(Console->InputBuffer.ActiveEvent); DeleteCriticalSection(&Console->Lock); - RtlFreeHeap(ConSrvHeap, 0, Console); + ConsoleFreeHeap(Console); return Status; } /* Make the new screen buffer active */ Console->ActiveBuffer = NewBuffer; InitializeListHead(&Console->WriteWaitQueue); - - /* - * Initialize the history buffers - */ + Console->PauseFlags = 0; + Console->UnpauseEvent = NULL; + // HardwareState + + /* + * Initialize the alias and history buffers + */ + Console->Aliases = NULL; InitializeListHead(&Console->HistoryBuffers); Console->HistoryBufferSize = ConsoleInfo.HistoryBufferSize; Console->NumberOfHistoryBuffers = ConsoleInfo.NumberOfHistoryBuffers; @@ -644,9 +657,9 @@ ConsoleCreateUnicodeString(&Console->OriginalTitle, ConsoleInfo.ConsoleTitle); if (ConsoleInfo.ConsoleTitle[0] == L'\0') { - if (LoadStringW(ConSrvDllInstance, IDS_CONSOLE_TITLE, Title, sizeof(Title) / sizeof(Title[0]))) - { - ConsoleCreateUnicodeString(&Console->Title, Title); + if (LoadStringW(ConSrvDllInstance, IDS_CONSOLE_TITLE, DefaultTitle, sizeof(DefaultTitle) / sizeof(DefaultTitle[0]))) + { + ConsoleCreateUnicodeString(&Console->Title, DefaultTitle); } else { @@ -709,7 +722,7 @@ CloseHandle(Console->InputBuffer.ActiveEvent); // LeaveCriticalSection(&Console->Lock); DeleteCriticalSection(&Console->Lock); - RtlFreeHeap(ConSrvHeap, 0, Console); + ConsoleFreeHeap(Console); return Status; } } @@ -827,7 +840,7 @@ /* Discard all entries in the input event queue */ PurgeInputBuffer(Console); - if (Console->LineBuffer) RtlFreeHeap(ConSrvHeap, 0, Console->LineBuffer); + if (Console->LineBuffer) ConsoleFreeHeap(Console->LineBuffer); IntDeleteAllAliases(Console); HistoryDeleteBuffers(Console); @@ -850,7 +863,7 @@ DeleteCriticalSection(&Console->Lock); DPRINT("ConSrvDeleteConsole - Lock destroyed ; freeing console\n"); - RtlFreeHeap(ConSrvHeap, 0, Console); + ConsoleFreeHeap(Console); DPRINT("ConSrvDeleteConsole - Console freed\n"); /* Unlock the console list and return */ @@ -880,18 +893,6 @@ { return STATUS_INVALID_PARAMETER; } - - /* - * We are about to create a new console. However when ConSrvNewProcess - * was called, we didn't know that we wanted to create a new console and - * therefore, we by default inherited the handles table from our parent - * process. It's only now that we notice that in fact we do not need - * them, because we've created a new console and thus we must use it. - * - * Therefore, free the console we can have and our handles table, - * and recreate a new one later on. - */ - ConSrvRemoveConsole(ProcessData); /* Initialize a new Console owned by the Console Leader Process */ Status = ConSrvAllocateConsole(ProcessData, @@ -971,18 +972,6 @@ } /* - * We are about to create a new console. However when ConSrvNewProcess - * was called, we didn't know that we wanted to create a new console and - * therefore, we by default inherited the handles table from our parent - * process. It's only now that we notice that in fact we do not need - * them, because we've created a new console and thus we must use it. - * - * Therefore, free the console we can have and our handles table, - * and recreate a new one later on. - */ - ConSrvRemoveConsole(TargetProcessData); - - /* * Inherit the console from the parent, * if any, otherwise return an error. */ @@ -1212,7 +1201,7 @@ } /* Allocate a new buffer to hold the new title (NULL-terminated) */ - Buffer = RtlAllocateHeap(ConSrvHeap, 0, TitleRequest->Length + sizeof(WCHAR)); + Buffer = ConsoleAllocHeap(0, TitleRequest->Length + sizeof(WCHAR)); if (Buffer) { /* Free the old title */ Modified: trunk/reactos/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/consrv/consrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/consrv.h [iso-8859-1] Sun May 12 00:20:15 2013 @@ -45,9 +45,11 @@ #include <win/conmsg.h> +/* Heap Helpers */ +#include "heap.h" + /* Globals */ extern HINSTANCE ConSrvDllInstance; -extern HANDLE ConSrvHeap; #define ConsoleGetPerProcessData(Process) \ ((PCONSOLE_PROCESS_DATA)((Process)->ServerData[CONSRV_SERVERDLL_INDEX])) Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… ============================================================================== --- trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun May 12 00:20:15 2013 @@ -233,11 +233,11 @@ GuiConsoleUpdateSelection(Console, &Console->Selection.dwSelectionAnchor); Length = Console->Title.Length + sizeof(L"Mark - ")/sizeof(WCHAR) + 1; - WindowTitle = RtlAllocateHeap(ConSrvHeap, 0, Length * sizeof(WCHAR)); + WindowTitle = ConsoleAllocHeap(0, Length * sizeof(WCHAR)); wcscpy(WindowTitle, L"Mark - "); wcscat(WindowTitle, Console->Title.Buffer); SetWindowText(GuiData->hWindow, WindowTitle); - RtlFreeHeap(ConSrvHeap, 0, WindowTitle); + ConsoleFreeHeap(WindowTitle); break; } @@ -1013,11 +1013,11 @@ GuiConsoleUpdateSelection(Console, &Console->Selection.dwSelectionAnchor); Length = Console->Title.Length + sizeof(L"Selection - ")/sizeof(WCHAR) + 1; - WindowTitle = RtlAllocateHeap(ConSrvHeap, 0, Length * sizeof(WCHAR)); + WindowTitle = ConsoleAllocHeap(0, Length * sizeof(WCHAR)); wcscpy(WindowTitle, L"Selection - "); wcscat(WindowTitle, Console->Title.Buffer); SetWindowText(GuiData->hWindow, WindowTitle); - RtlFreeHeap(ConSrvHeap, 0, WindowTitle); + ConsoleFreeHeap(WindowTitle); break; } @@ -2020,7 +2020,7 @@ Console->TermIFace.Data = NULL; DeleteCriticalSection(&GuiData->Lock); - RtlFreeHeap(ConSrvHeap, 0, GuiData); + ConsoleFreeHeap(GuiData); DPRINT("Quit GuiCleanupConsole\n"); } @@ -2290,8 +2290,7 @@ /* Initialize the console */ Console->TermIFace.Vtbl = &GuiVtbl; - GuiData = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY, - sizeof(GUI_CONSOLE_DATA)); + GuiData = ConsoleAllocHeap(HEAP_ZERO_MEMORY, sizeof(GUI_CONSOLE_DATA)); if (!GuiData) { DPRINT1("CONSRV: Failed to create GUI_CONSOLE_DATA\n"); Modified: trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… ============================================================================== --- trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c [iso-8859-1] Sun May 12 00:20:15 2013 @@ -68,9 +68,8 @@ /* Build the driver path */ /* 52 = wcslen(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\") */ - pszDriverPath = RtlAllocateHeap(ConSrvHeap, - HEAP_ZERO_MEMORY, - (52 + wcslen(lpServiceName) + 1) * sizeof(WCHAR)); + pszDriverPath = ConsoleAllocHeap(HEAP_ZERO_MEMORY, + (52 + wcslen(lpServiceName) + 1) * sizeof(WCHAR)); if (pszDriverPath == NULL) return ERROR_NOT_ENOUGH_MEMORY; @@ -105,7 +104,7 @@ &WasPrivilegeEnabled); done: - RtlFreeHeap(ConSrvHeap, 0, pszDriverPath); + ConsoleFreeHeap(pszDriverPath); return RtlNtStatusToDosError(Status); } @@ -120,9 +119,8 @@ /* Build the driver path */ /* 52 = wcslen(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\") */ - pszDriverPath = RtlAllocateHeap(ConSrvHeap, - HEAP_ZERO_MEMORY, - (52 + wcslen(lpServiceName) + 1) * sizeof(WCHAR)); + pszDriverPath = ConsoleAllocHeap(HEAP_ZERO_MEMORY, + (52 + wcslen(lpServiceName) + 1) * sizeof(WCHAR)); if (pszDriverPath == NULL) return ERROR_NOT_ENOUGH_MEMORY; @@ -157,7 +155,7 @@ &WasPrivilegeEnabled); done: - RtlFreeHeap(ConSrvHeap, 0, pszDriverPath); + ConsoleFreeHeap(pszDriverPath); return RtlNtStatusToDosError(Status); } #endif @@ -185,8 +183,7 @@ SwapConsole = (0 < Next ? GetNextConsole(SwapConsole) : GetPrevConsole(SwapConsole)); Title.MaximumLength = RtlUnicodeStringToAnsiSize(&SwapConsole->Console->Title); Title.Length = 0; - Buffer = RtlAllocateHeap(ConSrvHeap, 0, - sizeof(COORD) + Title.MaximumLength); + Buffer = ConsoleAllocHeap(0, sizeof(COORD) + Title.MaximumLength); pos = (PCOORD)Buffer; Title.Buffer = (PVOID)((ULONG_PTR)Buffer + sizeof(COORD)); @@ -201,7 +198,7 @@ { DPRINT1( "Error writing to console\n" ); } - RtlFreeHeap(ConSrvHeap, 0, Buffer); + ConsoleFreeHeap(Buffer); LeaveCriticalSection(&ActiveVirtConsLock); return TRUE; @@ -476,7 +473,7 @@ Console->TermIFace.Data = NULL; DeleteCriticalSection(&TuiData->Lock); - RtlFreeHeap(ConSrvHeap, 0, TuiData); + ConsoleFreeHeap(TuiData); } static VOID WINAPI @@ -506,10 +503,10 @@ ConsoleDrawSize = sizeof(CONSOLE_DRAW) + (ConioRectWidth(Region) * ConioRectHeight(Region)) * 2; - ConsoleDraw = RtlAllocateHeap(ConSrvHeap, 0, ConsoleDrawSize); + ConsoleDraw = ConsoleAllocHeap(0, ConsoleDrawSize); if (NULL == ConsoleDraw) { - DPRINT1("RtlAllocateHeap failed\n"); + DPRINT1("ConsoleAllocHeap failed\n"); return; } ConsoleDraw->X = Region->Left; @@ -525,11 +522,11 @@ NULL, 0, ConsoleDraw, ConsoleDrawSize, &BytesReturned, NULL)) { DPRINT1("Failed to draw console\n"); - RtlFreeHeap(ConSrvHeap, 0, ConsoleDraw); + ConsoleFreeHeap(ConsoleDraw); return; } - RtlFreeHeap(ConSrvHeap, 0, ConsoleDraw); + ConsoleFreeHeap(ConsoleDraw); } static BOOL WINAPI @@ -679,8 +676,7 @@ /* Initialize the console */ Console->TermIFace.Vtbl = &TuiVtbl; - TuiData = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY, - sizeof(TUI_CONSOLE_DATA)); + TuiData = ConsoleAllocHeap(HEAP_ZERO_MEMORY, sizeof(TUI_CONSOLE_DATA)); if (!TuiData) { DPRINT1("CONSRV: Failed to create TUI_CONSOLE_DATA\n"); Modified: trunk/reactos/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/handle… ============================================================================== --- trunk/reactos/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/handle.c [iso-8859-1] Sun May 12 00:20:15 2013 @@ -40,7 +40,8 @@ { PCONSOLE_IO_OBJECT Object = Entry->Object; - DPRINT("AdjustHandleCounts(0x%p, %d), Object = 0x%p, Object->HandleCount = %d, Object->Type = %lu\n", Entry, Change, Object, Object->HandleCount, Object->Type); + DPRINT("AdjustHandleCounts(0x%p, %d), Object = 0x%p\n", Entry, Change, Object); + DPRINT("\tAdjustHandleCounts(0x%p, %d), Object = 0x%p, Object->HandleCount = %d, Object->Type = %lu\n", Entry, Change, Object, Object->HandleCount, Object->Type); if (Entry->Access & GENERIC_READ) Object->AccessRead += Change; if (Entry->Access & GENERIC_WRITE) Object->AccessWrite += Change; @@ -116,8 +117,12 @@ } /// LOCK /// LeaveCriticalSection(&Console->Lock); - Entry->Object = NULL; - } + + /* Invalidate (zero-out) this handle entry */ + // Entry->Object = NULL; + // RtlZeroMemory(Entry, sizeof(*Entry)); + } + RtlZeroMemory(Entry, sizeof(*Entry)); // Be sure the whole entry is invalidated. } @@ -204,22 +209,21 @@ IN PCONSOLE_PROCESS_DATA TargetProcessData) { NTSTATUS Status = STATUS_SUCCESS; - ULONG i; + ULONG i, j; RtlEnterCriticalSection(&SourceProcessData->HandleTableLock); /* Inherit a handles table only if there is no already */ if (TargetProcessData->HandleTable != NULL /* || TargetProcessData->HandleTableSize != 0 */) { - Status = STATUS_UNSUCCESSFUL; /* STATUS_INVALID_PARAMETER */ + Status = STATUS_UNSUCCESSFUL; goto Quit; } /* Allocate a new handle table for the child process */ - TargetProcessData->HandleTable = RtlAllocateHeap(ConSrvHeap, - HEAP_ZERO_MEMORY, - SourceProcessData->HandleTableSize - * sizeof(CONSOLE_IO_HANDLE)); + TargetProcessData->HandleTable = ConsoleAllocHeap(HEAP_ZERO_MEMORY, + SourceProcessData->HandleTableSize + * sizeof(CONSOLE_IO_HANDLE)); if (TargetProcessData->HandleTable == NULL) { Status = STATUS_NO_MEMORY; @@ -232,7 +236,7 @@ * Parse the parent process' handles table and, for each handle, * do a copy of it and reference it, if the handle is inheritable. */ - for (i = 0; i < SourceProcessData->HandleTableSize; i++) + for (i = 0, j = 0; i < SourceProcessData->HandleTableSize; i++) { if (SourceProcessData->HandleTable[i].Object != NULL && SourceProcessData->HandleTable[i].Inheritable) @@ -241,8 +245,9 @@ * Copy the handle data and increment the reference count of the * pointed object (via the call to ConSrvCreateHandleEntry). */ - TargetProcessData->HandleTable[i] = SourceProcessData->HandleTable[i]; - ConSrvCreateHandleEntry(&TargetProcessData->HandleTable[i]); + TargetProcessData->HandleTable[j] = SourceProcessData->HandleTable[i]; + ConSrvCreateHandleEntry(&TargetProcessData->HandleTable[j]); + ++j; } } @@ -260,18 +265,44 @@ { ULONG i; - /* Close all console handles and free the handle table memory */ - for (i = 0; i < ProcessData->HandleTableSize; i++) + /* + * ProcessData->Console is NULL (and the assertion fails) when + * ConSrvFreeHandlesTable is called in ConSrvConnect during the + * allocation of a new console. + */ + // ASSERT(ProcessData->Console); + if (ProcessData->Console != NULL) { - ConSrvCloseHandleEntry(&ProcessData->HandleTable[i]); + /* Close all the console handles */ + for (i = 0; i < ProcessData->HandleTableSize; i++) + { + ConSrvCloseHandleEntry(&ProcessData->HandleTable[i]); + } } - RtlFreeHeap(ConSrvHeap, 0, ProcessData->HandleTable); + /* Free the handles table memory */ + ConsoleFreeHeap(ProcessData->HandleTable); ProcessData->HandleTable = NULL; } ProcessData->HandleTableSize = 0; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); +} + +VOID +FASTCALL +ConSrvInitObject(IN OUT PCONSOLE_IO_OBJECT Object, + IN CONSOLE_IO_OBJECT_TYPE Type, + IN PCONSOLE Console) +{ + ASSERT(Object); + // if (!Object) return; + + Object->Type = Type; + Object->Console = Console; + Object->AccessRead = Object->AccessWrite = 0; + Object->ExclusiveRead = Object->ExclusiveWrite = 0; + Object->HandleCount = 0; } NTSTATUS @@ -285,34 +316,45 @@ { #define IO_HANDLES_INCREMENT 2 * 3 - ULONG i; + ULONG i = 0; PCONSOLE_IO_HANDLE Block; // NOTE: Commented out because calling code always lock HandleTableLock before. // RtlEnterCriticalSection(&ProcessData->HandleTableLock); - for (i = 0; i < ProcessData->HandleTableSize; i++) - { - if (ProcessData->HandleTable[i].Object == NULL) + ASSERT( (ProcessData->HandleTable == NULL && ProcessData->HandleTableSize == 0) || + (ProcessData->HandleTable != NULL && ProcessData->HandleTableSize != 0) ); + + if (ProcessData->HandleTable) + { + for (i = 0; i < ProcessData->HandleTableSize; i++) { - break; + if (ProcessData->HandleTable[i].Object == NULL) + break; } } + if (i >= ProcessData->HandleTableSize) { - Block = RtlAllocateHeap(ConSrvHeap, - HEAP_ZERO_MEMORY, - (ProcessData->HandleTableSize + + /* Allocate a new handles table */ + Block = ConsoleAllocHeap(HEAP_ZERO_MEMORY, + (ProcessData->HandleTableSize + IO_HANDLES_INCREMENT) * sizeof(CONSOLE_IO_HANDLE)); if (Block == NULL) { // RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_UNSUCCESSFUL; } - RtlCopyMemory(Block, - ProcessData->HandleTable, - ProcessData->HandleTableSize * sizeof(CONSOLE_IO_HANDLE)); - RtlFreeHeap(ConSrvHeap, 0, ProcessData->HandleTable); + + /* If we previously had a handles table, free it and use the new one */ + if (ProcessData->HandleTable) + { + /* Copy the handles from the old table to the new one */ + RtlCopyMemory(Block, + ProcessData->HandleTable, + ProcessData->HandleTableSize * sizeof(CONSOLE_IO_HANDLE)); + ConsoleFreeHeap(ProcessData->HandleTable); + } ProcessData->HandleTable = Block; ProcessData->HandleTableSize += IO_HANDLES_INCREMENT; } @@ -339,6 +381,8 @@ RtlEnterCriticalSection(&ProcessData->HandleTableLock); + ASSERT(ProcessData->HandleTable); + if (h >= ProcessData->HandleTableSize || (Object = ProcessData->HandleTable[h].Object) == NULL) { @@ -346,6 +390,7 @@ return STATUS_INVALID_HANDLE; } + ASSERT(ProcessData->Console); ConSrvCloseHandleEntry(&ProcessData->HandleTable[h]); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); @@ -429,6 +474,18 @@ { NTSTATUS Status = STATUS_SUCCESS; + /* + * We are about to create a new console. However when ConSrvNewProcess + * was called, we didn't know that we wanted to create a new console and + * therefore, we by default inherited the handles table from our parent + * process. It's only now that we notice that in fact we do not need + * them, because we've created a new console and thus we must use it. + * + * Therefore, free the handles table so that we can recreate + * a new one later on. + */ + ConSrvFreeHandlesTable(ProcessData); + /* Initialize a new Console owned by this process */ Status = ConSrvInitConsole(&ProcessData->Console, ConsoleStartInfo, ProcessData->Process); if (!NT_SUCCESS(Status)) @@ -500,6 +557,18 @@ if (CreateNewHandlesTable) { + /* + * We are about to create a new console. However when ConSrvNewProcess + * was called, we didn't know that we wanted to create a new console and + * therefore, we by default inherited the handles table from our parent + * process. It's only now that we notice that in fact we do not need + * them, because we've created a new console and thus we must use it. + * + * Therefore, free the handles table so that we can recreate + * a new one later on. + */ + ConSrvFreeHandlesTable(ProcessData); + /* Initialize the handles table */ Status = ConSrvInitHandlesTable(ProcessData, pInputHandle, @@ -552,7 +621,7 @@ DPRINT("ConSrvRemoveConsole\n"); - RtlEnterCriticalSection(&ProcessData->HandleTableLock); + // RtlEnterCriticalSection(&ProcessData->HandleTableLock); /* Validate and lock the console */ if (ConSrvValidateConsole(Console, CONSOLE_RUNNING, TRUE)) @@ -578,7 +647,7 @@ //ProcessData->ConsoleEvent = NULL; } - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + // RtlLeaveCriticalSection(&ProcessData->HandleTableLock); } @@ -649,19 +718,40 @@ CSR_API(SrvCloseHandle) { + NTSTATUS Status; PCONSOLE_CLOSEHANDLE CloseHandleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CloseHandleRequest; - - return ConSrvRemoveObject(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - CloseHandleRequest->ConsoleHandle); + PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); + PCONSOLE Console; + + Status = ConSrvGetConsole(ProcessData, &Console, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Can't get console\n"); + return Status; + } + + Status = ConSrvRemoveObject(ProcessData, CloseHandleRequest->ConsoleHandle); + + ConSrvReleaseConsole(Console, TRUE); + return Status; } CSR_API(SrvVerifyConsoleIoHandle) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PCONSOLE_VERIFYHANDLE VerifyHandleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.VerifyHandleRequest; PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); + PCONSOLE Console; + HANDLE ConsoleHandle = VerifyHandleRequest->ConsoleHandle; ULONG_PTR Index = (ULONG_PTR)ConsoleHandle >> 2; + + Status = ConSrvGetConsole(ProcessData, &Console, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Can't get console\n"); + return Status; + } RtlEnterCriticalSection(&ProcessData->HandleTableLock); @@ -675,17 +765,28 @@ RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + ConSrvReleaseConsole(Console, TRUE); return Status; } CSR_API(SrvDuplicateHandle) { + NTSTATUS Status; + PCONSOLE_DUPLICATEHANDLE DuplicateHandleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.DuplicateHandleRequest; + PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); + PCONSOLE Console; + + HANDLE ConsoleHandle = DuplicateHandleRequest->ConsoleHandle; + ULONG_PTR Index = (ULONG_PTR)ConsoleHandle >> 2; PCONSOLE_IO_HANDLE Entry; DWORD DesiredAccess; - PCONSOLE_DUPLICATEHANDLE DuplicateHandleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.DuplicateHandleRequest; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); - HANDLE ConsoleHandle = DuplicateHandleRequest->ConsoleHandle; - ULONG_PTR Index = (ULONG_PTR)ConsoleHandle >> 2; + + Status = ConSrvGetConsole(ProcessData, &Console, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Can't get console\n"); + return Status; + } RtlEnterCriticalSection(&ProcessData->HandleTableLock); @@ -694,8 +795,8 @@ (Entry = &ProcessData->HandleTable[Index])->Object == NULL) { DPRINT1("Couldn't duplicate invalid handle %p\n", ConsoleHandle); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return STATUS_INVALID_HANDLE; + Status = STATUS_INVALID_HANDLE; + goto Quit; } if (DuplicateHandleRequest->Options & DUPLICATE_SAME_ACCESS) @@ -709,27 +810,31 @@ if ((Entry->Access & DesiredAccess) == 0) { DPRINT1("Handle %p only has access %X; requested %X\n", - ConsoleHandle, Entry->Access, DesiredAccess); - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return STATUS_INVALID_PARAMETER; + ConsoleHandle, Entry->Access, DesiredAccess); + Status = STATUS_INVALID_PARAMETER; + goto Quit; } } /* Insert the new handle inside the process handles table */ - ApiMessage->Status = ConSrvInsertObject(ProcessData, - &DuplicateHandleRequest->ConsoleHandle, // Use the new handle value! - Entry->Object, - DesiredAccess, - DuplicateHandleRequest->Inheritable, - Entry->ShareMode); - if (NT_SUCCESS(ApiMessage->Status) && - DuplicateHandleRequest->Options & DUPLICATE_CLOSE_SOURCE) - { + Status = ConSrvInsertObject(ProcessData, + &DuplicateHandleRequest->ConsoleHandle, // Use the new handle value! + Entry->Object, + DesiredAccess, + DuplicateHandleRequest->Inheritable, + Entry->ShareMode); + if (NT_SUCCESS(Status) && + (DuplicateHandleRequest->Options & DUPLICATE_CLOSE_SOURCE)) + { + /* Close the original handle if needed */ ConSrvCloseHandleEntry(Entry); } +Quit: RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - return ApiMessage->Status; + + ConSrvReleaseConsole(Console, TRUE); + return Status; } /* EOF */ Modified: trunk/reactos/win32ss/user/consrv/handle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/handle… ============================================================================== --- trunk/reactos/win32ss/user/consrv/handle.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/handle.h [iso-8859-1] Sun May 12 00:20:15 2013 @@ -10,6 +10,9 @@ #pragma once +VOID FASTCALL ConSrvInitObject(IN OUT PCONSOLE_IO_OBJECT Object, + IN CONSOLE_IO_OBJECT_TYPE Type, + IN PCONSOLE Console); NTSTATUS FASTCALL ConSrvInsertObject(PCONSOLE_PROCESS_DATA ProcessData, PHANDLE Handle, PCONSOLE_IO_OBJECT Object, Added: trunk/reactos/win32ss/user/consrv/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/heap.h… ============================================================================== --- trunk/reactos/win32ss/user/consrv/heap.h (added) +++ trunk/reactos/win32ss/user/consrv/heap.h [iso-8859-1] Sun May 12 00:20:15 2013 @@ -0,0 +1,17 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/consrv/heap.h + * PURPOSE: Heap Helpers + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#pragma once + +/* See init.c */ +extern HANDLE ConSrvHeap; + +#define ConsoleAllocHeap(Flags, Size) RtlAllocateHeap(ConSrvHeap, Flags, Size) +#define ConsoleFreeHeap(HeapBase) RtlFreeHeap(ConSrvHeap, 0, HeapBase) + +/* EOF */ Propchange: trunk/reactos/win32ss/user/consrv/heap.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/user/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/includ… ============================================================================== --- trunk/reactos/win32ss/user/consrv/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/include/conio.h [iso-8859-1] Sun May 12 00:20:15 2013 @@ -64,7 +64,7 @@ BOOLEAN CursorBlinkOn; BOOLEAN ForceCursorOff; - ULONG CursorSize; + // ULONG CursorSize; CONSOLE_CURSOR_INFO CursorInfo; // FIXME: Keep this member or not ?? WORD ScreenDefaultAttrib; /* Default screen char attribute */ Modified: trunk/reactos/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/init.c… ============================================================================== --- trunk/reactos/win32ss/user/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/init.c [iso-8859-1] Sun May 12 00:20:15 2013 @@ -11,6 +11,8 @@ #include "consrv.h" #include "api.h" #include "procinit.h" +#include "include/conio.h" +#include "include/console.h" #include "console.h" #define NDEBUG @@ -301,6 +303,7 @@ /* FUNCTIONS ******************************************************************/ +/* See handle.c */ NTSTATUS ConSrvInheritHandlesTable(IN PCONSOLE_PROCESS_DATA SourceProcessData, IN PCONSOLE_PROCESS_DATA TargetProcessData); @@ -322,22 +325,25 @@ * ConSrvConnect we don't have any reference to the parent process anymore. **************************************************************************/ - PCONSOLE_PROCESS_DATA SourceProcessData, TargetProcessData; + NTSTATUS Status = STATUS_SUCCESS; + PCONSOLE_PROCESS_DATA /* SourceProcessData, */ TargetProcessData; /* An empty target process is invalid */ if (!TargetProcess) return STATUS_INVALID_PARAMETER; TargetProcessData = ConsoleGetPerProcessData(TargetProcess); - /**** HACK !!!! ****/ RtlZeroMemory(TargetProcessData, sizeof(*TargetProcessData)); - /* Initialize the new (target) process */ + RtlZeroMemory(TargetProcessData, sizeof(*TargetProcessData)); TargetProcessData->Process = TargetProcess; TargetProcessData->ConsoleEvent = NULL; TargetProcessData->Console = TargetProcessData->ParentConsole = NULL; TargetProcessData->ConsoleApp = ((TargetProcess->Flags & CsrProcessIsConsoleApp) ? TRUE : FALSE); - // Testing + /* + * The handles table gets initialized either when inheriting from + * another console process, or when creating a new console. + */ TargetProcessData->HandleTableSize = 0; TargetProcessData->HandleTable = NULL; @@ -346,25 +352,35 @@ /* Do nothing if the source process is NULL */ if (!SourceProcess) return STATUS_SUCCESS; - SourceProcessData = ConsoleGetPerProcessData(SourceProcess); + // SourceProcessData = ConsoleGetPerProcessData(SourceProcess); /* - * If both of the processes (parent and new child) are console applications, - * then try to inherit handles from the parent process. + * If the child process is a console application and the parent process is + * either a console application or just has a valid console (with a valid + * handles table: this can happen if it is a GUI application having called + * AllocConsole), then try to inherit handles from the parent process. */ - if ( SourceProcessData->Console != NULL && /* SourceProcessData->ConsoleApp */ - TargetProcessData->ConsoleApp ) + if (TargetProcessData->ConsoleApp /* && SourceProcessData->ConsoleApp */) { - NTSTATUS Status; - - Status = ConSrvInheritHandlesTable(SourceProcessData, TargetProcessData); - if (!NT_SUCCESS(Status)) return Status; - - /* Temporary save the parent's console */ - TargetProcessData->ParentConsole = SourceProcessData->Console; + PCONSOLE_PROCESS_DATA SourceProcessData = ConsoleGetPerProcessData(SourceProcess); + + /* Validate and lock the parent's console */ + if (ConSrvValidateConsole(SourceProcessData->Console, CONSOLE_RUNNING, TRUE)) + { + /* Inherit the parent's handles table */ + Status = ConSrvInheritHandlesTable(SourceProcessData, TargetProcessData); + if (NT_SUCCESS(Status)) + { + /* Temporary save the parent's console too */ + TargetProcessData->ParentConsole = SourceProcessData->Console; + } + + /* Unlock the parent's console */ + LeaveCriticalSection(&SourceProcessData->Console->Lock); + } } - return STATUS_SUCCESS; + return Status; } NTSTATUS @@ -408,10 +424,9 @@ * process. It's only now that we notice that in fact we do not need * them, because we've created a new console and thus we must use it. * - * Therefore, free the console we can have and our handles table, - * and recreate a new one later on. + * ConSrvAllocateConsole will free our old handles table + * and recreate a new valid one. */ - ConSrvRemoveConsole(ProcessData); /* Initialize a new Console owned by the Console Leader Process */ Status = ConSrvAllocateConsole(ProcessData, @@ -481,9 +496,9 @@ CSR_SERVER_DLL_INIT(ConServerDllInitialization) { /* Initialize the memory */ - // HACK: To try to uncover a heap corruption in CONSRV, use our own heap - // instead of the CSR heap, so that we won't corrupt it. - // ConSrvHeap = RtlGetProcessHeap(); + ConSrvHeap = RtlGetProcessHeap(); +/* + // We can use our own heap instead of the CSR heap to investigate heap corruptions :) ConSrvHeap = RtlCreateHeap(HEAP_GROWABLE | HEAP_PROTECTION_ENABLED | HEAP_FREE_CHECKING_ENABLED | @@ -491,6 +506,7 @@ HEAP_VALIDATE_ALL_ENABLED, NULL, 0, 0, NULL, NULL); if (!ConSrvHeap) return STATUS_NO_MEMORY; +*/ ConSrvInitConsoleSupport(); Modified: trunk/reactos/win32ss/user/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/linein… ============================================================================== --- trunk/reactos/win32ss/user/consrv/lineinput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/lineinput.c [iso-8859-1] Sun May 12 00:20:15 2013 @@ -45,15 +45,15 @@ } /* Couldn't find the buffer, create a new one */ - Hist = RtlAllocateHeap(ConSrvHeap, 0, sizeof(HISTORY_BUFFER) + ExeName.Length); + Hist = ConsoleAllocHeap(0, sizeof(HISTORY_BUFFER) + ExeName.Length); if (!Hist) return NULL; Hist->MaxEntries = Console->HistoryBufferSize; Hist->NumEntries = 0; - Hist->Entries = RtlAllocateHeap(ConSrvHeap, 0, Hist->MaxEntries * sizeof(UNICODE_STRING)); + Hist->Entries = ConsoleAllocHeap(0, Hist->MaxEntries * sizeof(UNICODE_STRING)); if (!Hist->Entries) { - RtlFreeHeap(ConSrvHeap, 0, Hist); + ConsoleFreeHeap(Hist); return NULL; } Hist->ExeName.Length = Hist->ExeName.MaximumLength = ExeName.Length; @@ -148,9 +148,9 @@ while (Hist->NumEntries != 0) RtlFreeUnicodeString(&Hist->Entries[--Hist->NumEntries]); - RtlFreeHeap(ConSrvHeap, 0, Hist->Entries); + ConsoleFreeHeap(Hist->Entries); RemoveEntryList(&Hist->ListEntry); - RtlFreeHeap(ConSrvHeap, 0, Hist); + ConsoleFreeHeap(Hist); } VOID FASTCALL @@ -577,8 +577,7 @@ if (Hist) { OldEntryList = Hist->Entries; - NewEntryList = RtlAllocateHeap(ConSrvHeap, 0, - MaxEntries * sizeof(UNICODE_STRING)); + NewEntryList = ConsoleAllocHeap(0, MaxEntries * sizeof(UNICODE_STRING)); if (!NewEntryList) { Status = STATUS_NO_MEMORY; @@ -595,7 +594,7 @@ Hist->MaxEntries = MaxEntries; Hist->Entries = memcpy(NewEntryList, Hist->Entries, Hist->NumEntries * sizeof(UNICODE_STRING)); - RtlFreeHeap(ConSrvHeap, 0, OldEntryList); + ConsoleFreeHeap(OldEntryList); } } ConSrvReleaseConsole(Console, TRUE); Modified: trunk/reactos/win32ss/user/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/settin… ============================================================================== --- trunk/reactos/win32ss/user/consrv/settings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/settings.c [iso-8859-1] Sun May 12 00:20:15 2013 @@ -74,20 +74,20 @@ hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | READ_CONTROL, FALSE, ProcessId); if (!hProcess) { - DPRINT("Error: OpenProcess failed(0x%x)\n", GetLastError()); + DPRINT1("Error: OpenProcess failed(0x%x)\n", GetLastError()); return FALSE; } if (!OpenProcessToken(hProcess, TOKEN_QUERY, &hProcessToken)) { - DPRINT("Error: OpenProcessToken failed(0x%x)\n", GetLastError()); + DPRINT1("Error: OpenProcessToken failed(0x%x)\n", GetLastError()); CloseHandle(hProcess); return FALSE; } if (!GetTokenInformation(hProcessToken, TokenUser, (PVOID)Buffer, sizeof(Buffer), &Length)) { - DPRINT("Error: GetTokenInformation failed(0x%x)\n",GetLastError()); + DPRINT1("Error: GetTokenInformation failed(0x%x)\n",GetLastError()); CloseHandle(hProcessToken); CloseHandle(hProcess); return FALSE; @@ -96,12 +96,15 @@ TokUser = ((PTOKEN_USER)Buffer)->User.Sid; if (!NT_SUCCESS(RtlConvertSidToUnicodeString(&SidName, TokUser, TRUE))) { - DPRINT("Error: RtlConvertSidToUnicodeString failed(0x%x)\n", GetLastError()); + DPRINT1("Error: RtlConvertSidToUnicodeString failed(0x%x)\n", GetLastError()); CloseHandle(hProcessToken); CloseHandle(hProcess); return FALSE; } + /* + * Might fail for LiveCD... Why ? Because only HKU\.DEFAULT exists. + */ bRet = (RegOpenKeyExW(HKEY_USERS, SidName.Buffer, 0,

11 years, 7 months

← Newer
1
...
10
11
12
13
14
15
16
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2013