Jacek Caban : vbscript: Added support for VT_NULL in stack_pop_bool.

Alexandre Julliard julliard at winehq.org
Mon Sep 10 15:22:11 CDT 2012


Module: wine
Branch: master
Commit: 81766a740e1c1816ba3869bf41832a3532ffa819
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=81766a740e1c1816ba3869bf41832a3532ffa819

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Sep 10 10:35:29 2012 +0200

vbscript: Added support for VT_NULL in stack_pop_bool.

---

 dlls/vbscript/interp.c       |    3 +++
 dlls/vbscript/tests/lang.vbs |    6 ++++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index 3a078b5..3a5d9b2 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -373,6 +373,9 @@ static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b)
     case VT_BOOL:
         *b = V_BOOL(val.v);
         break;
+    case VT_NULL:
+        *b = FALSE;
+        break;
     case VT_I2:
         *b = V_I2(val.v);
         break;
diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index 3e105b6..90d5304 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -434,6 +434,12 @@ do while true
     next
 loop
 
+if null then call ok(false, "if null evaluated")
+
+while null
+    call ok(false, "while null evaluated")
+wend
+
 Call collectionObj.reset()
 y = 0
 x = 10




More information about the wine-cvs mailing list