X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2Fpersistpropbag.cpp;h=2fc0873179b339558692051361d9d46eb168261f;hb=4d6d9949cc44e1e87904dc897c6df0cda3badd26;hp=e1fb0ab75b7c29da63758e2b20a083476ce6f868;hpb=3d831e04ece115bb9ca379b9552370755453e46e;p=vlc

diff --git a/activex/persistpropbag.cpp b/activex/persistpropbag.cpp
index e1fb0ab75b..2fc0873179 100644
--- a/activex/persistpropbag.cpp
+++ b/activex/persistpropbag.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * persistpropbag.cpp: ActiveX control for VLC
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
  *
  * Authors: Damien Fouilleul <Damien.Fouilleul@laposte.net>
  *
@@ -24,6 +24,7 @@
 #include "persistpropbag.h"
 
 #include "utils.h"
+#include "oleobject.h"
 
 using namespace std;
 
@@ -39,7 +40,7 @@ STDMETHODIMP VLCPersistPropertyBag::GetClassID(LPCLSID pClsID)
 
 STDMETHODIMP VLCPersistPropertyBag::InitNew(void)
 {
-    return _p_instance->onInitNew();
+    return _p_instance->onInit();
 };
 
 STDMETHODIMP VLCPersistPropertyBag::Load(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog)
@@ -47,7 +48,7 @@ STDMETHODIMP VLCPersistPropertyBag::Load(LPPROPERTYBAG pPropBag, LPERRORLOG pErr
     if( NULL == pPropBag )
         return E_POINTER;
 
-    HRESULT hr = _p_instance->onInitNew();
+    HRESULT hr = _p_instance->onInit();
     if( FAILED(hr) )
         return hr;
 
@@ -112,10 +113,10 @@ STDMETHODIMP VLCPersistPropertyBag::Load(LPPROPERTYBAG pPropBag, LPERRORLOG pErr
         VariantClear(&value);
     }
 
-    return S_OK;
+    return _p_instance->onLoad();
 };
 
-STDMETHODIMP VLCPersistPropertyBag::Save(LPPROPERTYBAG pPropBag, BOOL fClearDiry, BOOL fSaveAllProperties)
+STDMETHODIMP VLCPersistPropertyBag::Save(LPPROPERTYBAG pPropBag, BOOL fClearDirty, BOOL fSaveAllProperties)
 {
     if( NULL == pPropBag )
         return E_POINTER;