Changeset 887 in vbox for trunk/src/VBox/Main/ConsoleImpl.cpp

Timestamp:

Feb 13, 2007 7:08:24 PM (18 years ago)

Author:

vboxsync

Message:

Backed out rev. 18598

File:

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

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -306 +306 @@
     AssertReturn (mAudioSniffer, E_FAIL);
 
-    memset (&mCallbackData, 0, sizeof (mCallbackData));    
-    
     /* Confirm a successful initialization when it's the case */
     autoInitSpan.setSucceeded();
@@ -421 +419 @@
     unconst (mMachine).setNull();
 
-    /* Release all callbacks. Do this after uninitializing the components,
-     * as some of them are well-behaved and unregister their callbacks.
-     * These would trigger error messages complaining about trying to
-     * unregister a non-registered callback. */
+    // Release all callbacks. Do this after uninitializing the components,
+    // as some of them are well-behaved and unregister their callbacks.
+    // These would trigger error messages complaining about trying to
+    // unregister a non-registered callback.
     mCallbacks.clear();
-
-    /* dynamically allocated members of mCallbackData are uninitialized
-     * at the end of powerDown() */
-    Assert (!mCallbackData.mpsc.valid && mCallbackData.mpsc.shape == NULL);
-    Assert (!mCallbackData.mcc.valid);
-    Assert (!mCallbackData.klc.valid);
 
     LogFlowThisFuncLeave();
@@ -2363 +2355 @@
     mCallbacks.push_back (CallbackList::value_type (aCallback));
 
-    /* Inform the callback about the current status (for example, the new
-     * callback must know the current mouse capabilities and the pointer
-     * shape in order to properly integrate the mouse pointer). */
-
-    if (mCallbackData.mpsc.valid)
-        aCallback->OnMousePointerShapeChange (mCallbackData.mpsc.visible,
-                                              mCallbackData.mpsc.alpha,
-                                              mCallbackData.mpsc.xHot,
-                                              mCallbackData.mpsc.yHot,
-                                              mCallbackData.mpsc.width,
-                                              mCallbackData.mpsc.height,
-                                              mCallbackData.mpsc.shape);
-    if (mCallbackData.mcc.valid)
-        aCallback->OnMouseCapabilityChange (mCallbackData.mcc.supportsAbsolute,
-                                            mCallbackData.mcc.needsHostCursor);
-
-    aCallback->OnStateChange (mMachineState);
+#if 0
+    /* @todo dmik please implement this.
+     * Inform the callback about the current status, because the new callback
+     * must know at least the current mouse capabilities and the pointer shape.
+     */
+    aCallback->OnMousePointerShapeChange (mCallbacksStatus.pointerShape.fVisible,
+                                          mCallbackStatus.pointerShape.fAlpha,
+                                          mCallbackStatus.pointerShape.xHot,
+                                          mCallbackStatus.pointerShape.yHot,
+                                          mCallbackStatus.pointerShape.width,
+                                          mCallbackStatus.pointerShape.height,
+                                          mCallbackStatus.pointerShape.pShape);
+    aCallback->OnMouseCapabilityChange (mCallbackStatus.mouseCapability.supportsAbsolute,
+                                        mCallbackStatus.mouseCapability.needsHostCursor);
+    aCallback->OnStateChange (mCallbackStatus.machineState);
     aCallback->OnAdditionsStateChange();
-
-    if (mCallbackData.klc.valid)
-        aCallback->OnKeyboardLedsChange (mCallbackData.klc.numLock,
-                                         mCallbackData.klc.capsLock,
-                                         mCallbackData.klc.scrollLock);
+    aCallback->OnKeyboardLedsChange(mCallbackStatus.keyboardLeds.fNumLock,
+                                    mCallbackStatus.keyboardLeds.fCapsLock,
+                                    mCallbackStatus.keyboardLeds.fScrollLock);
+#endif
 
     return S_OK;
@@ -3275 +3264 @@
 
 /**
- *  @note Locks this object for writing.
+ *  @note Locks this object for reading.
  */
 void Console::onMousePointerShapeChange(bool fVisible, bool fAlpha,
@@ -3286 +3275 @@
                       fVisible, fAlpha, xHot, yHot, width, height, pShape));
 
-    AutoCaller autoCaller (this);
-    AssertComRCReturnVoid (autoCaller.rc());
-
-    /* We need a write lock because we alter the cached callback data */
-    AutoLock alock (this);
-
-    /* save the callback arguments */
-    mCallbackData.mpsc.visible = fVisible;
-    mCallbackData.mpsc.alpha = fAlpha;
-    mCallbackData.mpsc.xHot = xHot;
-    mCallbackData.mpsc.yHot = yHot;
-    mCallbackData.mpsc.width = width;
-    mCallbackData.mpsc.height = height;
-    
-    if (pShape != NULL)
-    {
-        size_t cb = (width + 7) / 8 * height; /* size of the AND mask */
-        cb += (cb + 3) & ~3 + width * 4 * height; /* + gap + size of the XOR mask */
-        mCallbackData.mpsc.shape = (BYTE *) RTMemAllocZ (cb);
-        AssertReturnVoid (mCallbackData.mpsc.shape);
-        memcpy (mCallbackData.mpsc.shape, pShape, cb);
-    }
-    else
-        mCallbackData.mpsc.shape = NULL;
-
-    mCallbackData.mpsc.valid = true;
+    AutoReaderLock alock (this);
 
     CallbackList::iterator it = mCallbacks.begin();
@@ -3320 +3284 @@
 
 /**
- *  @note Locks this object for writing.
+ *  @note Locks this object for reading.
  */
 void Console::onMouseCapabilityChange (BOOL supportsAbsolute, BOOL needsHostCursor)
@@ -3330 +3294 @@
     AssertComRCReturnVoid (autoCaller.rc());
 
-    /* We need a write lock because we alter the cached callback data */
-    AutoLock alock (this);
-
-    /* save the callback arguments */
-    mCallbackData.mcc.supportsAbsolute = supportsAbsolute;
-    mCallbackData.mcc.needsHostCursor = needsHostCursor;
-    mCallbackData.mcc.valid = true;
-    
+    AutoReaderLock alock (this);
+
     CallbackList::iterator it = mCallbacks.begin();
     while (it != mCallbacks.end())
@@ -3394 +3352 @@
 
 /**
- *  @note Locks this object for writing.
+ *  @note Locks this object for reading.
  */
 void Console::onKeyboardLedsChange(bool fNumLock, bool fCapsLock, bool fScrollLock)
@@ -3401 +3359 @@
     AssertComRCReturnVoid (autoCaller.rc());
 
-    /* We need a write lock because we alter the cached callback data */
-    AutoLock alock (this);
-
-    /* save the callback arguments */
-    mCallbackData.klc.numLock = fNumLock;
-    mCallbackData.klc.capsLock = fCapsLock;
-    mCallbackData.klc.scrollLock = fScrollLock;
-    mCallbackData.klc.valid = true;
+    AutoReaderLock alock (this);
 
     CallbackList::iterator it = mCallbacks.begin();
@@ -3706 +3657 @@
         mVMDestroying = false;
 
-    if (SUCCEEDED (rc))
-    {
-        /* uninit dynamically allocated members of mCallbackData */
-        if (mCallbackData.mpsc.valid)
-        {
-            if (mCallbackData.mpsc.shape != NULL)
-                RTMemFree (mCallbackData.mpsc.shape);
-        }
-        memset (&mCallbackData, 0, sizeof (mCallbackData));    
-    }
-    
     LogFlowThisFuncLeave();
     return rc;