msscript.ocx: Fix VARIANT access.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2019-09-25 17:02:04 +02:00 committed by Alexandre Julliard
parent f99b9868e5
commit 12db3a102a
1 changed files with 2 additions and 6 deletions

View File

@ -1525,11 +1525,9 @@ static void test_IScriptControl_Eval(void)
parse_flags = SCRIPTTEXT_ISEXPRESSION; parse_flags = SCRIPTTEXT_ISEXPRESSION;
script_str = a2bstr("var1 = 1 + 1"); script_str = a2bstr("var1 = 1 + 1");
V_VT(&var) = VT_NULL; V_VT(&var) = VT_NULL;
V_I4(&var) = 0xdeadbeef;
hr = IScriptControl_Eval(sc, script_str, &var); hr = IScriptControl_Eval(sc, script_str, &var);
ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr);
ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d.\n", V_VT(&var));
V_VT(&var), V_I4(&var));
SysFreeString(script_str); SysFreeString(script_str);
CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(SetScriptState_STARTED);
CHECK_CALLED(ParseScriptText); CHECK_CALLED(ParseScriptText);
@ -1657,11 +1655,9 @@ static void test_IScriptControl_AddCode(void)
parse_flags = SCRIPTTEXT_ISEXPRESSION; parse_flags = SCRIPTTEXT_ISEXPRESSION;
code_str = a2bstr("var2 = 10 + var1"); code_str = a2bstr("var2 = 10 + var1");
V_VT(&var) = VT_NULL; V_VT(&var) = VT_NULL;
V_I4(&var) = 0xdeadbeef;
hr = IScriptControl_Eval(sc, code_str, &var); hr = IScriptControl_Eval(sc, code_str, &var);
ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr);
ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d.\n", V_VT(&var));
V_VT(&var), V_I4(&var));
SysFreeString(code_str); SysFreeString(code_str);
CHECK_CALLED(ParseScriptText); CHECK_CALLED(ParseScriptText);