[PATCH v3 0/1] MR1495: vbscript: Add support for redim byref.

[Jason Millard (＠jsm174)]

fixes https://bugs.winehq.org/show_bug.cgi?id=53807

--
  v3: vbscript: Add support for redim byref.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1495

[PATCH v3 1/1] vbscript: Add support for redim byref.

[Jason Millard]

From: Jason Millard <jsm174(a)gmail.com>

---
 dlls/vbscript/interp.c       | 33 ++++++++++++++++++++++++---------
 dlls/vbscript/tests/lang.vbs | 22 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index 77875ee7f44..2d33982839e 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -1283,6 +1283,7 @@ static HRESULT interp_redim(exec_ctx_t *ctx)
 {
     BSTR identifier = ctx->instr->arg1.bstr;
     const unsigned dim_cnt = ctx->instr->arg2.uint;
+    VARIANT *v;
     SAFEARRAYBOUND *bounds;
     SAFEARRAY *array;
     ref_t ref;
@@ -1312,9 +1313,16 @@ static HRESULT interp_redim(exec_ctx_t *ctx)
 
     /* FIXME: We should check if we're not modifying an existing static array here */
 
-    VariantClear(ref.u.v);
-    V_VT(ref.u.v) = VT_ARRAY|VT_VARIANT;
-    V_ARRAY(ref.u.v) = array;
+    v = ref.u.v;
+
+    if(V_VT(v) == (VT_VARIANT|VT_BYREF)) {
+        v = V_VARIANTREF(v);
+    }
+
+    VariantClear(v);
+    V_VT(v) = VT_ARRAY|VT_VARIANT;
+    V_ARRAY(v) = array;
+
     return S_OK;
 }
 
@@ -1323,6 +1331,7 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx)
     BSTR identifier = ctx->instr->arg1.bstr;
     const unsigned dim_cnt = ctx->instr->arg2.uint;
     unsigned i;
+    VARIANT *v;
     SAFEARRAYBOUND *bounds;
     SAFEARRAY *array;
     ref_t ref;
@@ -1341,12 +1350,18 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx)
         return E_FAIL;
     }
 
-    if(!(V_VT(ref.u.v) & VT_ARRAY)) {
-        FIXME("ReDim Preserve not valid on type %d\n", V_VT(ref.u.v));
+    v = ref.u.v;
+
+    if(V_VT(v) == (VT_VARIANT|VT_BYREF)) {
+        v = V_VARIANTREF(v);
+    }
+
+    if(!(V_VT(v) & VT_ARRAY)) {
+        FIXME("ReDim Preserve not valid on type %d\n", V_VT(v));
         return E_FAIL;
     }
 
-    array = V_ARRAY(ref.u.v);
+    array = V_ARRAY(v);
 
     hres = array_bounds_from_stack(ctx, dim_cnt, &bounds);
     if(FAILED(hres))
@@ -1355,9 +1370,9 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx)
     if(array == NULL || array->cDims == 0) {
         /* can initially allocate the array */
         array = SafeArrayCreate(VT_VARIANT, dim_cnt, bounds);
-        VariantClear(ref.u.v);
-        V_VT(ref.u.v) = VT_ARRAY|VT_VARIANT;
-        V_ARRAY(ref.u.v) = array;
+        VariantClear(v);
+        V_VT(v) = VT_ARRAY|VT_VARIANT;
+        V_ARRAY(v) = array;
         return S_OK;
     } else if(array->cDims != dim_cnt) {
         /* can't otherwise change the number of dimensions */
diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index beb7c7e86c9..990d830234d 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -1562,6 +1562,28 @@ sub TestReDimList
 end sub
 call TestReDimList
 
+dim rx(4)
+sub TestReDimByRef(byref x)
+   ok ubound(x) = 4, "ubound(x) = " & ubound(x)
+   redim x(6)
+   ok ubound(x) = 6, "ubound(x) = " & ubound(x)
+end sub
+call TestReDimByRef(rx)
+ok ubound(rx) = 6, "ubound(rx) = " & ubound(rx)
+
+redim rx(5)
+rx(3)=2
+sub TestReDimPreserveByRef(byref x)
+   ok ubound(x) = 5, "ubound(x) = " & ubound(x)
+   ok x(3) = 2, "x(3) = " & x(3)
+   redim preserve x(7)
+   ok ubound(x) = 7, "ubound(x) = " & ubound(x)
+   ok x(3) = 2, "x(3) = " & x(3)
+end sub
+call TestReDimPreserveByRef(rx)
+ok ubound(rx) = 7, "ubound(rx) = " & ubound(rx)
+ok rx(3) = 2, "rx(3) = " & rx(3)
+
 Class ArrClass
     Dim classarr(3)
     Dim classnoarr()
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1495

[PATCH v3 1/1] vbscript: Add support for redim byref.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=126631

Your paranoid android.


=== w7u_2qxl (32 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w7u_adm (32 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w7u_el (32 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w8 (32 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w8adm (32 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w864 (32 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w1064v1507 (32 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w1064v1809 (32 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w1064_tsign (32 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w10pro64 (32 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w864 (64 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w1064v1507 (64 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w1064v1809 (64 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w1064_2qxl (64 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w1064_adm (64 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w1064_tsign (64 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w10pro64 (64 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w10pro64_en_AE_u8 (64 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a
run.c:1206: Test failed: api.vbs: L"Err.number = 0"
run.c:1206: Test failed: api.vbs: L"Err.description = "
run.c:1206: Test failed: api.vbs: L"Err.number = 0"

=== w10pro64_ar (64 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w10pro64_ja (64 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

=== w10pro64_zh_CN (64 bit report) ===

vbscript:
run.c:1941: Test failed: unexpected call OnScriptError
run.c:1941: Test failed: unexpected call OnScriptError
run.c:3113: Test failed: expected global_success_d
run.c:3114: Test failed: expected global_success_i
run.c:3116: Test failed: parse_script failed: 800a000a

[Jason Millard (＠jsm174)]

On Tue Nov 22 13:41:33 2022 +0000, Jason Millard wrote:
> changed this line in [version 3 of the diff](/wine/wine/-/merge_requests/1495/diffs?diff_id=20281&start_sha=5070449cc9c02cd059faf69c65920d7ef72c3251#19b309798e74fb8c8af366e0c6cc686d79a38532_1315_1316)
> done!

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1495#note_16955

[PATCH v3 0/1] MR1495: vbscript: Add support for redim byref. - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1495