* don't mix old and new pl API

[vlc] / activex / provideclassinfo.h

diff --git a/activex/provideclassinfo.h b/activex/provideclassinfo.h
index 9074fc4534e381d256dd430b2b14ca6b152fa77e..82b43e7ab474498088ac2f04553f6dc1f44c0a88 100644 (file)
--- a/activex/provideclassinfo.h
+++ b/activex/provideclassinfo.h
@@ -36,10 +36,12 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IProvideClassInfo == riid) 
-         && (IID_IProvideClassInfo2 == riid) ) {
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IProvideClassInfo == riid) 
+         || (IID_IProvideClassInfo2 == riid) )
+        {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;