Michael Stefaniuc : strmbase: COM cleanup for the IClassFactory iface.

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Mon Aug 20 11:57:31 2012 +0200

strmbase: COM cleanup for the IClassFactory iface.

---

dlls/strmbase/dllfunc.c |   39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c
index 202cd81..d36c919 100644
--- a/dlls/strmbase/dllfunc.c
+++ b/dlls/strmbase/dllfunc.c
@@ -235,39 +235,40 @@ BOOL WINAPI STRMBASE_DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
  * DLL ClassFactory
  */
 typedef struct {
-    IClassFactory ITF_IClassFactory;
-
+    IClassFactory IClassFactory_iface;
     LONG ref;
     LPFNNewCOMObject pfnCreateInstance;
 } IClassFactoryImpl;

-static HRESULT WINAPI
-DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj)
+static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
 {
-    IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
+    return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface);
+}

+static HRESULT WINAPI DSCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj)
+{
     if (IsEqualGUID(riid, &IID_IUnknown) ||
         IsEqualGUID(riid, &IID_IClassFactory))
     {
         IClassFactory_AddRef(iface);
-        *ppobj = This;
+        *ppobj = iface;
         return S_OK;
     }

-    WARN("(%p)->(%s,%p), not found\n", This, debugstr_guid(riid), ppobj);
+    *ppobj = NULL;
+    WARN("(%p)->(%s,%p), not found\n", iface, debugstr_guid(riid), ppobj);
     return E_NOINTERFACE;
 }

-static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface)
+static ULONG WINAPI DSCF_AddRef(IClassFactory *iface)
 {
-    IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
+    IClassFactoryImpl *This = impl_from_IClassFactory(iface);
     return InterlockedIncrement(&This->ref);
 }

-static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface)
+static ULONG WINAPI DSCF_Release(IClassFactory *iface)
 {
-    IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
-
+    IClassFactoryImpl *This = impl_from_IClassFactory(iface);
     ULONG ref = InterlockedDecrement(&This->ref);

if (ref == 0)
@@ -276,10 +277,10 @@ static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface)
     return ref;
 }

-static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter,
-                                          REFIID riid, LPVOID *ppobj)
+static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter,
+                                          REFIID riid, void **ppobj)
 {
-    IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
+    IClassFactoryImpl *This = impl_from_IClassFactory(iface);
     HRESULT hres = ERROR_SUCCESS;
     LPUNKNOWN punk;

@@ -313,9 +314,9 @@ static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter
     return hres;
 }

-static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface, BOOL dolock)
+static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock)
 {
-    IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
+    IClassFactoryImpl *This = impl_from_IClassFactory(iface);
     TRACE("(%p)->(%d)\n",This, dolock);

if (dolock)
@@ -378,12 +379,12 @@ HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *
     if (!factory)
         return E_OUTOFMEMORY;

-    factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl;
+    factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl;
     factory->ref = 1;

factory->pfnCreateInstance = pList->m_lpfnNew;

-    *ppv = &(factory->ITF_IClassFactory);
+    *ppv = &factory->IClassFactory_iface;
     return S_OK;
 }