ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Use CoTaskMem* functions for safearrays.

This commit is contained in:
Nikolay Sivov 2015-01-06 12:45:16 +03:00 committed by Alexandre Julliard
parent 35a91741d3
commit adc091b8da
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/oleaut32/safearray.c
View File

@ -95,18 +95,18 @@ static const USHORT ignored_copy_features =
FADF_CREATEVECTOR;
/* Allocate memory */
static inline LPVOID SAFEARRAY_Malloc(ULONG ulSize)
static inline void* SAFEARRAY_Malloc(ULONG size)
{
/* FIXME: Memory should be allocated and freed using a per-thread IMalloc
* instance returned from CoGetMalloc().
*/
return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ulSize);
void *ret = CoTaskMemAlloc(size);
if (ret)
memset(ret, 0, size);
return ret;
}
/* Free memory */
static inline BOOL SAFEARRAY_Free(LPVOID lpData)
static inline void SAFEARRAY_Free(void *ptr)
{
return HeapFree(GetProcessHeap(), 0, lpData);
CoTaskMemFree(ptr);
}
/* Get the size of a supported VT type (0 means unsupported) */
@ -772,8 +772,7 @@ HRESULT WINAPI SafeArrayDestroyDescriptor(SAFEARRAY *psa)
!(psa->fFeatures & FADF_DATADELETED))
SAFEARRAY_DestroyData(psa, 0); /* Data not previously deleted */
if (!SAFEARRAY_Free(lpv))
return E_UNEXPECTED;
SAFEARRAY_Free(lpv);
}
return S_OK;
}
@ -1283,8 +1282,7 @@ HRESULT WINAPI SafeArrayDestroyData(SAFEARRAY *psa)
/* If this is not a vector, free the data memory block */
if (!(psa->fFeatures & FADF_CREATEVECTOR))
{
if (!SAFEARRAY_Free(psa->pvData))
return E_UNEXPECTED;
SAFEARRAY_Free(psa->pvData);
psa->pvData = NULL;
}
else