Michael Stefaniuc : mmdevapi: Use an iface instead of a vtbl pointer in IClassFactoryImpl.
Alexandre Julliard
julliard at winehq.org
Mon Dec 6 13:18:32 CST 2010
Module: wine
Branch: master
Commit: ef039627a5cc193f6308aab554c207992439579e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef039627a5cc193f6308aab554c207992439579e
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Sun Dec 5 15:16:39 2010 +0100
mmdevapi: Use an iface instead of a vtbl pointer in IClassFactoryImpl.
---
dlls/mmdevapi/main.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c
index b916df0..cb23dd0 100644
--- a/dlls/mmdevapi/main.c
+++ b/dlls/mmdevapi/main.c
@@ -342,15 +342,20 @@ HRESULT WINAPI DllCanUnloadNow(void)
typedef HRESULT (*FnCreateInstance)(REFIID riid, LPVOID *ppobj);
typedef struct {
- const IClassFactoryVtbl *lpVtbl;
+ IClassFactory IClassFactory_iface;
REFCLSID rclsid;
FnCreateInstance pfnCreateInstance;
} IClassFactoryImpl;
+static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
+{
+ return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface);
+}
+
static HRESULT WINAPI
MMCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj)
{
- IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
+ IClassFactoryImpl *This = impl_from_IClassFactory(iface);
TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj);
if (ppobj == NULL)
return E_POINTER;
@@ -382,7 +387,7 @@ static HRESULT WINAPI MMCF_CreateInstance(
REFIID riid,
LPVOID *ppobj)
{
- IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
+ IClassFactoryImpl *This = impl_from_IClassFactory(iface);
TRACE("(%p, %p, %s, %p)\n", This, pOuter, debugstr_guid(riid), ppobj);
if (pOuter)
@@ -398,7 +403,7 @@ static HRESULT WINAPI MMCF_CreateInstance(
static HRESULT WINAPI MMCF_LockServer(LPCLASSFACTORY iface, BOOL dolock)
{
- IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
+ IClassFactoryImpl *This = impl_from_IClassFactory(iface);
FIXME("(%p, %d) stub!\n", This, dolock);
return S_OK;
}
@@ -412,7 +417,7 @@ static const IClassFactoryVtbl MMCF_Vtbl = {
};
static IClassFactoryImpl MMDEVAPI_CF[] = {
- { &MMCF_Vtbl, &CLSID_MMDeviceEnumerator, (FnCreateInstance)MMDevEnum_Create }
+ { { &MMCF_Vtbl }, &CLSID_MMDeviceEnumerator, (FnCreateInstance)MMDevEnum_Create }
};
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
@@ -436,7 +441,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
for (i = 0; i < sizeof(MMDEVAPI_CF)/sizeof(MMDEVAPI_CF[0]); ++i)
{
if (IsEqualGUID(rclsid, MMDEVAPI_CF[i].rclsid)) {
- IUnknown_AddRef((IClassFactory*) &MMDEVAPI_CF[i]);
+ IUnknown_AddRef(&MMDEVAPI_CF[i].IClassFactory_iface);
*ppv = &MMDEVAPI_CF[i];
return S_OK;
}
More information about the wine-cvs
mailing list