Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[cgutman] 55338: [USBHUB] - Send the SCE IRP before resetting the port so we can wait on it for device enumeration

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jan 30 22:19:47 2012 New Revision: 55338 URL: http://svn.reactos.org/svn/reactos?rev=55338&view=rev Log: [USBHUB] - Send the SCE IRP before resetting the port so we can wait on it for device enumeration Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Mon Jan 30 22:19:47 2012 @@ -1446,6 +1446,11 @@ DPRINT1("RootHubInitCallbackFunction Sending the initial SCE Request %x\n", DeviceObject); + // + // Send the first SCE Request + // + QueryStatusChangeEndpoint(DeviceObject); + for (PortId = 1; PortId <= HubDeviceExtension->HubDescriptor.bNumberOfPorts; PortId++) { // @@ -1468,11 +1473,6 @@ } } } - - // - // Send the first SCE Request - // - QueryStatusChangeEndpoint(DeviceObject); } NTSTATUS

12 years, 10 months

[cgutman] 55337: [HAL] - Remove differences between legacy and ACPI HAL initialization

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jan 30 21:47:30 2012 New Revision: 55337 URL: http://svn.reactos.org/svn/reactos?rev=55337&view=rev Log: [HAL] - Remove differences between legacy and ACPI HAL initialization Modified: branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c Modified: branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/hal/halx86/le… ============================================================================== --- branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Mon Jan 30 21:47:30 2012 @@ -50,6 +50,50 @@ /* PRIVATE FUNCTIONS **********************************************************/ +VOID +NTAPI +HalpReportDetectedDevices(IN PDRIVER_OBJECT DriverObject, + IN PVOID Context, + IN ULONG Count) +{ + PFDO_EXTENSION FdoExtension = Context; + PPDO_EXTENSION PdoExtension; + PDEVICE_OBJECT PdoDeviceObject; + NTSTATUS Status; + + /* Create the PDO */ + Status = IoCreateDevice(DriverObject, + sizeof(PDO_EXTENSION), + NULL, + FILE_DEVICE_BUS_EXTENDER, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &PdoDeviceObject); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("HAL: Could not create ACPI device object status=0x%08x\n", Status); + return; + } + + /* Setup the PDO device extension */ + PdoExtension = PdoDeviceObject->DeviceExtension; + PdoExtension->ExtensionType = PdoExtensionType; + PdoExtension->PhysicalDeviceObject = PdoDeviceObject; + PdoExtension->ParentFdoExtension = FdoExtension; + PdoExtension->PdoType = AcpiPdo; + + /* Add the PDO to the head of the list */ + PdoExtension->Next = FdoExtension->ChildPdoList; + FdoExtension->ChildPdoList = PdoExtension; + + /* Initialization is finished */ + PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + /* Invalidate device relations since we added a new device */ + IoSynchronousInvalidateDeviceRelations(FdoExtension->PhysicalDeviceObject, BusRelations); +} + NTSTATUS NTAPI HalpAddDevice(IN PDRIVER_OBJECT DriverObject, @@ -57,9 +101,9 @@ { NTSTATUS Status; PFDO_EXTENSION FdoExtension; - PPDO_EXTENSION PdoExtension; - PDEVICE_OBJECT DeviceObject, PdoDeviceObject, AttachedDevice; + PDEVICE_OBJECT DeviceObject, AttachedDevice; // PDESCRIPTION_HEADER Wdrt; + DPRINT("HAL: PnP Driver ADD!\n"); /* Create the FDO */ @@ -99,47 +143,10 @@ /* Save the attachment */ FdoExtension->AttachedDeviceObject = AttachedDevice; - /* Create the PDO */ - Status = IoCreateDevice(DriverObject, - sizeof(PDO_EXTENSION), - NULL, - FILE_DEVICE_BUS_EXTENDER, - FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &PdoDeviceObject); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - DPRINT1("HAL: Could not create ACPI device object status=0x%08x\n", Status); - return Status; - } - - /* Setup the PDO device extension */ - PdoExtension = PdoDeviceObject->DeviceExtension; - PdoExtension->ExtensionType = PdoExtensionType; - PdoExtension->PhysicalDeviceObject = PdoDeviceObject; - PdoExtension->ParentFdoExtension = FdoExtension; - PdoExtension->PdoType = AcpiPdo; - - /* Add the PDO to the head of the list */ - PdoExtension->Next = FdoExtension->ChildPdoList; - FdoExtension->ChildPdoList = PdoExtension; - - /* Initialization is finished */ - PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - -#if 0 - /* Find the ACPI watchdog table */ - Wdrt = HalAcpiGetTable(0, 'TRDW'); - if (Wdrt) - { - /* FIXME: TODO */ - DPRINT1("You have an ACPI Watchdog. That's great! You should be proud ;-)\n"); - } -#endif - - /* Invalidate device relations since we added a new device */ - IoSynchronousInvalidateDeviceRelations(TargetDevice, BusRelations); + /* Register for reinitialization to report devices later */ + IoRegisterBootDriverReinitialization(DriverObject, + HalpReportDetectedDevices, + FdoExtension); /* Return status */ DPRINT("Device added %lx\n", Status);

12 years, 10 months

[cgutman] 55336: [HIVESYS] - Fix the service entries [HAL] - Synchronously invalidate device relations [NTOSKRNL] - Remove hacks

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jan 30 21:36:51 2012 New Revision: 55336 URL: http://svn.reactos.org/svn/reactos?rev=55336&view=rev Log: [HIVESYS] - Fix the service entries [HAL] - Synchronously invalidate device relations [NTOSKRNL] - Remove hacks Modified: branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf branches/usb-bringup-trunk/hal/halx86/acpi/halpnpdd.c branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon Jan 30 21:36:51 2012 @@ -1453,31 +1453,35 @@ ; USB hub driver HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Group",0x00000000,"Boot Bus" +HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","ImagePath",0x00020000,"system32\drivers\usbhub.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Type",0x00010001,0x00000002 ; EHCI controller driver HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Group",0x00000000,"Boot Bus" +HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","ImagePath",0x00020000,"system32\drivers\usbehci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Type",0x00010001,0x00000002 ; OHCI controller driver HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Group",0x00000000,"Boot Bus" +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ImagePath",0x00020000,"system32\drivers\usbohci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x00000001 ; UHCI controller driver -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Boot Bus" -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Tag",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ImagePath",0x00020000,"system32\drivers\usbuhci.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Boot Bus Extender" +;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Tag",0x00010001,0x00000002 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ImagePath",0x00020000,"system32\drivers\usbuhci.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00010001,0x00000001 ; USB storage driver HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000001 @@ -1485,27 +1489,31 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ImagePath",0x00020000,"system32\drivers\usbstor.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Type",0x00010001,0x00000001 ; USB composite generic parent HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Group",0x00000000,"Boot Bus" +HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","ImagePath",0x00020000,"system32\drivers\usbccgp.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Type",0x00010001,0x00000001 ; ACPI driver HKLM,"SYSTEM\CurrentControlSet\Services\acpi","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Group",0x00000000,"Boot Bus" +HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\acpi","ImagePath",0x00020000,"system32\drivers\acpi.sys" HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Type",0x00010001,0x00000001 ; PCI Bus driver HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus" +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ImagePath",0x00020000,"system32\drivers\pci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C621",0x00030003,04,00,00,00,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950640",0x00030003,04,00,00,00,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80861230",0x00030003,04,00,00,00,00,00,00,00 Modified: branches/usb-bringup-trunk/hal/halx86/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/hal/halx86/ac… ============================================================================== --- branches/usb-bringup-trunk/hal/halx86/acpi/halpnpdd.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/hal/halx86/acpi/halpnpdd.c [iso-8859-1] Mon Jan 30 21:36:51 2012 @@ -57,9 +57,50 @@ IN ULONG Count) { PFDO_EXTENSION FdoExtension = Context; - - /* Invalidate device relations since we added a new device */ - IoInvalidateDeviceRelations(FdoExtension->PhysicalDeviceObject, BusRelations); + PPDO_EXTENSION PdoExtension; + PDEVICE_OBJECT PdoDeviceObject; + PDESCRIPTION_HEADER Wdrt; + NTSTATUS Status; + + /* Create the PDO */ + Status = IoCreateDevice(DriverObject, + sizeof(PDO_EXTENSION), + NULL, + FILE_DEVICE_BUS_EXTENDER, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &PdoDeviceObject); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("HAL: Could not create ACPI device object status=0x%08x\n", Status); + return; + } + + /* Setup the PDO device extension */ + PdoExtension = PdoDeviceObject->DeviceExtension; + PdoExtension->ExtensionType = PdoExtensionType; + PdoExtension->PhysicalDeviceObject = PdoDeviceObject; + PdoExtension->ParentFdoExtension = FdoExtension; + PdoExtension->PdoType = AcpiPdo; + + /* Add the PDO to the head of the list */ + PdoExtension->Next = FdoExtension->ChildPdoList; + FdoExtension->ChildPdoList = PdoExtension; + + /* Initialization is finished */ + PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + /* Find the ACPI watchdog table */ + Wdrt = HalAcpiGetTable(0, 'TRDW'); + if (Wdrt) + { + /* FIXME: TODO */ + DPRINT1("You have an ACPI Watchdog. That's great! You should be proud ;-)\n"); + } + + /* This will synchronously load the ACPI driver (needed because we're critical for boot) */ + IoSynchronousInvalidateDeviceRelations(FdoExtension->PhysicalDeviceObject, BusRelations); } NTSTATUS @@ -69,10 +110,7 @@ { NTSTATUS Status; PFDO_EXTENSION FdoExtension; - PPDO_EXTENSION PdoExtension; PDEVICE_OBJECT DeviceObject, AttachedDevice; - PDEVICE_OBJECT PdoDeviceObject; - PDESCRIPTION_HEADER Wdrt; DPRINT("HAL: PnP Driver ADD!\n"); @@ -112,43 +150,6 @@ /* Save the attachment */ FdoExtension->AttachedDeviceObject = AttachedDevice; - - /* Create the PDO */ - Status = IoCreateDevice(DriverObject, - sizeof(PDO_EXTENSION), - NULL, - FILE_DEVICE_BUS_EXTENDER, - FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &PdoDeviceObject); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - DPRINT1("HAL: Could not create ACPI device object status=0x%08x\n", Status); - return Status; - } - - /* Setup the PDO device extension */ - PdoExtension = PdoDeviceObject->DeviceExtension; - PdoExtension->ExtensionType = PdoExtensionType; - PdoExtension->PhysicalDeviceObject = PdoDeviceObject; - PdoExtension->ParentFdoExtension = FdoExtension; - PdoExtension->PdoType = AcpiPdo; - - /* Add the PDO to the head of the list */ - PdoExtension->Next = FdoExtension->ChildPdoList; - FdoExtension->ChildPdoList = PdoExtension; - - /* Initialization is finished */ - PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - - /* Find the ACPI watchdog table */ - Wdrt = HalAcpiGetTable(0, 'TRDW'); - if (Wdrt) - { - /* FIXME: TODO */ - DPRINT1("You have an ACPI Watchdog. That's great! You should be proud ;-)\n"); - } /* Register for reinitialization to report devices later */ IoRegisterBootDriverReinitialization(DriverObject, Modified: branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/hal/halx86/le… ============================================================================== --- branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Mon Jan 30 21:36:51 2012 @@ -139,7 +139,7 @@ #endif /* Invalidate device relations since we added a new device */ - IoInvalidateDeviceRelations(TargetDevice, BusRelations); + IoSynchronousInvalidateDeviceRelations(TargetDevice, BusRelations); /* Return status */ DPRINT("Device added %lx\n", Status); Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/p… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Jan 30 21:36:51 2012 @@ -389,9 +389,6 @@ DPRINT1("Installed NULL service for critical device '%wZ'\n", &ChildIdNameU); } - /* We need to enumerate children */ - DeviceNode->Flags |= DNF_NEED_TO_ENUM; - ExFreePool(OriginalIdBuffer); ExFreePool(PartialInfo); ExFreePool(BasicInfo); @@ -2174,6 +2171,9 @@ ULONG i; BOOLEAN Found; + if (DeviceNode == IopRootDeviceNode) + return; + while (Child != NULL) { NextChild = Child->Sibling; @@ -2420,7 +2420,7 @@ UNICODE_STRING RegKey; /* Install the service for this if it's in the CDDB */ - //IopInstallCriticalDevice(DeviceNode); + IopInstallCriticalDevice(DeviceNode); RegKey.Length = 0; RegKey.MaximumLength = sizeof(RegKeyBuffer); @@ -2553,25 +2553,7 @@ if (IopDeviceNodeHasFlag(DeviceNode, DNF_STARTED) || IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) || IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) - { - if (DeviceNode->Flags & DNF_NEED_TO_ENUM) - { - Status = IopInitializeDevice(DeviceNode, NULL); - if (NT_SUCCESS(Status)) - { - /* HACK */ - DeviceNode->Flags &= ~DNF_STARTED; - Status = IopStartDevice(DeviceNode); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopStartDevice(%wZ) failed with status 0x%08x\n", - &DeviceNode->InstancePath, Status); - } - } - DeviceNode->Flags &= ~DNF_NEED_TO_ENUM; - } return STATUS_SUCCESS; - } if (DeviceNode->ServiceName.Buffer == NULL) {

12 years, 10 months

[ion] 55335: [SMSS2]: Implement all the processing required for being able to create emergency, system, and manual-sized page files, on both fixed drives any "any" drives. Missing the code to build...

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 21:28:48 2012 New Revision: 55335 URL: http://svn.reactos.org/svn/reactos?rev=55335&view=rev Log: [SMSS2]: Implement all the processing required for being able to create emergency, system, and manual-sized page files, on both fixed drives any "any" drives. Missing the code to build volume descriptors and to actually ask the kernel to create the file (right now, just prints what should be done and sizes). Modified: trunk/reactos/base/system/smss2/pagefile.c Modified: trunk/reactos/base/system/smss2/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/pagefile… ============================================================================== --- trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] Mon Jan 30 21:28:48 2012 @@ -14,7 +14,11 @@ /* GLOBALS ********************************************************************/ -#define STANDARD_DRIVE_LETTER_OFFSET 4 +// +// Taken from ASSERTs +// +#define STANDARD_PAGING_FILE_NAME L"\\??\\?:\\pagefile.sys" +#define STANDARD_DRIVE_LETTER_OFFSET 4 #define SMP_PAGEFILE_CREATED 0x01 #define SMP_PAGEFILE_DEFAULT 0x02 @@ -209,7 +213,308 @@ NTSTATUS NTAPI +SmpCreatePagingFileOnFixedDrive(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor, + IN PLARGE_INTEGER FuzzFactor, + IN PLARGE_INTEGER MinimumSize) +{ + DPRINT1("Should create fixed pagefile of sizes: %I64d %I64d\n", + FuzzFactor->QuadPart, MinimumSize->QuadPart); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SmpCreatePagingFileOnAnyDrive(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor, + IN PLARGE_INTEGER FuzzFactor, + IN PLARGE_INTEGER MinimumSize) +{ + DPRINT1("Should create 'any' pagefile of sizes: %I64d %I64d\n", + FuzzFactor->QuadPart, MinimumSize->QuadPart); + return STATUS_SUCCESS; +} + +VOID +NTAPI +SmpMakeDefaultPagingFileDescriptor(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor) +{ + /* The default descriptor uses 128MB as a pagefile size */ + Descriptor->Flags |= SMP_PAGEFILE_DEFAULT; + Descriptor->MinSize.QuadPart = 0x8000000; + Descriptor->MaxSize.QuadPart = 0x8000000; +} + +VOID +NTAPI +SmpMakeSystemManagedPagingFileDescriptor(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor) +{ + NTSTATUS Status; + LONGLONG MinimumSize, MaximumSize, Ram; + SYSTEM_BASIC_INFORMATION BasicInfo; + + /* Query the page size of the system, and the amount of RAM */ + Status = NtQuerySystemInformation(SystemBasicInformation, + &BasicInfo, + sizeof(BasicInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + /* If we failed, use defaults since we have no idea otherwise */ + DPRINT1("SMSS:PFILE: NtQuerySystemInformation failed with %x \n", Status); + SmpMakeDefaultPagingFileDescriptor(Descriptor); + return; + } + + /* Chekc how much RAM we have and set three times this amount as maximum */ + Ram = BasicInfo.NumberOfPhysicalPages * BasicInfo.PageSize; + MaximumSize = 3 * Ram; + + /* If we have more than 1GB, use that as minimum, otherwise, use 1.5X RAM */ + MinimumSize = (Ram >= 0x40000000) ? Ram : MaximumSize / 2; + + /* Write the new sizes in the descriptor and mark it as system managed */ + Descriptor->MinSize.QuadPart = MinimumSize; + Descriptor->MaxSize.QuadPart = MaximumSize; + Descriptor->Flags |= SMP_PAGEFILE_SYSTEM_MANAGED; +} + +NTSTATUS +NTAPI +SmpValidatePagingFileSizes(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONGLONG MinSize, MaxSize; + BOOLEAN WasTooBig = FALSE; + + /* Capture the min and max */ + MinSize = Descriptor->MinSize.QuadPart; + MaxSize = Descriptor->MaxSize.QuadPart; + DPRINT1("SMSS:PFILE: Validating sizes for `%wZ' %I64X %I64X\n", + &Descriptor->Name, MinSize, MaxSize); + + /* Don't let minimum be bigger than maximum */ + if (MinSize > MaxSize) MaxSize = MinSize; + + /* On PAE we can have bigger pagefiles... */ + if (SharedUserData->ProcessorFeatures[PF_PAE_ENABLED]) + { + /* But we don't support that yet */ + DPRINT1("ReactOS does not support PAE yet... assuming sizes OK\n"); + } + else + { + /* Check if the minimum is more then 4095 MB */ + if (MinSize > 0xFFF00000) + { + /* Trim it, this isn't allowed */ + WasTooBig = TRUE; + MinSize = 0xFFF00000; + } + + /* Check if the maximum is more then 4095 MB */ + if (MaxSize > 0xFFF00000) + { + /* Trim it, this isn't allowed */ + WasTooBig = TRUE; + MaxSize = 0xFFF00000; + } + } + + /* Did we trim? */ + if (WasTooBig) + { + /* Notify debugger output and write a flag in the descriptor */ + DPRINT1("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed \n", + &Descriptor->Name); + Descriptor->Flags |= SMP_PAGEFILE_WAS_TOO_BIG; + } + + /* Now write the (possibly trimmed) sizes back */ + Descriptor->MinSize.QuadPart = MinSize; + Descriptor->MaxSize.QuadPart = MaxSize; + return Status; +} + +NTSTATUS +NTAPI +SmpCreateSystemManagedPagingFile(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor, + IN BOOLEAN DecreaseSize) +{ + LARGE_INTEGER FuzzFactor, Size; + + /* Make sure there's at least 1 paging file and that we are system-managed */ + ASSERT(SmpNumberOfPagingFiles >= 1); + ASSERT(!IsListEmpty(&SmpPagingFileDescriptorList)); + ASSERT(Descriptor->Flags & SMP_PAGEFILE_SYSTEM_MANAGED); // Descriptor->SystemManaged == 1 in ASSERT. + + /* Keep decreasing the pagefile by this amount if we run out of space */ + FuzzFactor.QuadPart = 0x1000000; + + /* Create the descriptor for it (mainly the right sizes) and validate */ + SmpMakeSystemManagedPagingFileDescriptor(Descriptor); + SmpValidatePagingFileSizes(Descriptor); + + /* Use either the minimum size in the descriptor, or 16MB in minimal mode */ + Size.QuadPart = DecreaseSize ? 0x1000000 : Descriptor->MinSize.QuadPart; + + /* Check if this should be a fixed pagefile or an any pagefile*/ + if (Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] == '?') + { + /* Find a disk for it */ + return SmpCreatePagingFileOnAnyDrive(Descriptor, &FuzzFactor, &Size); + } + + /* Use the disk that was given */ + return SmpCreatePagingFileOnFixedDrive(Descriptor, &FuzzFactor, &Size); +} + +NTSTATUS +NTAPI +SmpCreateEmergencyPagingFile(VOID) +{ + PSMP_PAGEFILE_DESCRIPTOR Descriptor; + ULONG Length; + WCHAR Buffer[32]; + + /* Allocate a descriptor */ + Descriptor = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SMP_PAGEFILE_DESCRIPTOR)); + if (!Descriptor) return STATUS_NO_MEMORY; + + /* Initialize it */ + RtlInitUnicodeString(&Descriptor->Name, NULL); + RtlInitUnicodeString(&Descriptor->Token, NULL); + + /* Copy the default pagefile name */ + wcscpy(Buffer, STANDARD_PAGING_FILE_NAME); + Length = wcslen(Buffer) * sizeof(WCHAR); + ASSERT(sizeof(Buffer) > Length); + + /* Fill the rest of the descriptor out */ + Descriptor->Name.Buffer = Buffer; + Descriptor->Name.Length = Length; + Descriptor->Name.MaximumLength = Length + sizeof(UNICODE_NULL); + Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = '?'; + Descriptor->Flags |= SMP_PAGEFILE_SYSTEM_MANAGED | + SMP_PAGEFILE_EMERGENCY | + SMP_PAGEFILE_ON_ANY_DRIVE; + + /* Insert it into the descriptor list */ + InsertHeadList(&SmpPagingFileDescriptorList, &Descriptor->Entry); + SmpNumberOfPagingFiles++; + + /* Go ahead and create it now, with the minimal size possible */ + return SmpCreateSystemManagedPagingFile(Descriptor, TRUE); +} + +NTSTATUS +NTAPI +SmpCreateVolumeDescriptors(VOID) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI SmpCreatePagingFiles(VOID) { - return STATUS_SUCCESS; -} + NTSTATUS Status; + PSMP_PAGEFILE_DESCRIPTOR Descriptor; + LARGE_INTEGER Size, FuzzFactor; + BOOLEAN Created = FALSE; + PLIST_ENTRY NextEntry; + + /* Check if no paging files were requested */ + if (!(SmpNumberOfPagingFiles) && !(SmpRegistrySpecifierPresent)) + { + /* The list should be empty -- nothign to do */ + ASSERT(IsListEmpty(&SmpPagingFileDescriptorList)); + DPRINT1("SMSS:PFILE: No paging file was requested \n"); + return STATUS_SUCCESS; + } + + /* Initialize the volume descriptors so we can know what's available */ + Status = SmpCreateVolumeDescriptors(); + if (!NT_SUCCESS(Status)) + { + /* We can't make decisions without this, so fail */ + DPRINT1("SMSS:PFILE: Failed to create volume descriptors (status %X)\n", + Status); + return Status; + } + + /* If we fail creating pagefiles, try to reduce by this much each time */ + FuzzFactor.QuadPart = 0x1000000; + + /* Loop the descriptor list */ + NextEntry = SmpPagingFileDescriptorList.Flink; + while (NextEntry != &SmpPagingFileDescriptorList) + { + /* Check what kind of descriptor this is */ + Descriptor = CONTAINING_RECORD(NextEntry, SMP_PAGEFILE_DESCRIPTOR, Entry); + if (Descriptor->Flags & SMP_PAGEFILE_SYSTEM_MANAGED) + { + /* This is a system-managed descriptor. Create the correct file */ + DPRINT1("SMSS:PFILE: Creating a system managed paging file (`%wZ')\n", + &Descriptor->Name); + Status = SmpCreateSystemManagedPagingFile(Descriptor, FALSE); + if (!NT_SUCCESS(Status)) + { + /* We failed -- try again, with size minimization this time */ + DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ') \n", + &Descriptor->Name); + Status = SmpCreateSystemManagedPagingFile(Descriptor, TRUE); + } + } + else + { + /* This is a manually entered descriptor. Validate its size first */ + SmpValidatePagingFileSizes(Descriptor); + + /* Check if this is an ANY pagefile or a FIXED pagefile */ + DPRINT1("SMSS:PFILE: Creating a normal paging file (`%wZ') \n", + &Descriptor->Name); + if (Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] == L'?') + { + /* It's an any pagefile, try to create it wherever possible */ + Size = Descriptor->MinSize; + Status = SmpCreatePagingFileOnAnyDrive(Descriptor, + &FuzzFactor, + &Size); + if (!NT_SUCCESS(Status)) + { + /* We failed to create it. Try again with a smaller size */ + DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ') \n", + &Descriptor->Name); + Size.QuadPart = 0x1000000; + Status = SmpCreatePagingFileOnAnyDrive(Descriptor, + &FuzzFactor, + &Size); + } + } + else + { + /* It's a fixed pagefile: override the minimum and use ours */ + Size.QuadPart = 0x1000000; + Status = SmpCreatePagingFileOnFixedDrive(Descriptor, + &FuzzFactor, + &Size); + } + } + + /* Go to the next descriptor */ + if (NT_SUCCESS(Status)) Created = TRUE; + NextEntry = NextEntry->Flink; + } + + /* Check if none of the code in our loops above was able to create it */ + if (!Created) + { + /* Build an emergency pagefile ourselves */ + DPRINT1("SMSS:PFILE: Creating emergency paging file. \n"); + Status = SmpCreateEmergencyPagingFile(); + } + + /* All done */ + return Status; +}

12 years, 10 months

[tfaber] 55334: [COMCTL32] - Fix the fix for MSVC build (r55306). This is the version accepted by Wine.

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Jan 30 20:29:12 2012 New Revision: 55334 URL: http://svn.reactos.org/svn/reactos?rev=55334&view=rev Log: [COMCTL32] - Fix the fix for MSVC build (r55306). This is the version accepted by Wine. Modified: trunk/reactos/dll/win32/comctl32/imagelist.c Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Mon Jan 30 20:29:12 2012 @@ -3094,13 +3094,13 @@ if ((ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) || ilc == ILC_COLOR) { - BITMAPINFO *bmi = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); - if (bmi == NULL) - return NULL; + char buffer[sizeof(BITMAPINFO) + (256 - 1) * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO *)buffer; TRACE("Creating DIBSection %d x %d, %d Bits per Pixel\n", sz.cx, sz.cy, himl->uBitsPixel); + memset( buffer, 0, sizeof(buffer) ); bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmi->bmiHeader.biWidth = sz.cx; bmi->bmiHeader.biHeight = sz.cy; @@ -3116,7 +3116,6 @@ DeleteObject( tmp ); } hbmNewBitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, 0, 0); - HeapFree( GetProcessHeap(), 0, bmi ); } else /*if (ilc == ILC_COLORDDB)*/ {

12 years, 10 months

[ion] 55333: [SMSS2]: Implement command line and token parsing. Implement pagefile descriptor structure, format, flags, and parsing. They are now created as they should. Use SmpHeap instead of RtlG...

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 19:29:30 2012 New Revision: 55333 URL: http://svn.reactos.org/svn/reactos?rev=55333&view=rev Log: [SMSS2]: Implement command line and token parsing. Implement pagefile descriptor structure, format, flags, and parsing. They are now created as they should. Use SmpHeap instead of RtlGetProcessHeap() to keep code cleaner. Use SmpSystemRoot instead of NtSystemRoot now that it's being defined. "Environment" in registry should be parsed twice to handle nested expansions. Modified: trunk/reactos/base/system/smss2/pagefile.c trunk/reactos/base/system/smss2/sminit.c trunk/reactos/base/system/smss2/smss.c trunk/reactos/base/system/smss2/smss.h trunk/reactos/base/system/smss2/smutil.c Modified: trunk/reactos/base/system/smss2/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/pagefile… ============================================================================== --- trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] Mon Jan 30 19:29:30 2012 @@ -14,7 +14,30 @@ /* GLOBALS ********************************************************************/ +#define STANDARD_DRIVE_LETTER_OFFSET 4 + +#define SMP_PAGEFILE_CREATED 0x01 +#define SMP_PAGEFILE_DEFAULT 0x02 +#define SMP_PAGEFILE_SYSTEM_MANAGED 0x04 +#define SMP_PAGEFILE_WAS_TOO_BIG 0x08 +#define SMP_PAGEFILE_ON_ANY_DRIVE 0x10 +#define SMP_PAGEFILE_EMERGENCY 0x20 +#define SMP_PAGEFILE_DUMP_PROCESSED 0x40 +typedef struct _SMP_PAGEFILE_DESCRIPTOR +{ + LIST_ENTRY Entry; + UNICODE_STRING Name; + UNICODE_STRING Token; + LARGE_INTEGER MinSize; + LARGE_INTEGER MaxSize; + LARGE_INTEGER ActualMinSize; + LARGE_INTEGER ActualMaxSize; + ULONG Flags; +} SMP_PAGEFILE_DESCRIPTOR, *PSMP_PAGEFILE_DESCRIPTOR; + LIST_ENTRY SmpPagingFileDescriptorList, SmpVolumeDescriptorList; +BOOLEAN SmpRegistrySpecifierPresent; +ULONG SmpNumberOfPagingFiles; /* FUNCTIONS ******************************************************************/ @@ -31,8 +54,157 @@ NTAPI SmpCreatePagingFileDescriptor(IN PUNICODE_STRING PageFileToken) { - DPRINT1("New pagefile data: %wZ\n", PageFileToken); - return STATUS_SUCCESS; + NTSTATUS Status; + ULONG MinSize = 0, MaxSize = 0; + BOOLEAN SystemManaged = FALSE, ZeroSize = TRUE; + PSMP_PAGEFILE_DESCRIPTOR Descriptor, ListDescriptor; + ULONG i; + WCHAR c; + PWCHAR p, ArgBuffer; + PLIST_ENTRY NextEntry; + UNICODE_STRING PageFileName, Arguments; + + /* Make sure we don't have too many */ + if (SmpNumberOfPagingFiles >= 16) + { + DPRINT1("SMSS:PFILE: Too many paging files specified - %d\n", + SmpNumberOfPagingFiles); + return STATUS_TOO_MANY_PAGING_FILES; + } + + /* Parse the specified and get the name and arguments out of it */ + DPRINT1("SMSS:PFILE: Paging file specifier `%wZ' \n", PageFileToken); + Status = SmpParseCommandLine(PageFileToken, + NULL, + &PageFileName, + NULL, + &Arguments); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("SMSS:PFILE: SmpParseCommandLine(%wZ) failed with status %X \n", + PageFileToken, Status); + return Status; + } + + /* Set the variable to let everyone know we have a pagefile token */ + SmpRegistrySpecifierPresent = TRUE; + + /* Parse the arguments, if any */ + if (Arguments.Buffer) + { + /* Parse the pagefile size */ + for (i = 0; i < Arguments.Length / sizeof(WCHAR); i++) + { + /* Check if it's zero */ + c = Arguments.Buffer[i]; + if ((c != L' ') && (c != L'\t') && (c != L'0')) + { + /* It isn't, break out */ + ZeroSize = FALSE; + break; + } + } + } + + /* Was a pagefile not specified, or was it specified with no size? */ + if ((Arguments.Buffer) || (ZeroSize)) + { + /* In this case, the system will manage its size */ + SystemManaged = TRUE; + } + else + { + /* We do have a size, so convert the arguments into a number */ + Status = RtlUnicodeStringToInteger(&Arguments, 0, &MinSize); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + RtlFreeUnicodeString(&PageFileName); + RtlFreeUnicodeString(&Arguments); + return Status; + } + + /* Now advance to the next argument */ + ArgBuffer = Arguments.Buffer; + p = ArgBuffer; + while (*p++) + { + /* Which should be a space... */ + if (*p == L' ') + { + /* And use the rest of the arguments as a maximum size */ + Arguments.Length -= ((PCHAR)p - (PCHAR)ArgBuffer); + Arguments.Buffer = ArgBuffer; + Status = RtlUnicodeStringToInteger(&Arguments, 0, &MaxSize); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + RtlFreeUnicodeString(&PageFileName); + RtlFreeUnicodeString(&Arguments); + return Status; + } + + /* We have both min and max, restore argument buffer */ + Arguments.Buffer = ArgBuffer; // Actual Windows Bug in faillure case above. + break; + } + } + } + + /* We are done parsing arguments */ + RtlFreeUnicodeString(&Arguments); + + /* Now we can allocate our descriptor */ + Descriptor = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SMP_PAGEFILE_DESCRIPTOR)); + if (!Descriptor) + { + /* Fail if we couldn't */ + RtlFreeUnicodeString(&PageFileName); + return STATUS_NO_MEMORY; + } + + /* Capture all our data into the descriptor */ + Descriptor->Token = *PageFileToken; + Descriptor->Name = PageFileName; + Descriptor->MinSize.QuadPart = MinSize * 0x100000; + Descriptor->MaxSize.QuadPart = MaxSize * 0x100000; + if (SystemManaged) Descriptor->Flags |= SMP_PAGEFILE_SYSTEM_MANAGED; + Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = + RtlUpcaseUnicodeChar(Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET]); + if (Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] == '?') + { + Descriptor->Flags |= SMP_PAGEFILE_ON_ANY_DRIVE; + } + + /* Now loop the existing descriptors */ + NextEntry = SmpPagingFileDescriptorList.Flink; + do + { + /* Are there none, or have we looped back to the beginning? */ + if (NextEntry == &SmpPagingFileDescriptorList) + { + /* This means no duplicates exist, so insert our descriptor! */ + InsertTailList(&SmpPagingFileDescriptorList, &Descriptor->Entry); + SmpNumberOfPagingFiles++; + DPRINT1("SMSS:PFILE: Created descriptor for `%wZ' (`%wZ') \n", + PageFileToken, &Descriptor->Name); + return STATUS_SUCCESS; + } + + /* Keep going until we find a duplicate, unless we are in "any" mode */ + ListDescriptor = CONTAINING_RECORD(NextEntry, SMP_PAGEFILE_DESCRIPTOR, Entry); + NextEntry = NextEntry->Flink; + } while (!(ListDescriptor->Flags & SMP_PAGEFILE_ON_ANY_DRIVE) || + !(Descriptor->Flags & SMP_PAGEFILE_ON_ANY_DRIVE)); + + /* We found a duplicate, so skip this descriptor/pagefile and fail */ + DPRINT1("SMSS:PFILE: Skipping duplicate specifier `%wZ' \n", PageFileToken); + RtlFreeUnicodeString(&PageFileName); + RtlFreeHeap(RtlGetProcessHeap(), 0, Descriptor); + return STATUS_INVALID_PARAMETER; } NTSTATUS Modified: trunk/reactos/base/system/smss2/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/sminit.c… ============================================================================== --- trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] Mon Jan 30 19:29:30 2012 @@ -23,15 +23,14 @@ } SMP_REGISTRY_VALUE, *PSMP_REGISTRY_VALUE; UNICODE_STRING SmpSubsystemName, PosixName, Os2Name; -UNICODE_STRING SmpDebugKeyword, SmpASyncKeyword, SmpAutoChkKeyword; LIST_ENTRY SmpBootExecuteList, SmpSetupExecuteList, SmpPagingFileList; LIST_ENTRY SmpDosDevicesList, SmpFileRenameList, SmpKnownDllsList; LIST_ENTRY SmpExcludeKnownDllsList, SmpSubSystemList, SmpSubSystemsToLoad; LIST_ENTRY SmpSubSystemsToDefer, SmpExecuteList, NativeProcessList; +PVOID SmpHeap; ULONG SmBaseTag; HANDLE SmpDebugPort, SmpDosDevicesObjectDirectory; -PVOID SmpHeap; PWCHAR SmpDefaultEnvironment, SmpDefaultLibPathBuffer; UNICODE_STRING SmpKnownDllPath, SmpDefaultLibPath; ULONG SmpCalledConfigEnv; @@ -720,6 +719,16 @@ RTL_QUERY_REGISTRY_SUBKEY, L"KnownDlls", &SmpKnownDllsList, + REG_NONE, + NULL, + 0 + }, + + { + SmpConfigureEnvironment, + RTL_QUERY_REGISTRY_SUBKEY, + L"Environment", + NULL, REG_NONE, NULL, 0 Modified: trunk/reactos/base/system/smss2/smss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.c?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.c [iso-8859-1] Mon Jan 30 19:29:30 2012 @@ -26,8 +26,7 @@ sizeof(WCHAR); ULONG NtInitialUserProcessBufferType = REG_SZ; -UNICODE_STRING NtSystemRoot; - +UNICODE_STRING SmpSystemRoot; ULONG AttachedSessionId = -1; BOOLEAN SmpDebug; @@ -127,7 +126,7 @@ /* Copy the DOS path */ RtlCopyUnicodeString(&ProcessParams->CurrentDirectory.DosPath, - &NtSystemRoot); + &SmpSystemRoot); /* Make a buffer for the DLL Path */ p = (PWSTR)((PCHAR)ProcessParams->CurrentDirectory.DosPath.Buffer + @@ -195,7 +194,7 @@ RtlAppendUnicodeStringToString(&Environment, &NullString); /* Create the system drive string */ - SystemDriveString = NtSystemRoot; + SystemDriveString = SmpSystemRoot; SystemDriveString.Length = 2 * sizeof(WCHAR); /* Append it to the environment */ @@ -205,7 +204,7 @@ /* Append the system root to the environment */ RtlAppendUnicodeToString(&Environment, L"SystemRoot="); - RtlAppendUnicodeStringToString(&Environment, &NtSystemRoot); + RtlAppendUnicodeStringToString(&Environment, &SmpSystemRoot); RtlAppendUnicodeStringToString(&Environment, &NullString); /* Create SMSS process */ @@ -271,8 +270,8 @@ /* No handles at first */ Handles[0] = Handles[1] = NULL; - /* Setup system root */ - RtlInitUnicodeString(&NtSystemRoot, SharedUserData->NtSystemRoot); + /* Initialize the system root */ + RtlInitUnicodeString(&SmpSystemRoot, SharedUserData->NtSystemRoot); /* Allocate the initialization buffer */ InitBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(INIT_BUFFER)); Modified: trunk/reactos/base/system/smss2/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.h?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.h [iso-8859-1] Mon Jan 30 19:29:30 2012 @@ -30,6 +30,11 @@ /* DEFINES ********************************************************************/ +#define SMP_DEBUG_FLAG 0x01 +#define SMP_ASYNC_FLAG 0x02 +#define SMP_AUTOCHK_FLAG 0x04 +#define SMP_INVALID_PATH 0x10 + /* EXTERNALS ******************************************************************/ extern RTL_CRITICAL_SECTION SmpKnownSubSysLock; @@ -43,6 +48,12 @@ extern HANDLE SmpSessionsObjectDirectory; extern HANDLE SmpWindowsSubSysProcessId; extern BOOLEAN RegPosixSingleInstance; +extern UNICODE_STRING SmpDebugKeyword, SmpASyncKeyword, SmpAutoChkKeyword; +extern PVOID SmpHeap; +extern ULONG SmBaseTag; +extern UNICODE_STRING SmpSystemRoot; +extern PWCHAR SmpDefaultEnvironment; +extern UNICODE_STRING SmpDefaultLibPath; /* FUNCTIONS ******************************************************************/ @@ -121,3 +132,12 @@ VOID ); +NTSTATUS +NTAPI +SmpParseCommandLine( + IN PUNICODE_STRING CommandLine, + OUT PULONG Flags, + OUT PUNICODE_STRING FileName, + OUT PUNICODE_STRING Directory, + OUT PUNICODE_STRING Arguments +); Modified: trunk/reactos/base/system/smss2/smutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smutil.c… ============================================================================== --- trunk/reactos/base/system/smss2/smutil.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smutil.c [iso-8859-1] Mon Jan 30 19:29:30 2012 @@ -23,6 +23,8 @@ TOKEN_PRIVILEGES NewBuffer; } SMP_PRIVILEGE_STATE, *PSMP_PRIVILEGE_STATE; +UNICODE_STRING SmpDebugKeyword, SmpASyncKeyword, SmpAutoChkKeyword; + /* FUNCTIONS ******************************************************************/ NTSTATUS @@ -36,9 +38,9 @@ /* Assume failure */ *PrivilegeState = NULL; - + /* Acquire the state structure to hold everything we need */ - State = RtlAllocateHeap(RtlGetProcessHeap(), + State = RtlAllocateHeap(SmpHeap, 0, sizeof(SMP_PRIVILEGE_STATE) + sizeof(TOKEN_PRIVILEGES) + @@ -52,7 +54,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - RtlFreeHeap(RtlGetProcessHeap(), 0, State); + RtlFreeHeap(SmpHeap, 0, State); return Status; } @@ -74,7 +76,7 @@ if (Status == STATUS_BUFFER_TOO_SMALL) { /* Our static buffer is not big enough, allocate a bigger one */ - State->OldPrivileges = RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); + State->OldPrivileges = RtlAllocateHeap(SmpHeap, 0, Size); if (!State->OldPrivileges) { /* Out of memory, fail */ @@ -105,12 +107,12 @@ if (State->OldPrivileges != (PTOKEN_PRIVILEGES)&State->OldBuffer) { /* Free it */ - RtlFreeHeap(RtlGetProcessHeap(), 0, State->OldPrivileges); + RtlFreeHeap(SmpHeap, 0, State->OldPrivileges); } /* Close the token handle and free the state structure */ NtClose(State->TokenHandle); - RtlFreeHeap(RtlGetProcessHeap(), 0, State); + RtlFreeHeap(SmpHeap, 0, State); return Status; } @@ -119,7 +121,7 @@ SmpReleasePrivilege(IN PVOID PrivState) { PSMP_PRIVILEGE_STATE State = (PSMP_PRIVILEGE_STATE)PrivState; - + /* Adjust the privileges in the token */ NtAdjustPrivilegesToken(State->TokenHandle, FALSE, @@ -132,10 +134,277 @@ if (State->OldPrivileges != (PTOKEN_PRIVILEGES)&State->OldBuffer) { /* Free it */ - RtlFreeHeap(RtlGetProcessHeap(), 0, State->OldPrivileges); + RtlFreeHeap(SmpHeap, 0, State->OldPrivileges); } /* Close the token handle and free the state structure */ NtClose(State->TokenHandle); - RtlFreeHeap(RtlGetProcessHeap(), 0, State); + RtlFreeHeap(SmpHeap, 0, State); } + +NTSTATUS +NTAPI +SmpParseToken(IN PUNICODE_STRING Input, + IN BOOLEAN SecondPass, + OUT PUNICODE_STRING Token) +{ + PWCHAR p, pp; + ULONG Length, TokenLength, InputLength; + + /* Initialize to NULL to start with */ + RtlInitUnicodeString(Token, NULL); + + /* Save the input length */ + InputLength = Input->Length; + + /* Parse the buffer until the first character */ + p = Input->Buffer; + Length = 0; + while (Length < InputLength) + { + if (*p > L' ' ) break; + ++p; + Length += sizeof(WCHAR); + } + + /* Are we being called for argument pick-up? */ + if (SecondPass) + { + /* Then assume everything else is an argument */ + TokenLength = InputLength - Length * sizeof(WCHAR); + pp = (PWSTR)((ULONG_PTR)p + TokenLength); + } + else + { + /* No -- so loop until the next space */ + pp = p; + while (Length < InputLength) + { + if (*pp <= L' ' ) break; + ++pp; + Length += sizeof(WCHAR); + } + + /* Now compute how long this token is, and loop until the next char */ + TokenLength = (ULONG_PTR)pp - (ULONG_PTR)p; + while (Length < InputLength) + { + if (*pp > L' ' ) break; + ++pp; + Length += sizeof(WCHAR); + } + } + + /* Did we find a token? */ + if (TokenLength) + { + /* Allocate a buffer for it */ + Token->Buffer = RtlAllocateHeap(SmpHeap, + SmBaseTag, + TokenLength + sizeof(UNICODE_NULL)); + if (!Token->Buffer) return STATUS_NO_MEMORY; + + /* Fill in the unicode string to hold it */ + Token->MaximumLength = TokenLength + sizeof(UNICODE_NULL); + Token->Length = TokenLength; + RtlCopyMemory(Token->Buffer, p, TokenLength); + Token->Buffer[TokenLength / sizeof(WCHAR)] = UNICODE_NULL; + } + + /* Modify the input string with the position of where the next token begins */ + Input->Length -= (ULONG_PTR)pp - (ULONG_PTR)Input->Buffer; + Input->Buffer = pp; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SmpParseCommandLine(IN PUNICODE_STRING CommandLine, + OUT PULONG Flags, + OUT PUNICODE_STRING FileName, + OUT PUNICODE_STRING Directory, + OUT PUNICODE_STRING Arguments) +{ + ULONG Length; + UNICODE_STRING EnvString, PathString, CmdLineCopy, Token; + WCHAR PathBuffer[MAX_PATH]; + PWCHAR FilePart; + NTSTATUS Status; + UNICODE_STRING FullPathString; + + /* Initialize output arguments to NULL */ + RtlInitUnicodeString(FileName, NULL); + RtlInitUnicodeString(Arguments, NULL); + if (Directory) RtlInitUnicodeString(Directory, NULL); + + /* Check if we haven't yet built a full default path or system root yet */ + if (!SmpSystemRoot.Length) + { + /* Initialize it based on shared user data string */ + RtlInitUnicodeString(&SmpSystemRoot, SharedUserData->NtSystemRoot); + + /* Allocate an empty string for the path */ + Length = SmpDefaultLibPath.MaximumLength + SmpSystemRoot.MaximumLength + + sizeof(L"\\system32;"); + RtlInitEmptyUnicodeString(&FullPathString, + RtlAllocateHeap(SmpHeap, SmBaseTag, Length), + Length); + if (FullPathString.Buffer) + { + /* Append the root, system32;, and then the current library path */ + RtlAppendUnicodeStringToString(&FullPathString, &SmpSystemRoot); + RtlAppendUnicodeToString(&FullPathString, L"\\system32;"); + RtlAppendUnicodeStringToString(&FullPathString, &SmpDefaultLibPath); + RtlFreeHeap(SmpHeap, 0, SmpDefaultLibPath.Buffer); + SmpDefaultLibPath = FullPathString; + } + } + + /* Consume the command line */ + CmdLineCopy = *CommandLine; + while (TRUE) + { + /* Parse the first token and check for modifiers/specifiers */ + Status = SmpParseToken(&CmdLineCopy, FALSE, &Token); + if (!(NT_SUCCESS(Status)) || !(Token.Buffer)) return STATUS_UNSUCCESSFUL; + if (!Flags) break; + + /* Debug requested? */ + if (RtlEqualUnicodeString(&Token, &SmpDebugKeyword, TRUE)) + { + /* Convert into a flag */ + *Flags |= SMP_DEBUG_FLAG; + } + else if (RtlEqualUnicodeString(&Token, &SmpASyncKeyword, TRUE)) + { + /* Asynch requested, convert into a flag */ + *Flags |= SMP_ASYNC_FLAG; + } + else if (RtlEqualUnicodeString(&Token, &SmpAutoChkKeyword, TRUE)) + { + /* Autochk requested, convert into a flag */ + *Flags |= SMP_AUTOCHK_FLAG; + } + else + { + /* No specifier found, keep going */ + break; + } + + /* Get rid of this token and get the next */ + RtlFreeHeap(SmpHeap, 0, Token.Buffer); + } + + /* Initialize a string to hold the current path */ + RtlInitUnicodeString(&EnvString, L"Path"); + Length = PAGE_SIZE; + RtlInitEmptyUnicodeString(&PathString, + RtlAllocateHeap(SmpHeap, SmBaseTag, Length), + Length); + if (!PathString.Buffer) + { + /* Fail if we have no memory for this */ + RtlFreeHeap(SmpHeap, 0, Token.Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Query the path from the environment */ + Status = RtlQueryEnvironmentVariable_U(SmpDefaultEnvironment, + &EnvString, + &PathString); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Our buffer was too small, free it */ + RtlFreeHeap(SmpHeap, 0, PathString.Buffer); + + /* And allocate one big enough */ + Length = PathString.Length + sizeof(UNICODE_NULL); + RtlInitEmptyUnicodeString(&PathString, + RtlAllocateHeap(SmpHeap, SmBaseTag, Length), + Length); + if (!PathString.Buffer) + { + /* Fail if we have no memory for this */ + RtlFreeHeap(SmpHeap, 0, Token.Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Now try again, this should work */ + Status = RtlQueryEnvironmentVariable_U(SmpDefaultEnvironment, + &EnvString, + &PathString); + } + if (!NT_SUCCESS(Status)) + { + /* Another failure means that the kernel hasn't passed the path correctly */ + DPRINT1("SMSS: %wZ environment variable not defined.\n", &EnvString); + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + else + { + /* Check if the caller expects any flags out of here */ + if (Flags) + { + /* We can return the image not found flag -- so does the image exist */ + if (!(RtlDosSearchPath_U(PathString.Buffer, + Token.Buffer, + L".exe", + sizeof(PathBuffer), + PathBuffer, + &FilePart)) && + !(RtlDosSearchPath_U(SmpDefaultLibPath.Buffer, + Token.Buffer, + L".exe", + sizeof(PathBuffer), + PathBuffer, + &FilePart))) + { + /* It doesn't, let the caller know about it and exit */ + *Flags |= SMP_INVALID_PATH; + *FileName = Token; + RtlFreeHeap(SmpHeap, 0, PathString.Buffer); + return STATUS_SUCCESS; + } + } + else + { + /* Caller doesn't want flags, probably wants the image itself */ + wcscpy(PathBuffer, Token.Buffer); + } + } + + /* Free tokens and such, all that's left is to convert the image name */ + RtlFreeHeap(SmpHeap, 0, Token.Buffer); + RtlFreeHeap(SmpHeap, 0, PathString.Buffer); + if (!NT_SUCCESS(Status)) return Status; + + /* Convert it and bail out if this failed */ + if (!RtlDosPathNameToNtPathName_U(PathBuffer, FileName, NULL, NULL)) + { + DPRINT1("SMSS: Unable to translate %ws into an NT File Name\n", + &PathBuffer); + Status = STATUS_OBJECT_PATH_INVALID; + } + if (!NT_SUCCESS(Status)) return Status; + + /* Finally, check if the caller also wanted the directory */ + if (Directory) + { + /* Is the file a relative name with no directory? */ + if (FilePart <= PathBuffer) + { + /* Clear it */ + RtlInitUnicodeString(Directory, NULL); + } + else + { + /* There is a directory, and a filename -- separate those two */ + FilePart -= sizeof(UNICODE_NULL); + *FilePart = UNICODE_NULL; + RtlCreateUnicodeString(Directory, PathBuffer); + } + } + + /* We are done -- move on to the second pass to get the arguments */ + return SmpParseToken(&CmdLineCopy, TRUE, Arguments); +}

12 years, 10 months

[janderwald] 55332: [HIDPARSE] - Start support for multi top level hid collections - Not yet full implemented - Required for proper usb composite support

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jan 30 19:29:26 2012 New Revision: 55332 URL: http://svn.reactos.org/svn/reactos?rev=55332&view=rev Log: [HIDPARSE] - Start support for multi top level hid collections - Not yet full implemented - Required for proper usb composite support Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/api.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h branches/usb-bringup-trunk/lib/drivers/hidparser/parser.c branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/api.c [iso-8859-1] Mon Jan 30 19:29:26 2012 @@ -95,89 +95,73 @@ } PHID_REPORT +HidParser_GetReportInCollection( + PHID_COLLECTION Collection, + IN UCHAR ReportType) +{ + ULONG Index; + PHID_REPORT Report; + + // + // search in local array + // + for(Index = 0; Index < Collection->ReportCount; Index++) + { + if (Collection->Reports[Index]->Type == ReportType) + { + // + // found report + // + return Collection->Reports[Index]; + } + } + + // + // search in local array + // + for(Index = 0; Index < Collection->NodeCount; Index++) + { + Report = HidParser_GetReportInCollection(Collection->Nodes[Index], ReportType); + if (Report) + { + // + // found report + // + return Report; + } + } + + // + // not found + // + return NULL; +} + +PHID_REPORT HidParser_GetReportByType( IN PHID_PARSER Parser, - IN ULONG ReportType) -{ - PHID_PARSER_CONTEXT ParserContext; - ULONG Index; - - // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // sanity checks - // - ASSERT(ParserContext); - - // - // FIXME support multiple top collecions - // - ASSERT(ParserContext->RootCollection->NodeCount == 1); - for(Index = 0; Index < ParserContext->ReportCount; Index++) - { - // - // check if the report type match - // - if (ParserContext->Reports[Index]->Type == ReportType) - { - // - // found report - // - return ParserContext->Reports[Index]; - } - } - - // - // report not found - // - return NULL; -} - - -ULONG -HidParser_NumberOfReports( - IN PHID_PARSER Parser, - IN ULONG ReportType) -{ - PHID_PARSER_CONTEXT ParserContext; - ULONG Index; - ULONG ReportCount = 0; - - // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // sanity checks - // - ASSERT(ParserContext); - - // - // FIXME support multiple top collecions - // - ASSERT(ParserContext->RootCollection->NodeCount == 1); - for(Index = 0; Index < ParserContext->ReportCount; Index++) - { - // - // check if the report type match - // - if (ParserContext->Reports[Index]->Type == ReportType) - { - // - // found report - // - ReportCount++; - } - } - - // - // done - // - return ReportCount; + IN ULONG CollectionIndex, + IN UCHAR ReportType) +{ + PHID_COLLECTION Collection; + + // + // find collection + // + Collection = HidParser_GetCollection(Parser, CollectionIndex); + if (!Collection) + { + // + // no such collection + // + ASSERT(FALSE); + return NULL; + } + + // + // search report + // + return HidParser_GetReportInCollection(Collection, ReportType); } HIDPARSER_STATUS @@ -212,6 +196,7 @@ ULONG HidParser_GetReportLength( IN PHID_PARSER Parser, + IN ULONG CollectionIndex, IN ULONG ReportType) { PHID_PARSER_CONTEXT ParserContext; @@ -236,7 +221,7 @@ // // get first report // - Report = HidParser_GetReportByType(Parser, ReportType); + Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); if (!Report) { // @@ -289,6 +274,7 @@ ULONG HidParser_GetReportItemCountFromReportType( IN PHID_PARSER Parser, + IN ULONG CollectionIndex, IN ULONG ReportType) { PHID_PARSER_CONTEXT ParserContext; @@ -312,7 +298,7 @@ // // get report // - Report = HidParser_GetReportByType(Parser, ReportType); + Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); if (!Report) { // @@ -331,6 +317,7 @@ ULONG HidParser_GetReportItemTypeCountFromReportType( IN PHID_PARSER Parser, + IN ULONG CollectionIndex, IN ULONG ReportType, IN ULONG bData) { @@ -357,7 +344,7 @@ // // get report // - Report = HidParser_GetReportByType(Parser, ReportType); + Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); if (!Report) { // @@ -398,7 +385,8 @@ ULONG HidParser_GetContextSize( - IN PHID_PARSER Parser) + IN PHID_PARSER Parser, + IN ULONG CollectionIndex) { // // FIXME the context must contain all parsed info @@ -540,6 +528,7 @@ ULONG HidParser_GetMaxUsageListLengthWithReportAndPage( IN PHID_PARSER Parser, + IN ULONG CollectionIndex, IN ULONG ReportType, IN USAGE UsagePage OPTIONAL) { @@ -567,7 +556,7 @@ // // get report // - Report = HidParser_GetReportByType(Parser, ReportType); + Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); if (!Report) { // @@ -600,6 +589,7 @@ HIDPARSER_STATUS HidParser_GetSpecificValueCapsWithReport( IN PHID_PARSER Parser, + IN ULONG CollectionIndex, IN ULONG ReportType, IN USHORT UsagePage, IN USHORT Usage, @@ -631,7 +621,7 @@ // // get report // - Report = HidParser_GetReportByType(Parser, ReportType); + Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); if (!Report) { // @@ -705,6 +695,7 @@ HIDPARSER_STATUS HidParser_GetUsagesWithReport( IN PHID_PARSER Parser, + IN ULONG CollectionIndex, IN ULONG ReportType, IN USAGE UsagePage, OUT USAGE *UsageList, @@ -739,7 +730,7 @@ // // get report // - Report = HidParser_GetReportByType(Parser, ReportType); + Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); if (!Report) { // @@ -852,6 +843,7 @@ HIDPARSER_STATUS HidParser_GetScaledUsageValueWithReport( IN PHID_PARSER Parser, + IN ULONG CollectionIndex, IN ULONG ReportType, IN USAGE UsagePage, IN USAGE Usage, @@ -884,7 +876,7 @@ // // get report // - Report = HidParser_GetReportByType(Parser, ReportType); + Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); if (!Report) { // @@ -1042,6 +1034,7 @@ HIDPARSER_STATUS HidParser_TranslateUsage( IN PHID_PARSER Parser, + IN ULONG CollectionIndex, IN USAGE Usage, IN HIDP_KEYBOARD_DIRECTION KeyAction, IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, @@ -1072,4 +1065,16 @@ // done // return HIDPARSER_STATUS_SUCCESS; -} +} + +ULONG +HidParser_GetCollectionNumberFromParserContext( + IN PHID_PARSER Parser) +{ + PHID_PARSER_CONTEXT Context = (PHID_PARSER_CONTEXT)Parser->ParserContext; + + // + // get parser context + // + return Context->CollectionIndex; +} Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c [iso-8859-1] Mon Jan 30 19:29:26 2012 @@ -69,16 +69,12 @@ // get collection count // CollectionCount = HidParser_NumberOfTopCollections(Parser); - - // - // FIXME: only one top level collection is supported - // - ASSERT(CollectionCount <= 1); if (CollectionCount == 0) { // // no top level collections found // + ASSERT(FALSE); return STATUS_NO_DATA_DETECTED; } @@ -119,9 +115,9 @@ // DeviceDescription->ReportIDs[Index].CollectionNumber = Index + 1; DeviceDescription->ReportIDs[Index].ReportID = Index; //FIXME - DeviceDescription->ReportIDs[Index].InputLength = HidParser_GetReportLength(Parser, HID_REPORT_TYPE_INPUT); - DeviceDescription->ReportIDs[Index].OutputLength = HidParser_GetReportLength(Parser, HID_REPORT_TYPE_OUTPUT); - DeviceDescription->ReportIDs[Index].FeatureLength = HidParser_GetReportLength(Parser, HID_REPORT_TYPE_FEATURE); + DeviceDescription->ReportIDs[Index].InputLength = HidParser_GetReportLength(Parser, Index, HID_REPORT_TYPE_INPUT); + DeviceDescription->ReportIDs[Index].OutputLength = HidParser_GetReportLength(Parser, Index, HID_REPORT_TYPE_OUTPUT); + DeviceDescription->ReportIDs[Index].FeatureLength = HidParser_GetReportLength(Parser, Index, HID_REPORT_TYPE_FEATURE); // // init collection description @@ -143,7 +139,7 @@ // // set preparsed data length // - DeviceDescription->CollectionDesc[Index].PreparsedDataLength = HidParser_GetContextSize(Parser); + DeviceDescription->CollectionDesc[Index].PreparsedDataLength = HidParser_GetContextSize(Parser, Index); DeviceDescription->CollectionDesc[Index].PreparsedData = Parser->Alloc(DeviceDescription->CollectionDesc[Index].PreparsedDataLength); if (!DeviceDescription->CollectionDesc[Index].PreparsedData) { @@ -209,23 +205,24 @@ OUT PHIDP_CAPS Capabilities) { ULONG CollectionNumber; + + // + // get collection number from context + // + CollectionNumber = HidParser_GetCollectionNumberFromParserContext(Parser); + // // zero capabilities // Parser->Zero(Capabilities, sizeof(HIDP_CAPS)); // - // FIXME support multiple top level collections - // - CollectionNumber = 0; - - // // init capabilities // HidParser_GetCollectionUsagePage(Parser, CollectionNumber, &Capabilities->Usage, &Capabilities->UsagePage); - Capabilities->InputReportByteLength = HidParser_GetReportLength(Parser, HID_REPORT_TYPE_INPUT); - Capabilities->OutputReportByteLength = HidParser_GetReportLength(Parser, HID_REPORT_TYPE_OUTPUT); - Capabilities->FeatureReportByteLength = HidParser_GetReportLength(Parser, HID_REPORT_TYPE_FEATURE); + Capabilities->InputReportByteLength = HidParser_GetReportLength(Parser, CollectionNumber, HID_REPORT_TYPE_INPUT); + Capabilities->OutputReportByteLength = HidParser_GetReportLength(Parser, CollectionNumber, HID_REPORT_TYPE_OUTPUT); + Capabilities->FeatureReportByteLength = HidParser_GetReportLength(Parser, CollectionNumber, HID_REPORT_TYPE_FEATURE); // // always pre-prend report id @@ -237,29 +234,29 @@ // // get number of link collection nodes // - Capabilities->NumberLinkCollectionNodes = HidParser_GetTotalCollectionCount(Parser); + Capabilities->NumberLinkCollectionNodes = HidParser_GetTotalCollectionCount(Parser, CollectionNumber); // // get data indices // - Capabilities->NumberInputDataIndices = HidParser_GetReportItemTypeCountFromReportType(Parser, HID_REPORT_TYPE_INPUT, TRUE); - Capabilities->NumberOutputDataIndices = HidParser_GetReportItemTypeCountFromReportType(Parser, HID_REPORT_TYPE_OUTPUT, TRUE); - Capabilities->NumberFeatureDataIndices = HidParser_GetReportItemTypeCountFromReportType(Parser, HID_REPORT_TYPE_FEATURE, TRUE); + Capabilities->NumberInputDataIndices = HidParser_GetReportItemTypeCountFromReportType(Parser, CollectionNumber, HID_REPORT_TYPE_INPUT, TRUE); + Capabilities->NumberOutputDataIndices = HidParser_GetReportItemTypeCountFromReportType(Parser, CollectionNumber, HID_REPORT_TYPE_OUTPUT, TRUE); + Capabilities->NumberFeatureDataIndices = HidParser_GetReportItemTypeCountFromReportType(Parser, CollectionNumber, HID_REPORT_TYPE_FEATURE, TRUE); // // get value caps // - Capabilities->NumberInputValueCaps = HidParser_GetReportItemTypeCountFromReportType(Parser, HID_REPORT_TYPE_INPUT, FALSE); - Capabilities->NumberOutputValueCaps = HidParser_GetReportItemTypeCountFromReportType(Parser, HID_REPORT_TYPE_OUTPUT, FALSE); - Capabilities->NumberFeatureValueCaps = HidParser_GetReportItemTypeCountFromReportType(Parser, HID_REPORT_TYPE_FEATURE, FALSE); + Capabilities->NumberInputValueCaps = HidParser_GetReportItemTypeCountFromReportType(Parser, CollectionNumber, HID_REPORT_TYPE_INPUT, FALSE); + Capabilities->NumberOutputValueCaps = HidParser_GetReportItemTypeCountFromReportType(Parser, CollectionNumber, HID_REPORT_TYPE_OUTPUT, FALSE); + Capabilities->NumberFeatureValueCaps = HidParser_GetReportItemTypeCountFromReportType(Parser, CollectionNumber, HID_REPORT_TYPE_FEATURE, FALSE); // // get button caps // - Capabilities->NumberInputButtonCaps = HidParser_GetReportItemCountFromReportType(Parser, HID_REPORT_TYPE_INPUT); - Capabilities->NumberOutputButtonCaps = HidParser_GetReportItemCountFromReportType(Parser, HID_REPORT_TYPE_OUTPUT); - Capabilities->NumberFeatureButtonCaps = HidParser_GetReportItemCountFromReportType(Parser, HID_REPORT_TYPE_FEATURE); + Capabilities->NumberInputButtonCaps = HidParser_GetReportItemCountFromReportType(Parser, CollectionNumber, HID_REPORT_TYPE_INPUT); + Capabilities->NumberOutputButtonCaps = HidParser_GetReportItemCountFromReportType(Parser, CollectionNumber, HID_REPORT_TYPE_OUTPUT); + Capabilities->NumberFeatureButtonCaps = HidParser_GetReportItemCountFromReportType(Parser, CollectionNumber, HID_REPORT_TYPE_FEATURE); // // done @@ -275,6 +272,14 @@ IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage OPTIONAL) { + ULONG CollectionNumber; + + // + // get collection number from context + // + CollectionNumber = HidParser_GetCollectionNumberFromParserContext(Parser); + + // // FIXME test what should be returned when usage page is not defined // @@ -296,21 +301,21 @@ // // input report // - return HidParser_GetMaxUsageListLengthWithReportAndPage(Parser, HID_REPORT_TYPE_INPUT, UsagePage); + return HidParser_GetMaxUsageListLengthWithReportAndPage(Parser, CollectionNumber, HID_REPORT_TYPE_INPUT, UsagePage); } else if (ReportType == HidP_Output) { // // input report // - return HidParser_GetMaxUsageListLengthWithReportAndPage(Parser, HID_REPORT_TYPE_OUTPUT, UsagePage); + return HidParser_GetMaxUsageListLengthWithReportAndPage(Parser, CollectionNumber, HID_REPORT_TYPE_OUTPUT, UsagePage); } else if (ReportType == HidP_Feature) { // // input report // - return HidParser_GetMaxUsageListLengthWithReportAndPage(Parser, HID_REPORT_TYPE_FEATURE, UsagePage); + return HidParser_GetMaxUsageListLengthWithReportAndPage(Parser, CollectionNumber, HID_REPORT_TYPE_FEATURE, UsagePage); } else { @@ -348,6 +353,14 @@ IN OUT PULONG ValueCapsLength) { HIDPARSER_STATUS ParserStatus; + ULONG CollectionNumber; + + // + // get collection number from context + // + CollectionNumber = HidParser_GetCollectionNumberFromParserContext(Parser); + + // // FIXME: implement searching in specific collection @@ -359,21 +372,21 @@ // // input report // - ParserStatus = HidParser_GetSpecificValueCapsWithReport(Parser, HID_REPORT_TYPE_INPUT, UsagePage, Usage, ValueCaps, ValueCapsLength); + ParserStatus = HidParser_GetSpecificValueCapsWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_INPUT, UsagePage, Usage, ValueCaps, ValueCapsLength); } else if (ReportType == HidP_Output) { // // input report // - ParserStatus = HidParser_GetSpecificValueCapsWithReport(Parser, HID_REPORT_TYPE_OUTPUT, UsagePage, Usage, ValueCaps, ValueCapsLength); + ParserStatus = HidParser_GetSpecificValueCapsWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_OUTPUT, UsagePage, Usage, ValueCaps, ValueCapsLength); } else if (ReportType == HidP_Feature) { // // input report // - ParserStatus = HidParser_GetSpecificValueCapsWithReport(Parser, HID_REPORT_TYPE_FEATURE, UsagePage, Usage, ValueCaps, ValueCapsLength); + ParserStatus = HidParser_GetSpecificValueCapsWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_FEATURE, UsagePage, Usage, ValueCaps, ValueCapsLength); } else { @@ -541,6 +554,12 @@ IN ULONG ReportLength) { HIDPARSER_STATUS ParserStatus; + ULONG CollectionNumber; + + // + // get collection number from context + // + CollectionNumber = HidParser_GetCollectionNumberFromParserContext(Parser); // // FIXME: implement searching in specific collection @@ -552,21 +571,21 @@ // // input report // - ParserStatus = HidParser_GetUsagesWithReport(Parser, HID_REPORT_TYPE_INPUT, UsagePage, UsageList, UsageLength, Report, ReportLength); + ParserStatus = HidParser_GetUsagesWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_INPUT, UsagePage, UsageList, UsageLength, Report, ReportLength); } else if (ReportType == HidP_Output) { // // input report // - ParserStatus = HidParser_GetUsagesWithReport(Parser, HID_REPORT_TYPE_OUTPUT, UsagePage, UsageList, UsageLength, Report, ReportLength); + ParserStatus = HidParser_GetUsagesWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_OUTPUT, UsagePage, UsageList, UsageLength, Report, ReportLength); } else if (ReportType == HidP_Feature) { // // input report // - ParserStatus = HidParser_GetUsagesWithReport(Parser, HID_REPORT_TYPE_FEATURE, UsagePage, UsageList, UsageLength, Report, ReportLength); + ParserStatus = HidParser_GetUsagesWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_FEATURE, UsagePage, UsageList, UsageLength, Report, ReportLength); } else { @@ -604,6 +623,12 @@ IN ULONG ReportLength) { HIDPARSER_STATUS ParserStatus; + ULONG CollectionNumber; + + // + // get collection number from context + // + CollectionNumber = HidParser_GetCollectionNumberFromParserContext(Parser); // // FIXME: implement searching in specific collection @@ -615,21 +640,21 @@ // // input report // - ParserStatus = HidParser_GetScaledUsageValueWithReport(Parser, HID_REPORT_TYPE_INPUT, UsagePage, Usage, UsageValue, Report, ReportLength); + ParserStatus = HidParser_GetScaledUsageValueWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_INPUT, UsagePage, Usage, UsageValue, Report, ReportLength); } else if (ReportType == HidP_Output) { // // input report // - ParserStatus = HidParser_GetScaledUsageValueWithReport(Parser, HID_REPORT_TYPE_OUTPUT, UsagePage, Usage, UsageValue, Report, ReportLength); + ParserStatus = HidParser_GetScaledUsageValueWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_OUTPUT, UsagePage, Usage, UsageValue, Report, ReportLength); } else if (ReportType == HidP_Feature) { // // input report // - ParserStatus = HidParser_GetScaledUsageValueWithReport(Parser, HID_REPORT_TYPE_FEATURE, UsagePage, Usage, UsageValue, Report, ReportLength); + ParserStatus = HidParser_GetScaledUsageValueWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_FEATURE, UsagePage, Usage, UsageValue, Report, ReportLength); } else { @@ -667,6 +692,12 @@ { ULONG Index; HIDPARSER_STATUS Status = HIDPARSER_STATUS_SUCCESS; + ULONG CollectionNumber; + + // + // get collection number from context + // + CollectionNumber = HidParser_GetCollectionNumberFromParserContext(Parser); for(Index = 0; Index < UsageListLength; Index++) { @@ -678,7 +709,7 @@ // // process usage // - Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); + Status = HidParser_TranslateUsage(Parser, CollectionNumber, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); } else if (ChangedUsageList[Index].UsagePage == HID_USAGE_PAGE_CONSUMER) { @@ -890,12 +921,12 @@ NTSTATUS NTAPI HidParser_GetData( - IN HIDP_REPORT_TYPE ReportType, - OUT PHIDP_DATA DataList, - IN OUT PULONG DataLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + OUT PHIDP_DATA DataList, + IN OUT PULONG DataLength, + IN PCHAR Report, + IN ULONG ReportLength) { UNIMPLEMENTED ASSERT(FALSE); @@ -906,11 +937,11 @@ NTSTATUS NTAPI HidParser_GetExtendedAttributes( - IN HIDP_REPORT_TYPE ReportType, - IN USHORT DataIndex, - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, - IN OUT PULONG LengthAttributes) + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USHORT DataIndex, + OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, + IN OUT PULONG LengthAttributes) { UNIMPLEMENTED ASSERT(FALSE); @@ -921,9 +952,9 @@ NTSTATUS NTAPI HidParser_GetLinkCollectionNodes( + IN PHID_PARSER Parser, OUT PHIDP_LINK_COLLECTION_NODE LinkCollectionNodes, - IN OUT PULONG LinkCollectionNodesLength, - IN PHIDP_PREPARSED_DATA PreparsedData) + IN OUT PULONG LinkCollectionNodesLength) { UNIMPLEMENTED ASSERT(FALSE); @@ -934,27 +965,26 @@ NTSTATUS NTAPI HidParser_GetUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - OUT PULONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - - -NTSTATUS -NTAPI -HidParser_SysPowerEvent ( + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN USAGE Usage, + OUT PULONG UsageValue, + IN PCHAR Report, + IN ULONG ReportLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidParser_SysPowerEvent( + IN PHID_PARSER Parser, IN PCHAR HidPacket, IN USHORT HidPacketLength, - IN PHIDP_PREPARSED_DATA Ppd, OUT PULONG OutputBuffer) { UNIMPLEMENTED @@ -965,7 +995,7 @@ NTSTATUS NTAPI HidParser_SysPowerCaps ( - IN PHIDP_PREPARSED_DATA Ppd, + IN PHID_PARSER Parser, OUT PULONG OutputBuffer) { UNIMPLEMENTED @@ -977,15 +1007,15 @@ NTSTATUS NTAPI HidParser_GetUsageValueArray( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - OUT PCHAR UsageValue, - IN USHORT UsageValueByteLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection OPTIONAL, + IN USAGE Usage, + OUT PCHAR UsageValue, + IN USHORT UsageValueByteLength, + IN PCHAR Report, + IN ULONG ReportLength) { UNIMPLEMENTED ASSERT(FALSE); @@ -996,14 +1026,14 @@ NTSTATUS NTAPI HidParser_UnsetUsages( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN PUSAGE UsageList, - IN OUT PULONG UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN PUSAGE UsageList, + IN OUT PULONG UsageLength, + IN OUT PCHAR Report, + IN ULONG ReportLength) { UNIMPLEMENTED ASSERT(FALSE); @@ -1030,14 +1060,14 @@ NTSTATUS NTAPI HidParser_SetUsages( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN PUSAGE UsageList, - IN OUT PULONG UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN PUSAGE UsageList, + IN OUT PULONG UsageLength, + IN OUT PCHAR Report, + IN ULONG ReportLength) { UNIMPLEMENTED ASSERT(FALSE); @@ -1048,15 +1078,15 @@ NTSTATUS NTAPI HidParser_SetUsageValueArray( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - IN PCHAR UsageValue, - IN USHORT UsageValueByteLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PCHAR Report, - IN ULONG ReportLength) + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection OPTIONAL, + IN USAGE Usage, + IN PCHAR UsageValue, + IN USHORT UsageValueByteLength, + OUT PCHAR Report, + IN ULONG ReportLength) { UNIMPLEMENTED ASSERT(FALSE); @@ -1067,14 +1097,14 @@ NTSTATUS NTAPI HidParser_SetUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - IN ULONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN USAGE Usage, + IN ULONG UsageValue, + IN OUT PCHAR Report, + IN ULONG ReportLength) { UNIMPLEMENTED ASSERT(FALSE); @@ -1085,14 +1115,14 @@ NTSTATUS NTAPI HidParser_SetScaledUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - IN LONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection OPTIONAL, + IN USAGE Usage, + IN LONG UsageValue, + IN OUT PCHAR Report, + IN ULONG ReportLength) { UNIMPLEMENTED ASSERT(FALSE); @@ -1103,12 +1133,12 @@ NTSTATUS NTAPI HidParser_SetData( - IN HIDP_REPORT_TYPE ReportType, - IN PHIDP_DATA DataList, - IN OUT PULONG DataLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN PHIDP_DATA DataList, + IN OUT PULONG DataLength, + IN OUT PCHAR Report, + IN ULONG ReportLength) { UNIMPLEMENTED ASSERT(FALSE); @@ -1119,8 +1149,8 @@ ULONG NTAPI HidParser_MaxDataListLength( - IN HIDP_REPORT_TYPE ReportType, - IN PHIDP_PREPARSED_DATA PreparsedData) + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType) { UNIMPLEMENTED ASSERT(FALSE); @@ -1131,11 +1161,11 @@ NTSTATUS NTAPI HidParser_InitializeReportForID( - IN HIDP_REPORT_TYPE ReportType, - IN UCHAR ReportID, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength) + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN UCHAR ReportID, + IN OUT PCHAR Report, + IN ULONG ReportLength) { UNIMPLEMENTED ASSERT(FALSE); @@ -1148,12 +1178,12 @@ NTSTATUS NTAPI HidParser_GetValueCaps( - HIDP_REPORT_TYPE ReportType, - PHIDP_VALUE_CAPS ValueCaps, - PULONG ValueCapsLength, - PHIDP_PREPARSED_DATA PreparsedData) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} + IN PHID_PARSER Parser, + HIDP_REPORT_TYPE ReportType, + PHIDP_VALUE_CAPS ValueCaps, + PULONG ValueCapsLength) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] Mon Jan 30 19:29:26 2012 @@ -119,7 +119,7 @@ NTAPI HidParser_FreeCollectionDescription( IN PHID_PARSER Parser, - IN PHIDP_DEVICE_DESC DeviceDescription); + IN PHIDP_DEVICE_DESC DeviceDescription); HIDAPI NTSTATUS @@ -180,53 +180,53 @@ NTSTATUS NTAPI HidParser_GetData( - IN HIDP_REPORT_TYPE ReportType, - OUT PHIDP_DATA DataList, - IN OUT PULONG DataLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength); + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + OUT PHIDP_DATA DataList, + IN OUT PULONG DataLength, + IN PCHAR Report, + IN ULONG ReportLength); HIDAPI NTSTATUS NTAPI HidParser_GetExtendedAttributes( - IN HIDP_REPORT_TYPE ReportType, - IN USHORT DataIndex, - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, - IN OUT PULONG LengthAttributes); + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USHORT DataIndex, + OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, + IN OUT PULONG LengthAttributes); HIDAPI NTSTATUS NTAPI HidParser_GetLinkCollectionNodes( + IN PHID_PARSER Parser, OUT PHIDP_LINK_COLLECTION_NODE LinkCollectionNodes, - IN OUT PULONG LinkCollectionNodesLength, - IN PHIDP_PREPARSED_DATA PreparsedData); + IN OUT PULONG LinkCollectionNodesLength); HIDAPI NTSTATUS NTAPI HidParser_GetUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - OUT PULONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength); + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN USAGE Usage, + OUT PULONG UsageValue, + IN PCHAR Report, + IN ULONG ReportLength); HIDAPI NTSTATUS NTAPI HidParser_UsageListDifference( - IN PUSAGE PreviousUsageList, - IN PUSAGE CurrentUsageList, - OUT PUSAGE BreakUsageList, - OUT PUSAGE MakeUsageList, - IN ULONG UsageListLength); + IN PUSAGE PreviousUsageList, + IN PUSAGE CurrentUsageList, + OUT PUSAGE BreakUsageList, + OUT PUSAGE MakeUsageList, + IN ULONG UsageListLength); HIDAPI @@ -266,30 +266,30 @@ NTSTATUS NTAPI HidParser_SysPowerEvent ( + IN PHID_PARSER Parser, IN PCHAR HidPacket, IN USHORT HidPacketLength, - IN PHIDP_PREPARSED_DATA Ppd, OUT PULONG OutputBuffer); NTSTATUS NTAPI HidParser_SysPowerCaps ( - IN PHIDP_PREPARSED_DATA Ppd, + IN PHID_PARSER Parser, OUT PULONG OutputBuffer); HIDAPI NTSTATUS NTAPI HidParser_GetUsageValueArray( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - OUT PCHAR UsageValue, - IN USHORT UsageValueByteLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength); + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection OPTIONAL, + IN USAGE Usage, + OUT PCHAR UsageValue, + IN USHORT UsageValueByteLength, + IN PCHAR Report, + IN ULONG ReportLength); HIDAPI @@ -306,14 +306,14 @@ NTSTATUS NTAPI HidParser_UnsetUsages( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN PUSAGE UsageList, - IN OUT PULONG UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength); + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN PUSAGE UsageList, + IN OUT PULONG UsageLength, + IN OUT PCHAR Report, + IN ULONG ReportLength); HIDAPI NTSTATUS @@ -342,87 +342,87 @@ NTSTATUS NTAPI HidParser_SetUsages( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN PUSAGE UsageList, - IN OUT PULONG UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength); + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN PUSAGE UsageList, + IN OUT PULONG UsageLength, + IN OUT PCHAR Report, + IN ULONG ReportLength); HIDAPI NTSTATUS NTAPI HidParser_SetUsageValueArray( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - IN PCHAR UsageValue, - IN USHORT UsageValueByteLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PCHAR Report, - IN ULONG ReportLength); + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection OPTIONAL, + IN USAGE Usage, + IN PCHAR UsageValue, + IN USHORT UsageValueByteLength, + OUT PCHAR Report, + IN ULONG ReportLength); HIDAPI NTSTATUS NTAPI HidParser_SetUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - IN ULONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength); + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection, + IN USAGE Usage, + IN ULONG UsageValue, + IN OUT PCHAR Report, + IN ULONG ReportLength); HIDAPI NTSTATUS NTAPI HidParser_SetScaledUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - IN LONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength); + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN USAGE UsagePage, + IN USHORT LinkCollection OPTIONAL, + IN USAGE Usage, + IN LONG UsageValue, + IN OUT PCHAR Report, + IN ULONG ReportLength); HIDAPI NTSTATUS NTAPI HidParser_SetData( - IN HIDP_REPORT_TYPE ReportType, - IN PHIDP_DATA DataList, - IN OUT PULONG DataLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength); + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN PHIDP_DATA DataList, + IN OUT PULONG DataLength, + IN OUT PCHAR Report, + IN ULONG ReportLength); HIDAPI ULONG NTAPI HidParser_MaxDataListLength( - IN HIDP_REPORT_TYPE ReportType, - IN PHIDP_PREPARSED_DATA PreparsedData); + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType); HIDAPI NTSTATUS NTAPI HidParser_InitializeReportForID( - IN HIDP_REPORT_TYPE ReportType, - IN UCHAR ReportID, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength); - + IN PHID_PARSER Parser, + IN HIDP_REPORT_TYPE ReportType, + IN UCHAR ReportID, + IN OUT PCHAR Report, + IN ULONG ReportLength); HIDPARSER_STATUS HidParser_TranslateUsage( IN PHID_PARSER Parser, + IN ULONG CollectionNumber, IN USAGE Usage, IN HIDP_KEYBOARD_DIRECTION KeyAction, IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, @@ -433,7 +433,7 @@ NTSTATUS NTAPI HidParser_GetValueCaps( - HIDP_REPORT_TYPE ReportType, - PHIDP_VALUE_CAPS ValueCaps, - PULONG ValueCapsLength, - PHIDP_PREPARSED_DATA PreparsedData); + PHID_PARSER Parser, + HIDP_REPORT_TYPE ReportType, + PHIDP_VALUE_CAPS ValueCaps, + PULONG ValueCapsLength); Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/parser.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/parser.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/parser.c [iso-8859-1] Mon Jan 30 19:29:26 2012 @@ -136,26 +136,6 @@ // ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // delete all reports - // - for(Index = 0; Index < ParserContext->ReportCount; Index++) - { - // - // delete report - // - HidParser_DeleteReport(Parser, ParserContext->Reports[Index]); - } - - if (ParserContext->ReportCount && ParserContext->Reports) - { - // - // free report array - // - Parser->Free(ParserContext->Reports); - } - if (ParserContext->RootCollection) { // @@ -167,8 +147,6 @@ // // reinit parser // - ParserContext->ReportCount = 0; - ParserContext->Reports = NULL; ParserContext->RootCollection = NULL; ParserContext->UseReportIDs = FALSE; @@ -235,6 +213,49 @@ // return HIDPARSER_STATUS_SUCCESS; } + +HIDPARSER_STATUS +HidParser_FindReportInCollection( + IN PHID_COLLECTION Collection, + IN UCHAR ReportType, + IN UCHAR ReportID, + OUT PHID_REPORT *OutReport) +{ + ULONG Index; + HIDPARSER_STATUS Status; + + // + // search in local list + // + for(Index = 0; Index < Collection->ReportCount; Index++) + { + if (Collection->Reports[Index]->Type == ReportType && Collection->Reports[Index]->ReportID == ReportID) + { + // + // found report + // + *OutReport = Collection->Reports[Index]; + return HIDPARSER_STATUS_SUCCESS; + } + } + + // + // search in sub collections + // + for(Index = 0; Index < Collection->NodeCount; Index++) + { + Status = HidParser_FindReportInCollection(Collection->Nodes[Index], ReportType, ReportID, OutReport); + if (Status == HIDPARSER_STATUS_SUCCESS) + return Status; + } + + // + // no such report found + // + *OutReport = NULL; + return HIDPARSER_STATUS_REPORT_NOT_FOUND; +} + HIDPARSER_STATUS HidParser_FindReport( @@ -244,7 +265,6 @@ OUT PHID_REPORT *OutReport) { PHID_PARSER_CONTEXT ParserContext; - ULONG Index; // // get parser context @@ -252,23 +272,10 @@ ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; ASSERT(ParserContext); - for(Index = 0; Index < ParserContext->ReportCount; Index++) - { - if (ParserContext->Reports[Index]->Type == ReportType && ParserContext->Reports[Index]->ReportID == ReportID) - { - // - // found report - // - *OutReport = ParserContext->Reports[Index]; - return HIDPARSER_STATUS_SUCCESS; - } - } - - // - // no such report found - // - *OutReport = NULL; - return HIDPARSER_STATUS_REPORT_NOT_FOUND; + // + // search in current top level collection + // + return HidParser_FindReportInCollection(ParserContext->RootCollection->Nodes[ParserContext->RootCollection->NodeCount-1], ReportType, ReportID, OutReport); } HIDPARSER_STATUS @@ -306,8 +313,9 @@ } HIDPARSER_STATUS -HidParser_AddReport( +HidParser_AddReportToCollection( IN PHID_PARSER Parser, + IN PHID_COLLECTION CurrentCollection, IN PHID_REPORT NewReport) { PHID_REPORT * NewReportArray; @@ -322,7 +330,7 @@ // // allocate new report array // - NewReportArray = (PHID_REPORT*)Parser->Alloc(sizeof(PHID_REPORT) * (ParserContext->ReportCount + 1)); + NewReportArray = (PHID_REPORT*)Parser->Alloc(sizeof(PHID_REPORT) * (CurrentCollection->ReportCount + 1)); if (!NewReportArray) { // @@ -331,25 +339,25 @@ return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; } - if (ParserContext->ReportCount) + if (CurrentCollection->ReportCount) { // // copy old array contents // - Parser->Copy(NewReportArray, ParserContext->Reports, sizeof(PHID_REPORT) * ParserContext->ReportCount); + Parser->Copy(NewReportArray, CurrentCollection->Reports, sizeof(PHID_REPORT) * CurrentCollection->ReportCount); // // free old array // - Parser->Free(ParserContext->Reports); + Parser->Free(CurrentCollection->Reports); } // // store result // - NewReportArray[ParserContext->ReportCount] = NewReport; - ParserContext->Reports = NewReportArray; - ParserContext->ReportCount++; + NewReportArray[CurrentCollection->ReportCount] = NewReport; + CurrentCollection->Reports = NewReportArray; + CurrentCollection->ReportCount++; // // completed successfully @@ -360,6 +368,7 @@ HIDPARSER_STATUS HidParser_GetReport( IN PHID_PARSER Parser, + IN PHID_COLLECTION Collection, IN UCHAR ReportType, IN UCHAR ReportID, IN UCHAR CreateIfNotExists, @@ -394,7 +403,7 @@ // // add report // - Status = HidParser_AddReport(Parser, *OutReport); + Status = HidParser_AddReportToCollection(Parser, Collection, *OutReport); if (Status != HIDPARSER_STATUS_SUCCESS) { // @@ -925,7 +934,7 @@ } } - + Parser->Debug("Tag %x Type %x Size %x Offset %lu Length %lu\n", CurrentItem->Tag, CurrentItem->Type, CurrentItem->Size, ((ULONG_PTR)CurrentItem - (ULONG_PTR)ReportDescriptor), ReportLength); // // handle items // @@ -1019,7 +1028,7 @@ break; default: - Parser->Debug("[HIDPARSE] Unknown ReportType %x\n", CurrentItem->Tag); + Parser->Debug("[HIDPARSE] Unknown ReportType Tag %x Type %x Size %x CurrentItemSize %x\n", CurrentItem->Tag, CurrentItem->Type, CurrentItem->Size, CurrentItemSize); ASSERT(FALSE); break; } @@ -1030,7 +1039,7 @@ // // get report // - Status = HidParser_GetReport(Parser, ReportType, ParserContext->GlobalItemState.ReportId, TRUE, &Report); + Status = HidParser_GetReport(Parser, CurrentCollection, ReportType, ParserContext->GlobalItemState.ReportId, TRUE, &Report); ASSERT(Status == HIDPARSER_STATUS_SUCCESS); // fill in a sensible default if the index isn't set @@ -1246,7 +1255,7 @@ break; case ITEM_TAG_LOCAL_USAGE_MAXIMUM: - Parser->Debug("[HIDPARSE] ITEM_TAG_LOCAL_USAGE_MAXIMUM Data %x\n", Data); + Parser->Debug("[HIDPARSE] ITEM_TAG_LOCAL_USAGE_MAXIMUM Data %x ItemSize %x %x\n", Data, CurrentItemSize, CurrentItem->Size); ParserContext->LocalItemState.UsageMaximum.u.Extended = Data; ParserContext->LocalItemState.UsageMaximum.IsExtended = CurrentItemSize == sizeof(ULONG); @@ -1344,4 +1353,3 @@ // return HIDPARSER_STATUS_SUCCESS; } - Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h [iso-8859-1] Mon Jan 30 19:29:26 2012 @@ -195,7 +195,7 @@ UCHAR Valid; }HID_REPORT_ITEM, *PHID_REPORT_ITEM; -struct HID_REPORT; +struct _HID_REPORT; typedef struct __HID_COLLECTION__ { @@ -210,14 +210,15 @@ ULONG ItemCount; ULONG ItemCountAllocated; + PHID_REPORT_ITEM * Items; - //ULONG ReportCount; - //struct HID_REPORT ** Reports; + ULONG ReportCount; + struct _HID_REPORT ** Reports; }HID_COLLECTION, *PHID_COLLECTION; -typedef struct +typedef struct _HID_REPORT { UCHAR Type; UCHAR ReportID; @@ -225,11 +226,8 @@ ULONG ItemCount; ULONG ItemAllocated; - PHID_REPORT_ITEM *Items; - - ULONG ReportStatus; - UCHAR * CurrentReport; - ULONG BusyCount; + PHID_REPORT_ITEM* Items; + }HID_REPORT, *PHID_REPORT; typedef struct @@ -250,19 +248,14 @@ PHID_COLLECTION RootCollection; // - // report count - // - ULONG ReportCount; - - // - // reports - // - PHID_REPORT * Reports; - - // // uses report ids // UCHAR UseReportIDs; + + // + // collection index + // + ULONG CollectionIndex; }HID_PARSER_CONTEXT, *PHID_PARSER_CONTEXT; @@ -280,11 +273,6 @@ #define HID_REPORT_TYPE_OUTPUT 0x02 #define HID_REPORT_TYPE_FEATURE 0x04 -ULONG -HidParser_NumberOfReports( - IN PHID_PARSER Parser, - IN ULONG ReportType); - HIDPARSER_STATUS HidParser_GetCollectionUsagePage( IN PHID_PARSER Parser, @@ -295,6 +283,7 @@ ULONG HidParser_GetReportLength( IN PHID_PARSER Parser, + IN ULONG CollectionIndex, IN ULONG ReportType); UCHAR @@ -304,17 +293,20 @@ ULONG HidParser_GetReportItemCountFromReportType( IN PHID_PARSER Parser, + IN ULONG CollectionNumber, IN ULONG ReportType); ULONG HidParser_GetReportItemTypeCountFromReportType( IN PHID_PARSER Parser, + IN ULONG CollectionNumber, IN ULONG ReportType, IN ULONG bData); ULONG HidParser_GetContextSize( - IN PHID_PARSER Parser); + IN PHID_PARSER Parser, + IN ULONG CollectionNumber); VOID HidParser_FreeContext( @@ -329,12 +321,14 @@ ULONG HidParser_GetMaxUsageListLengthWithReportAndPage( IN PHID_PARSER Parser, + IN ULONG CollectionNumber, IN ULONG ReportType, IN USAGE UsagePage OPTIONAL); HIDPARSER_STATUS HidParser_GetSpecificValueCapsWithReport( IN PHID_PARSER Parser, + IN ULONG CollectionNumber, IN ULONG ReportType, IN USHORT UsagePage, IN USHORT Usage, @@ -345,6 +339,7 @@ HIDPARSER_STATUS HidParser_GetUsagesWithReport( IN PHID_PARSER Parser, + IN ULONG CollectionNumber, IN ULONG ReportType, IN USAGE UsagePage, OUT USAGE *UsageList, @@ -355,9 +350,15 @@ HIDPARSER_STATUS HidParser_GetScaledUsageValueWithReport( IN PHID_PARSER Parser, + IN ULONG CollectionNumber, IN ULONG ReportType, IN USAGE UsagePage, IN USAGE Usage, OUT PLONG UsageValue, IN PCHAR ReportDescriptor, IN ULONG ReportDescriptorLength); + +ULONG +HidParser_GetCollectionNumberFromParserContext( + IN PHID_PARSER Parser); +

12 years, 10 months

[zguo] 55331: Change version string to release header for rbuild. Next time we release, do this in the cmake file.

by zguo＠svn.reactos.org

Author: zguo Date: Mon Jan 30 18:23:14 2012 New Revision: 55331 URL: http://svn.reactos.org/svn/reactos?rev=55331&view=rev Log: Change version string to release header for rbuild. Next time we release, do this in the cmake file. Modified: branches/ros-branch-0_3_14/include/reactos/version.h Modified: branches/ros-branch-0_3_14/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/include/react… ============================================================================== --- branches/ros-branch-0_3_14/include/reactos/version.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_14/include/reactos/version.h [iso-8859-1] Mon Jan 30 18:23:14 2012 @@ -24,7 +24,7 @@ #define COPYRIGHT_YEAR "2012" /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"" #endif

12 years, 10 months

[ion] 55330: [NTOSKRNL]: Keep doing the old region/swap work incorrectly, but at least return a correct size. Let's see if this fixes it.

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 17:19:14 2012 New Revision: 55330 URL: http://svn.reactos.org/svn/reactos?rev=55330&view=rev Log: [NTOSKRNL]: Keep doing the old region/swap work incorrectly, but at least return a correct size. Let's see if this fixes it. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Jan 30 17:19:14 2012 @@ -874,14 +874,11 @@ return(Status); } -#if 0 MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress; -#else ULONG_PTR EndingAddress; EndingAddress = ((ULONG_PTR)MemoryArea->StartingAddress + RegionSize - 1) | (PAGE_SIZE - 1); - MemoryAreaLength = (ULONG_PTR)EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress + 1; -#endif + RegionSize = (ULONG_PTR)EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress + 1; MmInitializeRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, MemoryAreaLength, Type, Protect); @@ -898,7 +895,7 @@ if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); *UBaseAddress = BaseAddress; - *URegionSize = MemoryAreaLength; + *URegionSize = RegionSize; DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); return(STATUS_SUCCESS);

12 years, 11 months

[janderwald] 55329: [HIDCLASS] - Prevent buffer overflow in HidClassPDO_HandleQueryHardwareId - Reimplement HidClassPDO_HandleQueryInstanceId - USB Composite driver now gets further(hangs at instal...

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jan 30 16:47:39 2012 New Revision: 55329 URL: http://svn.reactos.org/svn/reactos?rev=55329&view=rev Log: [HIDCLASS] - Prevent buffer overflow in HidClassPDO_HandleQueryHardwareId - Reimplement HidClassPDO_HandleQueryInstanceId - USB Composite driver now gets further(hangs at installation stage) Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] Mon Jan 30 16:47:39 2012 @@ -143,7 +143,7 @@ { NTSTATUS Status; PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; - WCHAR Buffer[100]; + WCHAR Buffer[200]; ULONG Offset = 0; LPWSTR Ptr; PHIDP_COLLECTION_DESC CollectionDescription; @@ -280,26 +280,38 @@ 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)) + LPWSTR Buffer; + PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + + // + // get device extension + // + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + + // + // allocate buffer + // + Buffer = ExAllocatePool(NonPagedPool, 5 * sizeof(WCHAR)); + if (!Buffer) { // // failed // - return Status; - } - DPRINT1("HidClassPDO_HandleQueryInstanceId Buffer %S\n", Irp->IoStatus.Information); - return Status; + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // write device id + // + swprintf(Buffer, L"%04x", PDODeviceExtension->CollectionNumber); + Irp->IoStatus.Information = (ULONG_PTR)Buffer; + + // + // done + // + return STATUS_SUCCESS; } NTSTATUS Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Mon Jan 30 16:47:39 2012 @@ -384,7 +384,6 @@ { /* not implemented */ DPRINT1("IOCTL_KEYBOARD_QUERY_INDICATORS not implemented\n"); - ASSERT(FALSE); Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; @@ -393,7 +392,6 @@ { /* not implemented */ DPRINT1("IOCTL_KEYBOARD_QUERY_TYPEMATIC not implemented\n"); - ASSERT(FALSE); Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; @@ -402,7 +400,6 @@ { /* not implemented */ DPRINT1("IOCTL_KEYBOARD_SET_INDICATORS not implemented\n"); - ASSERT(FALSE); Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; @@ -411,7 +408,6 @@ { /* not implemented */ DPRINT1("IOCTL_KEYBOARD_SET_TYPEMATIC not implemented\n"); - ASSERT(FALSE); Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; @@ -420,7 +416,6 @@ { /* not implemented */ DPRINT1("IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION not implemented\n"); - ASSERT(FALSE); Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED;

12 years, 11 months

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 January 2012