* skins2/src/skin_common.hpp: Added missing header

[vlc] / activex / vlccontrol.h

diff --git a/activex/vlccontrol.h b/activex/vlccontrol.h
index fcedb5ab7437acc65a74475e47223118ba51b60a..a45abdb7c3bfbf15925b947e8cdf7d104eceb3be 100644 (file)
--- a/activex/vlccontrol.h
+++ b/activex/vlccontrol.h
@@ -37,10 +37,12 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid)
-         && (IID_IDispatch == riid)
-         && (IID_IVLCControl == riid) ) {
+        if( NULL == ppv )
+          return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IDispatch == riid)
+         || (IID_IVLCControl == riid) )
+        {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;