Re: [Libusb-win32-devel] [PATCH] Add recipient support for get/set descriptor

[Adam K. <akr...@ro...>]

On Thu, Jul 20, 2006 at 08:04:41PM +0200, Stephan Meyer wrote:
> 
> I applied your patch, but in driver_api.h I moved the 'recipient' member 
> to the end of the structure so that the new dll remains downward 
> compatible and works with older driver versions.

It looks like a couple unintentional changes might have crept into your
commit of windows.c. Just in case, I've highlighted them here...

Thanks!
--Adam

> diff -u -r1.47 -r1.48
> --- windows.c	18 Jul 2006 20:13:40 -0000	1.47
> +++ windows.c	20 Jul 2006 17:58:57 -0000	1.48
> @@ -161,18 +161,18 @@
>      }
>    
>    /* now, retrieve the device's current configuration, except from hubs */
> -  if(dev->device->config && dev->device->config->interface
> -     && dev->device->config->interface[0].altsetting
> -     && dev->device->config->interface[0].altsetting[0].bInterfaceClass 
> -     != USB_CLASS_HUB)
> -    {
> -      config = usb_get_configuration(dev);
> +/*   if(dev->device->config && dev->device->config->interface */
> +/*      && dev->device->config->interface[0].altsetting */
> +/*      && dev->device->config->interface[0].altsetting[0].bInterfaceClass  */
> +/*      != USB_CLASS_HUB) */
> +/*     { */
> +/*       config = usb_get_configuration(dev); */
>        
> -      if(config > 0)
> -        {
> -          dev->config = config;
> -        }
> -    }
> +/*       if(config > 0) */
> +/*         { */
> +/*           dev->config = config; */
> +/*         } */
> +/*     } */
>  
>    return 0;
>  }
> @@ -768,7 +770,7 @@
>      {
>        usb_error("usb_control_msg: sending control message failed, "
>                  "win error: %s", usb_win_error_to_string());
> -      return -usb_win_error_to_errno();
> +      ret = -usb_win_error_to_errno();
>      }
>  
>    /* out request? */