[PATCH 2/3] jscript/tests: merge parse_htmlscript into parse_script.

[Reece Dunn]

- Reece
-------------- next part --------------
From b3baf15cd56b92a0a1a158fa92b55e0797802f1d Mon Sep 17 00:00:00 2001
From: Reece Dunn <msclrhd at gmail.com>
Date: Wed, 6 Oct 2010 20:46:24 +0100
Subject: [PATCH 2/3] jscript/tests: merge parse_htmlscript into parse_script.

---
 dlls/jscript/tests/run.c |   61 +++++++++-------------------------------------
 1 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c
index e1a9bd1..eefca42 100644
--- a/dlls/jscript/tests/run.c
+++ b/dlls/jscript/tests/run.c
@@ -731,7 +731,7 @@ static IActiveScript *create_script(void)
     return script;
 }
 
-static HRESULT parse_script(DWORD flags, BSTR script_str)
+static HRESULT parse_script(DWORD flags, BSTR script_str, BSTR html_str)
 {
     IActiveScriptParse *parser;
     IActiveScript *engine;
@@ -767,7 +767,7 @@ static HRESULT parse_script(DWORD flags, BSTR script_str)
     ok(script_disp != NULL, "script_disp == NULL\n");
     ok(script_disp != (IDispatch*)&Global, "script_disp == Global\n");
 
-    hres = IActiveScriptParse64_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL);
+    hres = IActiveScriptParse64_ParseScriptText(parser, script_str, NULL, NULL, html_str, 0, 0, 0, NULL, NULL);
 
     IDispatch_Release(script_disp);
     IActiveScript_Release(engine);
@@ -776,54 +776,13 @@ static HRESULT parse_script(DWORD flags, BSTR script_str)
     return hres;
 }
 
-static HRESULT parse_htmlscript(BSTR script_str)
-{
-    IActiveScriptParse *parser;
-    IActiveScript *engine;
-    HRESULT hres;
-    BSTR tmp = a2bstr("</SCRIPT>");
-
-    engine = create_script();
-    if(!engine)
-        return E_FAIL;
-
-    hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser);
-    ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres);
-    if (FAILED(hres))
-    {
-        IActiveScript_Release(engine);
-        return E_FAIL;
-    }
-
-    hres = IActiveScriptParse64_InitNew(parser);
-    ok(hres == S_OK, "InitNew failed: %08x\n", hres);
-
-    hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite);
-    ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres);
-
-    hres = IActiveScript_AddNamedItem(engine, testW,
-            SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS);
-    ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres);
-
-    hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED);
-    ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres);
-
-    hres = IActiveScriptParse64_ParseScriptText(parser, script_str, NULL, NULL, tmp, 0, 0, 0, NULL, NULL);
-
-    IActiveScript_Release(engine);
-    IUnknown_Release(parser);
-    SysFreeString(tmp);
-
-    return hres;
-}
-
 static HRESULT parse_script_ex_af(DWORD flags, const char *src)
 {
     BSTR tmp;
     HRESULT hres;
 
     tmp = a2bstr(src);
-    hres = parse_script(flags, tmp);
+    hres = parse_script(flags, tmp, NULL);
     SysFreeString(tmp);
 
     return hres;
@@ -849,9 +808,13 @@ static void parse_script_a(const char *src)
 static HRESULT parse_htmlscript_a(const char *src)
 {
     HRESULT hres;
-    BSTR tmp = a2bstr(src);
-    hres = parse_htmlscript(tmp);
-    SysFreeString(tmp);
+    BSTR script_src, html_src;
+
+    script_src = a2bstr(src);
+    html_src = a2bstr("</SCRIPT>");
+    hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, script_src, html_src);
+    SysFreeString(html_src);
+    SysFreeString(script_src);
 
     return hres;
 }
@@ -904,7 +867,7 @@ static void run_from_file(const char *filename)
         return;
 
     strict_dispid_check = FALSE;
-    hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, script_str);
+    hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, script_str, NULL);
     SysFreeString(script_str);
     ok(hres == S_OK, "parse_script failed: %08x\n", hres);
 }
@@ -932,7 +895,7 @@ static void run_from_res(const char *name)
 
     SET_EXPECT(global_success_d);
     SET_EXPECT(global_success_i);
-    hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, str);
+    hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, str, NULL);
     CHECK_CALLED(global_success_d);
     CHECK_CALLED(global_success_i);
 
-- 
1.7.0.4