Skip to content

W
wine-winehq
Commit 3fc0c965 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

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

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent e9b51970
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 45 deletions
dlls/jscript/tests/run.c
View file @ 3fc0c965
...@@ -1959,7 +1959,8 @@ static HRESULT parse_htmlscript(BSTR script_str) ...@@ -1959,7 +1959,8 @@ static HRESULT parse_htmlscript(BSTR script_str)
return hres; return hres;
} }
static void test_IActiveScriptError(IActiveScriptError *error, SCODE errorcode, ULONG line, LONG pos, BSTR script_source, BSTR description, BSTR line_text) static void test_IActiveScriptError(IActiveScriptError *error, SCODE errorcode, ULONG line, LONG pos, const WCHAR *script_source,
const WCHAR *description, const WCHAR *line_text)
{ {
HRESULT hres; HRESULT hres;
DWORD source_context; DWORD source_context;
...@@ -2047,7 +2048,8 @@ static void test_IActiveScriptError(IActiveScriptError *error, SCODE errorcode, ...@@ -2047,7 +2048,8 @@ static void test_IActiveScriptError(IActiveScriptError *error, SCODE errorcode,
SysFreeString(excep.bstrHelpFile); SysFreeString(excep.bstrHelpFile);
} }
static void parse_script_with_error(DWORD flags, BSTR script_str, SCODE errorcode, ULONG line, LONG pos, BSTR script_source, BSTR description, BSTR line_text) static void parse_script_with_error(DWORD flags, const WCHAR *script_str, SCODE errorcode, ULONG line, LONG pos, const WCHAR *script_source,
const WCHAR *description, const WCHAR *line_text)
{ {
IActiveScriptParse *parser; IActiveScriptParse *parser;
IActiveScript *engine; IActiveScript *engine;
...@@ -2128,23 +2130,6 @@ static void parse_script_ae(const char *src, HRESULT exhres) ...@@ -2128,23 +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 void parse_script_with_error_a(const char *src, SCODE errorcode, ULONG line, LONG pos, LPCSTR source, LPCSTR desc, LPCSTR linetext)
{
BSTR tmp, script_source, description, line_text;
tmp = a2bstr(src);
script_source = a2bstr(source);
description = a2bstr(desc);
line_text = a2bstr(linetext);
parse_script_with_error(SCRIPTITEM_GLOBALMEMBERS, tmp, errorcode, line, pos, script_source, description, line_text);
SysFreeString(line_text);
SysFreeString(description);
SysFreeString(script_source);
SysFreeString(tmp);
}
static HRESULT parse_htmlscript_a(const char *src) static HRESULT parse_htmlscript_a(const char *src)
{ {
HRESULT hres; HRESULT hres;
...@@ -3117,46 +3102,52 @@ static BOOL run_tests(void) ...@@ -3117,46 +3102,52 @@ static BOOL run_tests(void)
test_invokeex(); test_invokeex();
test_eval(); test_eval();
parse_script_with_error_a( parse_script_with_error(
"?", SCRIPTITEM_GLOBALMEMBERS,
L"?",
0x800a03ea, 0, 0, 0x800a03ea, 0, 0,
"Microsoft JScript compilation error", L"Microsoft JScript compilation error",
"Syntax error", L"Syntax error",
"?"); L"?");
parse_script_with_error_a( parse_script_with_error(
"var a=1;\nif(a\n-->0) a=5;\n", SCRIPTITEM_GLOBALMEMBERS,
L"var a=1;\nif(a\n-->0) a=5;\n",
0x800a03ee, 2, 0, 0x800a03ee, 2, 0,
"Microsoft JScript compilation error", L"Microsoft JScript compilation error",
"Expected ')'", L"Expected ')'",
"-->0) a=5;"); L"-->0) a=5;");
parse_script_with_error_a( parse_script_with_error(
"new 3;", SCRIPTITEM_GLOBALMEMBERS,
L"new 3;",
0x800a01bd, 0, 0, 0x800a01bd, 0, 0,
"Microsoft JScript runtime error", L"Microsoft JScript runtime error",
"Object doesn't support this action", L"Object doesn't support this action",
NULL); NULL);
parse_script_with_error_a( parse_script_with_error(
"new null;", SCRIPTITEM_GLOBALMEMBERS,
L"new null;",
0x800a138f, 0, 0, 0x800a138f, 0, 0,
"Microsoft JScript runtime error", L"Microsoft JScript runtime error",
"Object expected", L"Object expected",
NULL); NULL);
parse_script_with_error_a( parse_script_with_error(
"var a;\nnew null;", SCRIPTITEM_GLOBALMEMBERS,
L"var a;\nnew null;",
0x800a138f, 1, 0, 0x800a138f, 1, 0,
"Microsoft JScript runtime error", L"Microsoft JScript runtime error",
"Object expected", L"Object expected",
NULL); NULL);
parse_script_with_error_a( parse_script_with_error(
"var a; new null;", SCRIPTITEM_GLOBALMEMBERS,
L"var a; new null;",
0x800a138f, 0, 7, 0x800a138f, 0, 7,
"Microsoft JScript runtime error", L"Microsoft JScript runtime error",
"Object expected", L"Object expected",
NULL); NULL);
run_bom_tests(); run_bom_tests();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment