Jacek Caban : msscript.ocx: Fix VARIANT access.
Alexandre Julliard
julliard at winehq.org
Wed Sep 25 16:45:19 CDT 2019
Module: wine
Branch: master
Commit: 12db3a102af292e9e07927ff82152533c3ec42bc
URL: https://source.winehq.org/git/wine.git/?a=commit;h=12db3a102af292e9e07927ff82152533c3ec42bc
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Sep 25 17:02:04 2019 +0200
msscript.ocx: Fix VARIANT access.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msscript.ocx/tests/msscript.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c
index 0345b3f392..95b2a69cf6 100644
--- a/dlls/msscript.ocx/tests/msscript.c
+++ b/dlls/msscript.ocx/tests/msscript.c
@@ -1525,11 +1525,9 @@ static void test_IScriptControl_Eval(void)
parse_flags = SCRIPTTEXT_ISEXPRESSION;
script_str = a2bstr("var1 = 1 + 1");
V_VT(&var) = VT_NULL;
- V_I4(&var) = 0xdeadbeef;
hr = IScriptControl_Eval(sc, script_str, &var);
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",
- V_VT(&var), V_I4(&var));
+ ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d.\n", V_VT(&var));
SysFreeString(script_str);
CHECK_CALLED(SetScriptState_STARTED);
CHECK_CALLED(ParseScriptText);
@@ -1657,11 +1655,9 @@ static void test_IScriptControl_AddCode(void)
parse_flags = SCRIPTTEXT_ISEXPRESSION;
code_str = a2bstr("var2 = 10 + var1");
V_VT(&var) = VT_NULL;
- V_I4(&var) = 0xdeadbeef;
hr = IScriptControl_Eval(sc, code_str, &var);
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",
- V_VT(&var), V_I4(&var));
+ ok(V_VT(&var) == VT_EMPTY, "V_VT(var) = %d.\n", V_VT(&var));
SysFreeString(code_str);
CHECK_CALLED(ParseScriptText);
More information about the wine-cvs
mailing list