Changeset 22685 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Sep 1, 2009 9:58:57 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

51797

Message:

Additions/x11/vboxmouse: fix a segfault on X.Org Server 1.7 due to a missing initialisation call

File:

• trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c (modified) (2 diffs)

trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c

@@ -74 +74 @@
 }
 
+static void
+VBoxPtrCtrlProc(DeviceIntPtr device, PtrCtrl *ctrl)
+{
+    /* Nothing to do, dix handles all settings */
+}
+
 static int
 VBoxInit(DeviceIntPtr device)
 {
     CARD8 map[2] = { 0, 1 };
-    InputInfoPtr pInfo;
-
-    pInfo = device->public.devicePrivate;
     Atom axis_labels[2] = { 0, 0 };
     Atom button_labels[2] = { 0, 0 };
-
+    InputInfoPtr pInfo;
+
+    pInfo = device->public.devicePrivate;
     if (!InitValuatorClassDeviceStruct(device, 2,
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
@@ -99 +104 @@
 #endif
                                      map))
+        return !Success;
+    if (!InitPtrFeedbackClassDeviceStruct(device, VBoxPtrCtrlProc))
         return !Success;