mkv.cpp: support the new A_AAC codec ID and SBR for older IDs (more tests needed)

[vlc] / activex / oleinplaceobject.cpp

diff --git a/activex/oleinplaceobject.cpp b/activex/oleinplaceobject.cpp
index 80c4a519b35493ea2a259f8d4bff8b91ccc876fb..0ad8a58e60a2c159f99b43331f34de4cb671b9c2 100644 (file)
--- a/activex/oleinplaceobject.cpp
+++ b/activex/oleinplaceobject.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * oleinplaceobject.cpp: ActiveX control for VLC
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
  *
  * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
  *
@@ -30,18 +30,15 @@ using namespace std;
 STDMETHODIMP VLCOleInPlaceObject::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 VLCOleInPlaceObject::ContextSensitiveHelp(BOOL fEnterMode)
@@ -54,6 +51,7 @@ STDMETHODIMP VLCOleInPlaceObject::InPlaceDeactivate(void)
     if( _p_instance->isInPlaceActive() )
     {
         UIDeactivate();
+
         _p_instance->onInPlaceDeactivate();
 
         LPOLEOBJECT p_oleObject;
@@ -85,26 +83,26 @@ STDMETHODIMP VLCOleInPlaceObject::UIDeactivate(void)
         if( _p_instance->hasFocus() )
         {
             _p_instance->setFocus(FALSE);
+        }
 
-            LPOLEOBJECT p_oleObject;
-            if( SUCCEEDED(QueryInterface(IID_IOleObject, (void**)&p_oleObject)) ) 
+        LPOLEOBJECT p_oleObject;
+        if( SUCCEEDED(QueryInterface(IID_IOleObject, (void**)&p_oleObject)) ) 
+        {
+            LPOLECLIENTSITE p_clientSite;
+            if( SUCCEEDED(p_oleObject->GetClientSite(&p_clientSite)) )
             {
-                LPOLECLIENTSITE p_clientSite;
-                if( SUCCEEDED(p_oleObject->GetClientSite(&p_clientSite)) )
+                LPOLEINPLACESITE p_inPlaceSite;
+
+                if( SUCCEEDED(p_clientSite->QueryInterface(IID_IOleInPlaceSite, (void**)&p_inPlaceSite)) )
                 {
-                    LPOLEINPLACESITE p_inPlaceSite;
-
-                    if( SUCCEEDED(p_clientSite->QueryInterface(IID_IOleInPlaceSite, (void**)&p_inPlaceSite)) )
-                    {
-                        p_inPlaceSite->OnUIDeactivate(FALSE);
-                        p_inPlaceSite->Release();
-                    }
-                    p_clientSite->Release();
+                    p_inPlaceSite->OnUIDeactivate(FALSE);
+                    p_inPlaceSite->Release();
                 }
-                p_oleObject->Release();
+                p_clientSite->Release();
             }
-            return S_OK;
+            p_oleObject->Release();
         }
+        return S_OK;
     }
     return E_UNEXPECTED;
 };