Changeset 51436 in vbox for trunk/src/VBox/Main

Timestamp:

May 28, 2014 9:12:15 AM (11 years ago)

Author:

vboxsync

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

93991

Message:

Main,Frontends: IDisplay provides the guest screen bitmap to frontends.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (11 diffs)
• include/ConsoleVRDPServer.h (modified) (1 diff)
• include/DisplayImpl.h (modified) (6 diffs)
• src-client/ConsoleImpl2.cpp (modified) (3 diffs)
• src-client/ConsoleVRDPServer.cpp (modified) (4 diffs)
• src-client/DisplayImpl.cpp (modified) (19 diffs)
• src-client/DisplaySourceBitmapImpl.cpp (added)
• src-client/VMMDevInterface.cpp (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -709 +709 @@
         src-client/ConsoleVRDPServer.cpp \
         src-client/DisplayImpl.cpp \
+        src-client/DisplaySourceBitmapImpl.cpp \
         src-client/EmulatedUSBImpl.cpp \
         src-client/GuestImpl.cpp \

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -15154 +15154 @@
 
   <interface
+    name="IDisplaySourceBitmap" extends="$unknown" wsmap="suppress"
+    uuid="b00907f7-d85e-4dce-b1a6-16a2d91b0269"
+    >
+    <attribute name="screenId" type="unsigned long" readonly="yes"/>
+    <method name="queryBitmapInfo">
+      <desc>Information about the screen bitmap.</desc>
+      <param name="address" type="octet" mod="ptr" dir="out"/>
+      <param name="width" type="unsigned long" dir="out"/>
+      <param name="height" type="unsigned long" dir="out"/>
+      <param name="bitsPerPixel" type="unsigned long" dir="out"/>
+      <param name="bytesPerLine" type="unsigned long" dir="out"/>
+      <param name="pixelFormat" type="unsigned long" dir="out"/>
+    </method>
+
+  </interface>
+
+  <interface
     name="IFramebuffer" extends="$unknown"
-    uuid="e3f122c0-adab-4fc9-a8dc-da112fb48428"
+    uuid="29e4a04d-03a7-4860-977b-a987c3e92c2b"
     wsmap="managed"
     >
@@ -15265 +15282 @@
     </method>
 
+  <!--
     <method name="requestResize" wsmap="suppress">
       <desc>
@@ -15298 +15316 @@
         available or not. If @a pixelFormat is <link
         to="FramebufferPixelFormat_Opaque"/> then direct access to the guest
-        VRAM buffer is not available -- the @a VRAM, @a bitsPerPixel and
+        VRAM buffer is not available - the @a VRAM, @a bitsPerPixel and
         @a bytesPerLine parameters must be ignored and the implementation must use
         the indirect mode (where it provides its own buffer in one of the
@@ -15381 +15399 @@
           <link to="IDisplay::resizeCompleted"/>.
         </desc>
+      </param>
+    </method>
+  -->
+
+    <method name="notifyChange">
+      <desc>
+        Requests a size change.
+      </desc>
+      <param name="screenId" type="unsigned long" dir="in">
+        <desc>
+          Logical guest screen number.
+        </desc>
+      </param>
+      <param name="xOrigin" type="unsigned long" dir="in">
+        <desc>Location of the screen in the guest.</desc>
+      </param>
+      <param name="yOrigin" type="unsigned long" dir="in">
+        <desc>Location of the screen in the guest.</desc>
+      </param>
+      <param name="width" type="unsigned long" dir="in">
+        <desc>Width of the guest display, in pixels.</desc>
+      </param>
+      <param name="height" type="unsigned long" dir="in">
+        <desc>Height of the guest display, in pixels.</desc>
       </param>
     </method>
@@ -15542 +15584 @@
   <interface
     name="IDisplay" extends="$unknown"
-    uuid="480b372c-c0b5-4c23-9bd7-dcbb85b1594c"
+    uuid="efd0567f-8697-4b4c-965a-7f3672d1909e"
     wsmap="managed"
     >
@@ -15556 +15598 @@
       the host computer or an RDP session's display on a remote computer.
     </desc>
+
     <method name="getScreenResolution">
       <desc>Queries display width, height and color depth for given screen.</desc>
@@ -15566 +15609 @@
     </method>
 
-    <method name="setFramebuffer">
-      <desc>
-        Sets the framebuffer for given screen.
+    <method name="attachFramebuffer">
+      <desc>
+        Sets the graphics updates target for a screen.
       </desc>
       <param name="screenId" type="unsigned long" dir="in"/>
@@ -15574 +15617 @@
     </method>
 
-    <method name="getFramebuffer">
-      <desc>
-        Queries the framebuffer for given screen.
+    <method name="detachFramebuffer">
+      <desc>
+        Removes the graphics updates target for a screen.
+      </desc>
+      <param name="screenId" type="unsigned long" dir="in"/>
+    </method>
+
+    <method name="queryFramebuffer">
+      <desc>
+        Queries the graphics updates targets for a screen.
       </desc>
       <param name="screenId" type="unsigned long" dir="in"/>
       <param name="framebuffer" type="IFramebuffer" dir="out"/>
-      <param name="xOrigin" type="long" dir="out"/>
-      <param name="yOrigin" type="long" dir="out"/>
     </method>
 
@@ -15810 +15858 @@
     </method>
 
+  <!--
     <method name="resizeCompleted">
       <desc>
@@ -15821 +15870 @@
       <param name="screenId" type="unsigned long" dir="in"/>
     </method>
+  -->
 
     <method name="completeVHWACommand">
@@ -15868 +15918 @@
       </param>
     </method>
+
+    <method name="querySourceBitmap" wsmap="suppress">
+      <desc>
+         Obtains the guest screen bitmap parameters.
+      </desc>
+      <param name="screenId" type="unsigned long" dir="in"/>
+      <param name="displaySourceBitmap" type="IDisplaySourceBitmap" dir="out"/>
+    </method>
+
   </interface>
 

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

@@ -197 +197 @@
     int m_mousey;
 
-    IFramebuffer *maFramebuffers[SchemaDefs::MaxGuestMonitors];
+    ComPtr<IDisplaySourceBitmap> maSourceBitmaps[SchemaDefs::MaxGuestMonitors];
 
     ComPtr<IEventListener> mConsoleListener;

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

@@ -32 +32 @@
 #endif
 
+#include "DisplaySourceBitmapWrap.h"
+
 class Console;
 struct VIDEORECCONTEXT;
@@ -49 +51 @@
 
     ComPtr<IFramebuffer> pFramebuffer;
+    ComPtr<IDisplaySourceBitmap> pSourceBitmap;
     bool fDisabled;
 
@@ -219 +222 @@
     STDMETHOD(GetScreenResolution)(ULONG aScreenId, ULONG *aWidth, ULONG *aHeight, ULONG *aBitsPerPixel, LONG *aXOrigin, LONG *aYOrigin);
     STDMETHOD(SetFramebuffer)(ULONG aScreenId, IFramebuffer *aFramebuffer);
+    STDMETHOD(AttachFramebuffer)(ULONG aScreenId,
+                                 IFramebuffer *aFramebuffer);
+    STDMETHOD(DetachFramebuffer)(ULONG aScreenId);
+    STDMETHOD(QueryFramebuffer)(ULONG aScreenId,
+                                IFramebuffer **aFramebuffer);
     STDMETHOD(GetFramebuffer)(ULONG aScreenId, IFramebuffer **aFramebuffer, LONG *aXOrigin, LONG *aYOrigin);
     STDMETHOD(SetVideoModeHint)(ULONG aDisplay, BOOL aEnabled, BOOL aChangeOrigin, LONG aOriginX, LONG aOriginY, ULONG aWidth, ULONG aHeight, ULONG aBitsPerPixel);
@@ -232 +240 @@
 
     STDMETHOD(ViewportChanged)(ULONG aScreenId, ULONG x, ULONG y, ULONG width, ULONG height);
+    STDMETHOD(QuerySourceBitmap)(ULONG aScreenId,
+                                 IDisplaySourceBitmap **aDisplaySourceBitmap);
 
     static const PDMDRVREG  DrvReg;
@@ -237 +247 @@
 private:
 
+    HRESULT querySourceBitmap(ULONG aScreenId,
+                              IDisplaySourceBitmap **ppDisplaySourceBitmap);
     int updateDisplayData(void);
 
@@ -423 +435 @@
                    uint8_t fLimitSize);
 
+class ATL_NO_VTABLE DisplaySourceBitmap:
+    public DisplaySourceBitmapWrap
+{
+public:
+
+    DECLARE_EMPTY_CTOR_DTOR(DisplaySourceBitmap)
+
+    HRESULT FinalConstruct();
+    void FinalRelease();
+
+    /* Public initializer/uninitializer for internal purposes only. */
+    HRESULT init(ComObjPtr<Display> pDisplay, unsigned uScreenId, DISPLAYFBINFO *pFBInfo);
+    void uninit();
+
+    bool usesVRAM(void) { return m.pu8Allocated == NULL; }
+
+private:
+    // wrapped IDisplaySourceBitmap properties
+    virtual HRESULT getScreenId(ULONG *aScreenId);
+
+    // wrapped IDisplaySourceBitmap methods
+    virtual HRESULT queryBitmapInfo(BYTE **aAddress,
+                                    ULONG *aWidth,
+                                    ULONG *aHeight,
+                                    ULONG *aBitsPerPixel,
+                                    ULONG *aBytesPerLine,
+                                    ULONG *aPixelFormat);
+
+    int initSourceBitmap(unsigned aScreenId, DISPLAYFBINFO *pFBInfo);
+
+    struct Data
+    {
+        ComObjPtr<Display> pDisplay;
+        unsigned uScreenId;
+        DISPLAYFBINFO *pFBInfo;
+
+        uint8_t *pu8Allocated;
+
+        uint8_t *pu8Address;
+        ULONG ulWidth;
+        ULONG ulHeight;
+        ULONG ulBitsPerPixel;
+        ULONG ulBytesPerLine;
+        ULONG ulPixelFormat;
+    };
+
+    Data m;
+};
+
 #endif // ____H_DISPLAYIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

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

@@ -3406 +3406 @@
             InsertConfigInteger(pCfg, "VMSVGAEnabled", true);
 #ifdef VBOX_WITH_VMSVGA3D
-            IFramebuffer *pFramebuffer = getDisplay()->getFramebuffer();
-            if (pFramebuffer)
+            IFramebuffer *pFramebuffer = NULL;
+            hrc = getDisplay()->QueryFramebuffer(0, &pFramebuffer);
+            if (SUCCEEDED(hrc) && pFramebuffer)
             {
                 LONG64 winId = 0;
@@ -3414 +3415 @@
                 hrc = pFramebuffer->COMGETTER(WinId)(&winId);
                 InsertConfigInteger(pCfg, "HostWindowId", winId);
+                pFramebuffer->Release();
             }
             BOOL f3DEnabled;
@@ -3438 +3440 @@
         /* VESA height reduction */
         ULONG ulHeightReduction;
-        IFramebuffer *pFramebuffer = getDisplay()->getFramebuffer();
-        if (pFramebuffer)
+        IFramebuffer *pFramebuffer = NULL;
+        hrc = getDisplay()->QueryFramebuffer(0, &pFramebuffer);
+        if (SUCCEEDED(hrc) && pFramebuffer)
         {
             hrc = pFramebuffer->COMGETTER(HeightReduction)(&ulHeightReduction);             H();
+            pFramebuffer->Release();
+            pFramebuffer = NULL;
         }
         else

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

@@ -1085 +1085 @@
     bool fAvailable = false;
 
-    IFramebuffer *pfb = NULL;
-    LONG xOrigin = 0;
-    LONG yOrigin = 0;
-
-    server->mConsole->getDisplay()->GetFramebuffer(uScreenId, &pfb, &xOrigin, &yOrigin);
-
-    if (pfb)
-    {
-        pfb->Lock ();
-
-        /* Query framebuffer parameters. */
-        ULONG lineSize = 0;
-        pfb->COMGETTER(BytesPerLine)(&lineSize);
-
-        ULONG bitsPerPixel = 0;
-        pfb->COMGETTER(BitsPerPixel)(&bitsPerPixel);
-
-        BYTE *address = NULL;
-        pfb->COMGETTER(Address)(&address);
-
-        ULONG height = 0;
-        pfb->COMGETTER(Height)(&height);
-
-        ULONG width = 0;
-        pfb->COMGETTER(Width)(&width);
-
-        /* Now fill the information as requested by the caller. */
-        pInfo->pu8Bits = address;
-        pInfo->xOrigin = xOrigin;
-        pInfo->yOrigin = yOrigin;
-        pInfo->cWidth = width;
-        pInfo->cHeight = height;
-        pInfo->cBitsPerPixel = bitsPerPixel;
-        pInfo->cbLine = lineSize;
-
-        pfb->Unlock();
-
-        fAvailable = true;
-    }
-
-    if (server->maFramebuffers[uScreenId])
-    {
-        server->maFramebuffers[uScreenId]->Release();
-    }
-    server->maFramebuffers[uScreenId] = pfb;
+    /* Obtain the new screen bitmap. */
+    HRESULT hr = server->mConsole->getDisplay()->QuerySourceBitmap(uScreenId, server->maSourceBitmaps[uScreenId].asOutParam());
+    if (SUCCEEDED(hr))
+    {
+        LONG xOrigin = 0;
+        LONG yOrigin = 0;
+        BYTE *pAddress = NULL;
+        ULONG ulWidth = 0;
+        ULONG ulHeight = 0;
+        ULONG ulBitsPerPixel = 0;
+        ULONG ulBytesPerLine = 0;
+        ULONG ulPixelFormat = 0;
+
+        hr = server->maSourceBitmaps[uScreenId]->QueryBitmapInfo(&pAddress,
+                                                                 &ulWidth,
+                                                                 &ulHeight,
+                                                                 &ulBitsPerPixel,
+                                                                 &ulBytesPerLine,
+                                                                 &ulPixelFormat);
+
+        if (SUCCEEDED(hr))
+        {
+            hr = server->mConsole->getDisplay()->GetScreenResolution(uScreenId, NULL, NULL, NULL,
+                                                                     &xOrigin, &yOrigin);
+
+            if (SUCCEEDED(hr))
+            {
+                /* Now fill the information as requested by the caller. */
+                pInfo->pu8Bits = pAddress;
+                pInfo->xOrigin = xOrigin;
+                pInfo->yOrigin = yOrigin;
+                pInfo->cWidth = ulWidth;
+                pInfo->cHeight = ulHeight;
+                pInfo->cBitsPerPixel = ulBitsPerPixel;
+                pInfo->cbLine = ulBytesPerLine;
+
+                fAvailable = true;
+            }
+        }
+    }
 
     return fAvailable;
@@ -1136 +1131 @@
 DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackFramebufferLock(void *pvCallback, unsigned uScreenId)
 {
-    ConsoleVRDPServer *server = static_cast<ConsoleVRDPServer*>(pvCallback);
-
-    if (server->maFramebuffers[uScreenId])
-    {
-        server->maFramebuffers[uScreenId]->Lock();
-    }
+    NOREF(pvCallback);
+    NOREF(uScreenId);
+    /* Do nothing */
 }
 
 DECLCALLBACK(void) ConsoleVRDPServer::VRDPCallbackFramebufferUnlock(void *pvCallback, unsigned uScreenId)
 {
-    ConsoleVRDPServer *server = static_cast<ConsoleVRDPServer*>(pvCallback);
-
-    if (server->maFramebuffers[uScreenId])
-    {
-        server->maFramebuffers[uScreenId]->Unlock();
-    }
+    NOREF(pvCallback);
+    NOREF(uScreenId);
+    /* Do nothing */
 }
 
@@ -1408 +1397 @@
     m_InputSynch.fClientScrollLock = false;
 
-    RT_ZERO(maFramebuffers);
-
     {
         ComPtr<IEventSource> es;
@@ -1467 +1454 @@
 
     unsigned i;
-    for (i = 0; i < RT_ELEMENTS(maFramebuffers); i++)
-    {
-        if (maFramebuffers[i])
-        {
-            maFramebuffers[i]->Release();
-            maFramebuffers[i] = NULL;
-        }
+    for (i = 0; i < RT_ELEMENTS(maSourceBitmaps); i++)
+    {
+        maSourceBitmaps[i].setNull();
     }
 

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

@@ -855 +855 @@
     Assert (pFramebuffer);
 
+    NOREF(pixelFormat);
+    NOREF(pvVRAM);
+    NOREF(bpp);
+    NOREF(cbLine);
+
     /* Call the framebuffer to try and set required pixelFormat. */
-    BOOL finished = TRUE;
-
-    pFramebuffer->RequestResize (uScreenId, pixelFormat, (BYTE *) pvVRAM,
-                                 bpp, cbLine, w, h, &finished);
-
-    if (!finished)
-    {
-        LogRelFlowFunc(("External framebuffer wants us to wait!\n"));
-        return VINF_VGA_RESIZE_IN_PROGRESS;
-    }
+    HRESULT hr = pFramebuffer->NotifyChange(uScreenId, 0, 0, w, h); /* @todo origin */
+
+    Log(("pFramebuffer->NotifyChange hr %08x\n", hr));
 
     return VINF_SUCCESS;
@@ -939 +937 @@
 
     /* If there is no framebuffer, this call is not interesting. */
-    if (   uScreenId >= mcMonitors
-        || maFramebuffers[uScreenId].pFramebuffer.isNull())
+    if (uScreenId >= mcMonitors)
     {
         return VINF_SUCCESS;
@@ -953 +950 @@
         mLastHeight = h;
         mLastFlags = flags;
+
+        DISPLAYFBINFO *pFBInfo = &maFramebuffers[uScreenId];
+        pFBInfo->w = w;
+        pFBInfo->h = h;
+
+        pFBInfo->u16BitsPerPixel = (uint16_t)bpp;
+        pFBInfo->pu8FramebufferVRAM = (uint8_t *)pvVRAM;
+        pFBInfo->u32LineSize = cbLine;
+    }
+
+    if (maFramebuffers[uScreenId].pFramebuffer.isNull())
+    {
+        return VINF_SUCCESS;
     }
 
@@ -1001 +1011 @@
     /* Framebuffer will be invalid during resize, make sure that it is not accessed. */
     if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
-        mpDrv->pUpPort->pfnSetRenderVRAM (mpDrv->pUpPort, false);
+    {
+        mpDrv->pUpPort->pfnSetRenderVRAM(mpDrv->pUpPort, false);
+
+        mpDrv->IConnector.pu8Data    = NULL;
+        mpDrv->IConnector.cbScanline = 0;
+        mpDrv->IConnector.cBits      = 32; /* DevVGA does not work with cBits == 0. */
+        mpDrv->IConnector.cx         = 0;
+        mpDrv->IConnector.cy         = 0;
+    }
+
+    maFramebuffers[uScreenId].pSourceBitmap.setNull();
 
     int rc = callFramebufferResize (maFramebuffers[uScreenId].pFramebuffer, uScreenId,
@@ -1082 +1102 @@
         if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN && !pFBInfo->pFramebuffer.isNull())
         {
-            /* Primary framebuffer has completed the resize. Update the connector data for VGA device. */
-            int rc2 = updateDisplayData();
-
-            /* Check the framebuffer pixel format to setup the rendering in VGA device. */
-            BOOL usesGuestVRAM = FALSE;
-            pFBInfo->pFramebuffer->COMGETTER(UsesGuestVRAM) (&usesGuestVRAM);
-
-            pFBInfo->fDefaultFormat = (usesGuestVRAM == FALSE);
-
-            /* If the primary framebuffer is disabled, tell the VGA device to not to copy
-             * pixels from VRAM to the framebuffer.
-             */
-            if (pFBInfo->fDisabled || RT_FAILURE(rc2))
-                mpDrv->pUpPort->pfnSetRenderVRAM (mpDrv->pUpPort, false);
-            else
-                mpDrv->pUpPort->pfnSetRenderVRAM (mpDrv->pUpPort,
-                                                  pFBInfo->fDefaultFormat);
-
             /* If the screen resize was because of disabling, tell framebuffer to repaint.
              * The framebuffer if now in default format so it will not use guest VRAM
@@ -1109 +1111 @@
         else if (!pFBInfo->pFramebuffer.isNull())
         {
-            BOOL usesGuestVRAM = FALSE;
-            pFBInfo->pFramebuffer->COMGETTER(UsesGuestVRAM) (&usesGuestVRAM);
-
-            pFBInfo->fDefaultFormat = (usesGuestVRAM == FALSE);
-
             /* If the screen resize was because of disabling, tell framebuffer to repaint.
              * The framebuffer if now in default format so it will not use guest VRAM
@@ -2386 +2383 @@
     if (aScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
     {
-        CHECK_CONSOLE_DRV(mpDrv);
-
-        u32Width = mpDrv->IConnector.cx;
-        u32Height = mpDrv->IConnector.cy;
-        int rc = mpDrv->pUpPort->pfnQueryColorDepth(mpDrv->pUpPort, &u32BitsPerPixel);
-        AssertRC(rc);
+        if (mpDrv)
+        {
+            u32Width = mpDrv->IConnector.cx;
+            u32Height = mpDrv->IConnector.cy;
+            int rc = mpDrv->pUpPort->pfnQueryColorDepth(mpDrv->pUpPort, &u32BitsPerPixel);
+            AssertRC(rc);
+        }
     }
     else if (aScreenId < mcMonitors)
@@ -2478 +2476 @@
         ComAssertRCRet (vrc, E_FAIL);
     }
+
+    return S_OK;
+}
+
+STDMETHODIMP Display::AttachFramebuffer(ULONG aScreenId,
+                                        IFramebuffer *aFramebuffer)
+{
+    LogRelFlowFunc(("aScreenId = %d\n", aScreenId));
+
+    CheckComArgPointerValid(aFramebuffer);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc()))
+        return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (aScreenId >= mcMonitors)
+        return setError(E_INVALIDARG, tr("AttachFramebuffer: Invalid screen %d (total %d)"),
+                        aScreenId, mcMonitors);
+
+    DISPLAYFBINFO *pFBInfo = &maFramebuffers[aScreenId];
+    if (!pFBInfo->pFramebuffer.isNull())
+        return setError(E_FAIL, tr("AttachFramebuffer: Framebuffer already attached to %d"),
+                        aScreenId);
+
+    pFBInfo->pFramebuffer = aFramebuffer;
+
+    /* The driver might not have been constructed yet */
+    if (mpDrv)
+    {
+        /* Setup the new framebuffer, the resize will lead to an updateDisplayData call. */
+
+#if defined(VBOX_WITH_CROGL)
+        /* Release the lock, because SHCRGL_HOST_FN_SCREEN_CHANGED will read current framebuffer */
+        /* @todo investigate */
+        {
+            BOOL is3denabled;
+            mParent->machine()->COMGETTER(Accelerate3DEnabled)(&is3denabled);
+
+            if (is3denabled)
+            {
+                alock.release();
+            }
+        }
+#endif
+
+        /* @todo generic code for all monitors. */
+        if (pFBInfo->fVBVAEnabled && pFBInfo->pu8FramebufferVRAM)
+        {
+            /* This display in VBVA mode. Resize it to the last guest resolution,
+             * if it has been reported.
+             */
+            handleDisplayResize(aScreenId, pFBInfo->u16BitsPerPixel,
+                                pFBInfo->pu8FramebufferVRAM,
+                                pFBInfo->u32LineSize,
+                                pFBInfo->w,
+                                pFBInfo->h,
+                                pFBInfo->flags);
+        }
+        else if (aScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
+        {
+            /* VGA device mode, only for the primary screen. */
+            handleDisplayResize(VBOX_VIDEO_PRIMARY_SCREEN, mLastBitsPerPixel,
+                                mLastAddress,
+                                mLastBytesPerLine,
+                                mLastWidth,
+                                mLastHeight,
+                                mLastFlags);
+        }
+    }
+
+    LogRelFlowFunc(("Attached to %d\n", aScreenId));
+    return S_OK;
+}
+
+STDMETHODIMP Display::DetachFramebuffer(ULONG aScreenId)
+{
+    LogRelFlowFunc(("aScreenId = %d\n", aScreenId));
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc()))
+        return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (aScreenId >= mcMonitors)
+        return setError(E_INVALIDARG, tr("DetachFramebuffer: Invalid screen %d (total %d)"),
+                        aScreenId, mcMonitors);
+
+    DISPLAYFBINFO *pFBInfo = &maFramebuffers[aScreenId];
+
+    pFBInfo->pFramebuffer.setNull();
+
+    return S_OK;
+}
+
+STDMETHODIMP Display::QueryFramebuffer(ULONG aScreenId,
+                                       IFramebuffer **aFramebuffer)
+{
+    LogRelFlowFunc(("aScreenId = %d\n", aScreenId));
+
+    CheckComArgOutPointerValid(aFramebuffer);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc()))
+        return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (aScreenId >= mcMonitors)
+        return setError(E_INVALIDARG, tr("QueryFramebuffer: Invalid screen %d (total %d)"),
+                        aScreenId, mcMonitors);
+
+    DISPLAYFBINFO *pFBInfo = &maFramebuffers[aScreenId];
+
+    *aFramebuffer = pFBInfo->pFramebuffer;
+    if (!pFBInfo->pFramebuffer.isNull())
+        pFBInfo->pFramebuffer->AddRef();
 
     return S_OK;
@@ -3239 +3356 @@
                     && !pFBInfo->fDisabled)
                 {
-                    address = NULL;
-                    HRESULT hrc = pFBInfo->pFramebuffer->COMGETTER(Address) (&address);
-                    if (SUCCEEDED(hrc) && address != NULL)
+                    BYTE *pAddress = NULL;
+                    ULONG ulWidth = 0;
+                    ULONG ulHeight = 0;
+                    ULONG ulBitsPerPixel = 0;
+                    ULONG ulBytesPerLine = 0;
+                    ULONG ulPixelFormat = 0;
+
+                    HRESULT hrc = pFBInfo->pSourceBitmap->QueryBitmapInfo(&pAddress,
+                                                                          &ulWidth,
+                                                                          &ulHeight,
+                                                                          &ulBitsPerPixel,
+                                                                          &ulBytesPerLine,
+                                                                          &ulPixelFormat);
+                    if (SUCCEEDED(hrc))
                     {
                         pu8Src       = pFBInfo->pu8FramebufferVRAM;
@@ -3252 +3380 @@
 
                         /* Default format is 32 bpp. */
-                        pu8Dst             = address;
+                        pu8Dst             = pAddress;
                         xDst                = xSrc;
                         yDst                = ySrc;
@@ -3374 +3502 @@
                  * When framebuffer uses VRAM directly, just notify it to update.
                  */
-                if (pFBInfo->fDefaultFormat)
+                if (pFBInfo->fDefaultFormat && !pFBInfo->pSourceBitmap.isNull())
                 {
-                    BYTE *address = NULL;
-                    ULONG uWidth = 0;
-                    ULONG uHeight = 0;
-                    pFBInfo->pFramebuffer->COMGETTER(Width) (&uWidth);
-                    pFBInfo->pFramebuffer->COMGETTER(Height) (&uHeight);
-                    HRESULT hrc = pFBInfo->pFramebuffer->COMGETTER(Address) (&address);
-                    if (SUCCEEDED(hrc) && address != NULL)
+                    BYTE *pAddress = NULL;
+                    ULONG ulWidth = 0;
+                    ULONG ulHeight = 0;
+                    ULONG ulBitsPerPixel = 0;
+                    ULONG ulBytesPerLine = 0;
+                    ULONG ulPixelFormat = 0;
+
+                    HRESULT hrc = pFBInfo->pSourceBitmap->QueryBitmapInfo(&pAddress,
+                                                                          &ulWidth,
+                                                                          &ulHeight,
+                                                                          &ulBitsPerPixel,
+                                                                          &ulBytesPerLine,
+                                                                          &ulPixelFormat);
+                    if (SUCCEEDED(hrc))
                     {
                         uint32_t width              = pFBInfo->w;
@@ -3396 +3531 @@
 
                         /* Default format is 32 bpp. */
-                        uint8_t *pu8Dst             = address;
+                        uint8_t *pu8Dst             = pAddress;
                         int32_t xDst                = xSrc;
                         int32_t yDst                = ySrc;
@@ -3408 +3543 @@
                          * copyrect should not be called.
                          */
-                        if (uWidth == pFBInfo->w && uHeight == pFBInfo->h)
+                        if (ulWidth == pFBInfo->w && ulHeight == pFBInfo->h)
                         {
 
@@ -3549 +3684 @@
 }
 
+STDMETHODIMP Display::QuerySourceBitmap(ULONG aScreenId,
+                                        IDisplaySourceBitmap **aDisplaySourceBitmap)
+{
+    LogRelFlowFunc(("aScreenId = %d\n", aScreenId));
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    Console::SafeVMPtr ptrVM(mParent);
+    if (!ptrVM.isOk())
+        return ptrVM.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (aScreenId >= mcMonitors)
+        return setError(E_INVALIDARG, tr("QuerySourceBitmap: Invalid screen %d (total %d)"),
+                        aScreenId, mcMonitors);
+
+    HRESULT hr = querySourceBitmap(aScreenId, aDisplaySourceBitmap);
+
+    alock.release();
+
+    LogRelFlowFunc(("%Rhrc\n", hr));
+    return hr;
+}
+
 // private methods
 /////////////////////////////////////////////////////////////////////////////
+
+HRESULT Display::querySourceBitmap(ULONG aScreenId,
+                                   IDisplaySourceBitmap **ppDisplaySourceBitmap)
+{
+    HRESULT hr = S_OK;
+
+    DISPLAYFBINFO *pFBInfo = &maFramebuffers[aScreenId];
+    if (pFBInfo->pSourceBitmap.isNull())
+    {
+        /* Create a new object. */
+        ComObjPtr<DisplaySourceBitmap> obj;
+        hr = obj.createObject();
+        if (SUCCEEDED(hr))
+        {
+            hr = obj->init(this, aScreenId, pFBInfo);
+        }
+
+        if (SUCCEEDED(hr))
+        {
+            pFBInfo->pSourceBitmap = obj;
+
+            /* Whether VRAM must be copied to the internal buffer. */
+            pFBInfo->fDefaultFormat = !obj->usesVRAM();
+
+            if (aScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
+            {
+                /* Start buffer updates. */
+                BYTE *pAddress = NULL;
+                ULONG ulWidth = 0;
+                ULONG ulHeight = 0;
+                ULONG ulBitsPerPixel = 0;
+                ULONG ulBytesPerLine = 0;
+                ULONG ulPixelFormat = 0;
+
+                obj->QueryBitmapInfo(&pAddress,
+                                     &ulWidth,
+                                     &ulHeight,
+                                     &ulBitsPerPixel,
+                                     &ulBytesPerLine,
+                                     &ulPixelFormat);
+
+                mpDrv->IConnector.pu8Data    = pAddress;
+                mpDrv->IConnector.cbScanline = ulBytesPerLine;
+                mpDrv->IConnector.cBits      = ulBitsPerPixel;
+                mpDrv->IConnector.cx         = ulWidth;
+                mpDrv->IConnector.cy         = ulHeight;
+
+                if (pFBInfo->fDefaultFormat)
+                    mpDrv->pUpPort->pfnSetRenderVRAM(mpDrv->pUpPort, true);
+            }
+
+            if (pFBInfo->fDefaultFormat)
+            {
+                /* @todo make sure that the bitmap contains the latest image? */
+            }
+        }
+    }
+
+    if (SUCCEEDED(hr))
+    {
+        pFBInfo->pSourceBitmap->AddRef();
+        *ppDisplaySourceBitmap = pFBInfo->pSourceBitmap;
+    }
+
+    return hr;
+}
 
 /**
@@ -3848 +4075 @@
     unsigned uScreenId;
 
-    Log2(("DisplayRefreshCallback\n"));
     for (uScreenId = 0; uScreenId < pDisplay->mcMonitors; uScreenId++)
     {
@@ -3895 +4121 @@
                 if (!pFBInfo->pFramebuffer.isNull() && pFBInfo->u32ResizeStatus == ResizeStatus_Void)
                 {
-                    Assert(pDrv->IConnector.pu8Data);
                     pDisplay->vbvaLock();
                     pDrv->pUpPort->pfnUpdateDisplay(pDrv->pUpPort);
@@ -4742 +4967 @@
             {
                 /* Render VRAM content to the framebuffer. */
-                BYTE *address = NULL;
-                HRESULT hrc = pFBInfo->pFramebuffer->COMGETTER(Address) (&address);
-                if (SUCCEEDED(hrc) && address != NULL)
+                BYTE *pAddress = NULL;
+                ULONG ulWidth = 0;
+                ULONG ulHeight = 0;
+                ULONG ulBitsPerPixel = 0;
+                ULONG ulBytesPerLine = 0;
+                ULONG ulPixelFormat = 0;
+
+                HRESULT hrc = pFBInfo->pSourceBitmap->QueryBitmapInfo(&pAddress,
+                                                                      &ulWidth,
+                                                                      &ulHeight,
+                                                                      &ulBitsPerPixel,
+                                                                      &ulBytesPerLine,
+                                                                      &ulPixelFormat);
+                if (SUCCEEDED(hrc))
                 {
                     uint32_t width              = pCmd->w;
@@ -4757 +4993 @@
                     uint32_t u32SrcBitsPerPixel = pFBInfo->u16BitsPerPixel;
 
-                    uint8_t *pu8Dst             = address;
+                    uint8_t *pu8Dst             = pAddress;
                     int32_t xDst                = xSrc;
                     int32_t yDst                = ySrc;
@@ -5218 +5454 @@
     pThis->pDisplay = pDisplay;
     pThis->pDisplay->mpDrv = pThis;
-    /*
-     * Update our display information according to the framebuffer
-     */
-    pDisplay->updateDisplayData();
+
+    /* Disable VRAM to a buffer copy initially. */
+    pThis->pUpPort->pfnSetRenderVRAM (pThis->pUpPort, false);
+    pThis->IConnector.cBits = 32; /* DevVGA does nothing otherwise. */
 
     /*

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

@@ -400 +400 @@
 #endif
     IFramebuffer *framebuffer = NULL;
-    LONG xOrigin = 0;
-    LONG yOrigin = 0;
-    HRESULT hrc = pConsole->getDisplay()->GetFramebuffer(display, &framebuffer, &xOrigin, &yOrigin);
+    HRESULT hrc = pConsole->getDisplay()->QueryFramebuffer(display, &framebuffer);
     if (SUCCEEDED(hrc) && framebuffer)
     {
@@ -425 +423 @@
     if (!heightReduction)
         return VERR_INVALID_PARAMETER;
-    IFramebuffer *framebuffer = pConsole->getDisplay()->getFramebuffer();
-    if (framebuffer)
+    IFramebuffer *framebuffer = NULL;
+    HRESULT hrc = pConsole->getDisplay()->QueryFramebuffer(0, &framebuffer);
+    if (SUCCEEDED(hrc) && framebuffer)
+    {
         framebuffer->COMGETTER(HeightReduction)((ULONG*)heightReduction);
+        framebuffer->Release();
+    }
     else
         *heightReduction = 0;