[PATCH 08/11] mshtml: Move some SelectElement methods up.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/htmlselect.c | 54 ++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c
index 5c020ffe089..13b8f14b807 100644
--- a/dlls/mshtml/htmlselect.c
+++ b/dlls/mshtml/htmlselect.c
@@ -1313,6 +1313,23 @@ static inline HTMLSelectElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
     return CONTAINING_RECORD(iface, HTMLSelectElement, element.node);
 }

+static HRESULT HTMLSelectElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v)
+{
+    HTMLSelectElement *This = impl_from_HTMLDOMNode(iface);
+    return IHTMLSelectElement_put_disabled(&This->IHTMLSelectElement_iface, v);
+}
+
+static HRESULT HTMLSelectElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL *p)
+{
+    HTMLSelectElement *This = impl_from_HTMLDOMNode(iface);
+    return IHTMLSelectElement_get_disabled(&This->IHTMLSelectElement_iface, p);
+}
+
+static inline HTMLSelectElement *impl_from_DispatchEx(DispatchEx *iface)
+{
+    return CONTAINING_RECORD(iface, HTMLSelectElement, element.node.event_target.dispex);
+}
+
 static void *HTMLSelectElement_QI(HTMLDOMNode *iface, REFIID riid)
 {
     HTMLSelectElement *This = impl_from_HTMLDOMNode(iface);
@@ -1327,16 +1344,20 @@ static void *HTMLSelectElement_QI(HTMLDOMNode *iface, REFIID riid)
     return HTMLElement_QI(&This->element.node, riid);
 }

-static HRESULT HTMLSelectElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v)
+static void HTMLSelectElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
 {
-    HTMLSelectElement *This = impl_from_HTMLDOMNode(iface);
-    return IHTMLSelectElement_put_disabled(&This->IHTMLSelectElement_iface, v);
+    HTMLSelectElement *This = impl_from_DispatchEx(dispex);
+    HTMLDOMNode_traverse(dispex, cb);
+
+    if(This->nsselect)
+        note_cc_edge((nsISupports*)This->nsselect, "nsselect", cb);
 }

-static HRESULT HTMLSelectElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL *p)
+static void HTMLSelectElement_unlink(DispatchEx *dispex)
 {
-    HTMLSelectElement *This = impl_from_HTMLDOMNode(iface);
-    return IHTMLSelectElement_get_disabled(&This->IHTMLSelectElement_iface, p);
+    HTMLSelectElement *This = impl_from_DispatchEx(dispex);
+    HTMLDOMNode_unlink(dispex);
+    unlink_ref(&This->nsselect);
 }

#define DISPID_OPTIONCOL_0 MSHTML_DISPID_CUSTOM_MIN
@@ -1406,27 +1427,6 @@ static HRESULT HTMLSelectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid
     return S_OK;
 }

-static inline HTMLSelectElement *impl_from_DispatchEx(DispatchEx *iface)
-{
-    return CONTAINING_RECORD(iface, HTMLSelectElement, element.node.event_target.dispex);
-}
-
-static void HTMLSelectElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb)
-{
-    HTMLSelectElement *This = impl_from_DispatchEx(dispex);
-    HTMLDOMNode_traverse(dispex, cb);
-
-    if(This->nsselect)
-        note_cc_edge((nsISupports*)This->nsselect, "nsselect", cb);
-}
-
-static void HTMLSelectElement_unlink(DispatchEx *dispex)
-{
-    HTMLSelectElement *This = impl_from_DispatchEx(dispex);
-    HTMLDOMNode_unlink(dispex);
-    unlink_ref(&This->nsselect);
-}
-
 static const NodeImplVtbl HTMLSelectElementImplVtbl = {
     .clsid                 = &CLSID_HTMLSelectElement,
     .qi                    = HTMLSelectElement_QI,