Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 54792: [USB-BRINGUP] - Partly implement IRP_MN_START_DEVICE for PDO - PDO now completely initializes - Remaining IOCTL to implement IRP_MJ_CREATE, IRP_MJ_CLOSE, IRP_MJ_FLUSH, IRP_MJ_RE...
by janderwald＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: janderwald Date: Sat Dec 31 04:13:37 2011 New Revision: 54792 URL: http://svn.reactos.org/svn/reactos?rev=54792&view=rev Log: [USB-BRINGUP] - Partly implement IRP_MN_START_DEVICE for PDO - PDO now completely initializes - Remaining IOCTL to implement IRP_MJ_CREATE, IRP_MJ_CLOSE, IRP_MJ_FLUSH, IRP_MJ_READ for partial mouse support in hidclass Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c branches/usb-bringup/drivers/hid/hidclass/pdo.c branches/usb-bringup/drivers/hid/hidclass/precomp.h Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sat Dec 31 04:13:37 2011 @@ -128,6 +128,8 @@ { UNIMPLEMENTED ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } @@ -139,6 +141,8 @@ { UNIMPLEMENTED ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } @@ -150,6 +154,8 @@ { UNIMPLEMENTED ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } @@ -161,6 +167,8 @@ { UNIMPLEMENTED ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } Modified: branches/usb-bringup/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] Sat Dec 31 04:13:37 2011 @@ -422,13 +422,27 @@ } case IRP_MN_START_DEVICE: { - DPRINT1("[HIDCLASS] PDO PnP not implemented %x\n", IoStack->MinorFunction); - ASSERT(FALSE); - - // - // do nothing - // - Status = Irp->IoStatus.Status; + // + // FIXME: support polled devices + // + ASSERT(PDODeviceExtension->Common.DriverExtension->DevicesArePolled == FALSE); + + // + // now register the device interface + // + Status = IoRegisterDeviceInterface(PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject, &GUID_DEVINTERFACE_HID, NULL, &PDODeviceExtension->DeviceInterface); + if (NT_SUCCESS(Status)) + { + // + // enable device interface + // + Status = IoSetDeviceInterfaceState(&PDODeviceExtension->DeviceInterface, TRUE); + } + ASSERT(Status == STATUS_SUCCESS); + + // + // break + // break; } case IRP_MN_REMOVE_DEVICE: @@ -528,7 +542,7 @@ // PDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension = FDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension; PDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject; - PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = NULL; + PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject; PDODeviceExtension->Common.IsFDO = FALSE; PDODeviceExtension->Common.DriverExtension = FDODeviceExtension->Common.DriverExtension; RtlCopyMemory(&PDODeviceExtension->Attributes, &FDODeviceExtension->Attributes, sizeof(HID_DEVICE_ATTRIBUTES)); Modified: branches/usb-bringup/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] Sat Dec 31 04:13:37 2011 @@ -2,10 +2,10 @@ #define _HIDPI_NO_FUNCTION_MACROS_ #include <ntddk.h> +#include <initguid.h> #include <hidport.h> #include <hidpddi.h> #include <stdio.h> -#include <initguid.h> #include <wdmguid.h> #include <debug.h> @@ -108,6 +108,10 @@ // ULONG CollectionIndex; + // + // device interface + // + UNICODE_STRING DeviceInterface; }HIDCLASS_PDO_DEVICE_EXTENSION, *PHIDCLASS_PDO_DEVICE_EXTENSION;

1 0

[janderwald] 54791: [USB-BRINGUP] - Implement HidClassFDO_DeviceRelations - Implement IOCTL_HID_GET_COLLECTION_INFORMATION, IOCTL_HID_GET_COLLECTION_DESCRIPTOR - Implement IRP_MN_QUERY_ID, IRP_MN_Q...
by janderwald＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: janderwald Date: Sat Dec 31 03:33:14 2011 New Revision: 54791 URL: http://svn.reactos.org/svn/reactos?rev=54791&view=rev Log: [USB-BRINGUP] - Implement HidClassFDO_DeviceRelations - Implement IOCTL_HID_GET_COLLECTION_INFORMATION, IOCTL_HID_GET_COLLECTION_DESCRIPTOR - Implement IRP_MN_QUERY_ID, IRP_MN_QUERY_CAPABILITIES, IRP_MN_QUERY_BUS_INFORMATION, IRP_MN_QUERY_PNP_STATE, IRP_MN_QUERY_DEVICE_RELATIONS, - HIDClass PDO is now created and starts initialization, needs IRP_MN_START_DEVICE request implementation - Tested in Vbox 4.1.4 + WinXP + ReactOS hidusb,hidmou,hidclass Added: branches/usb-bringup/drivers/hid/hidclass/pdo.c (with props) Modified: branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt branches/usb-bringup/drivers/hid/hidclass/fdo.c branches/usb-bringup/drivers/hid/hidclass/hidclass.c branches/usb-bringup/drivers/hid/hidclass/precomp.h Modified: branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Sat Dec 31 03:33:14 2011 @@ -5,6 +5,7 @@ fdo.c hidclass.c hidclass.rc + pdo.c ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def) add_library(hidclass SHARED ${SOURCE}) Modified: branches/usb-bringup/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/fdo.c [iso-8859-1] Sat Dec 31 03:33:14 2011 @@ -145,7 +145,7 @@ IN PIRP Irp) { KEVENT Event; - PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; NTSTATUS Status; PIO_STACK_LOCATION IoStack; @@ -157,8 +157,7 @@ // // get device extension // - FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; - ASSERT(FDODeviceExtension->Common.IsFDO); + CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; // // set completion routine @@ -187,7 +186,7 @@ // call driver // DPRINT1("IoStack MajorFunction %x MinorFunction %x\n", IoStack->MajorFunction, IoStack->MinorFunction); - Status = FDODeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); + Status = CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); // // wait for the request to finish @@ -393,13 +392,132 @@ } NTSTATUS +HidClassFDO_CopyDeviceRelations( + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_RELATIONS *OutRelations) +{ + PDEVICE_RELATIONS DeviceRelations; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + ULONG Index; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // allocate result + // + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS) + (FDODeviceExtension->DeviceRelations.Count-1) * sizeof(PDEVICE_OBJECT)); + if (!DeviceRelations) + { + // + // no memory + // + *OutRelations = NULL; + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // copy device objects + // + for(Index = 0; Index < FDODeviceExtension->DeviceRelations.Count; Index++) + { + // + // reference pdo + // + ObReferenceObject(FDODeviceExtension->DeviceRelations.Objects[Index]); + + // + // store object + // + DeviceRelations->Objects[Index] = FDODeviceExtension->DeviceRelations.Objects[Index]; + } + + // + // set object count + // + DeviceRelations->Count = FDODeviceExtension->DeviceRelations.Count; + + + // + // store result + // + *OutRelations = DeviceRelations; + return STATUS_SUCCESS; +} + +NTSTATUS HidClassFDO_DeviceRelations( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + PDEVICE_RELATIONS DeviceRelations; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // check relations type + // + if (IoStack->Parameters.QueryDeviceRelations.Type != BusRelations) + { + // + // only bus relations are handled + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); + } + + if (FDODeviceExtension->DeviceRelations.Count == 0) + { + // + // time to create the pdos + // + Status = HidClassPDO_CreatePDO(DeviceObject); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + DPRINT1("[HIDCLASS] HidClassPDO_CreatePDO failed with %x\n", Status); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + // + // sanity check + // + ASSERT(FDODeviceExtension->DeviceRelations.Count > 0); + } + + // + // now copy device relations + // + Status = HidClassFDO_CopyDeviceRelations(DeviceObject, &DeviceRelations); + // + // store result + // + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + // + // complete request + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } NTSTATUS Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sat Dec 31 03:33:14 2011 @@ -83,7 +83,7 @@ FDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension = (PVOID)((ULONG_PTR)FDODeviceExtension + sizeof(HIDCLASS_FDO_EXTENSION)); FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject = IoAttachDeviceToDeviceStack(NewDeviceObject, PhysicalDeviceObject); FDODeviceExtension->Common.IsFDO = TRUE; - FDODeviceExtension->DriverExtension = DriverExtension; + FDODeviceExtension->Common.DriverExtension = DriverExtension; /* sanity check */ ASSERT(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject); @@ -170,9 +170,105 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; + PHID_COLLECTION_INFORMATION CollectionInformation; + PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + + // + // get device extension + // + CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(CommonDeviceExtension->IsFDO == FALSE); + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)CommonDeviceExtension; + + // + // get stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + switch(IoStack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_HID_GET_COLLECTION_INFORMATION: + { + // + // check if output buffer is big enough + // + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(HID_COLLECTION_INFORMATION)) + { + // + // invalid buffer size + // + Irp->IoStatus.Status = STATUS_INVALID_BUFFER_SIZE; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_BUFFER_SIZE; + } + + // + // get output buffer + // + CollectionInformation = (PHID_COLLECTION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + ASSERT(CollectionInformation); + + // + // init result buffer + // + CollectionInformation->DescriptorSize = PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength; //FIXME which collection is to be retrieved for composite devices / multi collection devices? + CollectionInformation->Polled = CommonDeviceExtension->DriverExtension->DevicesArePolled; + CollectionInformation->VendorID = PDODeviceExtension->Attributes.VendorID; + CollectionInformation->ProductID = PDODeviceExtension->Attributes.ProductID; + CollectionInformation->VersionNumber = PDODeviceExtension->Attributes.VersionNumber; + + // + // complete request + // + Irp->IoStatus.Information = sizeof(HID_COLLECTION_INFORMATION); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + case IOCTL_HID_GET_COLLECTION_DESCRIPTOR: + { + // + // FIXME: which collection to use for composite / multi collection devices... + // + + // + // check if output buffer is big enough + // + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength) + { + // + // invalid buffer size + // + Irp->IoStatus.Status = STATUS_INVALID_BUFFER_SIZE; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_BUFFER_SIZE; + } + + // + // copy result + // + ASSERT(Irp->UserBuffer); + RtlCopyMemory(Irp->UserBuffer, PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedData, PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength); + + // + // complete request + // + Irp->IoStatus.Information = PDODeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + default: + { + DPRINT1("[HIDCLASS] DeviceControl IoControlCode 0x%x not implemented\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + ASSERT(FALSE); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + } + } } NTSTATUS @@ -212,14 +308,22 @@ CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; // - // FIXME: support PDO - // - ASSERT(CommonDeviceExtension->IsFDO == TRUE); - - // - // handle request - // - return HidClassFDO_PnP(DeviceObject, Irp); + // check type of device object + // + if (CommonDeviceExtension->IsFDO) + { + // + // handle request + // + return HidClassFDO_PnP(DeviceObject, Irp); + } + else + { + // + // handle request + // + return HidClassPDO_PnP(DeviceObject, Irp); + } } NTSTATUS Added: branches/usb-bringup/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/pdo.c (added) +++ branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] Sat Dec 31 03:33:14 2011 @@ -1,0 +1,566 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Human Interface Device Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/hid/hidclass/fdo.c + * PURPOSE: HID Class Driver + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ +#include "precomp.h" + +NTSTATUS +HidClassPDO_HandleQueryDeviceId( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + LPWSTR Buffer; + LPWSTR NewBuffer, Ptr; + ULONG Length; + + // + // copy current stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // call mini-driver + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + + // + // get buffer + // + Buffer = (LPWSTR)Irp->IoStatus.Information; + Length = wcslen(Buffer); + + // + // allocate new buffer + // + NewBuffer = (LPWSTR)ExAllocatePool(NonPagedPool, (Length + 1) * sizeof(WCHAR)); + if (!NewBuffer) + { + // + // failed to allocate buffer + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // replace bus + // + wcscpy(NewBuffer, L"HID\\"); + + // + // get offset to first '\\' + // + Ptr = wcschr(Buffer, L'\\'); + if (Ptr) + { + // + // append result + // + wcscat(NewBuffer, Ptr + 1); + } + + // + // free old buffer + // + ExFreePool(Buffer); + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)NewBuffer; + return STATUS_SUCCESS; +} + +NTSTATUS +HidClassPDO_HandleQueryHardwareId( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + WCHAR Buffer[100]; + ULONG Offset = 0; + LPWSTR Ptr; + + // + // get device extension + // + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // copy current stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // call mini-driver + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + + // + // store hardware ids + // + Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Attributes.VendorID, PDODeviceExtension->Attributes.ProductID, PDODeviceExtension->Attributes.VersionNumber) + 1; + Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x", PDODeviceExtension->Attributes.VendorID, PDODeviceExtension->Attributes.ProductID) + 1; + + if (PDODeviceExtension->DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].UsagePage == HID_USAGE_PAGE_GENERIC) + { + switch(PDODeviceExtension->DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].Usage) + { + case HID_USAGE_GENERIC_POINTER: + case HID_USAGE_GENERIC_MOUSE: + // + // Pointer / Mouse + // + Offset += swprintf(&Buffer[Offset], L"HID_DEVICE_SYSTEM_MOUSE") + 1; + break; + case HID_USAGE_GENERIC_GAMEPAD: + case HID_USAGE_GENERIC_JOYSTICK: + // + // Joystick / Gamepad + // + Offset += swprintf(&Buffer[Offset], L"HID_DEVICE_SYSTEM_GAME") + 1; + break; + case HID_USAGE_GENERIC_KEYBOARD: + case HID_USAGE_GENERIC_KEYPAD: + // + // Keyboard / Keypad + // + Offset += swprintf(&Buffer[Offset], L"HID_DEVICE_SYSTEM_KEYBOARD") + 1; + break; + case HID_USAGE_GENERIC_SYSTEM_CTL: + // + // System Control + // + Offset += swprintf(&Buffer[Offset], L"HID_DEVICE_SYSTEM_CONTROL") + 1; + break; + } + } + else if (PDODeviceExtension->DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].UsagePage == HID_USAGE_PAGE_CONSUMER && PDODeviceExtension->DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].Usage == HID_USAGE_CONSUMERCTRL) + { + // + // Consumer Audio Control + // + Offset += swprintf(&Buffer[Offset], L"HID_DEVICE_SYSTEM_CONSUMER") + 1; + } + + // + // FIXME: add 'HID_DEVICE_UP:0001_U:0002' + // + + // + // add HID + // + Offset +=swprintf(&Buffer[Offset], L"HID_DEVICE") + 1; + + // + // free old buffer + // + ExFreePool((PVOID)Irp->IoStatus.Information); + + // + // allocate buffer + // + Ptr = (LPWSTR)ExAllocatePool(NonPagedPool, (Offset +1)* sizeof(WCHAR)); + if (!Ptr) + { + // + // no memory + // + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // copy buffer + // + RtlCopyMemory(Ptr, Buffer, Offset * sizeof(WCHAR)); + Ptr[Offset] = UNICODE_NULL; + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)Ptr; + return STATUS_SUCCESS; +} + +NTSTATUS +HidClassPDO_HandleQueryInstanceId( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + + // + // copy current stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // call mini-driver + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + DPRINT1("HidClassPDO_HandleQueryInstanceId Buffer %S\n", Irp->IoStatus.Information); + // + //TODO implement instance id + // example: + // HID\VID_045E&PID_0047\8&1A0700BC&0&0000 + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +HidClassPDO_HandleQueryCompatibleId( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + + // + // copy current stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // call mini-driver + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + + // + // FIXME: implement me + // + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +HidClassPDO_PnP( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + PPNP_BUS_INFORMATION BusInformation; + PDEVICE_RELATIONS DeviceRelation; + + // + // get device extension + // + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // handle request + // + 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; + } + case IRP_MN_QUERY_CAPABILITIES: + { + if (IoStack->Parameters.DeviceCapabilities.Capabilities == NULL) + { + // + // invalid request + // + Status = STATUS_DEVICE_CONFIGURATION_ERROR; + } + + // + // copy capabilities + // + RtlCopyMemory(IoStack->Parameters.DeviceCapabilities.Capabilities, &PDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_QUERY_BUS_INFORMATION: + { + // + // + // + BusInformation = (PPNP_BUS_INFORMATION)ExAllocatePool(NonPagedPool, sizeof(PNP_BUS_INFORMATION)); + + // + // fill in result + // + RtlCopyMemory(&BusInformation->BusTypeGuid, &GUID_BUS_TYPE_HID, sizeof(GUID)); + BusInformation->LegacyBusType = PNPBus; + BusInformation->BusNumber = 0; //FIXME + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)BusInformation; + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_QUERY_PNP_DEVICE_STATE: + { + // + // FIXME set flags when driver fails / disabled + // + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + // + // only target relations are supported + // + if (IoStack->Parameters.QueryDeviceRelations.Type != TargetDeviceRelation) + { + // + // not supported + // + Status = Irp->IoStatus.Status; + break; + } + + // + // allocate device relations + // + DeviceRelation = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS)); + if (!DeviceRelation) + { + // + // no memory + // + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + // + // init device relation + // + DeviceRelation->Count = 1; + DeviceRelation->Objects[0] = DeviceObject; + ObReferenceObject(DeviceRelation->Objects[0]); + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelation; + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_START_DEVICE: + { + DPRINT1("[HIDCLASS] PDO PnP not implemented %x\n", IoStack->MinorFunction); + ASSERT(FALSE); + + // + // do nothing + // + Status = Irp->IoStatus.Status; + break; + } + case IRP_MN_REMOVE_DEVICE: + { + DPRINT1("[HIDCLASS] PDO IRP_MN_REMOVE_DEVICE not implemented\n"); + ASSERT(FALSE); + + // + // do nothing + // + Status = Irp->IoStatus.Status; + break; + } + case IRP_MN_QUERY_INTERFACE: + { + DPRINT1("[HIDCLASS] PDO IRP_MN_QUERY_INTERFACE not implemented\n"); + ASSERT(FALSE); + + // + // do nothing + // + Status = Irp->IoStatus.Status; + break; + } + default: + { + // + // do nothing + // + Status = Irp->IoStatus.Status; + break; + } + } + + // + // complete request + // + if (Status != STATUS_PENDING) + { + // + // store result + // + Irp->IoStatus.Status = Status; + + // + // complete request + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + // + // done processing + // + return Status; +} + +NTSTATUS +HidClassPDO_CreatePDO( + IN PDEVICE_OBJECT DeviceObject) +{ + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + NTSTATUS Status; + PDEVICE_OBJECT PDODeviceObject; + PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // 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); + if (!NT_SUCCESS(Status)) + { + // + // failed to create device + // + DPRINT1("[HIDCLASS] Failed to create device %x\n", Status); + return Status; + } + + // + // patch stack size + // + PDODeviceObject->StackSize = DeviceObject->StackSize + 1; + + // + // get device extension + // + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; + + // + // init device extension + // + PDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension = FDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension; + PDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject; + PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = NULL; + PDODeviceExtension->Common.IsFDO = FALSE; + PDODeviceExtension->Common.DriverExtension = FDODeviceExtension->Common.DriverExtension; + RtlCopyMemory(&PDODeviceExtension->Attributes, &FDODeviceExtension->Attributes, sizeof(HID_DEVICE_ATTRIBUTES)); + RtlCopyMemory(&PDODeviceExtension->DeviceDescription, &FDODeviceExtension->DeviceDescription, sizeof(HIDP_DEVICE_DESC)); + RtlCopyMemory(&PDODeviceExtension->Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); + + // + // FIXME: support composite devices + // + PDODeviceExtension->CollectionIndex = 0; + ASSERT(PDODeviceExtension->DeviceDescription.CollectionDescLength == 1); + + // + // store in device relations struct + // + FDODeviceExtension->DeviceRelations.Count = 1; + FDODeviceExtension->DeviceRelations.Objects[0] = PDODeviceObject; + + // + // set device flags + // + PDODeviceObject->Flags |= DO_MAP_IO_BUFFER; + + // + // device is initialized + // + PDODeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + ObReferenceObject(PDODeviceObject); + + // + // done + // + return STATUS_SUCCESS; +} Propchange: branches/usb-bringup/drivers/hid/hidclass/pdo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] Sat Dec 31 03:33:14 2011 @@ -4,7 +4,11 @@ #include <ntddk.h> #include <hidport.h> #include <hidpddi.h> +#include <stdio.h> +#include <initguid.h> +#include <wdmguid.h> #include <debug.h> + typedef struct @@ -21,11 +25,22 @@ typedef struct { + // + // hid device extension + // HID_DEVICE_EXTENSION HidDeviceExtension; + + // + // if it is a pdo + // BOOLEAN IsFDO; + + // + // driver extension + // + PHIDCLASS_DRIVER_EXTENSION DriverExtension; + }HIDCLASS_COMMON_DEVICE_EXTENSION, *PHIDCLASS_COMMON_DEVICE_EXTENSION; - - typedef struct { @@ -33,11 +48,6 @@ // parts shared by fdo and pdo // HIDCLASS_COMMON_DEVICE_EXTENSION Common; - - // - // driver extension - // - PHIDCLASS_DRIVER_EXTENSION DriverExtension; // // device capabilities @@ -64,7 +74,41 @@ // HIDP_DEVICE_DESC DeviceDescription; + // + // device relations + // + DEVICE_RELATIONS DeviceRelations; + }HIDCLASS_FDO_EXTENSION, *PHIDCLASS_FDO_EXTENSION; + +typedef struct +{ + // + // parts shared by fdo and pdo + // + HIDCLASS_COMMON_DEVICE_EXTENSION Common; + + // + // device descriptor + // + HID_DEVICE_ATTRIBUTES Attributes; + + // + // device capabilities + // + DEVICE_CAPABILITIES Capabilities; + + // + // device description + // + HIDP_DEVICE_DESC DeviceDescription; + + // + // collection index + // + ULONG CollectionIndex; + +}HIDCLASS_PDO_DEVICE_EXTENSION, *PHIDCLASS_PDO_DEVICE_EXTENSION; /* fdo.c */ @@ -73,3 +117,20 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS +HidClassFDO_DispatchRequestSynchronous( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +/* pdo.c */ +NTSTATUS +HidClassPDO_CreatePDO( + IN PDEVICE_OBJECT DeviceObject); + +NTSTATUS +HidClassPDO_PnP( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + +/* eof */

1 0

[janderwald] 54790: [USB-BRINGUP] - add missing defines
by janderwald＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: janderwald Date: Sat Dec 31 03:21:11 2011 New Revision: 54790 URL: http://svn.reactos.org/svn/reactos?rev=54790&view=rev Log: [USB-BRINGUP] - add missing defines Modified: branches/usb-bringup/include/psdk/hidusage.h Modified: branches/usb-bringup/include/psdk/hidusage.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/include/psdk/hidusa… ============================================================================== --- branches/usb-bringup/include/psdk/hidusage.h [iso-8859-1] (original) +++ branches/usb-bringup/include/psdk/hidusage.h [iso-8859-1] Sat Dec 31 03:21:11 2011 @@ -199,6 +199,14 @@ #define HID_USAGE_SIMULATION_RUDDER ((USAGE) 0xBA) #define HID_USAGE_SIMULATION_THROTTLE ((USAGE) 0xBB) + +#define HID_USAGE_CONSUMERCTRL ((USAGE)0x01) +#define HID_USAGE_DIGITIZER_PEN ((USAGE)0x02) +#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE)0x32) +#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE)0x42) +#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE)0x44) + + #ifdef __cplusplus } #endif

1 0

[pschweitzer] 54789: [KERNEL32] CreateDirectory: handle the case when the FS doesn't support EAs. This should fix VBox and is mandatory if we want to support MS FSD with FAT32
by pschweitzer＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: pschweitzer Date: Sat Dec 31 02:01:34 2011 New Revision: 54789 URL: http://svn.reactos.org/svn/reactos?rev=54789&view=rev Log: [KERNEL32] CreateDirectory: handle the case when the FS doesn't support EAs. This should fix VBox and is mandatory if we want to support MS FSD with FAT32 Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] Sat Dec 31 02:01:34 2011 @@ -342,6 +342,12 @@ } else { + if (Status == STATUS_EAS_NOT_SUPPORTED) + { + /* Extended attributes are not supported, so, this is OK */ + /* FIXME: Would deserve a deeper look, comparing with Windows */ + Status = STATUS_SUCCESS; + } /* failure or no extended attributes present, break the loop */ break; }

1 0

[pschweitzer] 54788: [FASTFAT] Return appropriate status when requesting extended attributes on FAT32
by pschweitzer＠svn.reactos.org 31 Dec '11

31 Dec '11

Author: pschweitzer Date: Sat Dec 31 00:09:57 2011 New Revision: 54788 URL: http://svn.reactos.org/svn/reactos?rev=54788&view=rev Log: [FASTFAT] Return appropriate status when requesting extended attributes on FAT32 Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Sat Dec 31 00:09:57 2011 @@ -517,8 +517,9 @@ { /* FIXME */ DPRINT1("VFAT: FileEaInformation not implemented!\n"); - } - return STATUS_SUCCESS; + return STATUS_SUCCESS; + } + return STATUS_EAS_NOT_SUPPORTED; }

1 0

[janderwald] 54787: [USB-BRINGUP] - Rename device extension - Implement FDO Initialization (IRP_MN_START_DEVICE)
by janderwald＠svn.reactos.org 30 Dec '11

30 Dec '11

Author: janderwald Date: Fri Dec 30 14:34:07 2011 New Revision: 54787 URL: http://svn.reactos.org/svn/reactos?rev=54787&view=rev Log: [USB-BRINGUP] - Rename device extension - Implement FDO Initialization (IRP_MN_START_DEVICE) Added: branches/usb-bringup/drivers/hid/hidclass/fdo.c (with props) Modified: branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt branches/usb-bringup/drivers/hid/hidclass/hidclass.c branches/usb-bringup/drivers/hid/hidclass/precomp.h Modified: branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Fri Dec 30 14:34:07 2011 @@ -2,6 +2,7 @@ spec2def(hidclass.sys hidclass.spec) list(APPEND SOURCE + fdo.c hidclass.c hidclass.rc ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def) Added: branches/usb-bringup/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/fdo.c (added) +++ branches/usb-bringup/drivers/hid/hidclass/fdo.c [iso-8859-1] Fri Dec 30 14:34:07 2011 @@ -1,0 +1,472 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Human Interface Device Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/hid/hidclass/fdo.c + * PURPOSE: HID Class Driver + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ +#include "precomp.h" + +NTSTATUS +NTAPI +HidClassFDO_QueryCapabilitiesCompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + // + // set event + // + KeSetEvent((PRKEVENT)Context, 0, FALSE); + + // + // completion is done in the HidClassFDO_QueryCapabilities routine + // + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +HidClassFDO_QueryCapabilities( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PDEVICE_CAPABILITIES Capabilities) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // init event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // now allocte the irp + // + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // get next stack location + // + IoStack = IoGetNextIrpStackLocation(Irp); + + // + // init stack location + // + IoStack->MajorFunction = IRP_MJ_PNP; + IoStack->MinorFunction = IRP_MN_QUERY_CAPABILITIES; + IoStack->Parameters.DeviceCapabilities.Capabilities = Capabilities; + + // + // set completion routine + // + IoSetCompletionRoutine(Irp, HidClassFDO_QueryCapabilitiesCompletionRoutine, (PVOID)&Event, TRUE, TRUE, TRUE); + + // + // init capabilities + // + RtlZeroMemory(Capabilities, sizeof(DEVICE_CAPABILITIES)); + Capabilities->Size = sizeof(DEVICE_CAPABILITIES); + Capabilities->Version = 1; // FIXME hardcoded constant + Capabilities->Address = MAXULONG; + Capabilities->UINumber = MAXULONG; + + // + // pnp irps have default completion code + // + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + + // + // call lower device + // + Status = IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + // + // wait for completion + // + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + // + // get status + // + Status = Irp->IoStatus.Status; + + // + // complete request + // + IoFreeIrp(Irp); + + // + // done + // + return Status; +} + +NTSTATUS +NTAPI +HidClassFDO_DispatchRequestSynchronousCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + // + // signal event + // + KeSetEvent((PRKEVENT)Context, 0, FALSE); + + // + // done + // + return STATUS_MORE_PROCESSING_REQUIRED; +} + + +NTSTATUS +HidClassFDO_DispatchRequestSynchronous( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + KEVENT Event; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + + // + // init event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // set completion routine + // + IoSetCompletionRoutine(Irp, HidClassFDO_DispatchRequestSynchronousCompletion, &Event, TRUE, TRUE, TRUE); + + ASSERT(Irp->CurrentLocation > 0); + // + // create stack location + // + IoSetNextIrpStackLocation(Irp); + + // + // get next stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // store device object + // + IoStack->DeviceObject = DeviceObject; + + + + // + // call driver + // + DPRINT1("IoStack MajorFunction %x MinorFunction %x\n", IoStack->MajorFunction, IoStack->MinorFunction); + Status = FDODeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); + + // + // wait for the request to finish + // + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + // + // update status + // + Status = Irp->IoStatus.Status; + } + + // + // done + // + return Status; +} + +NTSTATUS +HidClassFDO_GetDescriptors( + IN PDEVICE_OBJECT DeviceObject) +{ + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + PIRP Irp; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // lets allocate irp + // + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // get stack location + // + IoStack = IoGetNextIrpStackLocation(Irp); + + // + // init stack location + // + IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_HID_GET_DEVICE_DESCRIPTOR; + IoStack->Parameters.DeviceIoControl.OutputBufferLength = sizeof(HID_DESCRIPTOR); + IoStack->Parameters.DeviceIoControl.InputBufferLength = 0; + IoStack->Parameters.DeviceIoControl.Type3InputBuffer = NULL; + Irp->UserBuffer = &FDODeviceExtension->HidDescriptor; + + // + // send request + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed to get device descriptor + // + DPRINT1("[HIDCLASS] IOCTL_HID_GET_DEVICE_DESCRIPTOR failed with %x\n", Status); + IoFreeIrp(Irp); + return Status; + } + + // + // lets get device attributes + // + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_HID_GET_DEVICE_ATTRIBUTES; + IoStack->Parameters.DeviceIoControl.OutputBufferLength = sizeof(HID_DEVICE_ATTRIBUTES); + Irp->UserBuffer = &FDODeviceExtension->Attributes; + + // + // send request + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed to get device descriptor + // + DPRINT1("[HIDCLASS] IOCTL_HID_GET_DEVICE_ATTRIBUTES failed with %x\n", Status); + IoFreeIrp(Irp); + return Status; + } + + // + // sanity checks + // + ASSERT(FDODeviceExtension->HidDescriptor.bLength == sizeof(HID_DESCRIPTOR)); + ASSERT(FDODeviceExtension->HidDescriptor.bNumDescriptors > 0); + ASSERT(FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength > 0); + ASSERT(FDODeviceExtension->HidDescriptor.DescriptorList[0].bReportType == HID_REPORT_DESCRIPTOR_TYPE); + + + // + // now allocate space for the report descriptor + // + FDODeviceExtension->ReportDescriptor = (PUCHAR)ExAllocatePool(NonPagedPool, FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength); + if (!FDODeviceExtension->ReportDescriptor) + { + // + // not enough memory + // + IoFreeIrp(Irp); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // init stack location + // + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_HID_GET_REPORT_DESCRIPTOR; + IoStack->Parameters.DeviceIoControl.OutputBufferLength = FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength; + Irp->UserBuffer = FDODeviceExtension->ReportDescriptor; + + // + // send request + // + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed to get device descriptor + // + DPRINT1("[HIDCLASS] IOCTL_HID_GET_REPORT_DESCRIPTOR failed with %x\n", Status); + IoFreeIrp(Irp); + return Status; + } + + // + // completed successfully + // + return STATUS_SUCCESS; +} + + +NTSTATUS +HidClassFDO_StartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // query capabilities + // + Status = HidClassFDO_QueryCapabilities(DeviceObject, &FDODeviceExtension->Capabilities); + ASSERT(Status == STATUS_SUCCESS); + + // + // lets start the lower device too + // + IoCopyCurrentIrpStackLocationToNext(Irp); + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + ASSERT(Status == STATUS_SUCCESS); + + // + // lets get the descriptors + // + Status = HidClassFDO_GetDescriptors(DeviceObject); + ASSERT(Status == STATUS_SUCCESS); + + // + // now get the the collection description + // + Status = HidP_GetCollectionDescription(FDODeviceExtension->ReportDescriptor, FDODeviceExtension->HidDescriptor.DescriptorList[0].wReportLength, NonPagedPool, &FDODeviceExtension->DeviceDescription); + ASSERT(Status == STATUS_SUCCESS); + + // + // complete request + // + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +HidClassFDO_RemoveDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +HidClassFDO_DeviceRelations( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +HidClassFDO_PnP( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + switch(IoStack->MinorFunction) + { + case IRP_MN_START_DEVICE: + { + return HidClassFDO_StartDevice(DeviceObject, Irp); + } + case IRP_MN_REMOVE_DEVICE: + { + return HidClassFDO_RemoveDevice(DeviceObject, Irp); + } + case IRP_MN_QUERY_STOP_DEVICE: + { + // + // set status to succes + // + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // forward to lower device + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); + } + case IRP_MN_CANCEL_STOP_DEVICE: + { + // + // set status to succes + // + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // forward to lower device + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); + } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + return HidClassFDO_DeviceRelations(DeviceObject, Irp); + } + default: + { + // + // dispatch to lower device + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); + } + } +} Propchange: branches/usb-bringup/drivers/hid/hidclass/fdo.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] Fri Dec 30 14:34:07 2011 @@ -37,7 +37,7 @@ NTSTATUS Status; UNICODE_STRING DeviceName; PDEVICE_OBJECT NewDeviceObject; - PHIDCLASS_DEVICE_EXTENSION DeviceExtension; + PHIDCLASS_FDO_EXTENSION FDODeviceExtension; ULONG DeviceExtensionSize; PHIDCLASS_DRIVER_EXTENSION DriverExtension; @@ -61,7 +61,7 @@ } /* calculate device extension size */ - DeviceExtensionSize = sizeof(HIDCLASS_DEVICE_EXTENSION) + DriverExtension->DeviceExtensionSize; + DeviceExtensionSize = sizeof(HIDCLASS_FDO_EXTENSION) + DriverExtension->DeviceExtensionSize; /* now create the device */ Status = IoCreateDevice(DriverObject, DeviceExtensionSize, &DeviceName, FILE_DEVICE_UNKNOWN, 0, FALSE, &NewDeviceObject); @@ -73,20 +73,20 @@ } /* get device extension */ - DeviceExtension = (PHIDCLASS_DEVICE_EXTENSION)NewDeviceObject->DeviceExtension; + FDODeviceExtension = (PHIDCLASS_FDO_EXTENSION)NewDeviceObject->DeviceExtension; /* zero device extension */ - RtlZeroMemory(DeviceExtension, sizeof(HIDCLASS_DEVICE_EXTENSION)); + RtlZeroMemory(FDODeviceExtension, sizeof(HIDCLASS_FDO_EXTENSION)); /* initialize device extension */ - DeviceExtension->HidDeviceExtension.PhysicalDeviceObject = PhysicalDeviceObject; - DeviceExtension->HidDeviceExtension.MiniDeviceExtension = (PVOID)((ULONG_PTR)DeviceExtension + sizeof(HIDCLASS_DEVICE_EXTENSION)); - DeviceExtension->HidDeviceExtension.NextDeviceObject = IoAttachDeviceToDeviceStack(NewDeviceObject, PhysicalDeviceObject); - DeviceExtension->IsFDO = TRUE; - DeviceExtension->DriverExtension = DriverExtension; + FDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = PhysicalDeviceObject; + FDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension = (PVOID)((ULONG_PTR)FDODeviceExtension + sizeof(HIDCLASS_FDO_EXTENSION)); + FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject = IoAttachDeviceToDeviceStack(NewDeviceObject, PhysicalDeviceObject); + FDODeviceExtension->Common.IsFDO = TRUE; + FDODeviceExtension->DriverExtension = DriverExtension; /* sanity check */ - ASSERT(DeviceExtension->HidDeviceExtension.NextDeviceObject); + ASSERT(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject); /* increment stack size */ NewDeviceObject->StackSize++; @@ -102,7 +102,7 @@ { /* failed */ DPRINT1("HIDCLASS: AddDevice failed with %x\n", Status); - IoDetachDevice(DeviceExtension->HidDeviceExtension.NextDeviceObject); + IoDetachDevice(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject); IoDeleteDevice(NewDeviceObject); return Status; } @@ -122,13 +122,174 @@ NTSTATUS NTAPI +HidClass_Create( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClass_Close( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClass_Read( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClass_Write( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClass_DeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClass_InternalDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +NTAPI +HidClass_Power( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidClass_PnP( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; + + // + // get common device extension + // + CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // FIXME: support PDO + // + ASSERT(CommonDeviceExtension->IsFDO == TRUE); + + // + // handle request + // + return HidClassFDO_PnP(DeviceObject, Irp); +} + +NTSTATUS +NTAPI +HidClass_DispatchDefault( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; + + // + // get common device extension + // + CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // FIXME: support PDO + // + ASSERT(CommonDeviceExtension->IsFDO == TRUE); + + // + // skip current irp stack location + // + IoSkipCurrentIrpStackLocation(Irp); + + // + // dispatch to lower device object + // + return IoCallDriver(CommonDeviceExtension->HidDeviceExtension.NextDeviceObject, Irp); +} + + +NTSTATUS +NTAPI HidClassDispatch( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("[HIDCLASS] Dispatch Major %x Minor %x\n", IoStack->MajorFunction, IoStack->MinorFunction); + + // + // dispatch request based on major function + // + switch(IoStack->MajorFunction) + { + case IRP_MJ_CREATE: + return HidClass_Create(DeviceObject, Irp); + case IRP_MJ_CLOSE: + return HidClass_Close(DeviceObject, Irp); + case IRP_MJ_READ: + return HidClass_Read(DeviceObject, Irp); + case IRP_MJ_WRITE: + return HidClass_Write(DeviceObject, Irp); + case IRP_MJ_DEVICE_CONTROL: + return HidClass_DeviceControl(DeviceObject, Irp); + case IRP_MJ_INTERNAL_DEVICE_CONTROL: + return HidClass_InternalDeviceControl(DeviceObject, Irp); + case IRP_MJ_POWER: + return HidClass_Power(DeviceObject, Irp); + case IRP_MJ_PNP: + return HidClass_PnP(DeviceObject, Irp); + default: + return HidClass_DispatchDefault(DeviceObject, Irp); + } } NTSTATUS @@ -167,7 +328,7 @@ DriverExtension->DriverUnload = MinidriverRegistration->DriverObject->DriverUnload; /* copy driver dispatch routines */ - RtlCopyMemory(DriverExtension->MajorFunction, MinidriverRegistration->DriverObject->MajorFunction, sizeof(PDRIVER_DISPATCH) * IRP_MJ_MAXIMUM_FUNCTION); + RtlCopyMemory(DriverExtension->MajorFunction, MinidriverRegistration->DriverObject->MajorFunction, sizeof(PDRIVER_DISPATCH) * (IRP_MJ_MAXIMUM_FUNCTION+1)); /* initialize lock */ KeInitializeSpinLock(&DriverExtension->Lock); Modified: branches/usb-bringup/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] Fri Dec 30 14:34:07 2011 @@ -3,6 +3,7 @@ #define _HIDPI_NO_FUNCTION_MACROS_ #include <ntddk.h> #include <hidport.h> +#include <hidpddi.h> #include <debug.h> @@ -11,7 +12,7 @@ PDRIVER_OBJECT DriverObject; ULONG DeviceExtensionSize; BOOLEAN DevicesArePolled; - PDRIVER_DISPATCH MajorFunction[IRP_MJ_MAXIMUM_FUNCTION]; + PDRIVER_DISPATCH MajorFunction[IRP_MJ_MAXIMUM_FUNCTION + 1]; PDRIVER_ADD_DEVICE AddDevice; PDRIVER_UNLOAD DriverUnload; KSPIN_LOCK Lock; @@ -22,6 +23,53 @@ { HID_DEVICE_EXTENSION HidDeviceExtension; BOOLEAN IsFDO; +}HIDCLASS_COMMON_DEVICE_EXTENSION, *PHIDCLASS_COMMON_DEVICE_EXTENSION; + + + +typedef struct +{ + // + // parts shared by fdo and pdo + // + HIDCLASS_COMMON_DEVICE_EXTENSION Common; + + // + // driver extension + // PHIDCLASS_DRIVER_EXTENSION DriverExtension; -}HIDCLASS_DEVICE_EXTENSION, *PHIDCLASS_DEVICE_EXTENSION; + // + // device capabilities + // + DEVICE_CAPABILITIES Capabilities; + + // + // hid descriptor + // + HID_DESCRIPTOR HidDescriptor; + + // + // hid attributes + // + HID_DEVICE_ATTRIBUTES Attributes; + + // + // report descriptor + // + PUCHAR ReportDescriptor; + + // + // device description + // + HIDP_DEVICE_DESC DeviceDescription; + +}HIDCLASS_FDO_EXTENSION, *PHIDCLASS_FDO_EXTENSION; + + +/* fdo.c */ +NTSTATUS +HidClassFDO_PnP( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); +

1 0

[pschweitzer] 54786: [EVENTVWR] Fix handle leak
by pschweitzer＠svn.reactos.org 30 Dec '11

30 Dec '11

Author: pschweitzer Date: Fri Dec 30 13:31:44 2011 New Revision: 54786 URL: http://svn.reactos.org/svn/reactos?rev=54786&view=rev Log: [EVENTVWR] Fix handle leak Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Fri Dec 30 13:31:44 2011 @@ -555,12 +555,12 @@ /* If we have at least 1000 records show the waiting dialog */ if (dwTotalRecords > 1000) { - CreateThread(NULL, - 0, - ShowStatusMessageThread, - (LPVOID)&hwndDlg, - 0, - NULL); + CloseHandle(CreateThread(NULL, + 0, + ShowStatusMessageThread, + (LPVOID)&hwndDlg, + 0, + NULL)); } while (dwCurrentRecord < dwTotalRecords)

1 0

[jimtabor] 54785: - Fix absolutes.
by jimtabor＠svn.reactos.org 30 Dec '11

30 Dec '11

Author: jimtabor Date: Fri Dec 30 02:52:43 2011 New Revision: 54785 URL: http://svn.reactos.org/svn/reactos?rev=54785&view=rev Log: - Fix absolutes. Modified: trunk/reactos/subsystems/win32/win32k/objects/dcstate.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcstate.c [iso-8859-1] Fri Dec 30 02:52:43 2011 @@ -24,7 +24,7 @@ /* The VisRectRegion field needs to be set to a valid state */ /* Mark some fields as dirty */ - pdcDst->pdcattr->ulDirty_ |= 0x0012001f; // Note: Use if, To is FALSE.... + pdcDst->pdcattr->ulDirty_ |= (DIRTY_FILL|DIRTY_LINE|DIRTY_TEXT|DIRTY_BACKGROUND|DIRTY_CHARSET|DC_ICM_NOT_CALIBRATED|DC_ICM_NOT_SET); // Note: Use if, To is FALSE.... /* Copy DC level */ pdcDst->dclevel.pColorSpace = pdcSrc->dclevel.pColorSpace;

1 0

[jimtabor] 54784: - Add ICM DC Attribute flags.
by jimtabor＠svn.reactos.org 30 Dec '11

30 Dec '11

Author: jimtabor Date: Fri Dec 30 01:28:02 2011 New Revision: 54784 URL: http://svn.reactos.org/svn/reactos?rev=54784&view=rev Log: - Add ICM DC Attribute flags. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Fri Dec 30 01:28:02 2011 @@ -169,6 +169,10 @@ #define DC_DIBSECTION 0x00004000 #define DC_LAST_CLIPRGN_VALID 0x00008000 #define DC_PRIMARY_DISPLAY 0x00010000 +#define DC_ICM_NOT_CALIBRATED 0x00020000 +#define DC_ICM_BRUSH_DIRTY 0x00040000 +#define DC_ICM_PEN_DIRTY 0x00080000 +#define DC_ICM_NOT_SET 0x00100000 #define DC_MODE_DIRTY 0x00200000 #define DC_FONTTEXT_DIRTY 0x00400000

1 0

[cgutman] 54783: [NTOSKRNL] - Fix the fix
by cgutman＠svn.reactos.org 30 Dec '11

30 Dec '11

Author: cgutman Date: Fri Dec 30 00:10:39 2011 New Revision: 54783 URL: http://svn.reactos.org/svn/reactos?rev=54783&view=rev Log: [NTOSKRNL] - Fix the fix Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Fri Dec 30 00:10:39 2011 @@ -529,7 +529,7 @@ * are invalid translations, so the processor won't cache them */ MmUnmapPageTable(Pt); - if (Pte & PA_PRESENT) + if ((Pte & PA_PRESENT) || !(Pte & 0x800)) { KeBugCheck(MEMORY_MANAGEMENT); } @@ -681,7 +681,7 @@ { ULONG Entry; Entry = MmGetPageEntryForProcess(Process, Address); - return !(Entry & PA_PRESENT) && Entry != 0; + return !(Entry & PA_PRESENT) && (Entry & 0x800); } NTSTATUS

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs