Changeset 7409 in vbox

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

Files:

• include/VBox/VBoxDev.h (modified) (1 diff)
• include/VBox/VBoxGuest.h (modified) (2 diffs)
• src/VBox/Devices/VMMDev/VBoxDev.cpp (modified) (4 diffs)
• src/VBox/Main/GuestImpl.cpp (modified) (2 diffs)
• src/VBox/Main/VMMDevInterface.cpp (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/GuestImpl.h (modified) (4 diffs)

trunk/include/VBox/VBoxDev.h

@@ -61 +61 @@
 /** the guest supports mapping guest to host windows */
 #define VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING     RT_BIT(1)
+/** 
+ * the guest graphical additions are active - used for fast activation
+ * and deactivation of certain graphical operations.
+ * The legacy VMMDevReq_ReportGuestCapabilities request sets this
+ * automatically, but VMMDevReq_SetGuestCapabilities does not. */
+#define VMMDEV_GUEST_SUPPORTS_GRAPHICS                      RT_BIT(2)
 /** @} */
 

trunk/include/VBox/VBoxGuest.h

@@ -149 +149 @@
     VMMDevReq_GetDisplayChangeRequest2   = 54,
     VMMDevReq_ReportGuestCapabilities    = 55,
+    VMMDevReq_SetGuestCapabilities       = 56,
 #ifdef VBOX_HGCM
     VMMDevReq_HGCMConnect                = 60,
@@ -286 +287 @@
     uint32_t    caps;
 } VMMDevReqGuestCapabilities;
+
+/** guest capabilites structure */
+typedef struct
+{
+    /** header */
+    VMMDevRequestHeader header;
+    /** mask of capabilities to be added */
+    uint32_t    u32OrMask;
+    /** mask of capabilities to be removed */
+    uint32_t    u32NotMask;
+} VMMDevReqGuestCapabilities2;
 
 /** idle request structure */

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -521 +521 @@
                 VMMDevReqGuestCapabilities *guestCaps = (VMMDevReqGuestCapabilities*)pRequestHeader;
 
+                /* Enable this automatically for guests using the old
+                   request to report their capabilities. */
+                /** @todo change this when we next bump the interface version */
+                guestCaps->caps |= VMMDEV_GUEST_SUPPORTS_GRAPHICS;
                 if (pData->guestCaps != guestCaps->caps)
                 {
@@ -528 +532 @@
                     LogRel(("Guest Additions capability report: (0x%x) "
                             "VMMDEV_GUEST_SUPPORTS_SEAMLESS: %s "
-                            "VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING: %s\n",
+                            "VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING: %s"
+                            "VMMDEV_GUEST_SUPPORTS_GRAPHICS: %s\n",
                             guestCaps->caps,
                             guestCaps->caps & VMMDEV_GUEST_SUPPORTS_SEAMLESS ? "yes" : "no",
-                            guestCaps->caps & VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING ? "yes" : "no"));
+                            guestCaps->caps & VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING ? "yes" : "no",
+                            guestCaps->caps & VMMDEV_GUEST_SUPPORTS_GRAPHICS ? "yes" : "no"));
 
                     pData->pDrv->pfnUpdateGuestCapabilities(pData->pDrv, guestCaps->caps);
                 }
+                pRequestHeader->rc = VINF_SUCCESS;
+            }
+            break;
+        }
+
+        /* Change guest capabilities */
+        case VMMDevReq_SetGuestCapabilities:
+        {
+            if (pRequestHeader->size != sizeof(VMMDevReqGuestCapabilities2))
+            {
+                AssertMsgFailed(("VMMDev guest caps structure has invalid size!\n"));
+                pRequestHeader->rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                VMMDevReqGuestCapabilities2 *guestCaps = (VMMDevReqGuestCapabilities2*)pRequestHeader;
+
+                pData->guestCaps |= guestCaps->u32OrMask;
+                pData->guestCaps &= ~guestCaps->u32NotMask;
+
+                LogRel(("Guest Additions capability report: (0x%x) "
+                        "VMMDEV_GUEST_SUPPORTS_SEAMLESS: %s "
+                        "VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING: %s"
+                        "VMMDEV_GUEST_SUPPORTS_GRAPHICS: %s\n",
+                        pData->guestCaps,
+                        pData->guestCaps & VMMDEV_GUEST_SUPPORTS_SEAMLESS ? "yes" : "no",
+                        pData->guestCaps & VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING ? "yes" : "no",
+                        pData->guestCaps & VMMDEV_GUEST_SUPPORTS_GRAPHICS ? "yes" : "no"));
+
+                pData->pDrv->pfnUpdateGuestCapabilities(pData->pDrv, pData->guestCaps);
                 pRequestHeader->rc = VINF_SUCCESS;
             }
@@ -2294 +2330 @@
     pData->fu32AdditionsOk = false;
     memset (&pData->guestInfo, 0, sizeof (pData->guestInfo));
-    pData->guestCaps = 0;
 
     memset (&pData->lastReadDisplayChangeRequest, 0, sizeof (pData->lastReadDisplayChangeRequest));
@@ -2316 +2351 @@
     pData->u32NewGuestFilterMask = 0;
     pData->fNewGuestFilterMask   = 0;
+
+    /* This is the default, as Windows and OS/2 guests take this for granted. */
+    /** @todo change this when we next bump the interface version */
+    pData->guestCaps = VMMDEV_GUEST_SUPPORTS_GRAPHICS;
+    pData->pDrv->pfnUpdateGuestCapabilities(pData->pDrv, pData->guestCaps);
 }
 

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;
     };