By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Fix remaing KCM mouse module crashes

tdebase-kcm-mouse-logitech-crash1.diff (text/plain), 4.64 KB, created by Slávek Banko on 2013-11-08 19:49:55 CST

(hide)

Description: Fix remaing KCM mouse module crashes

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2013-11-08 19:49:55 CST

Size: 4.64 KB

patch

obsolete

>diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp >index 1b77896..2798ce1 100644 >--- a/kcontrol/input/logitechmouse.cpp >+++ b/kcontrol/input/logitechmouse.cpp >@@ -132,13 +132,15 @@ void LogitechMouse::updateCordlessStatus() > { > TQByteArray status(8); > >- int result = usb_control_msg( m_usbDeviceHandle, >+ int result = (m_usbDeviceHandle != 0 >+ ? usb_control_msg( m_usbDeviceHandle, > USB_TYPE_VENDOR | USB_ENDPOINT_IN,0x09, > (0x0003 | m_useSecondChannel), > (0x0000 | m_useSecondChannel), > status.data(), > 0x0008, >- 1000); >+ 1000) >+ : -1); > > if (0 > result) { > // We probably have a permission problem >@@ -253,14 +255,16 @@ void LogitechMouse::updateResolution() > { > char resolution; > >- int result = usb_control_msg( m_usbDeviceHandle, >+ int result = (m_usbDeviceHandle != 0 >+ ? usb_control_msg( m_usbDeviceHandle, > USB_TYPE_VENDOR | USB_ENDPOINT_IN, > 0x01, > 0x000E, > 0x0000, > &resolution, > 0x0001, >- 100); >+ 100) >+ : -1); > > // kdDebug() << "resolution is: " << resolution << endl; > if (0 > result) { >@@ -273,14 +277,16 @@ void LogitechMouse::updateResolution() > > void LogitechMouse::setLogitechTo800() > { >- int result = usb_control_msg( m_usbDeviceHandle, >+ int result = (m_usbDeviceHandle != 0 >+ ? usb_control_msg( m_usbDeviceHandle, > USB_TYPE_VENDOR, > 0x02, > 0x000E, > 4, > NULL, > 0x0000, >- 100); >+ 100) >+ : -1); > if (0 > result) { > kdWarning() << "Error setting resolution on device: " << usb_strerror() << endl; > } >@@ -288,14 +294,16 @@ void LogitechMouse::setLogitechTo800() > > void LogitechMouse::setLogitechTo400() > { >- int result = usb_control_msg( m_usbDeviceHandle, >+ int result = (m_usbDeviceHandle != 0 >+ ? usb_control_msg( m_usbDeviceHandle, > USB_TYPE_VENDOR, > 0x02, > 0x000E, > 3, > NULL, > 0x0000, >- 100); >+ 100) >+ : -1); > if (0 > result) { > kdWarning() << "Error setting resolution on device: " << usb_strerror() << endl; > } >@@ -319,14 +327,16 @@ bool LogitechMouse::isDualChannelCapable() > > void LogitechMouse::setChannel1() > { >- int result = usb_control_msg( m_usbDeviceHandle, >+ int result = (m_usbDeviceHandle != 0 >+ ? usb_control_msg( m_usbDeviceHandle, > USB_TYPE_VENDOR, > 0x02, > (0x0008 | m_useSecondChannel), > (0x0000 | m_useSecondChannel), > NULL, > 0x0000, >- 1000); >+ 1000) >+ : -1); > > if (0 > result) { > kdWarning() << "Error setting mouse to channel 1 : " << usb_strerror() << endl; >@@ -336,14 +346,16 @@ void LogitechMouse::setChannel1() > > void LogitechMouse::setChannel2() > { >- int result = usb_control_msg( m_usbDeviceHandle, >+ int result = (m_usbDeviceHandle != 0 >+ ? usb_control_msg( m_usbDeviceHandle, > USB_TYPE_VENDOR, > 0x02, > (0x0008 | m_useSecondChannel), > (0x0001 | m_useSecondChannel), > NULL, > 0x0000, >- 1000); >+ 1000) >+ : -1); > > if (0 > result) { > kdWarning() << "Error setting mouse to channel 2 : " << usb_strerror() << endl; View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]