]> git.sesse.net Git - vlc/commitdiff
activex: add IID_IVLCControl2 as know interface to IObjectSafety
authorJean-Paul Saman <jean-paul.saman@m2x.nl>
Tue, 9 Mar 2010 11:02:28 +0000 (12:02 +0100)
committerJean-Paul Saman <jean-paul.saman@m2x.nl>
Thu, 18 Mar 2010 10:16:03 +0000 (11:16 +0100)
Signed-off-by: Jean-Paul Saman <jean-paul.saman@m2x.nl>
projects/activex/objectsafety.cpp

index 3806d36ca2763ccfb993203891d81bd29e64b441..667a15bd4683ae3d5c430e8608a90f4853e52798 100644 (file)
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * 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>
  *
@@ -44,7 +44,8 @@ STDMETHODIMP VLCObjectSafety::GetInterfaceSafetyOptions(
     *pdwSupportedOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACESAFE_FOR_UNTRUSTED_CALLER;
 
     if( (IID_IDispatch == riid)
-     || (IID_IVLCControl == riid) )
+     || (IID_IVLCControl == riid)
+     || (IID_IVLCControl2 == riid) )
     {
         *pdwEnabledOptions = INTERFACESAFE_FOR_UNTRUSTED_CALLER;
         return NOERROR;
@@ -68,7 +69,8 @@ STDMETHODIMP VLCObjectSafety::SetInterfaceSafetyOptions(
 )
 {
     if( (IID_IDispatch == riid)
-     || (IID_IVLCControl == riid) )
+     || (IID_IVLCControl == riid)
+     || (IID_IVLCControl2 == riid) )
     {
         if( (INTERFACESAFE_FOR_UNTRUSTED_CALLER == dwOptionSetMask)
          && (INTERFACESAFE_FOR_UNTRUSTED_CALLER == dwEnabledOptions) )
@@ -91,4 +93,3 @@ STDMETHODIMP VLCObjectSafety::SetInterfaceSafetyOptions(
     }
     return E_FAIL;
 };
-