Changeset 60759 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Apr 29, 2016 11:19:23 AM (9 years ago)

Author:

vboxsync

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

106953

Message:

Frontends: various cleanups, mostly ATL related, remove code for no longer existing API method

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (3 diffs)
• Framebuffer.h (modified) (5 diffs)
• VBoxSDL.cpp (modified) (2 diffs)

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -152 +152 @@
     mfInitialized = true;
 #ifdef RT_OS_WINDOWS
-    HRESULT hr = CoCreateFreeThreadedMarshaler(this, //GetControllingUnknown(),
-                                             &m_pUnkMarshaler.p);
+    HRESULT hr = CoCreateFreeThreadedMarshaler(this, m_pUnkMarshaler.asOutParam());
     Log(("CoCreateFreeThreadedMarshaler hr %08X\n", hr));
 #endif
@@ -1429 +1428 @@
 
 /**
- * Returns the address of the framebuffer bits for writing to.
- *
- * @returns COM status code
- * @param   alpha Address of result buffer.
- */
-STDMETHODIMP VBoxSDLFBOverlay::COMGETTER(Address)(ULONG *address)
-{
-    LogFlow(("VBoxSDLFBOverlay::GetAddress\n"));
-    if (!address)
-        return E_INVALIDARG;
-    *address = (uintptr_t) mOverlayBits->pixels;
-    return S_OK;
-}
-
-/**
  * Returns the current colour depth.  In fact, this is always 32bpp.
  *

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -44 +44 @@
 
 class ATL_NO_VTABLE VBoxSDLFB :
-    public CComObjectRootEx<CComMultiThreadModel>,
+    public ATL::CComObjectRootEx<ATL::CComMultiThreadModel>,
     VBOX_SCRIPTABLE_IMPL(IFramebuffer)
 {
@@ -67 +67 @@
         COM_INTERFACE_ENTRY(IFramebuffer)
         COM_INTERFACE_ENTRY2(IDispatch,IFramebuffer)
-        COM_INTERFACE_ENTRY_AGGREGATE(IID_IMarshal, m_pUnkMarshaler.p)
+        COM_INTERFACE_ENTRY_AGGREGATE(IID_IMarshal, m_pUnkMarshaler.m_p)
     END_COM_MAP()
 
@@ -208 +208 @@
 
 #ifdef RT_OS_WINDOWS
-     CComPtr <IUnknown>   m_pUnkMarshaler;
+     ComPtr<IUnknown> m_pUnkMarshaler;
 #endif
 };
@@ -245 +245 @@
     STDMETHOD(COMGETTER(Alpha))(ULONG *alpha);
     STDMETHOD(COMSETTER(Alpha))(ULONG alpha);
-    STDMETHOD(COMGETTER(Address))(ULONG *address);
     STDMETHOD(COMGETTER(BytesPerLine))(ULONG *bytesPerLine);
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -739 +739 @@
 #ifdef RT_OS_WINDOWS
 // Required for ATL
-static CComModule _Module;
+static ATL::CComModule _Module;
 #endif