mshtml/tests: Get rid of strstr_wa.
Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
765fc5cb31
commit
d5bd667390
|
@ -81,22 +81,6 @@ static BSTR a2bstr(const char *str)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const WCHAR *strstr_wa(const WCHAR *str, const char *suba)
|
|
||||||
{
|
|
||||||
BSTR sub;
|
|
||||||
const WCHAR *ret = NULL;
|
|
||||||
sub = a2bstr(suba);
|
|
||||||
while (*str)
|
|
||||||
{
|
|
||||||
const WCHAR *p1 = str, *p2 = sub;
|
|
||||||
while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; }
|
|
||||||
if (!*p2) {ret = str; break;}
|
|
||||||
str++;
|
|
||||||
}
|
|
||||||
SysFreeString(sub);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define test_var_bstr(a,b) _test_var_bstr(__LINE__,a,b)
|
#define test_var_bstr(a,b) _test_var_bstr(__LINE__,a,b)
|
||||||
static void _test_var_bstr(unsigned line, const VARIANT *v, const char *expect)
|
static void _test_var_bstr(unsigned line, const VARIANT *v, const char *expect)
|
||||||
{
|
{
|
||||||
|
@ -2920,14 +2904,13 @@ static void test_body_style(IHTMLStyle *style)
|
||||||
if (hres != E_INVALIDARG) {
|
if (hres != E_INVALIDARG) {
|
||||||
hres = IHTMLStyle_get_listStyle(style, &str);
|
hres = IHTMLStyle_get_listStyle(style, &str);
|
||||||
ok(hres == S_OK, "get_listStyle failed: %08x\n", hres);
|
ok(hres == S_OK, "get_listStyle failed: %08x\n", hres);
|
||||||
ok(strstr_wa(str, "decimal-leading-zero") &&
|
ok(wcsstr(str, L"decimal-leading-zero") && wcsstr(str, L"inside"),
|
||||||
strstr_wa(str, "inside") != NULL,
|
|
||||||
"listStyle = %s\n", wine_dbgstr_w(str));
|
"listStyle = %s\n", wine_dbgstr_w(str));
|
||||||
if(compat_mode < COMPAT_IE9)
|
if(compat_mode < COMPAT_IE9)
|
||||||
ok(strstr_wa(str, "none") != NULL, "listStyle = %s\n", wine_dbgstr_w(str));
|
ok(wcsstr(str, L"none") != NULL, "listStyle = %s\n", wine_dbgstr_w(str));
|
||||||
else
|
else
|
||||||
todo_wine
|
todo_wine
|
||||||
ok(!strstr_wa(str, "none"), "listStyle = %s\n", wine_dbgstr_w(str));
|
ok(!wcsstr(str, L"none"), "listStyle = %s\n", wine_dbgstr_w(str));
|
||||||
|
|
||||||
SysFreeString(str);
|
SysFreeString(str);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue