X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=activex%2Fobjectsafety.h;h=14ad3404334c703a35b67cdea624d77cd3772419;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=1550b869d0de6a711d8a5ea5e6c6b7d5dcd7a9a6;hpb=35db6dd6ecab2daf4c03ccc2c0be4b25a42c092c;p=vlc

diff --git a/activex/objectsafety.h b/activex/objectsafety.h
index 1550b869d0..14ad340433 100644
--- a/activex/objectsafety.h
+++ b/activex/objectsafety.h
@@ -17,7 +17,7 @@
  *
  * 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__
@@ -42,13 +42,13 @@ 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
@@ -67,9 +67,10 @@ public:
     // 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);
@@ -82,19 +83,19 @@ public:
     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;
 };