Changeset 8950 in vbox for trunk/src/VBox/Additions/x11/xmouse

Timestamp:

May 20, 2008 11:41:40 AM (17 years ago)

Author:

vboxsync

Message:

Additions/x11: do not attempt to access the VBox device from the mouse driver unless it initialises properly

File:

• trunk/src/VBox/Additions/x11/xmouse/VBoxUtils.c (modified) (4 diffs)

trunk/src/VBox/Additions/x11/xmouse/VBoxUtils.c

@@ -29 +29 @@
 #include "compiler.h"
 
+/* This is an ugly hack, but I can't see anywhere to save this information
+   in the driver context. */
+/** Have we ever failed to open the VBox device? */
+static Bool gDeviceOpenFailed = FALSE;
+
 int VBoxMouseInit(void)
 {
-    int rc = VbglR3Init();
+    int rc;
+    if (gDeviceOpenFailed)
+        return 1;
+    rc = VbglR3Init();
     if (RT_FAILURE(rc))
     {
-        ErrorF("VbglR3Init failed.\n");
+        ErrorF("Failed to open the VirtualBox device, falling back to compatibility mouse mode.\n");
+        gDeviceOpenFailed = TRUE;
         return 1;
     }
@@ -43 +52 @@
         ErrorF("Error sending mouse pointer capabilities to VMM! rc = %d (%s)\n",
                errno, strerror(errno));
+        gDeviceOpenFailed = TRUE;
+        VbglR3Term();
         return 1;
     }
@@ -56 +67 @@
     uint32_t pointerYPos;
 
+    if (gDeviceOpenFailed)
+        return 2;
     AssertPtrReturn(puAbsXPos, VERR_INVALID_PARAMETER);
     AssertPtrReturn(puAbsYPos, VERR_INVALID_PARAMETER);
@@ -72 +85 @@
 int VBoxMouseFini(void)
 {
+    if (gDeviceOpenFailed)
+        return VINF_SUCCESS;
     int rc = VbglR3SetMouseStatus(0);
     VbglR3Term();