Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in ClassFactory.

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Sat Dec  4 22:14:12 2010 +0100

mshtml: Use an iface instead of a vtbl pointer in ClassFactory.

---

dlls/mshtml/main.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c
index 679c206..5f7a943 100644
--- a/dlls/mshtml/main.c
+++ b/dlls/mshtml/main.c
@@ -172,11 +172,16 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
  */
 typedef HRESULT (*CreateInstanceFunc)(IUnknown*,REFIID,void**);
 typedef struct {
-    const IClassFactoryVtbl *lpVtbl;
+    IClassFactory IClassFactory_iface;
     LONG ref;
     CreateInstanceFunc fnCreateInstance;
 } ClassFactory;

+static inline ClassFactory *impl_from_IClassFactory(IClassFactory *iface)
+{
+    return CONTAINING_RECORD(iface, ClassFactory, IClassFactory_iface);
+}
+
 static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFGUID riid, void **ppvObject)
 {
     if(IsEqualGUID(&IID_IClassFactory, riid) || IsEqualGUID(&IID_IUnknown, riid)) {
@@ -192,7 +197,7 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFGUID

static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)
 {
-    ClassFactory *This = (ClassFactory*)iface;
+    ClassFactory *This = impl_from_IClassFactory(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
     TRACE("(%p) ref = %u\n", This, ref);
     return ref;
@@ -200,7 +205,7 @@ static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)

static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
 {
-    ClassFactory *This = (ClassFactory*)iface;
+    ClassFactory *This = impl_from_IClassFactory(iface);
     ULONG ref = InterlockedDecrement(&This->ref);

TRACE("(%p) ref = %u\n", This, ref);
@@ -215,7 +220,7 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
 static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter,
         REFIID riid, void **ppvObject)
 {
-    ClassFactory *This = (ClassFactory*)iface;
+    ClassFactory *This = impl_from_IClassFactory(iface);
     return This->fnCreateInstance(pUnkOuter, riid, ppvObject);
 }

@@ -240,11 +245,11 @@ static HRESULT ClassFactory_Create(REFIID riid, void **ppv, CreateInstanceFunc f
     ClassFactory *ret = heap_alloc(sizeof(ClassFactory));
     HRESULT hres;

-    ret->lpVtbl = &HTMLClassFactoryVtbl;
+    ret->IClassFactory_iface.lpVtbl = &HTMLClassFactoryVtbl;
     ret->ref = 0;
     ret->fnCreateInstance = fnCreateInstance;

-    hres = IClassFactory_QueryInterface((IClassFactory*)ret, riid, ppv);
+    hres = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv);
     if(FAILED(hres)) {
         heap_free(ret);
         *ppv = NULL;