system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 19:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

qedit: Simplify/fix the creation of the IEnumMediaTypes.

Browse source
This commit is contained in:
Michael Stefaniuc 2015-08-07 23:27:20 +02:00 committed by Alexandre Julliard
parent 2d3edce0f8
commit f34efaab98
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
dlls/qedit/samplegrabber.c
View file

@ -37,7 +37,7 @@ static const WCHAR vendor_name[] = { 'W', 'i', 'n', 'e', 0 };
static const WCHAR pin_in_name[] = { 'I', 'n', 0 }; static const WCHAR pin_in_name[] = { 'I', 'n', 0 };
static const WCHAR pin_out_name[] = { 'O', 'u', 't', 0 }; static const WCHAR pin_out_name[] = { 'O', 'u', 't', 0 };
static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype); static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype, BOOL past);
/* Single media type enumerator */ /* Single media type enumerator */
typedef struct _ME_Impl { typedef struct _ME_Impl {
@ -151,10 +151,9 @@ static HRESULT WINAPI Single_IEnumMediaTypes_Clone(IEnumMediaTypes *iface, IEnum
TRACE("(%p)->(%p)\n", This, me); TRACE("(%p)->(%p)\n", This, me);
if (!me) if (!me)
return E_POINTER; return E_POINTER;
*me = mediaenum_create(&This->mtype); *me = mediaenum_create(&This->mtype, This->past);
if (!*me) if (!*me)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
((ME_Impl *)*me)->past = This->past;
return S_OK; return S_OK;
} }
@ -172,27 +171,29 @@ static const IEnumMediaTypesVtbl IEnumMediaTypes_VTable =
Single_IEnumMediaTypes_Clone, Single_IEnumMediaTypes_Clone,
}; };
static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype, BOOL past)
{ {
ME_Impl *obj = CoTaskMemAlloc(sizeof(ME_Impl)); ME_Impl *obj = CoTaskMemAlloc(sizeof(ME_Impl));
if (obj) {
ZeroMemory(obj, sizeof(ME_Impl)); if (!obj)
obj->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypes_VTable; return NULL;
obj->refCount = 1; ZeroMemory(obj, sizeof(*obj));
obj->past = FALSE; obj->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypes_VTable;
if (mtype) { obj->refCount = 1;
obj->mtype = *mtype; obj->past = past;
obj->mtype.pUnk = NULL; if (mtype) {
if (mtype->cbFormat) { obj->mtype = *mtype;
obj->mtype.pbFormat = CoTaskMemAlloc(mtype->cbFormat); obj->mtype.pUnk = NULL;
CopyMemory(obj->mtype.pbFormat, mtype->pbFormat, mtype->cbFormat); if (mtype->cbFormat) {
} obj->mtype.pbFormat = CoTaskMemAlloc(mtype->cbFormat);
else CopyMemory(obj->mtype.pbFormat, mtype->pbFormat, mtype->cbFormat);
obj->mtype.pbFormat = NULL;
} }
else else
obj->mtype.majortype = GUID_NULL; obj->mtype.pbFormat = NULL;
} }
else
obj->mtype.majortype = GUID_NULL;
return &obj->IEnumMediaTypes_iface; return &obj->IEnumMediaTypes_iface;
} }
@ -1095,7 +1096,7 @@ SampleGrabber_IPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **mtypes)
TRACE("(%p)->(%p)\n", This, mtypes); TRACE("(%p)->(%p)\n", This, mtypes);
if (!mtypes) if (!mtypes)
return E_POINTER; return E_POINTER;
*mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : NULL); *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : NULL, FALSE);
return *mtypes ? S_OK : E_OUTOFMEMORY; return *mtypes ? S_OK : E_OUTOFMEMORY;
} }