Michael Stefaniuc : devenum: COM cleanup for the IClassFactory iface.
Alexandre Julliard
julliard at winehq.org
Mon Aug 1 13:22:09 CDT 2011
Module: wine
Branch: master
Commit: aa591dcd9d45bc0a50066f493092de7cdd822cf8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa591dcd9d45bc0a50066f493092de7cdd822cf8
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Mon Aug 1 10:34:09 2011 +0200
devenum: COM cleanup for the IClassFactory iface.
---
dlls/devenum/devenum_main.c | 2 +-
dlls/devenum/devenum_private.h | 2 +-
dlls/devenum/factory.c | 23 ++++++++---------------
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c
index 6867fea..e19e1e0 100644
--- a/dlls/devenum/devenum_main.c
+++ b/dlls/devenum/devenum_main.c
@@ -75,7 +75,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
* Oh well - works just fine as it is */
if (IsEqualGUID(rclsid, &CLSID_SystemDeviceEnum) ||
IsEqualGUID(rclsid, &CLSID_CDeviceMoniker))
- return IClassFactory_QueryInterface((IClassFactory*)&DEVENUM_ClassFactory, iid, ppv);
+ return IClassFactory_QueryInterface(&DEVENUM_ClassFactory.IClassFactory_iface, iid, ppv);
FIXME("CLSID: %s, IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid));
return CLASS_E_CLASSNOTAVAILABLE;
diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h
index 1363e91..7515877 100644
--- a/dlls/devenum/devenum_private.h
+++ b/dlls/devenum/devenum_private.h
@@ -57,7 +57,7 @@ static inline void DEVENUM_UnlockModule(void) { InterlockedDecrement(&dll_refs);
*/
typedef struct
{
- const IClassFactoryVtbl *lpVtbl;
+ IClassFactory IClassFactory_iface;
} ClassFactoryImpl;
typedef struct
diff --git a/dlls/devenum/factory.c b/dlls/devenum/factory.c
index 09861fa..215eb3a 100644
--- a/dlls/devenum/factory.c
+++ b/dlls/devenum/factory.c
@@ -28,10 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum);
/**********************************************************************
* DEVENUM_IClassFactory_QueryInterface (also IUnknown)
*/
-static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface(
- LPCLASSFACTORY iface,
- REFIID riid,
- LPVOID *ppvObj)
+static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface(IClassFactory *iface, REFIID riid,
+ void **ppvObj)
{
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
@@ -56,7 +54,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface(
/**********************************************************************
* DEVENUM_IClassFactory_AddRef (also IUnknown)
*/
-static ULONG WINAPI DEVENUM_IClassFactory_AddRef(LPCLASSFACTORY iface)
+static ULONG WINAPI DEVENUM_IClassFactory_AddRef(IClassFactory *iface)
{
TRACE("\n");
@@ -68,7 +66,7 @@ static ULONG WINAPI DEVENUM_IClassFactory_AddRef(LPCLASSFACTORY iface)
/**********************************************************************
* DEVENUM_IClassFactory_Release (also IUnknown)
*/
-static ULONG WINAPI DEVENUM_IClassFactory_Release(LPCLASSFACTORY iface)
+static ULONG WINAPI DEVENUM_IClassFactory_Release(IClassFactory *iface)
{
TRACE("\n");
@@ -80,11 +78,8 @@ static ULONG WINAPI DEVENUM_IClassFactory_Release(LPCLASSFACTORY iface)
/**********************************************************************
* DEVENUM_IClassFactory_CreateInstance
*/
-static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance(
- LPCLASSFACTORY iface,
- LPUNKNOWN pUnkOuter,
- REFIID riid,
- LPVOID *ppvObj)
+static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance(IClassFactory *iface,
+ IUnknown *pUnkOuter, REFIID riid, void **ppvObj)
{
TRACE("\n\tIID:\t%s\n",debugstr_guid(riid));
@@ -110,9 +105,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance(
/**********************************************************************
* DEVENUM_IClassFactory_LockServer
*/
-static HRESULT WINAPI DEVENUM_IClassFactory_LockServer(
- LPCLASSFACTORY iface,
- BOOL fLock)
+static HRESULT WINAPI DEVENUM_IClassFactory_LockServer(IClassFactory *iface, BOOL fLock)
{
TRACE("\n");
@@ -138,4 +131,4 @@ static const IClassFactoryVtbl IClassFactory_Vtbl =
/**********************************************************************
* static ClassFactory instance
*/
-ClassFactoryImpl DEVENUM_ClassFactory = { &IClassFactory_Vtbl };
+ClassFactoryImpl DEVENUM_ClassFactory = { { &IClassFactory_Vtbl } };
More information about the wine-cvs
mailing list