Acked-by: Jonathon Jongsma <jjongsma@xxxxxxxxxx>
On Thu, 2016-02-11 at 18:04 +0200, Dmitry Fleytman wrote:
> Signed-off-by: Dmitry Fleytman <dmitry@xxxxxxxxxx>
> ---
> src/usb-device-manager.c | 44 ++++++++++++++++++++++++++++----------------
> 1 file changed, 28 insertions(+), 16 deletions(-)
>
> diff --git a/src/usb-device-manager.c b/src/usb-device-manager.c
> index 5bb8e17..0ae9b9b 100644
> --- a/src/usb-device-manager.c
> +++ b/src/usb-device-manager.c
> @@ -256,10 +256,12 @@ static gboolean
> spice_usb_device_manager_initable_init(GInitable *initable,
> #endif
>
> #ifdef G_OS_WIN32
> - priv->installer = spice_win_usb_driver_new(err);
> - if (!priv->installer) {
> - SPICE_DEBUG("failed to initialize winusb driver");
> - return FALSE;
> + if (priv->use_usbclerk) {
> + priv->installer = spice_win_usb_driver_new(err);
> + if (!priv->installer) {
> + SPICE_DEBUG("failed to initialize winusb driver");
> + return FALSE;
> + }
> }
> #endif
>
> @@ -366,8 +368,10 @@ static void spice_usb_device_manager_finalize(GObject
> *gobject)
> free(priv->auto_conn_filter_rules);
> free(priv->redirect_on_connect_rules);
> #ifdef G_OS_WIN32
> - if (priv->installer)
> + if (priv->installer) {
> + g_warn_if_fail(priv->use_usbclerk);
> g_object_unref(priv->installer);
> + }
> if (!priv->use_usbclerk) {
> _usbdk_hider_clear(self);
> }
> @@ -963,12 +967,14 @@ static void
> spice_usb_device_manager_remove_dev(SpiceUsbDeviceManager *self,
> }
>
> #ifdef G_OS_WIN32
> - const guint8 state = spice_usb_device_get_state(device);
> - if ((state == SPICE_USB_DEVICE_STATE_INSTALLING) ||
> - (state == SPICE_USB_DEVICE_STATE_UNINSTALLING)) {
> - SPICE_DEBUG("skipping " DEV_ID_FMT ". It is un/installing its
> driver",
> - bus, address);
> - return;
> + if (priv->use_usbclerk) {
> + const guint8 state = spice_usb_device_get_state(device);
> + if ((state == SPICE_USB_DEVICE_STATE_INSTALLING) ||
> + (state == SPICE_USB_DEVICE_STATE_UNINSTALLING)) {
> + SPICE_DEBUG("skipping " DEV_ID_FMT ". It is un/installing its
> driver",
> + bus, address);
> + return;
> + }
> }
> #endif
>
> @@ -1169,6 +1175,7 @@ static void
> spice_usb_device_manager_drv_install_cb(GObject *gobject,
> g_free(cbinfo);
>
> g_return_if_fail(SPICE_IS_USB_DEVICE_MANAGER(self));
> + g_return_if_fail(self->priv->use_usbclerk);
> g_return_if_fail(SPICE_IS_WIN_USB_DRIVER(installer));
> g_return_if_fail(device!= NULL);
>
> @@ -1201,6 +1208,7 @@ static void
> spice_usb_device_manager_drv_uninstall_cb(GObject *gobject,
>
> SPICE_DEBUG("Win USB driver uninstall finished");
> g_return_if_fail(SPICE_IS_USB_DEVICE_MANAGER(self));
> + g_return_if_fail(self->priv->use_usbclerk);
>
> if (!spice_win_usb_driver_uninstall_finish(cbinfo->installer, res, &err))
> {
> g_warning("win usb driver uninstall failed -- %s", err->message);
> @@ -1604,15 +1612,18 @@ void
> spice_usb_device_manager_connect_device_async(SpiceUsbDeviceManager *self,
> {
>
> #if defined(USE_USBREDIR) && defined(G_OS_WIN32)
> - _spice_usb_device_manager_install_driver_async(self, device, cancellable,
> - callback, user_data);
> -#else
> + if (self->priv->use_usbclerk) {
> + _spice_usb_device_manager_install_driver_async(self, device,
> cancellable,
> + callback, user_data);
> + return;
> + }
> +#endif
> +
> _spice_usb_device_manager_connect_device_async(self,
> device,
> cancellable,
> callback,
> user_data);
> -#endif
> }
>
> /**
> @@ -1665,7 +1676,8 @@ void
> spice_usb_device_manager_disconnect_device(SpiceUsbDeviceManager *self,
> spice_usbredir_channel_disconnect_device(channel);
>
> #ifdef G_OS_WIN32
> - _spice_usb_device_manager_uninstall_driver_async(self, device);
> + if(self->priv->use_usbclerk)
> + _spice_usb_device_manager_uninstall_driver_async(self, device);
> #endif
>
> #endif
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel