mshtml: Use ifaces instead of vtbl pointers in HTMLFrameBase.

dlls/mshtml/htmlframe.c

@@ -220,7 +220,7 @@ static HRESULT HTMLFrameElement_get_readystate(HTMLDOMNode *iface, BSTR *p)
 {
     HTMLFrameElement *This = impl_from_HTMLDOMNode(iface);
 
-    return IHTMLFrameBase2_get_readyState(HTMLFRAMEBASE2(&This->framebase), p);
+    return IHTMLFrameBase2_get_readyState(&This->framebase.IHTMLFrameBase2_iface, p);
 }
 
 static HRESULT HTMLFrameElement_get_dispid(HTMLDOMNode *iface, BSTR name,

dlls/mshtml/htmliframe.c

@@ -223,7 +223,7 @@ static HRESULT HTMLIFrame_get_readystate(HTMLDOMNode *iface, BSTR *p)
 {
     HTMLIFrame *This = impl_from_HTMLDOMNode(iface);
 
-    return IHTMLFrameBase2_get_readyState(HTMLFRAMEBASE2(&This->framebase), p);
+    return IHTMLFrameBase2_get_readyState(&This->framebase.IHTMLFrameBase2_iface, p);
 }
 
 static HRESULT HTMLIFrame_bind_to_tree(HTMLDOMNode *iface)

dlls/mshtml/htmlwindow.c

@@ -1610,7 +1610,7 @@ static HRESULT WINAPI HTMLWindow4_get_frameElement(IHTMLWindow4 *iface, IHTMLFra
     TRACE("(%p)->(%p)\n", This, p);
 
     if(This->frame_element) {
-        *p = HTMLFRAMEBASE(This->frame_element);
+        *p = &This->frame_element->IHTMLFrameBase_iface;
         IHTMLFrameBase_AddRef(*p);
     }else
         *p = NULL;

dlls/mshtml/mshtml_private.h

@@ -575,8 +575,8 @@ typedef struct {
 struct HTMLFrameBase {
     HTMLElement element;
 
-    const IHTMLFrameBaseVtbl   *lpIHTMLFrameBaseVtbl;
-    const IHTMLFrameBase2Vtbl  *lpIHTMLFrameBase2Vtbl;
+    IHTMLFrameBase  IHTMLFrameBase_iface;
+    IHTMLFrameBase2 IHTMLFrameBase2_iface;
 
     HTMLWindow *content_window;
 
@@ -638,8 +638,6 @@ struct HTMLDocumentNode {
 #define BINDINFO(x)      ((IInternetBindInfo*)            &(x)->lpInternetBindInfoVtbl);
 
 #define HTMLTEXTCONT(x)  ((IHTMLTextContainer*)           &(x)->lpHTMLTextContainerVtbl)
-#define HTMLFRAMEBASE(x) ((IHTMLFrameBase*)               &(x)->lpIHTMLFrameBaseVtbl)
-#define HTMLFRAMEBASE2(x) ((IHTMLFrameBase2*)             &(x)->lpIHTMLFrameBase2Vtbl)
 
 #define HTMLOPTFACTORY(x)  ((IHTMLOptionElementFactory*)  &(x)->lpHTMLOptionElementFactoryVtbl)
 #define HTMLIMGFACTORY(x)  ((IHTMLImageElementFactory*)   &(x)->lpHTMLImageElementFactoryVtbl)