X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2Foleinplaceactiveobject.cpp;h=69878c48c384382d176c6b9d597851740503d8f1;hb=19e1fd66b1aab7426bcb2a13555ea959e4d9e644;hp=222985cdc71452559b753905bcc54ed92642f423;hpb=fe087a38282e93addb25fa9598393e40ea233b09;p=vlc

diff --git a/activex/oleinplaceactiveobject.cpp b/activex/oleinplaceactiveobject.cpp
index 222985cdc7..69878c48c3 100644
--- a/activex/oleinplaceactiveobject.cpp
+++ b/activex/oleinplaceactiveobject.cpp
@@ -28,18 +28,15 @@ using namespace std;
 STDMETHODIMP VLCOleInPlaceActiveObject::GetWindow(HWND *pHwnd)
 {
     if( NULL == pHwnd )
-        return E_INVALIDARG;
+        return E_POINTER;
 
+    *pHwnd = NULL;
     if( _p_instance->isInPlaceActive() )
     {
         if( NULL != (*pHwnd = _p_instance->getInPlaceWindow()) )
             return S_OK;
-
-        return E_FAIL;
     }
-    *pHwnd = NULL;
-
-    return E_UNEXPECTED;
+    return E_FAIL;
 };
 
 STDMETHODIMP VLCOleInPlaceActiveObject::EnableModeless(BOOL fEnable)