Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[akhaldi] 55358: [README.WINE] * Mark some modules, that are in sync with Wine 1.3.37, as such.
by akhaldi＠svn.reactos.org 31 Jan '12

31 Jan '12

Author: akhaldi Date: Tue Jan 31 20:53:40 2012 New Revision: 55358 URL: http://svn.reactos.org/svn/reactos?rev=55358&view=rev Log: [README.WINE] * Mark some modules, that are in sync with Wine 1.3.37, as such. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Jan 31 20:53:40 2012 @@ -70,18 +70,18 @@ reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.3.37 reactos/dll/win32/imagehlp # Autosync -reactos/dll/win32/imm32 # Autosync +reactos/dll/win32/imm32 # Synced to Wine-1.3.37 reactos/dll/win32/inetcomm # Synced to Wine-1.3.37 reactos/dll/win32/inetmib1 # Autosync -reactos/dll/win32/initpki # Autosync +reactos/dll/win32/initpki # Synced to Wine-1.3.37 reactos/dll/win32/inseng # Synced to Wine-1.3.37 reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Autosync +reactos/dll/win32/itircl # Synced to Wine-1.3.37 reactos/dll/win32/itss # Synced to Wine-1.3.37 reactos/dll/win32/jscript # Autosync reactos/dll/win32/localspl # Autosync reactos/dll/win32/localui # Autosync -reactos/dll/win32/lz32 # Autosync +reactos/dll/win32/lz32 # Synced to Wine-1.3.37 reactos/dll/win32/mapi32 # Autosync reactos/dll/win32/mciavi32 # Synced to Wine-1.3.37 reactos/dll/win32/mcicda # Synced to Wine-1.3.37 @@ -90,26 +90,27 @@ reactos/dll/win32/mciwave # Synced to Wine-1.3.37 reactos/dll/win32/mlang # Synced to Wine-1.3.37 reactos/dll/win32/mpr # Autosync -reactos/dll/win32/mprapi # Autosync +reactos/dll/win32/mprapi # Synced to Wine-1.3.37 reactos/dll/win32/msacm32 # Autosync reactos/dll/win32/msadp32.acm # Synced to Wine-1.3.37 -reactos/dll/win32/mscat32 # Autosync +reactos/dll/win32/mscat32 # Synced to Wine-1.3.37 reactos/dll/win32/mscms # Synced to Wine-1.3.37 reactos/dll/win32/mscoree # Synced to Wine-1.3.37 reactos/dll/win32/msctf # Synced to Wine-1.3.37 reactos/dll/win32/msftedit # Synced to Wine-1.3.37 reactos/dll/win32/msg711.acm # Synced to Wine-1.3.37 -reactos/dll/win32/msgsm32.acm # Autosync +reactos/dll/win32/msgsm32.acm # Synced to Wine-1.3.37 reactos/dll/win32/mshtml # Autosync -reactos/dll/win32/msimg32 # Autosync +reactos/dll/win32/mshtml.tlb # Autosync reactos/dll/win32/msi # Autosync +reactos/dll/win32/msimg32 # Synced to Wine-1.3.37 reactos/dll/win32/msimtf # Synced to Wine-1.3.37 reactos/dll/win32/msisip # Synced to Wine-1.3.37 -reactos/dll/win32/msisys.ocx # Autosync -reactos/dll/win32/msnet32 # Autosync +reactos/dll/win32/msisys.ocx # Synced to Wine-1.3.37 +reactos/dll/win32/msnet32 # Synced to Wine-1.3.37 reactos/dll/win32/msrle32 # Autosync -reactos/dll/win32/mssign32 # Autosync -reactos/dll/win32/mssip32 # Autosync +reactos/dll/win32/mssign32 # Synced to Wine-1.3.37 +reactos/dll/win32/mssip32 # Synced to Wine-1.3.37 reactos/dll/win32/mstask # Synced to Wine-1.3.37 reactos/dll/win32/msvcrt20 # Autosync reactos/dll/win32/msvfw32 # Autosync @@ -125,36 +126,37 @@ reactos/dll/win32/ole32 # Autosync reactos/dll/win32/oleacc # Autosync reactos/dll/win32/oleaut32 # Autosync -reactos/dll/win32/olecli32 # Autosync +reactos/dll/win32/olecli32 # Synced to Wine-1.3.37 reactos/dll/win32/oledlg # Autosync reactos/dll/win32/olepro32 # Autosync -reactos/dll/win32/olesvr32 # Autosync -reactos/dll/win32/olethk32 # Autosync +reactos/dll/win32/olesvr32 # Synced to Wine-1.3.37 +reactos/dll/win32/olethk32 # Synced to Wine-1.3.37 reactos/dll/win32/pdh # Autosync -reactos/dll/win32/pidgen # Autosync +reactos/dll/win32/pidgen # Synced to Wine-1.3.37 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.3.37 reactos/dll/win32/pstorec # Synced to Wine-1.3.37 reactos/dll/win32/query # Synced to Wine-1.3.37 reactos/dll/win32/rasapi32 # Synced to Wine-1.3.37 -reactos/dll/win32/resutils # Autosync +reactos/dll/win32/resutils # Synced to Wine-1.3.37 reactos/dll/win32/riched20 # Synced to Wine-1.3.37 -reactos/dll/win32/riched32 # Autosync +reactos/dll/win32/riched32 # Synced to Wine-1.3.37 reactos/dll/win32/rpcrt4 # Synced to Wine-1.3.26 reactos/dll/win32/rsabase # Autosync reactos/dll/win32/rsaenh # Autosync -reactos/dll/win32/sccbase # Autosync -reactos/dll/win32/schannel # Autosync +reactos/dll/win32/sccbase # Synced to Wine-1.3.37 +reactos/dll/win32/schannel # Synced to Wine-1.3.37 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Autosync +reactos/dll/win32/sensapi # Synced to Wine-1.3.37 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shdocvw # Autosync reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Autosync -reactos/dll/win32/slbcsp # Autosync -reactos/dll/win32/softpub # Autosync +reactos/dll/win32/slbcsp # Synced to Wine-1.3.37 +reactos/dll/win32/snmpapi # Synced to Wine-1.3.37 +reactos/dll/win32/softpub # Synced to Wine-1.3.37 reactos/dll/win32/spoolss # Autosync reactos/dll/win32/stdole2.tlb # Synced to Wine-1.3.37 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.3.37 @@ -163,7 +165,7 @@ reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/traffic # Autosync reactos/dll/win32/twain_32 # Out of sync -reactos/dll/win32/updspapi # Autosync +reactos/dll/win32/updspapi # Synced to Wine-1.3.37 reactos/dll/win32/url # Autosync reactos/dll/win32/urlmon # Autosync reactos/dll/win32/usp10 # Synced to Wine-1.3.37 @@ -172,20 +174,20 @@ reactos/dll/win32/wer # Autosync reactos/dll/win32/windowscodecs # Autosync reactos/dll/win32/winemp3.acm # Synced to Wine-1.3.37 +reactos/dll/win32/winhttp # Autosync reactos/dll/win32/wininet # Autosync -reactos/dll/win32/winhttp # Autosync reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/wintrust # Autosync reactos/dll/win32/wldap32 # Autosync -reactos/dll/win32/wmi # Autosync +reactos/dll/win32/wmi # Synced to Wine-1.3.37 reactos/dll/win32/wtsapi32 # Synced to Wine-1.3.37 reactos/dll/win32/wuapi # Autosync -reactos/dll/win32/xinput1_1 # Autosync -reactos/dll/win32/xinput1_2 # Autosync +reactos/dll/win32/xinput1_1 # Synced to Wine-1.3.37 +reactos/dll/win32/xinput1_2 # Synced to Wine-1.3.37 reactos/dll/win32/xinput1_3 # Autosync -reactos/dll/win32/xinput9_1_0 # Autosync +reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.3.37 reactos/dll/win32/xmllite # Autosync reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21

1 0

[janderwald] 55357: [HIDPARSE] - Implement HidP_GetUsagesEx - HidP_GetUsagesEx uses HidP_GetUsages with undefined usage page - Required for hid usb support - Check if there is a maximum set. In tha...
by janderwald＠svn.reactos.org 31 Jan '12

31 Jan '12

Author: janderwald Date: Tue Jan 31 19:00:45 2012 New Revision: 55357 URL: http://svn.reactos.org/svn/reactos?rev=55357&view=rev Log: [HIDPARSE] - Implement HidP_GetUsagesEx - HidP_GetUsagesEx uses HidP_GetUsages with undefined usage page - Required for hid usb support - Check if there is a maximum set. In that case verify if a usage maximum has been set and apply it to the currnt usage. Fixes asserts while usb composite device installation (keyboard) Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/api.c branches/usb-bringup-trunk/lib/drivers/hidparser/parser.c 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] Tue Jan 31 19:00:45 2012 @@ -345,6 +345,7 @@ PHID_REPORT_ITEM ReportItem; UCHAR Activated; ULONG Data; + PUSAGE_AND_PAGE UsageAndPage = NULL; // // get report @@ -366,6 +367,17 @@ return HIDPARSER_STATUS_INVALID_REPORT_LENGTH; } + // + // cast to usage and page + // + if (UsagePage == HID_USAGE_PAGE_UNDEFINED) + { + // + // the caller requested any set usages + // + UsageAndPage = (PUSAGE_AND_PAGE)UsageList; + } + for(Index = 0; Index < Report->ItemCount; Index++) { // @@ -384,17 +396,20 @@ // CurrentUsagePage = (ReportItem->UsageMinimum >> 16); - // - // does usage match - // - if (UsagePage != CurrentUsagePage) - continue; + if (UsagePage != HID_USAGE_PAGE_UNDEFINED) + { + // + // does usage match + // + if (UsagePage != CurrentUsagePage) + continue; + } // // check if the specified usage is activated // ASSERT(ReportItem->ByteOffset < ReportDescriptorLength); - ASSERT(ReportItem->BitCount < 8); + ASSERT(ReportItem->BitCount <= 8); // // one extra shift for skipping the prepended report id @@ -428,10 +443,21 @@ continue; } - // - // store item - // - UsageList[ItemCount] = (ReportItem->UsageMinimum & 0xFFFF); + if (UsagePage != HID_USAGE_PAGE_UNDEFINED) + { + // + // store item + // + UsageList[ItemCount] = (ReportItem->UsageMinimum & 0xFFFF); + } + else + { + // + // store usage and page + // + UsageAndPage[ItemCount].Usage = (ReportItem->UsageMinimum & 0xFFFF); + UsageAndPage[ItemCount].UsagePage = CurrentUsagePage; + } ItemCount++; } @@ -443,10 +469,21 @@ return HIDPARSER_STATUS_BUFFER_TOO_SMALL; } - // - // success, clear rest of array - // - Parser->Zero(&UsageList[ItemCount], (*UsageLength - ItemCount) * sizeof(USAGE)); + if (UsagePage == HID_USAGE_PAGE_UNDEFINED) + { + // + // success, clear rest of array + // + Parser->Zero(&UsageAndPage[ItemCount], (*UsageLength - ItemCount) * sizeof(USAGE_AND_PAGE)); + } + else + { + // + // success, clear rest of array + // + Parser->Zero(&UsageList[ItemCount], (*UsageLength - ItemCount) * sizeof(USAGE)); + } + // // store result size 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] Tue Jan 31 19:00:45 2012 @@ -535,20 +535,21 @@ // get usage minimum from local state // UsageValue = LocalItemState->UsageMinimum; - ASSERT(LocalItemState->UsageMinimumSet); - ASSERT(LocalItemState->UsageMaximumSet); // // append item index // UsageValue.u.Extended += ReportItemIndex; - if (UsageValue.u.Extended > LocalItemState->UsageMaximum.u.Extended) + if (LocalItemState->UsageMaximumSet) { - // - // maximum reached - // - UsageValue.u.Extended = LocalItemState->UsageMaximum.u.Extended; + if (UsageValue.u.Extended > LocalItemState->UsageMaximum.u.Extended) + { + // + // maximum reached + // + UsageValue.u.Extended = LocalItemState->UsageMaximum.u.Extended; + } } }

1 0

[janderwald] 55356: [HIDCLASS] - Implement set idle request. The device should only send data when there is actual data. May also fix the mouse debug flood when mouse is ejected - Not yet supported...
by janderwald＠svn.reactos.org 31 Jan '12

31 Jan '12

Author: janderwald Date: Tue Jan 31 18:37:49 2012 New Revision: 55356 URL: http://svn.reactos.org/svn/reactos?rev=55356&view=rev Log: [HIDCLASS] - Implement set idle request. The device should only send data when there is actual data. May also fix the mouse debug flood when mouse is ejected - Not yet supported in OHCI - Add missing constants Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.h branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup-trunk/include/ddk/hidport.h Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c [iso-8859-1] Tue Jan 31 18:37:49 2012 @@ -1230,6 +1230,72 @@ return Status; } +NTSTATUS +Hid_SetIdle( + IN PDEVICE_OBJECT DeviceObject) +{ + PHID_USB_DEVICE_EXTENSION HidDeviceExtension; + PHID_DEVICE_EXTENSION DeviceExtension; + PURB Urb; + NTSTATUS Status; + + // + // get device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + + // + // allocate urb + // + Urb = ExAllocatePool(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); + if (!Urb) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // zero urb + // + RtlZeroMemory(Urb, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); + + // + // format urb + // + UsbBuildVendorRequest(Urb, + URB_FUNCTION_CLASS_INTERFACE, + sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), + 0, + HID_REPORT_DESCRIPTOR_TYPE, + USB_SET_IDLE_REQUEST, // HID_SET_IDLE + 0, + 0, + NULL, + NULL, + 0, + NULL); + + // + // dispatch urb + // + Status = Hid_DispatchUrb(DeviceObject, Urb); + + // + // free urb + // + ExFreePool(Urb); + + // + // print status + // + DPRINT1("Status %x\n", Status); + return Status; +} + + NTSTATUS Hid_PnpStart( @@ -1332,6 +1398,12 @@ ASSERT(InterfaceDescriptor->bInterfaceClass == USB_DEVICE_CLASS_HUMAN_INTERFACE); ASSERT(InterfaceDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE); ASSERT(InterfaceDescriptor->bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); + + // + // now set the device idle + // + Hid_SetIdle(DeviceObject); + // // move to next descriptor Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.h [iso-8859-1] Tue Jan 31 18:37:49 2012 @@ -11,6 +11,8 @@ #include <usbioctl.h> #include <usb.h> #include <usbdlib.h> + +#include <hidport.h> typedef struct { @@ -80,3 +82,5 @@ Hid_DispatchUrb( IN PDEVICE_OBJECT DeviceObject, IN PURB Urb); + +#define USB_SET_IDLE_REQUEST 0xA Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Tue Jan 31 18:37:49 2012 @@ -1731,7 +1731,10 @@ if (Urb->UrbControlVendorClassRequest.TransferBufferLength == 0) { - DPRINT1("Invalid request length\n"); + // + // FIXME: support requests w/o data stage + //; + ASSERT(FALSE); return STATUS_SUCCESS; } Modified: branches/usb-bringup-trunk/include/ddk/hidport.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/ddk/h… ============================================================================== --- branches/usb-bringup-trunk/include/ddk/hidport.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/include/ddk/hidport.h [iso-8859-1] Tue Jan 31 18:37:49 2012 @@ -47,6 +47,11 @@ #include <poppack.h> +#define HID_HID_DESCRIPTOR_TYPE 0x21 +#define HID_REPORT_DESCRIPTOR_TYPE 0x22 +#define HID_PHYSICAL_DESCRIPTOR_TYPE 0x23 + + typedef VOID

1 0

[cgutman] 55355: [NTOSKRNL] - Don't check for the correct parent in IopActionInitChildServices - This function is also used to load drivers later for devices enumerated early in boot (before we hav...
by cgutman＠svn.reactos.org 31 Jan '12

31 Jan '12

Author: cgutman Date: Tue Jan 31 18:26:03 2012 New Revision: 55355 URL: http://svn.reactos.org/svn/reactos?rev=55355&view=rev Log: [NTOSKRNL] - Don't check for the correct parent in IopActionInitChildServices - This function is also used to load drivers later for devices enumerated early in boot (before we have access to the disk) and we want it to run for all devices on the system, not just those that are immediate children of the root node - Fixes broken PnP in 3rd stage Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c 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] Tue Jan 31 18:26:03 2012 @@ -2534,15 +2534,11 @@ } /* - * Make sure this device node is a direct child of the parent device node - * that is given as an argument + * We don't want to check for a direct child because + * this function is called during boot to reinitialize + * devices with drivers that couldn't load yet due to + * stage 0 limitations (ie can't load from disk yet). */ - - if (DeviceNode->Parent != ParentDeviceNode) - { - DPRINT("Skipping 2+ level child\n"); - return STATUS_SUCCESS; - } if (!(DeviceNode->Flags & DNF_PROCESSED)) {

1 0

[pschweitzer] 55354: [NTOSKRNL] Implement IoVolumeDeviceToDosName(), taking advantage of newcomer in the branch, MountMgr :-). This implementation will in fact don't work as MountMgr doesn't implem...
by pschweitzer＠svn.reactos.org 31 Jan '12

31 Jan '12

Author: pschweitzer Date: Tue Jan 31 18:18:46 2012 New Revision: 55354 URL: http://svn.reactos.org/svn/reactos?rev=55354&view=rev Log: [NTOSKRNL] Implement IoVolumeDeviceToDosName(), taking advantage of newcomer in the branch, MountMgr :-). This implementation will in fact don't work as MountMgr doesn't implement that part... But the day it's ready, this function will be! Modified: branches/usb-bringup-trunk/ntoskrnl/include/ntoskrnl.h branches/usb-bringup-trunk/ntoskrnl/io/iomgr/volume.c Modified: branches/usb-bringup-trunk/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/incl… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Tue Jan 31 18:18:46 2012 @@ -31,6 +31,7 @@ #include <ntifs.h> #include <wdmguid.h> #include <arc/arc.h> +#include <mountmgr.h> #undef NTHALAPI #define NTHALAPI __declspec(dllimport) #include <ndk/asm.h> Modified: branches/usb-bringup-trunk/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/i… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Tue Jan 31 18:18:46 2012 @@ -1269,15 +1269,165 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI IoVolumeDeviceToDosName(IN PVOID VolumeDeviceObject, OUT PUNICODE_STRING DosName) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PIRP Irp; + ULONG Length; + KEVENT Event; + NTSTATUS Status; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING MountMgrDevice; + MOUNTMGR_VOLUME_PATHS VolumePath; + PMOUNTMGR_VOLUME_PATHS VolumePathPtr; + /* + * This variable with be required to query device name. + * It's based on MOUNTDEV_NAME (mountmgr.h). + * Doing it that way will prevent dyn memory allocation. + * Device name won't be longer. + */ + struct + { + USHORT NameLength; + WCHAR DeviceName[256]; + } DeviceName; + + PAGED_CODE(); + + /* First step, getting device name */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, + VolumeDeviceObject, NULL, 0, + &DeviceName, sizeof(DeviceName), + FALSE, &Event, &IoStatusBlock); + if (!Irp) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = IoCallDriver(VolumeDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Now that we have the device name, we can query the MountMgr + * So, get its device object first. + */ + RtlInitUnicodeString(&MountMgrDevice, MOUNTMGR_DEVICE_NAME); + Status = IoGetDeviceObjectPointer(&MountMgrDevice, FILE_READ_ATTRIBUTES, + &FileObject, &DeviceObject); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Then, use the proper IOCTL to query the DOS name */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATH, + DeviceObject, &DeviceName, sizeof(DeviceName), + &VolumePath, sizeof(VolumePath), + FALSE, &Event, &IoStatusBlock); + if (!Irp) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto DereferenceFO; + } + + Status = IoCallDriver(VolumeDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + + /* Only tolerated failure here is buffer too small, which is + * expected. + */ + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + goto DereferenceFO; + } + + /* Compute needed size to store DOS name. + * Even if MOUNTMGR_VOLUME_PATHS allows bigger + * name lengths than MAXUSHORT, we can't use + * them, because we have to return this in an UNICODE_STRING + * that stores length on USHORT. + */ + Length = VolumePath.MultiSzLength + sizeof(VolumePath); + if (Length > MAXUSHORT) + { + Status = STATUS_INVALID_BUFFER_SIZE; + goto DereferenceFO; + } + + /* Reallocate memory, even in case of success, because + * that's the buffer that will be returned to caller + */ + VolumePathPtr = ExAllocatePoolWithTag(PagedPool, Length, 'D2d '); + if (!VolumePathPtr) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto DereferenceFO; + } + + /* Requery DOS path with proper size */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildDeviceIoControlRequest(IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATH, + DeviceObject, &DeviceName, sizeof(DeviceName), + VolumePathPtr, Length, + FALSE, &Event, &IoStatusBlock); + if (!Irp) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto ReleaseMemory; + } + + Status = IoCallDriver(VolumeDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + + if (!NT_SUCCESS(Status)) + { + goto ReleaseMemory; + } + + /* Set output string */ + DosName->Length = VolumePathPtr->MultiSzLength; + DosName->MaximumLength = VolumePathPtr->MultiSzLength + sizeof(UNICODE_NULL); + /* Our MOUNTMGR_VOLUME_PATHS will be used as output buffer */ + DosName->Buffer = (PWSTR)VolumePathPtr; + /* Move name at the begin, RtlMoveMemory is OK with overlapping */ + RtlMoveMemory(DosName->Buffer, VolumePathPtr->MultiSz, VolumePathPtr->MultiSzLength); + DosName->Buffer[DosName->Length / sizeof(WCHAR)] = UNICODE_NULL; + + /* DON'T release buffer, just dereference FO, and return success */ + Status = STATUS_SUCCESS; + goto DereferenceFO; + +ReleaseMemory: + ExFreePoolWithTag(VolumePathPtr, 'D2d '); + +DereferenceFO: + ObDereferenceObject(FileObject); + + return Status; } /* EOF */

1 0

[janderwald] 55353: [HIDPARSER] - Rewrite hidparser so that it support multiple top level collections - Add support for flat collection context meaning all context structures are aligned in after e...
by janderwald＠svn.reactos.org 31 Jan '12

31 Jan '12

Author: janderwald Date: Tue Jan 31 16:19:33 2012 New Revision: 55353 URL: http://svn.reactos.org/svn/reactos?rev=55353&view=rev Log: [HIDPARSER] - Rewrite hidparser so that it support multiple top level collections - Add support for flat collection context meaning all context structures are aligned in after each other. The reason this is required is that usermode hid.dll will access the same structure and thus can't use kernel pointers. User mode hid.dll is used to support keyboard with custom keys (for example search key, email key etc) Added: branches/usb-bringup-trunk/lib/drivers/hidparser/context.c (with props) Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c branches/usb-bringup-trunk/lib/drivers/hidparser/CMakeLists.txt 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/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c [iso-8859-1] Tue Jan 31 16:19:33 2012 @@ -93,7 +93,7 @@ // // init parser // - HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, NULL, &Parser); + HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, &Parser); // // free collection @@ -114,12 +114,12 @@ // // init parser // - HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, PreparsedData, &Parser); + HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, &Parser); // // get caps // - return HidParser_GetCaps(&Parser, Capabilities); + return HidParser_GetCaps(&Parser, PreparsedData, Capabilities); } NTSTATUS @@ -130,30 +130,17 @@ IN POOL_TYPE PoolType, OUT PHIDP_DEVICE_DESC DeviceDescription) { - PHID_PARSER Parser; - HIDPARSER_STATUS Status; - - // - // first allocate the parser - // - Status = HidParser_AllocateParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, &Parser); - if (Status != HIDPARSER_STATUS_SUCCESS) - { - // - // not enough memory - // - return STATUS_INSUFFICIENT_RESOURCES; - } + HID_PARSER Parser; + + // + // init parser + // + HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, &Parser); // // get description; // - Status = HidParser_GetCollectionDescription(Parser, ReportDesc, DescLength, PoolType, DeviceDescription); - - // - // FIXME parser memory leak - // - return Status; + return HidParser_GetCollectionDescription(&Parser, ReportDesc, DescLength, PoolType, DeviceDescription); } HIDAPI @@ -174,13 +161,13 @@ // // init parser // - HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, PreparsedData, &Parser); + HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, &Parser); // // get usage length // - return HidParser_MaxUsageListLength(&Parser, ReportType, UsagePage); + return HidParser_MaxUsageListLength(&Parser, PreparsedData, ReportType, UsagePage); } HIDAPI @@ -205,12 +192,12 @@ // // init parser // - HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, PreparsedData, &Parser); + HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, &Parser); // // get value caps // - return HidParser_GetSpecificValueCaps(&Parser, ReportType, UsagePage, LinkCollection, Usage, ValueCaps, ValueCapsLength); + return HidParser_GetSpecificValueCaps(&Parser, PreparsedData, ReportType, UsagePage, LinkCollection, Usage, ValueCaps, ValueCapsLength); } HIDAPI @@ -236,12 +223,12 @@ // // init parser // - HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, PreparsedData, &Parser); + HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, &Parser); // // get usages // - return HidParser_GetUsages(&Parser, ReportType, UsagePage, LinkCollection, UsageList, UsageLength, Report, ReportLength); + return HidParser_GetUsages(&Parser, PreparsedData, ReportType, UsagePage, LinkCollection, UsageList, UsageLength, Report, ReportLength); } @@ -311,12 +298,12 @@ // // init parser // - HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, PreparsedData, &Parser); + HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, &Parser); // // get scaled usage value // - return HidParser_GetScaledUsageValue(&Parser, ReportType, UsagePage, LinkCollection, Usage, UsageValue, Report, ReportLength); + return HidParser_GetScaledUsageValue(&Parser, PreparsedData, ReportType, UsagePage, LinkCollection, Usage, UsageValue, Report, ReportLength); } HIDAPI @@ -335,7 +322,7 @@ // // init parser // - HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, NULL, &Parser); + HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, &Parser); // // translate usage pages Modified: branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c [iso-8859-1] Tue Jan 31 16:19:33 2012 @@ -324,8 +324,8 @@ InterfaceList[InterfaceCount].InterfaceDescriptor != NULL; InterfaceCount++) { - UrbSize += sizeof(USBD_INTERFACE_INFORMATION); - UrbSize += (InterfaceList[InterfaceCount].InterfaceDescriptor->bNumEndpoints - 1) * sizeof(USBD_PIPE_INFORMATION); + UrbSize += FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes); + UrbSize += (InterfaceList[InterfaceCount].InterfaceDescriptor->bNumEndpoints) * sizeof(USBD_PIPE_INFORMATION); } UrbSize += sizeof(URB) + sizeof(USBD_INTERFACE_INFORMATION); Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/CMakeLists.txt [iso-8859-1] Tue Jan 31 16:19:33 2012 @@ -4,6 +4,7 @@ -DNDEBUG=1) list(APPEND SOURCE + context.c hidparser.c parser.c api.c) 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] Tue Jan 31 16:19:33 2012 @@ -31,143 +31,9 @@ 150,158,159,128,136,177,178,176,142,152,173,140 }; - - -ULONG -HidParser_NumberOfTopCollections( - IN PHID_PARSER Parser) -{ - PHID_PARSER_CONTEXT ParserContext; - - // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // sanity checks - // - ASSERT(ParserContext); - ASSERT(ParserContext->RootCollection); - ASSERT(ParserContext->RootCollection->NodeCount); - - // - // number of top collections - // - return ParserContext->RootCollection->NodeCount; -} - -PHID_COLLECTION -HidParser_GetCollection( - IN PHID_PARSER Parser, - IN ULONG CollectionNumber) -{ - PHID_PARSER_CONTEXT ParserContext; - - // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // sanity checks - // - ASSERT(ParserContext); - ASSERT(ParserContext->RootCollection); - ASSERT(ParserContext->RootCollection->NodeCount); - - // - // is collection index out of bounds - // - if (CollectionNumber < ParserContext->RootCollection->NodeCount) - { - // - // valid collection - // - return ParserContext->RootCollection->Nodes[CollectionNumber]; - } - - // - // no such collection - // - Parser->Debug("HIDPARSE] No such collection %lu\n", CollectionNumber); - return NULL; -} - -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 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 HidParser_GetCollectionUsagePage( - IN PHID_PARSER Parser, - IN ULONG CollectionIndex, + IN PVOID CollectionContext, OUT PUSHORT Usage, OUT PUSHORT UsagePage) { @@ -176,7 +42,7 @@ // // find collection // - Collection = HidParser_GetCollection(Parser, CollectionIndex); + Collection = HidParser_GetCollectionFromContext(CollectionContext); if (!Collection) { // @@ -195,33 +61,16 @@ ULONG HidParser_GetReportLength( - IN PHID_PARSER Parser, - IN ULONG CollectionIndex, - IN ULONG ReportType) -{ - PHID_PARSER_CONTEXT ParserContext; + IN PVOID CollectionContext, + IN UCHAR ReportType) +{ PHID_REPORT Report; ULONG ReportLength; // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // sanity checks - // - ASSERT(ParserContext); - - // - // FIXME support multiple top collecions - // - ASSERT(ParserContext->RootCollection->NodeCount == 1); - - // // get first report // - Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); + Report = HidParser_GetReportInCollection(CollectionContext, ReportType); if (!Report) { // @@ -249,56 +98,17 @@ return ReportLength; } -UCHAR -HidParser_IsReportIDUsed( - IN PHID_PARSER Parser) -{ - PHID_PARSER_CONTEXT ParserContext; - - // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // sanity checks - // - ASSERT(ParserContext); - - // - // return flag - // - return ParserContext->UseReportIDs; -} - ULONG HidParser_GetReportItemCountFromReportType( - IN PHID_PARSER Parser, - IN ULONG CollectionIndex, - IN ULONG ReportType) -{ - PHID_PARSER_CONTEXT ParserContext; + IN PVOID CollectionContext, + IN UCHAR ReportType) +{ PHID_REPORT Report; // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // sanity checks - // - ASSERT(ParserContext); - - // - // FIXME support multiple top collecions - // - ASSERT(ParserContext->RootCollection->NodeCount == 1); - - // // get report // - Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); + Report = HidParser_GetReportInCollection(CollectionContext, ReportType); if (!Report) { // @@ -316,35 +126,18 @@ ULONG HidParser_GetReportItemTypeCountFromReportType( - IN PHID_PARSER Parser, - IN ULONG CollectionIndex, - IN ULONG ReportType, + IN PVOID CollectionContext, + IN UCHAR ReportType, IN ULONG bData) { - PHID_PARSER_CONTEXT ParserContext; ULONG Index; PHID_REPORT Report; ULONG ItemCount = 0; // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // sanity checks - // - ASSERT(ParserContext); - - // - // FIXME support multiple top collecions - // - ASSERT(ParserContext->RootCollection->NodeCount == 1); - - // // get report // - Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); + Report = HidParser_GetReportInCollection(CollectionContext, ReportType); if (!Report) { // @@ -361,14 +154,14 @@ // // check item type // - if (Report->Items[Index]->HasData && bData == TRUE) + if (Report->Items[Index].HasData && bData == TRUE) { // // found data item // ItemCount++; } - else if (Report->Items[Index]->HasData == FALSE && bData == FALSE) + else if (Report->Items[Index].HasData == FALSE && bData == FALSE) { // // found value item @@ -383,85 +176,6 @@ return ItemCount; } -ULONG -HidParser_GetContextSize( - IN PHID_PARSER Parser, - IN ULONG CollectionIndex) -{ - // - // FIXME the context must contain all parsed info - // - return sizeof(HID_PARSER_CONTEXT); -} - -VOID -HidParser_FreeContext( - IN PHID_PARSER Parser, - IN PUCHAR Context, - IN ULONG ContextLength) -{ - // - // FIXME implement freeing of parsed info - // -} - -HIDPARSER_STATUS -HidParser_AllocateParser( - IN PHIDPARSER_ALLOC_FUNCTION AllocFunction, - IN PHIDPARSER_FREE_FUNCTION FreeFunction, - IN PHIDPARSER_ZERO_FUNCTION ZeroFunction, - IN PHIDPARSER_COPY_FUNCTION CopyFunction, - IN PHIDPARSER_DEBUG_FUNCTION DebugFunction, - OUT PHID_PARSER *OutParser) -{ - PHID_PARSER Parser; - PHID_PARSER_CONTEXT ParserContext; - - // - // allocate - // - Parser = (PHID_PARSER)AllocFunction(sizeof(HID_PARSER)); - if (!Parser) - { - // - // no memory - // - return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; - } - - // - // allocate parser context - // - ParserContext = (PHID_PARSER_CONTEXT)AllocFunction(sizeof(HID_PARSER_CONTEXT)); - if (!ParserContext) - { - // - // no memory - // - FreeFunction(Parser); - return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; - } - - - // - // init parser - // - Parser->Alloc = AllocFunction; - Parser->Free = FreeFunction; - Parser->Zero = ZeroFunction; - Parser->Copy = CopyFunction; - Parser->Debug = DebugFunction; - Parser->ParserContext = ParserContext; - - // - // store result - // - *OutParser = Parser; - // - // success - // - return HIDPARSER_STATUS_SUCCESS; -} VOID HidParser_InitParser( @@ -470,7 +184,6 @@ IN PHIDPARSER_ZERO_FUNCTION ZeroFunction, IN PHIDPARSER_COPY_FUNCTION CopyFunction, IN PHIDPARSER_DEBUG_FUNCTION DebugFunction, - IN PVOID ParserContext, OUT PHID_PARSER Parser) { Parser->Alloc = AllocFunction; @@ -478,85 +191,23 @@ Parser->Zero = ZeroFunction; Parser->Copy = CopyFunction; Parser->Debug = DebugFunction; - Parser->ParserContext = ParserContext; -} - -ULONG -HidParser_GetCollectionCount( - IN PHID_COLLECTION Collection) -{ - ULONG Index; - ULONG Count = Collection->NodeCount; - - for(Index = 0; Index < Collection->NodeCount; Index++) - { - // - // count collection for sub nodes - // - Count += HidParser_GetCollectionCount(Collection->Nodes[Index]); - } - - // - // done - // - return Count; -} - -ULONG -HidParser_GetTotalCollectionCount( - IN PHID_PARSER Parser) -{ - PHID_PARSER_CONTEXT ParserContext; - - // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // sanity check - // - ASSERT(ParserContext); - ASSERT(ParserContext->RootCollection); - - // - // count collections - // - return HidParser_GetCollectionCount(ParserContext->RootCollection); } ULONG HidParser_GetMaxUsageListLengthWithReportAndPage( - IN PHID_PARSER Parser, - IN ULONG CollectionIndex, - IN ULONG ReportType, + IN PVOID CollectionContext, + IN UCHAR ReportType, IN USAGE UsagePage OPTIONAL) { - PHID_PARSER_CONTEXT ParserContext; ULONG Index; PHID_REPORT Report; ULONG ItemCount = 0; USHORT CurrentUsagePage; // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // sanity checks - // - ASSERT(ParserContext); - - // - // FIXME support multiple top collecions - // - ASSERT(ParserContext->RootCollection->NodeCount == 1); - - // // get report // - Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); + Report = HidParser_GetReportInCollection(CollectionContext, ReportType); if (!Report) { // @@ -570,8 +221,8 @@ // // check usage page // - CurrentUsagePage = (Report->Items[Index]->UsageMinimum >> 16); - if (CurrentUsagePage == UsagePage && Report->Items[Index]->HasData) + CurrentUsagePage = (Report->Items[Index].UsageMinimum >> 16); + if (CurrentUsagePage == UsagePage && Report->Items[Index].HasData) { // // found item @@ -589,14 +240,13 @@ HIDPARSER_STATUS HidParser_GetSpecificValueCapsWithReport( IN PHID_PARSER Parser, - IN ULONG CollectionIndex, - IN ULONG ReportType, + IN PVOID CollectionContext, + IN UCHAR ReportType, IN USHORT UsagePage, IN USHORT Usage, OUT PHIDP_VALUE_CAPS ValueCaps, IN OUT PULONG ValueCapsLength) { - PHID_PARSER_CONTEXT ParserContext; ULONG Index; PHID_REPORT Report; ULONG ItemCount = 0; @@ -604,24 +254,9 @@ USHORT CurrentUsage; // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // sanity checks - // - ASSERT(ParserContext); - - // - // FIXME support multiple top collecions - // - ASSERT(ParserContext->RootCollection->NodeCount == 1); - - // // get report // - Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); + Report = HidParser_GetReportInCollection(CollectionContext, ReportType); if (!Report) { // @@ -635,8 +270,8 @@ // // check usage page // - CurrentUsagePage = (Report->Items[Index]->UsageMinimum >> 16); - CurrentUsage = (Report->Items[Index]->UsageMinimum & 0xFFFF); + CurrentUsagePage = (Report->Items[Index].UsageMinimum >> 16); + CurrentUsage = (Report->Items[Index].UsageMinimum & 0xFFFF); if ((Usage == CurrentUsage && UsagePage == CurrentUsagePage) || (Usage == 0 && UsagePage == CurrentUsagePage) || (Usage == CurrentUsage && UsagePage == 0) || (Usage == 0 && UsagePage == 0)) { @@ -655,10 +290,10 @@ // ValueCaps[ItemCount].UsagePage = CurrentUsagePage; ValueCaps[ItemCount].ReportID = Report->ReportID; - ValueCaps[ItemCount].LogicalMin = Report->Items[Index]->Minimum; - ValueCaps[ItemCount].LogicalMax = Report->Items[Index]->Maximum; - ValueCaps[ItemCount].IsAbsolute = !Report->Items[Index]->Relative; - ValueCaps[ItemCount].BitSize = Report->Items[Index]->BitCount; + ValueCaps[ItemCount].LogicalMin = Report->Items[Index].Minimum; + ValueCaps[ItemCount].LogicalMax = Report->Items[Index].Maximum; + ValueCaps[ItemCount].IsAbsolute = !Report->Items[Index].Relative; + ValueCaps[ItemCount].BitSize = Report->Items[Index].BitCount; // // FIXME: FILLMEIN @@ -695,15 +330,14 @@ HIDPARSER_STATUS HidParser_GetUsagesWithReport( IN PHID_PARSER Parser, - IN ULONG CollectionIndex, - IN ULONG ReportType, + IN PVOID CollectionContext, + IN UCHAR ReportType, IN USAGE UsagePage, OUT USAGE *UsageList, IN OUT PULONG UsageLength, IN PCHAR ReportDescriptor, IN ULONG ReportDescriptorLength) { - PHID_PARSER_CONTEXT ParserContext; ULONG Index; PHID_REPORT Report; ULONG ItemCount = 0; @@ -713,24 +347,9 @@ ULONG Data; // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // sanity checks - // - ASSERT(ParserContext); - - // - // FIXME support multiple top collecions - // - ASSERT(ParserContext->RootCollection->NodeCount == 1); - - // // get report // - Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); + Report = HidParser_GetReportInCollection(CollectionContext, ReportType); if (!Report) { // @@ -752,7 +371,7 @@ // // get report item // - ReportItem = Report->Items[Index]; + ReportItem = &Report->Items[Index]; // // does it have data @@ -843,15 +462,14 @@ HIDPARSER_STATUS HidParser_GetScaledUsageValueWithReport( IN PHID_PARSER Parser, - IN ULONG CollectionIndex, - IN ULONG ReportType, + IN PVOID CollectionContext, + IN UCHAR ReportType, IN USAGE UsagePage, IN USAGE Usage, OUT PLONG UsageValue, IN PCHAR ReportDescriptor, IN ULONG ReportDescriptorLength) { - PHID_PARSER_CONTEXT ParserContext; ULONG Index; PHID_REPORT Report; USHORT CurrentUsagePage; @@ -859,24 +477,9 @@ ULONG Data; // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - // - // sanity checks - // - ASSERT(ParserContext); - - // - // FIXME support multiple top collecions - // - ASSERT(ParserContext->RootCollection->NodeCount == 1); - - // // get report // - Report = HidParser_GetReportByType(Parser, CollectionIndex, ReportType); + Report = HidParser_GetReportInCollection(CollectionContext, ReportType); if (!Report) { // @@ -898,7 +501,7 @@ // // get report item // - ReportItem = Report->Items[Index]; + ReportItem = &Report->Items[Index]; // // check usage page @@ -1034,7 +637,6 @@ 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, @@ -1066,15 +668,3 @@ // 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; -} Added: branches/usb-bringup-trunk/lib/drivers/hidparser/context.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/context.c (added) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/context.c [iso-8859-1] Tue Jan 31 16:19:33 2012 @@ -1,0 +1,344 @@ +/* + * PROJECT: ReactOS HID Parser Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/drivers/hidparser/context.c + * PURPOSE: HID Parser + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + + +#include "parser.h" + +typedef struct +{ + ULONG Size; + union + { + UCHAR RawData[1]; + }; +}HID_COLLECTION_CONTEXT, *PHID_COLLECTION_CONTEXT; + +ULONG +HidParser_CalculateCollectionSize( + IN PHID_COLLECTION Collection) +{ + ULONG Size = 0, Index; + + Size = sizeof(HID_COLLECTION); + + // + // add size required for the number of report items + // + for(Index = 0; Index < Collection->ReportCount; Index++) + { + // + // get report size + // + ASSERT(Collection->Reports[Index]->ItemCount); + Size += sizeof(HID_REPORT) + Collection->Reports[Index]->ItemCount * sizeof(HID_REPORT_ITEM); + } + + // + // calculate size for sub collections + // + for(Index = 0; Index < Collection->NodeCount; Index++) + { + Size += HidParser_CalculateCollectionSize(Collection->Nodes[Index]); + } + + // + // append size for the offset + // + Size += (Collection->ReportCount + Collection->NodeCount) * sizeof(ULONG); + + // + // done + // + return Size; +} + +ULONG +HidParser_CalculateContextSize( + IN PHID_COLLECTION Collection) +{ + ULONG Size; + + // + // minimum size is the size of the collection + // + Size = HidParser_CalculateCollectionSize(Collection); + + // + // append collection context size + // + Size += sizeof(HID_COLLECTION_CONTEXT); + return Size; +} + +ULONG +HidParser_StoreCollection( + IN PHID_PARSER Parser, + IN PHID_COLLECTION Collection, + IN PHID_COLLECTION_CONTEXT CollectionContext, + IN ULONG CurrentOffset) +{ + ULONG Index; + ULONG ReportSize; + ULONG InitialOffset; + ULONG CollectionSize; + PHID_COLLECTION TargetCollection; + + // + // backup initial offset + // + InitialOffset = CurrentOffset; + + // + // get target collection + // + TargetCollection = (PHID_COLLECTION)(&CollectionContext->RawData[CurrentOffset]); + + // + // first copy the collection details + // + Parser->Copy(TargetCollection, Collection, sizeof(HID_COLLECTION)); + + // + // calulcate collection size + // + CollectionSize = sizeof(HID_COLLECTION) + sizeof(ULONG) * (Collection->ReportCount + Collection->NodeCount); + + // + // increase offset + // + CurrentOffset += CollectionSize; + + // + // sanity check + // + ASSERT(CurrentOffset < CollectionContext->Size); + + // + // first store the report items + // + for(Index = 0; Index < Collection->ReportCount; Index++) + { + // + // calculate report size + // + ReportSize = sizeof(HID_REPORT) + Collection->Reports[Index]->ItemCount * sizeof(HID_REPORT_ITEM); + + // + // sanity check + // + ASSERT(CurrentOffset + ReportSize < CollectionContext->Size); + + // + // copy report item + // + Parser->Copy(&CollectionContext->RawData[CurrentOffset], Collection->Reports[Index], ReportSize); + + // + // store offset to report item + // + TargetCollection->Offsets[Index] = CurrentOffset; + + // + // move to next offset + // + CurrentOffset += ReportSize; + } + + ASSERT(CurrentOffset <= CollectionContext->Size); + + // + // now store the sub collections + // + for(Index = 0; Index < Collection->NodeCount; Index++) + { + // + // store offset + // + TargetCollection->Offsets[Collection->NodeCount + Index] = CurrentOffset; + + // + // store sub collections + // + CurrentOffset += HidParser_StoreCollection(Parser, Collection->Nodes[Index], CollectionContext, CurrentOffset); + + // + // sanity check + // + ASSERT(CurrentOffset < CollectionContext->Size); + } + + // + // return size of collection + // + return CurrentOffset - InitialOffset; +} + +HIDPARSER_STATUS +HidParser_BuildCollectionContext( + IN PHID_PARSER Parser, + IN PHID_COLLECTION RootCollection, + IN PVOID Context, + IN ULONG ContextSize) +{ + PHID_COLLECTION_CONTEXT CollectionContext; + ULONG CollectionSize; + + // + // init context + // + CollectionContext = (PHID_COLLECTION_CONTEXT)Context; + CollectionContext->Size = ContextSize; + + // + // store collections + // + CollectionSize = HidParser_StoreCollection(Parser, RootCollection, CollectionContext, 0); + + // + // sanity check + // + ASSERT(CollectionSize + sizeof(HID_COLLECTION_CONTEXT) == ContextSize); + + DPRINT1("CollectionContext %p\n", CollectionContext); + DPRINT1("CollectionContext RawData %p\n", CollectionContext->RawData); + DPRINT1("CollectionContext Size %lu\n", CollectionContext->Size); + + // + // done + // + return HIDPARSER_STATUS_SUCCESS; +} + +PHID_REPORT +HidParser_SearchReportInCollection( + IN PHID_COLLECTION_CONTEXT CollectionContext, + IN PHID_COLLECTION Collection, + IN UCHAR ReportType) +{ + ULONG Index; + PHID_REPORT Report; + PHID_COLLECTION SubCollection; + + // + // search first in local array + // + for(Index = 0; Index < Collection->ReportCount; Index++) + { + // + // get report + // + Report = (PHID_REPORT)(CollectionContext->RawData + Collection->Offsets[Index]); + if (Report->Type == ReportType) + { + // + // found report + // + return Report; + } + } + + // + // now search in sub collections + // + for(Index = 0; Index < Collection->NodeCount; Index++) + { + // + // get collection + // + SubCollection = (PHID_COLLECTION)(CollectionContext->RawData + Collection->Offsets[Collection->NodeCount + Index]); + + // + // recursively search collection + // + Report = HidParser_SearchReportInCollection(CollectionContext, SubCollection, ReportType); + if (Report) + { + // + // found report + // + return Report; + } + } + + // + // not found + // + return NULL; +} + +PHID_REPORT +HidParser_GetReportInCollection( + IN PVOID Context, + IN UCHAR ReportType) +{ + PHID_COLLECTION_CONTEXT CollectionContext = (PHID_COLLECTION_CONTEXT)Context; + + // + // done + // + return HidParser_SearchReportInCollection(CollectionContext, (PHID_COLLECTION)&CollectionContext->RawData, ReportType); +} + +PHID_COLLECTION +HidParser_GetCollectionFromContext( + IN PVOID Context) +{ + PHID_COLLECTION_CONTEXT CollectionContext = (PHID_COLLECTION_CONTEXT)Context; + + // + // return root collection + // + return (PHID_COLLECTION)CollectionContext->RawData; +} + +ULONG +HidParser_GetCollectionCount( + IN PHID_COLLECTION_CONTEXT CollectionContext, + IN PHID_COLLECTION Collection) +{ + ULONG Index; + ULONG Count = Collection->NodeCount; + PHID_COLLECTION SubCollection; + + for(Index = 0; Index < Collection->NodeCount; Index++) + { + // + // get offset to sub collection + // + SubCollection = (PHID_COLLECTION)(CollectionContext->RawData + Collection->Offsets[Collection->NodeCount + Index]); + + // + // count collection for sub nodes + // + Count += HidParser_GetCollectionCount(CollectionContext, SubCollection); + } + + // + // done + // + return Count; +} + +ULONG +HidParser_GetTotalCollectionCount( + IN PVOID Context) +{ + PHID_COLLECTION_CONTEXT CollectionContext; + + // + // get parser context + // + CollectionContext = (PHID_COLLECTION_CONTEXT)Context; + + // + // count collections + // + return HidParser_GetCollectionCount(CollectionContext, (PHID_COLLECTION)CollectionContext->RawData); +} Propchange: branches/usb-bringup-trunk/lib/drivers/hidparser/context.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Tue Jan 31 16:19:33 2012 @@ -51,11 +51,12 @@ HIDPARSER_STATUS ParserStatus; ULONG CollectionCount; ULONG Index; + PVOID ParserContext; // // first parse the report descriptor // - ParserStatus = HidParser_ParseReportDescriptor(Parser, ReportDesc, DescLength); + ParserStatus = HidParser_ParseReportDescriptor(Parser, ReportDesc, DescLength, &ParserContext); if (ParserStatus != HIDPARSER_STATUS_SUCCESS) { // @@ -68,7 +69,7 @@ // // get collection count // - CollectionCount = HidParser_NumberOfTopCollections(Parser); + CollectionCount = HidParser_NumberOfTopCollections(ParserContext); if (CollectionCount == 0) { // @@ -111,48 +112,43 @@ for(Index = 0; Index < CollectionCount; Index++) { // - // init report description - // - DeviceDescription->ReportIDs[Index].CollectionNumber = Index + 1; - DeviceDescription->ReportIDs[Index].ReportID = Index; //FIXME - 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 - // - DeviceDescription->CollectionDesc[Index].CollectionNumber = Index + 1; - - // - // get collection usage page - // - ParserStatus = HidParser_GetCollectionUsagePage(Parser, Index, &DeviceDescription->CollectionDesc[Index].Usage, &DeviceDescription->CollectionDesc[Index].UsagePage); - - // - // windows seems to prepend the report id, regardless if it is required - // - DeviceDescription->CollectionDesc[Index].InputLength = (DeviceDescription->ReportIDs[Index].InputLength > 0 ? DeviceDescription->ReportIDs[Index].InputLength + 1 : 0); - DeviceDescription->CollectionDesc[Index].OutputLength = (DeviceDescription->ReportIDs[Index].OutputLength > 0 ? DeviceDescription->ReportIDs[Index].OutputLength + 1 : 0); - DeviceDescription->CollectionDesc[Index].FeatureLength = (DeviceDescription->ReportIDs[Index].FeatureLength > 0 ? DeviceDescription->ReportIDs[Index].FeatureLength + 1 : 0); - - // // set preparsed data length // - DeviceDescription->CollectionDesc[Index].PreparsedDataLength = HidParser_GetContextSize(Parser, Index); - DeviceDescription->CollectionDesc[Index].PreparsedData = Parser->Alloc(DeviceDescription->CollectionDesc[Index].PreparsedDataLength); - if (!DeviceDescription->CollectionDesc[Index].PreparsedData) + DeviceDescription->CollectionDesc[Index].PreparsedDataLength = HidParser_GetContextSize(Parser, ParserContext, Index); + ParserStatus = HidParser_BuildContext(Parser, ParserContext, Index, DeviceDescription->CollectionDesc[Index].PreparsedDataLength, (PVOID*)&DeviceDescription->CollectionDesc[Index].PreparsedData); + if (ParserStatus != HIDPARSER_STATUS_SUCCESS) { // // no memory // - return STATUS_INSUFFICIENT_RESOURCES; + return TranslateHidParserStatus(ParserStatus); } // - // copy context - // - Parser->Copy(DeviceDescription->CollectionDesc[Index].PreparsedData, Parser->ParserContext, DeviceDescription->CollectionDesc[Index].PreparsedDataLength); + // init report description + // + DeviceDescription->ReportIDs[Index].CollectionNumber = Index + 1; + DeviceDescription->ReportIDs[Index].ReportID = Index; //FIXME + DeviceDescription->ReportIDs[Index].InputLength = HidParser_GetReportLength((PVOID)DeviceDescription->CollectionDesc[Index].PreparsedData, HID_REPORT_TYPE_INPUT); + DeviceDescription->ReportIDs[Index].OutputLength = HidParser_GetReportLength((PVOID)DeviceDescription->CollectionDesc[Index].PreparsedData, HID_REPORT_TYPE_OUTPUT); + DeviceDescription->ReportIDs[Index].FeatureLength = HidParser_GetReportLength((PVOID)DeviceDescription->CollectionDesc[Index].PreparsedData, HID_REPORT_TYPE_FEATURE); + + // + // init collection description + // + DeviceDescription->CollectionDesc[Index].CollectionNumber = Index + 1; + + // + // get collection usage page + // + ParserStatus = HidParser_GetCollectionUsagePage((PVOID)DeviceDescription->CollectionDesc[Index].PreparsedData, &DeviceDescription->CollectionDesc[Index].Usage, &DeviceDescription->CollectionDesc[Index].UsagePage); + + // + // windows seems to prepend the report id, regardless if it is required + // + DeviceDescription->CollectionDesc[Index].InputLength = (DeviceDescription->ReportIDs[Index].InputLength > 0 ? DeviceDescription->ReportIDs[Index].InputLength + 1 : 0); + DeviceDescription->CollectionDesc[Index].OutputLength = (DeviceDescription->ReportIDs[Index].OutputLength > 0 ? DeviceDescription->ReportIDs[Index].OutputLength + 1 : 0); + DeviceDescription->CollectionDesc[Index].FeatureLength = (DeviceDescription->ReportIDs[Index].FeatureLength > 0 ? DeviceDescription->ReportIDs[Index].FeatureLength + 1 : 0); } // @@ -181,9 +177,9 @@ for(Index = 0; Index < DeviceDescription->CollectionDescLength; Index++) { // - // free parser context - // - HidParser_FreeContext(Parser, (PUCHAR)DeviceDescription->CollectionDesc[Index].PreparsedData, DeviceDescription->CollectionDesc[Index].PreparsedDataLength); + // free collection context + // + Parser->Free(DeviceDescription->CollectionDesc[Index].PreparsedData); } // @@ -202,15 +198,9 @@ NTAPI HidParser_GetCaps( IN PHID_PARSER Parser, + IN PVOID CollectionContext, OUT PHIDP_CAPS Capabilities) { - ULONG CollectionNumber; - - // - // get collection number from context - // - CollectionNumber = HidParser_GetCollectionNumberFromParserContext(Parser); - // // zero capabilities // @@ -219,10 +209,10 @@ // // init capabilities // - HidParser_GetCollectionUsagePage(Parser, CollectionNumber, &Capabilities->Usage, &Capabilities->UsagePage); - 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); + HidParser_GetCollectionUsagePage(CollectionContext, &Capabilities->Usage, &Capabilities->UsagePage); + Capabilities->InputReportByteLength = HidParser_GetReportLength(CollectionContext, HID_REPORT_TYPE_INPUT); + Capabilities->OutputReportByteLength = HidParser_GetReportLength(CollectionContext, HID_REPORT_TYPE_OUTPUT); + Capabilities->FeatureReportByteLength = HidParser_GetReportLength(CollectionContext, HID_REPORT_TYPE_FEATURE); // // always pre-prend report id @@ -234,29 +224,29 @@ // // get number of link collection nodes // - Capabilities->NumberLinkCollectionNodes = HidParser_GetTotalCollectionCount(Parser, CollectionNumber); + Capabilities->NumberLinkCollectionNodes = HidParser_GetTotalCollectionCount(CollectionContext); // // get data indices // - 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); + Capabilities->NumberInputDataIndices = HidParser_GetReportItemTypeCountFromReportType(CollectionContext, HID_REPORT_TYPE_INPUT, TRUE); + Capabilities->NumberOutputDataIndices = HidParser_GetReportItemTypeCountFromReportType(CollectionContext, HID_REPORT_TYPE_OUTPUT, TRUE); + Capabilities->NumberFeatureDataIndices = HidParser_GetReportItemTypeCountFromReportType(CollectionContext, HID_REPORT_TYPE_FEATURE, TRUE); // // get value caps // - 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); + Capabilities->NumberInputValueCaps = HidParser_GetReportItemTypeCountFromReportType(CollectionContext, HID_REPORT_TYPE_INPUT, FALSE); + Capabilities->NumberOutputValueCaps = HidParser_GetReportItemTypeCountFromReportType(CollectionContext, HID_REPORT_TYPE_OUTPUT, FALSE); + Capabilities->NumberFeatureValueCaps = HidParser_GetReportItemTypeCountFromReportType(CollectionContext, HID_REPORT_TYPE_FEATURE, FALSE); // // get button caps // - 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); + Capabilities->NumberInputButtonCaps = HidParser_GetReportItemCountFromReportType(CollectionContext, HID_REPORT_TYPE_INPUT); + Capabilities->NumberOutputButtonCaps = HidParser_GetReportItemCountFromReportType(CollectionContext, HID_REPORT_TYPE_OUTPUT); + Capabilities->NumberFeatureButtonCaps = HidParser_GetReportItemCountFromReportType(CollectionContext, HID_REPORT_TYPE_FEATURE); // // done @@ -269,17 +259,10 @@ NTAPI HidParser_MaxUsageListLength( IN PHID_PARSER Parser, + IN PVOID CollectionContext, 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 // @@ -301,21 +284,21 @@ // // input report // - return HidParser_GetMaxUsageListLengthWithReportAndPage(Parser, CollectionNumber, HID_REPORT_TYPE_INPUT, UsagePage); + return HidParser_GetMaxUsageListLengthWithReportAndPage(CollectionContext, HID_REPORT_TYPE_INPUT, UsagePage); } else if (ReportType == HidP_Output) { // // input report // - return HidParser_GetMaxUsageListLengthWithReportAndPage(Parser, CollectionNumber, HID_REPORT_TYPE_OUTPUT, UsagePage); + return HidParser_GetMaxUsageListLengthWithReportAndPage(CollectionContext, HID_REPORT_TYPE_OUTPUT, UsagePage); } else if (ReportType == HidP_Feature) { // // input report // - return HidParser_GetMaxUsageListLengthWithReportAndPage(Parser, CollectionNumber, HID_REPORT_TYPE_FEATURE, UsagePage); + return HidParser_GetMaxUsageListLengthWithReportAndPage(CollectionContext, HID_REPORT_TYPE_FEATURE, UsagePage); } else { @@ -333,11 +316,12 @@ NTAPI HidParser_GetButtonCaps( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN PHIDP_BUTTON_CAPS ButtonCaps, IN PUSHORT ButtonCapsLength) { - return HidParser_GetSpecificButtonCaps(Parser, ReportType, HID_USAGE_PAGE_UNDEFINED, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_PAGE_UNDEFINED, ButtonCaps, (PULONG)ButtonCapsLength); + return HidParser_GetSpecificButtonCaps(Parser, CollectionContext, ReportType, HID_USAGE_PAGE_UNDEFINED, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_PAGE_UNDEFINED, ButtonCaps, (PULONG)ButtonCapsLength); } HIDAPI @@ -345,6 +329,7 @@ NTAPI HidParser_GetSpecificValueCaps( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -353,14 +338,6 @@ IN OUT PULONG ValueCapsLength) { HIDPARSER_STATUS ParserStatus; - ULONG CollectionNumber; - - // - // get collection number from context - // - CollectionNumber = HidParser_GetCollectionNumberFromParserContext(Parser); - - // // FIXME: implement searching in specific collection @@ -372,21 +349,21 @@ // // input report // - ParserStatus = HidParser_GetSpecificValueCapsWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_INPUT, UsagePage, Usage, ValueCaps, ValueCapsLength); + ParserStatus = HidParser_GetSpecificValueCapsWithReport(Parser, CollectionContext, HID_REPORT_TYPE_INPUT, UsagePage, Usage, ValueCaps, ValueCapsLength); } else if (ReportType == HidP_Output) { // // input report // - ParserStatus = HidParser_GetSpecificValueCapsWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_OUTPUT, UsagePage, Usage, ValueCaps, ValueCapsLength); + ParserStatus = HidParser_GetSpecificValueCapsWithReport(Parser, CollectionContext, HID_REPORT_TYPE_OUTPUT, UsagePage, Usage, ValueCaps, ValueCapsLength); } else if (ReportType == HidP_Feature) { // // input report // - ParserStatus = HidParser_GetSpecificValueCapsWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_FEATURE, UsagePage, Usage, ValueCaps, ValueCapsLength); + ParserStatus = HidParser_GetSpecificValueCapsWithReport(Parser, CollectionContext, HID_REPORT_TYPE_FEATURE, UsagePage, Usage, ValueCaps, ValueCapsLength); } else { @@ -545,6 +522,7 @@ NTAPI HidParser_GetUsages( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -554,12 +532,6 @@ IN ULONG ReportLength) { HIDPARSER_STATUS ParserStatus; - ULONG CollectionNumber; - - // - // get collection number from context - // - CollectionNumber = HidParser_GetCollectionNumberFromParserContext(Parser); // // FIXME: implement searching in specific collection @@ -571,21 +543,21 @@ // // input report // - ParserStatus = HidParser_GetUsagesWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_INPUT, UsagePage, UsageList, UsageLength, Report, ReportLength); + ParserStatus = HidParser_GetUsagesWithReport(Parser, CollectionContext, HID_REPORT_TYPE_INPUT, UsagePage, UsageList, UsageLength, Report, ReportLength); } else if (ReportType == HidP_Output) { // // input report // - ParserStatus = HidParser_GetUsagesWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_OUTPUT, UsagePage, UsageList, UsageLength, Report, ReportLength); + ParserStatus = HidParser_GetUsagesWithReport(Parser, CollectionContext, HID_REPORT_TYPE_OUTPUT, UsagePage, UsageList, UsageLength, Report, ReportLength); } else if (ReportType == HidP_Feature) { // // input report // - ParserStatus = HidParser_GetUsagesWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_FEATURE, UsagePage, UsageList, UsageLength, Report, ReportLength); + ParserStatus = HidParser_GetUsagesWithReport(Parser, CollectionContext, HID_REPORT_TYPE_FEATURE, UsagePage, UsageList, UsageLength, Report, ReportLength); } else { @@ -614,6 +586,7 @@ NTAPI HidParser_GetScaledUsageValue( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -623,12 +596,6 @@ IN ULONG ReportLength) { HIDPARSER_STATUS ParserStatus; - ULONG CollectionNumber; - - // - // get collection number from context - // - CollectionNumber = HidParser_GetCollectionNumberFromParserContext(Parser); // // FIXME: implement searching in specific collection @@ -640,21 +607,21 @@ // // input report // - ParserStatus = HidParser_GetScaledUsageValueWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_INPUT, UsagePage, Usage, UsageValue, Report, ReportLength); + ParserStatus = HidParser_GetScaledUsageValueWithReport(Parser, CollectionContext, HID_REPORT_TYPE_INPUT, UsagePage, Usage, UsageValue, Report, ReportLength); } else if (ReportType == HidP_Output) { // // input report // - ParserStatus = HidParser_GetScaledUsageValueWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_OUTPUT, UsagePage, Usage, UsageValue, Report, ReportLength); + ParserStatus = HidParser_GetScaledUsageValueWithReport(Parser, CollectionContext, HID_REPORT_TYPE_OUTPUT, UsagePage, Usage, UsageValue, Report, ReportLength); } else if (ReportType == HidP_Feature) { // // input report // - ParserStatus = HidParser_GetScaledUsageValueWithReport(Parser, CollectionNumber, HID_REPORT_TYPE_FEATURE, UsagePage, Usage, UsageValue, Report, ReportLength); + ParserStatus = HidParser_GetScaledUsageValueWithReport(Parser, CollectionContext, HID_REPORT_TYPE_FEATURE, UsagePage, Usage, UsageValue, Report, ReportLength); } else { @@ -692,12 +659,6 @@ { 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++) { @@ -709,7 +670,7 @@ // // process usage // - Status = HidParser_TranslateUsage(Parser, CollectionNumber, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); + Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); } else if (ChangedUsageList[Index].UsagePage == HID_USAGE_PAGE_CONSUMER) { @@ -760,6 +721,7 @@ NTAPI HidParser_GetUsagesEx( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USHORT LinkCollection, OUT PUSAGE_AND_PAGE ButtonList, @@ -767,7 +729,7 @@ IN PCHAR Report, IN ULONG ReportLength) { - return HidParser_GetUsages(Parser, ReportType, HID_USAGE_PAGE_UNDEFINED, LinkCollection, (PUSAGE)ButtonList, UsageLength, Report, ReportLength); + return HidParser_GetUsages(Parser, CollectionContext, ReportType, HID_USAGE_PAGE_UNDEFINED, LinkCollection, (PUSAGE)ButtonList, UsageLength, Report, ReportLength); } HIDAPI @@ -904,6 +866,7 @@ NTAPI HidParser_GetSpecificButtonCaps( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -922,6 +885,7 @@ NTAPI HidParser_GetData( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, OUT PHIDP_DATA DataList, IN OUT PULONG DataLength, @@ -938,6 +902,7 @@ NTAPI HidParser_GetExtendedAttributes( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USHORT DataIndex, OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, @@ -953,6 +918,7 @@ NTAPI HidParser_GetLinkCollectionNodes( IN PHID_PARSER Parser, + IN PVOID CollectionContext, OUT PHIDP_LINK_COLLECTION_NODE LinkCollectionNodes, IN OUT PULONG LinkCollectionNodesLength) { @@ -966,6 +932,7 @@ NTAPI HidParser_GetUsageValue( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -983,6 +950,7 @@ NTAPI HidParser_SysPowerEvent( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN PCHAR HidPacket, IN USHORT HidPacketLength, OUT PULONG OutputBuffer) @@ -996,6 +964,7 @@ NTAPI HidParser_SysPowerCaps ( IN PHID_PARSER Parser, + IN PVOID CollectionContext, OUT PULONG OutputBuffer) { UNIMPLEMENTED @@ -1008,6 +977,7 @@ NTAPI HidParser_GetUsageValueArray( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -1027,6 +997,7 @@ NTAPI HidParser_UnsetUsages( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -1061,6 +1032,7 @@ NTAPI HidParser_SetUsages( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -1079,6 +1051,7 @@ NTAPI HidParser_SetUsageValueArray( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -1098,6 +1071,7 @@ NTAPI HidParser_SetUsageValue( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -1116,6 +1090,7 @@ NTAPI HidParser_SetScaledUsageValue( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -1134,6 +1109,7 @@ NTAPI HidParser_SetData( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN PHIDP_DATA DataList, IN OUT PULONG DataLength, @@ -1150,11 +1126,12 @@ NTAPI HidParser_MaxDataListLength( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType) { UNIMPLEMENTED ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + return 0; } HIDAPI @@ -1162,6 +1139,7 @@ NTAPI HidParser_InitializeReportForID( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN UCHAR ReportID, IN OUT PCHAR Report, @@ -1179,6 +1157,7 @@ NTAPI HidParser_GetValueCaps( IN PHID_PARSER Parser, + IN PVOID CollectionContext, HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PULONG ValueCapsLength) 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] Tue Jan 31 16:19:33 2012 @@ -79,22 +79,7 @@ // debug function // PHIDPARSER_DEBUG_FUNCTION Debug; - - // - // parser context - // - void * ParserContext; - }HID_PARSER, *PHID_PARSER; - -HIDPARSER_STATUS -HidParser_AllocateParser( - IN PHIDPARSER_ALLOC_FUNCTION AllocFunction, - IN PHIDPARSER_FREE_FUNCTION FreeFunction, - IN PHIDPARSER_ZERO_FUNCTION ZeroFunction, - IN PHIDPARSER_COPY_FUNCTION CopyFunction, - IN PHIDPARSER_DEBUG_FUNCTION DebugFunction, - OUT PHID_PARSER *OutParser); VOID HidParser_InitParser( @@ -103,7 +88,6 @@ IN PHIDPARSER_ZERO_FUNCTION ZeroFunction, IN PHIDPARSER_COPY_FUNCTION CopyFunction, IN PHIDPARSER_DEBUG_FUNCTION DebugFunction, - IN PVOID ParserContext, OUT PHID_PARSER Parser); NTSTATUS @@ -126,6 +110,7 @@ NTAPI HidParser_GetCaps( IN PHID_PARSER Parser, + IN PVOID CollectionContext, OUT PHIDP_CAPS Capabilities); HIDAPI @@ -133,6 +118,7 @@ NTAPI HidParser_GetSpecificValueCaps( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -146,6 +132,7 @@ NTAPI HidParser_GetButtonCaps( IN PHID_PARSER Parser, + IN PVOID CollectionContext, HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength); @@ -155,6 +142,7 @@ NTAPI HidParser_GetSpecificButtonCaps( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -167,6 +155,7 @@ NTAPI HidParser_GetScaledUsageValue( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -181,6 +170,7 @@ NTAPI HidParser_GetData( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, OUT PHIDP_DATA DataList, IN OUT PULONG DataLength, @@ -192,6 +182,7 @@ NTAPI HidParser_GetExtendedAttributes( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USHORT DataIndex, OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, @@ -202,6 +193,7 @@ NTAPI HidParser_GetLinkCollectionNodes( IN PHID_PARSER Parser, + IN PVOID CollectionContext, OUT PHIDP_LINK_COLLECTION_NODE LinkCollectionNodes, IN OUT PULONG LinkCollectionNodesLength); @@ -210,6 +202,7 @@ NTAPI HidParser_GetUsageValue( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -234,6 +227,7 @@ NTAPI HidParser_MaxUsageListLength( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage OPTIONAL); @@ -242,6 +236,7 @@ NTAPI HidParser_GetUsages( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -255,6 +250,7 @@ NTAPI HidParser_GetUsagesEx( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USHORT LinkCollection, OUT PUSAGE_AND_PAGE ButtonList, @@ -267,6 +263,7 @@ NTAPI HidParser_SysPowerEvent ( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN PCHAR HidPacket, IN USHORT HidPacketLength, OUT PULONG OutputBuffer); @@ -275,6 +272,7 @@ NTAPI HidParser_SysPowerCaps ( IN PHID_PARSER Parser, + IN PVOID CollectionContext, OUT PULONG OutputBuffer); HIDAPI @@ -282,6 +280,7 @@ NTAPI HidParser_GetUsageValueArray( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -307,6 +306,7 @@ NTAPI HidParser_UnsetUsages( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -343,6 +343,7 @@ NTAPI HidParser_SetUsages( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -356,6 +357,7 @@ NTAPI HidParser_SetUsageValueArray( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -370,6 +372,7 @@ NTAPI HidParser_SetUsageValue( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection, @@ -383,6 +386,7 @@ NTAPI HidParser_SetScaledUsageValue( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, @@ -396,6 +400,7 @@ NTAPI HidParser_SetData( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN PHIDP_DATA DataList, IN OUT PULONG DataLength, @@ -407,6 +412,7 @@ NTAPI HidParser_MaxDataListLength( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType); HIDAPI @@ -414,6 +420,7 @@ NTAPI HidParser_InitializeReportForID( IN PHID_PARSER Parser, + IN PVOID CollectionContext, IN HIDP_REPORT_TYPE ReportType, IN UCHAR ReportID, IN OUT PCHAR Report, @@ -422,7 +429,6 @@ 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, @@ -434,6 +440,7 @@ NTAPI HidParser_GetValueCaps( PHID_PARSER Parser, + IN PVOID CollectionContext, 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] Tue Jan 31 16:19:33 2012 @@ -123,40 +123,6 @@ return HIDPARSER_STATUS_SUCCESS; } - -VOID -HidParser_ResetParser( - OUT PHID_PARSER Parser) -{ - ULONG Index; - PHID_PARSER_CONTEXT ParserContext; - - // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - - if (ParserContext->RootCollection) - { - // - // delete root collection - // - HidParser_FreeCollection(Parser, ParserContext->RootCollection); - } - - // - // reinit parser - // - ParserContext->RootCollection = NULL; - ParserContext->UseReportIDs = FALSE; - - // - // zero item states - // - Parser->Zero(&ParserContext->GlobalItemState, sizeof(GLOBAL_ITEM_STATE)); - Parser->Zero(&ParserContext->LocalItemState, sizeof(LOCAL_ITEM_STATE)); -} - HIDPARSER_STATUS HidParser_AddCollection( IN PHID_PARSER Parser, @@ -260,18 +226,11 @@ HIDPARSER_STATUS HidParser_FindReport( IN PHID_PARSER Parser, + IN PHID_PARSER_CONTEXT ParserContext, IN UCHAR ReportType, IN UCHAR ReportID, OUT PHID_REPORT *OutReport) { - PHID_PARSER_CONTEXT ParserContext; - - // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - ASSERT(ParserContext); - // // search in current top level collection // @@ -315,17 +274,11 @@ HIDPARSER_STATUS HidParser_AddReportToCollection( IN PHID_PARSER Parser, + IN PHID_PARSER_CONTEXT ParserContext, IN PHID_COLLECTION CurrentCollection, IN PHID_REPORT NewReport) { PHID_REPORT * NewReportArray; - PHID_PARSER_CONTEXT ParserContext; - - // - // get parser context - // - ParserContext = (PHID_PARSER_CONTEXT)Parser->ParserContext; - ASSERT(ParserContext); // // allocate new report array @@ -368,6 +321,7 @@ HIDPARSER_STATUS HidParser_GetReport( IN PHID_PARSER Parser, + IN PHID_PARSER_CONTEXT ParserContext, IN PHID_COLLECTION Collection, IN UCHAR ReportType, IN UCHAR ReportID, @@ -379,7 +333,7 @@ // // try finding existing report // - Status = HidParser_FindReport(Parser, ReportType, ReportID, OutReport); + Status = HidParser_FindReport(Parser, ParserContext, ReportType, ReportID, OutReport); if (Status == HIDPARSER_STATUS_SUCCESS || CreateIfNotExists == FALSE) { // @@ -403,7 +357,7 @@ // // add report // - Status = HidParser_AddReportToCollection(Parser, Collection, *OutReport); + Status = HidParser_AddReportToCollection(Parser, ParserContext, Collection, *OutReport); if (Status != HIDPARSER_STATUS_SUCCESS) { // @@ -417,86 +371,37 @@ // return Status; } - - -HIDPARSER_STATUS -HidParser_ReserveCollectionItems( - IN PHID_PARSER Parser, - IN PHID_COLLECTION Collection, - IN ULONG ReportCount) -{ - PHID_REPORT_ITEM * NewReportArray; - - if (Collection->ItemCount + ReportCount <= Collection->ItemCountAllocated) - { - // - // enough space for the next items - // - return HIDPARSER_STATUS_SUCCESS; - } - - // - // allocate report array - // - NewReportArray = (PHID_REPORT_ITEM*)Parser->Alloc(sizeof(PHID_REPORT) * (Collection->ItemCountAllocated + ReportCount)); - if (!NewReportArray) - { - // - // no memory - // - return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; - } - - // - // are there any items - // - if (Collection->ItemCount) - { - // - // copy old items - // - Parser->Copy(NewReportArray, Collection->Items, sizeof(PHID_REPORT_ITEM) * Collection->ItemCount); - - // - // free old item - // - Parser->Free(Collection->Items); - } - - // - // replace array - // - Collection->Items = NewReportArray; - Collection->ItemCountAllocated += ReportCount; - - // - // completed sucessfully - // - return HIDPARSER_STATUS_SUCCESS; -} - HIDPARSER_STATUS HidParser_ReserveReportItems( IN PHID_PARSER Parser, IN PHID_REPORT Report, - IN ULONG ReportCount) -{ - PHID_REPORT_ITEM * NewReportArray; + IN ULONG ReportCount, + OUT PHID_REPORT *OutReport) +{ + PHID_REPORT NewReport; + ULONG OldSize, Size; if (Report->ItemCount + ReportCount <= Report->ItemAllocated) { // - // enough space for the next items - // + // space is already allocated + // + *OutReport = Report; return HIDPARSER_STATUS_SUCCESS; } // - // allocate report array - // - NewReportArray = (PHID_REPORT_ITEM*)Parser->Alloc(sizeof(PHID_REPORT_ITEM) * (Report->ItemAllocated + ReportCount)); - if (!NewReportArray) + //calculate new size + // + OldSize = sizeof(HID_REPORT) + (Report->ItemCount) * sizeof(HID_REPORT_ITEM); + Size = ReportCount * sizeof(HID_REPORT_ITEM); + + // + // allocate memory + // + NewReport = (PHID_REPORT)Parser->Alloc(Size + OldSize); + if (!NewReport) { // // no memory @@ -504,92 +409,26 @@ return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; } - // - // are there any items - // - if (Report->ItemCount) - { - // - // copy old items - // - Parser->Copy(NewReportArray, Report->Items, sizeof(PHID_REPORT_ITEM) * Report->ItemCount); - - // - // free old item - // - Parser->Free(Report->Items); - } - - // - // replace array - // - Report->Items = NewReportArray; - Report->ItemAllocated += ReportCount; + + // + // copy old report + // + Parser->Copy(NewReport, Report, OldSize); + + // + // increase array size + // + NewReport->ItemAllocated += ReportCount; + + // + // store result + // + *OutReport = NewReport; // // completed sucessfully // return HIDPARSER_STATUS_SUCCESS; -} - -HIDPARSER_STATUS -HidParser_AllocateReportItem( - IN PHID_PARSER Parser, - OUT PHID_REPORT_ITEM * OutReportItem) -{ - PHID_REPORT_ITEM ReportItem; - - // - // allocate report item - // - ReportItem = (PHID_REPORT_ITEM)Parser->Alloc(sizeof(HID_REPORT_ITEM)); - if (!ReportItem) - { - // - // no memory - // - return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; - } - - // - // store result - // - *OutReportItem = ReportItem; - return HIDPARSER_STATUS_SUCCESS; -} - -VOID -HidParser_AddReportItemToReport( - IN OUT PHID_REPORT Report, - IN PHID_REPORT_ITEM ReportItem) -{ - // - // there should be space in item array - // - ASSERT(Report->ItemCount + 1 <= Report->ItemAllocated); - - // - // store item - // - Report->Items[Report->ItemCount] = ReportItem; - Report->ItemCount++; -} - -VOID -HidParser_AddReportItemToCollection( - IN OUT PHID_COLLECTION Collection, - IN PHID_REPORT_ITEM ReportItem) -{ - // - // there should be space in item array - // - ASSERT(Collection->ItemCount + 1 <= Collection->ItemCountAllocated); - - // - // store item - // - Collection->Items[Collection->ItemCount] = ReportItem; - Collection->ItemCount++; } VOID @@ -745,23 +584,87 @@ return HIDPARSER_STATUS_SUCCESS; } +BOOLEAN +HidParser_UpdateCurrentCollectionReport( + IN PHID_COLLECTION Collection, + IN PHID_REPORT Report, + IN PHID_REPORT NewReport) +{ + ULONG Index; + BOOLEAN Found = FALSE, TempFound; + + // + // search in local list + // + for(Index = 0; Index < Collection->ReportCount; Index++) + { + if (Collection->Reports[Index] == Report) + { + // + // update report + // + Collection->Reports[Index] = NewReport; + Found = TRUE; + } + } + + // + // search in sub collections + // + for(Index = 0; Index < Collection->NodeCount; Index++) + { + // + // was it found + // + TempFound = HidParser_UpdateCurrentCollectionReport(Collection->Nodes[Index], Report, NewReport); + if (TempFound) + { + // + // the same report should not be found in different collections + // + ASSERT(Found == FALSE); + Found = TRUE; + } + } + + // + // done + // + return Found; +} + +BOOLEAN +HidParser_UpdateCollectionReport( + IN PHID_PARSER_CONTEXT ParserContext, + IN PHID_REPORT Report, + IN PHID_REPORT NewReport) +{ + // + // update in current collection + // + return HidParser_UpdateCurrentCollectionReport(ParserContext->RootCollection->Nodes[ParserContext->RootCollection->NodeCount-1], Report, NewReport); +} + + HIDPARSER_STATUS HidParser_AddMainItem( IN PHID_PARSER Parser, + IN PHID_PARSER_CONTEXT ParserContext, IN PHID_REPORT Report, IN PGLOBAL_ITEM_STATE GlobalItemState, IN PLOCAL_ITEM_STATE LocalItemState, IN PMAIN_ITEM_DATA ItemData, IN PHID_COLLECTION Collection) { - PHID_REPORT_ITEM ReportItem; HIDPARSER_STATUS Status; ULONG Index; + PHID_REPORT NewReport; + BOOLEAN Found; // // first grow report item array // - Status = HidParser_ReserveReportItems(Parser, Report, GlobalItemState->ReportCount); + Status = HidParser_ReserveReportItems(Parser, Report, GlobalItemState->ReportCount, &NewReport); if (Status != HIDPARSER_STATUS_SUCCESS) { // @@ -770,48 +673,35 @@ return Status; } - // - // grow collection item array - // - Status = HidParser_ReserveCollectionItems(Parser, Collection, GlobalItemState->ReportCount); - if (Status != HIDPARSER_STATUS_SUCCESS) - { - // - // failed to allocate memory - // - return Status; - } - - + if (NewReport != Report) + { + // + // update current top level collection + // + Found = HidParser_UpdateCollectionReport(ParserContext, Report, NewReport); + ASSERT(Found); + } + + // + // sanity check + // + ASSERT(NewReport->ItemCount + GlobalItemState->ReportCount <= NewReport->ItemAllocated); for(Index = 0; Index < GlobalItemState->ReportCount; Index++) { - // - // create report item - // - Status = HidParser_AllocateReportItem(Parser, &ReportItem); + Status = HidParser_InitReportItem(NewReport, &NewReport->Items[NewReport->ItemCount], GlobalItemState, LocalItemState, ItemData, Index); if (Status != HIDPARSER_STATUS_SUCCESS) { // - // failed to allocate memory + // failed to init report item // return Status; } - Status = HidParser_InitReportItem(Report, ReportItem, GlobalItemState, LocalItemState, ItemData, Index); - if (Status != HIDPARSER_STATUS_SUCCESS) - { - // - // failed to init report item - // - return Status; - } - - // - // add report item - // - HidParser_AddReportItemToReport(Report, ReportItem); - HidParser_AddReportItemToCollection(Collection, ReportItem); + // + // increment report item count + // + NewReport->ItemCount++; } // @@ -819,12 +709,37 @@ // return HIDPARSER_STATUS_SUCCESS; } + +HIDPARSER_STATUS +AllocateParserContext( + IN PHID_PARSER Parser, + OUT PHID_PARSER_CONTEXT *OutParserContext) +{ + PHID_PARSER_CONTEXT ParserContext; + + ParserContext = Parser->Alloc(sizeof(HID_PARSER_CONTEXT)); + if (!ParserContext) + { + // + // failed + // + return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; + } + + // + // store result + // + *OutParserContext = ParserContext; + return HIDPARSER_STATUS_SUCCESS; +} + HIDPARSER_STATUS HidParser_ParseReportDescriptor( IN PHID_PARSER Parser, IN PUCHAR ReportDescriptor, - IN ULONG ReportLength) + IN ULONG ReportLength, + OUT PVOID *OutParser) { PGLOBAL_ITEM_STATE LinkedGlobalItemState, NextLinkedGlobalItemState; ULONG Index; @@ -843,15 +758,12 @@ PHID_PARSER_CONTEXT ParserContext; // - // reset parser - // - HidParser_ResetParser(Parser); - - // - // get parser context - // - ParserContext =(PHID_PARSER_CONTEXT)Parser->ParserContext; - ASSERT(ParserContext); + // allocate parser + // + Status = AllocateParserContext(Parser, &ParserContext); + if (Status != HIDPARSER_STATUS_SUCCESS) + return Status; + // // allocate usage stack @@ -1039,7 +951,7 @@ // // get report // - Status = HidParser_GetReport(Parser, CurrentCollection, ReportType, ParserContext->GlobalItemState.ReportId, TRUE, &Report); + Status = HidParser_GetReport(Parser, ParserContext, CurrentCollection, ReportType, ParserContext->GlobalItemState.ReportId, TRUE, &Report); ASSERT(Status == HIDPARSER_STATUS_SUCCESS); // fill in a sensible default if the index isn't set @@ -1059,7 +971,7 @@ // // add states & data to the report // - Status = HidParser_AddMainItem(Parser, Report, &ParserContext->GlobalItemState, &ParserContext->LocalItemState, MainItemData, CurrentCollection); + Status = HidParser_AddMainItem(Parser, ParserContext, Report, &ParserContext->GlobalItemState, &ParserContext->LocalItemState, MainItemData, CurrentCollection); ASSERT(Status == HIDPARSER_STATUS_SUCCESS); } @@ -1349,7 +1261,139 @@ ParserContext->LocalItemState.UsageStack = NULL; // + // store result + // + *OutParser = ParserContext; + + // // done // return HIDPARSER_STATUS_SUCCESS; } + +PHID_COLLECTION +HidParser_GetCollection( + IN PHID_PARSER Parser, + PHID_PARSER_CONTEXT ParserContext, + IN ULONG CollectionNumber) +{ + // + // sanity checks + // + ASSERT(ParserContext); + ASSERT(ParserContext->RootCollection); + ASSERT(ParserContext->RootCollection->NodeCount); + + // + // is collection index out of bounds + // + if (CollectionNumber < ParserContext->RootCollection->NodeCount) + { + // + // valid collection + // + return ParserContext->RootCollection->Nodes[CollectionNumber]; + } + + // + // no such collection + // + Parser->Debug("HIDPARSE] No such collection %lu\n", CollectionNumber); + return NULL; +} + + +ULONG +HidParser_NumberOfTopCollections( + IN PVOID ParserCtx) +{ + PHID_PARSER_CONTEXT ParserContext; + + // + // get parser context + // + ParserContext = (PHID_PARSER_CONTEXT)ParserCtx; + + // + // sanity checks + // + ASSERT(ParserContext); + ASSERT(ParserContext->RootCollection); + ASSERT(ParserContext->RootCollection->NodeCount); + + // + // number of top collections + // + return ParserContext->RootCollection->NodeCount; +} + +HIDPARSER_STATUS +HidParser_BuildContext( + IN PHID_PARSER Parser, + IN PVOID ParserContext, + IN ULONG CollectionIndex, + IN ULONG ContextSize, + OUT PVOID *CollectionContext) +{ + PHID_COLLECTION Collection; + PVOID Context; + HIDPARSER_STATUS Status; + + // + // lets get the collection + // + Collection = HidParser_GetCollection(Parser, (PHID_PARSER_CONTEXT)ParserContext, CollectionIndex); + ASSERT(Collection); + + // + // lets allocate the context + // + Context = Parser->Alloc(ContextSize); + if (Context == NULL) + { + // + // no memory + // + return HIDPARSER_STATUS_INSUFFICIENT_RESOURCES; + } + + // + // lets build the context + // + Status = HidParser_BuildCollectionContext(Parser, Collection, Context, ContextSize); + if (Status == HIDPARSER_STATUS_SUCCESS) + { + // + // store context + // + *CollectionContext = Context; + } + + // + // done + // + return Status; +} + + +ULONG +HidParser_GetContextSize( + IN PHID_PARSER Parser, + IN PVOID ParserContext, + IN ULONG CollectionIndex) +{ + PHID_COLLECTION Collection; + ULONG Size; + + // + // lets get the collection + // + Collection = HidParser_GetCollection(Parser, (PHID_PARSER_CONTEXT)ParserContext, CollectionIndex); + + // + // calculate size + // + Size = HidParser_CalculateContextSize(Collection); + return Size; +} + 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] Tue Jan 31 16:19:33 2012 @@ -199,22 +199,18 @@ typedef struct __HID_COLLECTION__ { - struct __HID_COLLECTION__ * Root; - UCHAR Type; ULONG Usage; UCHAR StringID; UCHAR PhysicalID; + ULONG ReportCount; ULONG NodeCount; + struct __HID_COLLECTION__ ** Nodes; - - ULONG ItemCount; - ULONG ItemCountAllocated; - - PHID_REPORT_ITEM * Items; - - ULONG ReportCount; + struct __HID_COLLECTION__ * Root; struct _HID_REPORT ** Reports; + + ULONG Offsets[1]; }HID_COLLECTION, *PHID_COLLECTION; @@ -223,11 +219,9 @@ UCHAR Type; UCHAR ReportID; ULONG ReportSize; - ULONG ItemCount; ULONG ItemAllocated; - PHID_REPORT_ITEM* Items; - + HID_REPORT_ITEM Items[1]; }HID_REPORT, *PHID_REPORT; typedef struct @@ -258,16 +252,6 @@ ULONG CollectionIndex; }HID_PARSER_CONTEXT, *PHID_PARSER_CONTEXT; - -HIDPARSER_STATUS -HidParser_ParseReportDescriptor( - PHID_PARSER Parser, - PUCHAR Report, - ULONG ReportSize); - -ULONG -HidParser_NumberOfTopCollections( - IN PHID_PARSER Parser); #define HID_REPORT_TYPE_INPUT 0x01 #define HID_REPORT_TYPE_OUTPUT 0x02 @@ -275,16 +259,14 @@ HIDPARSER_STATUS HidParser_GetCollectionUsagePage( - IN PHID_PARSER Parser, - IN ULONG CollectionNumber, + IN PVOID CollectionContext, OUT PUSHORT Usage, OUT PUSHORT UsagePage); ULONG HidParser_GetReportLength( - IN PHID_PARSER Parser, - IN ULONG CollectionIndex, - IN ULONG ReportType); + IN PVOID CollectionContext, + IN UCHAR ReportType); UCHAR HidParser_IsReportIDUsed( @@ -292,44 +274,26 @@ ULONG HidParser_GetReportItemCountFromReportType( - IN PHID_PARSER Parser, - IN ULONG CollectionNumber, - IN ULONG ReportType); + IN PVOID CollectionContext, + IN UCHAR ReportType); ULONG HidParser_GetReportItemTypeCountFromReportType( - IN PHID_PARSER Parser, - IN ULONG CollectionNumber, - IN ULONG ReportType, + IN PVOID CollectionContext, + IN UCHAR ReportType, IN ULONG bData); ULONG -HidParser_GetContextSize( - IN PHID_PARSER Parser, - IN ULONG CollectionNumber); - -VOID -HidParser_FreeContext( - IN PHID_PARSER Parser, - IN PUCHAR Context, - IN ULONG ContextLength); - -ULONG -HidParser_GetTotalCollectionCount( - IN PHID_PARSER Parser); - -ULONG HidParser_GetMaxUsageListLengthWithReportAndPage( - IN PHID_PARSER Parser, - IN ULONG CollectionNumber, - IN ULONG ReportType, + IN PVOID CollectionContext, + IN UCHAR ReportType, IN USAGE UsagePage OPTIONAL); HIDPARSER_STATUS HidParser_GetSpecificValueCapsWithReport( IN PHID_PARSER Parser, - IN ULONG CollectionNumber, - IN ULONG ReportType, + IN PVOID CollectionContext, + IN UCHAR ReportType, IN USHORT UsagePage, IN USHORT Usage, OUT PHIDP_VALUE_CAPS ValueCaps, @@ -339,8 +303,8 @@ HIDPARSER_STATUS HidParser_GetUsagesWithReport( IN PHID_PARSER Parser, - IN ULONG CollectionNumber, - IN ULONG ReportType, + IN PVOID CollectionContext, + IN UCHAR ReportType, IN USAGE UsagePage, OUT USAGE *UsageList, IN OUT PULONG UsageLength, @@ -350,15 +314,64 @@ HIDPARSER_STATUS HidParser_GetScaledUsageValueWithReport( IN PHID_PARSER Parser, - IN ULONG CollectionNumber, - IN ULONG ReportType, + IN PVOID CollectionContext, + IN UCHAR ReportType, IN USAGE UsagePage, IN USAGE Usage, OUT PLONG UsageValue, IN PCHAR ReportDescriptor, IN ULONG ReportDescriptorLength); -ULONG -HidParser_GetCollectionNumberFromParserContext( - IN PHID_PARSER Parser); - +/* parser.c */ + +HIDPARSER_STATUS +HidParser_BuildContext( + IN PHID_PARSER Parser, + IN PVOID ParserContext, + IN ULONG CollectionIndex, + IN ULONG ContextSize, + OUT PVOID *CollectionContext); + +ULONG +HidParser_CalculateContextSize( + IN PHID_COLLECTION Collection); + +HIDPARSER_STATUS +HidParser_ParseReportDescriptor( + PHID_PARSER Parser, + PUCHAR Report, + ULONG ReportSize, + OUT PVOID *ParserContext); + +ULONG +HidParser_NumberOfTopCollections( + IN PVOID ParserContext); + +ULONG +HidParser_GetContextSize( + IN PHID_PARSER Parser, + IN PVOID ParserContext, + IN ULONG CollectionNumber); + + +/* context.c */ + +PHID_COLLECTION +HidParser_GetCollectionFromContext( + IN PVOID Context); + +ULONG +HidParser_GetTotalCollectionCount( + IN PVOID CollectionContext); + +HIDPARSER_STATUS +HidParser_BuildCollectionContext( + IN PHID_PARSER Parser, + IN PHID_COLLECTION RootCollection, + IN PVOID Context, + IN ULONG ContextSize); + +PHID_REPORT +HidParser_GetReportInCollection( + IN PVOID Context, + IN UCHAR ReportType);

1 0

[cgutman] 55352: [USBSTOR] - Add forgotten event initialization from last usbstor commit
by cgutman＠svn.reactos.org 31 Jan '12

31 Jan '12

Author: cgutman Date: Tue Jan 31 15:59:59 2012 New Revision: 55352 URL: http://svn.reactos.org/svn/reactos?rev=55352&view=rev Log: [USBSTOR] - Add forgotten event initialization from last usbstor commit Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c [iso-8859-1] Tue Jan 31 15:59:59 2012 @@ -29,6 +29,11 @@ // initialize irp list head // InitializeListHead(&FDODeviceExtension->IrpListHead); + + // + // initialize event + // + KeInitializeEvent(&FDODeviceExtension->NoPendingRequests, NotificationEvent, TRUE); } VOID

1 0

[cgutman] 55351: [USETUP] - Don't quit if setup doesn't find a non-PnP HDD (until PnP stuff works better)
by cgutman＠svn.reactos.org 31 Jan '12

31 Jan '12

Author: cgutman Date: Tue Jan 31 15:45:43 2012 New Revision: 55351 URL: http://svn.reactos.org/svn/reactos?rev=55351&view=rev Log: [USETUP] - Don't quit if setup doesn't find a non-PnP HDD (until PnP stuff works better) Modified: branches/usb-bringup-trunk/base/setup/usetup/interface/usetup.c Modified: branches/usb-bringup-trunk/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/base/setup/us… ============================================================================== --- branches/usb-bringup-trunk/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue Jan 31 15:45:43 2012 @@ -728,19 +728,19 @@ static PAGE_NUMBER SetupStartPage(PINPUT_RECORD Ir) { - SYSTEM_DEVICE_INFORMATION Sdi; + //SYSTEM_DEVICE_INFORMATION Sdi; NTSTATUS Status; WCHAR FileNameBuffer[MAX_PATH]; INFCONTEXT Context; PWCHAR Value; UINT ErrorLine; - ULONG ReturnSize; + //ULONG ReturnSize; PGENERIC_LIST_ENTRY ListEntry; INT IntValue; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - +#if 0 /* Check whether a harddisk is available */ Status = NtQuerySystemInformation(SystemDeviceInformation, &Sdi, @@ -759,6 +759,7 @@ MUIDisplayError(ERROR_NO_HDD, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } +#endif /* Get the source path and source root path */ Status = GetSourcePaths(&SourcePath,

1 0

[cgutman] 55350: [USBSTOR] - Fix handling of SRB_FUNCTION_FLUSH and SRB_FUNCTION_SHUTDOWN to prevent data loss
by cgutman＠svn.reactos.org 31 Jan '12

31 Jan '12

Author: cgutman Date: Tue Jan 31 15:33:32 2012 New Revision: 55350 URL: http://svn.reactos.org/svn/reactos?rev=55350&view=rev Log: [USBSTOR] - Fix handling of SRB_FUNCTION_FLUSH and SRB_FUNCTION_SHUTDOWN to prevent data loss Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c [iso-8859-1] Tue Jan 31 15:33:32 2012 @@ -175,9 +175,9 @@ DPRINT1("SRB_FUNCTION_FLUSH / SRB_FUNCTION_FLUSH_QUEUE / SRB_FUNCTION_SHUTDOWN\n"); // - // flush all requests - // - USBSTOR_QueueFlushIrps(PDODeviceExtension->LowerDeviceObject); + // wait for pending requests to finish + // + USBSTOR_QueueWaitForPendingRequests(PDODeviceExtension->LowerDeviceObject); // // set status success Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c [iso-8859-1] Tue Jan 31 15:33:32 2012 @@ -176,12 +176,18 @@ // add irp to queue // InsertTailList(&FDODeviceExtension->IrpListHead, &Irp->Tail.Overlay.ListEntry); - } - - // - // increment pending count - // - FDODeviceExtension->IrpPendingCount++; + } + + // + // increment pending count + // + FDODeviceExtension->IrpPendingCount++; + + + // + // clear the no requests pending event + // + KeClearEvent(&FDODeviceExtension->NoPendingRequests); // // check if queue is freezed @@ -296,105 +302,24 @@ } VOID -USBSTOR_QueueFlushIrps( +USBSTOR_QueueWaitForPendingRequests( IN PDEVICE_OBJECT DeviceObject) { - KIRQL OldLevel; - PFDO_DEVICE_EXTENSION FDODeviceExtension; - PLIST_ENTRY Entry; - PIRP Irp; - PIO_STACK_LOCATION IoStack; - PSCSI_REQUEST_BLOCK Request; - KIRQL OldIrql; - - // - // get FDO device extension - // - FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - // - // sanity check - // - ASSERT(FDODeviceExtension->Common.IsFDO); - - // - // acquire lock - // - KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); - - // - // complete all irps with status cancelled - // - while(!IsListEmpty(&FDODeviceExtension->IrpListHead)) - { - // - // remove irp - // - Entry = RemoveHeadList(&FDODeviceExtension->IrpListHead); - - // - // get start of irp structure - // - Irp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); - - // - // remove the cancellation routine - // - IoAcquireCancelSpinLock(&OldIrql); - (void)IoSetCancelRoutine(Irp, NULL); - IoReleaseCancelSpinLock(OldIrql); - - // - // get current stack location - // - IoStack = IoGetCurrentIrpStackLocation(Irp); - - // - // get request block - // - Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; - - // - // sanity check - // - ASSERT(Request); - - // - // set srb status to flushed - // - Request->SrbStatus = SRB_STATUS_REQUEST_FLUSHED; - - // - // set unsuccessful status - // - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - - // - // release lock - // - KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); - - // - // complete request - // - USBSTOR_QueueTerminateRequest(DeviceObject, Irp); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - // - // start next one - // - USBSTOR_QueueNextRequest(DeviceObject); - - // - // acquire lock - // - KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); - } - - // - // release lock - // - KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // perform the wait + // + KeWaitForSingleObject(&FDODeviceExtension->NoPendingRequests, + Executive, + KernelMode, + FALSE, + NULL); } VOID @@ -436,6 +361,15 @@ // indicate processing is completed // FDODeviceExtension->ActiveSrb = NULL; + } + + // + // Set the event if nothing else is pending + // + if (FDODeviceExtension->IrpPendingCount == 0 && + FDODeviceExtension->ActiveSrb == NULL) + { + KeSetEvent(&FDODeviceExtension->NoPendingRequests, IO_NO_INCREMENT, FALSE); } // Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] Tue Jan 31 15:33:32 2012 @@ -67,6 +67,7 @@ BOOLEAN ResetInProgress; // if hard reset is in progress ULONG IrpPendingCount; // count of irp pending PSCSI_REQUEST_BLOCK ActiveSrb; // stores the current active SRB + KEVENT NoPendingRequests; // set if no pending or in progress requests }FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; typedef struct @@ -405,7 +406,7 @@ PIRP Irp); VOID -USBSTOR_QueueFlushIrps( +USBSTOR_QueueWaitForPendingRequests( IN PDEVICE_OBJECT DeviceObject); VOID

1 0

[gadamopoulos] 55349: [user32_apitest] - Add some more tests
by gadamopoulos＠svn.reactos.org 31 Jan '12

31 Jan '12

Author: gadamopoulos Date: Tue Jan 31 10:49:44 2012 New Revision: 55349 URL: http://svn.reactos.org/svn/reactos?rev=55349&view=rev Log: [user32_apitest] - Add some more tests Modified: trunk/rostests/apitests/user32/SystemParametersInfo.c Modified: trunk/rostests/apitests/user32/SystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SystemPar… ============================================================================== --- trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] Tue Jan 31 10:49:44 2012 @@ -150,6 +150,27 @@ ok(ret, "SystemParametersInfo failed\n"); ok(temp == 1, "SPI_GETMOUSESPEED did not get value set by SPI_SETMOUSESPEED (%d instead of 1)\n", (int)temp); + temp = 20; + ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)temp, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + ok(ret, "SystemParametersInfo failed\n"); + ret = SystemParametersInfo(SPI_GETMOUSESPEED, 0, &temp, 0); + ok(ret, "SystemParametersInfo failed\n"); + ok(temp == 20, "SPI_GETMOUSESPEED did not get value set by SPI_SETMOUSESPEED (%d instead of 20)\n", (int)temp); + + temp = 21; + ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)temp, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + ok(!ret, "expected SystemParametersInfo to fail\n"); + ret = SystemParametersInfo(SPI_GETMOUSESPEED, 0, &temp, 0); + ok(ret, "SystemParametersInfo failed\n"); + ok(temp == 20, "SPI_GETMOUSESPEED got unexpected value (%d instead of 20)\n", (int)temp); + + temp = 0; + ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)temp, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + ok(!ret, "expected SystemParametersInfo to fail\n"); + ret = SystemParametersInfo(SPI_GETMOUSESPEED, 0, &temp, 0); + ok(ret, "SystemParametersInfo failed\n"); + ok(temp == 20, "SPI_GETMOUSESPEED got unexpected value (%d instead of 20)\n", (int)temp); + ret = SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)ulMouseSpeed, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); ok(ret, "SystemParametersInfo failed\n"); }

1 0

Jump to page:

2025

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