Jacek Caban : mshtml/tests: Fix tests on some recent IE versions.
Module: wine Branch: master Commit: 6941232d8be5b0f6e46f4a01b70ff60db9895773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6941232d8be5b0f6e46f4a01b... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 28 17:33:35 2019 +0200 mshtml/tests: Fix tests on some recent IE versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index c0ddc81..7d6afd2 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -135,6 +135,7 @@ DEFINE_EXPECT(QS_VariantConversion); DEFINE_EXPECT(QS_IActiveScriptSite); DEFINE_EXPECT(QS_GetCaller); DEFINE_EXPECT(ChangeType); +DEFINE_EXPECT(GetTypeInfo); #define TESTSCRIPT_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80746}" #define TESTACTIVEX_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" @@ -399,7 +400,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); + CHECK_EXPECT2(GetTypeInfo); return E_NOTIMPL; } @@ -3453,9 +3454,12 @@ static void run_js_tests(void) { run_js_script("jstest.html"); run_js_script("exectest.html"); - run_js_script("vbtest.html"); run_js_script("events.html"); + SET_EXPECT(GetTypeInfo); + run_js_script("vbtest.html"); + CLEAR_CALLED(GetTypeInfo); + if(!is_ie9plus) { win_skip("Skipping some script tests on IE older than 9.\n"); return;
participants (1)
-
Alexandre Julliard