Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 55032: [USB-BRINGUP-TRUNK] - Fix usbohci build
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

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; }

1 0

[tfaber] 55031: [KMTESTS] - Fix IRP handling, and some 64 bit warnings
by tfaber＠svn.reactos.org 20 Jan '12

20 Jan '12

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)

1 0

[cgutman] 55030: [USB-BRINGUP-TRUNK] - Fix hidparser build - Based on a patch from igorko
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

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,

1 0

[cgutman] 55029: [USB-BRINGUP-TRUNK] - Fix usbehci build
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

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)

1 0

[cgutman] 55028: [USB-BRINGUP-TRUNK] - Fix hidusb build
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

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;

1 0

[cgutman] 55027: [USB-BRINGUP-TRUNK] - Fix uninitialized variable use and more build errors
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: cgutman Date: Fri Jan 20 22:35:52 2012 New Revision: 55027 URL: http://svn.reactos.org/svn/reactos?rev=55027&view=rev Log: [USB-BRINGUP-TRUNK] - Fix uninitialized variable use and more build errors Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Fri Jan 20 22:35:52 2012 @@ -800,7 +800,7 @@ CreateDeviceIds( PDEVICE_OBJECT UsbChildDeviceObject) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; ULONG Index; PWCHAR BufferPtr; WCHAR Buffer[100]; @@ -965,6 +965,7 @@ if (UsbChildExtension->usInstanceId.Buffer == NULL) { DPRINT1("Error: failed to allocate %lu bytes\n", Index * sizeof(WCHAR)); + Status = STATUS_INSUFFICIENT_RESOURCES; goto Cleanup; } Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Fri Jan 20 22:35:52 2012 @@ -284,8 +284,8 @@ DPRINT1("Connect %x\n", ((PortStatus.Status & USB_PORT_STATUS_CONNECT) << 1) << ((PortId - 1) * 2)); DPRINT1("Enable %x\n", ((PortStatus.Status & USB_PORT_STATUS_ENABLE) >> 1) << ((PortId - 1) * 2)); *PortStatusBits += - ((PortStatus.Status & USB_PORT_STATUS_CONNECT) << 1) << ((PortId - 1) * 2) + - ((PortStatus.Status & USB_PORT_STATUS_ENABLE) >> 1) << ((PortId - 1) * 2); + (((PortStatus.Status & USB_PORT_STATUS_CONNECT) << 1) << ((PortId - 1) * 2)) + + (((PortStatus.Status & USB_PORT_STATUS_ENABLE) >> 1) << ((PortId - 1) * 2)); } } Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c [iso-8859-1] Fri Jan 20 22:35:52 2012 @@ -153,7 +153,7 @@ ULONG CopyField( IN PUCHAR Name, - IN PUCHAR Buffer, + IN PCHAR Buffer, IN ULONG MaxLength) { ULONG Index; @@ -261,7 +261,7 @@ { PPDO_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - UCHAR Buffer[100]; + CHAR Buffer[100]; LPCSTR DeviceType; ULONG Offset = 0; PUFI_INQUIRY_RESPONSE InquiryData;

1 0

[rharabien] 55026: - Fix rbuild build
by rharabien＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: rharabien Date: Fri Jan 20 22:35:10 2012 New Revision: 55026 URL: http://svn.reactos.org/svn/reactos?rev=55026&view=rev Log: - Fix rbuild build Modified: trunk/reactos/dll/win32/netshell/netshell.rbuild Modified: trunk/reactos/dll/win32/netshell/netshell.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.rbuild [iso-8859-1] Fri Jan 20 22:35:10 2012 @@ -17,12 +17,12 @@ <library>ws2_32</library> <library>comctl32</library> <pch>precomp.h</pch> - <file>netshell.c</file> - <file>shfldr_netconnect.c</file> - <file>enumlist.c</file> + <file>netshell.cpp</file> + <file>shfldr_netconnect.cpp</file> + <file>enumlist.cpp</file> <file>netshell.rc</file> - <file>classfactory.c</file> - <file>connectmanager.c</file> - <file>lanconnectui.c</file> - <file>lanstatusui.c</file> + <file>classfactory.cpp</file> + <file>connectmanager.cpp</file> + <file>lanconnectui.cpp</file> + <file>lanstatusui.cpp</file> </module>

1 0

[cgutman] 55025: [USB-BRINGUP-TRUNK] - Fix build errors in kbdhid and mouhid
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: cgutman Date: Fri Jan 20 22:17:32 2012 New Revision: 55025 URL: http://svn.reactos.org/svn/reactos?rev=55025&view=rev Log: [USB-BRINGUP-TRUNK] - Fix build errors in kbdhid and mouhid Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Fri Jan 20 22:17:32 2012 @@ -42,7 +42,7 @@ IN PCHAR NewScanCodes, IN ULONG Length) { - KEYBOARD_INPUT_DATA InputData; + //KEYBOARD_INPUT_DATA InputData; ULONG Index; for(Index = 0; Index < Length; Index++) @@ -563,7 +563,7 @@ /* init input report*/ DeviceExtension->ReportLength = Capabilities.InputReportByteLength; ASSERT(DeviceExtension->ReportLength); - DeviceExtension->Report = (PUCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); + DeviceExtension->Report = (PCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); ASSERT(DeviceExtension->Report); RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength); Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] Fri Jan 20 22:17:32 2012 @@ -648,7 +648,7 @@ DPRINT1("[MOUHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); /* verify capabilities */ - if (Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC) + if ((Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE) || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC) { /* not supported */ ExFreePool(PreparsedData); @@ -658,7 +658,7 @@ /* init input report*/ DeviceExtension->ReportLength = Capabilities.InputReportByteLength; ASSERT(DeviceExtension->ReportLength); - DeviceExtension->Report = (PUCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); + DeviceExtension->Report = (PCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); ASSERT(DeviceExtension->Report); RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength); Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h [iso-8859-1] Fri Jan 20 22:17:32 2012 @@ -86,7 +86,7 @@ // // input report buffer // - PUCHAR Report; + PCHAR Report; // // input report length

1 0

[cgutman] 55024: [USB-BRINGUP-TRUNK] - Add USB stuff to 1st stage setup
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: cgutman Date: Fri Jan 20 22:04:57 2012 New Revision: 55024 URL: http://svn.reactos.org/svn/reactos?rev=55024&view=rev Log: [USB-BRINGUP-TRUNK] - Add USB stuff to 1st stage setup Modified: branches/usb-bringup-trunk/base/setup/usetup/interface/devinst.c branches/usb-bringup-trunk/boot/bootdata/packages/reactos.dff branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/kbdhid/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbhub/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbhub_new/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt Modified: branches/usb-bringup-trunk/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/base/setup/us… ============================================================================== --- branches/usb-bringup-trunk/base/setup/usetup/interface/devinst.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/base/setup/usetup/interface/devinst.c [iso-8859-1] Fri Jan 20 22:04:57 2012 @@ -63,6 +63,7 @@ if (!SetupFindFirstLineW(hInf, L"BootBusExtenders.Load", Driver, &Context) && !SetupFindFirstLineW(hInf, L"BusExtenders.Load", Driver, &Context) && !SetupFindFirstLineW(hInf, L"SCSI.Load", Driver, &Context) + && !SetupFindFirstLineW(hInf, L"InputDevicesSupport.Load", Driver, &Context) && !SetupFindFirstLineW(hInf, L"Keyboard.Load", Driver, &Context)) return FALSE; if (!INF_GetDataField(&Context, 1, &ImagePath)) 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] Fri Jan 20 22:04:57 2012 @@ -541,11 +541,7 @@ drivers\storage\ide\pciide\pciide.sys 2 drivers\storage\ide\pciidex\pciidex.sys 2 -;drivers\usb\miniport\usbohci\usbohci.sys 2 -;drivers\usb\miniport\usbuhci\usbuhci.sys 2 -;drivers\usb\usbhub\usbhub.sys 2 -;drivers\usb\usbport\usbport.sys 2 -;drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 +drivers\hid\mouhid\mouhid.sys 2 drivers\video\displays\vga\vgaddi.dll 1 drivers\video\displays\framebuf\framebuf.dll 1 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 22:04:57 2012 @@ -32,7 +32,15 @@ disk.sys=,,,,,,x,,,,,,4 floppy.sys=,,,,,,x,,,,,,4 i8042prt.sys=,,,,,,x,,,,,,4 -usbdrv.sys=,,,,,,,,,,,,4 +hidclass.sys=,,,,,,,,,,,,4 +hidparse.sys=,,,,,,,,,,,,4 +hidusb.sys=,,,,,,,,,,,,4 +usbhub.sys=,,,,,,,,,,,,4 +;usbuhci.sys=,,,,,,,,,,,,4 +usbohci.sys=,,,,,,,,,,,,4 +usbehci.sys=,,,,,,,,,,,,4 +usbstor.sys=,,,,,,,,,,,,4 +kbdhid.sys=,,,,,,,,,,,,4 kbdclass.sys=,,,,,,x,,,,,,4 l_intl.nls=,,,,,,,,,,,,2 ntfs.sys=,,,,,,,,,,,,4 @@ -61,11 +69,29 @@ PCI\CC_0105 = uniata PCI\CC_0106 = uniata *PNP0600 = uniata +USB\CLASS_09 = usbhub +USB\ROOT_HUB = usbhub +USB\ROOT_HUB20 = usbhub +;PCI\CC_0C0300 = usbuhci +PCI\CC_0C0310 = usbohci +PCI\CC_0C0320 = usbehci +;USB\Class_08&SubClass_06&Prot_50 = usbstor +HID_DEVICE_SYSTEM_KEYBOARD = kbdhid [BootBusExtenders.Load] acpi = acpi.sys pci = pci.sys isapnp = isapnp.sys + +[InputDevicesSupport.Load] +usbehci = usbehci.sys +usbohci = usbohci.sys +;usbuhci = usbuhci.sys +usbhub = usbhub.sys +;usbccgp = usbccgp.sys +hidusb = hidusb.sys +usbstor = usbstor.sys +kbdhid = kbdhid.sys [BusExtenders.Load] pciide = pciide.sys Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Fri Jan 20 22:04:57 2012 @@ -17,4 +17,6 @@ add_importlibs(hidclass ntoskrnl hidparse hal) -add_importlib_target(hidclass.spec) +add_importlib_target(hidclass.spec) + +add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt [iso-8859-1] Fri Jan 20 22:04:57 2012 @@ -14,3 +14,5 @@ add_importlib_target(hidparse.spec) target_link_libraries(hidparse hidparser) + +add_cd_file(TARGET hidparse DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt [iso-8859-1] Fri Jan 20 22:04:57 2012 @@ -6,4 +6,6 @@ add_library(hidusb SHARED ${SOURCE}) set_module_type(hidusb kernelmodedriver) -add_importlibs(hidusb hidclass ntoskrnl usbd hal) +add_importlibs(hidusb hidclass ntoskrnl usbd hal) + +add_cd_file(TARGET hidusb DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/kbdhid/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/kbdhid/CMakeLists.txt [iso-8859-1] Fri Jan 20 22:04:57 2012 @@ -7,3 +7,5 @@ set_module_type(kbdhid kernelmodedriver) add_importlibs(kbdhid ntoskrnl hal hidparse) + +add_cd_file(TARGET kbdhid DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] Fri Jan 20 22:04:57 2012 @@ -17,3 +17,5 @@ set_module_type(usbehci kernelmodedriver) add_importlibs(usbehci ntoskrnl hal) + +add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all) 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:04:57 2012 @@ -30,4 +30,6 @@ endif(MSVC) set_module_type(usbehci kernelmodedriver) -add_importlibs(usbehci ntoskrnl ks drmk hal) +add_importlibs(usbehci ntoskrnl ks drmk hal) + +add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: branches/usb-bringup-trunk/drivers/usb/usbhub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] Fri Jan 20 22:04:57 2012 @@ -11,3 +11,5 @@ set_module_type(usbhub kernelmodedriver) add_importlibs(usbhub ntoskrnl hal usbd) + +add_cd_file(TARGET usbhub DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/CMakeLists.txt [iso-8859-1] Fri Jan 20 22:04:57 2012 @@ -9,3 +9,5 @@ set_module_type(usbhub kernelmodedriver) add_importlibs(usbhub ntoskrnl hal usbd) + +add_cd_file(TARGET usbhub DESTINATION reactos/system32/drivers NO_CAB FOR all) 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 22:04:57 2012 @@ -30,4 +30,6 @@ endif(MSVC) set_module_type(usbohci kernelmodedriver) -add_importlibs(usbohci ntoskrnl ks drmk hal usbd) +add_importlibs(usbohci ntoskrnl ks drmk hal usbd) + +add_cd_file(TARGET usbohci DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] Fri Jan 20 22:04:57 2012 @@ -7,3 +7,5 @@ set_module_type(usbstor kernelmodedriver) add_importlibs(usbstor ntoskrnl hal usbd) + +add_cd_file(TARGET usbstor DESTINATION reactos/system32/drivers NO_CAB FOR all)

1 0

[rharabien] 55023: - Fix build
by rharabien＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: rharabien Date: Fri Jan 20 21:59:33 2012 New Revision: 55023 URL: http://svn.reactos.org/svn/reactos?rev=55023&view=rev Log: - Fix build Added: trunk/reactos/dll/win32/netshell/enumlist.h (with props) Added: trunk/reactos/dll/win32/netshell/enumlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/enumlis… ============================================================================== --- trunk/reactos/dll/win32/netshell/enumlist.h (added) +++ trunk/reactos/dll/win32/netshell/enumlist.h [iso-8859-1] Fri Jan 20 21:59:33 2012 @@ -1,0 +1,48 @@ +typedef struct tagGUIDStruct +{ + BYTE dummy; /* offset 01 is unknown */ + GUID guid; /* offset 02 */ +} GUIDStruct; + +#define PT_GUID 0x1F + +typedef struct tagPIDLDATA +{ + BYTE type; /*00*/ + union + { + struct tagGUIDStruct guid; + struct tagVALUEStruct value; + } u; +} PIDLDATA, *LPPIDLDATA; + +typedef struct tagENUMLIST +{ + struct tagENUMLIST *pNext; + LPITEMIDLIST pidl; +} ENUMLIST, *LPENUMLIST; + +class CEnumIDList: + public IEnumIDList +{ + public: + CEnumIDList(); + BOOL AddToEnumList(LPITEMIDLIST pidl); + + // IUnknown + virtual HRESULT WINAPI QueryInterface(REFIID riid, LPVOID *ppvOut); + virtual ULONG WINAPI AddRef(); + virtual ULONG WINAPI Release(); + + // IEnumIDList + virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt, LPITEMIDLIST *rgelt, ULONG *pceltFetched); + virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt); + virtual HRESULT STDMETHODCALLTYPE Reset(); + virtual HRESULT STDMETHODCALLTYPE Clone(IEnumIDList **ppenum); + + private: + LONG ref; + LPENUMLIST mpFirst; + LPENUMLIST mpLast; + LPENUMLIST mpCurrent; +}; Propchange: trunk/reactos/dll/win32/netshell/enumlist.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/netshell/enumlist.h ------------------------------------------------------------------------------ svn:keywords = Author Date Id Rev URL

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs