diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 266e1d8e9c5..fad1325cc0e 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -519,7 +519,7 @@ static const ICreateDevEnumVtbl ICreateDevEnum_Vtbl = /********************************************************************** * static CreateDevEnum instance */ -CreateDevEnumImpl DEVENUM_CreateDevEnum = { { &ICreateDevEnum_Vtbl } }; +ICreateDevEnum DEVENUM_CreateDevEnum = { &ICreateDevEnum_Vtbl }; /********************************************************************** * DEVENUM_CreateAMCategoryKey (INTERNAL) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 45736a5146a..17e89a5314a 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -60,16 +60,6 @@ typedef struct IClassFactory IClassFactory_iface; } ClassFactoryImpl; -typedef struct -{ - ICreateDevEnum ICreateDevEnum_iface; -} CreateDevEnumImpl; - -typedef struct -{ - IParseDisplayName IParseDisplayName_iface; -} ParseDisplayNameImpl; - typedef struct { IMoniker IMoniker_iface; @@ -81,8 +71,8 @@ MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) DECLSPEC_HIDDEN; HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker) DECLSPEC_HIDDEN; extern ClassFactoryImpl DEVENUM_ClassFactory DECLSPEC_HIDDEN; -extern CreateDevEnumImpl DEVENUM_CreateDevEnum DECLSPEC_HIDDEN; -extern ParseDisplayNameImpl DEVENUM_ParseDisplayName DECLSPEC_HIDDEN; +extern ICreateDevEnum DEVENUM_CreateDevEnum DECLSPEC_HIDDEN; +extern IParseDisplayName DEVENUM_ParseDisplayName DECLSPEC_HIDDEN; /********************************************************************** * Private helper function to get AM filter category key location diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index 40850b29fd8..77ea1ecdcb8 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -153,4 +153,4 @@ static const IParseDisplayNameVtbl IParseDisplayName_Vtbl = }; /* The one instance of this class */ -ParseDisplayNameImpl DEVENUM_ParseDisplayName = { { &IParseDisplayName_Vtbl } }; +IParseDisplayName DEVENUM_ParseDisplayName = { &IParseDisplayName_Vtbl };