From: Amine Khaldi Date: Sun, 17 Sep 2017 22:54:31 +0000 (+0000) Subject: [JSCRIPT_WINETEST] Sync with Wine Staging 2.16. CORE-13762 X-Git-Tag: 0.4.8-dev~356 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=438c6a92bc8554a3c3714641e6fc93bc7a1363bc [JSCRIPT_WINETEST] Sync with Wine Staging 2.16. CORE-13762 svn path=/trunk/; revision=75883 --- diff --git a/rostests/winetests/jscript/run.c b/rostests/winetests/jscript/run.c index e2da2a3a4fd..9d9f4af85c3 100644 --- a/rostests/winetests/jscript/run.c +++ b/rostests/winetests/jscript/run.c @@ -1322,7 +1322,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[6], v; + VARIANT args[7], v; DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; @@ -1362,6 +1362,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_UI4(args+4) = 0xffffffff; V_VT(args+5) = VT_BYREF|VT_VARIANT; V_VARIANTREF(args+5) = &v; + V_VT(args+6) = VT_R4; + V_R4(args+6) = 0.5; V_VT(&v) = VT_I4; V_I4(&v) = 2; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); @@ -2651,7 +2653,8 @@ static BOOL run_tests(void) CHECK_CALLED(global_propargput_i); SET_EXPECT(global_testargtypes_i); - parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(i4ref,ui4,nullunk,d,i,s) {" + parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp," + "function(r4,i4ref,ui4,nullunk,d,i,s) {" " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" " ok(getVT(d) === 'VT_DISPATCH', 'getVT(d) = ' + getVT(d));" @@ -2661,6 +2664,8 @@ static BOOL run_tests(void) " ok(ui4 > 0, 'ui4 = ' + ui4);" " ok(getVT(i4ref) === 'VT_I4', 'getVT(i4ref) = ' + getVT(i4ref));" " ok(i4ref === 2, 'i4ref = ' + i4ref);" + " ok(r4 === 0.5, 'r4 = ' + r4);" + " ok(getVT(r4) === 'VT_R8', 'getVT(r4) = ' + getVT(r4));" "});"); CHECK_CALLED(global_testargtypes_i);