commit b0dd7c79d3b764b8fd019679a9aeaf8263396848
author Zhenbo Li <litimetal@gmail.com> Fri Aug 07 18:12:58 2015 +0800
committer Alexandre Julliard <julliard@winehq.org> Fri Aug 07 23:50:49 2015 +0900
tree fc0c3c977bb122d5c2248e741eb4ddb4c2f6551b
parent 6419ac0f139c2a3d9cbcd71e5b43e3f89d6336cc

mshtml: Fix error handler in IHTMLSelectElement::remove().

dlls/mshtml/htmlselect.c

diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c
index 152d855..e55d7ea 100644
--- a/dlls/mshtml/htmlselect.c
+++ b/dlls/mshtml/htmlselect.c
@@ -432,6 +432,9 @@
     HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface);
     nsresult nsres;
     TRACE("(%p)->(%d)\n", This, index);
+    if(index < 0)
+        return E_INVALIDARG;
+
     nsres = nsIDOMHTMLSelectElement_select_Remove(This->nsselect, index);
     if(NS_FAILED(nsres)) {
         ERR("Remove failed: %08x\n", nsres);

dlls/mshtml/tests/dom.c

diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 02eeb78..7088c52 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -2872,7 +2872,6 @@
     test_select_length(select, 2);
 
     hres = IHTMLSelectElement_remove(select, -1);
-    todo_wine
     ok(hres == E_INVALIDARG, "remove failed: %08x, expected E_INVALIDARG\n", hres);
     test_select_length(select, 2);