mshtml: COM cleanup for the IHTMLStyle iface.

dlls/mshtml/htmlstyle.h

@@ -18,7 +18,7 @@
 
 struct HTMLStyle {
     DispatchEx dispex;
-    const IHTMLStyleVtbl    *lpHTMLStyleVtbl;
+    IHTMLStyle  IHTMLStyle_iface;
     const IHTMLStyle2Vtbl   *lpHTMLStyle2Vtbl;
     const IHTMLStyle3Vtbl   *lpHTMLStyle3Vtbl;
     const IHTMLStyle4Vtbl   *lpHTMLStyle4Vtbl;
@@ -28,7 +28,6 @@ struct HTMLStyle {
     nsIDOMCSSStyleDeclaration *nsstyle;
 };
 
-#define HTMLSTYLE(x)     ((IHTMLStyle*)                   &(x)->lpHTMLStyleVtbl)
 #define HTMLSTYLE2(x)    ((IHTMLStyle2*)                  &(x)->lpHTMLStyle2Vtbl)
 #define HTMLSTYLE3(x)    ((IHTMLStyle3*)                  &(x)->lpHTMLStyle3Vtbl)
 #define HTMLSTYLE4(x)    ((IHTMLStyle4*)                  &(x)->lpHTMLStyle4Vtbl)

dlls/mshtml/htmlstyle2.c

@@ -39,21 +39,21 @@ static HRESULT WINAPI HTMLStyle2_QueryInterface(IHTMLStyle2 *iface, REFIID riid,
 {
     HTMLStyle *This = HTMLSTYLE2_THIS(iface);
 
-    return IHTMLStyle_QueryInterface(HTMLSTYLE(This), riid, ppv);
+    return IHTMLStyle_QueryInterface(&This->IHTMLStyle_iface, riid, ppv);
 }
 
 static ULONG WINAPI HTMLStyle2_AddRef(IHTMLStyle2 *iface)
 {
     HTMLStyle *This = HTMLSTYLE2_THIS(iface);
 
-    return IHTMLStyle_AddRef(HTMLSTYLE(This));
+    return IHTMLStyle_AddRef(&This->IHTMLStyle_iface);
 }
 
 static ULONG WINAPI HTMLStyle2_Release(IHTMLStyle2 *iface)
 {
     HTMLStyle *This = HTMLSTYLE2_THIS(iface);
 
-    return IHTMLStyle_Release(HTMLSTYLE(This));
+    return IHTMLStyle_Release(&This->IHTMLStyle_iface);
 }
 
 static HRESULT WINAPI HTMLStyle2_GetTypeInfoCount(IHTMLStyle2 *iface, UINT *pctinfo)

dlls/mshtml/htmlstyle3.c

@@ -39,21 +39,21 @@ static HRESULT WINAPI HTMLStyle3_QueryInterface(IHTMLStyle3 *iface, REFIID riid,
 {
     HTMLStyle *This = HTMLSTYLE3_THIS(iface);
 
-    return IHTMLStyle_QueryInterface(HTMLSTYLE(This), riid, ppv);
+    return IHTMLStyle_QueryInterface(&This->IHTMLStyle_iface, riid, ppv);
 }
 
 static ULONG WINAPI HTMLStyle3_AddRef(IHTMLStyle3 *iface)
 {
     HTMLStyle *This = HTMLSTYLE3_THIS(iface);
 
-    return IHTMLStyle_AddRef(HTMLSTYLE(This));
+    return IHTMLStyle_AddRef(&This->IHTMLStyle_iface);
 }
 
 static ULONG WINAPI HTMLStyle3_Release(IHTMLStyle3 *iface)
 {
     HTMLStyle *This = HTMLSTYLE3_THIS(iface);
 
-    return IHTMLStyle_Release(HTMLSTYLE(This));
+    return IHTMLStyle_Release(&This->IHTMLStyle_iface);
 }
 
 static HRESULT WINAPI HTMLStyle3_GetTypeInfoCount(IHTMLStyle3 *iface, UINT *pctinfo)
@@ -358,21 +358,21 @@ static HRESULT WINAPI HTMLStyle4_QueryInterface(IHTMLStyle4 *iface, REFIID riid,
 {
     HTMLStyle *This = HTMLSTYLE4_THIS(iface);
 
-    return IHTMLStyle_QueryInterface(HTMLSTYLE(This), riid, ppv);
+    return IHTMLStyle_QueryInterface(&This->IHTMLStyle_iface, riid, ppv);
 }
 
 static ULONG WINAPI HTMLStyle4_AddRef(IHTMLStyle4 *iface)
 {
     HTMLStyle *This = HTMLSTYLE4_THIS(iface);
 
-    return IHTMLStyle_AddRef(HTMLSTYLE(This));
+    return IHTMLStyle_AddRef(&This->IHTMLStyle_iface);
 }
 
 static ULONG WINAPI HTMLStyle4_Release(IHTMLStyle4 *iface)
 {
     HTMLStyle *This = HTMLSTYLE4_THIS(iface);
 
-    return IHTMLStyle_Release(HTMLSTYLE(This));
+    return IHTMLStyle_Release(&This->IHTMLStyle_iface);
 }
 
 static HRESULT WINAPI HTMLStyle4_GetTypeInfoCount(IHTMLStyle4 *iface, UINT *pctinfo)