From 1329f87d46cfc8a1d5984db8f96d87b928d381e2 Mon Sep 17 00:00:00 2001
From: Robert Shearman <rob@codeweavers.com>
Date: Thu, 9 Jun 2005 09:43:38 +0000
Subject: [PATCH] - The typelib marshaler should only free the memory it
 actually allocated. - Add special cases for two lesser used types that aren't
   sizeof(DWORD) sized.

---
 dlls/oleaut32/tmarshal.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c
index 7a94fad3970..7960ee66060 100644
--- a/dlls/oleaut32/tmarshal.c
+++ b/dlls/oleaut32/tmarshal.c
@@ -455,6 +455,10 @@ static const IRpcProxyBufferVtbl tmproxyvtable = {
 int
 _argsize(DWORD vt) {
     switch (vt) {
+    case VT_R8:
+        return sizeof(double)/sizeof(DWORD);
+    case VT_CY:
+        return sizeof(CY)/sizeof(DWORD);
     case VT_DATE:
 	return sizeof(DATE)/sizeof(DWORD);
     case VT_VARIANT:
@@ -607,6 +611,9 @@ serialize_param(
     }
     case VT_PTR: {
 	DWORD cookie;
+	BOOL        derefhere;
+
+	derefhere = (tdesc->u.lptdesc->vt != VT_USERDEFINED);
 
 	if (debugout) TRACE_(olerelay)("*");
 	/* Write always, so the other side knows when it gets a NULL pointer.
@@ -620,7 +627,7 @@ serialize_param(
 	    return S_OK;
 	}
 	hres = serialize_param(tinfo,writeit,debugout,dealloc,tdesc->u.lptdesc,(DWORD*)*arg,buf);
-	if (dealloc) HeapFree(GetProcessHeap(),0,(LPVOID)arg);
+	if (derefhere && dealloc) HeapFree(GetProcessHeap(),0,(LPVOID)*arg);
 	return hres;
     }
     case VT_UNKNOWN:
-- 
2.11.4.GIT