Rob Shearman : ole32: Execute Reduce using the moniker' s vtable in CreateCompositeMoniker as the moniker isn' t necessarily a composite moniker.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3bcea6395ff3d86b7eb1ef8e2c980a6e1e304f3e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3bcea6395ff3d86b7eb1ef8e2c...

Author: Rob Shearman 
Date:   Thu Dec 28 02:41:39 2006 +0000

ole32: Execute Reduce using the moniker's vtable in CreateCompositeMoniker as the moniker isn't necessarily a composite moniker.

---

dlls/ole32/compositemoniker.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index 6438e54..4a0af25 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -466,7 +466,7 @@ CompositeMonikerImpl_Reduce(IMoniker* if
         res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk);
         IMoniker_Release(antiMk);

-        return CompositeMonikerImpl_Reduce(mostRigthMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced);
+        return IMoniker_Reduce(mostRigthMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced);
     }
     else if (*ppmkToLeft==NULL)

@@ -486,7 +486,7 @@ CompositeMonikerImpl_Reduce(IMoniker* if
         /* If any of the components  reduces itself, the method returns S_OK and passes back a composite */
         /* of the reduced components */
         if (IMoniker_Reduce(mostRigthMk,pbc,dwReduceHowFar,NULL,&mostRigthReducedMk) &&
-            CompositeMonikerImpl_Reduce(mostRigthMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk)
+            IMoniker_Reduce(mostRigthMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk)
            )

return CreateGenericComposite(leftReducedComposedMk,mostRigthReducedMk,ppmkReduced);