ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Added IHTMLSelectElement::[get|put]_disabled implementation.

This commit is contained in:
Jacek Caban 2008-10-09 15:32:55 -05:00 committed by Alexandre Julliard
parent 9306e9b657
commit b0ff8f7e95
2 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/mshtml/htmlselect.c
View File

@ -289,15 +289,35 @@ static HRESULT WINAPI HTMLSelectElement_get_value(IHTMLSelectElement *iface, BST
static HRESULT WINAPI HTMLSelectElement_put_disabled(IHTMLSelectElement *iface, VARIANT_BOOL v)
{
HTMLSelectElement *This = HTMLSELECT_THIS(iface);
FIXME("(%p)->(%x)\n", This, v);
return E_NOTIMPL;
nsresult nsres;
TRACE("(%p)->(%x)\n", This, v);
nsres = nsIDOMHTMLSelectElement_SetDisabled(This->nsselect, v != VARIANT_FALSE);
if(NS_FAILED(nsres)) {
ERR("SetDisabled failed: %08x\n", nsres);
return E_FAIL;
}
return S_OK;
}
static HRESULT WINAPI HTMLSelectElement_get_disabled(IHTMLSelectElement *iface, VARIANT_BOOL *p)
{
HTMLSelectElement *This = HTMLSELECT_THIS(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
PRBool disabled = FALSE;
nsresult nsres;
TRACE("(%p)->(%p)\n", This, p);
nsres = nsIDOMHTMLSelectElement_GetDisabled(This->nsselect, &disabled);
if(NS_FAILED(nsres)) {
ERR("GetDisabled failed: %08x\n", nsres);
return E_FAIL;
}
*p = disabled ? VARIANT_TRUE : VARIANT_FALSE;
return S_OK;
}
static HRESULT WINAPI HTMLSelectElement_get_form(IHTMLSelectElement *iface, IHTMLFormElement **p)

28
dlls/mshtml/tests/dom.c
View File

@ -1096,6 +1096,30 @@ static void _test_elem3_set_disabled(unsigned line, IUnknown *unk, VARIANT_BOOL
_test_elem3_get_disabled(line, unk, b);
}
#define test_select_get_disabled(i,b) _test_select_get_disabled(__LINE__,i,b)
static void _test_select_get_disabled(unsigned line, IHTMLSelectElement *select, VARIANT_BOOL exb)
{
VARIANT_BOOL disabled = 100;
HRESULT hres;
hres = IHTMLSelectElement_get_disabled(select, &disabled);
ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres);
ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb);
_test_elem3_get_disabled(line, (IUnknown*)select, exb);
}
#define test_select_set_disabled(i,b) _test_select_set_disabled(__LINE__,i,b)
static void _test_select_set_disabled(unsigned line, IHTMLSelectElement *select, VARIANT_BOOL b)
{
HRESULT hres;
hres = IHTMLSelectElement_put_disabled(select, b);
ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres);
_test_select_get_disabled(line, select, b);
}
#define elem_get_scroll_height(u) _elem_get_scroll_height(__LINE__,u)
static long _elem_get_scroll_height(unsigned line, IUnknown *unk)
{
@ -1727,6 +1751,10 @@ static void test_select_elem(IHTMLSelectElement *select)
test_select_set_value(select, "val1");
test_select_value(select, "val1");
test_select_get_disabled(select, VARIANT_FALSE);
test_select_set_disabled(select, VARIANT_TRUE);
test_select_set_disabled(select, VARIANT_FALSE);
}
static void test_create_option_elem(IHTMLDocument2 *doc)