Alexandre Julliard : ole32: Fix the free threaded marshaller data for 64-bit pointers.

Alexandre Julliard julliard at winehq.org
Wed Apr 7 11:56:07 CDT 2010


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Apr  6 21:45:38 2010 +0200

ole32: Fix the free threaded marshaller data for 64-bit pointers.

---

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

diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c
index 1380285..d8f4bf6 100644
--- a/dlls/ole32/ftmarshal.c
+++ b/dlls/ole32/ftmarshal.c
@@ -204,8 +204,11 @@ FTMarshalImpl_MarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid, vo
         hres = IStream_Write (pStm, &object, sizeof (object), NULL);
         if (hres != S_OK) return STG_E_MEDIUMFULL;
 
-        hres = IStream_Write (pStm, &constant, sizeof (constant), NULL);
-        if (hres != S_OK) return STG_E_MEDIUMFULL;
+        if (sizeof(object) == sizeof(DWORD))
+        {
+            hres = IStream_Write (pStm, &constant, sizeof (constant), NULL);
+            if (hres != S_OK) return STG_E_MEDIUMFULL;
+        }
 
         hres = IStream_Write (pStm, &unknown_guid, sizeof (unknown_guid), NULL);
         if (hres != S_OK) return STG_E_MEDIUMFULL;
@@ -237,10 +240,13 @@ FTMarshalImpl_UnmarshalInterface (LPMARSHAL iface, IStream * pStm, REFIID riid,
     hres = IStream_Read (pStm, &object, sizeof (object), NULL);
     if (hres != S_OK) return STG_E_READFAULT;
 
-    hres = IStream_Read (pStm, &constant, sizeof (constant), NULL);
-    if (hres != S_OK) return STG_E_READFAULT;
-    if (constant != 0)
-        FIXME("constant is 0x%x instead of 0\n", constant);
+    if (sizeof(object) == sizeof(DWORD))
+    {
+        hres = IStream_Read (pStm, &constant, sizeof (constant), NULL);
+        if (hres != S_OK) return STG_E_READFAULT;
+        if (constant != 0)
+            FIXME("constant is 0x%x instead of 0\n", constant);
+    }
 
     hres = IStream_Read (pStm, &unknown_guid, sizeof (unknown_guid), NULL);
     if (hres != S_OK) return STG_E_READFAULT;
@@ -267,10 +273,13 @@ static HRESULT WINAPI FTMarshalImpl_ReleaseMarshalData (LPMARSHAL iface, IStream
     hres = IStream_Read (pStm, &object, sizeof (object), NULL);
     if (hres != S_OK) return STG_E_READFAULT;
 
-    hres = IStream_Read (pStm, &constant, sizeof (constant), NULL);
-    if (hres != S_OK) return STG_E_READFAULT;
-    if (constant != 0)
-        FIXME("constant is 0x%x instead of 0\n", constant);
+    if (sizeof(object) == sizeof(DWORD))
+    {
+        hres = IStream_Read (pStm, &constant, sizeof (constant), NULL);
+        if (hres != S_OK) return STG_E_READFAULT;
+        if (constant != 0)
+            FIXME("constant is 0x%x instead of 0\n", constant);
+    }
 
     hres = IStream_Read (pStm, &unknown_guid, sizeof (unknown_guid), NULL);
     if (hres != S_OK) return STG_E_READFAULT;




More information about the wine-cvs mailing list