system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 05:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

- The typelib marshaler should only free the memory it actually allocated.

Browse source 
- Add special cases for two lesser used types that aren't
  sizeof(DWORD) sized.
This commit is contained in:
Robert Shearman 2005-06-09 09:43:38 +00:00 committed by Alexandre Julliard
parent d1f59dba67
commit 1329f87d46
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/oleaut32/tmarshal.c
View file

@ -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: