diff --git a/activex/connectioncontainer.cpp b/activex/connectioncontainer.cpp
index d4a9c0d35ac21d7cbb6e2c3b1ef82d688be1b61d..40ed87751322d5df31d40b530618cc8f1a6f4a09 100644
--- a/activex/connectioncontainer.cpp
+++ b/activex/connectioncontainer.cpp
@@ -101,7 +101,7 @@ STDMETHODIMP VLCConnectionPoint::Advise(IUnknown *pUnk, DWORD *pdwCookie)
 
     pUnk->AddRef();
     cd.pUnk = pUnk;
-    *pdwCookie = cd.dwCookie = _connections.size();
+    *pdwCookie = cd.dwCookie = _connections.size()+1;
 
     _connections.push_back(cd);
 
@@ -110,9 +110,9 @@ STDMETHODIMP VLCConnectionPoint::Advise(IUnknown *pUnk, DWORD *pdwCookie)
 
 STDMETHODIMP VLCConnectionPoint::Unadvise(DWORD pdwCookie)
 {
-    if( pdwCookie < _connections.size() )
+    if( (0 < pdwCookie) && (pdwCookie <= _connections.size()) )
     {
-        CONNECTDATA cd = _connections[pdwCookie];
+        CONNECTDATA cd = _connections[pdwCookie-1];
         if( NULL != cd.pUnk )
         {
             cd.pUnk->Release();
diff --git a/activex/connectioncontainer.h b/activex/connectioncontainer.h
index 991e9366930fb4fc8e6906d2e1904633b7049701..71f1f5b1312e24f79e815a6609cb0d3ea7e741b9 100644
--- a/activex/connectioncontainer.h
+++ b/activex/connectioncontainer.h
@@ -39,9 +39,11 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( NULL == ppv ) return E_POINTER;
+        if( NULL == ppv )
+            return E_POINTER;
         if( (IID_IUnknown == riid) 
-         && (IID_IConnectionPoint == riid) ) {
+         || (IID_IConnectionPoint == riid) )
+        {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;
@@ -95,9 +97,11 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IConnectionPointContainer == riid) ) {
+        if( NULL == ppv)
+            return E_POINTER;
+        if( (IID_IUnknown == riid) 
+         || (IID_IConnectionPointContainer == riid) )
+        {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;
diff --git a/activex/dataobject.h b/activex/dataobject.h
index c0e7bea51f16459305bddc683d25eaf9b27a5036..1758ec37da8f15145b7265b46e9913f785732a20 100644
--- a/activex/dataobject.h
+++ b/activex/dataobject.h
@@ -37,9 +37,10 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IDataObject == riid) ) {
+        if( NULL == ppv)
+            return E_POINTER;
+        if( (IID_IUnknown == riid) 
+         || (IID_IDataObject == riid) ) {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;
diff --git a/activex/objectsafety.h b/activex/objectsafety.h
index ca4dadcb21463ea29cab0db4100594a6b484356a..e3533aa5bda1963b7f66f3c74fdfff7f23ac89cd 100644
--- a/activex/objectsafety.h
+++ b/activex/objectsafety.h
@@ -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);
diff --git a/activex/olecontrol.h b/activex/olecontrol.h
index f58464c307f7a0b9332df5544c54dfe3d38e6963..0f16411271b95fb585086c8c2dc942546bd0668c 100644
--- a/activex/olecontrol.h
+++ b/activex/olecontrol.h
@@ -36,9 +36,10 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid)
-         && (IID_IOleControl == riid) ) 
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IOleControl == riid) ) 
         {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
diff --git a/activex/oleinplaceactiveobject.h b/activex/oleinplaceactiveobject.h
index debaa561e74a051fa00843cfe49eb42f8704a32f..159f3b13668990e4ce647e16348c57b3965d710a 100644
--- a/activex/oleinplaceactiveobject.h
+++ b/activex/oleinplaceactiveobject.h
@@ -36,10 +36,11 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IOleWindow == riid) 
-         && (IID_IOleInPlaceActiveObject == riid) )
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid) 
+         || (IID_IOleWindow == riid) 
+         || (IID_IOleInPlaceActiveObject == riid) )
         {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
diff --git a/activex/oleinplaceobject.h b/activex/oleinplaceobject.h
index 40f81e68823fbb9bd711468a76803ecf54b5a730..6dcf3f3623b9c2cc9a260045811951de32d76b21 100644
--- a/activex/oleinplaceobject.h
+++ b/activex/oleinplaceobject.h
@@ -34,10 +34,11 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid)
-         && (IID_IOleWindow == riid)
-         && (IID_IOleInPlaceObject == riid) ) 
+        if( NULL == ppv )
+    	    return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IOleWindow == riid)
+         || (IID_IOleInPlaceObject == riid) ) 
         {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
diff --git a/activex/oleobject.h b/activex/oleobject.h
index c37c2f0ef97fafbaddb7194c3cfa760133c9dfea..567a10897bcc97d319ea779afbf1112bd2450051 100644
--- a/activex/oleobject.h
+++ b/activex/oleobject.h
@@ -34,9 +34,10 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid)
-         && (IID_IOleObject == riid) ) 
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IOleObject == riid) ) 
         {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
diff --git a/activex/persistpropbag.h b/activex/persistpropbag.h
index df148b3b7f56e3fbe587c6cf3376795c29c4af71..f4e081c65ed61623744103fc66924255db515b4f 100644
--- a/activex/persistpropbag.h
+++ b/activex/persistpropbag.h
@@ -36,10 +36,12 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IPersist == riid) 
-         && (IID_IPersistPropertyBag == riid) ) {
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IPersist == riid) 
+         || (IID_IPersistPropertyBag == riid) )
+        {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;
diff --git a/activex/persiststorage.h b/activex/persiststorage.h
index e2fb78e1575171e6586a5bea771e07285ec2bf26..5d31c3868e9f5bcea4f261dedfc3aa7e9f04ac05 100644
--- a/activex/persiststorage.h
+++ b/activex/persiststorage.h
@@ -36,10 +36,12 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IPersist == riid) 
-         && (IID_IPersistStorage == riid) ) {
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IPersist == riid) 
+         || (IID_IPersistStorage == riid) )
+        {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;
diff --git a/activex/persiststreaminit.cpp b/activex/persiststreaminit.cpp
index df67050635767c3c1907fb879974de6f0e934eb1..ad45bb31fb90959220eeb0d88c2ecaf9219acd7a 100644
--- a/activex/persiststreaminit.cpp
+++ b/activex/persiststreaminit.cpp
@@ -213,7 +213,7 @@ public:
         if( NULL == ppv )
             return E_POINTER;
         if( (IID_IUnknown == riid) 
-         && (IID_IPropertyBag == riid) )
+         || (IID_IPropertyBag == riid) )
         {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
diff --git a/activex/persiststreaminit.h b/activex/persiststreaminit.h
index d814216bd77676ed871952f0e78a569b040d6e35..619f1a3456e931c04f4d3de59bfb4d770dd98a8e 100644
--- a/activex/persiststreaminit.h
+++ b/activex/persiststreaminit.h
@@ -36,10 +36,12 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IPersist == riid) 
-         && (IID_IPersistStreamInit == riid) ) {
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IPersist == riid) 
+         || (IID_IPersistStreamInit == riid) )
+        {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;
diff --git a/activex/plugin.cpp b/activex/plugin.cpp
index e2b8a18102d42e0f97809fc1ce6f4025cb3830ec..86ca913d316237f076ffada8c556aa86b610c412 100644
--- a/activex/plugin.cpp
+++ b/activex/plugin.cpp
@@ -180,7 +180,8 @@ STDMETHODIMP VLCPluginClass::QueryInterface(REFIID riid, void **ppv)
     if( NULL == ppv )
         return E_INVALIDARG;
 
-    if( (IID_IUnknown == riid) || (IID_IClassFactory == riid) )
+    if( (IID_IUnknown == riid)
+     || (IID_IClassFactory == riid) )
     {
         AddRef();
         *ppv = reinterpret_cast<LPVOID>(this);
diff --git a/activex/provideclassinfo.h b/activex/provideclassinfo.h
index 9074fc4534e381d256dd430b2b14ca6b152fa77e..82b43e7ab474498088ac2f04553f6dc1f44c0a88 100644
--- 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;
diff --git a/activex/utils.h b/activex/utils.h
index c7ac574a10c05c46d1bd4c05e597d78b5029df0d..0a4c62460a179a6264c7e31e631ac0bf2e4f86a3 100644
--- a/activex/utils.h
+++ b/activex/utils.h
@@ -108,13 +108,16 @@ VLCEnum<T>& VLCEnum<T>::operator=(const VLCEnum<T> &e)
 template<class T>
 STDMETHODIMP VLCEnum<T>::QueryInterface(REFIID riid, void **ppv)
 {
-    if( NULL == ppv ) return E_POINTER;
+    if( NULL == ppv )
+        return E_POINTER;
     if( (IID_IUnknown == riid) 
-     && ( _riid == riid) ) {
+     || (_riid == riid) )
+    {
         AddRef();
         *ppv = reinterpret_cast<LPVOID>(this);
         return NOERROR;
     }
+    // standalone object
     return E_NOINTERFACE;
 };
 
diff --git a/activex/viewobject.h b/activex/viewobject.h
index 1b2b24a3281f81e2e1a1c0ba0864cc8aefb57470..7a36de12484a1a2e174b1b9ee57ecdeb20db5abe 100644
--- a/activex/viewobject.h
+++ b/activex/viewobject.h
@@ -37,11 +37,12 @@ public:
     // IUnknown methods
     STDMETHODIMP QueryInterface(REFIID riid, void **ppv)
     {
-        if( (NULL != ppv)
-         && (IID_IUnknown == riid) 
-         && (IID_IPersist == riid) 
-         && (IID_IViewObject == riid) 
-         && (IID_IViewObject2 == riid) ) {
+        if( NULL == ppv )
+            return E_POINTER;
+        if( (IID_IUnknown == riid)
+         || (IID_IViewObject == riid) 
+         || (IID_IViewObject2 == riid) )
+        {
             AddRef();
             *ppv = reinterpret_cast<LPVOID>(this);
             return NOERROR;
diff --git a/activex/vlccontrol.h b/activex/vlccontrol.h
index fcedb5ab7437acc65a74475e47223118ba51b60a..a45abdb7c3bfbf15925b947e8cdf7d104eceb3be 100644
--- 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;