Robert Shearman : ole32: Release the standard marshal in the free-threaded marshaler' s UnmarshalInterface function.

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


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

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

ole32: Release the standard marshal in the free-threaded marshaler's UnmarshalInterface function.

---

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

diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c
index 8749c3c..04eb745 100644
--- a/dlls/ole32/ftmarshal.c
+++ b/dlls/ole32/ftmarshal.c
@@ -238,6 +238,8 @@ FTMarshalImpl_UnmarshalInterface (LPMARS
         if (FAILED(hres)) return hres;
 
         hres = IMarshal_UnmarshalInterface (pMarshal, pStm, riid, ppv);
+        IMarshal_Release (pMarshal);
+        return hres;
     }
     else {
         IUnknown *object;
@@ -259,8 +261,6 @@ FTMarshalImpl_UnmarshalInterface (LPMARS
         IUnknown_Release(object);
         return hres;
     }
-
-    return S_OK;
 }
 
 static HRESULT WINAPI FTMarshalImpl_ReleaseMarshalData (LPMARSHAL iface, IStream * pStm)




More information about the wine-cvs mailing list