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

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

Browse source 
svn path=/trunk/; revision=69953
This commit is contained in:
Amine Khaldi 2015-11-20 10:28:29 +00:00
parent fe1ce8948d
commit 6f84bb5c35
1 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
rostests/winetests/jscript/run.c
View file

@ -91,6 +91,7 @@ DEFINE_EXPECT(global_propputref_d);
DEFINE_EXPECT(global_propputref_i); DEFINE_EXPECT(global_propputref_i);
DEFINE_EXPECT(global_propdelete_d); DEFINE_EXPECT(global_propdelete_d);
DEFINE_EXPECT(global_nopropdelete_d); DEFINE_EXPECT(global_nopropdelete_d);
DEFINE_EXPECT(global_propdeleteerror_d);
DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_d);
DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_success_i);
DEFINE_EXPECT(global_notexists_d); DEFINE_EXPECT(global_notexists_d);
@ -117,6 +118,7 @@ DEFINE_EXPECT(ActiveScriptSite_OnScriptError);
DEFINE_EXPECT(invoke_func); DEFINE_EXPECT(invoke_func);
DEFINE_EXPECT(DeleteMemberByDispID); DEFINE_EXPECT(DeleteMemberByDispID);
DEFINE_EXPECT(DeleteMemberByDispID_false); DEFINE_EXPECT(DeleteMemberByDispID_false);
DEFINE_EXPECT(DeleteMemberByDispID_error);
DEFINE_EXPECT(BindHandler); DEFINE_EXPECT(BindHandler);
#define DISPID_GLOBAL_TESTPROPGET 0x1000 #define DISPID_GLOBAL_TESTPROPGET 0x1000
@ -150,8 +152,9 @@ DEFINE_EXPECT(BindHandler);
#define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c #define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c
#define DISPID_GLOBAL_BINDEVENTHANDLER 0x101d #define DISPID_GLOBAL_BINDEVENTHANDLER 0x101d
#define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTPROPDELETE 0x2000
#define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001
#define DISPID_GLOBAL_TESTPROPDELETEERROR 0x2002
#define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_PROP 0x2000
#define DISPID_TESTOBJ_ONLYDISPID 0x2001 #define DISPID_TESTOBJ_ONLYDISPID 0x2001
@ -716,6 +719,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD
*pid = DISPID_GLOBAL_TESTNOPROPDELETE; *pid = DISPID_GLOBAL_TESTNOPROPDELETE;
return S_OK; return S_OK;
} }
if(!strcmp_wa(bstrName, "testPropDeleteError")) {
CHECK_EXPECT(global_propdeleteerror_d);
test_grfdex(grfdex, fdexNameCaseSensitive);
*pid = DISPID_GLOBAL_TESTPROPDELETEERROR;
return S_OK;
}
if(!strcmp_wa(bstrName, "getVT")) { if(!strcmp_wa(bstrName, "getVT")) {
test_grfdex(grfdex, fdexNameCaseSensitive); test_grfdex(grfdex, fdexNameCaseSensitive);
*pid = DISPID_GLOBAL_GETVT; *pid = DISPID_GLOBAL_GETVT;
@ -1368,6 +1377,9 @@ static HRESULT WINAPI Global_DeleteMemberByDispID(IDispatchEx *iface, DISPID id)
case DISPID_GLOBAL_TESTNOPROPDELETE: case DISPID_GLOBAL_TESTNOPROPDELETE:
CHECK_EXPECT(DeleteMemberByDispID_false); CHECK_EXPECT(DeleteMemberByDispID_false);
return S_FALSE; return S_FALSE;
case DISPID_GLOBAL_TESTPROPDELETEERROR:
CHECK_EXPECT(DeleteMemberByDispID_error);
return E_FAIL;
default: default:
ok(0, "id = %d\n", id); ok(0, "id = %d\n", id);
} }
@ -1855,6 +1867,17 @@ static void parse_script_a(const char *src)
parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src);
} }
static void parse_script_ae(const char *src, HRESULT exhres)
{
BSTR tmp;
HRESULT hres;
tmp = a2bstr(src);
hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp);
SysFreeString(tmp);
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) 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; BSTR tmp, script_source, description, line_text;
@ -2455,6 +2478,12 @@ static BOOL run_tests(void)
CHECK_CALLED(global_nopropdelete_d); CHECK_CALLED(global_nopropdelete_d);
CHECK_CALLED(DeleteMemberByDispID_false); CHECK_CALLED(DeleteMemberByDispID_false);
SET_EXPECT(global_propdeleteerror_d);
SET_EXPECT(DeleteMemberByDispID_error);
parse_script_ae("delete testPropDeleteError;", E_FAIL);
CHECK_CALLED(global_propdeleteerror_d);
CHECK_CALLED(DeleteMemberByDispID_error);
SET_EXPECT(puredisp_prop_d); SET_EXPECT(puredisp_prop_d);
parse_script_a("ok((delete pureDisp.prop) === false, 'delete pureDisp.prop did not return true');"); parse_script_a("ok((delete pureDisp.prop) === false, 'delete pureDisp.prop did not return true');");
CHECK_CALLED(puredisp_prop_d); CHECK_CALLED(puredisp_prop_d);