Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[cgutman] 55037: [USB-BRINGUP-TRUNK] - Fix input.inf and include it in reactos.cab

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 21 01:29:33 2012 New Revision: 55037 URL: http://svn.reactos.org/svn/reactos?rev=55037&view=rev Log: [USB-BRINGUP-TRUNK] - Fix input.inf and include it in reactos.cab Modified: branches/usb-bringup-trunk/boot/bootdata/packages/reactos.dff branches/usb-bringup-trunk/media/inf/input.inf Modified: branches/usb-bringup-trunk/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Jan 21 01:29:33 2012 @@ -666,6 +666,7 @@ media\inf\fdc.inf 6 media\inf\hal.inf 6 media\inf\hdc.inf 6 +media\inf\input.inf 6 media\inf\intl.inf 6 media\inf\layout.inf 6 media\inf\machine.inf 6 Modified: branches/usb-bringup-trunk/media/inf/input.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/inp… ============================================================================== --- branches/usb-bringup-trunk/media/inf/input.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/media/inf/input.inf [iso-8859-1] Sat Jan 21 01:29:33 2012 @@ -2,43 +2,41 @@ Signature="$WINDOWS NT$" Class=HIDClass ClassGuid={745a17a0-74d3-11d0-b6fe-00a0c90f57da} -Provider=%MSFT% +Provider=%ReactOS% LayoutFile=layout.inf -DriverVer=07/01/2001,5.1.2600.5512 +DriverVer=01/20/2012,1.00 [DestinationDirs] DefaultDestDir = 12 HID_Inst.CopyFilesDLL.NT = 11 -SPI_Files_DLL = 11 - -[ClassInstall] -Addreg=HIDClassReg [HIDClassReg] HKR,,,,%HID.ClassName% HKR,,Icon,,-24 HKR,,NoInstallClass,,1 -[ClassInstall32] +[ClassInstall32.NT] Addreg=HIDClassReg +[Manufacturer] +%StdMfg% = StdMfg +%MSMice% = MSMice + [MSMice] -%USB\VID_045E&PID_0009.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0009 -%USB\VID_045E&PID_001E.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_001E -%USB\VID_045E&PID_0023.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0023 -%USB\VID_045E&PID_0024.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0024 -%USB\VID_045E&PID_0025.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0025 -%USB\VID_045E&PID_0029.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0029 -%USB\VID_045E&PID_0039.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0039 -%USB\VID_045E&PID_0040.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0040 -%USB\VID_045E&PID_0047.DeviceDesc%=HID_Inst,, USB\VID_045E&PID_0047 +%USB\VID_045E&PID_0009.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0009 +%USB\VID_045E&PID_001E.DeviceDesc%=HID_Inst,USB\VID_045E&PID_001E +%USB\VID_045E&PID_0023.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0023 +%USB\VID_045E&PID_0024.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0024 +%USB\VID_045E&PID_0025.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0025 +%USB\VID_045E&PID_0029.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0029 +%USB\VID_045E&PID_0039.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0039 +%USB\VID_045E&PID_0040.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0040 +%USB\VID_045E&PID_0047.DeviceDesc%=HID_Inst,USB\VID_045E&PID_0047 - -[Standard] -%HID_DEVICE_SYSTEM_GAME%=HID_Raw_Inst,, HID_DEVICE_SYSTEM_GAME -%HID_DEVICE%=HID_Raw_Inst,, HID_DEVICE -%HID.DeviceDesc% = HID_Inst,,GENERIC_HID_DEVICE,USB\Class_03&SubClass_01,USB\Class_03 - +[StdMfg] +%HID.DeviceDesc% = HID_Inst,GENERIC_HID_DEVICE +%HID.DeviceDesc% = HID_Inst,USB\Class_03&SubClass_01 +%HID.DeviceDesc% = HID_Inst,USB\Class_03 [HID_Inst.NT] Copyfiles = HID_Inst.CopyFiles.NT, HID_Inst.CopyFilesDLL.NT @@ -59,15 +57,13 @@ StartType = 3 ErrorControl = 1 ServiceBinary = %12%\hidusb.sys -LoadOrderGroup = extended base +LoadOrderGroup = Extended Base -[strings] -MSFT = "ReactOS" -HID.DeviceDesc = "USB-HID (Human Interface Device)" -HID.DefaultDevice = "HID-Standardgerät" -HID.ClassName = "Eingabegeräte (Human Interface Devices)" -HID.SvcDesc = "ReactOS HID Class-Treiber" +[Strings] +ReactOS = "ReactOS Team" +HID.ClassName = "Human Interface Devices" +HID.DeviceDesc = "USB Human Interface Device" +StdMfg = "(Standard Human Interface Devices)" +MSMice = "Microsoft" - -

12 years, 11 months

[cgutman] 55036: [USB-BRINGUP-TRUNK] - Fix a BSOD during usbstor device initialization - Enable usbstor in 1st stage

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 21 00:31:09 2012 New Revision: 55036 URL: http://svn.reactos.org/svn/reactos?rev=55036&view=rev Log: [USB-BRINGUP-TRUNK] - Fix a BSOD during usbstor device initialization - Enable usbstor in 1st stage Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] Sat Jan 21 00:31:09 2012 @@ -76,7 +76,7 @@ ;PCI\CC_0C0300 = usbuhci PCI\CC_0C0310 = usbohci PCI\CC_0C0320 = usbehci -;USB\Class_08&SubClass_06&Prot_50 = usbstor +USB\Class_08&SubClass_06&Prot_50 = usbstor HID_DEVICE_SYSTEM_KEYBOARD = kbdhid [BootBusExtenders.Load] Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c [iso-8859-1] Sat Jan 21 00:31:09 2012 @@ -411,7 +411,7 @@ // DPRINT1("USBSTOR_SelectConfiguration failed to set interface %x\n", Status); FreeItem(InterfaceList); - FreeItem(Urb); + ExFreePool(Urb); return Status; } @@ -425,7 +425,7 @@ // failed to allocate interface information structure // FreeItem(InterfaceList); - FreeItem(Urb); + ExFreePool(Urb); return Status; } @@ -470,7 +470,7 @@ // free interface list & urb // FreeItem(InterfaceList); - FreeItem(Urb); + ExFreePool(Urb); // // done

12 years, 11 months

[cgutman] 55035: [USB-BRINGUP-TRUNK] - Revert r55030

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 21 00:09:55 2012 New Revision: 55035 URL: http://svn.reactos.org/svn/reactos?rev=55035&view=rev Log: [USB-BRINGUP-TRUNK] - Revert r55030 Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/api.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h 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] Sat Jan 21 00:09:55 2012 @@ -101,7 +101,7 @@ { PHID_PARSER_CONTEXT ParserContext; ULONG Index; - //ULONG ReportCount = 0; + ULONG ReportCount = 0; // // get parser context @@ -863,7 +863,7 @@ PHID_PARSER_CONTEXT ParserContext; ULONG Index; PHID_REPORT Report; - //ULONG ItemCount = 0; + ULONG ItemCount = 0; USHORT CurrentUsagePage; PHID_REPORT_ITEM ReportItem; ULONG Data; @@ -1017,7 +1017,7 @@ // // is this a key break // - if (KeyAction == HidP_Keyboard_Break) + if (KeyAction == HidP_KeyboardBreak) { // // add break 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] Sat Jan 21 00:09:55 2012 @@ -49,7 +49,7 @@ OUT PHIDP_DEVICE_DESC DeviceDescription) { HIDPARSER_STATUS ParserStatus; - ULONG CollectionCount; + ULONG CollectionCount, ReportCount; ULONG Index; // @@ -678,9 +678,7 @@ // // process usage // - //Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); - UNIMPLEMENTED - Status = HIDPARSER_STATUS_NOT_IMPLEMENTED; + Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); } else if (ChangedUsageList[Index].UsagePage == HID_USAGE_PAGE_CONSUMER) { 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] Sat Jan 21 00:09:55 2012 @@ -13,7 +13,6 @@ #define _HIDPI_ #define _HIDPI_NO_FUNCTION_MACROS_ #include <ntddk.h> -#include <ntddkbd.h> #include <hidpddi.h> #include <hidpi.h> #include <debug.h> @@ -331,7 +330,6 @@ NTSTATUS NTAPI HidParser_TranslateUsageAndPagesToI8042ScanCodes( - IN PHID_PARSER Parser, IN PUSAGE_AND_PAGE ChangedUsageList, IN ULONG UsageListLength, IN HIDP_KEYBOARD_DIRECTION KeyAction,

12 years, 11 months

[cgutman] 55034: [USB-BRINGUP-TRUNK] - Add usbd to bootcd because usbohci depends on it - Make device interface creation failure a non-fatal error so the port drivers start successfully in 1st stage

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jan 20 23:58:29 2012 New Revision: 55034 URL: http://svn.reactos.org/svn/reactos?rev=55034&view=rev Log: [USB-BRINGUP-TRUNK] - Add usbd to bootcd because usbohci depends on it - Make device interface creation failure a non-fatal error so the port drivers start successfully in 1st stage Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif branches/usb-bringup-trunk/drivers/usb/usbd/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Jan 20 23:58:29 2012 @@ -35,6 +35,7 @@ hidclass.sys=,,,,,,,,,,,,4 hidparse.sys=,,,,,,,,,,,,4 hidusb.sys=,,,,,,,,,,,,4 +usbd.sys=,,,,,,,,,,,,4 usbhub.sys=,,,,,,,,,,,,4 ;usbuhci.sys=,,,,,,,,,,,,4 usbohci.sys=,,,,,,,,,,,,4 Modified: branches/usb-bringup-trunk/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] Fri Jan 20 23:58:29 2012 @@ -9,3 +9,5 @@ set_module_type(usbd kernelmodedriver) add_importlibs(usbd ntoskrnl hal) add_importlib_target(usbd.spec) + +add_cd_file(TARGET usbd DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Fri Jan 20 23:58:29 2012 @@ -3299,7 +3299,7 @@ // // done // - return Status; + return STATUS_SUCCESS; } NTSTATUS 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] Fri Jan 20 23:58:29 2012 @@ -3287,7 +3287,7 @@ // // done // - return Status; + return STATUS_SUCCESS; } NTSTATUS

12 years, 11 months

[cgutman] 55033: [USB-BRINGUP-TRUNK] - Add add_cd_file line for mouhid

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jan 20 23:24:07 2012 New Revision: 55033 URL: http://svn.reactos.org/svn/reactos?rev=55033&view=rev Log: [USB-BRINGUP-TRUNK] - Add add_cd_file line for mouhid Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt [iso-8859-1] Fri Jan 20 23:24:07 2012 @@ -8,3 +8,4 @@ set_module_type(mouhid kernelmodedriver) add_importlibs(mouhid ntoskrnl hal hidparse) +add_cd_file(TARGET mouhid DESTINATION reactos/system32/drivers FOR all)

12 years, 11 months

[cgutman] 55032: [USB-BRINGUP-TRUNK] - Fix usbohci build

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jan 20 23:19:18 2012 New Revision: 55032 URL: http://svn.reactos.org/svn/reactos?rev=55032&view=rev Log: [USB-BRINGUP-TRUNK] - Fix usbohci build Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] Fri Jan 20 23:19:18 2012 @@ -19,7 +19,6 @@ target_link_libraries(usbohci libcntpr - stlport ${PSEH_LIB}) if(MSVC) Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Fri Jan 20 23:19:18 2012 @@ -997,7 +997,7 @@ ULONG PortId, ULONG Status) { - ULONG Value, Index = 0; + ULONG Value; DPRINT("CUSBHardwareDevice::ClearPortStatus PortId %x Feature %x\n", PortId, Status); @@ -1383,7 +1383,6 @@ { CUSBHardwareDevice *This; ULONG CStatus, Index, PortStatus; - POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor; ULONG DoneHead; // Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Fri Jan 20 23:19:18 2012 @@ -1028,7 +1028,6 @@ IN USBD_CONFIGURATION_HANDLE ConfigurationHandle, IN OUT PUSBD_INTERFACE_INFORMATION InterfaceInfo) { - ULONG ConfigurationIndex = 0; PUSB_CONFIGURATION_DESCRIPTOR Configuration; ULONG PipeIndex; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Fri Jan 20 23:19:18 2012 @@ -169,7 +169,6 @@ { NTSTATUS Status; ULONG Type; - KIRQL OldLevel; POHCI_ENDPOINT_DESCRIPTOR HeadDescriptor; POHCI_ENDPOINT_DESCRIPTOR Descriptor; POHCI_ISO_TD CurrentDescriptor; @@ -289,6 +288,14 @@ PrintEndpointList(m_IsoHeadEndpointDescriptor); } + else + { + // + // bad request type + // + Request->Release(); + return STATUS_INVALID_PARAMETER; + } // // set descriptor active @@ -307,7 +314,6 @@ // m_Hardware->HeadEndpointDescriptorModified(Type); } - return STATUS_SUCCESS; }

12 years, 11 months

[tfaber] 55031: [KMTESTS] - Fix IRP handling, and some 64 bit warnings

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jan 20 23:12:44 2012 New Revision: 55031 URL: http://svn.reactos.org/svn/reactos?rev=55031&view=rev Log: [KMTESTS] - Fix IRP handling, and some 64 bit warnings Modified: trunk/rostests/kmtests/kmtest_drv/kmtest_drv.c trunk/rostests/kmtests/kmtest_drv/kmtest_standalone.c Modified: trunk/rostests/kmtests/kmtest_drv/kmtest_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/kmtest… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] Fri Jan 20 23:12:44 2012 @@ -22,8 +22,13 @@ /* Prototypes */ DRIVER_INITIALIZE DriverEntry; static DRIVER_UNLOAD DriverUnload; +__drv_dispatchType(IRP_MJ_CREATE) static DRIVER_DISPATCH DriverCreate; +__drv_dispatchType(IRP_MJ_CLEANUP) +static DRIVER_DISPATCH DriverCleanup; +__drv_dispatchType(IRP_MJ_CLOSE) static DRIVER_DISPATCH DriverClose; +__drv_dispatchType(IRP_MJ_DEVICE_CONTROL) static DRIVER_DISPATCH DriverIoControl; /* Globals */ @@ -83,6 +88,7 @@ DriverObject->DriverUnload = DriverUnload; DriverObject->MajorFunction[IRP_MJ_CREATE] = DriverCreate; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = DriverCleanup; DriverObject->MajorFunction[IRP_MJ_CLOSE] = DriverClose; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DriverIoControl; @@ -130,7 +136,7 @@ /** * @name DriverCreate * - * Driver Dispatch function for CreateFile + * Driver Dispatch function for IRP_MJ_CREATE * * @param DeviceObject * Device Object @@ -166,9 +172,9 @@ } /** - * @name DriverClose - * - * Driver Dispatch function for CloseHandle. + * @name DriverCleanup + * + * Driver Dispatch function for IRP_MJ_CLEANUP * * @param DeviceObject * Device Object @@ -180,7 +186,7 @@ static NTSTATUS NTAPI -DriverClose( +DriverCleanup( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -192,7 +198,7 @@ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - DPRINT("DriverClose. DeviceObject=%p, RequestorMode=%d, FileObject=%p, FsContext=%p, FsContext2=%p\n", + DPRINT("DriverCleanup. DeviceObject=%p, RequestorMode=%d, FileObject=%p, FsContext=%p, FsContext2=%p\n", DeviceObject, Irp->RequestorMode, IoStackLocation->FileObject, IoStackLocation->FileObject->FsContext, IoStackLocation->FileObject->FsContext2); @@ -219,9 +225,43 @@ } /** + * @name DriverClose + * + * Driver Dispatch function for IRP_MJ_CLOSE + * + * @param DeviceObject + * Device Object + * @param Irp + * I/O request packet + * + * @return Status + */ +static +NTSTATUS +NTAPI +DriverClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + DPRINT("DriverClose. DeviceObject=%p, RequestorMode=%d\n", + DeviceObject, Irp->RequestorMode); + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +/** * @name DriverIoControl * - * Driver Dispatch function for DeviceIoControl. + * Driver Dispatch function for IRP_MJ_DEVICE_CONTROL * * @param DeviceObject * Device Object Modified: trunk/rostests/kmtests/kmtest_drv/kmtest_standalone.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/kmtest… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/kmtest_standalone.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/kmtest_standalone.c [iso-8859-1] Fri Jan 20 23:12:44 2012 @@ -320,7 +320,7 @@ IrpHandlers[i].IrpHandler != NULL) return IrpHandlers[i].IrpHandler(DeviceObject, Irp, IoStackLocation); } - + /* default handler for DeviceControl */ if (IoStackLocation->MajorFunction == IRP_MJ_DEVICE_CONTROL || IoStackLocation->MajorFunction == IRP_MJ_INTERNAL_DEVICE_CONTROL) @@ -462,7 +462,7 @@ { NTSTATUS Status = STATUS_SUCCESS; ULONG ControlCode = (IoStackLocation->Parameters.DeviceIoControl.IoControlCode & 0x00000FFC) >> 2; - ULONG OutLength = IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength; + SIZE_T OutLength = IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength; int i; for (i = 0; i < sizeof MessageHandlers / sizeof MessageHandlers[0]; ++i)

12 years, 11 months

[cgutman] 55030: [USB-BRINGUP-TRUNK] - Fix hidparser build - Based on a patch from igorko

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jan 20 23:03:27 2012 New Revision: 55030 URL: http://svn.reactos.org/svn/reactos?rev=55030&view=rev Log: [USB-BRINGUP-TRUNK] - Fix hidparser build - Based on a patch from igorko Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/api.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h 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] Fri Jan 20 23:03:27 2012 @@ -101,7 +101,7 @@ { PHID_PARSER_CONTEXT ParserContext; ULONG Index; - ULONG ReportCount = 0; + //ULONG ReportCount = 0; // // get parser context @@ -863,7 +863,7 @@ PHID_PARSER_CONTEXT ParserContext; ULONG Index; PHID_REPORT Report; - ULONG ItemCount = 0; + //ULONG ItemCount = 0; USHORT CurrentUsagePage; PHID_REPORT_ITEM ReportItem; ULONG Data; @@ -1017,7 +1017,7 @@ // // is this a key break // - if (KeyAction == HidP_KeyboardBreak) + if (KeyAction == HidP_Keyboard_Break) { // // add break 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] Fri Jan 20 23:03:27 2012 @@ -49,7 +49,7 @@ OUT PHIDP_DEVICE_DESC DeviceDescription) { HIDPARSER_STATUS ParserStatus; - ULONG CollectionCount, ReportCount; + ULONG CollectionCount; ULONG Index; // @@ -678,7 +678,9 @@ // // process usage // - Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); + //Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); + UNIMPLEMENTED + Status = HIDPARSER_STATUS_NOT_IMPLEMENTED; } else if (ChangedUsageList[Index].UsagePage == HID_USAGE_PAGE_CONSUMER) { 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] Fri Jan 20 23:03:27 2012 @@ -13,6 +13,7 @@ #define _HIDPI_ #define _HIDPI_NO_FUNCTION_MACROS_ #include <ntddk.h> +#include <ntddkbd.h> #include <hidpddi.h> #include <hidpi.h> #include <debug.h> @@ -330,6 +331,7 @@ NTSTATUS NTAPI HidParser_TranslateUsageAndPagesToI8042ScanCodes( + IN PHID_PARSER Parser, IN PUSAGE_AND_PAGE ChangedUsageList, IN ULONG UsageListLength, IN HIDP_KEYBOARD_DIRECTION KeyAction,

12 years, 11 months

[cgutman] 55029: [USB-BRINGUP-TRUNK] - Fix usbehci build

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jan 20 22:53:30 2012 New Revision: 55029 URL: http://svn.reactos.org/svn/reactos?rev=55029&view=rev Log: [USB-BRINGUP-TRUNK] - Fix usbehci build Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] Fri Jan 20 22:53:30 2012 @@ -19,7 +19,6 @@ target_link_libraries(usbehci libcntpr - stlport ${PSEH_LIB}) if(MSVC)

12 years, 11 months

[cgutman] 55028: [USB-BRINGUP-TRUNK] - Fix hidusb build

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jan 20 22:38:39 2012 New Revision: 55028 URL: http://svn.reactos.org/svn/reactos?rev=55028&view=rev Log: [USB-BRINGUP-TRUNK] - Fix hidusb build Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c 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] Fri Jan 20 22:38:39 2012 @@ -622,7 +622,7 @@ { PHID_USB_DEVICE_EXTENSION HidDeviceExtension; PHID_DEVICE_EXTENSION DeviceExtension; - PUCHAR Report = NULL; + PVOID Report = NULL; ULONG BufferLength, Length; PIO_STACK_LOCATION IoStack; NTSTATUS Status;

12 years, 11 months

← Newer
1
...
30
31
32
33
34
35
36
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2012