Remove tabs, reformat, merge comments.

This commit is contained in:
Mike McCormack 2005-02-24 12:48:00 +00:00 committed by Alexandre Julliard
parent b6bc6aa6f8
commit 2e283d09ec
1 changed files with 107 additions and 86 deletions

View File

@ -33,44 +33,50 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdmo);
/*********************************************************************** /***********************************************************************
* MoCreateMediaType (MSDMO.@) * MoCreateMediaType (MSDMO.@)
*
* Allocate a new media type structure
*/ */
HRESULT WINAPI MoCreateMediaType(DMO_MEDIA_TYPE** ppmedia, DWORD cbFormat) HRESULT WINAPI MoCreateMediaType(DMO_MEDIA_TYPE** ppmedia, DWORD cbFormat)
{ {
HRESULT hr; HRESULT r;
TRACE("(%p,%lu)\n", ppmedia, cbFormat); TRACE("%p %lu\n", ppmedia, cbFormat);
if (ppmedia == NULL) if (!ppmedia)
return E_POINTER; return E_POINTER;
*ppmedia = CoTaskMemAlloc(sizeof(DMO_MEDIA_TYPE)); *ppmedia = CoTaskMemAlloc(sizeof(DMO_MEDIA_TYPE));
if (*ppmedia == NULL) if (!*ppmedia)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
hr = MoInitMediaType(*ppmedia, cbFormat); r = MoInitMediaType(*ppmedia, cbFormat);
if (FAILED(hr)) { if (FAILED(r))
{
CoTaskMemFree(*ppmedia); CoTaskMemFree(*ppmedia);
*ppmedia = NULL; *ppmedia = NULL;
} }
return hr; return r;
} }
/*********************************************************************** /***********************************************************************
* MoInitMediaType (MSDMO.@) * MoInitMediaType (MSDMO.@)
*
* Initialize media type structure
*/ */
HRESULT WINAPI MoInitMediaType(DMO_MEDIA_TYPE* pmedia, DWORD cbFormat) HRESULT WINAPI MoInitMediaType(DMO_MEDIA_TYPE* pmedia, DWORD cbFormat)
{ {
TRACE("(%p,%lu)\n", pmedia,cbFormat); TRACE("%p %lu\n", pmedia, cbFormat);
if (pmedia == NULL) if (!pmedia)
return E_POINTER; return E_POINTER;
memset(pmedia, 0, sizeof(DMO_MEDIA_TYPE)); memset(pmedia, 0, sizeof(DMO_MEDIA_TYPE));
if (cbFormat > 0) { if (cbFormat > 0)
{
pmedia->pbFormat = CoTaskMemAlloc(cbFormat); pmedia->pbFormat = CoTaskMemAlloc(cbFormat);
if (pmedia->pbFormat == NULL) if (!pmedia->pbFormat)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
pmedia->cbFormat = cbFormat; pmedia->cbFormat = cbFormat;
@ -81,12 +87,14 @@ HRESULT WINAPI MoInitMediaType(DMO_MEDIA_TYPE* pmedia, DWORD cbFormat)
/*********************************************************************** /***********************************************************************
* MoDeleteMediaType (MSDMO.@) * MoDeleteMediaType (MSDMO.@)
*
* Delete a media type structure
*/ */
HRESULT WINAPI MoDeleteMediaType(DMO_MEDIA_TYPE* pmedia) HRESULT WINAPI MoDeleteMediaType(DMO_MEDIA_TYPE* pmedia)
{ {
TRACE("(%p)\n", pmedia); TRACE("%p\n", pmedia);
if (pmedia == NULL) if (!pmedia)
return E_POINTER; return E_POINTER;
MoFreeMediaType(pmedia); MoFreeMediaType(pmedia);
@ -97,20 +105,24 @@ HRESULT WINAPI MoDeleteMediaType(DMO_MEDIA_TYPE* pmedia)
/*********************************************************************** /***********************************************************************
* MoFreeMediaType (MSDMO.@) * MoFreeMediaType (MSDMO.@)
*
* Free allocated members of a media type structure
*/ */
HRESULT WINAPI MoFreeMediaType(DMO_MEDIA_TYPE* pmedia) HRESULT WINAPI MoFreeMediaType(DMO_MEDIA_TYPE* pmedia)
{ {
TRACE("(%p)\n", pmedia); TRACE("%p\n", pmedia);
if (pmedia == NULL) if (!pmedia)
return E_POINTER; return E_POINTER;
if (pmedia->pUnk != NULL) { if (pmedia->pUnk)
{
IUnknown_Release(pmedia->pUnk); IUnknown_Release(pmedia->pUnk);
pmedia->pUnk = NULL; pmedia->pUnk = NULL;
} }
if (pmedia->pbFormat != NULL) { if (pmedia->pbFormat)
{
CoTaskMemFree(pmedia->pbFormat); CoTaskMemFree(pmedia->pbFormat);
pmedia->pbFormat = NULL; pmedia->pbFormat = NULL;
} }
@ -120,39 +132,44 @@ HRESULT WINAPI MoFreeMediaType(DMO_MEDIA_TYPE* pmedia)
/*********************************************************************** /***********************************************************************
* MoDuplicateMediaType (MSDMO.@) * MoDuplicateMediaType (MSDMO.@)
*
* Duplicates a media type structure
*/ */
HRESULT WINAPI MoDuplicateMediaType(DMO_MEDIA_TYPE** ppdst, HRESULT WINAPI MoDuplicateMediaType(DMO_MEDIA_TYPE** ppdst,
const DMO_MEDIA_TYPE* psrc) const DMO_MEDIA_TYPE* psrc)
{ {
HRESULT hr; HRESULT r;
TRACE("(%p,%p)\n", ppdst, psrc); TRACE("%p %p\n", ppdst, psrc);
if (ppdst == NULL || psrc == NULL) if (!ppdst || !psrc)
return E_POINTER; return E_POINTER;
*ppdst = CoTaskMemAlloc(sizeof(DMO_MEDIA_TYPE)); *ppdst = CoTaskMemAlloc(sizeof(DMO_MEDIA_TYPE));
if (*ppdst == NULL) if (!*ppdst)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
hr = MoCopyMediaType(*ppdst, psrc); r = MoCopyMediaType(*ppdst, psrc);
if (FAILED(hr)) { if (FAILED(r))
{
MoFreeMediaType(*ppdst); MoFreeMediaType(*ppdst);
*ppdst = NULL; *ppdst = NULL;
} }
return hr; return r;
} }
/*********************************************************************** /***********************************************************************
* MoCopyMediaType (MSDMO.@) * MoCopyMediaType (MSDMO.@)
*
* Copy a new media type structure
*/ */
HRESULT WINAPI MoCopyMediaType(DMO_MEDIA_TYPE* pdst, HRESULT WINAPI MoCopyMediaType(DMO_MEDIA_TYPE* pdst,
const DMO_MEDIA_TYPE* psrc) const DMO_MEDIA_TYPE* psrc)
{ {
TRACE("(%p,%p)\n", pdst, psrc); TRACE("%p %p\n", pdst, psrc);
if (pdst == NULL || psrc == NULL) if (!pdst || !psrc)
return E_POINTER; return E_POINTER;
memcpy(&pdst->majortype, &psrc->majortype, sizeof(psrc->majortype)); memcpy(&pdst->majortype, &psrc->majortype, sizeof(psrc->majortype));
@ -164,19 +181,23 @@ HRESULT WINAPI MoCopyMediaType(DMO_MEDIA_TYPE* pdst,
pdst->lSampleSize = psrc->lSampleSize; pdst->lSampleSize = psrc->lSampleSize;
pdst->cbFormat = psrc->cbFormat; pdst->cbFormat = psrc->cbFormat;
if (psrc->pbFormat != NULL && psrc->cbFormat > 0) { if (psrc->pbFormat && psrc->cbFormat > 0)
{
pdst->pbFormat = CoTaskMemAlloc(psrc->cbFormat); pdst->pbFormat = CoTaskMemAlloc(psrc->cbFormat);
if (pdst->pbFormat == NULL) if (!pdst->pbFormat)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
memcpy(pdst->pbFormat, psrc->pbFormat, psrc->cbFormat); memcpy(pdst->pbFormat, psrc->pbFormat, psrc->cbFormat);
} else }
else
pdst->pbFormat = NULL; pdst->pbFormat = NULL;
if (psrc->pUnk != NULL) { if (psrc->pUnk)
{
pdst->pUnk = psrc->pUnk; pdst->pUnk = psrc->pUnk;
IUnknown_AddRef(pdst->pUnk); IUnknown_AddRef(pdst->pUnk);
} else }
else
pdst->pUnk = NULL; pdst->pUnk = NULL;
return S_OK; return S_OK;