[PATCH 07/11] mshtml: Move some ObjectElement methods up.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/htmlobject.c | 67 ++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c
index fbaa7d4c7d1..6c0fc014dad 100644
--- a/dlls/mshtml/htmlobject.c
+++ b/dlls/mshtml/htmlobject.c
@@ -637,6 +637,18 @@ static inline HTMLObjectElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
     return CONTAINING_RECORD(iface, HTMLObjectElement, plugin_container.element.node);
 }

+static HRESULT HTMLObjectElement_get_readystate(HTMLDOMNode *iface, BSTR *p)
+{
+    HTMLObjectElement *This = impl_from_HTMLDOMNode(iface);
+    FIXME("(%p)->(%p)\n", This, p);
+    return E_NOTIMPL;
+}
+
+static inline HTMLObjectElement *impl_from_DispatchEx(DispatchEx *iface)
+{
+    return CONTAINING_RECORD(iface, HTMLObjectElement, plugin_container.element.node.event_target.dispex);
+}
+
 static void *HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid)
 {
     HTMLObjectElement *This = impl_from_HTMLDOMNode(iface);
@@ -676,6 +688,22 @@ static void *HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid)
     return elem_iface;
 }

+static void HTMLObjectElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
+{
+    HTMLObjectElement *This = impl_from_DispatchEx(dispex);
+    HTMLDOMNode_traverse(dispex, cb);
+
+    if(This->nsobject)
+        note_cc_edge((nsISupports*)This->nsobject, "nsobject", cb);
+}
+
+static void HTMLObjectElement_unlink(DispatchEx *dispex)
+{
+    HTMLObjectElement *This = impl_from_DispatchEx(dispex);
+    HTMLDOMNode_unlink(dispex);
+    unlink_ref(&This->nsobject);
+}
+
 static void HTMLObjectElement_destructor(HTMLDOMNode *iface)
 {
     HTMLObjectElement *This = impl_from_HTMLDOMNode(iface);
@@ -686,21 +714,13 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface)
     HTMLElement_destructor(&This->plugin_container.element.node);
 }

-static HRESULT HTMLObjectElement_get_readystate(HTMLDOMNode *iface, BSTR *p)
-{
-    HTMLObjectElement *This = impl_from_HTMLDOMNode(iface);
-    FIXME("(%p)->(%p)\n", This, p);
-    return E_NOTIMPL;
-}
-
-static HRESULT HTMLObjectElement_get_dispid(HTMLDOMNode *iface, BSTR name,
-        DWORD grfdex, DISPID *pid)
+static HRESULT HTMLObjectElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *dispid)
 {
     HTMLObjectElement *This = impl_from_HTMLDOMNode(iface);

-    TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(name), grfdex, pid);
+    TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(name), grfdex, dispid);

-    return get_plugin_dispid(&This->plugin_container, name, pid);
+    return get_plugin_dispid(&This->plugin_container, name, dispid);
 }

static HRESULT HTMLObjectElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name)
@@ -712,8 +732,8 @@ static HRESULT HTMLObjectElement_dispex_get_name(HTMLDOMNode *iface, DISPID id,
     return E_NOTIMPL;
 }

-static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid,
-        WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller)
+static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params,
+        VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller)
 {
     HTMLObjectElement *This = impl_from_HTMLDOMNode(iface);

@@ -722,27 +742,6 @@ static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid
     return invoke_plugin_prop(&This->plugin_container, id, lcid, flags, params, res, ei);
 }

-static inline HTMLObjectElement *impl_from_DispatchEx(DispatchEx *iface)
-{
-    return CONTAINING_RECORD(iface, HTMLObjectElement, plugin_container.element.node.event_target.dispex);
-}
-
-static void HTMLObjectElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
-{
-    HTMLObjectElement *This = impl_from_DispatchEx(dispex);
-    HTMLDOMNode_traverse(dispex, cb);
-
-    if(This->nsobject)
-        note_cc_edge((nsISupports*)This->nsobject, "nsobject", cb);
-}
-
-static void HTMLObjectElement_unlink(DispatchEx *dispex)
-{
-    HTMLObjectElement *This = impl_from_DispatchEx(dispex);
-    HTMLDOMNode_unlink(dispex);
-    unlink_ref(&This->nsobject);
-}
-
 static const NodeImplVtbl HTMLObjectElementImplVtbl = {
     .clsid                 = &CLSID_HTMLObjectElement,
     .qi                    = HTMLObjectElement_QI,