Changeset 31798 in vbox for trunk

Timestamp:

Aug 19, 2010 6:08:55 PM (15 years ago)

Author:

vboxsync

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

64990

Message:

VBoxHeadless: install null framebuffer in any case

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• NullFramebuffer.h (added)
• VBoxHeadless.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -67 +67 @@
 #endif
 
+#include "NullFramebuffer.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -89 +90 @@
 static VNCFB *g_pFramebufferVNC;
 #endif
-
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -907 +907 @@
         machine->COMGETTER(MonitorCount)(&cMonitors);
 
+        unsigned uScreenId;
 #ifdef VBOX_WITH_VRDP
-        unsigned uScreenId;
         for (uScreenId = 0; uScreenId < cMonitors; uScreenId++)
         {
@@ -939 +939 @@
         }
 #endif
+        // fill in remaining slots with null framebuffers
+        for (uScreenId = 0; uScreenId < cMonitors; uScreenId++)
+        {
+            ComPtr<IFramebuffer> fb;
+            LONG xOrigin, yOrigin;
+            HRESULT hrc2 = display->GetFramebuffer(uScreenId,
+                                                   fb.asOutParam(),
+                                                   &xOrigin, &yOrigin);
+            if (hrc2 == S_OK && fb.isNull())
+            {
+                NullFB *pNullFB =  new NullFB();
+                pNullFB->AddRef();
+                pNullFB->init();
+                display->SetFramebuffer(uScreenId, pNullFB);
+            }
+        }
 
         /* get the machine debugger (isn't necessarily available) */
@@ -1215 +1231 @@
 }
 #endif /* !VBOX_WITH_HARDENING */
+
+#ifdef VBOX_WITH_XPCOM
+NS_DECL_CLASSINFO(NullFB)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(NullFB, IFramebuffer)
+#endif