Commit d86c8213 authored by Jean-Paul Saman's avatar Jean-Paul Saman

activex: add IID_IVLCControl2 as know interface to IObjectSafety

Signed-off-by: Jean-Paul Saman's avatarJean-Paul Saman <jean-paul.saman@m2x.nl>
parent 7113bb57
/***************************************************************************** /*****************************************************************************
* objectsafety.cpp: ActiveX control for VLC * objectsafety.cpp: ActiveX control for VLC
***************************************************************************** *****************************************************************************
* Copyright (C) 2005 the VideoLAN team * Copyright (C) 2005-2010 the VideoLAN team
* *
* Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net> * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
* *
...@@ -44,7 +44,8 @@ STDMETHODIMP VLCObjectSafety::GetInterfaceSafetyOptions( ...@@ -44,7 +44,8 @@ STDMETHODIMP VLCObjectSafety::GetInterfaceSafetyOptions(
*pdwSupportedOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACESAFE_FOR_UNTRUSTED_CALLER; *pdwSupportedOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACESAFE_FOR_UNTRUSTED_CALLER;
if( (IID_IDispatch == riid) if( (IID_IDispatch == riid)
|| (IID_IVLCControl == riid) ) || (IID_IVLCControl == riid)
|| (IID_IVLCControl2 == riid) )
{ {
*pdwEnabledOptions = INTERFACESAFE_FOR_UNTRUSTED_CALLER; *pdwEnabledOptions = INTERFACESAFE_FOR_UNTRUSTED_CALLER;
return NOERROR; return NOERROR;
...@@ -68,7 +69,8 @@ STDMETHODIMP VLCObjectSafety::SetInterfaceSafetyOptions( ...@@ -68,7 +69,8 @@ STDMETHODIMP VLCObjectSafety::SetInterfaceSafetyOptions(
) )
{ {
if( (IID_IDispatch == riid) if( (IID_IDispatch == riid)
|| (IID_IVLCControl == riid) ) || (IID_IVLCControl == riid)
|| (IID_IVLCControl2 == riid) )
{ {
if( (INTERFACESAFE_FOR_UNTRUSTED_CALLER == dwOptionSetMask) if( (INTERFACESAFE_FOR_UNTRUSTED_CALLER == dwOptionSetMask)
&& (INTERFACESAFE_FOR_UNTRUSTED_CALLER == dwEnabledOptions) ) && (INTERFACESAFE_FOR_UNTRUSTED_CALLER == dwEnabledOptions) )
...@@ -91,4 +93,3 @@ STDMETHODIMP VLCObjectSafety::SetInterfaceSafetyOptions( ...@@ -91,4 +93,3 @@ STDMETHODIMP VLCObjectSafety::SetInterfaceSafetyOptions(
} }
return E_FAIL; return E_FAIL;
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment