Huw Davies : ole32: Call the object's IPersistStorage_Load() if the object is running.
Alexandre Julliard
julliard at winehq.org
Tue Oct 21 07:07:05 CDT 2008
Module: wine
Branch: master
Commit: 3019a8f1950ff163bd7e74418b9e4cae3229fa7e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3019a8f1950ff163bd7e74418b9e4cae3229fa7e
Author: Huw Davies <huw at codeweavers.com>
Date: Mon Oct 20 15:16:49 2008 +0100
ole32: Call the object's IPersistStorage_Load() if the object is running.
---
dlls/ole32/defaulthandler.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c
index 87eb932..b20cb01 100644
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -1543,9 +1543,17 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_Load(
IPersistStorage* iface,
IStorage* pStg)
{
- DefaultHandler *This = impl_from_IPersistStorage(iface);
+ DefaultHandler *This = impl_from_IPersistStorage(iface);
+ HRESULT hr;
+
+ TRACE("(%p)->(%p)\n", iface, pStg);
+
+ hr = IPersistStorage_Load(This->dataCache_PersistStg, pStg);
- return IPersistStorage_Load(This->dataCache_PersistStg, pStg);
+ if(SUCCEEDED(hr) && object_is_running(This))
+ hr = IPersistStorage_Load(This->pPSDelegate, pStg);
+
+ return hr;
}
More information about the wine-cvs
mailing list