VirtualBox

Changeset 60759 in vbox


Ignore:
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
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp

    r57358 r60759  
    55
    66/*
    7  * Copyright (C) 2012-2013 Oracle Corporation
     7 * Copyright (C) 2012-2016 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2121*********************************************************************************************************************************/
    2222#include <Windows.h>
     23#include <tchar.h>
    2324
    2425#include <VBox/com/com.h>

  • trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxWatchdog.cpp

    r59907 r60759  
    146146#ifdef RT_OS_WINDOWS
    147147/* Required for ATL. */
    148 static CComModule _Module;
     148static ATL::CComModule _Module;
    149149#endif
    150150

  • trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

    r59410 r60759  
    55
    66/*
    7  * Copyright (C) 2006-2015 Oracle Corporation
     7 * Copyright (C) 2006-2016 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    590590#ifdef RT_OS_WINDOWS
    591591// Required for ATL
    592 static CComModule _Module;
     592static ATL::CComModule _Module;
    593593#endif
    594594

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

    r60734 r60759  
    55
    66/*
    7  * Copyright (C) 2006-2015 Oracle Corporation
     7 * Copyright (C) 2006-2016 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    9393# ifdef RT_OS_WINDOWS
    9494// Required for ATL
    95 static CComModule       _Module;
     95static ATL::CComModule  _Module;
    9696# endif
    9797

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

    r55810 r60759  
    77
    88/*
    9  * Copyright (C) 2006-2012 Oracle Corporation
     9 * Copyright (C) 2006-2016 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    152152    mfInitialized = true;
    153153#ifdef RT_OS_WINDOWS
    154     HRESULT hr = CoCreateFreeThreadedMarshaler(this, //GetControllingUnknown(),
    155                                              &m_pUnkMarshaler.p);
     154    HRESULT hr = CoCreateFreeThreadedMarshaler(this, m_pUnkMarshaler.asOutParam());
    156155    Log(("CoCreateFreeThreadedMarshaler hr %08X\n", hr));
    157156#endif
    … …  
    14291428
    14301429/**
    1431  * Returns the address of the framebuffer bits for writing to.
    1432  *
    1433  * @returns COM status code
    1434  * @param   alpha Address of result buffer.
    1435  */
    1436 STDMETHODIMP VBoxSDLFBOverlay::COMGETTER(Address)(ULONG *address)
    1437 {
    1438     LogFlow(("VBoxSDLFBOverlay::GetAddress\n"));
    1439     if (!address)
    1440         return E_INVALIDARG;
    1441     *address = (uintptr_t) mOverlayBits->pixels;
    1442     return S_OK;
    1443 }
    1444 
    1445 /**
    14461430 * Returns the current colour depth.  In fact, this is always 32bpp.
    14471431 *

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

    r56580 r60759  
    77
    88/*
    9  * Copyright (C) 2006-2015 Oracle Corporation
     9 * Copyright (C) 2006-2016 Oracle Corporation
    1010 *
    1111 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    4444
    4545class ATL_NO_VTABLE VBoxSDLFB :
    46     public CComObjectRootEx<CComMultiThreadModel>,
     46    public ATL::CComObjectRootEx<ATL::CComMultiThreadModel>,
    4747    VBOX_SCRIPTABLE_IMPL(IFramebuffer)
    4848{
    … …  
    6767        COM_INTERFACE_ENTRY(IFramebuffer)
    6868        COM_INTERFACE_ENTRY2(IDispatch,IFramebuffer)
    69         COM_INTERFACE_ENTRY_AGGREGATE(IID_IMarshal, m_pUnkMarshaler.p)
     69        COM_INTERFACE_ENTRY_AGGREGATE(IID_IMarshal, m_pUnkMarshaler.m_p)
    7070    END_COM_MAP()
    7171
    … …  
    208208
    209209#ifdef RT_OS_WINDOWS
    210      CComPtr <IUnknown>  m_pUnkMarshaler;
     210     ComPtr<IUnknown> m_pUnkMarshaler;
    211211#endif
    212212};
    … …  
    245245    STDMETHOD(COMGETTER(Alpha))(ULONG *alpha);
    246246    STDMETHOD(COMSETTER(Alpha))(ULONG alpha);
    247     STDMETHOD(COMGETTER(Address))(ULONG *address);
    248247    STDMETHOD(COMGETTER(BytesPerLine))(ULONG *bytesPerLine);
    249248

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

    r57358 r60759  
    66
    77/*
    8  * Copyright (C) 2006-2015 Oracle Corporation
     8 * Copyright (C) 2006-2016 Oracle Corporation
    99 *
    1010 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    739739#ifdef RT_OS_WINDOWS
    740740// Required for ATL
    741 static CComModule _Module;
     741static ATL::CComModule _Module;
    742742#endif
    743743
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette