[Wine-patches] [eterhack 21/23] usbhub.sys: Do not set a timeout.

Alexander Morozov =?iso-8859-1?q?amorozov_=CE=C1_etersoft=2Eru?=
Пт Июн 5 13:00:21 MSD 2009


---
 dlls/usbhub.sys/usbhub.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/usbhub.sys/usbhub.c b/dlls/usbhub.sys/usbhub.c
index c2e1051..34d7b11 100644
--- a/dlls/usbhub.sys/usbhub.c
+++ b/dlls/usbhub.sys/usbhub.c
@@ -324,7 +324,7 @@ static NTSTATUS WINAPI usbhub_internal_ioctl( DEVICE_OBJECT *device, IRP *irp )
                         ret = libusb_bulk_transfer( husb,
                                 (unsigned int)request->PipeHandle,
                                 buf, request->TransferBufferLength,
-                                &transferred, 1000 );
+                                &transferred, 0 );
                         if (!libusb_release_interface( husb,
                                 ((int)request->PipeHandle >> 8) - 1 ) && !ret)
                         {
@@ -450,7 +450,7 @@ static NTSTATUS WINAPI usbhub_internal_ioctl( DEVICE_OBJECT *device, IRP *irp )
                 {
                     ret = libusb_control_transfer( husb, 1 << 7,
                             LIBUSB_REQUEST_GET_STATUS, 0, request->Index, buf,
-                            sizeof(USHORT), 1000 );
+                            sizeof(USHORT), 0 );
                     libusb_close( husb );
                     if (ret < 0) break;
                     status = STATUS_SUCCESS;
@@ -502,7 +502,7 @@ static NTSTATUS WINAPI usbhub_internal_ioctl( DEVICE_OBJECT *device, IRP *irp )
                             req_type |= (1 << 7);
                         ret = libusb_control_transfer( husb, req_type,
                                 request->Request, request->Value, request->Index,
-                                buf, size, 1000 );
+                                buf, size, 0 );
                         if (ret < 0)
                             ERR( "libusb_control_transfer: %d\n", ret );
                         else
@@ -680,10 +680,10 @@ static NTSTATUS WINAPI usbhub_internal_ioctl( DEVICE_OBJECT *device, IRP *irp )
                         /* FIXME: add support for an interrupt transfer */
                         if (request->TransferFlags & USBD_TRANSFER_DIRECTION_IN)
                             ret = usb_bulk_read( husb, (int)request->PipeHandle & 0xff,
-                                    buf, request->TransferBufferLength, 1000 );
+                                    buf, request->TransferBufferLength, 0 );
                         else
                             ret = usb_bulk_write( husb, (int)request->PipeHandle & 0xff,
-                                    buf, request->TransferBufferLength, 1000 );
+                                    buf, request->TransferBufferLength, 0 );
                         if (!usb_release_interface( husb,
                                 ((int)request->PipeHandle >> 8) - 1 ) && ret >= 0)
                         {
@@ -804,7 +804,7 @@ static NTSTATUS WINAPI usbhub_internal_ioctl( DEVICE_OBJECT *device, IRP *irp )
                 if (husb)
                 {
                     ret = usb_control_msg( husb, 1 << 7, USB_REQ_GET_STATUS, 0,
-                            request->Index, buf, sizeof(USHORT), 1000 );
+                            request->Index, buf, sizeof(USHORT), 0 );
                     if (ret < 0)
                         ERR( "%s\n", usb_strerror() );
                     else
@@ -858,7 +858,7 @@ static NTSTATUS WINAPI usbhub_internal_ioctl( DEVICE_OBJECT *device, IRP *irp )
                         if (request->TransferFlags & USBD_TRANSFER_DIRECTION_IN)
                             req_type |= (1 << 7);
                         ret = usb_control_msg( husb, req_type, request->Request,
-                                request->Value, request->Index, buf, size, 1000 );
+                                request->Value, request->Index, buf, size, 0 );
                         if (ret < 0)
                             ERR( "%s\n", usb_strerror() );
                         else
-- 
1.6.3.1



Подробная информация о списке рассылки Wine-patches