Changeset 8312 in vbox for trunk/src/VBox

Timestamp:

Apr 22, 2008 9:04:44 PM (17 years ago)

Author:

vboxsync

Message:

Devices/VMMDev, Frontends/VBoxBFE, Main: add a guest request to report the maximum resolution currently supported by the additions - host side

Location:

trunk/src/VBox

Files:

• Devices/VMMDev/VBoxDev.cpp (modified) (6 diffs)
• Devices/VMMDev/VMMDevState.h (modified) (1 diff)
• Frontends/VBoxBFE/VMMDevInterface.cpp (modified) (1 diff)
• Main/GuestImpl.cpp (modified) (1 diff)
• Main/VMMDevInterface.cpp (modified) (2 diffs)
• Main/include/GuestImpl.h (modified) (3 diffs)

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

@@ -572 +572 @@
 
                 pData->pDrv->pfnUpdateGuestCapabilities(pData->pDrv, pData->guestCaps);
+                pRequestHeader->rc = VINF_SUCCESS;
+            }
+            break;
+        }
+
+        case VMMDevReq_SetMaxGuestResolution:
+        {
+            if (pRequestHeader->size != sizeof(VMMDevReqGuestResolution))
+            {
+                AssertMsgFailed(("VMMDev guest resolution structure has invalid size!\n"));
+                pRequestHeader->rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                VMMDevReqGuestResolution *guestRes = (VMMDevReqGuestResolution*)pRequestHeader;
+
+                pData->u32MaxGuestWidth  = guestRes->u32MaxWidth;
+                pData->u32MaxGuestHeight = guestRes->u32MaxHeight;
+
+                LogRel(("Guest Additions maximum resolution of %dx%d reported\n",
+                        pData->u32MaxGuestWidth, pData->u32MaxGuestHeight));
+
+                /* Only notify frontends that are interested (i.e. Main, but not BFE) */
+                if (NULL != pData->pDrv->pfnUpdateMaxGuestResolution)
+                    pData->pDrv->pfnUpdateMaxGuestResolution(pData->pDrv, pData->u32MaxGuestWidth, pData->u32MaxGuestHeight);
                 pRequestHeader->rc = VINF_SUCCESS;
             }
@@ -1947 +1972 @@
 
 
-#define VMMDEV_SSM_VERSION  6
+#define VMMDEV_SSM_VERSION  7
 
 /**
@@ -1978 +2003 @@
     SSMR3PutU32(pSSMHandle, pData->guestCaps);
 
+    SSMR3PutU32(pSSMHandle, pData->u32MaxGuestWidth);
+    SSMR3PutU32(pSSMHandle, pData->u32MaxGuestHeight);
+
 #ifdef VBOX_HGCM
     vmmdevHGCMSaveState (pData, pSSMHandle);
@@ -2017 +2045 @@
     SSMR3GetU32(pSSMHandle, &pData->guestCaps);
 
+    SSMR3GetU32(pSSMHandle, &pData->u32MaxGuestWidth);
+    SSMR3GetU32(pSSMHandle, &pData->u32MaxGuestHeight);
+
 #ifdef VBOX_HGCM
     vmmdevHGCMLoadState (pData, pSSMHandle);
@@ -2046 +2077 @@
     if (pData->pDrv)
         pData->pDrv->pfnUpdateGuestCapabilities(pData->pDrv, pData->guestCaps);
+
+    if (    pData->pDrv && pData->pDrv->pfnUpdateMaxGuestResolution)
+        pData->pDrv->pfnUpdateMaxGuestResolution(pData->pDrv, pData->u32MaxGuestWidth, pData->u32MaxGuestHeight);
 
     return VINF_SUCCESS;
@@ -2319 +2353 @@
     pData->fu32AdditionsOk = false;
     memset (&pData->guestInfo, 0, sizeof (pData->guestInfo));
+
+    /* No maximum resolution specified yet */
+    pData->u32MaxGuestWidth  = 0;
+    pData->u32MaxGuestHeight = 0;
 
     memset (&pData->lastReadDisplayChangeRequest, 0, sizeof (pData->lastReadDisplayChangeRequest));

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -108 +108 @@
     uint32_t u32VideoAccelEnabled;
 
+    /** Maximum guest resolution, width - a value of 0 mean no maximum */
+    uint32_t u32MaxGuestWidth;
+    /** Maximum guest resolution, height - a value of 0 mean no maximum */
+    uint32_t u32MaxGuestHeight;
+
     /** resolution change request */
     struct

trunk/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp

@@ -421 +421 @@
     pData->Connector.pfnUpdateGuestVersion      = VMMDev::UpdateGuestVersion;
     pData->Connector.pfnUpdateGuestCapabilities = VMMDev::UpdateGuestCapabilities;
+    pData->Connector.pfnUpdateMaxGuestResolution = NULL;
     pData->Connector.pfnUpdateMouseCapabilities = VMMDev::UpdateMouseCapabilities;
     pData->Connector.pfnUpdatePointerShape      = VMMDev::UpdatePointerShape;

trunk/src/VBox/Main/GuestImpl.cpp

@@ -337 +337 @@
 }
 
+void Guest::setMaxGuestResolution (ULONG aMaxWidth, ULONG aMaxHeight)
+{
+    AutoCaller autoCaller (this);
+    AssertComRCReturnVoid (autoCaller.rc());
+
+    AutoWriteLock alock (this);
+
+    mData.mMaxWidth  = aMaxWidth;
+    mData.mMaxHeight = aMaxHeight;
+}
+
 void Guest::setSupportsSeamless (BOOL aSupportsSeamless)
 {

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -215 +215 @@
     pDrv->pVMMDev->getParent()->onAdditionsStateChange();
     
+}
+
+/**
+ * Update the maximum guest resolution.
+ * This is called when the guest sends us a corresponding notification. The new resolution
+ * is given and the connector should update its internal state.
+ * @note    This member can be left null if the connector is not interested in the
+ *          notification.
+ *
+ * @param   pInterface          Pointer to this interface.
+ * @param   u32MaxWidth         New width.
+ * @param   u32MaxHeight        New Height.
+ * @thread  The emulation thread.
+ */
+DECLCALLBACK(void) vmmdevUpdateMaxGuestResolution(PPDMIVMMDEVCONNECTOR pInterface, uint32_t u32MaxWidth, uint32_t u32MaxHeight)
+{
+    PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
+
+    /* store that information in IGuest */
+    Guest* guest = pDrv->pVMMDev->getParent()->getGuest();
+    Assert(guest);
+    if (!guest)
+        return;
+
+    guest->setMaxGuestResolution(u32MaxWidth, u32MaxHeight);
+
+    /* This information is queried when it is needed, so there is no need to
+       issue any further notifications. */
 }
 
@@ -677 +705 @@
     pData->Connector.pfnUpdateGuestVersion            = vmmdevUpdateGuestVersion;
     pData->Connector.pfnUpdateGuestCapabilities       = vmmdevUpdateGuestCapabilities;
+    pData->Connector.pfnUpdateMaxGuestResolution      = vmmdevUpdateMaxGuestResolution;
     pData->Connector.pfnUpdateMouseCapabilities       = vmmdevUpdateMouseCapabilities;
     pData->Connector.pfnUpdatePointerShape            = vmmdevUpdatePointerShape;

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

@@ -76 +76 @@
     void setAdditionsVersion (Bstr aVersion);
 
+    void setMaxGuestResolution (ULONG aMaxWidth, ULONG aMaxHeight);
+
     void setSupportsSeamless (BOOL aSupportsSeamless);
 
@@ -89 +91 @@
     struct Data
     {
-        Data() : mAdditionsActive (FALSE), mSupportsSeamless (FALSE),
+        Data() : mAdditionsActive (FALSE), mMaxWidth (0),
+                 mMaxHeight(0), mSupportsSeamless (FALSE),
                   /* Windows and OS/2 guests take this for granted */
                  mSupportsGraphics (TRUE) {}
@@ -96 +99 @@
         BOOL  mAdditionsActive;
         Bstr  mAdditionsVersion;
+        /** The maximum width supported by the guest - zero means no maximum */
+        ULONG mMaxWidth;
+        /** The maximum height supported by the guest - zero means no maximum */
+        ULONG mMaxHeight;
         BOOL  mSupportsSeamless;
         BOOL  mSupportsGraphics;