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

Timestamp:

Apr 28, 2008 3:03:37 PM (17 years ago)

Author:

vboxsync

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

30274

Message:

Frontends/VirtualBox3/4, Main, Devices/VMMDev, Frontends/VBoxBFE, Additions/common, Additions/x11: reverted r30152, r30085, r30074 and r30072

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/GuestImpl.cpp

@@ -161 +161 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(MaxGuestWidth) (ULONG *aMaxWidth)
-{
-    if (!VALID_PTR(aMaxWidth))
-        return E_POINTER;
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoReadLock alock (this);
-
-    *aMaxWidth = mData.mMaxWidth;
-
-    return S_OK;
-}
-
-STDMETHODIMP Guest::COMGETTER(MaxGuestHeight) (ULONG *aMaxHeight)
-{
-    if (!VALID_PTR(aMaxHeight))
-        return E_POINTER;
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoReadLock alock (this);
-
-    *aMaxHeight = mData.mMaxHeight;
-
-    return S_OK;
-}
-
 STDMETHODIMP Guest::COMGETTER(SupportsSeamless) (BOOL *aSupportsSeamless)
 {
@@ -367 +337 @@
 }
 
-void Guest::setMaxGuestResolution (ULONG aMaxWidth, ULONG aMaxHeight)
+void Guest::setSupportsSeamless (BOOL aSupportsSeamless)
 {
     AutoCaller autoCaller (this);
@@ -374 +344 @@
     AutoWriteLock alock (this);
 
-    mData.mMaxWidth  = aMaxWidth;
-    mData.mMaxHeight = aMaxHeight;
-}
-
-void Guest::setSupportsSeamless (BOOL aSupportsSeamless)
+    mData.mSupportsSeamless = aSupportsSeamless;
+}
+
+void Guest::setSupportsGraphics (BOOL aSupportsGraphics)
 {
     AutoCaller autoCaller (this);
@@ -385 +354 @@
     AutoWriteLock alock (this);
 
-    mData.mSupportsSeamless = aSupportsSeamless;
-}
-
-void Guest::setSupportsGraphics (BOOL aSupportsGraphics)
-{
-    AutoCaller autoCaller (this);
-    AssertComRCReturnVoid (autoCaller.rc());
-
-    AutoWriteLock alock (this);
-
     mData.mSupportsGraphics = aSupportsGraphics;
 }

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. */
 }
 
@@ -705 +677 @@
     pData->Connector.pfnUpdateGuestVersion            = vmmdevUpdateGuestVersion;
     pData->Connector.pfnUpdateGuestCapabilities       = vmmdevUpdateGuestCapabilities;
-    pData->Connector.pfnUpdateMaxGuestResolution      = vmmdevUpdateMaxGuestResolution;
     pData->Connector.pfnUpdateMouseCapabilities       = vmmdevUpdateMouseCapabilities;
     pData->Connector.pfnUpdatePointerShape            = vmmdevUpdatePointerShape;

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

@@ -5184 +5184 @@
   <interface
      name="IGuest" extends="$unknown"
-     uuid="655f0f7f-a35b-4e2f-a728-175d7e18dcce"
+     uuid="d8556fca-81bc-12af-fca3-365528fa38ca"
 
      wsmap="suppress"
@@ -5227 +5227 @@
         the version might be refused by VirtualBox (incompatible) or
         other failures occured.
-      </desc>
-    </attribute>
-
-    <attribute name="maxGuestWidth" type="unsigned long" readonly="yes">
-      <desc>
-        The maximum horizontal resolution currently supported by the
-        Guest Additions for the purpose of host-initiated resiing
-        (and fullscreen and seamless).  A value of zero means no
-        arbitrary maximum other than that imposed by VRAM limits.
-      </desc>
-    </attribute>
-
-    <attribute name="maxGuestHeight" type="unsigned long" readonly="yes">
-      <desc>
-        The maximum vertical resolution currently supported by the
-        Guest Additions for the purpose of host-initiated resiing
-        (and fullscreen and seamless).  A value of zero means no
-        arbitrary maximum other than that imposed by VRAM limits.
       </desc>
     </attribute>

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

@@ -61 +61 @@
     STDMETHOD(COMGETTER(AdditionsActive)) (BOOL *aAdditionsActive);
     STDMETHOD(COMGETTER(AdditionsVersion)) (BSTR *aAdditionsVersion);
-    STDMETHOD(COMGETTER(MaxGuestWidth)) (ULONG *aMaxWidth);
-    STDMETHOD(COMGETTER(MaxGuestHeight)) (ULONG *aMaxHeight);
     STDMETHOD(COMGETTER(SupportsSeamless)) (BOOL *aSupportsSeamless);
     STDMETHOD(COMGETTER(SupportsGraphics)) (BOOL *aSupportsGraphics);
@@ -78 +76 @@
     void setAdditionsVersion (Bstr aVersion);
 
-    void setMaxGuestResolution (ULONG aMaxWidth, ULONG aMaxHeight);
-
     void setSupportsSeamless (BOOL aSupportsSeamless);
 
@@ -93 +89 @@
     struct Data
     {
-        Data() : mAdditionsActive (FALSE), mMaxWidth (0),
-                 mMaxHeight(0), mSupportsSeamless (FALSE),
+        Data() : mAdditionsActive (FALSE), mSupportsSeamless (FALSE),
                   /* Windows and OS/2 guests take this for granted */
                  mSupportsGraphics (TRUE) {}
@@ -101 +96 @@
         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;