Jacek Caban : mshtml: Added IHTMLInputElement::[get|put] _defaultChecked implementation.

Alexandre Julliard julliard at winehq.org
Fri Oct 17 07:25:52 CDT 2008


Module: wine
Branch: master
Commit: 3600fb3b56050cbcb281bd005ef1523cc3b29573
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3600fb3b56050cbcb281bd005ef1523cc3b29573

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Oct 16 15:27:59 2008 -0500

mshtml: Added IHTMLInputElement::[get|put]_defaultChecked implementation.

---

 dlls/mshtml/htmlinput.c |   28 ++++++++++++++++++++++++----
 dlls/mshtml/tests/dom.c |   26 ++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c
index fa120d0..c14c4a8 100644
--- a/dlls/mshtml/htmlinput.c
+++ b/dlls/mshtml/htmlinput.c
@@ -381,15 +381,35 @@ static HRESULT WINAPI HTMLInputElement_get_indeterminate(IHTMLInputElement *ifac
 static HRESULT WINAPI HTMLInputElement_put_defaultChecked(IHTMLInputElement *iface, VARIANT_BOOL v)
 {
     HTMLInputElement *This = HTMLINPUT_THIS(iface);
-    FIXME("(%p)->(%x)\n", This, v);
-    return E_NOTIMPL;
+    nsresult nsres;
+
+    TRACE("(%p)->(%x)\n", This, v);
+
+    nsres = nsIDOMHTMLInputElement_SetDefaultChecked(This->nsinput, v != VARIANT_FALSE);
+    if(NS_FAILED(nsres)) {
+        ERR("SetDefaultChecked failed: %08x\n", nsres);
+        return E_FAIL;
+    }
+
+    return S_OK;
 }
 
 static HRESULT WINAPI HTMLInputElement_get_defaultChecked(IHTMLInputElement *iface, VARIANT_BOOL *p)
 {
     HTMLInputElement *This = HTMLINPUT_THIS(iface);
-    FIXME("(%p)->(%p)\n", This, p);
-    return E_NOTIMPL;
+    PRBool default_checked = FALSE;
+    nsresult nsres;
+
+    TRACE("(%p)->(%p)\n", This, p);
+
+    nsres = nsIDOMHTMLInputElement_GetDefaultChecked(This->nsinput, &default_checked);
+    if(NS_FAILED(nsres)) {
+        ERR("GetDefaultChecked failed: %08x\n", nsres);
+        return E_FAIL;
+    }
+
+    *p = default_checked ? VARIANT_TRUE : VARIANT_FALSE;
+    return S_OK;
 }
 
 static HRESULT WINAPI HTMLInputElement_put_checked(IHTMLInputElement *iface, VARIANT_BOOL v)
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 75538fe..9f477aa 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -1405,6 +1405,28 @@ static void _test_input_set_disabled(unsigned line, IHTMLInputElement *input, VA
     _test_input_get_disabled(line, input, b);
 }
 
+#define test_input_get_defaultchecked(i,b) _test_input_get_defaultchecked(__LINE__,i,b)
+static void _test_input_get_defaultchecked(unsigned line, IHTMLInputElement *input, VARIANT_BOOL exb)
+{
+    VARIANT_BOOL checked = 100;
+    HRESULT hres;
+
+    hres = IHTMLInputElement_get_defaultChecked(input, &checked);
+    ok_(__FILE__,line) (hres == S_OK, "get_defaultChecked failed: %08x\n", hres);
+    ok_(__FILE__,line) (checked == exb, "checked=%x, expected %x\n", checked, exb);
+}
+
+#define test_input_set_defaultchecked(i,b) _test_input_set_defaultchecked(__LINE__,i,b)
+static void _test_input_set_defaultchecked(unsigned line, IHTMLInputElement *input, VARIANT_BOOL b)
+{
+    HRESULT hres;
+
+    hres = IHTMLInputElement_put_defaultChecked(input, b);
+    ok_(__FILE__,line) (hres == S_OK, "get_defaultChecked failed: %08x\n", hres);
+
+    _test_input_get_defaultchecked(line, input, b);
+}
+
 #define test_input_value(o,t) _test_input_value(__LINE__,o,t)
 static void _test_input_value(unsigned line, IUnknown *unk, const char *exval)
 {
@@ -3138,6 +3160,10 @@ static void test_elems(IHTMLDocument2 *doc)
         test_elem_set_tabindex((IUnknown*)elem, 3);
         test_elem_title((IUnknown*)elem, "test title");
 
+        test_input_get_defaultchecked(input, VARIANT_FALSE);
+        test_input_set_defaultchecked(input, VARIANT_TRUE);
+        test_input_set_defaultchecked(input, VARIANT_FALSE);
+
         IHTMLInputElement_Release(input);
         IHTMLElement_Release(elem);
     }




More information about the wine-cvs mailing list