Changeset 55133 in vbox for trunk

Timestamp:

Apr 8, 2015 1:12:53 PM (10 years ago)

Author:

vboxsync

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

99432

Message:

Main,Frontends: framebuffer identifier.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (3 diffs)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/DisplayImpl.h (modified) (2 diffs)
• Main/src-client/DisplayImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -208 +208 @@
 static ULONG       gcMonitors = 1;
 static ComObjPtr<VBoxSDLFB> gpFramebuffer[64];
+static Bstr gaFramebufferId[64];
 static SDL_Cursor *gpDefaultCursor = NULL;
 #ifdef VBOXSDL_WITH_X11
@@ -2008 +2009 @@
     {
         // register our framebuffer
-        rc = gpDisplay->AttachFramebuffer(i, gpFramebuffer[i]);
+        rc = gpDisplay->AttachFramebuffer(i, gpFramebuffer[i], gaFramebufferId[i].asOutParam());
         if (FAILED(rc))
         {
@@ -3028 +3029 @@
     {
         for (unsigned i = 0; i < gcMonitors; i++)
-            gpDisplay->DetachFramebuffer(i);
+            gpDisplay->DetachFramebuffer(i, gaFramebufferId[i].raw());
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -381 +381 @@
      CComPtr <IUnknown> m_pUnkMarshaler;
 #endif /* Q_OS_WIN */
+     /** Identifier returned by AttachFramebuffer. Used in DetachFramebuffer. */
+     QString m_strFramebufferId;
 };
 
@@ -599 +601 @@
 void UIFrameBufferPrivate::attach()
 {
-    display().AttachFramebuffer(m_uScreenId, CFramebuffer(this));
+    m_strFramebufferId = display().AttachFramebuffer(m_uScreenId, CFramebuffer(this));
 }
 
@@ -606 +608 @@
     CFramebuffer frameBuffer = display().QueryFramebuffer(m_uScreenId);
     if (!frameBuffer.isNull())
-        display().DetachFramebuffer(m_uScreenId);
+    {
+        display().DetachFramebuffer(m_uScreenId, m_strFramebufferId);
+        m_strFramebufferId.clear();
+    }
 }
 

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

@@ -15938 +15938 @@
   <interface
     name="IDisplay" extends="$unknown"
-    uuid="04AA5E91-3816-4990-8C52-59939307E5EF"
+    uuid="94a7faa2-7792-42a3-8535-00770eca1f53"
     wsmap="managed"
     wrap-hint-server-addinterfaces="IEventListener"
@@ -15978 +15978 @@
       <param name="screenId" type="unsigned long" dir="in"/>
       <param name="framebuffer" type="IFramebuffer" dir="in"/>
+      <param name="id" type="uuid" mod="string" dir="return"/>
     </method>
 
@@ -15985 +15986 @@
       </desc>
       <param name="screenId" type="unsigned long" dir="in"/>
+      <param name="id" type="uuid" mod="string" dir="in"/>
     </method>
 

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

@@ -48 +48 @@
 
     ComPtr<IFramebuffer> pFramebuffer;
+    com::Guid framebufferId;
     ComPtr<IDisplaySourceBitmap> pSourceBitmap;
     bool fDisabled;
@@ -225 +226 @@
                                         GuestMonitorStatus_T *aGuestMonitorStatus);
     virtual HRESULT attachFramebuffer(ULONG aScreenId,
-                                      const ComPtr<IFramebuffer> &aFramebuffer);
-    virtual HRESULT detachFramebuffer(ULONG aScreenId);
+                                      const ComPtr<IFramebuffer> &aFramebuffer,
+                                      com::Guid &aId);
+    virtual HRESULT detachFramebuffer(ULONG aScreenId,
+                                      const com::Guid &aId);
     virtual HRESULT queryFramebuffer(ULONG aScreenId,
                                      ComPtr<IFramebuffer> &aFramebuffer);

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

@@ -1602 +1602 @@
 
 
-HRESULT Display::attachFramebuffer(ULONG aScreenId, const ComPtr<IFramebuffer> &aFramebuffer)
+HRESULT Display::attachFramebuffer(ULONG aScreenId, const ComPtr<IFramebuffer> &aFramebuffer, com::Guid &aId)
 {
     LogRelFlowFunc(("aScreenId = %d\n", aScreenId));
@@ -1618 +1618 @@
 
     pFBInfo->pFramebuffer = aFramebuffer;
+    pFBInfo->framebufferId.create();
+    aId = pFBInfo->framebufferId;
 
     SafeArray<FramebufferCapabilities_T> caps;
@@ -1663 +1665 @@
     }
 
-    LogRelFlowFunc(("Attached to %d\n", aScreenId));
+    LogRelFlowFunc(("Attached to %d %RTuuid\n", aScreenId, aId.raw()));
     return S_OK;
 }
 
-HRESULT Display::detachFramebuffer(ULONG aScreenId)
-{
-    LogRelFlowFunc(("aScreenId = %d\n", aScreenId));
+HRESULT Display::detachFramebuffer(ULONG aScreenId, const com::Guid &aId)
+{
+    LogRelFlowFunc(("aScreenId = %d %RTuuid\n", aScreenId, aId.raw()));
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1679 +1681 @@
     DISPLAYFBINFO *pFBInfo = &maFramebuffers[aScreenId];
 
+    if (pFBInfo->framebufferId != aId)
+    {
+        LogRelFlowFunc(("Invalid framebuffer aScreenId = %d, attached %p\n", aScreenId, pFBInfo->framebufferId.raw()));
+        return setError(E_FAIL, tr("DetachFramebuffer: Invalid framebuffer object"));
+    }
+
     pFBInfo->pFramebuffer.setNull();
+    pFBInfo->framebufferId.clear();
 
     alock.release();