June 2026 - Wine-GitLab - list.winehq.org

[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

[PATCH 0/2] MR11042: jscript,vbscript: Remove unused variables.
by Jacek Caban (＠jacek) June 1, 2026

June 1, 2026

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

2 2

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 10:38:38 2026 +0000, Nikolay Sivov wrote: > This could also mean that HDC handle is cached, not the data itself. 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 ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11035#note_141849

1 0

[PATCH 0/1] MR11039: winhttp: Revert recursion limit to 3.
by Hans Leidekker (＠hans) June 1, 2026

June 1, 2026

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

2 1

[PATCH v3 0/2] MR11016: msxml3: Don't indent endElement node since it changes text node content.
by Piotr Caban (＠piotr) June 1, 2026

June 1, 2026

-- v3: msxml3: Don't indent endElement since it changes text node content. msxml3: Don't add newline before first element when indentation is enabled. https://gitlab.winehq.org/wine/wine/-/merge_requests/11016

3 4

[PATCH 0/1] MR11038: server: Fix numpad vkey handling.
by Rémi Bernon (＠rbernon) June 1, 2026

June 1, 2026

It looks like 2eeb4d5192e808c18e5949cc1c14b51b22fee342 missed updating the hunk introduced a bit earlier by 11ef7af768427a8fe38a43351377100086357388. Fixes: 2eeb4d5192e808c18e5949cc1c14b51b22fee342 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11038

3 3

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

This could also mean that HDC handle is cached, not the data itself. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11035#note_141839

1 0