]> git.sesse.net Git - vlc/blobdiff - activex/plugin.cpp
Removes trailing spaces. Removes tabs.
[vlc] / activex / plugin.cpp
index e1f0c91ba7ef5cabecd266765a7188c4f202c58a..4f7908271f9fc233f89bbdf6f090bb7c5f6f4020 100644 (file)
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * plugin.cpp: ActiveX control for VLC
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2006 the VideoLAN team
  *
  * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
  *
@@ -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.
  *****************************************************************************/
 
 #include "plugin.h"
 #include "connectioncontainer.h"
 #include "objectsafety.h"
 #include "vlccontrol.h"
+#include "vlccontrol2.h"
 #include "viewobject.h"
+#include "dataobject.h"
+#include "supporterrorinfo.h"
 
 #include "utils.h"
 
 #include <string.h>
 #include <winreg.h>
+#include <winuser.h>
+#include <servprov.h>
+#include <shlwapi.h>
+#include <wininet.h>
 
 using namespace std;
 
 ////////////////////////////////////////////////////////////////////////
 //class factory
 
-// {E23FE9C6-778E-49d4-B537-38FCDE4887D8}
-//const GUID CLSID_VLCPlugin = 
-//    { 0xe23fe9c6, 0x778e, 0x49d4, { 0xb5, 0x37, 0x38, 0xfc, 0xde, 0x48, 0x87, 0xd8 } };
-
 static LRESULT CALLBACK VLCInPlaceClassWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
-    switch( uMsg )
-    {
-        case WM_ERASEBKGND:
-            return 1L;
-
-        case WM_PAINT:
-            PAINTSTRUCT ps;
-            if( GetUpdateRect(hWnd, NULL, FALSE) )
-            {
-                BeginPaint(hWnd, &ps);
-                EndPaint(hWnd, &ps);
-            }
-            return 0L;
-
-        default:
-            return DefWindowProc(hWnd, uMsg, wParam, lParam);
-    }
-};
-
-static LRESULT CALLBACK VLCVideoClassWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
     VLCPlugin *p_instance = reinterpret_cast<VLCPlugin *>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
 
     switch( uMsg )
@@ -95,15 +78,17 @@ static LRESULT CALLBACK VLCVideoClassWndProc(HWND hWnd, UINT uMsg, WPARAM wParam
     }
 };
 
-VLCPluginClass::VLCPluginClass(LONG *p_class_ref, HINSTANCE hInstance) :
+VLCPluginClass::VLCPluginClass(LONG *p_class_ref, HINSTANCE hInstance, REFCLSID rclsid) :
     _p_class_ref(p_class_ref),
-    _hinstance(hInstance)
+    _hinstance(hInstance),
+    _classid(rclsid),
+    _inplace_picture(NULL)
 {
     WNDCLASS wClass;
 
     if( ! GetClassInfo(hInstance, getInPlaceWndClassName(), &wClass) )
     {
-        wClass.style          = CS_NOCLOSE|CS_HREDRAW|CS_VREDRAW|CS_DBLCLKS;
+        wClass.style          = CS_NOCLOSE|CS_DBLCLKS;
         wClass.lpfnWndProc    = VLCInPlaceClassWndProc;
         wClass.cbClsExtra     = 0;
         wClass.cbWndExtra     = 0;
@@ -113,7 +98,7 @@ VLCPluginClass::VLCPluginClass(LONG *p_class_ref, HINSTANCE hInstance) :
         wClass.hbrBackground  = NULL;
         wClass.lpszMenuName   = NULL;
         wClass.lpszClassName  = getInPlaceWndClassName();
-       
+
         _inplace_wndclass_atom = RegisterClass(&wClass);
     }
     else
@@ -121,28 +106,19 @@ VLCPluginClass::VLCPluginClass(LONG *p_class_ref, HINSTANCE hInstance) :
         _inplace_wndclass_atom = 0;
     }
 
-    if( ! GetClassInfo(hInstance, getVideoWndClassName(), &wClass) )
-    {
-        wClass.style          = CS_NOCLOSE|CS_HREDRAW|CS_VREDRAW;
-        wClass.lpfnWndProc    = VLCVideoClassWndProc;
-        wClass.cbClsExtra     = 0;
-        wClass.cbWndExtra     = 0;
-        wClass.hInstance      = hInstance;
-        wClass.hIcon          = NULL;
-        wClass.hCursor        = LoadCursor(NULL, IDC_ARROW);
-        wClass.hbrBackground  = NULL;
-        wClass.lpszMenuName   = NULL;
-        wClass.lpszClassName  = getVideoWndClassName();
-       
-        _video_wndclass_atom = RegisterClass(&wClass);
-    }
-    else
+    HBITMAP hbitmap = (HBITMAP)LoadImage(getHInstance(), TEXT("INPLACE-PICT"), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+    if( NULL != hbitmap )
     {
-        _video_wndclass_atom = 0;
-    }
+        PICTDESC pictDesc;
 
-    _inplace_hbitmap = (HBITMAP)LoadImage(getHInstance(), TEXT("INPLACE-PICT"), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR);
+        pictDesc.cbSizeofstruct = sizeof(PICTDESC);
+        pictDesc.picType        = PICTYPE_BITMAP;
+        pictDesc.bmp.hbitmap    = hbitmap;
+        pictDesc.bmp.hpal       = NULL;
 
+        if( FAILED(OleCreatePictureIndirect(&pictDesc, IID_IPicture, TRUE, reinterpret_cast<LPVOID*>(&_inplace_picture))) )
+            _inplace_picture = NULL;
+    }
     AddRef();
 };
 
@@ -151,11 +127,8 @@ VLCPluginClass::~VLCPluginClass()
     if( 0 != _inplace_wndclass_atom )
         UnregisterClass(MAKEINTATOM(_inplace_wndclass_atom), _hinstance);
 
-    if( 0 != _video_wndclass_atom )
-        UnregisterClass(MAKEINTATOM(_video_wndclass_atom), _hinstance);
-
-    if( NULL != _inplace_hbitmap )
-        DeleteObject(_inplace_hbitmap);
+    if( NULL != _inplace_picture )
+        _inplace_picture->Release();
 };
 
 STDMETHODIMP VLCPluginClass::QueryInterface(REFIID riid, void **ppv)
@@ -163,7 +136,8 @@ STDMETHODIMP VLCPluginClass::QueryInterface(REFIID riid, void **ppv)
     if( NULL == ppv )
         return E_INVALIDARG;
 
-    if( (IID_IUnknown == riid) || (IID_IClassFactory == riid) )
+    if( (IID_IUnknown == riid)
+     || (IID_IClassFactory == riid) )
     {
         AddRef();
         *ppv = reinterpret_cast<LPVOID>(this);
@@ -192,20 +166,22 @@ STDMETHODIMP_(ULONG) VLCPluginClass::Release(void)
     return refcount;
 };
 
-STDMETHODIMP VLCPluginClass::CreateInstance(IUnknown *pUnkOuter, REFIID riid, void **ppv)
+STDMETHODIMP VLCPluginClass::CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void **ppv)
 {
     if( NULL == ppv )
         return E_POINTER;
 
     *ppv = NULL;
 
-    if( NULL != pUnkOuter )
+    if( (NULL != pUnkOuter) && (IID_IUnknown != riid) ) {
         return CLASS_E_NOAGGREGATION;
+    }
 
-    VLCPlugin *plugin = new VLCPlugin(this);
+    VLCPlugin *plugin = new VLCPlugin(this, pUnkOuter);
     if( NULL != plugin )
     {
         HRESULT hr = plugin->QueryInterface(riid, ppv);
+        // the following will destroy the object if QueryInterface() failed
         plugin->Release();
         return hr;
     }
@@ -216,7 +192,7 @@ STDMETHODIMP VLCPluginClass::LockServer(BOOL fLock)
 {
     if( fLock )
         AddRef();
-    else 
+    else
         Release();
 
     return S_OK;
@@ -224,22 +200,16 @@ STDMETHODIMP VLCPluginClass::LockServer(BOOL fLock)
 
 ////////////////////////////////////////////////////////////////////////
 
-VLCPlugin::VLCPlugin(VLCPluginClass *p_class) :
+VLCPlugin::VLCPlugin(VLCPluginClass *p_class, LPUNKNOWN pUnkOuter) :
     _inplacewnd(NULL),
     _p_class(p_class),
     _i_ref(1UL),
-    _codepage(CP_ACP),
-    _psz_src(NULL),
-    _b_autostart(TRUE),
-    _b_loopmode(FALSE),
-    _b_visible(TRUE),
-    _b_mute(FALSE),
-    _b_sendevents(TRUE),
-    _i_vlc(0)
+    _p_libvlc(NULL),
+    _i_codepage(CP_ACP),
+    _b_usermode(TRUE)
 {
     p_class->AddRef();
 
-    vlcOleObject = new VLCOleObject(this);
     vlcOleControl = new VLCOleControl(this);
     vlcOleInPlaceObject = new VLCOleInPlaceObject(this);
     vlcOleInPlaceActiveObject = new VLCOleInPlaceActiveObject(this);
@@ -250,23 +220,30 @@ VLCPlugin::VLCPlugin(VLCPluginClass *p_class) :
     vlcConnectionPointContainer = new VLCConnectionPointContainer(this);
     vlcObjectSafety = new VLCObjectSafety(this);
     vlcControl = new VLCControl(this);
+    vlcControl2 = new VLCControl2(this);
     vlcViewObject = new VLCViewObject(this);
+    vlcDataObject = new VLCDataObject(this);
+    vlcOleObject = new VLCOleObject(this);
+    vlcSupportErrorInfo = new VLCSupportErrorInfo(this);
+
+    // configure controlling IUnknown interface for implemented interfaces
+    this->pUnkOuter = (NULL != pUnkOuter) ? pUnkOuter : dynamic_cast<LPUNKNOWN>(this);
+
+    // default picure
+    _p_pict = p_class->getInPlacePict();
 
-    // set default/preferred size (320x240) pixels in HIMETRIC
-    HDC hDC = CreateDevDC(NULL);
-    _extent.cx = (320*2540L)/GetDeviceCaps(hDC, LOGPIXELSX);
-    _extent.cy = (240*2540L)/GetDeviceCaps(hDC, LOGPIXELSY);
-    DeleteDC(hDC);
+    // make sure that persistable properties are initialized
+    onInit();
 };
 
 VLCPlugin::~VLCPlugin()
 {
-    vlcOleInPlaceObject->UIDeactivate();
-    vlcOleInPlaceObject->InPlaceDeactivate();
-
+    delete vlcSupportErrorInfo;
+    delete vlcOleObject;
+    delete vlcDataObject;
     delete vlcViewObject;
+    delete vlcControl2;
     delete vlcControl;
-    delete vlcObjectSafety;
     delete vlcConnectionPointContainer;
     delete vlcProvideClassInfo;
     delete vlcPersistPropertyBag;
@@ -274,11 +251,14 @@ VLCPlugin::~VLCPlugin()
     delete vlcPersistStorage;
     delete vlcOleInPlaceActiveObject;
     delete vlcOleInPlaceObject;
+    delete vlcObjectSafety;
+
     delete vlcOleControl;
-    delete vlcOleObject;
+    if( _p_pict )
+        _p_pict->Release();
 
-    if( _psz_src )
-        free(_psz_src);
+    SysFreeString(_bstr_mrl);
+    SysFreeString(_bstr_baseurl);
 
     _p_class->Release();
 };
@@ -289,117 +269,56 @@ STDMETHODIMP VLCPlugin::QueryInterface(REFIID riid, void **ppv)
         return E_INVALIDARG;
 
     if( IID_IUnknown == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(this);
-        return NOERROR;
-    }
     else if( IID_IOleObject == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcOleObject);
-        return NOERROR;
-    }
     else if( IID_IOleControl == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcOleControl);
-        return NOERROR;
-    }
     else if( IID_IOleWindow == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcOleInPlaceObject);
-        return NOERROR;
-    }
     else if( IID_IOleInPlaceObject == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcOleInPlaceObject);
-        return NOERROR;
-    }
     else if( IID_IOleInPlaceActiveObject == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcOleInPlaceActiveObject);
-        return NOERROR;
-    }
     else if( IID_IPersist == riid )
-    {
-        AddRef();
-        *ppv = reinterpret_cast<LPVOID>(vlcPersistPropertyBag);
-        return NOERROR;
-    }
+        *ppv = reinterpret_cast<LPVOID>(vlcPersistStreamInit);
     else if( IID_IPersistStreamInit == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcPersistStreamInit);
-        return NOERROR;
-    }
     else if( IID_IPersistStorage == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcPersistStorage);
-        return NOERROR;
-    }
     else if( IID_IPersistPropertyBag == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcPersistPropertyBag);
-        return NOERROR;
-    }
     else if( IID_IProvideClassInfo == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcProvideClassInfo);
-        return NOERROR;
-    }
     else if( IID_IProvideClassInfo2 == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcProvideClassInfo);
-        return NOERROR;
-    }
     else if( IID_IConnectionPointContainer == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcConnectionPointContainer);
-        return NOERROR;
-    }
     else if( IID_IObjectSafety == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcObjectSafety);
-        return NOERROR;
-    }
     else if( IID_IDispatch == riid )
-    {
-        AddRef();
-        *ppv = reinterpret_cast<LPVOID>(vlcControl);
-        return NOERROR;
-    }
+        *ppv = (CLSID_VLCPlugin2 == getClassID()) ?
+                reinterpret_cast<LPVOID>(vlcControl2) :
+                reinterpret_cast<LPVOID>(vlcControl);
     else if( IID_IVLCControl == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcControl);
-        return NOERROR;
-    }
+    else if( IID_IVLCControl2 == riid )
+        *ppv = reinterpret_cast<LPVOID>(vlcControl2);
     else if( IID_IViewObject == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcViewObject);
-        return NOERROR;
-    }
     else if( IID_IViewObject2 == riid )
-    {
-        AddRef();
         *ppv = reinterpret_cast<LPVOID>(vlcViewObject);
-        return NOERROR;
+    else if( IID_IDataObject == riid )
+        *ppv = reinterpret_cast<LPVOID>(vlcDataObject);
+    else if( IID_ISupportErrorInfo == riid )
+        *ppv = reinterpret_cast<LPVOID>(vlcSupportErrorInfo);
+    else
+    {
+        *ppv = NULL;
+        return E_NOINTERFACE;
     }
-
-    *ppv = NULL;
-
-    return E_NOINTERFACE;
+    ((LPUNKNOWN)*ppv)->AddRef();
+    return NOERROR;
 };
 
 STDMETHODIMP_(ULONG) VLCPlugin::AddRef(void)
@@ -419,190 +338,330 @@ STDMETHODIMP_(ULONG) VLCPlugin::Release(void)
 
 //////////////////////////////////////
 
-/*
-** we use a window to represent plugin viewport,
-** whose geometry is limited by the clipping rectangle
-** all drawing within this window must follow must
-** follow coordinates system described in lprPosRect
-*/
-
-static void getViewportCoords(LPRECT lprPosRect, LPRECT lprClipRect)
+HRESULT VLCPlugin::onInit(void)
 {
-    RECT bounds;
-    bounds.right  = lprPosRect->right-lprPosRect->left;
-
-    if( lprClipRect->left <= lprPosRect->left )
+    if( NULL == _p_libvlc )
     {
-        // left side is not clipped out
-        bounds.left = 0;
+        // initialize persistable properties
+        _b_autoplay = TRUE;
+        _b_autoloop = FALSE;
+        _bstr_baseurl = NULL;
+        _bstr_mrl = NULL;
+        _b_visible = TRUE;
+        _b_mute = FALSE;
+        _i_volume = 50;
+        _i_time   = 0;
+        _i_backcolor = 0;
+        // set default/preferred size (320x240) pixels in HIMETRIC
+        HDC hDC = CreateDevDC(NULL);
+        _extent.cx = 320;
+        _extent.cy = 240;
+        HimetricFromDP(hDC, (LPPOINT)&_extent, 1);
+        DeleteDC(hDC);
 
-        if( lprClipRect->right >= lprPosRect->right )
-        {
-            // right side is not clipped out, no change
-        }
-        else if( lprClipRect->right >= lprPosRect->left )
-        {
-            // right side is clipped out
-            lprPosRect->right = lprClipRect->right;
-        }
-        else
-        {
-            // outside of clipping rectange, not visible
-            lprPosRect->right = lprPosRect->left;
-        }
+        return S_OK;
     }
-    else
-    {
-        // left side is clipped out
-        bounds.left = lprPosRect->left-lprClipRect->left;
-        bounds.right += bounds.left;
+    return CO_E_ALREADYINITIALIZED;
+};
 
-        lprPosRect->left = lprClipRect->left;
-        if( lprClipRect->right >= lprPosRect->right )
-        {
-            // right side is not clipped out
-        }
-        else
+HRESULT VLCPlugin::onLoad(void)
+{
+    if( SysStringLen(_bstr_baseurl) == 0 )
+    {
+        /*
+        ** try to retreive the base URL using the client site moniker, which for Internet Explorer
+        ** is the URL of the page the plugin is embedded into.
+        */
+        LPOLECLIENTSITE pClientSite;
+        if( SUCCEEDED(vlcOleObject->GetClientSite(&pClientSite)) && (NULL != pClientSite) )
         {
-            // right side is clipped out
-            lprPosRect->right = lprClipRect->right;
+            IBindCtx *pBC = 0;
+            if( SUCCEEDED(CreateBindCtx(0, &pBC)) )
+            {
+                LPMONIKER pContMoniker = NULL;
+                if( SUCCEEDED(pClientSite->GetMoniker(OLEGETMONIKER_ONLYIFTHERE,
+                                OLEWHICHMK_CONTAINER, &pContMoniker)) )
+                {
+                    LPOLESTR base_url;
+                    if( SUCCEEDED(pContMoniker->GetDisplayName(pBC, NULL, &base_url)) )
+                    {
+                        /*
+                        ** check that the moniker name is a URL
+                        */
+                        if( UrlIsW(base_url, URLIS_URL) )
+                        {
+                            /* copy base URL */
+                            _bstr_baseurl = SysAllocString(base_url);
+                        }
+                        CoTaskMemFree(base_url);
+                    }
+                }
+            }
         }
     }
+    setDirty(FALSE);
+    return S_OK;
+};
 
-    bounds.bottom = lprPosRect->bottom-lprPosRect->top;
-
-    if( lprClipRect->top <= lprPosRect->top )
+HRESULT VLCPlugin::getVLCObject(int* i_vlc)
+{
+    libvlc_instance_t *p_libvlc;
+    HRESULT result = getVLC(&p_libvlc);
+    if( SUCCEEDED(result) )
     {
-        // top side is not clipped out
-        bounds.top = 0;
-
-        if( lprClipRect->bottom >= lprPosRect->bottom )
-        {
-            // bottom side is not clipped out, no change
-        }
-        else if( lprClipRect->bottom >= lprPosRect->top )
-        {
-            // bottom side is clipped out
-            lprPosRect->bottom = lprClipRect->bottom;
-        }
-        else
-        {
-            // outside of clipping rectange, not visible
-            lprPosRect->right = lprPosRect->left;
-        }
+        *i_vlc = libvlc_get_vlc_id(p_libvlc);
     }
     else
     {
-        bounds.top = lprPosRect->top-lprClipRect->top;
-        bounds.bottom += bounds.top;
-
-        lprPosRect->top = lprClipRect->top;
-        if( lprClipRect->bottom >= lprPosRect->bottom )
-        {
-            // bottom side is not clipped out
-        }
-        else
-        {
-            // bottom side is clipped out
-            lprPosRect->bottom = lprClipRect->bottom;
-        }
+        *i_vlc = 0;
     }
-    *lprClipRect = *lprPosRect;
-    *lprPosRect  = bounds;
-};
+    return result;
+}
 
-HRESULT VLCPlugin::onInit(void)
+HRESULT VLCPlugin::getVLC(libvlc_instance_t** pp_libvlc)
 {
-    if( 0 == _i_vlc )
+    extern HMODULE DllGetModule();
+
+    if( ! isRunning() )
     {
-#ifdef ACTIVEX_DEBUG
-        char *ppsz_argv[] = { "vlc", "-vvv", "--fast-mutex", "--win9x-cv-method=1" };
-#else
-        char *ppsz_argv[] = { "vlc", "-vv" };
-#endif
+        /*
+        ** default initialization options
+        */
+        char *ppsz_argv[32] = { "vlc" };
+        int   ppsz_argc = 1;
+
+        char p_progpath[MAX_PATH];
+        {
+            TCHAR w_progpath[MAX_PATH];
+            DWORD len = GetModuleFileName(DllGetModule(), w_progpath, MAX_PATH);
+            if( len > 0 )
+            {
+                len = WideCharToMultiByte(CP_UTF8, 0, w_progpath, len, p_progpath,
+                           sizeof(p_progpath)-1, NULL, NULL);
+                if( len > 0 )
+                {
+                    p_progpath[len] = '\0';
+                    ppsz_argv[0] = p_progpath;
+                }
+            }
+        }
+
+        ppsz_argv[ppsz_argc++] = "-vv";
+
         HKEY h_key;
-        DWORD i_type, i_data = MAX_PATH + 1;
-        char p_data[MAX_PATH + 1];
-        if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, "Software\\VideoLAN\\VLC",
+        char p_pluginpath[MAX_PATH];
+        if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, TEXT("Software\\VideoLAN\\VLC"),
                           0, KEY_READ, &h_key ) == ERROR_SUCCESS )
         {
-             if( RegQueryValueEx( h_key, "InstallDir", 0, &i_type,
-                                  (LPBYTE)p_data, &i_data ) == ERROR_SUCCESS )
-             {
-                 if( i_type == REG_SZ )
-                 {
-                     strcat( p_data, "\\vlc" );
-                     ppsz_argv[0] = p_data;
-                 }
-             }
-             RegCloseKey( h_key );
+            DWORD i_type, i_data = MAX_PATH;
+            TCHAR w_pluginpath[MAX_PATH];
+            if( RegQueryValueEx( h_key, TEXT("InstallDir"), 0, &i_type,
+                                 (LPBYTE)w_pluginpath, &i_data ) == ERROR_SUCCESS )
+            {
+                if( i_type == REG_SZ )
+                {
+                    if( WideCharToMultiByte(CP_UTF8, 0, w_pluginpath, -1, p_pluginpath,
+                             sizeof(p_pluginpath)-sizeof("\\plugins")+1, NULL, NULL) )
+                    {
+                        strcat( p_pluginpath, "\\plugins" );
+                        ppsz_argv[ppsz_argc++] = "--plugin-path";
+                        ppsz_argv[ppsz_argc++] = p_pluginpath;
+                    }
+                }
+            }
+            RegCloseKey( h_key );
         }
 
-#if 0
-        ppsz_argv[0] = "C:\\cygwin\\home\\Damien_Fouilleul\\dev\\videolan\\vlc-trunk\\vlc";
-#endif
+        // make sure plugin isn't affected with VLC single instance mode
+        ppsz_argv[ppsz_argc++] = "--no-one-instance";
 
-        _i_vlc = VLC_Create();
+        /* common settings */
+        ppsz_argv[ppsz_argc++] = "--no-stats";
+        ppsz_argv[ppsz_argc++] = "--no-media-library";
+        ppsz_argv[ppsz_argc++] = "--intf=dummy";
 
-        if( VLC_Init(_i_vlc, sizeof(ppsz_argv)/sizeof(char*), ppsz_argv) )
+        // loop mode is a configuration option only
+        if( _b_autoloop )
+            ppsz_argv[ppsz_argc++] = "--loop";
+
+        _p_libvlc = libvlc_new(ppsz_argc, ppsz_argv, NULL);
+        if( NULL == _p_libvlc )
         {
-            VLC_Destroy(_i_vlc);
-            _i_vlc = 0;
+            *pp_libvlc = NULL;
             return E_FAIL;
         }
-        return S_OK;
-    }
-    return E_UNEXPECTED;
-};
 
-HRESULT VLCPlugin::onLoad(void)
-{
-    if( _b_mute )
-        VLC_VolumeMute(_i_vlc);
-
-    if( NULL != _psz_src )
-    {
-        // add default target to playlist
-        char *cOptions[1];
-        int  cOptionsCount = 0;
+        // initial volume setting
+        libvlc_audio_set_volume(_p_libvlc, _i_volume, NULL);
+        if( _b_mute )
+        {
+            libvlc_audio_set_mute(_p_libvlc, TRUE, NULL);
+        }
 
-        if( _b_loopmode )
+        // initial playlist item
+        if( SysStringLen(_bstr_mrl) > 0 )
         {
-            cOptions[cOptionsCount++] = "loop";
+            char *psz_mrl = NULL;
+
+            if( SysStringLen(_bstr_baseurl) > 0 )
+            {
+                /*
+                ** if the MRL a relative URL, we should end up with an absolute URL
+                */
+                LPWSTR abs_url = CombineURL(_bstr_baseurl, _bstr_mrl);
+                if( NULL != abs_url )
+                {
+                    psz_mrl = CStrFromWSTR(CP_UTF8, abs_url, wcslen(abs_url));
+                    CoTaskMemFree(abs_url);
+                }
+                else
+                {
+                    psz_mrl = CStrFromBSTR(CP_UTF8, _bstr_mrl);
+                }
+            }
+            else
+            {
+                /*
+                ** baseURL is empty, assume MRL is absolute
+                */
+                psz_mrl = CStrFromBSTR(CP_UTF8, _bstr_mrl);
+            }
+            if( NULL != psz_mrl )
+            {
+                const char *options[1];
+                int i_options = 0;
+
+                char timeBuffer[32];
+                if( _i_time )
+                {
+                    snprintf(timeBuffer, sizeof(timeBuffer), ":start-time=%d", _i_time);
+                    options[i_options++] = timeBuffer;
+                }
+                // add default target to playlist
+                libvlc_playlist_add_extended(_p_libvlc, psz_mrl, NULL, i_options, options, NULL);
+                CoTaskMemFree(psz_mrl);
+            }
         }
-        VLC_AddTarget(_i_vlc, _psz_src, (const char **)&cOptions, cOptionsCount, PLAYLIST_APPEND, PLAYLIST_END);
     }
+    *pp_libvlc = _p_libvlc;
     return S_OK;
 };
 
-HRESULT VLCPlugin::onClientSiteChanged(LPOLECLIENTSITE pActiveSite)
+void VLCPlugin::setErrorInfo(REFIID riid, const char *description)
+{
+    vlcSupportErrorInfo->setErrorInfo( getClassID() == CLSID_VLCPlugin2 ?
+        OLESTR("VideoLAN.VLCPlugin.2") : OLESTR("VideoLAN.VLCPlugin.1"),
+        riid, description );
+};
+
+HRESULT VLCPlugin::onAmbientChanged(LPUNKNOWN pContainer, DISPID dispID)
 {
-    if( NULL != pActiveSite )
+    VARIANT v;
+    switch( dispID )
     {
-        /*
-        ** object is embedded in container 
-        ** try to activate in place if it has initialized
-        */
-        if( _i_vlc )
-        {
-            vlcOleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL, pActiveSite, 0, NULL, NULL);
-        }
+        case DISPID_AMBIENT_BACKCOLOR:
+            VariantInit(&v);
+            V_VT(&v) = VT_I4;
+            if( SUCCEEDED(GetObjectProperty(pContainer, dispID, v)) )
+            {
+                setBackColor(V_I4(&v));
+            }
+            break;
+        case DISPID_AMBIENT_DISPLAYNAME:
+            break;
+        case DISPID_AMBIENT_FONT:
+            break;
+        case DISPID_AMBIENT_FORECOLOR:
+            break;
+        case DISPID_AMBIENT_LOCALEID:
+            break;
+        case DISPID_AMBIENT_MESSAGEREFLECT:
+            break;
+        case DISPID_AMBIENT_SCALEUNITS:
+            break;
+        case DISPID_AMBIENT_TEXTALIGN:
+            break;
+        case DISPID_AMBIENT_USERMODE:
+            VariantInit(&v);
+            V_VT(&v) = VT_BOOL;
+            if( SUCCEEDED(GetObjectProperty(pContainer, dispID, v)) )
+            {
+                setUserMode(V_BOOL(&v) != VARIANT_FALSE);
+            }
+            break;
+        case DISPID_AMBIENT_UIDEAD:
+            break;
+        case DISPID_AMBIENT_SHOWGRABHANDLES:
+            break;
+        case DISPID_AMBIENT_SHOWHATCHING:
+            break;
+        case DISPID_AMBIENT_DISPLAYASDEFAULT:
+            break;
+        case DISPID_AMBIENT_SUPPORTSMNEMONICS:
+            break;
+        case DISPID_AMBIENT_AUTOCLIP:
+            break;
+        case DISPID_AMBIENT_APPEARANCE:
+            break;
+        case DISPID_AMBIENT_CODEPAGE:
+            VariantInit(&v);
+            V_VT(&v) = VT_I4;
+            if( SUCCEEDED(GetObjectProperty(pContainer, dispID, v)) )
+            {
+                setCodePage(V_I4(&v));
+            }
+            break;
+        case DISPID_AMBIENT_PALETTE:
+            break;
+        case DISPID_AMBIENT_CHARSET:
+            break;
+        case DISPID_AMBIENT_RIGHTTOLEFT:
+            break;
+        case DISPID_AMBIENT_TOPTOBOTTOM:
+            break;
+        case DISPID_UNKNOWN:
+            /*
+            ** multiple property change, look up the ones we are interested in
+            */
+            VariantInit(&v);
+            V_VT(&v) = VT_BOOL;
+            if( SUCCEEDED(GetObjectProperty(pContainer, DISPID_AMBIENT_USERMODE, v)) )
+            {
+                setUserMode(V_BOOL(&v) != VARIANT_FALSE);
+            }
+            VariantInit(&v);
+            V_VT(&v) = VT_I4;
+            if( SUCCEEDED(GetObjectProperty(pContainer, DISPID_AMBIENT_CODEPAGE, v)) )
+            {
+                setCodePage(V_I4(&v));
+            }
+            break;
     }
     return S_OK;
 };
 
 HRESULT VLCPlugin::onClose(DWORD dwSaveOption)
 {
-    if( _i_vlc )
+    if( isInPlaceActive() )
     {
-        if( isInPlaceActive() )
+        onInPlaceDeactivate();
+    }
+    if( isRunning() )
+    {
+        libvlc_instance_t* p_libvlc = _p_libvlc;
+
+        IVLCLog *p_log;
+        if( SUCCEEDED(vlcControl2->get_log(&p_log)) )
         {
-            onInPlaceDeactivate();
+            // make sure the log is disabled
+            p_log->put_verbosity(-1);
+            p_log->Release();
         }
 
-        VLC_CleanUp(_i_vlc);
-        VLC_Destroy(_i_vlc);
-        _i_vlc = 0;
+        _p_libvlc = NULL;
+        vlcDataObject->onClose();
+
+        libvlc_destroy(p_libvlc, NULL );
     }
     return S_OK;
 };
@@ -614,31 +673,26 @@ BOOL VLCPlugin::isInPlaceActive(void)
 
 HRESULT VLCPlugin::onActivateInPlace(LPMSG lpMesg, HWND hwndParent, LPCRECT lprcPosRect, LPCRECT lprcClipRect)
 {
-    RECT posRect = *lprcPosRect;
     RECT clipRect = *lprcClipRect;
 
     /*
     ** record keeping of control geometry within container
-    */ 
-    _posRect = posRect;
-
-    /*
-    ** convert posRect & clipRect to match control viewport coordinates
     */
-    getViewportCoords(&posRect, &clipRect);
+    _posRect = *lprcPosRect;
 
     /*
     ** Create a window for in place activated control.
-    ** the window geometry represents the control viewport
-    ** so that embedded video is always properly clipped.
+    ** the window geometry matches the control viewport
+    ** within container so that embedded video is always
+    ** properly displayed.
     */
     _inplacewnd = CreateWindow(_p_class->getInPlaceWndClassName(),
-            "VLC Plugin In-Place Window",
-            WS_CHILD|WS_CLIPCHILDREN|WS_TABSTOP,
-            clipRect.left,
-            clipRect.top,
-            clipRect.right-clipRect.left,
-            clipRect.bottom-clipRect.top,
+            TEXT("VLC Plugin In-Place Window"),
+            WS_CHILD|WS_CLIPCHILDREN|WS_CLIPSIBLINGS,
+            lprcPosRect->left,
+            lprcPosRect->top,
+            lprcPosRect->right-lprcPosRect->left,
+            lprcPosRect->bottom-lprcPosRect->top,
             hwndParent,
             0,
             _p_class->getHInstance(),
@@ -650,67 +704,122 @@ HRESULT VLCPlugin::onActivateInPlace(LPMSG lpMesg, HWND hwndParent, LPCRECT lprc
 
     SetWindowLongPtr(_inplacewnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
 
-    /*
-    ** VLC embedded video geometry automatically matches parent window.
-    ** hence create a child window so that video position and size
-    ** is always correct relative to the viewport bounds
-    */
-    _videownd = CreateWindow(_p_class->getVideoWndClassName(),
-            "VLC Plugin Video Window",
-            WS_CHILD|WS_CLIPCHILDREN|WS_VISIBLE,
-            posRect.left,
-            posRect.top,
-            posRect.right-posRect.left,
-            posRect.bottom-posRect.top,
-            _inplacewnd,
-            0,
-            _p_class->getHInstance(),
-            NULL
-           );
+    /* change cliprect coordinates system relative to window bounding rect */
+    OffsetRect(&clipRect, -lprcPosRect->left, -lprcPosRect->top);
 
-    if( NULL == _videownd )
+    HRGN clipRgn = CreateRectRgnIndirect(&clipRect);
+    SetWindowRgn(_inplacewnd, clipRgn, TRUE);
+
+    if( _b_usermode )
     {
-        DestroyWindow(_inplacewnd);
-        return E_FAIL;
+        /* will run vlc if not done already */
+        libvlc_instance_t* p_libvlc;
+        HRESULT result = getVLC(&p_libvlc);
+        if( FAILED(result) )
+            return result;
+
+        /* set internal video width and height */
+        libvlc_video_set_size(p_libvlc,
+            lprcPosRect->right-lprcPosRect->left,
+            lprcPosRect->bottom-lprcPosRect->top,
+            NULL );
+
+        /* set internal video parent window */
+        libvlc_video_set_parent(p_libvlc,
+            reinterpret_cast<libvlc_drawable_t>(_inplacewnd), NULL);
+
+        if( _b_autoplay & (libvlc_playlist_items_count(p_libvlc, NULL) > 0) )
+        {
+            libvlc_playlist_play(p_libvlc, 0, 0, NULL, NULL);
+            fireOnPlayEvent();
+        }
     }
 
-    SetWindowLongPtr(_videownd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
-
-    if( getVisible() )
-        ShowWindow(_inplacewnd, SW_SHOWNORMAL);
-
-    /* horrible cast there */
-    vlc_value_t val;
-    val.i_int = reinterpret_cast<int>(_videownd);
-    VLC_VariableSet(_i_vlc, "drawable", val);
+    if( isVisible() )
+        ShowWindow(_inplacewnd, SW_SHOW);
 
-    if( _b_autostart & (VLC_PlaylistNumberOfItems(_i_vlc) > 0) )
-    {
-        VLC_Play(_i_vlc);
-        fireOnPlayEvent();
-    }
     return S_OK;
 };
 
 HRESULT VLCPlugin::onInPlaceDeactivate(void)
 {
-    VLC_Stop(_i_vlc);
-    fireOnStopEvent();
+    if( isRunning() )
+    {
+        libvlc_playlist_stop(_p_libvlc, NULL);
+        fireOnStopEvent();
+    }
 
-    DestroyWindow(_videownd);
-    _videownd = NULL;
     DestroyWindow(_inplacewnd);
     _inplacewnd = NULL;
+
     return S_OK;
 };
 
 void VLCPlugin::setVisible(BOOL fVisible)
 {
-    _b_visible = fVisible;
-    if( isInPlaceActive() )
-        ShowWindow(_inplacewnd, fVisible ? SW_SHOWNORMAL : SW_HIDE);
-    firePropChangedEvent(DISPID_Visible);
+    if( fVisible != _b_visible )
+    {
+        _b_visible = fVisible;
+        if( isInPlaceActive() )
+        {
+            ShowWindow(_inplacewnd, fVisible ? SW_SHOW : SW_HIDE);
+            if( fVisible )
+                InvalidateRect(_inplacewnd, NULL, TRUE);
+        }
+        setDirty(TRUE);
+        firePropChangedEvent(DISPID_Visible);
+    }
+};
+
+void VLCPlugin::setVolume(int volume)
+{
+    if( volume < 0 )
+        volume = 0;
+    else if( volume > 200 )
+        volume = 200;
+
+    if( volume != _i_volume )
+    {
+        _i_volume = volume;
+        if( isRunning() )
+        {
+            libvlc_audio_set_volume(_p_libvlc, _i_volume, NULL);
+        }
+        setDirty(TRUE);
+    }
+};
+
+void VLCPlugin::setBackColor(OLE_COLOR backcolor)
+{
+    if( _i_backcolor != backcolor )
+    {
+        _i_backcolor = backcolor;
+        if( isInPlaceActive() )
+        {
+
+        }
+        setDirty(TRUE);
+    }
+};
+
+void VLCPlugin::setTime(int seconds)
+{
+    if( seconds < 0 )
+        seconds = 0;
+
+    if( seconds != _i_time )
+    {
+        setStartTime(_i_time);
+        if( isRunning() )
+        {
+            libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(_p_libvlc, NULL);
+            if( NULL != p_md )
+            {
+                libvlc_media_instance_set_time(p_md, _i_time, NULL);
+                libvlc_media_instance_release(p_md);
+            }
+        }
+    }
 };
 
 void VLCPlugin::setFocus(BOOL fFocus)
@@ -724,145 +833,199 @@ BOOL VLCPlugin::hasFocus(void)
     return GetActiveWindow() == _inplacewnd;
 };
 
-void VLCPlugin::onPaint(HDC hdc, const RECT &bounds, const RECT &pr)
+void VLCPlugin::onDraw(DVTARGETDEVICE * ptd, HDC hicTargetDev,
+        HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds)
 {
-    if( getVisible() )
+    if( isVisible() )
     {
-        /*
-        ** if VLC is playing, it may not display any VIDEO content 
-        ** hence, draw control logo
-        */ 
-        int width = bounds.right-bounds.left;
-        int height = bounds.bottom-bounds.top;
-
-        HBITMAP pict = _p_class->getInPlacePict();
-        if( NULL != pict )
+        long width = lprcBounds->right-lprcBounds->left;
+        long height = lprcBounds->bottom-lprcBounds->top;
+
+        RECT bounds = { lprcBounds->left, lprcBounds->top, lprcBounds->right, lprcBounds->bottom };
+
+        if( isUserMode() )
         {
-            HDC hdcPict = CreateCompatibleDC(hdc);
-            if( NULL != hdcPict )
+            /* VLC is in user mode, just draw background color */
+            COLORREF colorref = RGB(0, 0, 0);
+            OleTranslateColor(_i_backcolor, (HPALETTE)GetStockObject(DEFAULT_PALETTE), &colorref);
+            if( colorref != RGB(0, 0, 0) )
+            {
+                /* custom background */
+                HBRUSH colorbrush = CreateSolidBrush(colorref);
+                FillRect(hdcDraw, &bounds, colorbrush);
+                DeleteObject((HANDLE)colorbrush);
+            }
+            else
+            {
+                /* black background */
+                FillRect(hdcDraw, &bounds, (HBRUSH)GetStockObject(BLACK_BRUSH));
+            }
+        }
+        else
+        {
+            /* VLC is in design mode, draw the VLC logo */
+            FillRect(hdcDraw, &bounds, (HBRUSH)GetStockObject(WHITE_BRUSH));
+
+            LPPICTURE pict = getPicture();
+            if( NULL != pict )
             {
-                BITMAP bm;
-                if( GetObject(pict, sizeof(BITMAPINFO), &bm) )
+                OLE_XSIZE_HIMETRIC picWidth;
+                OLE_YSIZE_HIMETRIC picHeight;
+
+                pict->get_Width(&picWidth);
+                pict->get_Height(&picHeight);
+
+                SIZEL picSize = { picWidth, picHeight };
+
+                if( NULL != hicTargetDev )
                 {
-                    int dstWidth = bm.bmWidth;
-                    if( dstWidth > width-4 )
-                        dstWidth = width-4;
-
-                    int dstHeight = bm.bmHeight;
-                    if( dstHeight > height-4 )
-                        dstHeight = height-4;
-
-                    int dstX = bounds.left+(width-dstWidth)/2;
-                    int dstY = bounds.top+(height-dstHeight)/2;
-
-                    SelectObject(hdcPict, pict);
-                    StretchBlt(hdc, dstX, dstY, dstWidth, dstHeight,
-                            hdcPict, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY);
-                    DeleteDC(hdcPict);
-                    ExcludeClipRect(hdc, dstX, dstY, dstWidth+dstX, dstHeight+dstY);
+                    DPFromHimetric(hicTargetDev, (LPPOINT)&picSize, 1);
                 }
+                else if( NULL != (hicTargetDev = CreateDevDC(ptd)) )
+                {
+                    DPFromHimetric(hicTargetDev, (LPPOINT)&picSize, 1);
+                    DeleteDC(hicTargetDev);
+                }
+
+                if( picSize.cx > width-4 )
+                    picSize.cx = width-4;
+                if( picSize.cy > height-4 )
+                    picSize.cy = height-4;
+
+                LONG dstX = lprcBounds->left+(width-picSize.cx)/2;
+                LONG dstY = lprcBounds->top+(height-picSize.cy)/2;
+
+                if( NULL != lprcWBounds )
+                {
+                    RECT wBounds = { lprcWBounds->left, lprcWBounds->top, lprcWBounds->right, lprcWBounds->bottom };
+                    pict->Render(hdcDraw, dstX, dstY, picSize.cx, picSize.cy,
+                            0L, picHeight, picWidth, -picHeight, &wBounds);
+                }
+                else
+                    pict->Render(hdcDraw, dstX, dstY, picSize.cx, picSize.cy,
+                            0L, picHeight, picWidth, -picHeight, NULL);
+
+                pict->Release();
             }
-        }
 
-        FillRect(hdc, &pr, (HBRUSH)GetStockObject(WHITE_BRUSH));
-        SelectObject(hdc, GetStockObject(BLACK_BRUSH));
+            SelectObject(hdcDraw, GetStockObject(BLACK_BRUSH));
 
-        MoveToEx(hdc, bounds.left, bounds.top, NULL);
-        LineTo(hdc, bounds.left+width-1, bounds.top);
-        LineTo(hdc, bounds.left+width-1, bounds.top+height-1);
-        LineTo(hdc, bounds.left, bounds.top+height-1);
-        LineTo(hdc, bounds.left, bounds.top);
+            MoveToEx(hdcDraw, bounds.left, bounds.top, NULL);
+            LineTo(hdcDraw, bounds.left+width-1, bounds.top);
+            LineTo(hdcDraw, bounds.left+width-1, bounds.top+height-1);
+            LineTo(hdcDraw, bounds.left, bounds.top+height-1);
+            LineTo(hdcDraw, bounds.left, bounds.top);
+        }
     }
 };
 
-void VLCPlugin::onPositionChange(LPCRECT lprcPosRect, LPCRECT lprcClipRect)
+void VLCPlugin::onPaint(HDC hdc, const RECT &bounds, const RECT &clipRect)
 {
-    RECT clipRect = *lprcClipRect;
-    RECT posRect  = *lprcPosRect;
+    if( isVisible() )
+    {
+        /* if VLC is in design mode, draw control logo */
+        HDC hdcDraw = CreateCompatibleDC(hdc);
+        if( NULL != hdcDraw )
+        {
+            SIZEL size = getExtent();
+            DPFromHimetric(hdc, (LPPOINT)&size, 1);
+            RECTL posRect = { 0, 0, size.cx, size.cy };
 
-    /*
-    ** tell container that previous area needs redrawing
-    */
+            int width = bounds.right-bounds.left;
+            int height = bounds.bottom-bounds.top;
 
-    InvalidateRect(GetParent(_inplacewnd), &_posRect, TRUE);
+            HBITMAP hBitmap = CreateCompatibleBitmap(hdc, width, height);
+            if( NULL != hBitmap )
+            {
+                HBITMAP oldBmp = (HBITMAP)SelectObject(hdcDraw, hBitmap);
 
-    /*
-    ** record keeping of control geometry within container
-    */
+                if( (size.cx != width) || (size.cy != height) )
+                {
+                    // needs to scale canvas
+                    SetMapMode(hdcDraw, MM_ANISOTROPIC);
+                    SetWindowExtEx(hdcDraw, size.cx, size.cy, NULL);
+                    SetViewportExtEx(hdcDraw, width, height, NULL);
+                }
 
-    _posRect = posRect;
+                onDraw(NULL, hdc, hdcDraw, &posRect, NULL);
 
-    /*
-    ** convert posRect & clipRect to match control viewport coordinates
-    */
-    getViewportCoords(&posRect, &clipRect);
+                SetMapMode(hdcDraw, MM_TEXT);
+                BitBlt(hdc, bounds.left, bounds.top,
+                        width, height,
+                        hdcDraw, 0, 0,
+                        SRCCOPY);
 
-    /*
-    ** change in-place window geometry to match clipping region
-    */
-    MoveWindow(_inplacewnd,
-            clipRect.left,
-            clipRect.top,
-            clipRect.right-clipRect.left,
-            clipRect.bottom-clipRect.top,
-            FALSE);
+                SelectObject(hdcDraw, oldBmp);
+                DeleteObject(hBitmap);
+            }
+            DeleteDC(hdcDraw);
+        }
+    }
+};
+
+void VLCPlugin::onPositionChange(LPCRECT lprcPosRect, LPCRECT lprcClipRect)
+{
+    RECT clipRect = *lprcClipRect;
+
+    //RedrawWindow(GetParent(_inplacewnd), &_posRect, NULL, RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN);
 
     /*
-    ** change video window geometry to match object bounds within clipping region
+    ** record keeping of control geometry within container
     */
-    MoveWindow(_videownd,
-            posRect.left,
-            posRect.top,
-            posRect.right-posRect.left,
-            posRect.bottom-posRect.top,
-            FALSE);
+    _posRect = *lprcPosRect;
 
     /*
-    ** force a full refresh of control content
+    ** change in-place window geometry to match clipping region
     */
-    RECT updateRect;
-    updateRect.left = -posRect.left;
-    updateRect.top = -posRect.top;
-    updateRect.right = posRect.right-posRect.left;
-    updateRect.bottom = posRect.bottom-posRect.top;
+    SetWindowPos(_inplacewnd, NULL,
+            lprcPosRect->left,
+            lprcPosRect->top,
+            lprcPosRect->right-lprcPosRect->left,
+            lprcPosRect->bottom-lprcPosRect->top,
+            SWP_NOACTIVATE|
+            SWP_NOCOPYBITS|
+            SWP_NOZORDER|
+            SWP_NOOWNERZORDER );
+
+    /* change cliprect coordinates system relative to window bounding rect */
+    OffsetRect(&clipRect, -lprcPosRect->left, -lprcPosRect->top);
+    HRGN clipRgn = CreateRectRgnIndirect(&clipRect);
+    SetWindowRgn(_inplacewnd, clipRgn, FALSE);
+
+    //RedrawWindow(_videownd, &posRect, NULL, RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN);
+    if( isRunning() )
+    {
+        libvlc_video_set_size(_p_libvlc,
+            lprcPosRect->right-lprcPosRect->left,
+            lprcPosRect->bottom-lprcPosRect->top,
+            NULL );
+    }
+};
 
-    ValidateRect(_videownd, NULL);
-    InvalidateRect(_videownd, &updateRect, FALSE);
-    UpdateWindow(_videownd);
+void VLCPlugin::freezeEvents(BOOL freeze)
+{
+    vlcConnectionPointContainer->freezeEvents(freeze);
 };
 
 void VLCPlugin::firePropChangedEvent(DISPID dispid)
 {
-    if( _b_sendevents )
-    {
-        vlcConnectionPointContainer->firePropChangedEvent(dispid); 
-    }
+    vlcConnectionPointContainer->firePropChangedEvent(dispid);
 };
 
 void VLCPlugin::fireOnPlayEvent(void)
 {
-    if( _b_sendevents )
-    {
-        DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
-        vlcConnectionPointContainer->fireEvent(DISPID_PlayEvent, &dispparamsNoArgs); 
-    }
+    DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
+    vlcConnectionPointContainer->fireEvent(DISPID_PlayEvent, &dispparamsNoArgs);
 };
 
 void VLCPlugin::fireOnPauseEvent(void)
 {
-    if( _b_sendevents )
-    {
-        DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
-        vlcConnectionPointContainer->fireEvent(DISPID_PauseEvent, &dispparamsNoArgs); 
-    }
+    DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
+    vlcConnectionPointContainer->fireEvent(DISPID_PauseEvent, &dispparamsNoArgs);
 };
 
 void VLCPlugin::fireOnStopEvent(void)
 {
-    if( _b_sendevents )
-    {
-        DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
-        vlcConnectionPointContainer->fireEvent(DISPID_StopEvent, &dispparamsNoArgs); 
-    }
+    DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
+    vlcConnectionPointContainer->fireEvent(DISPID_StopEvent, &dispparamsNoArgs);
 };
-