Robert Shearman : ole32: Fix infinite recursion in CompositeMonikerImpl_GetTimeOfLastChange by handling pmkToLeft properly .

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 96646d532ff072414afd8315b43ffcd3e81eb358
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=96646d532ff072414afd8315...

Author: Robert Shearman 
Date:   Mon May  8 15:54:43 2006 +0100

ole32: Fix infinite recursion in CompositeMonikerImpl_GetTimeOfLastChange by handling pmkToLeft properly.

Fix a typo where CompositeMonikerImpl_GetTimeOfLastChange was called 
instead of the virtual implementation of it on mostRightMk.

---

dlls/ole32/compositemoniker.c |   50 ++++++++++++++++++++++++-----------------
 1 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index fbeaa74..059eabf 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -727,9 +727,8 @@ static HRESULT WINAPI
 CompositeMonikerImpl_GetTimeOfLastChange(IMoniker* iface, IBindCtx* pbc,
                IMoniker* pmkToLeft, FILETIME* pCompositeTime)
 {
-    IRunningObjectTable* rot;
     HRESULT res;
-    IMoniker *tempMk,*antiMk,*mostRigthMk;
+    IMoniker *tempMk,*antiMk,*mostRigthMk,*leftMk;
     IEnumMoniker *enumMoniker;

TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pCompositeTime);
@@ -741,36 +740,45 @@ CompositeMonikerImpl_GetTimeOfLastChange
     /* retrieve the time of last change. If the object is not in the ROT, the method recursively calls  */
     /* IMoniker::GetTimeOfLastChange on the rightmost component of the composite, passing the remainder */
     /* of the composite as the pmkToLeft parameter for that call.                                       */
-    if (pmkToLeft!=NULL){
-
-        res=CreateGenericComposite(pmkToLeft,iface,&tempMk);
+    if (pmkToLeft)
+    {
+        IRunningObjectTable* rot;

-        res=IBindCtx_GetRunningObjectTable(pbc,&rot);
+        res = IMoniker_ComposeWith(pmkToLeft, iface, FALSE, &leftMk);

+        res = IBindCtx_GetRunningObjectTable(pbc,&rot);
         if (FAILED(res))
+        {
+            IMoniker_Release(leftMk);
             return res;
+        }

-        if (IRunningObjectTable_GetTimeOfLastChange(rot,tempMk,pCompositeTime)==S_OK)
+        if (IRunningObjectTable_GetTimeOfLastChange(rot,leftMk,pCompositeTime)==S_OK)
+        {
+            IMoniker_Release(leftMk);
             return res;
-        else
+        }
+    }
+    else
+        leftMk = iface;

-            IMoniker_Enum(iface,FALSE,&enumMoniker);
-            IEnumMoniker_Next(enumMoniker,1,&mostRigthMk,NULL);
-            IEnumMoniker_Release(enumMoniker);
+    IMoniker_Enum(iface, FALSE, &enumMoniker);
+    IEnumMoniker_Next(enumMoniker, 1, &mostRigthMk, NULL);
+    IEnumMoniker_Release(enumMoniker);

-            res=CreateAntiMoniker(&antiMk);
-            res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk);
-            IMoniker_Release(antiMk);
+    res = CreateAntiMoniker(&antiMk);
+    res = IMoniker_ComposeWith(leftMk, antiMk, 0, &tempMk);
+    IMoniker_Release(antiMk);

-            res=CompositeMonikerImpl_GetTimeOfLastChange(mostRigthMk,pbc,tempMk,pCompositeTime);
+    res = IMoniker_GetTimeOfLastChange(mostRigthMk, pbc, tempMk, pCompositeTime);

-            IMoniker_Release(tempMk);
-            IMoniker_Release(mostRigthMk);
+    IMoniker_Release(tempMk);
+    IMoniker_Release(mostRigthMk);

-            return res;
-    }
-    else
-        return IMoniker_GetTimeOfLastChange(iface,pbc,NULL,pCompositeTime);
+    if (pmkToLeft)
+        IMoniker_Release(leftMk);
+
+    return res;
 }

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