Robert Shearman : ole32: Fix the free-threaded marshaler when it has no outer unknown.

Alexandre Julliard julliard at wine.codeweavers.com
Thu May 25 04:16:13 CDT 2006


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

Author: Robert Shearman <rob at codeweavers.com>
Date:   Wed May 24 23:00:53 2006 +0100

ole32: Fix the free-threaded marshaler when it has no outer unknown.

---

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

diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c
index c938f6d..8a776f1 100644
--- a/dlls/ole32/ftmarshal.c
+++ b/dlls/ole32/ftmarshal.c
@@ -241,7 +241,7 @@ HRESULT WINAPI CoCreateFreeThreadedMarsh
     ftm->lpVtbl = &iunkvt;
     ftm->lpvtblFTM = &ftmvtbl;
     ftm->ref = 1;
-    ftm->pUnkOuter = punkOuter;
+    ftm->pUnkOuter = punkOuter ? punkOuter : _IFTMUnknown_(ftm);
 
     *ppunkMarshal = _IFTMUnknown_ (ftm);
     return S_OK;




More information about the wine-cvs mailing list