- Wine-GitLab - list.winehq.org

[PATCH v3 0/1] MR10484: vbscript: Return "Invalid for loop control variable" error for member expressions.
by Francis De Brabandere (＠francisdb) April 7, 2026

April 7, 2026

Windows VBScript rejects member expressions (e.g. x.y) as For/For Each loop control variables with error 1040. Accept MemberExpression in the parser rules and check for obj_expr to report the proper error instead of a generic syntax error. -- v3: vbscript: Return "Invalid for loop control variable" error for member expressions. https://gitlab.winehq.org/wine/wine/-/merge_requests/10484

2 1

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

April 7, 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. -- v10: 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

Re: [PATCH v4 0/1] MR10581: winealsa.drv: Simulate blocking calls midiOutLongMsg.
by Steven Don (＠shdon) April 6, 2026

April 6, 2026

Some justification for this patch. After noticing SysEx data not being transmitted properly to my Roland MT-32 when going through Wine, I created a test program that confirmed that the midiOutLongMsg call on Windows is blocking. Attached are four log files generated by my test application: [win10-cb.log](/uploads/c0f6cc5c97a53988d40a516705ceacea/win10-cb.log) on Windows 10, with a notification callback function [win10-direct.log](/uploads/096c54ab6975bbfa4770118ba76e2c90/win10-direct.log) on Windows 10, without a notification callback [wine-cb.log](/uploads/33974b0ed3510c31693b7bc8848a02a5/wine-cb.log) on Wine, with a notification callback function [wine-direct.log](/uploads/540320fa4d45e73b9d52e14451f1682a/wine-direct.log) on Wine, without a notification callback -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10581#note_135249

1 0

[PATCH v4 0/1] MR10366: vbscript: Fix For loop getting stuck when expression evaluation fails with On Error Resume Next.
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

When a For..To loop's bound expression fails (e.g. UBound on Empty) and On Error Resume Next is active, the error handler fills the step/to stack slots with VT_EMPTY. On the next iteration, VarCmp fails on these values and the error propagates back into the loop, causing an infinite loop. Fix this by handling VarCmp failures in interp_step: exit the loop and report error 92 (For loop not initialized). Also make interp_incc ignore VarAdd failures so execution reaches interp_step for proper cleanup. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54291 -- v4: vbscript: Fix For loop getting stuck when expression evaluation fails with On Error Resume Next. https://gitlab.winehq.org/wine/wine/-/merge_requests/10366

2 1

[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

[PATCH v14 0/1] MR10461: vbscript: Implement IDispatch::GetTypeInfo for class instances.
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

Implement GetTypeInfo on vbdisp_t (VBScript class instances) by returning an ITypeInfo that reports the class name via GetDocumentation(MEMBERID_NIL) and exposes public methods and properties via GetFuncDesc, GetVarDesc, GetNames, GetIDsOfNames, and GetTypeAttr. This makes TypeName() return the actual class name (e.g. "MyClass") instead of falling back to "Object". This is partially based on previous work by @jsm174 at https://github.com/jsm174/libwinevbs/blob/fbc4d2a17a2da8196d50805f7ae289406… -- v14: vbscript: Implement IDispatch::GetTypeInfo for class instances. https://gitlab.winehq.org/wine/wine/-/merge_requests/10461

2 1

[PATCH v5 0/2] MR10546: vbscript: Use indexed lookup for global functions and variables.
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

Replace O(N) linear scans through `global_funcs[]` and `global_vars[]` with O(log N) tree lookups for global function and variable resolution. **Global functions:** Scripts that use `ExecuteGlobal` to dynamically generate functions (e.g. Visual Pinball's GLF framework generates ~1000 functions at startup) hit pathological O(N) scan behavior on every `GetRef` call and `GetDispID` lookup. With this change, `GetRef` dispatch over 1000 functions drops from 503ms to 58ms (**8.7x**), reaching parity with Windows (62ms). | Benchmark (1000 dynamic functions) | Before | After | Speedup | Windows | |-----------|--------|-------|---------|---------| | GetRef varied x100K | 503 ms | 58 ms | **8.7x** | 62 ms | | GetRef loop x200K | 292 ms | 82 ms | **3.6x** | 125 ms | | GetRef cached x200K | 35 ms | 35 ms | 1.0x | 85 ms | | Direct call x200K | 35 ms | 46 ms | ~1.0x | 31 ms | **Global variables:** Profiling a real-world 75K-line Visual Pinball table script with 3000+ global variables (registered via multiple `ExecuteGlobal` calls) shows `lookup_identifier`'s linear scan over `global_vars[]` consuming ~55% of total CPU time. Compile-time binding (`bind_local`) does not help here because it only resolves variables declared within the same compilation unit, variables from prior `ExecuteGlobal` calls remain unbound at runtime. Depends on !10544 for the fast `vbs_wcsicmp` used in the tree comparators. -- v5: vbscript: Use indexed lookup for global variables. vbscript: Use indexed lookup for global functions. https://gitlab.winehq.org/wine/wine/-/merge_requests/10546

2 2

[PATCH v12 0/1] MR10405: vbscript: Return 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 an undefined variable is used, return VBS error 500 (Variable is undefined) with the variable name in the description, matching Windows behavior. Previously Wine returned E_FAIL with no description. -- v12: vbscript: Return proper error for undefined variables with Option Explicit. https://gitlab.winehq.org/wine/wine/-/merge_requests/10405

2 1

[PATCH v7 0/2] MR10579: vbscript: Identifier improvements
by Francis De Brabandere (＠francisdb) April 6, 2026

April 6, 2026

Windows limits VBScript identifiers to 255 characters, returning error 1030 (Identifier too long) for longer names. Wine previously accepted identifiers of any length. VBScript allows square brackets to quote identifiers containing spaces, special characters, or reserved words. -- v7: vbscript: Support bracketed identifiers like [my var]. vbscript: Reject identifiers longer than 255 characters. https://gitlab.winehq.org/wine/wine/-/merge_requests/10579

2 2

Re: [PATCH v2 0/1] MR10401: setupapi: Fix wrong buffer size in SetupDiGetClassDescriptionExA. - approved
by Alexandre Julliard (＠julliard) April 6, 2026

April 6, 2026

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10401

1 0

Re: [PATCH v2 0/1] MR10573: d3d11: Fix a memory leak in d3d_video_decoder_create(). - approved
by Alexandre Julliard (＠julliard) April 6, 2026

April 6, 2026

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10573

1 0

Re: [PATCH v2 0/3] MR10472: opengl32: Don't expose unsupported or unknown extensions. - approved
by Alexandre Julliard (＠julliard) April 6, 2026

April 6, 2026

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10472

1 0

Re: [PATCH v7 0/1] MR10500: vbscript: Defer For loop control variable assignment until all expressions are evaluated. - approved
by Alexandre Julliard (＠julliard) April 6, 2026

April 6, 2026

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10500

1 0

Re: [PATCH v3 0/1] MR10536: vbscript: Fast-path stack_pop_bool for VT_BOOL. - approved
by Alexandre Julliard (＠julliard) April 6, 2026

April 6, 2026

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10536

1 0

Re: [PATCH v5 0/5] MR10544: vbscript: Use ASCII-only case-insensitive compare for identifier lookups. - approved
by Alexandre Julliard (＠julliard) April 6, 2026

April 6, 2026

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10544

1 0

Re: [PATCH v3 0/1] MR10483: vbscript: Return "Illegal assignment" error for Const and function assignment. - approved
by Alexandre Julliard (＠julliard) April 6, 2026

April 6, 2026

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10483

1 0