Jacek Caban : devenum: Removed useless structs.

Alexandre Julliard julliard at winehq.org
Wed Apr 4 13:07:05 CDT 2012


Module: wine
Branch: master
Commit: 9940756d218f76653ebf65195f2c262626319db3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9940756d218f76653ebf65195f2c262626319db3

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Apr  4 10:43:12 2012 +0200

devenum: Removed useless structs.

---

 dlls/devenum/createdevenum.c    |    2 +-
 dlls/devenum/devenum_private.h  |   14 ++------------
 dlls/devenum/parsedisplayname.c |    2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c
index 266e1d8..fad1325 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 45736a5..17e89a5 100644
--- a/dlls/devenum/devenum_private.h
+++ b/dlls/devenum/devenum_private.h
@@ -62,16 +62,6 @@ typedef struct
 
 typedef struct
 {
-    ICreateDevEnum ICreateDevEnum_iface;
-} CreateDevEnumImpl;
-
-typedef struct
-{
-    IParseDisplayName IParseDisplayName_iface;
-} ParseDisplayNameImpl;
-
-typedef struct
-{
     IMoniker IMoniker_iface;
     LONG ref;
     HKEY hkey;
@@ -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 40850b2..77ea1ec 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 };




More information about the wine-cvs mailing list