commit 7db77df36d41d0150a9cc53ef122919c25fc17a7
author Jacek Caban <jacek@codeweavers.com> Mon Oct 06 09:53:35 2008 -0500
committer Alexandre Julliard <julliard@winehq.org> Tue Oct 07 12:08:59 2008 +0200
tree aba3ed18aae3013467e6ebba78e2d6da26cd6560
parent a06ef64036e45356945d69a329d4e7ef420a6a25

mshtml: Fixed handing non-element nodes in IHTMLElementCollection.

dlls/mshtml/htmlelemcol.c

diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c
index cf11234..f0ca6d7 100644
--- a/dlls/mshtml/htmlelemcol.c
+++ b/dlls/mshtml/htmlelemcol.c
@@ -359,6 +359,9 @@
     WCHAR *ptr;
     DWORD idx=0;
 
+    if(!*name)
+        return DISP_E_UNKNOWNNAME;
+
     for(ptr = name; *ptr && isdigitW(*ptr); ptr++)
         idx = idx*10 + (*ptr-'0');
 
@@ -484,8 +487,9 @@
 
     nsIDOMNodeList_GetLength(nslist, &length);
 
-    buf.len = buf.size = length;
-    if(buf.len) {
+    buf.len = 0;
+    buf.size = length;
+    if(length) {
         nsIDOMNode *nsnode;
 
         buf.buf = heap_alloc(buf.size*sizeof(HTMLElement*));
@@ -493,9 +497,11 @@
         for(i=0; i<length; i++) {
             nsIDOMNodeList_Item(nslist, i, &nsnode);
             if(is_elem_node(nsnode))
-                buf.buf[i] = HTMLELEM_NODE_THIS(get_node(doc, nsnode, TRUE));
+                buf.buf[buf.len++] = HTMLELEM_NODE_THIS(get_node(doc, nsnode, TRUE));
             nsIDOMNode_Release(nsnode);
         }
+
+        elem_vector_normalize(&buf);
     }else {
         buf.buf = NULL;
     }