Gabriel Ivăncescu : mshtml: Split the lookup for an element with name into a separate helper.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6420744c57429ab20818adefc4ebdc864584b4ba
URL:    https://gitlab.winehq.org/wine/wine/-/commit/6420744c57429ab20818adefc4ebdc8...

Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
Date:   Mon Oct 10 19:55:22 2022 +0300

mshtml: Split the lookup for an element with name into a separate helper.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>

---

 dlls/mshtml/htmldoc.c | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 0c96d73eb76..40d86a170ac 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -4818,30 +4818,30 @@ static inline HTMLDocument *impl_from_IDispatchEx(IDispatchEx *iface)
     return CONTAINING_RECORD(iface, HTMLDocument, IDispatchEx_iface);
 }
 
-static HRESULT dispid_from_elem_name(HTMLDocumentNode *This, BSTR name, DISPID *dispid)
+static HRESULT has_elem_name(nsIDOMHTMLDocument *nsdoc, const WCHAR *name)
 {
     nsIDOMNodeList *node_list;
     nsAString name_str;
-    UINT32 len;
-    unsigned i;
     nsresult nsres;
-
-    if(!This->nsdoc)
-        return DISP_E_UNKNOWNNAME;
+    UINT32 len;
 
     nsAString_InitDepend(&name_str, name);
-    nsres = nsIDOMHTMLDocument_GetElementsByName(This->nsdoc, &name_str, &node_list);
+    nsres = nsIDOMHTMLDocument_GetElementsByName(nsdoc, &name_str, &node_list);
     nsAString_Finish(&name_str);
     if(NS_FAILED(nsres))
-        return E_FAIL;
+        return map_nsresult(nsres);
 
     nsres = nsIDOMNodeList_GetLength(node_list, &len);
     nsIDOMNodeList_Release(node_list);
     if(NS_FAILED(nsres))
-        return E_FAIL;
+        return map_nsresult(nsres);
+
+    return len ? S_OK : DISP_E_UNKNOWNNAME;
+}
 
-    if(!len)
-        return DISP_E_UNKNOWNNAME;
+static HRESULT dispid_from_elem_name(HTMLDocumentNode *This, const WCHAR *name, DISPID *dispid)
+{
+    unsigned i;
 
     for(i=0; i < This->elem_vars_cnt; i++) {
         if(!wcscmp(name, This->elem_vars[i])) {
@@ -4943,7 +4943,12 @@ static HRESULT WINAPI DocDispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName,
     if(hres != DISP_E_UNKNOWNNAME)
         return hres;
 
-    return  dispid_from_elem_name(This->doc_node, bstrName, pid);
+    if(This->doc_node->nsdoc) {
+        hres = has_elem_name(This->doc_node->nsdoc, bstrName);
+        if(SUCCEEDED(hres))
+            hres = dispid_from_elem_name(This->doc_node, bstrName, pid);
+    }
+    return hres;
 }
 
 static HRESULT WINAPI DocDispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp,