Skip to content

W
wine-cw
Commit 1329f87d authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

- 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.
parent d1f59dba
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
dlls/oleaut32/tmarshal.c
View file @ 1329f87d
...@@ -455,6 +455,10 @@ static const IRpcProxyBufferVtbl tmproxyvtable = { ...@@ -455,6 +455,10 @@ static const IRpcProxyBufferVtbl tmproxyvtable = {
int int
_argsize(DWORD vt) { _argsize(DWORD vt) {
switch (vt) { switch (vt) {
case VT_R8:
return sizeof(double)/sizeof(DWORD);
case VT_CY:
return sizeof(CY)/sizeof(DWORD);
case VT_DATE: case VT_DATE:
return sizeof(DATE)/sizeof(DWORD); return sizeof(DATE)/sizeof(DWORD);
case VT_VARIANT: case VT_VARIANT:
...@@ -607,6 +611,9 @@ serialize_param( ...@@ -607,6 +611,9 @@ serialize_param(
} }
case VT_PTR: { case VT_PTR: {
DWORD cookie; DWORD cookie;
BOOL derefhere;
derefhere = (tdesc->u.lptdesc->vt != VT_USERDEFINED);
if (debugout) TRACE_(olerelay)("*"); if (debugout) TRACE_(olerelay)("*");
/* Write always, so the other side knows when it gets a NULL pointer. /* Write always, so the other side knows when it gets a NULL pointer.
...@@ -620,7 +627,7 @@ serialize_param( ...@@ -620,7 +627,7 @@ serialize_param(
return S_OK; return S_OK;
} }
hres = serialize_param(tinfo,writeit,debugout,dealloc,tdesc->u.lptdesc,(DWORD*)*arg,buf); 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; return hres;
} }
case VT_UNKNOWN: case VT_UNKNOWN:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment