ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vbscript: Support VT_BSTR in stack_pop_bool. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51911
Signed-off-by: Robert Wilhelm <robert.wilhelm@gmx.net>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit b9e38a41ea)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
Robert Wilhelm 2021-11-02 21:39:40 +01:00 committed by Michael Stefaniuc
parent f560fad07d
commit d4024e428b
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/vbscript/interp.c
View File

@ -416,6 +416,7 @@ static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b)
{ {
variant_val_t val; variant_val_t val;
HRESULT hres; HRESULT hres;
VARIANT_BOOL vb;
hres = stack_pop_val(ctx, &val); hres = stack_pop_val(ctx, &val);
if(FAILED(hres)) if(FAILED(hres))
@ -436,6 +437,12 @@ static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b)
case VT_I4: case VT_I4:
*b = V_I4(val.v); *b = V_I4(val.v);
break; break;
case VT_BSTR:
hres = VarBoolFromStr(V_BSTR(val.v), ctx->script->lcid, 0, &vb);
if(FAILED(hres))
return hres;
*b=vb;
break;
default: default:
FIXME("unsupported for %s\n", debugstr_variant(val.v)); FIXME("unsupported for %s\n", debugstr_variant(val.v));
release_val(&val); release_val(&val);

16
dlls/vbscript/tests/lang.vbs
View File

@ -357,6 +357,22 @@ while empty
ok false, "while empty executed" ok false, "while empty executed"
wend wend
x = 0
if "0" then
ok false, "if ""0"" executed"
else
x = 1
end if
Call ok(x = 1, "if ""0"" else not executed")
x = 0
if "-1" then
x = 1
else
ok false, "if ""-1"" else executed"
end if
Call ok(x = 1, "if ""-1"" not executed")
x = 0 x = 0
WHILE x < 3 : x = x + 1 : Wend WHILE x < 3 : x = x + 1 : Wend
Call ok(x = 3, "x not equal to 3") Call ok(x = 3, "x not equal to 3")