X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2Foleinplaceobject.h;h=83fc7d8c67d4e10ad625d74aa2c73182337466b8;hb=a58e289ab4387ef75c5167e9d4e9899408b8e380;hp=6f523a4d5951e21f19100fa43b27880854ede2de;hpb=35db6dd6ecab2daf4c03ccc2c0be4b25a42c092c;p=vlc

diff --git a/activex/oleinplaceobject.h b/activex/oleinplaceobject.h
index 6f523a4d59..83fc7d8c67 100644
--- a/activex/oleinplaceobject.h
+++ b/activex/oleinplaceobject.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 __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);
@@ -65,4 +66,3 @@ private:
 };
 
 #endif
-