- Wine-GitLab - list.winehq.org

[PATCH v11 0/1] MR10464: vbscript: Return "Name redefined" error for duplicate declarations.
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

When a name is defined twice (Const/Const, Dim/Const, Const/Dim, Dim/Dim, Sub vs Const/Dim, Class vs Const/Dim/Function, duplicate class members), Windows returns VBScript error 1041 ("Name redefined"). Wine was returning E_FAIL. Store source locations in const_decl_t, dim_decl_t, function_decl_t, and class_decl_t so errors point to the duplicate name. Also fix duplicate Sub/Function/Property/Dim detection inside classes, including the case where a Property collides with an existing Sub/Function. -- v11: vbscript: Return "Name redefined" error for duplicate declarations. https://gitlab.winehq.org/wine/wine/-/merge_requests/10464

2 1

[PATCH v10 0/1] MR10464: vbscript: Return "Name redefined" error for duplicate declarations.
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

When a name is defined twice (Const/Const, Dim/Const, Const/Dim, Dim/Dim, Sub vs Const/Dim, Class vs Const/Dim/Function, duplicate class members), Windows returns VBScript error 1041 ("Name redefined"). Wine was returning E_FAIL. Store source locations in const_decl_t, dim_decl_t, function_decl_t, and class_decl_t so errors point to the duplicate name. Also fix duplicate Sub/Function/Property/Dim detection inside classes, including the case where a Property collides with an existing Sub/Function. -- v10: vbscript: Return "Name redefined" error for duplicate declarations. https://gitlab.winehq.org/wine/wine/-/merge_requests/10464

2 1

[PATCH v3 0/1] MR10383: vbscript: Support element access on public array properties of class instances.
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

On Windows, public array properties declared in a class (e.g. "Public arr(3)") can be accessed element-wise from outside the class using obj.arr(i) for both reading and writing. Wine failed to handle this because invoke_variant_prop() used V_ARRAY() which does not work for VT_ARRAY|VT_BYREF|VT_VARIANT arrays, and the property put path did not support indexed arguments at all. Fix both by adding a helper to extract the SAFEARRAY from either BYREF or direct array variants, and implementing indexed array element writes in the property put path. -- v3: vbscript: Support element access on public array properties of class instances. https://gitlab.winehq.org/wine/wine/-/merge_requests/10383

2 1

[PATCH v5 0/1] MR10374: vbscript: Throw proper error for undefined variables with Option Explicit.
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

When Option Explicit is set and a For loop uses an undefined variable, throw error 500 (Variable is undefined) with proper description instead of just returning E_FAIL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57511 -- v5: vbscript: Throw proper error for undefined variables with Option Explicit. https://gitlab.winehq.org/wine/wine/-/merge_requests/10374

2 1

[PATCH v10 0/1] MR10363: vbscript: Support assignment to chained array index expressions.
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

Handle expressions like x(0)(1) = 5 where the left side of an assignment is a call expression whose inner expression is also a call (not a direct member). The compiler now evaluates the inner expression as a read, then emits a new OP_assign_call opcode to assign to the resulting array element or default dispatch property. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53877 _Side note: https://bugs.winehq.org/show_bug.cgi?id=58318 is a duplicate of that bug_ -- v10: vbscript: Support assignment to chained array index expressions. https://gitlab.winehq.org/wine/wine/-/merge_requests/10363

2 1

[PATCH v7 0/1] MR10362: vbscript: Support chained call syntax like dict.Keys()(i).
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

Treat '(' after tEMPTYBRACKETS as an argument list opener in the lexer, so that expressions like GetArr()(0) or dict.Keys()(i) parse correctly. Also dereference VT_BYREF|VT_VARIANT results in vcall so chained indexing on call results works at runtime. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58051 This includes some of the work done in !10308, preferably that one is merged first. -- v7: vbscript: Support chained call syntax like dict.Keys()(i). https://gitlab.winehq.org/wine/wine/-/merge_requests/10362

2 1

[PATCH v6 0/1] MR10343: vbscript: Resolve parser conflicts with %prec and %expect.
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

Use %prec LOWER_THAN_ELSE on the empty EndIf_opt rule to explicitly resolve 4 dangling Else / End If shift/reduce conflicts. The remaining 6 conflicts are benign colon-chain ambiguities documented with %expect 6. -- v6: vbscript: Resolve parser conflicts with %prec and %expect. https://gitlab.winehq.org/wine/wine/-/merge_requests/10343

2 1

[PATCH v7 0/1] MR10314: vbscript: Convert string to number for comparison operators.
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

When one operand was a string and the other numeric, VBScript should have converted the string to a double before comparing. VarCmp did not do this automatically, resulting in incorrect string comparison. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56281 -- v7: vbscript: Convert string to number for comparison operators. https://gitlab.winehq.org/wine/wine/-/merge_requests/10314

2 1

[PATCH v19 0/1] MR10244: vbscript: Fix Sub first argument parentheses handling.
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54177 Fix parsing of expressions like `Sub (i - 20) * 8,y` where a space-separated parenthesized expression followed by a binary operator(*` /` \` ^` &`) was incorrectly treated as call argument parentheses instead of expression grouping. If you look at all the extra test cases in `lang.vbs` you will see which parentheses related issues this solves. I have been testing with a repo full of scripts: https://github.com/sverrewl/vpxtable_scripts There are still quite some compiler issues left but this addresses the biggest parser issues. -- v19: vbscript: Fix Sub first argument parentheses handling. https://gitlab.winehq.org/wine/wine/-/merge_requests/10244

2 1

[PATCH v9 0/8] MR10515: Draft: vbscript: Bind local variables, class properties, and loop variables at compile time.
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

Resolve identifiers to direct indices during compilation instead of doing runtime `wcsicmp` string scans in `lookup_identifier()`. This adds new opcodes that access local variables, function arguments, class properties, and loop variables by index, eliminating the linear string comparison overhead for the most common cases. **New opcodes:** - `OP_local` / `OP_assign_local` / `OP_set_local` - read/write local vars and args by index - `OP_local_prop` / `OP_assign_local_prop` / `OP_set_local_prop` - read/write class properties by index - `OP_step_local` / `OP_incc_local` - For-loop step/increment with indexed counter - `OP_enumnext_local` - For-Each iteration with indexed loop variable This mirrors jscript's `OP_local` / `bind_local()` optimization (`dlls/jscript/compile.c`) and addresses the FIXME in `lookup_identifier()` noting that class property access should be bound at compile time. Names that cannot be resolved at compile time (globals in Execute/ExecuteGlobal code, dynamic vars, host objects) continue to use the existing string-based path. The last commit also adds a fast path for SAFEARRAY iteration that bypasses the `IEnumVARIANT` COM vtable dispatch and copies elements directly from the array data, eliminating one intermediate `VariantCopy` per iteration. ### Local variable / argument / class property access (1M iterations, 10 reads per iteration) | Benchmark | Windows (VM) | Wine master | Wine (7 commits) | **Speedup** | vs Windows | |-----------|-------------|-------------|-------------------|---------|------------| | Local vars | 156 ms | 10,134 ms | 960 ms | **10.6x** | 6.2x slower | | Arguments | 171 ms | 6,656 ms | 968 ms | **6.9x** | 5.7x slower | | Class props | 265 ms | 6,673 ms | 964 ms | **6.9x** | 3.6x slower | ### For-loop variants (10M iterations) | Benchmark | Windows (VM) | Wine master | Wine (7 commits) | **Speedup** | vs Windows | |-----------|-------------|-------------|-------------------|---------|------------| | Empty For | 117 ms | 6,222 ms | 1,531 ms | **4.1x** | 13x slower | | For + assign | 203 ms | 10,226 ms | 1,710 ms | **6.0x** | 8.4x slower | | Do-While manual | 437 ms | 8,773 ms | 1,820 ms | **4.8x** | 4.2x slower | | For Step 2 | 62 ms | 6,125 ms | 1,527 ms | **4.0x** | 25x slower | | Nested For | 125 ms | 7,742 ms | 1,546 ms | **5.0x** | 12x slower | | For local Sub | 109 ms | 3,062 ms | 1,531 ms | **2.0x** | 14x slower | | For R8 counter | 203 ms | 10,882 ms | 1,492 ms | **7.3x** | 7.4x slower | | For-Each array | 7 ms | 6,339 ms | 58 ms | **109x** | 8.3x slower | The remaining 4-13x gap vs Windows in For-loops is from `VarAdd`/`VarCmp` going through full `VariantChangeTypeEx` machinery (including locale alloc/free per call). A separate MR ([!10528](https://gitlab.winehq.org/wine/wine/-/merge_requests/10529)) adds I2/I4 fast paths in oleaut32 that bring integer loops within 1.2-1.9x of Windows when combined with this branch. -- v9: fixup! vbscript: Bind local variables and arguments at compile time. vbscript: Fast-path For-Each iteration over SAFEARRAY. vbscript: Bind For-Each loop variable at compile time. vbscript: Bind global-scope Dim variables at compile time. vbscript: Bind class properties at compile time. vbscript: Bind For-loop variables at compile time. vbscript: Bind local variable assignments at compile time. vbscript: Bind local variables and arguments at compile time. https://gitlab.winehq.org/wine/wine/-/merge_requests/10515

2 8