[vlc-commits] commit: activex: add IID_IVLCControl2 as know interface to IObjectSafety ( Jean-Paul Saman )

[git at videolan.org]

vlc | branch: master | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Tue Mar  9 12:02:28 2010 +0100| [d86c821313b3a6757ecfaac0a37bc0565bd7ea49] | committer: Jean-Paul Saman 

activex: add IID_IVLCControl2 as know interface to IObjectSafety

Signed-off-by: Jean-Paul Saman <jean-paul.saman at m2x.nl>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d86c821313b3a6757ecfaac0a37bc0565bd7ea49
---

 projects/activex/objectsafety.cpp |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/projects/activex/objectsafety.cpp b/projects/activex/objectsafety.cpp
index 3806d36..667a15b 100644
--- a/projects/activex/objectsafety.cpp
+++ b/projects/activex/objectsafety.cpp
@@ -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 at 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;
 };
-