Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-04 00:40:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[VBSCRIPT_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

Browse source 
svn path=/trunk/; revision=70140
This commit is contained in:
Amine Khaldi 2015-11-26 23:37:03 +00:00
parent 34b8a6f42b
commit d25d1c5a58
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
rostests/winetests/vbscript/run.c
View file

@ -107,6 +107,7 @@ DEFINE_EXPECT(Next);
DEFINE_EXPECT(GetWindow); DEFINE_EXPECT(GetWindow);
DEFINE_EXPECT(GetUIBehavior); DEFINE_EXPECT(GetUIBehavior);
DEFINE_EXPECT(EnableModeless); DEFINE_EXPECT(EnableModeless);
DEFINE_EXPECT(OnScriptError);
#define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_REPORTSUCCESS 1000
#define DISPID_GLOBAL_TRACE 1001 #define DISPID_GLOBAL_TRACE 1001
@ -145,6 +146,7 @@ static const char *test_name = "(null)";
static int test_counter; static int test_counter;
static SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_NOUIERROR; static SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_NOUIERROR;
static IDispatchEx testObj; static IDispatchEx testObj;
static HRESULT onerror_hres = E_NOTIMPL;
static BSTR a2bstr(const char *str) static BSTR a2bstr(const char *str)
{ {
@ -1630,7 +1632,12 @@ static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, S
static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, IActiveScriptError *pscripterror) static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, IActiveScriptError *pscripterror)
{ {
return E_NOTIMPL; HRESULT hr = onerror_hres;
CHECK_EXPECT(OnScriptError);
onerror_hres = E_NOTIMPL;
return hr;
} }
static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface) static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface)
@ -1934,18 +1941,22 @@ static void test_msgbox(void)
SET_EXPECT(GetUIBehavior); SET_EXPECT(GetUIBehavior);
SET_EXPECT(GetWindow); SET_EXPECT(GetWindow);
SET_EXPECT(EnableModeless); SET_EXPECT(EnableModeless);
SET_EXPECT(OnScriptError);
hres = parse_script_ar("MsgBox \"testing...\""); hres = parse_script_ar("MsgBox \"testing...\"");
ok(FAILED(hres), "script not failed\n"); ok(FAILED(hres), "script not failed\n");
CHECK_CALLED(GetUIBehavior); CHECK_CALLED(GetUIBehavior);
CHECK_CALLED(GetWindow); CHECK_CALLED(GetWindow);
CHECK_CALLED(EnableModeless); CHECK_CALLED(EnableModeless);
todo_wine CHECK_CALLED(OnScriptError);
uic_handling = SCRIPTUICHANDLING_NOUIERROR; uic_handling = SCRIPTUICHANDLING_NOUIERROR;
SET_EXPECT(GetUIBehavior); SET_EXPECT(GetUIBehavior);
SET_EXPECT(OnScriptError);
hres = parse_script_ar("MsgBox \"testing...\""); hres = parse_script_ar("MsgBox \"testing...\"");
ok(FAILED(hres), "script not failed\n"); ok(FAILED(hres), "script not failed\n");
CHECK_CALLED(GetUIBehavior); CHECK_CALLED(GetUIBehavior);
todo_wine CHECK_CALLED(OnScriptError);
} }
static HRESULT test_global_vars_ref(BOOL use_close) static HRESULT test_global_vars_ref(BOOL use_close)
@ -2191,8 +2202,10 @@ static void run_tests(void)
parse_htmlscript_a("<!--\ndim x\nx=1\n-->\n"); parse_htmlscript_a("<!--\ndim x\nx=1\n-->\n");
parse_htmlscript_a("<!--\ndim x\n-->\n<!--\nx=1\n-->\n"); parse_htmlscript_a("<!--\ndim x\n-->\n<!--\nx=1\n-->\n");
SET_EXPECT(OnScriptError);
hres = parse_script_ar("<!--"); hres = parse_script_ar("<!--");
ok(FAILED(hres), "script didn't fail\n"); ok(FAILED(hres), "script didn't fail\n");
todo_wine CHECK_CALLED(OnScriptError);
SET_EXPECT(global_success_d); SET_EXPECT(global_success_d);
SET_EXPECT(global_success_i); SET_EXPECT(global_success_i);
@ -2215,19 +2228,39 @@ static void run_tests(void)
test_global_vars_ref(TRUE); test_global_vars_ref(TRUE);
test_global_vars_ref(FALSE); test_global_vars_ref(FALSE);
SET_EXPECT(OnScriptError);
hres = parse_script_ar("throwInt(&h80080008&)"); hres = parse_script_ar("throwInt(&h80080008&)");
ok(hres == 0x80080008, "hres = %08x\n", hres); ok(hres == 0x80080008, "hres = %08x\n", hres);
todo_wine CHECK_CALLED(OnScriptError);
/* DISP_E_BADINDEX */ /* DISP_E_BADINDEX */
SET_EXPECT(OnScriptError);
hres = parse_script_ar("throwInt(&h8002000b&)"); hres = parse_script_ar("throwInt(&h8002000b&)");
ok(hres == MAKE_VBSERROR(9), "hres = %08x\n", hres); ok(hres == MAKE_VBSERROR(9), "hres = %08x\n", hres);
todo_wine CHECK_CALLED(OnScriptError);
SET_EXPECT(OnScriptError);
hres = parse_script_ar("throwInt(&h800a0009&)"); hres = parse_script_ar("throwInt(&h800a0009&)");
ok(hres == MAKE_VBSERROR(9), "hres = %08x\n", hres); ok(hres == MAKE_VBSERROR(9), "hres = %08x\n", hres);
todo_wine CHECK_CALLED(OnScriptError);
onerror_hres = S_OK;
SET_EXPECT(OnScriptError);
hres = parse_script_ar("throwInt(&h800a0009&)");
todo_wine ok(hres == SCRIPT_E_REPORTED, "hres = %08x\n", hres);
todo_wine CHECK_CALLED(OnScriptError);
/* E_NOTIMPL */ /* E_NOTIMPL */
SET_EXPECT(OnScriptError);
hres = parse_script_ar("throwInt(&h80004001&)"); hres = parse_script_ar("throwInt(&h80004001&)");
ok(hres == MAKE_VBSERROR(445), "hres = %08x\n", hres); ok(hres == MAKE_VBSERROR(445), "hres = %08x\n", hres);
todo_wine CHECK_CALLED(OnScriptError);
onerror_hres = S_OK;
SET_EXPECT(OnScriptError);
hres = parse_script_ar("throwInt(&h80004001&)");
todo_wine ok(hres == SCRIPT_E_REPORTED, "hres = %08x\n", hres);
todo_wine CHECK_CALLED(OnScriptError);
SET_EXPECT(global_testoptionalarg_i); SET_EXPECT(global_testoptionalarg_i);
parse_script_a("call testOptionalArg(1,,2)"); parse_script_a("call testOptionalArg(1,,2)");
@ -2262,8 +2295,10 @@ static void run_tests(void)
parse_script_a("x = y\n" parse_script_a("x = y\n"
"Call ok(getVT(x) = \"VT_EMPTY*\", \"getVT(x) = \" & getVT(x))\n" "Call ok(getVT(x) = \"VT_EMPTY*\", \"getVT(x) = \" & getVT(x))\n"
"Call ok(getVT(y) = \"VT_EMPTY*\", \"getVT(y) = \" & getVT(y))"); "Call ok(getVT(y) = \"VT_EMPTY*\", \"getVT(y) = \" & getVT(y))");
SET_EXPECT(OnScriptError);
hres = parse_script_ar("x = y(\"a\")"); hres = parse_script_ar("x = y(\"a\")");
ok(FAILED(hres), "script didn't fail\n"); ok(FAILED(hres), "script didn't fail\n");
todo_wine CHECK_CALLED(OnScriptError);
run_from_res("lang.vbs"); run_from_res("lang.vbs");
run_from_res("api.vbs"); run_from_res("api.vbs");

2
rostests/winetests/vbscript/vbsregexp55.idl
View file

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#pragma makedep header
import "oaidl.idl"; import "oaidl.idl";
#include "vbscript_defs.h" #include "vbscript_defs.h"