[PATCH v2 1/2] vbscript: Coerce to VT_BOOL when evaluating jump conditions.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 dlls/vbscript/interp.c       | 41 +++++++++--------------
 dlls/vbscript/tests/lang.vbs | 63 ++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index eb1dcab5f01..7b77916f96c 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -413,43 +413,32 @@ static HRESULT stack_assume_val(exec_ctx_t *ctx, unsigned n)
     return S_OK;
 }

-static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b)
+static HRESULT stack_pop_bool(exec_ctx_t *ctx, BOOL *b)
 {
     variant_val_t val;
     HRESULT hres;
-    VARIANT_BOOL vb;
+    VARIANT v;

hres = stack_pop_val(ctx, &val);
     if(FAILED(hres))
         return hres;

-    switch (V_VT(val.v))
+    if (V_VT(val.v) == VT_NULL)
     {
-    case VT_BOOL:
-        *b = V_BOOL(val.v);
-        break;
-    case VT_NULL:
-    case VT_EMPTY:
         *b = FALSE;
-        break;
-    case VT_I2:
-        *b = V_I2(val.v);
-        break;
-    case VT_I4:
-        *b = V_I4(val.v);
-        break;
-    case VT_BSTR:
-        hres = VarBoolFromStr(V_BSTR(val.v), ctx->script->lcid, 0, &vb);
-        if(FAILED(hres))
-            return hres;
-        *b=vb;
-        break;
-    default:
-        FIXME("unsupported for %s\n", debugstr_variant(val.v));
-        release_val(&val);
-        return E_NOTIMPL;
     }
-    return S_OK;
+    else
+    {
+        V_VT(&v) = VT_EMPTY;
+        hres = VariantChangeType(&v, val.v, VARIANT_LOCALBOOL, VT_BOOL);
+    }
+
+    release_val(&val);
+
+    if (SUCCEEDED(hres))
+        *b = V_BOOL(&v) == VARIANT_TRUE;
+
+    return hres;
 }

static HRESULT stack_pop_disp(exec_ctx_t *ctx, IDispatch **ret)
diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index 55efdcb5a00..918a20ad472 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -420,6 +420,69 @@ else
 end if
 Call ok(x = 1, "if ""-1"" not executed")

+x = 0
+if 0.1 then
+   x = 1
+else
+   ok false, "if ""0.1"" else executed"
+end if
+Call ok(x = 1, "if ""0.1"" not executed")
+
+x = 0
+if "TRUE" then
+   x = 1
+else
+   ok false, "if ""TRUE"" else executed"
+end if
+Call ok(x = 1, "if ""TRUE"" not executed")
+
+x = 0
+if "#TRUE#" then
+   x = 1
+else
+   ok false, "if ""#TRUE#"" else executed"
+end if
+Call ok(x = 1, "if ""#TRUE#"" not executed")
+
+x = 0
+if (not "#FALSE#") then
+   x = 1
+else
+   ok false, "if ""not #FALSE#"" else executed"
+end if
+Call ok(x = 1, "if ""not #FALSE#"" not executed")
+
+Class ValClass
+    Public myval
+
+    Public default Property Get defprop
+        defprop = myval
+    End Property
+End Class
+
+Dim MyObject
+Set MyObject = New ValClass
+
+MyObject.myval = 1
+Call ok(CBool(MyObject) = True, "CBool(MyObject) = " & CBool(MyObject))
+x = 0
+if MyObject then
+   x = 1
+else
+   ok false, "if ""MyObject(1)"" else executed"
+end if
+Call ok(x = 1, "if ""MyObject(1)"" not executed")
+
+MyObject.myval = 0
+Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject))
+x = 0
+if not MyObject then
+   x = 1
+else
+   ok false, "if ""MyObject(0)"" else executed"
+end if
+Call ok(x = 1, "if ""MyObject(0)"" not executed")
+
 x = 0
 WHILE x < 3 : x = x + 1 : Wend
 Call ok(x = 3, "x not equal to 3")