X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2Foleobject.h;h=9e5485601cc201fa547b3dc40316e4bea3b51cf6;hb=c67ce44afc1a15760897f39e198b2a59fa061453;hp=a406163aa4850246db7caf8da880c445c4cfc40c;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc

diff --git a/activex/oleobject.h b/activex/oleobject.h
index a406163aa4..9e5485601c 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);
@@ -73,8 +74,7 @@ public:
 
 private:
 
-    HRESULT doInPlaceActivate(LPMSG lpMsg, LPOLECLIENTSITE pActiveSite, HWND hwndParent, LPCRECT lprcPosRect);
-    HRESULT doUIActivate(LPMSG lpMsg, LPOLECLIENTSITE pActiveSite, HWND hwndParent, LPCRECT lprcPosRect);
+    HRESULT doInPlaceActivate(LPMSG lpMsg, LPOLECLIENTSITE pActiveSite, HWND hwndParent, LPCRECT lprcPosRect, BOOL uiActivate);
 
     IOleAdviseHolder *_p_advise_holder;
     IOleClientSite *_p_clientsite;