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

jscript/tests: Use wide char string literals instead of parse_htmlscript_a. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-01-14 15:50:08 +01:00 committed by Alexandre Julliard
parent 3fc0c96512
commit 2a6119814a
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/jscript/tests/run.c
View File

@ -1918,7 +1918,7 @@ static HRESULT invoke_procedure(const char *argsa, const char *sourcea, DISPPARA
return hres; return hres;
} }
static HRESULT parse_htmlscript(BSTR script_str) static HRESULT parse_htmlscript(const WCHAR *script_str)
{ {
IActiveScriptParse *parser; IActiveScriptParse *parser;
IActiveScript *engine; IActiveScript *engine;
@ -2130,16 +2130,6 @@ static void parse_script_ae(const char *src, HRESULT exhres)
ok(hres == exhres, "parse_script failed: %08x, expected %08x\n", hres, exhres); ok(hres == exhres, "parse_script failed: %08x, expected %08x\n", hres, exhres);
} }
static HRESULT parse_htmlscript_a(const char *src)
{
HRESULT hres;
BSTR tmp = a2bstr(src);
hres = parse_htmlscript(tmp);
SysFreeString(tmp);
return hres;
}
static BSTR get_script_from_file(const char *filename) static BSTR get_script_from_file(const char *filename)
{ {
DWORD size, len; DWORD size, len;
@ -3085,17 +3075,17 @@ static BOOL run_tests(void)
parse_script_af(0, "test.testThis2(this);"); parse_script_af(0, "test.testThis2(this);");
parse_script_af(0, "(function () { test.testThis2(this); })();"); parse_script_af(0, "(function () { test.testThis2(this); })();");
hres = parse_htmlscript_a("<!--"); hres = parse_htmlscript(L"<!--");
ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres);
hres = parse_htmlscript_a("-->"); hres = parse_htmlscript(L"-->");
ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres);
hres = parse_htmlscript_a("<!--\nvar a=1;\n-->\n"); hres = parse_htmlscript(L"<!--\nvar a=1;\n-->\n");
ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres);
hres = parse_htmlscript_a("<!--\n<!-- ignore this\n-->\n"); hres = parse_htmlscript(L"<!--\n<!-- ignore this\n-->\n");
ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres);
hres = parse_htmlscript_a("var a=1;\nif(a-->0) a=5;\n"); hres = parse_htmlscript(L"var a=1;\nif(a-->0) a=5;\n");
ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres);
hres = parse_htmlscript_a("var a=1;\nif(a\n-->0) a=5;\n"); hres = parse_htmlscript(L"var a=1;\nif(a\n-->0) a=5;\n");
ok(hres != S_OK, "ParseScriptText have not failed\n"); ok(hres != S_OK, "ParseScriptText have not failed\n");
test_script_exprs(); test_script_exprs();