Zebediah Figura : strmbase: Get rid of the ENUMMEDIADETAILS structure.
Alexandre Julliard
julliard at winehq.org
Wed May 15 16:18:25 CDT 2019
Module: wine
Branch: master
Commit: 8ba451f85b7facbf902339ef0dd3c67460da672f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ba451f85b7facbf902339ef0dd3c67460da672f
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue May 14 19:41:58 2019 -0500
strmbase: Get rid of the ENUMMEDIADETAILS structure.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/strmbase/mediatype.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c
index 743936f..8ad2e22 100644
--- a/dlls/strmbase/mediatype.c
+++ b/dlls/strmbase/mediatype.c
@@ -77,11 +77,6 @@ void WINAPI DeleteMediaType(AM_MEDIA_TYPE * pMediaType)
CoTaskMemFree(pMediaType);
}
-typedef struct tagENUMEDIADETAILS
-{
- ULONG cMediaTypes;
-} ENUMMEDIADETAILS;
-
typedef struct IEnumMediaTypesImpl
{
IEnumMediaTypes IEnumMediaTypes_iface;
@@ -90,7 +85,7 @@ typedef struct IEnumMediaTypesImpl
BasePin_GetMediaType enumMediaFunction;
BasePin_GetMediaTypeVersion mediaVersionFunction;
LONG currentVersion;
- ENUMMEDIADETAILS enumMediaDetails;
+ ULONG count;
ULONG uIndex;
} IEnumMediaTypesImpl;
@@ -127,7 +122,7 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e
i++;
}
- pEnumMediaTypes->enumMediaDetails.cMediaTypes = i;
+ pEnumMediaTypes->count = i;
*ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface;
pEnumMediaTypes->currentVersion = versionFunc(basePin);
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);
- 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))
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))
return VFW_E_ENUM_OUT_OF_SYNC;
- if (This->uIndex + cMediaTypes < This->enumMediaDetails.cMediaTypes)
+ if (This->uIndex + cMediaTypes < This->count)
{
This->uIndex += cMediaTypes;
return S_OK;
@@ -248,7 +243,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface)
FreeMediaType(&amt);
i++;
}
- This->enumMediaDetails.cMediaTypes = i;
+ This->count = i;
This->currentVersion = This->mediaVersionFunction(This->basePin);
This->uIndex = 0;
More information about the wine-cvs
mailing list