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

mshtml: Fixed typos in IHTMLInputElement::value tests.

This commit is contained in:
Jacek Caban 2011-02-28 13:12:22 +01:00 committed by Alexandre Julliard
parent 35d5c07538
commit 624287499e
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/mshtml/htmlinput.c
View File

@ -178,25 +178,13 @@ static HRESULT WINAPI HTMLInputElement_get_value(IHTMLInputElement *iface, BSTR
{ {
HTMLInputElement *This = impl_from_IHTMLInputElement(iface); HTMLInputElement *This = impl_from_IHTMLInputElement(iface);
nsAString value_str; nsAString value_str;
const PRUnichar *value = NULL;
nsresult nsres; nsresult nsres;
TRACE("(%p)->(%p)\n", This, p); TRACE("(%p)->(%p)\n", This, p);
nsAString_Init(&value_str, NULL); nsAString_Init(&value_str, NULL);
nsres = nsIDOMHTMLInputElement_GetValue(This->nsinput, &value_str); nsres = nsIDOMHTMLInputElement_GetValue(This->nsinput, &value_str);
if(NS_SUCCEEDED(nsres)) { return return_nsstr(nsres, &value_str, p);
nsAString_GetData(&value_str, &value);
*p = SysAllocString(value);
}else {
ERR("GetValue failed: %08x\n", nsres);
}
nsAString_Finish(&value_str);
TRACE("value=%s\n", debugstr_w(*p));
return S_OK;
} }
static HRESULT WINAPI HTMLInputElement_put_name(IHTMLInputElement *iface, BSTR v) static HRESULT WINAPI HTMLInputElement_put_name(IHTMLInputElement *iface, BSTR v)

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

@ -414,6 +414,9 @@ static BSTR a2bstr(const char *str)
BSTR ret; BSTR ret;
int len; int len;
if(!str)
return NULL;
len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);
ret = SysAllocStringLen(NULL, len); ret = SysAllocStringLen(NULL, len);
MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len);
@ -2306,7 +2309,7 @@ static void _test_input_value(unsigned line, IUnknown *unk, const char *exval)
if(exval) if(exval)
ok_(__FILE__,line) (!strcmp_wa(bstr, exval), "value=%s\n", wine_dbgstr_w(bstr)); ok_(__FILE__,line) (!strcmp_wa(bstr, exval), "value=%s\n", wine_dbgstr_w(bstr));
else else
ok_(__FILE__,line) (!exval, "exval != NULL\n"); ok_(__FILE__,line) (!bstr, "exval != NULL\n");
SysFreeString(bstr); SysFreeString(bstr);
IHTMLInputElement_Release(input); IHTMLInputElement_Release(input);
} }
@ -2324,10 +2327,12 @@ static void _test_input_put_value(unsigned line, IUnknown *unk, const char *val)
return; return;
bstr = a2bstr(val); bstr = a2bstr(val);
hres = IHTMLInputElement_get_value(input, &bstr); hres = IHTMLInputElement_put_value(input, bstr);
ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08x\n", hres); ok_(__FILE__,line) (hres == S_OK, "get_value failed: %08x\n", hres);
SysFreeString(bstr); SysFreeString(bstr);
IHTMLInputElement_Release(input); IHTMLInputElement_Release(input);
_test_input_value(line, unk, val);
} }
#define test_input_src(i,s) _test_input_src(__LINE__,i,s) #define test_input_src(i,s) _test_input_src(__LINE__,i,s)
@ -3101,6 +3106,7 @@ static void _test_border_styles(unsigned line, IHTMLStyle *pStyle, BSTR Name)
hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, hres = IHTMLStyle_Invoke(pStyle, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT,
DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL); DISPATCH_PROPERTYPUT, &params, &ret, NULL, NULL);
ok_(__FILE__,line) (hres == S_OK, "default. ret: %08x\n", hres); ok_(__FILE__,line) (hres == S_OK, "default. ret: %08x\n", hres);
VariantClear(&vDefault);
} }
} }
@ -6427,7 +6433,6 @@ static void test_elems(IHTMLDocument2 *doc)
test_node_get_value_str((IUnknown*)elem, NULL); test_node_get_value_str((IUnknown*)elem, NULL);
test_input_value((IUnknown*)elem, NULL); test_input_value((IUnknown*)elem, NULL);
test_input_put_value((IUnknown*)elem, "test"); test_input_put_value((IUnknown*)elem, "test");
test_input_value((IUnknown*)elem, NULL);
test_elem_class((IUnknown*)elem, "testclass"); test_elem_class((IUnknown*)elem, "testclass");
test_elem_tabindex((IUnknown*)elem, 2); test_elem_tabindex((IUnknown*)elem, 2);
test_elem_set_tabindex((IUnknown*)elem, 3); test_elem_set_tabindex((IUnknown*)elem, 3);