Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 75784: [USBPORT][USBHUB_NEW] - Add license headers
by tfaber＠svn.reactos.org 08 Sep '17

08 Sep '17

Author: tfaber Date: Fri Sep 8 07:32:39 2017 New Revision: 75784 URL: http://svn.reactos.org/svn/reactos?rev=75784&view=rev Log: [USBPORT][USBHUB_NEW] - Add license headers Modified: trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h trunk/reactos/drivers/usb/usbhub_new/debug.c trunk/reactos/drivers/usb/usbhub_new/ioctl.c trunk/reactos/drivers/usb/usbhub_new/pnp.c trunk/reactos/drivers/usb/usbhub_new/power.c trunk/reactos/drivers/usb/usbhub_new/usbhub.c trunk/reactos/drivers/usb/usbhub_new/usbhub.h trunk/reactos/drivers/usb/usbport/debug.c trunk/reactos/drivers/usb/usbport/device.c trunk/reactos/drivers/usb/usbport/endpoint.c trunk/reactos/drivers/usb/usbport/iface.c trunk/reactos/drivers/usb/usbport/ioctl.c trunk/reactos/drivers/usb/usbport/iso.c trunk/reactos/drivers/usb/usbport/pnp.c trunk/reactos/drivers/usb/usbport/power.c trunk/reactos/drivers/usb/usbport/queue.c trunk/reactos/drivers/usb/usbport/roothub.c trunk/reactos/drivers/usb/usbport/trfsplit.c trunk/reactos/drivers/usb/usbport/urb.c trunk/reactos/drivers/usb/usbport/usb2.c trunk/reactos/drivers/usb/usbport/usbdebug.h trunk/reactos/drivers/usb/usbport/usbport.c trunk/reactos/drivers/usb/usbport/usbport.h Modified: trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/dbg… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub debugging declarations + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #ifndef DBG_UHUB_H__ #define DBG_UHUB_H__ Modified: trunk/reactos/drivers/usb/usbhub_new/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/deb… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/debug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/debug.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub debugging functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbhub.h" //#define NDEBUG Modified: trunk/reactos/drivers/usb/usbhub_new/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/ioc… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/ioctl.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub I/O control functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbhub.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbhub_new/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/pnp… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/pnp.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub plug and play functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbhub.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbhub_new/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/pow… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/power.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub power handling functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbhub.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/usb… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub main driver functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbhub.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbhub_new/usbhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/usb… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub declarations + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #ifndef _USBHUB_H_ #define _USBHUB_H_ Modified: trunk/reactos/drivers/usb/usbport/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/debug.… ============================================================================== --- trunk/reactos/drivers/usb/usbport/debug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/debug.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort debugging functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/device… ============================================================================== --- trunk/reactos/drivers/usb/usbport/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/device.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort device functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/endpoint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/endpoi… ============================================================================== --- trunk/reactos/drivers/usb/usbport/endpoint.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/endpoint.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort endpoint functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/iface.… ============================================================================== --- trunk/reactos/drivers/usb/usbport/iface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/iface.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort interface functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/ioctl.… ============================================================================== --- trunk/reactos/drivers/usb/usbport/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/ioctl.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort I/O control functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" //#define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/iso.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbport/iso.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/iso.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort isochronous transfer functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/pnp.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbport/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/pnp.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort plug and play functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/power.… ============================================================================== --- trunk/reactos/drivers/usb/usbport/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/power.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort power handling functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/queue.… ============================================================================== --- trunk/reactos/drivers/usb/usbport/queue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/queue.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort queue implementation + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/roothub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/roothu… ============================================================================== --- trunk/reactos/drivers/usb/usbport/roothub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/roothub.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort root hub implementation + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/trfsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/trfspl… ============================================================================== --- trunk/reactos/drivers/usb/usbport/trfsplit.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/trfsplit.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort split transfer functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/urb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/urb.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbport/urb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/urb.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort URB functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/usb2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usb2.c… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usb2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usb2.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort USB 2.0 functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" //#define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/usbdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbdeb… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbdebug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usbdebug.h [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort debugging declarations + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #ifndef USBDEBUG_H__ #define USBDEBUG_H__ Modified: trunk/reactos/drivers/usb/usbport/usbport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usbport.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort main driver functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/usbport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usbport.h [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort declarations + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #ifndef USBPORT_H__ #define USBPORT_H__

1 0

[tfaber] 75783: [USBPORT] - Begin implementing split transfers. Patch by Vadim Galyant.
by tfaber＠svn.reactos.org 08 Sep '17

08 Sep '17

Author: tfaber Date: Fri Sep 8 07:17:34 2017 New Revision: 75783 URL: http://svn.reactos.org/svn/reactos?rev=75783&view=rev Log: [USBPORT] - Begin implementing split transfers. Patch by Vadim Galyant. Added: trunk/reactos/drivers/usb/usbport/trfsplit.c (with props) Modified: trunk/reactos/drivers/usb/usbport/CMakeLists.txt trunk/reactos/drivers/usb/usbport/endpoint.c trunk/reactos/drivers/usb/usbport/queue.c trunk/reactos/drivers/usb/usbport/usbport.c trunk/reactos/drivers/usb/usbport/usbport.h trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h Modified: trunk/reactos/drivers/usb/usbport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbport/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/CMakeLists.txt [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -12,6 +12,7 @@ power.c queue.c roothub.c + trfsplit.c urb.c usb2.c usbport.c Modified: trunk/reactos/drivers/usb/usbport/endpoint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/endpoi… ============================================================================== --- trunk/reactos/drivers/usb/usbport/endpoint.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/endpoint.c [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -1279,8 +1279,7 @@ if (Transfer->Flags & TRANSFER_FLAG_SPLITED) { - DPRINT1("USBPORT_DmaEndpointActive: FIXME call USBPORT_CancelSplitTransfer\n"); - ASSERT(FALSE); //USBPORT_CancelSplitTransfer(); + USBPORT_CancelSplitTransfer(Transfer); } else { Modified: trunk/reactos/drivers/usb/usbport/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/queue.… ============================================================================== --- trunk/reactos/drivers/usb/usbport/queue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/queue.c [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -529,6 +529,8 @@ PUSBPORT_TRANSFER Transfer; PUSBPORT_ENDPOINT Endpoint; PIRP irp; + PUSBPORT_TRANSFER SplitTransfer; + PLIST_ENTRY Entry; KIRQL OldIrql; DPRINT_CORE("USBPORT_CancelActiveTransferIrp: Irp - %p\n", Irp); @@ -543,30 +545,52 @@ irp = USBPORT_FindActiveTransferIrp(FdoDevice, Irp); - if (irp) - { - Urb = URB_FROM_IRP(irp); - Transfer = Urb->UrbControlTransfer.hca.Reserved8[0]; - Endpoint = Transfer->Endpoint; - - DPRINT_CORE("USBPORT_CancelActiveTransferIrp: irp - %p, Urb - %p, Transfer - %p\n", - irp, - Urb, - Transfer); - - KeAcquireSpinLockAtDpcLevel(&Endpoint->EndpointSpinLock); - Transfer->Flags |= TRANSFER_FLAG_CANCELED; - KeReleaseSpinLockFromDpcLevel(&Endpoint->EndpointSpinLock); - + if (!irp) + { KeReleaseSpinLock(&FdoExtension->FlushTransferSpinLock, OldIrql); - - USBPORT_InvalidateEndpointHandler(FdoDevice, - Endpoint, - INVALIDATE_ENDPOINT_WORKER_THREAD); return; } + Urb = URB_FROM_IRP(irp); + Transfer = Urb->UrbControlTransfer.hca.Reserved8[0]; + Endpoint = Transfer->Endpoint; + + DPRINT_CORE("USBPORT_CancelActiveTransferIrp: irp - %p, Urb - %p, Transfer - %p\n", + irp, + Urb, + Transfer); + + KeAcquireSpinLockAtDpcLevel(&Endpoint->EndpointSpinLock); + + Transfer->Flags |= TRANSFER_FLAG_CANCELED; + + if (Transfer->Flags & TRANSFER_FLAG_PARENT) + { + KeAcquireSpinLockAtDpcLevel(&Transfer->TransferSpinLock); + + Entry = Transfer->SplitTransfersList.Flink; + + while (Entry && Entry != &Transfer->SplitTransfersList) + { + SplitTransfer = CONTAINING_RECORD(Entry, + USBPORT_TRANSFER, + SplitLink); + + SplitTransfer->Flags |= TRANSFER_FLAG_CANCELED; + + Entry = Entry->Flink; + } + + KeReleaseSpinLockFromDpcLevel(&Transfer->TransferSpinLock); + } + + KeReleaseSpinLockFromDpcLevel(&Endpoint->EndpointSpinLock); KeReleaseSpinLock(&FdoExtension->FlushTransferSpinLock, OldIrql); + + USBPORT_InvalidateEndpointHandler(FdoDevice, + Endpoint, + INVALIDATE_ENDPOINT_WORKER_THREAD); + return; } VOID Added: trunk/reactos/drivers/usb/usbport/trfsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/trfspl… ============================================================================== --- trunk/reactos/drivers/usb/usbport/trfsplit.c (added) +++ trunk/reactos/drivers/usb/usbport/trfsplit.c [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -0,0 +1,329 @@ +#include "usbport.h" + +#define NDEBUG +#include <debug.h> + +ULONG +NTAPI +USBPORT_MakeSplitTransfer(IN PDEVICE_OBJECT FdoDevice, + IN PUSBPORT_TRANSFER Transfer, + IN PUSBPORT_TRANSFER SplitTransfer, + IN ULONG MaxTransferSize, + IN PULONG SgIdx, + IN PULONG SgOffset, + IN ULONG TransferRemainLen, + IN ULONG TransferOffset) +{ + PUSBPORT_SCATTER_GATHER_LIST SplitSgList; + PUSBPORT_SCATTER_GATHER_ELEMENT Element0; + PUSBPORT_SCATTER_GATHER_ELEMENT Element1; + SIZE_T SgLength; + SIZE_T SgRemainLen; + + DPRINT("USBPORT_MakeSplitTransfer: ... \n"); + + SplitSgList = &SplitTransfer->SgList; + Element0 = &SplitSgList->SgElement[0]; + + SgLength = Transfer->SgList.SgElement[*SgIdx].SgTransferLength - *SgOffset; + + if (SgLength > MaxTransferSize) + { + /* SgLength > MaxTransferSize */ + SplitTransfer->SgList.SgElementCount = 1; + + Element0->SgOffset = 0; + Element0->SgTransferLength = MaxTransferSize; + Element0->SgPhysicalAddress.LowPart = Transfer->SgList.SgElement[*SgIdx].SgPhysicalAddress.LowPart + *SgOffset; + + SplitTransfer->TransferParameters.IsTransferSplited = TRUE; + SplitTransfer->TransferParameters.TransferBufferLength = MaxTransferSize; + + SplitTransfer->SgList.CurrentVa = Transfer->SgList.CurrentVa + TransferOffset; + SplitTransfer->SgList.MappedSystemVa = (PVOID)((ULONG_PTR)Transfer->SgList.MappedSystemVa + TransferOffset); + + SplitTransfer->Flags |= TRANSFER_FLAG_SPLITED; + + *SgOffset += MaxTransferSize; + TransferRemainLen -= MaxTransferSize; + return TransferRemainLen; + } + + /* SgLength <= MaxTransferSize */ + SplitTransfer->SgList.SgElementCount = 1; + TransferRemainLen -= SgLength; + + Element0->SgOffset = 0; + Element0->SgTransferLength = SgLength; + Element0->SgPhysicalAddress.LowPart = Transfer->SgList.SgElement[*SgIdx].SgPhysicalAddress.LowPart + *SgOffset; + + SplitTransfer->TransferParameters.TransferBufferLength = SgLength; + SplitTransfer->TransferParameters.IsTransferSplited = TRUE; + + SplitTransfer->SgList.CurrentVa = Transfer->SgList.CurrentVa + TransferOffset; + SplitTransfer->SgList.MappedSystemVa = (PVOID)((ULONG_PTR)Transfer->SgList.MappedSystemVa + TransferOffset); + + SplitTransfer->Flags |= TRANSFER_FLAG_SPLITED; + + *SgOffset += SgLength; + + SgRemainLen = MaxTransferSize - SgLength; + + if (SgRemainLen > TransferRemainLen) + { + SgRemainLen = TransferRemainLen; + } + + if (!SgRemainLen) + { + /* SgLength == MaxTransferSize */ + ++*SgIdx; + *SgOffset = 0; + return TransferRemainLen; + } + + /* SgLength < MaxTransferSize */ + + DPRINT1("MakeSplitTransfer: SgRemainLen - %x\n", SgRemainLen); + DPRINT1("MakeSplitTransfer: SgIdx - %x\n", *SgIdx); + ++*SgIdx; + + *SgOffset = 0; + SplitTransfer->SgList.SgElementCount++; + + Element1 = &SplitSgList->SgElement[1]; + + Element1->SgOffset = SgRemainLen; + Element1->SgTransferLength = Element0->SgTransferLength; + Element1->SgPhysicalAddress.LowPart = Transfer->SgList.SgElement[*SgIdx].SgPhysicalAddress.LowPart + *SgOffset; + + SplitTransfer->TransferParameters.TransferBufferLength += SgRemainLen; + + *SgOffset += SgRemainLen; + TransferRemainLen -= SgRemainLen; + + return TransferRemainLen; +} + +VOID +NTAPI +USBPORT_SplitBulkInterruptTransfer(IN PDEVICE_OBJECT FdoDevice, + IN PUSBPORT_ENDPOINT Endpoint, + IN PUSBPORT_TRANSFER Transfer, + IN PLIST_ENTRY List) +{ + PUSBPORT_TRANSFER SplitTransfer; + LIST_ENTRY tmplist; + ULONG NeedSplits; + SIZE_T TransferBufferLength; + SIZE_T MaxTransferSize; + SIZE_T TransferOffset = 0; + SIZE_T RemainLength; + ULONG ix; + ULONG SgIdx = 0; + ULONG SgOffset = 0; + + DPRINT("USBPORT_SplitBulkInterruptTransfer: ... \n"); + + MaxTransferSize = Endpoint->EndpointProperties.TotalMaxPacketSize * + (Endpoint->EndpointProperties.MaxTransferSize / + Endpoint->EndpointProperties.TotalMaxPacketSize); + + if (Endpoint->EndpointProperties.MaxTransferSize > PAGE_SIZE) + { + KeBugCheckEx(BUGCODE_USB_DRIVER, 1, 0, 0, 0); + } + + TransferBufferLength = Transfer->TransferParameters.TransferBufferLength; + Transfer->Flags |= TRANSFER_FLAG_PARENT; + + NeedSplits = TransferBufferLength / MaxTransferSize + 1; + + InitializeListHead(&tmplist); + + DPRINT1("USBPORT_SplitBulkInterruptTransfer: TransferBufferLength - %x, NeedSplits - %x\n", + TransferBufferLength, NeedSplits); + + if (!NeedSplits) + { + DPRINT1("USBPORT_SplitBulkInterruptTransfer: DbgBreakPoint \n"); + DbgBreakPoint(); + goto Exit; + } + + for (ix = 0; ix < NeedSplits; ++ix) + { + SplitTransfer = ExAllocatePoolWithTag(NonPagedPool, + Transfer->FullTransferLength, + USB_PORT_TAG); + + if (!SplitTransfer) + { + DPRINT1("USBPORT_SplitBulkInterruptTransfer: DbgBreakPoint \n"); + DbgBreakPoint(); + goto Exit; + } + + RtlCopyMemory(SplitTransfer, Transfer, Transfer->FullTransferLength); + + SplitTransfer->MiniportTransfer = (PVOID)((ULONG_PTR)SplitTransfer + + SplitTransfer->PortTransferLength); + + InsertTailList(&tmplist, &SplitTransfer->TransferLink); + } + + if (Transfer->TransferParameters.TransferBufferLength == 0) + { + goto Exit; + } + + RemainLength = Transfer->TransferParameters.TransferBufferLength; + + do + { + SplitTransfer = CONTAINING_RECORD(tmplist.Flink, + USBPORT_TRANSFER, + TransferLink); + + RemoveHeadList(&tmplist); + + RemainLength = USBPORT_MakeSplitTransfer(FdoDevice, + Transfer, + SplitTransfer, + MaxTransferSize, + &SgIdx, + &SgOffset, + RemainLength, + TransferOffset); + + TransferOffset += SplitTransfer->TransferParameters.TransferBufferLength; + + InsertTailList(List, &SplitTransfer->TransferLink); + InsertTailList(&Transfer->SplitTransfersList,&SplitTransfer->SplitLink); + } + while (RemainLength != 0); + +Exit: + + while (!IsListEmpty(&tmplist)) + { + DPRINT1("USBPORT_SplitBulkInterruptTransfer: ... \n"); + + SplitTransfer = CONTAINING_RECORD(tmplist.Flink, + USBPORT_TRANSFER, + TransferLink); + RemoveHeadList(&tmplist); + + ExFreePoolWithTag(SplitTransfer, USB_PORT_TAG); + } + + return; +} + +VOID +NTAPI +USBPORT_SplitTransfer(IN PDEVICE_OBJECT FdoDevice, + IN PUSBPORT_ENDPOINT Endpoint, + IN PUSBPORT_TRANSFER Transfer, + IN PLIST_ENTRY List) +{ + ULONG TransferType; + + DPRINT("USBPORT_SplitTransfer ... \n"); + + InitializeListHead(List); + InitializeListHead(&Transfer->SplitTransfersList); + + Transfer->USBDStatus = USBD_STATUS_SUCCESS; + + if (Transfer->TransferParameters.TransferBufferLength > + Endpoint->EndpointProperties.MaxTransferSize) + { + TransferType = Endpoint->EndpointProperties.TransferType; + + if (TransferType == USBPORT_TRANSFER_TYPE_BULK || + TransferType == USBPORT_TRANSFER_TYPE_INTERRUPT) + { + USBPORT_SplitBulkInterruptTransfer(FdoDevice, + Endpoint, + Transfer, + List); + } + else if (TransferType == USBPORT_TRANSFER_TYPE_ISOCHRONOUS || + TransferType == USBPORT_TRANSFER_TYPE_CONTROL) + { + KeBugCheckEx(BUGCODE_USB_DRIVER, 1, 0, 0, 0); + } + else + { + DPRINT1("USBPORT_SplitTransfer: Unknown TransferType - %x\n", + TransferType); + } + } + else + { + InsertTailList(List, &Transfer->TransferLink); + } +} + +VOID +NTAPI +USBPORT_DoneSplitTransfer(IN PUSBPORT_TRANSFER SplitTransfer) +{ + PUSBPORT_TRANSFER ParentTransfer; + KIRQL OldIrql; + + DPRINT("USBPORT_DoneSplitTransfer: ... \n"); + + ParentTransfer = SplitTransfer->ParentTransfer; + ParentTransfer->CompletedTransferLen += SplitTransfer->CompletedTransferLen; + + if (SplitTransfer->USBDStatus != USBD_STATUS_SUCCESS) + { + DPRINT1("USBPORT_DoneSplitTransfer: SplitTransfer->USBDStatus - %X\n", + SplitTransfer->USBDStatus); + + ParentTransfer->USBDStatus = SplitTransfer->USBDStatus; + } + + KeAcquireSpinLock(&ParentTransfer->TransferSpinLock, &OldIrql); + + RemoveEntryList(&SplitTransfer->SplitLink); + ExFreePoolWithTag(SplitTransfer, USB_PORT_TAG); + + if (IsListEmpty(&ParentTransfer->SplitTransfersList)) + { + KeReleaseSpinLock(&ParentTransfer->TransferSpinLock, OldIrql); + USBPORT_DoneTransfer(ParentTransfer); + } + else + { + KeReleaseSpinLock(&ParentTransfer->TransferSpinLock, OldIrql); + } +} + +VOID +NTAPI +USBPORT_CancelSplitTransfer(IN PUSBPORT_TRANSFER SplitTransfer) +{ + PUSBPORT_TRANSFER ParentTransfer; + PUSBPORT_ENDPOINT Endpoint; + KIRQL OldIrql; + + DPRINT("USBPORT_CancelSplitTransfer \n"); + + Endpoint = SplitTransfer->Endpoint; + ParentTransfer = SplitTransfer->ParentTransfer; + ParentTransfer->CompletedTransferLen += SplitTransfer->CompletedTransferLen; + + KeAcquireSpinLock(&ParentTransfer->TransferSpinLock, &OldIrql); + RemoveEntryList(&SplitTransfer->SplitLink); + KeReleaseSpinLock(&ParentTransfer->TransferSpinLock, OldIrql); + + ExFreePool(SplitTransfer); + + if (IsListEmpty(&ParentTransfer->SplitTransfersList)) + { + InsertTailList(&Endpoint->CancelList, &ParentTransfer->TransferLink); + } +} Propchange: trunk/reactos/drivers/usb/usbport/trfsplit.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/usbport/usbport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usbport.c [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -789,7 +789,7 @@ if ((Transfer->Flags & TRANSFER_FLAG_SPLITED)) { - ASSERT(FALSE);// USBPORT_DoneSplitTransfer(Transfer); + USBPORT_DoneSplitTransfer(Transfer); } else { @@ -1946,8 +1946,11 @@ IN ULONG TransferLength) { PUSBPORT_TRANSFER Transfer; - PDEVICE_OBJECT FdoDevice; - PUSBPORT_DEVICE_EXTENSION FdoExtension; + PUSBPORT_TRANSFER ParentTransfer; + PUSBPORT_TRANSFER SplitTransfer; + PLIST_ENTRY SplitHead; + PLIST_ENTRY Entry; + KIRQL OldIrql; DPRINT_CORE("USBPORT_MiniportCompleteTransfer: USBDStatus - %x, TransferLength - %x\n", USBDStatus, @@ -1957,20 +1960,47 @@ USBPORT_TRANSFER, TransferParameters); - FdoDevice = Transfer->Endpoint->FdoDevice; - FdoExtension = FdoDevice->DeviceExtension; - + Transfer->Flags |= TRANSFER_FLAG_COMPLETED; Transfer->CompletedTransferLen = TransferLength; - RemoveEntryList(&Transfer->TransferLink); - - Transfer->USBDStatus = USBDStatus; - - ExInterlockedInsertTailList(&FdoExtension->DoneTransferList, - &Transfer->TransferLink, - &FdoExtension->DoneTransferSpinLock); - - KeInsertQueueDpc(&FdoExtension->TransferFlushDpc, NULL, NULL); + if (((Transfer->Flags & TRANSFER_FLAG_SPLITED) == 0) || + TransferLength >= Transfer->TransferParameters.TransferBufferLength) + { + goto Exit; + } + + ParentTransfer = Transfer->ParentTransfer; + + KeAcquireSpinLock(&ParentTransfer->TransferSpinLock, &OldIrql); + + if (IsListEmpty(&ParentTransfer->SplitTransfersList)) + { + goto Exit; + } + + SplitHead = &ParentTransfer->SplitTransfersList; + Entry = SplitHead->Flink; + + while (Entry && !IsListEmpty(SplitHead)) + { + SplitTransfer = CONTAINING_RECORD(Entry, + USBPORT_TRANSFER, + SplitLink); + + if (!(SplitTransfer->Flags & TRANSFER_FLAG_SUBMITED)) + { + DPRINT1("USBPORT_MiniportCompleteTransfer: SplitTransfer->Flags - %X\n", + SplitTransfer->Flags); + //Add TRANSFER_FLAG_xxx + } + + Entry = Entry->Flink; + } + + KeReleaseSpinLock(&ParentTransfer->TransferSpinLock, OldIrql); + +Exit: + USBPORT_QueueDoneTransfer(Transfer, USBDStatus); } VOID @@ -2250,6 +2280,9 @@ SIZE_T ElementLength; PUSBPORT_DEVICE_HANDLE DeviceHandle; PDMA_OPERATIONS DmaOperations; + USBD_STATUS USBDStatus; + LIST_ENTRY List; + PUSBPORT_TRANSFER transfer; DPRINT_CORE("USBPORT_MapTransfer: ... \n"); @@ -2266,12 +2299,12 @@ Mdl = Urb->UrbControlTransfer.TransferBufferMDL; CurrentVa = (ULONG_PTR)MmGetMdlVirtualAddress(Mdl); - Transfer->SgList.CurrentVa = CurrentVa; - Transfer->SgList.MappedSystemVa = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority); - sgList = &Transfer->SgList; + sgList->Flags = 0; - + sgList->CurrentVa = CurrentVa; + sgList->MappedSystemVa = MmGetSystemAddressForMdlSafe(Mdl, + NormalPagePriority); Transfer->MapRegisterBase = MapRegisterBase; ix = 0; @@ -2337,15 +2370,52 @@ } while (CurrentLength != Transfer->TransferParameters.TransferBufferLength); - Transfer->SgList.SgElementCount = ix; + sgList->SgElementCount = ix; + + if (Endpoint->EndpointProperties.DeviceSpeed == UsbHighSpeed) + { + Transfer->Flags |= TRANSFER_FLAG_HIGH_SPEED; + } + Transfer->Flags |= TRANSFER_FLAG_DMA_MAPPED; - ASSERT(Transfer->TransferParameters.TransferBufferLength <= - Endpoint->EndpointProperties.MaxTransferSize); - - KeAcquireSpinLock(&Endpoint->EndpointSpinLock, &Endpoint->EndpointOldIrql); - InsertTailList(&Endpoint->TransferList, &Transfer->TransferLink); - KeReleaseSpinLock(&Endpoint->EndpointSpinLock, Endpoint->EndpointOldIrql); + if ((Transfer->Flags & TRANSFER_FLAG_ISO) == 0) + { + KeAcquireSpinLock(&Endpoint->EndpointSpinLock, + &Endpoint->EndpointOldIrql); + + USBPORT_SplitTransfer(FdoDevice, Endpoint, Transfer, &List); + + while (!IsListEmpty(&List)) + { + transfer = CONTAINING_RECORD(List.Flink, + USBPORT_TRANSFER, + TransferLink); + + RemoveHeadList(&List); + InsertTailList(&Endpoint->TransferList, &transfer->TransferLink); + } + + KeReleaseSpinLock(&Endpoint->EndpointSpinLock, + Endpoint->EndpointOldIrql); + } + else + { + USBDStatus = USBPORT_InitializeIsoTransfer(FdoDevice, + &Urb->UrbIsochronousTransfer, + Transfer); + + if (USBDStatus != USBD_STATUS_SUCCESS) + { + KeAcquireSpinLock(&Endpoint->EndpointSpinLock, + &Endpoint->EndpointOldIrql); + + USBPORT_QueueDoneTransfer(Transfer, USBDStatus); + + KeReleaseSpinLock(&Endpoint->EndpointSpinLock, + Endpoint->EndpointOldIrql); + } + } DeviceHandle = Urb->UrbHeader.UsbdDeviceHandle; InterlockedDecrement(&DeviceHandle->DeviceHandleLock); @@ -2438,6 +2508,7 @@ PUSBPORT_TRANSFER Transfer; PUSBPORT_PIPE_HANDLE PipeHandle; USBD_STATUS USBDStatus; + SIZE_T IsoBlockLen = 0; DPRINT_CORE("USBPORT_AllocateTransfer: FdoDevice - %p, Urb - %p, DeviceHandle - %p, Irp - %p, Event - %p\n", FdoDevice, @@ -2458,15 +2529,24 @@ PagesNeed = ADDRESS_AND_SIZE_TO_SPAN_PAGES(VirtualAddr, TransferLength); + if (PagesNeed > 0) + { + PagesNeed--; + } } if (Urb->UrbHeader.Function == URB_FUNCTION_ISOCH_TRANSFER) { - DPRINT1("USBPORT_AllocateTransfer: ISOCH_TRANSFER UNIMPLEMENTED. FIXME.\n"); + DPRINT1("USBPORT_AllocateTransfer: ISOCH_TRANSFER UNIMPLEMENTED. FIXME\n"); + + //IsoBlockLen = sizeof(USBPORT_ISO_BLOCK) + + // Urb->UrbIsochronousTransfer.NumberOfPackets * + // sizeof(USBPORT_ISO_BLOCK_PACKET); } PortTransferLength = sizeof(USBPORT_TRANSFER) + - PagesNeed * sizeof(USBPORT_SCATTER_GATHER_ELEMENT); + PagesNeed * sizeof(USBPORT_SCATTER_GATHER_ELEMENT) + + IsoBlockLen; FullTransferLength = PortTransferLength + FdoExtension->MiniPortInterface->Packet.MiniPortTransferSize; @@ -2475,29 +2555,42 @@ FullTransferLength, USB_PORT_TAG); - if (Transfer) - { - RtlZeroMemory(Transfer, FullTransferLength); - - Transfer->Irp = Irp; - Transfer->Urb = Urb; - Transfer->Endpoint = PipeHandle->Endpoint; - Transfer->Event = Event; - Transfer->PortTransferLength = PortTransferLength; - Transfer->FullTransferLength = FullTransferLength; - - Transfer->MiniportTransfer = (PVOID)((ULONG_PTR)Transfer + - PortTransferLength); - - Urb->UrbControlTransfer.hca.Reserved8[0] = Transfer; - Urb->UrbHeader.UsbdFlags |= USBD_FLAG_ALLOCATED_TRANSFER; - - USBDStatus = USBD_STATUS_SUCCESS; - } - else - { - USBDStatus = USBD_STATUS_INSUFFICIENT_RESOURCES; - } + if (!Transfer) + { + DPRINT1("USBPORT_AllocateTransfer: Transfer not allocated!\n"); + return USBD_STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(Transfer, FullTransferLength); + + Transfer->Irp = Irp; + Transfer->Urb = Urb; + Transfer->Endpoint = PipeHandle->Endpoint; + Transfer->Event = Event; + Transfer->PortTransferLength = PortTransferLength; + Transfer->FullTransferLength = FullTransferLength; + Transfer->IsoBlockPtr = NULL; + Transfer->Period = 0; + Transfer->ParentTransfer = Transfer; + + if (IsoBlockLen) + { + Transfer->IsoBlockPtr = (PVOID)((ULONG_PTR)Transfer + + PortTransferLength - IsoBlockLen); + + Transfer->Period = PipeHandle->Endpoint->EndpointProperties.Period; + Transfer->Flags |= TRANSFER_FLAG_ISO; + } + + Transfer->MiniportTransfer = (PVOID)((ULONG_PTR)Transfer + + PortTransferLength); + + KeInitializeSpinLock(&Transfer->TransferSpinLock); + + Urb->UrbControlTransfer.hca.Reserved8[0] = Transfer; + Urb->UrbHeader.UsbdFlags |= USBD_FLAG_ALLOCATED_TRANSFER; + + USBDStatus = USBD_STATUS_SUCCESS; DPRINT_CORE("USBPORT_AllocateTransfer: return USBDStatus - %x\n", USBDStatus); Modified: trunk/reactos/drivers/usb/usbport/usbport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usbport.h [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -121,11 +121,14 @@ /* Transfer Flags (USBPORT_TRANSFER) */ #define TRANSFER_FLAG_CANCELED 0x00000001 #define TRANSFER_FLAG_DMA_MAPPED 0x00000002 +#define TRANSFER_FLAG_HIGH_SPEED 0x00000004 #define TRANSFER_FLAG_SUBMITED 0x00000008 #define TRANSFER_FLAG_ABORTED 0x00000010 #define TRANSFER_FLAG_ISO 0x00000020 #define TRANSFER_FLAG_DEVICE_GONE 0x00000080 #define TRANSFER_FLAG_SPLITED 0x00000100 +#define TRANSFER_FLAG_COMPLETED 0x00000200 +#define TRANSFER_FLAG_PARENT 0x00000400 extern KSPIN_LOCK USBPORT_SpinLock; extern LIST_ENTRY USBPORT_MiniPortDrivers; @@ -218,6 +221,8 @@ LIST_ENTRY FlushAbortLink; } USBPORT_ENDPOINT, *PUSBPORT_ENDPOINT; +typedef struct _USBPORT_ISO_BLOCK *PUSBPORT_ISO_BLOCK; + typedef struct _USBPORT_TRANSFER { ULONG Flags; PIRP Irp; @@ -237,8 +242,15 @@ PVOID MapRegisterBase; ULONG TimeOut; LARGE_INTEGER Time; + struct _USBPORT_TRANSFER * ParentTransfer; + KSPIN_LOCK TransferSpinLock; + LIST_ENTRY SplitTransfersList; // for parent transfers + LIST_ENTRY SplitLink; // for splitted transfers + ULONG Period; + PUSBPORT_ISO_BLOCK IsoBlockPtr; // pointer on IsoBlock // SgList should be LAST field - USBPORT_SCATTER_GATHER_LIST SgList; // Non IsoTransfer + USBPORT_SCATTER_GATHER_LIST SgList; // variable length + //USBPORT_ISO_BLOCK IsoBlock; // variable length } USBPORT_TRANSFER, *PUSBPORT_TRANSFER; typedef struct _USBPORT_IRP_TABLE { @@ -573,6 +585,11 @@ IN PDEVICE_OBJECT FdoDevice, IN ULONG Type); +VOID +NTAPI +USBPORT_DoneTransfer( + IN PUSBPORT_TRANSFER Transfer); + /* debug.c */ ULONG NTAPI @@ -1120,6 +1137,25 @@ USBPORT_RootHubPowerAndChirpAllCcPorts( IN PDEVICE_OBJECT FdoDevice); +/* trfsplit.c */ +VOID +NTAPI +USBPORT_SplitTransfer( + IN PDEVICE_OBJECT FdoDevice, + IN PUSBPORT_ENDPOINT Endpoint, + IN PUSBPORT_TRANSFER Transfer, + IN PLIST_ENTRY List); + +VOID +NTAPI +USBPORT_DoneSplitTransfer( + IN PUSBPORT_TRANSFER SplitTransfer); + +VOID +NTAPI +USBPORT_CancelSplitTransfer( + IN PUSBPORT_TRANSFER SplitTransfer); + /* urb.c */ NTSTATUS NTAPI Modified: trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/driver… ============================================================================== --- trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -626,16 +626,16 @@ ULONG_PTR CurrentVa; PVOID MappedSystemVa; ULONG SgElementCount; - USBPORT_SCATTER_GATHER_ELEMENT SgElement[1]; + USBPORT_SCATTER_GATHER_ELEMENT SgElement[2]; } USBPORT_SCATTER_GATHER_LIST, *PUSBPORT_SCATTER_GATHER_LIST; -C_ASSERT(sizeof(USBPORT_SCATTER_GATHER_LIST) == 24 + 4 * sizeof(PVOID)); +C_ASSERT(sizeof(USBPORT_SCATTER_GATHER_LIST) == 48 + 4 * sizeof(PVOID)); typedef struct _USBPORT_TRANSFER_PARAMETERS { ULONG TransferFlags; ULONG TransferBufferLength; ULONG TransferCounter; - ULONG Reserved1; + BOOL IsTransferSplited; ULONG Reserved2; USB_DEFAULT_PIPE_SETUP_PACKET SetupPacket; } USBPORT_TRANSFER_PARAMETERS, *PUSBPORT_TRANSFER_PARAMETERS;

1 0

[pschweitzer] 75782: [NTOSKRNL] In IoReportDetectedDevice(), don't attempt to guess service name, use the one provided in DriverObject. This fixes BtrFS file system driver initialization. Patch by ...
by pschweitzer＠svn.reactos.org 07 Sep '17

07 Sep '17

Author: pschweitzer Date: Thu Sep 7 21:23:19 2017 New Revision: 75782 URL: http://svn.reactos.org/svn/reactos?rev=75782&view=rev Log: [NTOSKRNL] In IoReportDetectedDevice(), don't attempt to guess service name, use the one provided in DriverObject. This fixes BtrFS file system driver initialization. Patch by Thomas Faber. CORE-13763 Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Thu Sep 7 21:23:19 2017 @@ -181,12 +181,7 @@ DPRINT("IoReportDetectedDevice (DeviceObject %p, *DeviceObject %p)\n", DeviceObject, DeviceObject ? *DeviceObject : NULL); - /* Create the service name (eg. ACPI_HAL) */ - ServiceName.Buffer = DriverObject->DriverName.Buffer + - sizeof(DRIVER_ROOT_NAME) / sizeof(WCHAR) - 1; - ServiceName.Length = DriverObject->DriverName.Length - - sizeof(DRIVER_ROOT_NAME) + sizeof(WCHAR); - ServiceName.MaximumLength = ServiceName.Length; + ServiceName = DriverObject->DriverExtension->ServiceKeyName; /* If the interface type is unknown, treat it as internal */ if (LegacyBusType == InterfaceTypeUndefined)

1 0

[mjansen] 75781: [SDK] Allow version lie shims to be applied to msi.dll
by mjansen＠svn.reactos.org 07 Sep '17

07 Sep '17

Author: mjansen Date: Thu Sep 7 16:46:33 2017 New Revision: 75781 URL: http://svn.reactos.org/svn/reactos?rev=75781&view=rev Log: [SDK] Allow version lie shims to be applied to msi.dll Modified: trunk/reactos/media/sdb/sysmain.xml Modified: trunk/reactos/media/sdb/sysmain.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/sdb/sysmain.xml?rev=… ============================================================================== --- trunk/reactos/media/sdb/sysmain.xml [iso-8859-1] (original) +++ trunk/reactos/media/sdb/sysmain.xml [iso-8859-1] Thu Sep 7 16:46:33 2017 @@ -13,6 +13,7 @@ <SHIM NAME="Win95VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -21,6 +22,7 @@ </SHIM> <SHIM NAME="Win98VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -29,6 +31,7 @@ </SHIM> <SHIM NAME="WinNT4SP5VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -37,6 +40,7 @@ </SHIM> <SHIM NAME="Win2000VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -45,6 +49,7 @@ </SHIM> <SHIM NAME="Win2000SP1VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -53,6 +58,7 @@ </SHIM> <SHIM NAME="Win2000SP2VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -61,6 +67,7 @@ </SHIM> <SHIM NAME="Win2000SP3VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -69,6 +76,7 @@ </SHIM> <SHIM NAME="WinXPVersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -77,6 +85,7 @@ </SHIM> <SHIM NAME="WinXPSP1VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -85,6 +94,7 @@ </SHIM> <SHIM NAME="WinXPSP2VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -93,6 +103,7 @@ </SHIM> <SHIM NAME="WinXPSP3VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -101,6 +112,7 @@ </SHIM> <SHIM NAME="Win2k3RTMVersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -109,6 +121,7 @@ </SHIM> <SHIM NAME="Win2k3SP1VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -117,6 +130,7 @@ </SHIM> <SHIM NAME="Win2k3SP2VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -125,6 +139,7 @@ </SHIM> <SHIM NAME="VistaRTMVersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -133,6 +148,7 @@ </SHIM> <SHIM NAME="VistaSP1VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -141,6 +157,7 @@ </SHIM> <SHIM NAME="VistaSP2VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -149,6 +166,7 @@ </SHIM> <SHIM NAME="Win7RTMVersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" />

1 0

[pschweitzer] 75780: [FSUTIL] Fix a cppcheck warning
by pschweitzer＠svn.reactos.org 07 Sep '17

07 Sep '17

Author: pschweitzer Date: Thu Sep 7 12:49:13 2017 New Revision: 75780 URL: http://svn.reactos.org/svn/reactos?rev=75780&view=rev Log: [FSUTIL] Fix a cppcheck warning Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Thu Sep 7 12:49:13 2017 @@ -52,7 +52,7 @@ CloseHandle(Volume); /* Print the status */ - _ftprintf(stdout, _T("The %s volume is %s\n"), argv[1], (VolumeStatus & VOLUME_IS_DIRTY ? _T("dirty") : _T("clean"))); + _ftprintf(stdout, _T("The %s volume is %s\n"), argv[1], ((VolumeStatus & VOLUME_IS_DIRTY) ? _T("dirty") : _T("clean"))); return 0; }

1 0

[tkreuzer] 75779: [WDMAUD.DRV/KMIXER] Replace a float mul/div/round operation with integer math.
by tkreuzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: tkreuzer Date: Wed Sep 6 21:09:25 2017 New Revision: 75779 URL: http://svn.reactos.org/svn/reactos?rev=75779&view=rev Log: [WDMAUD.DRV/KMIXER] Replace a float mul/div/round operation with integer math. Modified: trunk/reactos/dll/win32/wdmaud.drv/mixer.c trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c Modified: trunk/reactos/dll/win32/wdmaud.drv/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mixer… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] Wed Sep 6 21:09:25 2017 @@ -50,7 +50,7 @@ return ERROR_NOT_ENOUGH_MEMORY; } - NewSamples = lrintf(((FLOAT)NumSamples * ((FLOAT)NewRate / (FLOAT)OldRate))) + 2; + NewSamples = ((((ULONG64)NumSamples * NewRate) + (OldRate / 2)) / OldRate) + 2; FloatOut = HeapAlloc(GetProcessHeap(), 0, NewSamples * NumChannels * sizeof(FLOAT)); if (!FloatOut) Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Wed Sep 6 21:09:25 2017 @@ -59,7 +59,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } - NewSamples = lrintf(((FLOAT)NumSamples * ((FLOAT)NewRate / (FLOAT)OldRate))) + 2; + NewSamples = ((((ULONG64)NumSamples * NewRate) + (OldRate / 2)) / OldRate) + 2; FloatOut = ExAllocatePool(NonPagedPool, NewSamples * NumChannels * sizeof(FLOAT)); if (!FloatOut)

1 0

[pschweitzer] 75778: [FSUTIL] Print nicer error messages
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 17:11:03 2017 New Revision: 75778 URL: http://svn.reactos.org/svn/reactos?rev=75778&view=rev Log: [FSUTIL] Print nicer error messages Modified: trunk/reactos/base/applications/cmdutils/fsutil/common.c trunk/reactos/base/applications/cmdutils/fsutil/dirty.c trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h Modified: trunk/reactos/base/applications/cmdutils/fsutil/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/common.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/common.c [iso-8859-1] Wed Sep 6 17:11:03 2017 @@ -72,7 +72,7 @@ NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hVolume == INVALID_HANDLE_VALUE) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + PrintErrorMessage(GetLastError()); return INVALID_HANDLE_VALUE; } @@ -99,3 +99,24 @@ _ftprintf(stderr, _T("%s\t%s\n"), HandlersList[i].Command, HandlersList[i].Desc); } } + +int PrintErrorMessage(DWORD Error) +{ + TCHAR * String; + + /* Try to get textual error */ + if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, Error, 0, (TCHAR *)&String, 0, NULL) != 0) + { + /* And print it */ + _ftprintf(stderr, _T("Error: %s\n"), String); + LocalFree(String); + } + else + { + /* Otherwise, just print the error number */ + _ftprintf(stderr, _T("Error: %d\n"), Error); + } + + return Error; +} Modified: trunk/reactos/base/applications/cmdutils/fsutil/dirty.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/dirty.c [iso-8859-1] Wed Sep 6 17:11:03 2017 @@ -44,7 +44,7 @@ if (DeviceIoControl(Volume, FSCTL_IS_VOLUME_DIRTY, NULL, 0, &VolumeStatus, sizeof(ULONG), &BytesRead, NULL) == FALSE) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + PrintErrorMessage(GetLastError()); CloseHandle(Volume); return 1; } @@ -81,7 +81,7 @@ /* And set the dirty bit */ if (DeviceIoControl(Volume, FSCTL_MARK_VOLUME_DIRTY, NULL, 0, NULL, 0, &BytesRead, NULL) == FALSE) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + PrintErrorMessage(GetLastError()); CloseHandle(Volume); return 1; } Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] Wed Sep 6 17:11:03 2017 @@ -30,7 +30,7 @@ Drives = GetLogicalDrives(); if (Drives == 0) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + PrintErrorMessage(GetLastError()); return 1; } @@ -119,7 +119,7 @@ if (!GetVolumeInformation(argv[1], VolumeName, MAX_PATH + 1, &Serial, &MaxComponentLen, &Flags, FileSystem, MAX_PATH + 1)) { - _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + PrintErrorMessage(GetLastError()); return 1; } Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsutil.h [iso-8859-1] Wed Sep 6 17:11:03 2017 @@ -26,4 +26,6 @@ HandlerItem * HandlersList, int HandlerListCount); +int PrintErrorMessage(DWORD Error); + #endif

1 0

[pschweitzer] 75777: [FSUTIL] Implement fsutil fsinfo volumeinfo. Works well with our various FS :-)
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 16:35:46 2017 New Revision: 75777 URL: http://svn.reactos.org/svn/reactos?rev=75777&view=rev Log: [FSUTIL] Implement fsutil fsinfo volumeinfo. Works well with our various FS :-) Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] Wed Sep 6 16:35:46 2017 @@ -11,11 +11,13 @@ /* Add handlers here for subcommands */ static int DrivesMain(int argc, const TCHAR *argv[]); static int DriveTypeMain(int argc, const TCHAR *argv[]); +static int VolumeInfoMain(int argc, const TCHAR *argv[]); static HandlerItem HandlersList[] = { /* Proc, name, help */ { DrivesMain, _T("drives"), _T("Enumerates the drives") }, { DriveTypeMain, _T("drivetype"), _T("Provides the type of a drive") }, + { VolumeInfoMain, _T("volumeinfo"), _T("Provides informations about a volume") }, }; static int @@ -95,6 +97,65 @@ return 0; } +static int +VolumeInfoMain(int argc, const TCHAR *argv[]) +{ + DWORD Serial, MaxComponentLen, Flags; + TCHAR VolumeName[MAX_PATH + 1], FileSystem[MAX_PATH + 1]; + +#define HANDLE_FLAG(Flags, Flag, Desc) \ + if (Flags & Flag) \ + _ftprintf(stdout, Desc) + + /* We need a volume (path) */ + if (argc < 2) + { + _ftprintf(stderr, _T("Usage: fsutil fsinfo volumeinfo <volume_path>\n")); + _ftprintf(stderr, _T("\tFor example: fsutil fsinfo volumeinfo c:\\\n")); + return 1; + } + + /* Gather information */ + if (!GetVolumeInformation(argv[1], VolumeName, MAX_PATH + 1, &Serial, + &MaxComponentLen, &Flags, FileSystem, MAX_PATH + 1)) + { + _ftprintf(stderr, _T("Error: %d\n"), GetLastError()); + return 1; + } + + /* Display general information */ + _ftprintf(stdout, _T("Volume name: %s\n"), VolumeName); + _ftprintf(stdout, _T("Volume serial number: 0x%x\n"), Serial); + _ftprintf(stdout, _T("Maximum component length: %u\n"), MaxComponentLen); + _ftprintf(stdout, _T("File system name: %s\n"), FileSystem); + + /* Display specific flags */ + HANDLE_FLAG(Flags, FILE_CASE_SENSITIVE_SEARCH, _T("Supports case-sensitive file names\n")); + HANDLE_FLAG(Flags, FILE_CASE_PRESERVED_NAMES, _T("Supports preserved case of file names\n")); + HANDLE_FLAG(Flags, FILE_UNICODE_ON_DISK, _T("Supports unicode file names\n")); + HANDLE_FLAG(Flags, FILE_PERSISTENT_ACLS, _T("Preserves and applies ACLs\n")); + HANDLE_FLAG(Flags, FILE_FILE_COMPRESSION, _T("Supports compression per file\n")); + HANDLE_FLAG(Flags, FILE_VOLUME_QUOTAS, _T("Supports disk quotas\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_SPARSE_FILES, _T("Supports sparse files\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_REPARSE_POINTS, _T("Supports reparse points\n")); + HANDLE_FLAG(Flags, FILE_VOLUME_IS_COMPRESSED, _T("Is a compressed volume\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_OBJECT_IDS, _T("Supports object identifiers\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_ENCRYPTION, _T("Supports the Encrypted File System (EFS)\n")); + HANDLE_FLAG(Flags, FILE_NAMED_STREAMS, _T("Supports named streams\n")); + HANDLE_FLAG(Flags, FILE_READ_ONLY_VOLUME, _T("Is a read-only volume\n")); + HANDLE_FLAG(Flags, FILE_SEQUENTIAL_WRITE_ONCE, _T("Supports a single sequential write\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_TRANSACTIONS, _T("Supports transactions\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_HARD_LINKS, _T("Supports hard links\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_EXTENDED_ATTRIBUTES, _T("Supports extended attributes\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_OPEN_BY_FILE_ID, _T("Supports opening files per file identifier\n")); + HANDLE_FLAG(Flags, FILE_SUPPORTS_USN_JOURNAL, _T("Supports Update Sequence Number (USN) journals\n")); + HANDLE_FLAG(Flags, FILE_DAX_VOLUME, _T("Is a direct access volume\n")); + +#undef HANDLE_FLAGS + + return 0; +} + static void PrintUsage(const TCHAR * Command) {

1 0

[pschweitzer] 75776: [XDK] Add missing defines for FS features
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 16:28:22 2017 New Revision: 75776 URL: http://svn.reactos.org/svn/reactos?rev=75776&view=rev Log: [XDK] Add missing defines for FS features Modified: trunk/reactos/sdk/include/xdk/iotypes.h trunk/reactos/sdk/include/xdk/winnt_old.h Modified: trunk/reactos/sdk/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/iotypes.h?… ============================================================================== --- trunk/reactos/sdk/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/iotypes.h [iso-8859-1] Wed Sep 6 16:28:22 2017 @@ -5270,6 +5270,10 @@ #define FILE_SUPPORTS_EXTENDED_ATTRIBUTES 0x00800000 #define FILE_SUPPORTS_OPEN_BY_FILE_ID 0x01000000 #define FILE_SUPPORTS_USN_JOURNAL 0x02000000 +#define FILE_SUPPORTS_INTEGRITY_STREAMS 0x04000000 +#define FILE_SUPPORTS_BLOCK_REFCOUNTING 0x08000000 +#define FILE_SUPPORTS_SPARSE_VDL 0x10000000 +#define FILE_DAX_VOLUME 0x20000000 #define FILE_NEED_EA 0x00000080 Modified: trunk/reactos/sdk/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/winnt_old.… ============================================================================== --- trunk/reactos/sdk/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/winnt_old.h [iso-8859-1] Wed Sep 6 16:28:22 2017 @@ -286,20 +286,31 @@ #define FILE_NOTIFY_CHANGE_STREAM_WRITE 0x00000800 #define FILE_NOTIFY_VALID_MASK 0x00000fff -#define FILE_CASE_SENSITIVE_SEARCH 0x00000001 -#define FILE_CASE_PRESERVED_NAMES 0x00000002 -#define FILE_UNICODE_ON_DISK 0x00000004 -#define FILE_PERSISTENT_ACLS 0x00000008 -#define FILE_FILE_COMPRESSION 0x00000010 -#define FILE_VOLUME_QUOTAS 0x00000020 -#define FILE_SUPPORTS_SPARSE_FILES 0x00000040 -#define FILE_SUPPORTS_REPARSE_POINTS 0x00000080 -#define FILE_SUPPORTS_REMOTE_STORAGE 0x00000100 -#define FS_LFN_APIS 0x00004000 -#define FILE_VOLUME_IS_COMPRESSED 0x00008000 -#define FILE_SUPPORTS_OBJECT_IDS 0x00010000 -#define FILE_SUPPORTS_ENCRYPTION 0x00020000 -#define FILE_NAMED_STREAMS 0x00040000 +#define FILE_CASE_SENSITIVE_SEARCH 0x00000001 +#define FILE_CASE_PRESERVED_NAMES 0x00000002 +#define FILE_UNICODE_ON_DISK 0x00000004 +#define FILE_PERSISTENT_ACLS 0x00000008 +#define FILE_FILE_COMPRESSION 0x00000010 +#define FILE_VOLUME_QUOTAS 0x00000020 +#define FILE_SUPPORTS_SPARSE_FILES 0x00000040 +#define FILE_SUPPORTS_REPARSE_POINTS 0x00000080 +#define FILE_SUPPORTS_REMOTE_STORAGE 0x00000100 +#define FS_LFN_APIS 0x00004000 +#define FILE_VOLUME_IS_COMPRESSED 0x00008000 +#define FILE_SUPPORTS_OBJECT_IDS 0x00010000 +#define FILE_SUPPORTS_ENCRYPTION 0x00020000 +#define FILE_NAMED_STREAMS 0x00040000 +#define FILE_READ_ONLY_VOLUME 0x00080000 +#define FILE_SEQUENTIAL_WRITE_ONCE 0x00100000 +#define FILE_SUPPORTS_TRANSACTIONS 0x00200000 +#define FILE_SUPPORTS_HARD_LINKS 0x00400000 +#define FILE_SUPPORTS_EXTENDED_ATTRIBUTES 0x00800000 +#define FILE_SUPPORTS_OPEN_BY_FILE_ID 0x01000000 +#define FILE_SUPPORTS_USN_JOURNAL 0x02000000 +#define FILE_SUPPORTS_INTEGRITY_STREAMS 0x04000000 +#define FILE_SUPPORTS_BLOCK_REFCOUNTING 0x08000000 +#define FILE_SUPPORTS_SPARSE_VDL 0x10000000 +#define FILE_DAX_VOLUME 0x20000000 #define IO_COMPLETION_QUERY_STATE 0x0001 #define IO_COMPLETION_MODIFY_STATE 0x0002

1 0

[pschweitzer] 75775: [FSUTIL] Fix build (how does it even build locally?!)
by pschweitzer＠svn.reactos.org 06 Sep '17

06 Sep '17

Author: pschweitzer Date: Wed Sep 6 15:36:05 2017 New Revision: 75775 URL: http://svn.reactos.org/svn/reactos?rev=75775&view=rev Log: [FSUTIL] Fix build (how does it even build locally?!) Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c Modified: trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/fsutil/fsinfo.c [iso-8859-1] Wed Sep 6 15:36:05 2017 @@ -5,6 +5,8 @@ * PURPOSE: FSutil file systems information * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> */ + +#include "fsutil.h" /* Add handlers here for subcommands */ static int DrivesMain(int argc, const TCHAR *argv[]);

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