/*****************************************************************************
* objectsafety.h: ActiveX control for VLC
*****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
*
* Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef __OBJECTSAFETY_H__
#include <objsafe.h>
#else
+/*
+** mingw does not yet support objsafe.h, redefine what we need here
+*/
// {CB5BDC81-93C1-11cf-8F20-00805F2CD064}
extern "C" const IID IID_IObjectSafety;
struct IObjectSafety : public IUnknown
{
- virtual STDMETHODIMP GetInterfaceSafetyOptions(
+ virtual STDMETHODIMP GetInterfaceSafetyOptions(
REFIID riid,
DWORD __RPC_FAR *pdwSupportedOptions,
DWORD __RPC_FAR *pdwEnabledOptions
) = 0;
- virtual STDMETHODIMP SetInterfaceSafetyOptions(
+ virtual STDMETHODIMP SetInterfaceSafetyOptions(
REFIID riid,
DWORD dwSupportedOptions,
DWORD dwOptionSetMask
// IUnknown methods
STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
{
- if( (NULL != ppv)
- && (IID_IUnknown == riid)
- && (IID_IObjectSafety == riid) )
+ if( NULL == ppv)
+ return E_POINTER;
+ if( (IID_IUnknown == riid)
+ || (IID_IObjectSafety == riid) )
{
AddRef();
*ppv = reinterpret_cast<LPVOID>(this);
return NOERROR;
}
- return _p_instance->QueryInterface(riid, ppv);
+ return _p_instance->pUnkOuter->QueryInterface(riid, ppv);
};
- STDMETHODIMP_(ULONG) AddRef(void) { return _p_instance->AddRef(); };
- STDMETHODIMP_(ULONG) Release(void) { return _p_instance->Release(); };
+ STDMETHODIMP_(ULONG) AddRef(void) { return _p_instance->pUnkOuter->AddRef(); };
+ STDMETHODIMP_(ULONG) Release(void) { return _p_instance->pUnkOuter->Release(); };
// IUnknown methods
- STDMETHODIMP GetInterfaceSafetyOptions(
+ STDMETHODIMP GetInterfaceSafetyOptions(
REFIID riid,
DWORD *pdwSupportedOptions,
DWORD *pdwEnabledOptions
);
- STDMETHODIMP SetInterfaceSafetyOptions(
+ STDMETHODIMP SetInterfaceSafetyOptions(
REFIID riid,
DWORD dwOptionSetMask,
DWORD dwEnabledOptions
);
-private:
+private:
VLCPlugin *_p_instance;
};