Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 55122: [USBOHCI] - Fix warning - Remove assert [USBEHCI] - Remove assert
by janderwald＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: janderwald Date: Mon Jan 23 16:47:19 2012 New Revision: 55122 URL: http://svn.reactos.org/svn/reactos?rev=55122&view=rev Log: [USBOHCI] - Fix warning - Remove assert [USBEHCI] - Remove assert Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hcd_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/hcd_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] Mon Jan 23 16:47:19 2012 @@ -502,7 +502,6 @@ // // not supported // - PC_ASSERT(0); Status = STATUS_NOT_SUPPORTED; } break; Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hcd_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hcd_controller.cpp [iso-8859-1] Mon Jan 23 16:47:19 2012 @@ -502,7 +502,6 @@ // // not supported // - PC_ASSERT(0); Status = STATUS_NOT_SUPPORTED; } break; Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Mon Jan 23 16:47:19 2012 @@ -654,7 +654,7 @@ CUSBRequest::BuildIsochronousEndpoint( POHCI_ENDPOINT_DESCRIPTOR * OutEndpointDescriptor) { - POHCI_ISO_TD FirstDescriptor, PreviousDescriptor = NULL, CurrentDescriptor; + POHCI_ISO_TD FirstDescriptor = NULL, PreviousDescriptor = NULL, CurrentDescriptor = NULL; POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor; ULONG Index = 0, SubIndex, NumberOfPackets, PageOffset, Page; NTSTATUS Status;

1 0

[cgutman] 55121: [USBEHCI] - Remove unused variable
by cgutman＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: cgutman Date: Mon Jan 23 16:29:43 2012 New Revision: 55121 URL: http://svn.reactos.org/svn/reactos?rev=55121&view=rev Log: [USBEHCI] - Remove unused variable Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Mon Jan 23 16:29:43 2012 @@ -575,8 +575,6 @@ PQUEUE_HEAD CurrentQH, NTSTATUS Status) { - KIRQL OldLevel; - // // now unlink the queue head // FIXME: implement chained queue heads

1 0

[janderwald] 55120: [USBHUB] - Silent traces
by janderwald＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: janderwald Date: Mon Jan 23 16:25:43 2012 New Revision: 55120 URL: http://svn.reactos.org/svn/reactos?rev=55120&view=rev Log: [USBHUB] - Silent traces Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.h Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] Mon Jan 23 16:25:43 2012 @@ -1,5 +1,6 @@ #pragma once +#define NDEBUG #include <ntifs.h> #include <ntddk.h> #include <wdmguid.h>

1 0

[cgutman] 55119: [USB-BRINGUP-TRUNK] - Allow surprise removal of HID devices - Don't assemble useless empty resource lists
by cgutman＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: cgutman Date: Mon Jan 23 16:22:43 2012 New Revision: 55119 URL: http://svn.reactos.org/svn/reactos?rev=55119&view=rev Log: [USB-BRINGUP-TRUNK] - Allow surprise removal of HID devices - Don't assemble useless empty resource lists Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.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] Mon Jan 23 16:22:43 2012 @@ -1504,6 +1504,11 @@ // IoStack->Parameters.DeviceCapabilities.Capabilities->DeviceD1 = TRUE; IoStack->Parameters.DeviceCapabilities.Capabilities->DeviceD2 = TRUE; + + // + // don't need to safely remove + // + IoStack->Parameters.DeviceCapabilities.Capabilities->SurpriseRemovalOK = TRUE; } // 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] Mon Jan 23 16:22:43 2012 @@ -517,44 +517,18 @@ } case IRP_MN_QUERY_RESOURCES: { - PCM_RESOURCE_LIST ResourceList; - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n"); - ResourceList = ExAllocatePool(PagedPool, sizeof(CM_RESOURCE_LIST)); - if (!ResourceList) - { - DPRINT1("ExAllocatePool() failed\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - } - else - { - ResourceList->Count = 0; - Information = (ULONG_PTR)ResourceList; - Status = STATUS_SUCCESS; - } + + Information = Irp->IoStatus.Information; + Status = Irp->IoStatus.Status; break; } case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: { - PIO_RESOURCE_REQUIREMENTS_LIST ResourceList; DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); - ResourceList = ExAllocatePool(PagedPool, sizeof(IO_RESOURCE_REQUIREMENTS_LIST)); - if (!ResourceList) - { - DPRINT1("ExAllocatePool() failed\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - } - else - { - RtlZeroMemory(ResourceList, sizeof(IO_RESOURCE_REQUIREMENTS_LIST)); - ResourceList->ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST); - ResourceList->AlternativeLists = 1; - ResourceList->List->Version = 1; - ResourceList->List->Revision = 1; - ResourceList->List->Count = 0; - Information = (ULONG_PTR)ResourceList; - Status = STATUS_SUCCESS; - } + + Information = Irp->IoStatus.Information; + Status = Irp->IoStatus.Status; break; } case IRP_MN_QUERY_DEVICE_TEXT:

1 0

[janderwald] 55118: [USBSTOR] - Silent traces
by janderwald＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: janderwald Date: Mon Jan 23 16:22:33 2012 New Revision: 55118 URL: http://svn.reactos.org/svn/reactos?rev=55118&view=rev Log: [USBSTOR] - Silent traces Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h 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] Mon Jan 23 16:22:33 2012 @@ -2,7 +2,7 @@ #pragma once #include <ntddk.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> #include <usbdi.h> #include <hubbusif.h>

1 0

[janderwald] 55117: [USBEHCI] - Remove traces
by janderwald＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: janderwald Date: Mon Jan 23 16:17:21 2012 New Revision: 55117 URL: http://svn.reactos.org/svn/reactos?rev=55117&view=rev Log: [USBEHCI] - Remove traces Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Mon Jan 23 16:17:21 2012 @@ -934,9 +934,7 @@ // // acquire lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); // // return old irql @@ -949,7 +947,6 @@ CUSBHardwareDevice::ReleaseDeviceLock( KIRQL OldLevel) { - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel); } 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] Mon Jan 23 16:17:21 2012 @@ -1861,9 +1861,7 @@ // // acquire device lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); // // find address @@ -1885,7 +1883,6 @@ // // release spin lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel); // @@ -1903,9 +1900,7 @@ // // acquire device lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); // // sanity check @@ -1925,7 +1920,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel); } //----------------------------------------------------------------------------------------- @@ -1941,9 +1935,7 @@ // // acquire lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); // // point to first entry @@ -1991,7 +1983,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel); // @@ -2011,9 +2002,7 @@ // // acquire lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); // // point to first entry @@ -2051,7 +2040,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel); // @@ -2089,9 +2077,7 @@ // // acquire lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); // // insert entry @@ -2101,7 +2087,6 @@ // // release spin lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel); // @@ -2121,9 +2106,7 @@ // // acquire hub controller lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); // // now set the callback routine and context of the hub @@ -2131,11 +2114,10 @@ m_HubCallbackContext = CallbackContext; m_HubCallbackRoutine = CallbackRoutine; - // - // release hub controller lock - // - DPRINT(__FUNCTION__ "release\n"); - KeReleaseSpinLock(&m_Lock, OldLevel); + // + // release hub controller lock + // + KeReleaseSpinLock(&m_Lock, OldLevel); } //================================================================================================= Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp [iso-8859-1] Mon Jan 23 16:17:21 2012 @@ -157,9 +157,7 @@ // // acquire lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); // // helper variable @@ -237,7 +235,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel); // @@ -307,9 +304,7 @@ // // acquire lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); // // release buffer @@ -319,7 +314,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel); // Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] Mon Jan 23 16:17:21 2012 @@ -519,9 +519,7 @@ // // acquire device lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(&m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); // // commit urb @@ -531,7 +529,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(&m_Lock, OldLevel); return Status; Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Mon Jan 23 16:17:21 2012 @@ -33,7 +33,7 @@ return m_Ref; } - virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, PDMA_ADAPTER AdapterObject, IN PDMAMEMORYMANAGER MemManager, IN PKSPIN_LOCK Lock); + virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, PDMA_ADAPTER AdapterObject, IN PDMAMEMORYMANAGER MemManager, IN OPTIONAL PKSPIN_LOCK Lock); virtual ULONG GetPendingRequestCount(); virtual NTSTATUS AddUSBRequest(PURB Urb); virtual NTSTATUS AddUSBRequest(IUSBRequest * Request); @@ -355,12 +355,8 @@ // // Add it to the pending list // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); - LinkQueueHead(AsyncListQueueHead, QueueHead); - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel); } @@ -579,6 +575,8 @@ PQUEUE_HEAD CurrentQH, NTSTATUS Status) { + KIRQL OldLevel; + // // now unlink the queue head // FIXME: implement chained queue heads @@ -610,9 +608,7 @@ // // lock completed async list // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); // // walk async list @@ -668,7 +664,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel); } @@ -772,9 +767,7 @@ // // first acquire request lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); // // add to pending list @@ -784,7 +777,6 @@ // // release queue head // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel); // @@ -854,9 +846,7 @@ // // first acquire request lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); // // the list should not be empty @@ -883,7 +873,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel); // @@ -894,10 +883,7 @@ // // first acquire request lock // - DPRINT(__FUNCTION__ " acquire\n"); KeAcquireSpinLock(m_Lock, &OldLevel); - DPRINT(__FUNCTION__ " acquired\n"); - } // @@ -924,7 +910,6 @@ // // release lock // - DPRINT(__FUNCTION__ "release\n"); KeReleaseSpinLock(m_Lock, OldLevel); }

1 0

[akhaldi] 55116: [DDK] * Update usbbusif.h, usbdlib.h and usbscan.h annotations.
by akhaldi＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: akhaldi Date: Mon Jan 23 16:07:08 2012 New Revision: 55116 URL: http://svn.reactos.org/svn/reactos?rev=55116&view=rev Log: [DDK] * Update usbbusif.h, usbdlib.h and usbscan.h annotations. Modified: trunk/reactos/include/ddk/usbbusif.h trunk/reactos/include/ddk/usbdlib.h trunk/reactos/include/ddk/usbscan.h Modified: trunk/reactos/include/ddk/usbbusif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbbusif.h?rev… ============================================================================== --- trunk/reactos/include/ddk/usbbusif.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/usbbusif.h [iso-8859-1] Mon Jan 23 16:07:08 2012 @@ -12,31 +12,33 @@ typedef PVOID PUSB_DEVICE_HANDLE; #endif +_Must_inspect_result_ typedef NTSTATUS (USB_BUSIFFN *PUSB_BUSIFFN_SUBMIT_ISO_OUT_URB) ( - IN PVOID, - IN PURB); + _In_ PVOID, + _In_ PURB); #define USB_HCD_CAPS_SUPPORTS_RT_THREADS 0x00000001 typedef VOID (USB_BUSIFFN *PUSB_BUSIFFN_GETUSBDI_VERSION) ( - IN PVOID, - OUT PUSBD_VERSION_INFORMATION OPTIONAL, - OUT PULONG OPTIONAL); - + _In_ PVOID, + _Out_opt_ PUSBD_VERSION_INFORMATION, + _Out_opt_ PULONG); + +_Must_inspect_result_ typedef NTSTATUS (USB_BUSIFFN *PUSB_BUSIFFN_QUERY_BUS_TIME) ( - IN PVOID, - OUT PULONG OPTIONAL); + _In_ PVOID, + _Out_opt_ PULONG); typedef NTSTATUS (USB_BUSIFFN *PUSB_BUSIFFN_ENUM_LOG_ENTRY) ( - IN PVOID, - IN ULONG, - IN ULONG, - IN ULONG, - IN ULONG); + _In_ PVOID, + _In_ ULONG, + _In_ ULONG, + _In_ ULONG, + _In_ ULONG); typedef struct _USB_BUS_INFORMATION_LEVEL_0 { ULONG TotalBandwidth; @@ -50,17 +52,19 @@ WCHAR ControllerNameUnicodeString[1]; } USB_BUS_INFORMATION_LEVEL_1, *PUSB_BUS_INFORMATION_LEVEL_1; +_Must_inspect_result_ typedef NTSTATUS (USB_BUSIFFN *PUSB_BUSIFFN_QUERY_BUS_INFORMATION) ( - IN PVOID, - IN ULONG, - IN OUT PVOID, - OUT PULONG, - OUT PULONG OPTIONAL); - + _In_ PVOID, + _In_ ULONG, + _Inout_ PVOID, + _Out_ PULONG, + _Out_opt_ PULONG); + +_Must_inspect_result_ typedef BOOLEAN (USB_BUSIFFN *PUSB_BUSIFFN_IS_DEVICE_HIGH_SPEED) ( - IN PVOID OPTIONAL); + _In_opt_ PVOID); #define USB_BUSIF_USBDI_VERSION_0 0x0000 #define USB_BUSIF_USBDI_VERSION_1 0x0001 @@ -113,21 +117,23 @@ #if (NTDDI_VERSION >= NTDDI_VISTA) +_Must_inspect_result_ typedef NTSTATUS (USB_BUSIFFN *PUSB_BUSIFFN_QUERY_BUS_TIME_EX) ( - IN PVOID OPTIONAL, - OUT PULONG OPTIONAL); - + _In_opt_ PVOID, + _Out_opt_ PULONG); + +_Must_inspect_result_ typedef NTSTATUS (USB_BUSIFFN *PUSB_BUSIFFN_QUERY_CONTROLLER_TYPE) ( - IN PVOID OPTIONAL, - OUT PULONG OPTIONAL, - OUT PUSHORT OPTIONAL, - OUT PUSHORT OPTIONAL, - OUT PUCHAR OPTIONAL, - OUT PUCHAR OPTIONAL, - OUT PUCHAR OPTIONAL, - OUT PUCHAR OPTIONAL); + _In_opt_ PVOID, + _Out_opt_ PULONG, + _Out_opt_ PUSHORT, + _Out_opt_ PUSHORT, + _Out_opt_ PUCHAR, + _Out_opt_ PUCHAR, + _Out_opt_ PUCHAR, + _Out_opt_ PUCHAR); typedef struct _USB_BUS_INTERFACE_USBDI_V3 { USHORT Size; @@ -161,25 +167,26 @@ PVOID Reserved; } USBC_FUNCTION_DESCRIPTOR, *PUSBC_FUNCTION_DESCRIPTOR; -typedef -NTSTATUS +_Must_inspect_result_ +typedef NTSTATUS (USB_BUSIFFN *USBC_START_DEVICE_CALLBACK)( - IN PUSB_DEVICE_DESCRIPTOR DeviceDescriptor, - IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, - OUT PUSBC_FUNCTION_DESCRIPTOR *FunctionDescriptorBuffer, - OUT PULONG FunctionDescriptorBufferLength, - IN PDEVICE_OBJECT FdoDeviceObject, - IN PDEVICE_OBJECT PdoDeviceObject); - -typedef -BOOLEAN + _In_ PUSB_DEVICE_DESCRIPTOR DeviceDescriptor, + _In_ PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + _Outptr_result_bytebuffer_maybenull_(*FunctionDescriptorBufferLength) + PUSBC_FUNCTION_DESCRIPTOR *FunctionDescriptorBuffer, + _Out_ PULONG FunctionDescriptorBufferLength, + _In_ PDEVICE_OBJECT FdoDeviceObject, + _In_ PDEVICE_OBJECT PdoDeviceObject); + +_Must_inspect_result_ +typedef BOOLEAN (USB_BUSIFFN *USBC_PDO_ENABLE_CALLBACK)( - IN PVOID Context, - IN USHORT FirstInterfaceNumber, - IN USHORT NumberOfInterfaces, - IN UCHAR FunctionClass, - IN UCHAR FunctionSubClass, - IN UCHAR FunctionProtocol); + _In_ PVOID Context, + _In_ USHORT FirstInterfaceNumber, + _In_ USHORT NumberOfInterfaces, + _In_ UCHAR FunctionClass, + _In_ UCHAR FunctionSubClass, + _In_ UCHAR FunctionProtocol); #define USBC_DEVICE_CONFIGURATION_INTERFACE_VERSION_1 0x0001 @@ -190,7 +197,7 @@ PINTERFACE_REFERENCE InterfaceReference; PINTERFACE_DEREFERENCE InterfaceDereference; USBC_START_DEVICE_CALLBACK StartDeviceCallback; - USBC_PDO_ENABLE_CALLBACK PdoEnableCallback; + USBC_PDO_ENABLE_CALLBACK PdoEnableCallback; PVOID Reserved[7]; } USBC_DEVICE_CONFIGURATION_INTERFACE_V1, *PUSBC_DEVICE_CONFIGURATION_INTERFACE_V1; Modified: trunk/reactos/include/ddk/usbdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbdlib.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/usbdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/usbdlib.h [iso-8859-1] Mon Jan 23 16:07:08 2012 @@ -114,109 +114,118 @@ #ifndef _USBD_ +_IRQL_requires_max_(DISPATCH_LEVEL) DECLSPEC_IMPORT VOID NTAPI USBD_GetUSBDIVersion( - OUT PUSBD_VERSION_INFORMATION VersionInformation); + _Out_ PUSBD_VERSION_INFORMATION VersionInformation); DECLSPEC_IMPORT PUSB_INTERFACE_DESCRIPTOR NTAPI USBD_ParseConfigurationDescriptor( - IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, - IN UCHAR InterfaceNumber, - IN UCHAR AlternateSetting); + _In_ PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + _In_ UCHAR InterfaceNumber, + _In_ UCHAR AlternateSetting); DECLSPEC_IMPORT PURB NTAPI USBD_CreateConfigurationRequest( - IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, - OUT PUSHORT Siz); - + _In_ PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + _Out_ PUSHORT Siz); + +_IRQL_requires_max_(APC_LEVEL) DECLSPEC_IMPORT PUSB_COMMON_DESCRIPTOR NTAPI USBD_ParseDescriptors( - IN PVOID DescriptorBuffer, - IN ULONG TotalLength, - IN PVOID StartPosition, - IN LONG DescriptorType); - + _In_ PVOID DescriptorBuffer, + _In_ ULONG TotalLength, + _In_ PVOID StartPosition, + _In_ LONG DescriptorType); + +_IRQL_requires_max_(APC_LEVEL) DECLSPEC_IMPORT PUSB_INTERFACE_DESCRIPTOR NTAPI USBD_ParseConfigurationDescriptorEx( - IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, - IN PVOID StartPosition, - IN LONG InterfaceNumber, - IN LONG AlternateSetting, - IN LONG InterfaceClass, - IN LONG InterfaceSubClass, - IN LONG InterfaceProtocol); - + _In_ PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + _In_ PVOID StartPosition, + _In_ LONG InterfaceNumber, + _In_ LONG AlternateSetting, + _In_ LONG InterfaceClass, + _In_ LONG InterfaceSubClass, + _In_ LONG InterfaceProtocol); + +_IRQL_requires_max_(DISPATCH_LEVEL) DECLSPEC_IMPORT PURB NTAPI USBD_CreateConfigurationRequestEx( - IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, - IN PUSBD_INTERFACE_LIST_ENTRY InterfaceList); - + _In_ PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + _In_ PUSBD_INTERFACE_LIST_ENTRY InterfaceList); + +_IRQL_requires_max_(PASSIVE_LEVEL) DECLSPEC_EXPORT ULONG NTAPI USBD_GetInterfaceLength( - IN PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, - IN PUCHAR BufferEnd); - + _In_ PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, + _In_ PUCHAR BufferEnd); + +_IRQL_requires_max_(PASSIVE_LEVEL) DECLSPEC_EXPORT VOID NTAPI USBD_RegisterHcFilter( - IN PDEVICE_OBJECT DeviceObject, - IN PDEVICE_OBJECT FilterDeviceObject); - + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PDEVICE_OBJECT FilterDeviceObject); + +_IRQL_requires_max_(APC_LEVEL) DECLSPEC_EXPORT NTSTATUS NTAPI USBD_GetPdoRegistryParameter( - IN PDEVICE_OBJECT PhysicalDeviceObject, - IN OUT PVOID Parameter, - IN ULONG ParameterLength, - IN PWSTR KeyName, - IN ULONG KeyNameLength); + _In_ PDEVICE_OBJECT PhysicalDeviceObject, + _Inout_updates_bytes_(ParameterLength) PVOID Parameter, + _In_ ULONG ParameterLength, + _In_reads_bytes_(KeyNameLength) PWSTR KeyName, + _In_ ULONG KeyNameLength); DECLSPEC_EXPORT NTSTATUS NTAPI USBD_QueryBusTime( - IN PDEVICE_OBJECT RootHubPdo, - OUT PULONG CurrentFrame); + _In_ PDEVICE_OBJECT RootHubPdo, + _Out_ PULONG CurrentFrame); #if (NTDDI_VERSION >= NTDDI_WINXP) +_IRQL_requires_max_(DISPATCH_LEVEL) DECLSPEC_IMPORT ULONG NTAPI USBD_CalculateUsbBandwidth( - IN ULONG MaxPacketSize, - IN UCHAR EndpointType, - IN BOOLEAN LowSpeed); + _In_ ULONG MaxPacketSize, + _In_ UCHAR EndpointType, + _In_ BOOLEAN LowSpeed); #endif #if (NTDDI_VERSION >= NTDDI_VISTA) +_IRQL_requires_max_(DISPATCH_LEVEL) DECLSPEC_IMPORT USBD_STATUS NTAPI USBD_ValidateConfigurationDescriptor( - IN PUSB_CONFIGURATION_DESCRIPTOR ConfigDesc, - IN ULONG BufferLength, - IN USHORT Level, - OUT PUCHAR *Offset, - IN ULONG Tag OPTIONAL); + _In_reads_bytes_(BufferLength) PUSB_CONFIGURATION_DESCRIPTOR ConfigDesc, + _In_ ULONG BufferLength, + _In_ USHORT Level, + _Out_ PUCHAR *Offset, + _In_opt_ ULONG Tag); #endif Modified: trunk/reactos/include/ddk/usbscan.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbscan.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/usbscan.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/usbscan.h [iso-8859-1] Mon Jan 23 16:07:08 2012 @@ -37,32 +37,32 @@ #define BULKIN_FLAG 0x80 typedef struct _DRV_VERSION { - OUT ULONG major; - OUT ULONG minor; - OUT ULONG internal; + _Out_ ULONG major; + _Out_ ULONG minor; + _Out_ ULONG internal; } DRV_VERSION, *PDRV_VERSION; typedef struct _IO_BLOCK { - IN ULONG uOffset; - IN ULONG uLength; - IN OUT PUCHAR pbyData; - IN ULONG uIndex; + _In_ ULONG uOffset; + _In_ ULONG uLength; + _Inout_updates_bytes_(uLength) PUCHAR pbyData; + _In_ ULONG uIndex; } IO_BLOCK, *PIO_BLOCK; typedef struct _IO_BLOCK_EX { - IN ULONG uOffset; - IN ULONG uLength; - IN OUT PUCHAR pbyData; - IN ULONG uIndex; - IN UCHAR bRequest; - IN UCHAR bmRequestType; - IN UCHAR fTransferDirectionIn; + _In_ ULONG uOffset; + _In_ ULONG uLength; + _Inout_updates_bytes_(uLength) PUCHAR pbyData; + _In_ ULONG uIndex; + _In_ UCHAR bRequest; + _In_ UCHAR bmRequestType; + _In_ UCHAR fTransferDirectionIn; } IO_BLOCK_EX, *PIO_BLOCK_EX; typedef struct _CHANNEL_INFO { - OUT ULONG EventChannelSize; - OUT ULONG uReadDataAlignment; - OUT ULONG uWriteDataAlignment; + _Out_ ULONG EventChannelSize; + _Out_ ULONG uReadDataAlignment; + _Out_ ULONG uWriteDataAlignment; }CHANNEL_INFO, *PCHANNEL_INFO; typedef enum _PIPE_TYPE { @@ -73,16 +73,16 @@ } PIPE_TYPE; typedef struct _USBSCAN_GET_DESCRIPTOR { - IN UCHAR DescriptorType; - IN UCHAR Index; - IN USHORT LanguageId; + _In_ UCHAR DescriptorType; + _In_ UCHAR Index; + _In_ USHORT LanguageId; } USBSCAN_GET_DESCRIPTOR, *PUSBSCAN_GET_DESCRIPTOR; typedef struct _DEVICE_DESCRIPTOR { - OUT USHORT usVendorId; - OUT USHORT usProductId; - OUT USHORT usBcdDevice; - OUT USHORT usLanguageId; + _Out_ USHORT usVendorId; + _Out_ USHORT usProductId; + _Out_ USHORT usBcdDevice; + _Out_ USHORT usLanguageId; } DEVICE_DESCRIPTOR, *PDEVICE_DESCRIPTOR; typedef enum _RAW_PIPE_TYPE { @@ -100,8 +100,8 @@ } USBSCAN_PIPE_INFORMATION, *PUSBSCAN_PIPE_INFORMATION; typedef struct _USBSCAN_PIPE_CONFIGURATION { - OUT ULONG NumberOfPipes; - OUT USBSCAN_PIPE_INFORMATION PipeInfo[MAX_NUM_PIPES]; + _Out_ ULONG NumberOfPipes; + _Out_writes_(NumberOfPipes) USBSCAN_PIPE_INFORMATION PipeInfo[MAX_NUM_PIPES]; } USBSCAN_PIPE_CONFIGURATION, *PUSBSCAN_PIPE_CONFIGURATION; #if (NTDDI_VERSION >= NTDDI_WINXP)

1 0

[cgutman] 55115: [USB-BRINGUP-TRUNK] - Store correct device power state for PowerSystemWorking
by cgutman＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: cgutman Date: Mon Jan 23 16:06:32 2012 New Revision: 55115 URL: http://svn.reactos.org/svn/reactos?rev=55115&view=rev Log: [USB-BRINGUP-TRUNK] - Store correct device power state for PowerSystemWorking Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp 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] Mon Jan 23 16:06:32 2012 @@ -593,7 +593,7 @@ DeviceCapabilities->HardwareDisabled = FALSE; DeviceCapabilities->NoDisplayInUI = FALSE; DeviceCapabilities->DeviceState[0] = PowerDeviceD0; - for (Index = 0; Index < PowerSystemMaximum; Index++) + for (Index = 1; Index < PowerSystemMaximum; Index++) DeviceCapabilities->DeviceState[Index] = PowerDeviceD3; DeviceCapabilities->DeviceWake = PowerDeviceUnspecified; DeviceCapabilities->D1Latency = 0; 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] Mon Jan 23 16:06:32 2012 @@ -506,7 +506,7 @@ DeviceCapabilities->Address = UsbChildExtension->PortNumber; DeviceCapabilities->UINumber = 0; DeviceCapabilities->DeviceState[0] = PowerDeviceD0; - for (i = 0; i < PowerSystemMaximum; i++) + for (i = 1; i < PowerSystemMaximum; i++) DeviceCapabilities->DeviceState[i] = PowerDeviceD3; //DeviceCapabilities->DeviceWake = PowerDeviceUndefined; DeviceCapabilities->D1Latency = 0; 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] Mon Jan 23 16:06:32 2012 @@ -593,7 +593,7 @@ DeviceCapabilities->HardwareDisabled = FALSE; DeviceCapabilities->NoDisplayInUI = FALSE; DeviceCapabilities->DeviceState[0] = PowerDeviceD0; - for (Index = 0; Index < PowerSystemMaximum; Index++) + for (Index = 1; Index < PowerSystemMaximum; Index++) DeviceCapabilities->DeviceState[Index] = PowerDeviceD3; DeviceCapabilities->DeviceWake = PowerDeviceUnspecified; DeviceCapabilities->D1Latency = 0;

1 0

[akhaldi] 55114: [COMCAT_WINETEST] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: akhaldi Date: Mon Jan 23 16:04:06 2012 New Revision: 55114 URL: http://svn.reactos.org/svn/reactos?rev=55114&view=rev Log: [COMCAT_WINETEST] * Sync to Wine 1.3.37. Modified: trunk/rostests/winetests/comcat/comcat.c Modified: trunk/rostests/winetests/comcat/comcat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/comcat.c… ============================================================================== --- trunk/rostests/winetests/comcat/comcat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comcat/comcat.c [iso-8859-1] Mon Jan 23 16:04:06 2012 @@ -104,6 +104,7 @@ ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); + ok (hr == S_FALSE,"Expected S_FALSE, got 0x%08x\n", hr); ok (fetched == 0,"Fetched wrong number of guids %u\n",fetched); IEnumGUID_Release(pIEnum); @@ -113,6 +114,7 @@ ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); + ok (hr == S_OK,"Expected S_OK, got 0x%08x\n", hr); ok (fetched == 1,"Fetched wrong number of guids %u\n",fetched); ok (IsEqualGUID(the_guid,&wanted_guid),"Guids do not match\n");

1 0

[akhaldi] 55113: * Update the sync notes for clusapi, comcat, compstui and cryptdll.
by akhaldi＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: akhaldi Date: Mon Jan 23 16:03:34 2012 New Revision: 55113 URL: http://svn.reactos.org/svn/reactos?rev=55113&view=rev Log: * Update the sync notes for clusapi, comcat, compstui and cryptdll. 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] Mon Jan 23 16:03:34 2012 @@ -46,15 +46,15 @@ reactos/dll/win32/bcrypt # Synced to Wine-1.3.37 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.3.37 -reactos/dll/win32/clusapi # Autosync -reactos/dll/win32/comcat # Autosync +reactos/dll/win32/clusapi # Synced to Wine-1.3.37 +reactos/dll/win32/comcat # Synced to Wine-1.3.37 reactos/dll/win32/comctl32 # Synced to Wine 1.3.14 reactos/dll/win32/comdlg32 # Autosync -reactos/dll/win32/compstui # Autosync +reactos/dll/win32/compstui # Synced to Wine-1.3.37 reactos/dll/win32/credui # Synced to Wine-1.3.37 reactos/dll/win32/crypt32 # Synced to Wine-1.3.37 reactos/dll/win32/cryptdlg # Synced to Wine-1.3.37 -reactos/dll/win32/cryptdll # Autosync +reactos/dll/win32/cryptdll # Synced to Wine-1.3.37 reactos/dll/win32/cryptnet # Autosync reactos/dll/win32/cryptui # Autosync reactos/dll/win32/dbghelp # Autosync

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