Windows: Update transferred data on timeout or cancel.

* When handling aborted transfer it's possible that some data (but not
  the full buffer) was transferred.
* This change ensures that this partially transferred data is recorded
  and passed up to the caller.

diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c
index 8a8caf4e97392201758354dfadc9193ff750e26e..fff21f32199694048fb766f7340c5ab56a4114ff 100644 (file)
--- a/libusb/os/windows_usb.c
+++ b/libusb/os/windows_usb.c
@@ -2030,9 +2030,9 @@ static void windows_transfer_callback(struct usbi_transfer *itransfer, uint32_t
 {
        struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
        struct windows_device_priv *priv = _device_priv(transfer->dev_handle->dev);
-       int status;
+       int status, istatus;
 
-       usbi_dbg("handling I/O completion with errcode %d", io_result);
+       usbi_dbg("handling I/O completion with errcode %d, size %d", io_result, io_size);
 
        switch(io_result) {
        case NO_ERROR:
@@ -2047,6 +2047,10 @@ static void windows_transfer_callback(struct usbi_transfer *itransfer, uint32_t
                status = LIBUSB_TRANSFER_TIMED_OUT;
                break;
        case ERROR_OPERATION_ABORTED:
+               istatus = priv->apib->copy_transfer_data(SUB_API_NOTSET, itransfer, io_size);
+               if (istatus != LIBUSB_TRANSFER_COMPLETED) {
+                       usbi_dbg("Failed to copy partial data in aborted operation: %d", istatus);
+               }
                if (itransfer->flags & USBI_TRANSFER_TIMED_OUT) {
                        usbi_dbg("detected timeout");
                        status = LIBUSB_TRANSFER_TIMED_OUT;

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index cd498554d840c18901cc77055d19fd92793d4647..c6aa34d654c6213af1d0e200b7b0edee90c19e71 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10603
+#define LIBUSB_NANO 10604