Removes trailing spaces. Removes tabs.

[vlc] / activex / dataobject.h

diff --git a/activex/dataobject.h b/activex/dataobject.h
index c0e7bea51f16459305bddc683d25eaf9b27a5036..062fcdd25f63970e79082625a0283f23d63503e8 100644 (file)
--- 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;