Changeset 51525 in vbox for trunk/src/VBox

Timestamp:

Jun 4, 2014 8:32:22 AM (11 years ago)

Author:

vboxsync

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

94154

Message:

DisplayImpl: notify framebuffer about VM shutdown.

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (2 diffs)
• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -215 +215 @@
     void VideoCaptureStop();
     int  VideoCaptureEnableScreens(ComSafeArrayIn(BOOL, aScreens));
+
+    void notifyPowerDown(void);
 
     // IEventListener methods
@@ -331 +333 @@
     DISPLAYFBINFO maFramebuffers[SchemaDefs::MaxGuestMonitors];
 
+    bool mfSourceBitmapEnabled;
+
     /* arguments of the last handleDisplayResize() call */
     void       *mLastAddress;

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -7350 +7350 @@
      * safe to release the object lock now if needed)
      * ---------------------------------------------------------------------- */
+
+    if (mDisplay)
+    {
+        alock.release();
+
+        mDisplay->notifyPowerDown();
+
+        alock.acquire();
+    }
 
     /* Stop the VRDP server to prevent new clients connection while VM is being

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -597 +597 @@
 
     unconst(mParent) = aParent;
+
+    mfSourceBitmapEnabled = true;
 
     ULONG ul;
@@ -2366 +2368 @@
 }
 
+void Display::notifyPowerDown(void)
+{
+    LogRelFlowFunc(("\n"));
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    /* Source bitmaps are not available anymore. */
+    mfSourceBitmapEnabled = false;
+
+    /* Resize all displays to tell framebuffers to forget current source bitmap. */
+    unsigned uScreenId = mcMonitors;
+    while (uScreenId > 0)
+    {
+        --uScreenId;
+
+        DISPLAYFBINFO *pFBInfo = &maFramebuffers[uScreenId];
+        if (!pFBInfo->fDisabled)
+        {
+            handleDisplayResize(uScreenId, 32,
+                                NULL,
+                                0,
+                                pFBInfo->w,
+                                pFBInfo->h,
+                                0);
+        }
+    }
+}
+
 // IDisplay methods
 /////////////////////////////////////////////////////////////////////////////
@@ -3728 +3758 @@
 {
     HRESULT hr = S_OK;
+
+    if (!mfSourceBitmapEnabled)
+    {
+        *ppDisplaySourceBitmap = NULL;
+        return E_FAIL;
+    }
 
     DISPLAYFBINFO *pFBInfo = &maFramebuffers[aScreenId];