Huw Davies : ole32: Call the object's GetClassID if it's running.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5937ddd403502c0224ac5c56ff5992384e840c02
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5937ddd403502c0224ac5c56ff...

Author: Huw Davies 
Date:   Fri Oct 31 12:29:10 2008 +0000

ole32: Call the object's GetClassID if it's 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 833e6fd..6844ee8 100644
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -1520,9 +1520,17 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_GetClassID(
             IPersistStorage*     iface,
             CLSID*               clsid)
 {
-  DefaultHandler *This = impl_from_IPersistStorage(iface);
+    DefaultHandler *This = impl_from_IPersistStorage(iface);
+    HRESULT hr;
+
+    TRACE("(%p)->(%p)\n", iface, clsid);

-  return IPersistStorage_GetClassID(This->dataCache_PersistStg, clsid);
+    if(object_is_running(This))
+        hr = IPersistStorage_GetClassID(This->pPSDelegate, clsid);
+    else
+        hr = IPersistStorage_GetClassID(This->dataCache_PersistStg, clsid);
+
+    return hr;
 }

/************************************************************************