RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-17 13:17:13 +00:00
Code Issues Releases Wiki Activity

CoTaskMemAlloc/Free vs malloc/free cleanup

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9965 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2003-04-21 20:12:43 +00:00
parent 9f6cd22e44
commit 11df85a3dd
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
loader/dshow/cmediasample.c
View File

@ -47,7 +47,7 @@ void CMediaSample_Destroy(CMediaSample* This)
free(This->vt);
free(This->own_block);
if (This->media_type.pbFormat)
CoTaskMemFree(This->media_type.pbFormat);
free(This->media_type.pbFormat);
free(This);
}
@ -171,10 +171,10 @@ static HRESULT STDCALL CMediaSample_GetMediaType(IMediaSample* This,
}
t = &((CMediaSample*)This)->media_type;
// if(t.pbFormat)CoTaskMemFree(t.pbFormat);
(*ppMediaType) = (AM_MEDIA_TYPE*)CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE));
// if(t.pbFormat)free(t.pbFormat);
(*ppMediaType) = (AM_MEDIA_TYPE*)malloc(sizeof(AM_MEDIA_TYPE));
**ppMediaType = *t;
(*ppMediaType)->pbFormat = (char*)CoTaskMemAlloc(t->cbFormat);
(*ppMediaType)->pbFormat = (char*)malloc(t->cbFormat);
memcpy((*ppMediaType)->pbFormat, t->pbFormat, t->cbFormat);
// *ppMediaType=0; //media type was not changed
return 0;
@ -189,11 +189,11 @@ static HRESULT STDCALL CMediaSample_SetMediaType(IMediaSample * This,
return E_INVALIDARG;
t = &((CMediaSample*)This)->media_type;
if (t->pbFormat)
CoTaskMemFree(t->pbFormat);
free(t->pbFormat);
t = pMediaType;
if (t->cbFormat)
{
t->pbFormat = (char*)CoTaskMemAlloc(t->cbFormat);
t->pbFormat = (char*)malloc(t->cbFormat);
memcpy(t->pbFormat, pMediaType->pbFormat, t->cbFormat);
}
else

2
loader/dshow/inputpin.c
View File

@ -173,7 +173,7 @@ static long STDCALL CInputPin_ConnectionMediaType(IPin* This,
*pmt=((CInputPin*)This)->type;
if (pmt->cbFormat > 0)
{
pmt->pbFormat=(char *)CoTaskMemAlloc(pmt->cbFormat);
pmt->pbFormat=(char *)malloc(pmt->cbFormat);
memcpy(pmt->pbFormat, ((CInputPin*)This)->type.pbFormat, pmt->cbFormat);
}
return 0;

8
loader/dshow/outputpin.c
View File

@ -51,12 +51,12 @@ static HRESULT STDCALL CEnumMediaTypes_Next(IEnumMediaTypes * This,
if (pcFetched)
*pcFetched=1;
ppMediaTypes[0] = (AM_MEDIA_TYPE *)CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE));
ppMediaTypes[0] = (AM_MEDIA_TYPE *)malloc(sizeof(AM_MEDIA_TYPE));
// copy structures - C can handle this...
**ppMediaTypes = *type;
if (ppMediaTypes[0]->pbFormat)
{
ppMediaTypes[0]->pbFormat=(char *)CoTaskMemAlloc(ppMediaTypes[0]->cbFormat);
ppMediaTypes[0]->pbFormat=(char *)malloc(ppMediaTypes[0]->cbFormat);
memcpy(ppMediaTypes[0]->pbFormat, type->pbFormat, ppMediaTypes[0]->cbFormat);
}
if (cMediaTypes == 1)
@ -171,7 +171,7 @@ static HRESULT STDCALL COutputPin_Connect(IPin * This,
*pmt=((COutputPin*)This)->type;
if(pmt->cbFormat>0)
{
pmt->pbFormat=CoTaskMemAlloc(pmt->cbFormat);
pmt->pbFormat=malloc(pmt->cbFormat);
memcpy(pmt->pbFormat, ((COutputPin*)This)->type.pbFormat, pmt->cbFormat);
}
*/
@ -214,7 +214,7 @@ static HRESULT STDCALL COutputPin_ConnectionMediaType(IPin * This,
*pmt = ((COutputPin*)This)->type;
if (pmt->cbFormat>0)
{
pmt->pbFormat=(char *)CoTaskMemAlloc(pmt->cbFormat);
pmt->pbFormat=(char *)malloc(pmt->cbFormat);
memcpy(pmt->pbFormat, ((COutputPin*)This)->type.pbFormat, pmt->cbFormat);
}
return 0;