Changeset 27160 in vbox for trunk/src

Timestamp:

Mar 8, 2010 12:05:02 PM (15 years ago)

Author:

vboxsync

Message:

Main: don't assert in Mouse code all over the place. Now that we have absolute mouse coordinates, the GUI may send mouse events after having destroyed its session and console, and we shouldn't assert then

File:

• trunk/src/VBox/Main/MouseImpl.cpp (modified) (10 diffs)

trunk/src/VBox/Main/MouseImpl.cpp

@@ -286 +286 @@
 
         if (RT_FAILURE(vrc))
-            setError(VBOX_E_IPRT_ERROR,
-                     tr("Could not send the mouse event to the virtual mouse (%Rrc)"),
-                     vrc);
-        AssertRCReturn(vrc, VBOX_E_IPRT_ERROR);
+            return setError(VBOX_E_IPRT_ERROR,
+                            tr("Could not send the mouse event to the virtual mouse (%Rrc)"),
+                            vrc);
     }
     return S_OK;
@@ -318 +317 @@
                                           dw, fButtons);
         if (RT_FAILURE(vrc))
-            setError(VBOX_E_IPRT_ERROR,
-                     tr("Could not send the mouse event to the virtual mouse (%Rrc)"),
-                     vrc);
-        AssertRCReturn(vrc, VBOX_E_IPRT_ERROR);
+            return setError(VBOX_E_IPRT_ERROR,
+                            tr("Could not send the mouse event to the virtual mouse (%Rrc)"),
+                            vrc);
     }
     return S_OK;
@@ -344 +342 @@
                                                    mouseXAbs, mouseYAbs);
         if (RT_FAILURE(vrc))
-            setError(VBOX_E_IPRT_ERROR,
-                     tr("Could not send the mouse event to the virtual mouse (%Rrc)"),
-                     vrc);
-        AssertRCReturn(vrc, VBOX_E_IPRT_ERROR);
+            return setError(VBOX_E_IPRT_ERROR,
+                            tr("Could not send the mouse event to the virtual mouse (%Rrc)"),
+                            vrc);
     }
     return S_OK;
@@ -403 +400 @@
 
     ULONG displayWidth;
-    int rc = pDisplay->COMGETTER(Width)(&displayWidth);
-    ComAssertComRCRet(rc, rc);
+    HRESULT rc = pDisplay->COMGETTER(Width)(&displayWidth);
+    if (FAILED(rc)) return rc;
 
     *pcX = displayWidth ? (x * 0xFFFF) / displayWidth: 0;
@@ -422 +419 @@
 
     ULONG displayHeight;
-    int rc = pDisplay->COMGETTER(Height)(&displayHeight);
-    ComAssertComRCRet(rc, rc);
+    HRESULT rc = pDisplay->COMGETTER(Height)(&displayHeight);
+    if (FAILED(rc)) return rc;
 
     *pcY = displayHeight ? (y * 0xFFFF) / displayHeight: 0;
@@ -453 +450 @@
     uint32_t mouseXAbs;
     HRESULT rc = convertDisplayWidth(x, &mouseXAbs);
-    ComAssertComRCRet(rc, rc);
+    if (FAILED(rc)) return rc;
+
     /**
      * @todo multi-monitor Windows guests expect this to be unbounded.
@@ -463 +461 @@
     uint32_t mouseYAbs;
     rc = convertDisplayHeight(y, &mouseYAbs);
-    ComAssertComRCRet(rc, rc);
+    if (FAILED(rc)) return rc;
     /* if (mouseYAbs > 0xffff)
         mouseYAbs = mLastAbsY; */
@@ -471 +469 @@
     uint32_t mouseCaps;
     rc = getVMMDevMouseCaps(&mouseCaps);
-    ComAssertComRCRet(rc, rc);
+    if (FAILED(rc)) return rc;
 
     /*
@@ -500 +498 @@
             rc = reportRelEventToMouseDev(fNeedsJiggle ? 1 : 0, 0, dz, dw,
                                           fButtons);
-            ComAssertComRCRet(rc, rc);
         }
     }
@@ -506 +503 @@
         rc = reportAbsEventToMouseDev(mouseXAbs, mouseYAbs, dz, dw, fButtons);
 
-    ComAssertComRCRet(rc, rc);
+    if (FAILED(rc)) return rc;
 
     mLastAbsX = mouseXAbs;