Changeset 51605 in vbox

Timestamp:

Jun 11, 2014 12:57:05 PM (11 years ago)

Author:

vboxsync

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

94340

Message:

Main,Frontends: removed obsolete IFramebuffer methods: Address, UsesGuestVRAM, Lock, Unlock

Location:

trunk/src/VBox

Files:

• Frontends/VBoxSDL/Framebuffer.cpp (modified) (2 diffs)
• Frontends/VBoxSDL/Framebuffer.h (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/runtime/UIFrameBuffer.h (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/src-client/DisplayImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -284 +284 @@
 
 /**
- * Lock the framebuffer (make its address immutable).
- *
- * @returns COM status code
- */
-STDMETHODIMP VBoxSDLFB::Lock()
-{
-    LogFlow(("VBoxSDLFB::Lock\n"));
-    RTCritSectEnter(&mUpdateLock);
-    return S_OK;
-}
-
-/**
- * Unlock the framebuffer.
- *
- * @returns COM status code
- */
-STDMETHODIMP VBoxSDLFB::Unlock()
-{
-    LogFlow(("VBoxSDLFB::Unlock\n"));
-    RTCritSectLeave(&mUpdateLock);
-    return S_OK;
-}
-
-/**
- * Return the framebuffer start address.
- *
- * @returns COM status code.
- * @param   address Pointer to result variable.
- */
-STDMETHODIMP VBoxSDLFB::COMGETTER(Address)(BYTE **address)
-{
-    LogFlow(("VBoxSDLFB::GetAddress\n"));
-    if (!address)
-        return E_INVALIDARG;
-
-    if (!mSurfVRAM)
-    {
-        /* That's actually rather bad. */
-        AssertMsgFailed(("mSurfVRAM is NULL!\n"));
-        return E_FAIL;
-    }
-
-    *address = (BYTE *) mSurfVRAM->pixels;
-    LogFlow(("VBoxSDL::GetAddress returning %p\n", *address));
-    return S_OK;
-}
-
-/**
  * Return the current framebuffer color depth.
  *
@@ -370 +322 @@
         return E_POINTER;
     *pixelFormat = FramebufferPixelFormat_FOURCC_RGB;
-    return S_OK;
-}
-
-STDMETHODIMP VBoxSDLFB::COMGETTER(UsesGuestVRAM) (BOOL *usesGuestVRAM)
-{
-    if (!usesGuestVRAM)
-        return E_POINTER;
-    *usesGuestVRAM = TRUE;
     return S_OK;
 }

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h

@@ -74 +74 @@
     STDMETHOD(COMGETTER(Width))(ULONG *width);
     STDMETHOD(COMGETTER(Height))(ULONG *height);
-    STDMETHOD(Lock)();
-    STDMETHOD(Unlock)();
-    STDMETHOD(COMGETTER(Address))(BYTE **address);
     STDMETHOD(COMGETTER(BitsPerPixel))(ULONG *bitsPerPixel);
     STDMETHOD(COMGETTER(BytesPerLine))(ULONG *bytesPerLine);
     STDMETHOD(COMGETTER(PixelFormat)) (ULONG *pixelFormat);
-    STDMETHOD(COMGETTER(UsesGuestVRAM)) (BOOL *usesGuestVRAM);
     STDMETHOD(COMGETTER(HeightReduction)) (ULONG *heightReduction);
     STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **aOverlay);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -110 +110 @@
 }
 
-STDMETHODIMP UIFrameBuffer::COMGETTER(Address)(BYTE **ppAddress)
-{
-    if (!ppAddress)
-        return E_POINTER;
-    *ppAddress = address();
-    return S_OK;
-}
-
 STDMETHODIMP UIFrameBuffer::COMGETTER(Width)(ULONG *puWidth)
 {
@@ -158 +150 @@
 }
 
-STDMETHODIMP UIFrameBuffer::COMGETTER(UsesGuestVRAM)(BOOL *pbUsesGuestVRAM)
-{
-    if (!pbUsesGuestVRAM)
-        return E_POINTER;
-    *pbUsesGuestVRAM = true;
-    return S_OK;
-}
-
 STDMETHODIMP UIFrameBuffer::COMGETTER(HeightReduction)(ULONG *puHeightReduction)
 {
@@ -187 +171 @@
         return E_POINTER;
     *pWinId = m_iWinId;
-    return S_OK;
-}
-
-STDMETHODIMP UIFrameBuffer::Lock()
-{
-    this->lock();
-    return S_OK;
-}
-
-STDMETHODIMP UIFrameBuffer::Unlock()
-{
-    this->unlock();
     return S_OK;
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h

@@ -100 +100 @@
 
     /* IFramebuffer COM methods: */
-    STDMETHOD(COMGETTER(Address))(BYTE **ppAddress);
     STDMETHOD(COMGETTER(Width))(ULONG *puWidth);
     STDMETHOD(COMGETTER(Height))(ULONG *puHeight);
@@ -106 +105 @@
     STDMETHOD(COMGETTER(BytesPerLine))(ULONG *puBytesPerLine);
     STDMETHOD(COMGETTER(PixelFormat))(ULONG *puPixelFormat);
-    STDMETHOD(COMGETTER(UsesGuestVRAM))(BOOL *pbUsesGuestVRAM);
     STDMETHOD(COMGETTER(HeightReduction))(ULONG *puHeightReduction);
     STDMETHOD(COMGETTER(Overlay))(IFramebufferOverlay **ppOverlay);
     STDMETHOD(COMGETTER(WinId))(LONG64 *pWinId);
-
-    /* IFramebuffer sync methods: */
-    STDMETHOD(Lock)();
-    STDMETHOD(Unlock)();
 
     /** EMT callback: Notifies frame-buffer about guest-screen size change.

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

@@ -15253 +15253 @@
   <interface
     name="IFramebuffer" extends="$unknown"
-    uuid="29e4a04d-03a7-4860-977b-a987c3e92c2b"
+    uuid="929e4228-f7cf-436d-99a0-dcf6596473b2"
     wsmap="managed"
     >
-    <attribute name="address" type="octet" mod="ptr" readonly="yes" wsmap="suppress">
-      <desc>Address of the start byte of the frame buffer.</desc>
-    </attribute>
-
     <attribute name="width" type="unsigned long" readonly="yes">
       <desc>Frame buffer width, in pixels.</desc>
@@ -15293 +15289 @@
           buffer must be always known.
         </note>
-      </desc>
-    </attribute>
-
-    <attribute name="usesGuestVRAM" type="boolean" readonly="yes">
-      <desc>
-        Defines whether this frame buffer uses the virtual video card's memory
-        buffer (guest VRAM) directly or not.
       </desc>
     </attribute>
@@ -15334 +15323 @@
       </desc>
     </attribute>
-
-    <method name="lock" wsmap="suppress">
-      <desc>
-        Locks the frame buffer.
-        Gets called by the IDisplay object where this frame buffer is
-        bound to.
-      </desc>
-    </method>
-
-    <method name="unlock" wsmap="suppress">
-      <desc>
-        Unlocks the frame buffer.
-        Gets called by the IDisplay object where this frame buffer is
-        bound to.
-      </desc>
-    </method>
 
     <method name="notifyUpdate" wsmap="suppress">

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -1123 +1123 @@
     if (pFramebuffer != NULL)
     {
-        pFramebuffer->Lock();
-
         if (w != 0 && h != 0)
             pFramebuffer->NotifyUpdate(x, y, w, h);
-
-        pFramebuffer->Unlock();
     }