Changeset 13606 in vbox for trunk/src/VBox/Main/MouseImpl.cpp

Timestamp:

Oct 28, 2008 10:36:13 AM (16 years ago)

Author:

vboxsync

Message:

Main: First bulk of classes transfered to the new locking scheme.

File:

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

trunk/src/VBox/Main/MouseImpl.cpp

@@ +1 @@
+/* $Id $ */
+
 /** @file
  *
@@ -5 +7 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -52 +54 @@
 /////////////////////////////////////////////////////////////////////////////
 
+DEFINE_EMPTY_CTOR_DTOR (Mouse)
+
 HRESULT Mouse::FinalConstruct()
 {
-    mParent = NULL;
     mpDrv = NULL;
     return S_OK;
@@ -61 +64 @@
 void Mouse::FinalRelease()
 {
-    if (isReady())
-        uninit();
+    uninit();
 }
 
@@ -76 +78 @@
 HRESULT Mouse::init (Console *parent)
 {
-    LogFlow(("Mouse::init(): isReady=%d\n", isReady()));
+    LogFlow(("Mouse::init()\n"));
 
     ComAssertRet (parent, E_INVALIDARG);
 
-    AutoWriteLock alock (this);
-    ComAssertRet (!isReady(), E_UNEXPECTED);
-
-    mParent = parent;
+    /* Enclose the state transition NotReady->InInit->Ready */
+    AutoInitSpan autoInitSpan (this);
+    AssertReturn (autoInitSpan.isOk(), E_UNEXPECTED);
+
+    unconst(mParent) = parent;
 
 #ifdef RT_OS_L4
@@ -92 +95 @@
 #endif
 
-    setReady (true);
+    /* Confirm a successful initialization */
+    autoInitSpan.setSucceeded();
+
     return S_OK;
 }
@@ -102 +107 @@
 void Mouse::uninit()
 {
-    LogFlow(("Mouse::uninit(): isReady=%d\n", isReady()));
-
-    AutoWriteLock alock (this);
-    AssertReturn (isReady(), (void) 0);
+    LogFlowThisFunc (("\n"));
+
+    /* Enclose the state transition Ready->InUninit->NotReady */
+    AutoUninitSpan autoUninitSpan (this);
+    if (autoUninitSpan.uninitDone())
+        return;
 
     if (mpDrv)
@@ -111 +118 @@
     mpDrv = NULL;
 
-    setReady (false);
+    unconst (mParent).setNull();
 }
 
@@ -129 +136 @@
         return E_POINTER;
 
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
     AutoWriteLock alock (this);
-    CHECK_READY();
 
     CHECK_CONSOLE_DRV (mpDrv);
@@ -141 +150 @@
     mParent->getVMMDev()->getVMMDevPort()->pfnQueryMouseCapabilities(mParent->getVMMDev()->getVMMDevPort(), &mouseCaps);
     *absoluteSupported = mouseCaps & VMMDEV_MOUSEGUESTWANTSABS;
+
     return S_OK;
 }
@@ -156 +166 @@
         return E_POINTER;
 
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
     AutoWriteLock alock (this);
-    CHECK_READY();
 
     CHECK_CONSOLE_DRV (mpDrv);
@@ -168 +180 @@
     mParent->getVMMDev()->getVMMDevPort()->pfnQueryMouseCapabilities(mParent->getVMMDev()->getVMMDevPort(), &mouseCaps);
     *needsHostCursor = mouseCaps & VMMDEV_MOUSEGUESTNEEDSHOSTCUR;
+
     return S_OK;
 }
@@ -185 +198 @@
 STDMETHODIMP Mouse::PutMouseEvent(LONG dx, LONG dy, LONG dz, LONG buttonState)
 {
+    HRESULT rc = S_OK;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
     AutoWriteLock alock (this);
-    CHECK_READY();
 
     CHECK_CONSOLE_DRV (mpDrv);
@@ -218 +235 @@
     int vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, dx, dy, dz, fButtons);
     if (VBOX_FAILURE (vrc))
-        return setError (E_FAIL,
-            tr ("Could not send the mouse event to the virtual mouse (%Vrc)"),
-            vrc);
-
-    return S_OK;
+        rc = setError (E_FAIL, tr ("Could not send the mouse event to the virtual mouse (%Vrc)"),
+                       vrc);
+
+    return rc;
 }
 
@@ -238 +254 @@
                                           LONG buttonState)
 {
+    HRESULT rc = S_OK;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
     AutoWriteLock alock (this);
-    CHECK_READY();
 
     CHECK_CONSOLE_DRV (mpDrv);
@@ -267 +287 @@
     ULONG displayWidth;
     ULONG displayHeight;
-    HRESULT rc = pDisplay->COMGETTER(Width)(&displayWidth);
+    rc = pDisplay->COMGETTER(Width)(&displayWidth);
     ComAssertComRCRet (rc, rc);
     rc = pDisplay->COMGETTER(Height)(&displayHeight);
@@ -297 +317 @@
                                           fButtons);
         if (VBOX_FAILURE (vrc))
-            return setError (E_FAIL,
-                tr ("Could not send the mouse event to the virtual mouse (%Vrc)"),
-                vrc);
-    }
-
-    return S_OK;
+            rc = setError (E_FAIL, tr ("Could not send the mouse event to the virtual mouse (%Vrc)"),
+                           vrc);
+    }
+
+    return rc;
 }