- Wine-GitLab - list.winehq.org

[PATCH 0/2] MR11031: win32u: Add some messages to spy
by Bernhard Kölbl (＠besentv) June 1, 2026

June 1, 2026

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

2 2

[PATCH 0/1] MR11030: Add support for a layered window region. (v3)
by Ivan Lyugaev (＠valy) June 1, 2026

June 1, 2026

When WindowFromPoint is called with a point inside the transparent region of the top-level window, the top-level window is returned instead of the expected window beneath it. I found that this problem was previously addressed in the patch [https://gitlab.winehq.org/wine/wine-staging/-/blob/master/patches/user32-Mo…] I adapted that patch for the current version and added a test. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11030

2 1

[PATCH v6 0/4] MR10960: scrrun/dictionary: Match native semantics for Empty and Boolean keys.
by Francis De Brabandere (＠francisdb) June 1, 2026

June 1, 2026

An uninitialized VBScript variable is Empty, so scripts can end up using Empty as a dictionary key alongside a numeric 0 or "". Native treats those as the same key; Wine kept Empty distinct from every other type. Match an Empty key against any numeric zero or the empty string, while keeping it distinct from Null and from non-zero/non-empty keys. A Boolean key was rejected outright (E_NOTIMPL), breaking Exists/Remove when a script uses a comparison result as a key; hash it by its numeric value like the other numeric types. -- v6: scrrun/dictionary: Match native key semantics for Boolean keys. scrrun/tests: Add tests for Boolean dictionary keys. scrrun/dictionary: Match Empty keys against zero-valued and empty-string keys. scrrun/tests: Add tests for Empty dictionary keys. https://gitlab.winehq.org/wine/wine/-/merge_requests/10960

3 7

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

June 1, 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. Patched against Wine master (0c0d2643), measured on two real-world VBScripts (75K-line / 89-class and 37K-line / 17-class), 5 runs each: - Script A (loop/local-heavy): steady-state simulation -7.73 %, full run -4.63 %, top per-timer cumulative wall -6.18 % - Script B (class-method-heavy): steady-state -3.97 %, full run -4.18 %, top per-timer -3.13 % perf confirms the mechanism: lookup_identifier drops 9.52 % → 3.68 % of self-time, with the new interp_local taking 3.30 %. -- v28: vbscript: Bind class properties at compile time. vbscript: Bind For-loop variables at compile time. vbscript: Factor out do_for_step and do_incc from interp_step and interp_incc. vbscript: Bind local variable assignments at compile time. vbscript: Factor out assign_local_var from assign_ident. vbscript: Bind local variables and arguments at compile time. https://gitlab.winehq.org/wine/wine/-/merge_requests/10515

3 7

[PATCH v11 0/3] MR10897: vbscript: Handle declaration scope in the parser.
by Francis De Brabandere (＠francisdb) June 1, 2026

June 1, 2026

ClassDeclaration was only accepted at the top SourceElement level, so a prior statement on the same line (e.g. Dim x : Class C) failed to parse instead of being accepted or, for a name collision, reported as err 1041. Make ClassDeclaration a SimpleStatement and register it as a class at compile time in source order. Sub, Function and Class declarations are only valid at script global scope. A global If/ElseIf/Else/Select block still hoists a Sub or Function to global scope, but a loop (For/For Each/While/Do) or With block does not, and a Class is never hoisted. Reject the disallowed cases during parsing, reporting the location native reports rather than failing later during bytecode emission. -- v11: vbscript/tests: Add tests for sub declaration scope. vbscript: Handle class declaration scope in the parser. vbscript/tests: Add tests for class declaration scope. https://gitlab.winehq.org/wine/wine/-/merge_requests/10897

3 5

[PATCH v2 0/1] MR10868: gdi32/uniscribe: Add some out-of-bound checks in shape.c.
by समीरसिंह Sameer Singh (＠ss141309) June 1, 2026

June 1, 2026

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59680 -- v2: gdi32/uniscribe: Add some out-of-bound checks in shape.c. https://gitlab.winehq.org/wine/wine/-/merge_requests/10868

1 0

[PATCH 0/3] MR11040: ucrtbase/tests: Link directly to environment functions.
by Jacek Caban (＠jacek) June 1, 2026

June 1, 2026

Fixes -Wunused-but-set-global warnings. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11040

3 4

[PATCH v4 0/3] MR10859: gdi32/uniscribe: Add bounds checks in GPOS_apply_MarkToMark().
by समीरसिंह Sameer Singh (＠ss141309) June 1, 2026

June 1, 2026

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59680 -- v4: gdi32/uniscribe: Guard against int overflow in GPOS functions. https://gitlab.winehq.org/wine/wine/-/merge_requests/10859

2 3

Re: [PATCH v2 0/4] MR11035: gdi32/uniscribe: Eagerly cache cmap tables for a font.
by समीरसिंह Sameer Singh (＠ss141309) June 1, 2026

June 1, 2026

On Mon Jun 1 11:28:47 2026 +0000, Nikolay Sivov wrote: > Then referenced font objects could also be kept around, after GDI > handles are released. The point is that keeping just cmap is clearly not > enough for shaping to work. And duplicating all of the font data for > every cache instance also would be a strange solution. Regarding. "keeping just cmap is clearly not enough for shaping to work", the `ScriptCache` struct already stores raw table data for GSUB, GPOS and GDEF so shaping is possible. Adding cmap format4 to the struct (cmap format 12 was already present) follows the same established pattern. Here is what the struct looked prior to my patch: ```c typedef struct { struct list entry; DWORD refcount; LOGFONTW lf; TEXTMETRICW tm; OUTLINETEXTMETRICW *otm; SCRIPT_FONTPROPERTIES sfp; BOOL sfnt; CacheGlyphPage *page[NUM_PAGES]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; void *GSUB_Table; void *GDEF_Table; void *CMAP_Table; void *CMAP_format12_Table; void *GPOS_Table; BOOL scripts_initialized; LoadedScript *scripts; SIZE_T scripts_size; SIZE_T script_count; OPENTYPE_TAG userScript; OPENTYPE_TAG userLang; } ScriptCache; ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11035#note_141855

1 0

Re: [PATCH v2 0/4] MR11035: gdi32/uniscribe: Eagerly cache cmap tables for a font.
by Nikolay Sivov (＠nsivov) June 1, 2026

June 1, 2026

On Mon Jun 1 10:41:38 2026 +0000, समीरसिंह Sameer Singh wrote: > I don't think that is the case. I tried running this program on windows, > where I make two calls to `ScriptShapeOpenType` and in between the first > and second call I delete the `dc` . If windows cached the HDC then the > second called would have failed, but that is not the case the shaping > was done successfully. > ```c > #include <windows.h> > #include <usp10.h> > #include <stdio.h> > #define MAKE_OPENTYPE_TAG(a,b,c,d) \ > ((OPENTYPE_TAG)(a) | ((OPENTYPE_TAG)(b) << 8) | \ > ((OPENTYPE_TAG)(c) << 16) | ((OPENTYPE_TAG)(d) << 24)) > int main(void) { > static const WCHAR test1[] = {'O','n','e',0}; > static const WCHAR test2[] = {'T','w','o',0}; > HDC hdc = CreateCompatibleDC(NULL); > HFONT font = CreateFontA(20, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, > DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, > DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma"); > HFONT orig_font = SelectObject(hdc, font); > WORD glyphs[4], logclust[4]; > SCRIPT_CHARPROP charProp[4]; > SCRIPT_GLYPHPROP glyphProp[4]; > int pcGlyphs = 0; > SCRIPT_CACHE sc = NULL; > SCRIPT_ANALYSIS sa = {0}; > sa.eScript = 1; > OPENTYPE_TAG scriptTag = MAKE_OPENTYPE_TAG('l', 'a', 't', 'n'); > HRESULT hr = ScriptShapeOpenType(hdc, &sc, &sa, scriptTag, 0, NULL, > NULL, 0, test1, 3, 3, logclust, charProp, glyphs, glyphProp, &pcGlyphs); > if (FAILED(hr)) { > printf("Shaping failed for the first run. hr=%08lx\n", hr); > return -1; > } > DeleteDC(hdc); > DeleteObject(font); > hr = ScriptShapeOpenType(NULL, &sc, &sa, scriptTag, 0, NULL, NULL, 0, > test2, 3, 3, logclust, charProp, glyphs, glyphProp, &pcGlyphs); > if (FAILED(hr)) { > printf("Shaping failed for the second run. hr=%08lx\n", hr); > return -1; > } > printf("Shaping successful for the second run. hr=%08lx\n", hr); > ScriptFreeCache(&sc); > return 0; > } > ``` > Output: > ``` > Shaping successful for the second run. hr=00000000 > ``` Then referenced font objects could also be kept around, after GDI handles are released. The point is that keeping just cmap is clearly not enough for shaping to work. And duplicating all of the font data for every cache instance also would be a strange solution. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11035#note_141853

1 0