[PATCH 3/5] devenum: Get rid of the MediaCatMoniker typedef.
Zebediah Figura
z.figura12 at gmail.com
Fri Apr 10 14:49:49 CDT 2020
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/devenum/devenum_private.h | 6 +++---
dlls/devenum/mediacatenum.c | 27 ++++++++++++++-------------
dlls/devenum/parsedisplayname.c | 2 +-
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h
index 37ce935bbaa..11ebd5fa2a4 100644
--- a/dlls/devenum/devenum_private.h
+++ b/dlls/devenum/devenum_private.h
@@ -52,7 +52,7 @@ enum device_type
DEVICE_DMO,
};
-typedef struct
+struct moniker
{
IMoniker IMoniker_iface;
LONG ref;
@@ -64,9 +64,9 @@ typedef struct
WCHAR *name; /* for filters and codecs */
CLSID clsid; /* for DMOs */
};
-} MediaCatMoniker;
+};
-MediaCatMoniker *moniker_create(void) DECLSPEC_HIDDEN;
+struct moniker *moniker_create(void) DECLSPEC_HIDDEN;
HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **enum_mon) DECLSPEC_HIDDEN;
extern ICreateDevEnum devenum_factory DECLSPEC_HIDDEN;
diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c
index 19b3ec5ca04..7b553a07b7d 100644
--- a/dlls/devenum/mediacatenum.c
+++ b/dlls/devenum/mediacatenum.c
@@ -319,7 +319,7 @@ static const IPropertyBagVtbl IPropertyBag_Vtbl =
property_bag_Write,
};
-static HRESULT property_bag_create(MediaCatMoniker *mon, IPropertyBag **ppBag)
+static HRESULT property_bag_create(struct moniker *mon, IPropertyBag **ppBag)
{
RegPropBagImpl * rpb = CoTaskMemAlloc(sizeof(RegPropBagImpl));
if (!rpb)
@@ -359,9 +359,9 @@ static HRESULT property_bag_create(MediaCatMoniker *mon, IPropertyBag **ppBag)
}
-static inline MediaCatMoniker *impl_from_IMoniker(IMoniker *iface)
+static inline struct moniker *impl_from_IMoniker(IMoniker *iface)
{
- return CONTAINING_RECORD(iface, MediaCatMoniker, IMoniker_iface);
+ return CONTAINING_RECORD(iface, struct moniker, IMoniker_iface);
}
static HRESULT WINAPI moniker_QueryInterface(IMoniker *iface, REFIID riid, void **ppv)
@@ -388,7 +388,7 @@ static HRESULT WINAPI moniker_QueryInterface(IMoniker *iface, REFIID riid, void
static ULONG WINAPI moniker_AddRef(IMoniker *iface)
{
- MediaCatMoniker *This = impl_from_IMoniker(iface);
+ struct moniker *This = impl_from_IMoniker(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
@@ -398,7 +398,7 @@ static ULONG WINAPI moniker_AddRef(IMoniker *iface)
static ULONG WINAPI moniker_Release(IMoniker *iface)
{
- MediaCatMoniker *This = impl_from_IMoniker(iface);
+ struct moniker *This = impl_from_IMoniker(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
@@ -414,7 +414,7 @@ static ULONG WINAPI moniker_Release(IMoniker *iface)
static HRESULT WINAPI moniker_GetClassID(IMoniker *iface, CLSID *pClassID)
{
- MediaCatMoniker *This = impl_from_IMoniker(iface);
+ struct moniker *This = impl_from_IMoniker(iface);
TRACE("(%p)->(%p)\n", This, pClassID);
@@ -459,7 +459,7 @@ static HRESULT WINAPI moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *pcbSiz
static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc,
IMoniker *pmkToLeft, REFIID riidResult, void **ppvResult)
{
- MediaCatMoniker *This = impl_from_IMoniker(iface);
+ struct moniker *This = impl_from_IMoniker(iface);
IUnknown * pObj = NULL;
IPropertyBag * pProp = NULL;
CLSID clsID;
@@ -528,7 +528,7 @@ static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc,
static HRESULT WINAPI moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc,
IMoniker *pmkToLeft, REFIID riid, void **ppvObj)
{
- MediaCatMoniker *This = impl_from_IMoniker(iface);
+ struct moniker *This = impl_from_IMoniker(iface);
TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObj);
@@ -682,7 +682,7 @@ static HRESULT WINAPI moniker_RelativePathTo(IMoniker *iface, IMoniker *pmkOther
static HRESULT WINAPI moniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc,
IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName)
{
- MediaCatMoniker *This = impl_from_IMoniker(iface);
+ struct moniker *This = impl_from_IMoniker(iface);
WCHAR *buffer;
TRACE("(%p)->(%p, %p, %p)\n", iface, pbc, pmkToLeft, ppszDisplayName);
@@ -769,10 +769,11 @@ static const IMonikerVtbl IMoniker_Vtbl =
moniker_IsSystemMoniker,
};
-MediaCatMoniker *moniker_create(void)
+struct moniker *moniker_create(void)
{
- MediaCatMoniker * pMoniker = NULL;
- pMoniker = CoTaskMemAlloc(sizeof(MediaCatMoniker));
+ struct moniker *pMoniker;
+
+ pMoniker = CoTaskMemAlloc(sizeof(*pMoniker));
if (!pMoniker)
return NULL;
@@ -845,9 +846,9 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike
{
EnumMonikerImpl *This = impl_from_IEnumMoniker(iface);
WCHAR buffer[MAX_PATH + 1];
+ struct moniker *pMoniker;
LONG res;
ULONG fetched = 0;
- MediaCatMoniker * pMoniker;
CLSID clsid;
HRESULT hr;
HKEY hkey;
diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c
index f472e4c1bec..ab0f7bf870d 100644
--- a/dlls/devenum/parsedisplayname.c
+++ b/dlls/devenum/parsedisplayname.c
@@ -70,7 +70,7 @@ static HRESULT WINAPI devenum_parser_ParseDisplayName(IParseDisplayName *iface,
{
WCHAR buffer[MAX_PATH];
enum device_type type;
- MediaCatMoniker *mon;
+ struct moniker *mon;
CLSID class;
TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(name), eaten, ret);
--
2.26.0
More information about the wine-devel
mailing list