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

Timestamp:

Mar 10, 2008 2:50:08 PM (17 years ago)

Author:

vboxsync

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

28842

Message:

VMMDev: added VMMDEV_GUEST_SUPPORTS_GRAPHICS capability, enabled by default, to distinguish cases where the guest additions are loaded but graphics are not supported

Location:

trunk/src/VBox/Main

Files:

• GuestImpl.cpp (modified) (2 diffs)
• VMMDevInterface.cpp (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/GuestImpl.h (modified) (4 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -172 +172 @@
 }
 
+STDMETHODIMP Guest::COMGETTER(SupportsGraphics) (BOOL *aSupportsGraphics)
+{
+    if (!aSupportsGraphics)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    *aSupportsGraphics = mData.mSupportsGraphics;
+
+    return S_OK;
+}
+
 STDMETHODIMP Guest::COMGETTER(MemoryBalloonSize) (ULONG *aMemoryBalloonSize)
 {
@@ -327 +342 @@
     mData.mSupportsSeamless = aSupportsSeamless;
 }
+
+void Guest::setSupportsGraphics (BOOL aSupportsGraphics)
+{
+    AutoCaller autoCaller (this);
+    AssertComRCReturnVoid (autoCaller.rc());
+
+    AutoLock alock (this);
+
+    mData.mSupportsGraphics = aSupportsGraphics;
+}

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -202 +202 @@
         return;
 
-    Assert(!(newCapabilities & ~VMMDEV_GUEST_SUPPORTS_SEAMLESS));
-
     guest->setSupportsSeamless(BOOL (newCapabilities & VMMDEV_GUEST_SUPPORTS_SEAMLESS));
+    guest->setSupportsGraphics(BOOL (newCapabilities & VMMDEV_GUEST_SUPPORTS_GRAPHICS));
 
     /*

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

@@ -5139 +5139 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="c101f037-b03d-4bd4-bd25-381123980be2"
+     uuid="d8556fca-81bc-12af-fca3-365528fa38ca"
+
      wsmap="suppress"
      >
@@ -5188 +5189 @@
         Flag whether seamless guest display rendering (seamless desktop
         integration) is supported.
+      </desc>
+    </attribute>
+
+    <attribute name="supportsGraphics" type="boolean" readonly="yes">
+      <desc>
+        Flag whether the guest is in graphics mode.  If it is not, then
+        seamless rendering will not work, resize hints are not immediately
+        acted on and guest display resizes are probably not initiated by
+        the guest additions.
       </desc>
     </attribute>

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

@@ -58 +58 @@
     STDMETHOD(COMGETTER(AdditionsVersion)) (BSTR *aAdditionsVersion);
     STDMETHOD(COMGETTER(SupportsSeamless)) (BOOL *aSupportsSeamless);
+    STDMETHOD(COMGETTER(SupportsGraphics)) (BOOL *aSupportsGraphics);
     STDMETHOD(COMGETTER(MemoryBalloonSize)) (ULONG *aMemoryBalloonSize);
     STDMETHOD(COMSETTER(MemoryBalloonSize)) (ULONG aMemoryBalloonSize);
@@ -73 +74 @@
     void setSupportsSeamless (BOOL aSupportsSeamless);
 
+    void setSupportsGraphics (BOOL aSupportsGraphics);
+
     STDMETHOD(SetStatistic)(ULONG aCpuId, GuestStatisticType_T aStatistic, ULONG aStatVal);
 
@@ -82 +85 @@
     struct Data
     {
-        Data() : mAdditionsActive (FALSE), mSupportsSeamless (FALSE) {}
+        Data() : mAdditionsActive (FALSE), mSupportsSeamless (FALSE),
+                  /* Windows and OS/2 guests take this for granted */
+                 mSupportsGraphics (TRUE) {}
 
         Bstr  mOSTypeId;
@@ -88 +93 @@
         Bstr  mAdditionsVersion;
         BOOL  mSupportsSeamless;
+        BOOL  mSupportsGraphics;
     };