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

strmbase: Get rid of the ENUMMEDIADETAILS structure. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-05-14 19:41:58 -05:00 committed by Alexandre Julliard
parent a2258e717c
commit 8ba451f85b
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/strmbase/mediatype.c
View File

@ -77,11 +77,6 @@ void WINAPI DeleteMediaType(AM_MEDIA_TYPE * pMediaType)
CoTaskMemFree(pMediaType); CoTaskMemFree(pMediaType);
} }
typedef struct tagENUMEDIADETAILS
{
ULONG cMediaTypes;
} ENUMMEDIADETAILS;
typedef struct IEnumMediaTypesImpl typedef struct IEnumMediaTypesImpl
{ {
IEnumMediaTypes IEnumMediaTypes_iface; IEnumMediaTypes IEnumMediaTypes_iface;
@ -90,7 +85,7 @@ typedef struct IEnumMediaTypesImpl
BasePin_GetMediaType enumMediaFunction; BasePin_GetMediaType enumMediaFunction;
BasePin_GetMediaTypeVersion mediaVersionFunction; BasePin_GetMediaTypeVersion mediaVersionFunction;
LONG currentVersion; LONG currentVersion;
ENUMMEDIADETAILS enumMediaDetails; ULONG count;
ULONG uIndex; ULONG uIndex;
} IEnumMediaTypesImpl; } IEnumMediaTypesImpl;
@ -127,7 +122,7 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e
i++; i++;
} }
pEnumMediaTypes->enumMediaDetails.cMediaTypes = i; pEnumMediaTypes->count = i;
*ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface; *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface;
pEnumMediaTypes->currentVersion = versionFunc(basePin); pEnumMediaTypes->currentVersion = versionFunc(basePin);
return S_OK; return S_OK;
@ -184,7 +179,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cM
TRACE("(%p)->(%u, %p, %p)\n", iface, cMediaTypes, ppMediaTypes, pcFetched); TRACE("(%p)->(%u, %p, %p)\n", iface, cMediaTypes, ppMediaTypes, pcFetched);
cFetched = min(This->enumMediaDetails.cMediaTypes, This->uIndex + cMediaTypes) - This->uIndex; cFetched = min(This->count, This->uIndex + cMediaTypes) - This->uIndex;
if (This->currentVersion != This->mediaVersionFunction(This->basePin)) if (This->currentVersion != This->mediaVersionFunction(This->basePin))
return VFW_E_ENUM_OUT_OF_SYNC; return VFW_E_ENUM_OUT_OF_SYNC;
@ -226,7 +221,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface, ULONG cM
if (This->currentVersion != This->mediaVersionFunction(This->basePin)) if (This->currentVersion != This->mediaVersionFunction(This->basePin))
return VFW_E_ENUM_OUT_OF_SYNC; return VFW_E_ENUM_OUT_OF_SYNC;
if (This->uIndex + cMediaTypes < This->enumMediaDetails.cMediaTypes) if (This->uIndex + cMediaTypes < This->count)
{ {
This->uIndex += cMediaTypes; This->uIndex += cMediaTypes;
return S_OK; return S_OK;
@ -248,7 +243,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface)
FreeMediaType(&amt); FreeMediaType(&amt);
i++; i++;
} }
This->enumMediaDetails.cMediaTypes = i; This->count = i;
This->currentVersion = This->mediaVersionFunction(This->basePin); This->currentVersion = This->mediaVersionFunction(This->basePin);
This->uIndex = 0; This->uIndex = 0;