X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2Foleinplaceobject.h;h=83fc7d8c67d4e10ad625d74aa2c73182337466b8;hb=d248d3f2f9a3ca4b8b9508c84ee96d07c362c82b;hp=24514ffd5f7280c6e36a3bce208ade0e85d8d1d7;hpb=fe087a38282e93addb25fa9598393e40ea233b09;p=vlc

diff --git a/activex/oleinplaceobject.h b/activex/oleinplaceobject.h
index 24514ffd5f..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,20 +34,21 @@ 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);
             return NOERROR;
         }
-        return _p_instance->QueryInterface(riid, ppv);
+        return _p_instance->pUnkOuter->QueryInterface(riid, ppv);
     };
 
-    STDMETHODIMP_(ULONG) AddRef(void) { return _p_instance->AddRef(); };
-    STDMETHODIMP_(ULONG) Release(void) { return _p_instance->Release(); };
+    STDMETHODIMP_(ULONG) AddRef(void) { return _p_instance->pUnkOuter->AddRef(); };
+    STDMETHODIMP_(ULONG) Release(void) { return _p_instance->pUnkOuter->Release(); };
 
     // IOleWindow methods
     STDMETHODIMP GetWindow(HWND *);
@@ -65,4 +66,3 @@ private:
 };
 
 #endif
-