Michael Stefaniuc : wmiutils: Use an iface instead of a vtbl pointer in wmiutils_cf.
Alexandre Julliard
julliard at winehq.org
Wed Dec 29 11:14:51 CST 2010
Module: wine
Branch: master
Commit: 957cfa68dabba3fb5ff91a9204425db55f402026
URL: http://source.winehq.org/git/wine.git/?a=commit;h=957cfa68dabba3fb5ff91a9204425db55f402026
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Wed Dec 29 02:53:49 2010 +0100
wmiutils: Use an iface instead of a vtbl pointer in wmiutils_cf.
---
dlls/wmiutils/main.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/wmiutils/main.c b/dlls/wmiutils/main.c
index bd1d9f5..4f761bb 100644
--- a/dlls/wmiutils/main.c
+++ b/dlls/wmiutils/main.c
@@ -39,13 +39,13 @@ typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj );
typedef struct
{
- const struct IClassFactoryVtbl *vtbl;
+ IClassFactory IClassFactory_iface;
fnCreateInstance pfnCreateInstance;
} wmiutils_cf;
static inline wmiutils_cf *impl_from_IClassFactory( IClassFactory *iface )
{
- return (wmiutils_cf *)((char *)iface - FIELD_OFFSET( wmiutils_cf, vtbl ));
+ return CONTAINING_RECORD(iface, wmiutils_cf, IClassFactory_iface);
}
static HRESULT WINAPI wmiutils_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj )
@@ -112,7 +112,7 @@ static const struct IClassFactoryVtbl wmiutils_cf_vtbl =
wmiutils_cf_LockServer
};
-static wmiutils_cf status_code_cf = { &wmiutils_cf_vtbl, WbemStatusCodeText_create };
+static wmiutils_cf status_code_cf = { { &wmiutils_cf_vtbl }, WbemStatusCodeText_create };
BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv )
{
@@ -138,7 +138,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv )
if (IsEqualGUID( rclsid, &CLSID_WbemStatusCode ))
{
- cf = (IClassFactory *)&status_code_cf.vtbl;
+ cf = &status_code_cf.IClassFactory_iface;
}
if (!cf) return CLASS_E_CLASSNOTAVAILABLE;
return IClassFactory_QueryInterface( cf, iid, ppv );
More information about the wine-cvs
mailing list