October 2025 - Wine-GitLab - list.winehq.org

Re: [PATCH v9 0/6] MR9147: rometadata: Implement CIL assembly/metadata reader + some IMetaDataTables methods.
by Vibhav Pant (＠vibhavp) Oct. 13, 2025

Oct. 13, 2025

On Mon Oct 13 09:20:43 2025 +0000, Hans Leidekker wrote: > Using an offset variable would be cleaner. Sure, thanks. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9147#note_118373

1 0

Re: [PATCH v9 0/6] MR9147: rometadata: Implement CIL assembly/metadata reader + some IMetaDataTables methods.
by Vibhav Pant (＠vibhavp) Oct. 13, 2025

Oct. 13, 2025

On Mon Oct 13 09:20:43 2025 +0000, Hans Leidekker wrote: > What if assembly->stream_strings.size == 1? This could be written > without the padding variable. Hm, so II.24.2.3 mandates that the first string should always be `\0`, and II.24.2.2 says that stream sizes should be a multiple of 4. Nonetheless, this should still handle a string heap with a single NUL entry, so rewritten this to subtract padding bytes as long as `stream_strings.size > 1`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9147#note_118367

1 0

Re: [PATCH v3 0/4] MR8958: win32u: Fixes for the OpenGL drawables mess.
by Rémi Bernon Oct. 13, 2025

Oct. 13, 2025

On Mon Oct 13 10:09:28 2025 +0000, li xiao wrote: > When I merged this request and submitted win32u: Don't store the window > OpenGL drawables on the DCs.:, I encountered a deadlock while running a > software using wine: 01 a0:err:sync:RtlpWaitForCriticalSection section > 00007F4A4ACC5570 "?" wait timed out in thread 01a0, blocked by 0134, > retrying (60 sec). Before the merger, it's ok. > \ > After this submission : **win32u: Don't store the window OpenGL > drawables on the DCs.The lifecycle of opengl_rrawable is no longer > related to DC,Why is there still** > ```c > struct opengl_drawable *opengl_drawable > ``` > **in DC?** Hi, sorry if this has caused some more issues but if there's a bug please submit a bug report to https://bugs.winehq.org with some more details about it happens and how to reproduce it. Regarding the `opengl_drawable` member in the DC structure, it's still being used for non-Window DCs, like memory DCs, which need to keep a reference on their eventual OpenGL surface. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8958#note_118366

1 0

Re: [PATCH v3 0/4] MR8958: win32u: Fixes for the OpenGL drawables mess.
by li xiao (＠xiaolizai) Oct. 13, 2025

Oct. 13, 2025

When I merged this request and submitted win32u: Don't store the window OpenGL drawables on the DCs.:, I encountered a deadlock while running a software using wine: 01 a0:err:sync:RtlpWaitForCriticalSection section 00007F4A4ACC5570 "?" wait timed out in thread 01a0, blocked by 0134, retrying (60 sec). Before the merger, it's ok. \ After this submission : **win32u: Don't store the window OpenGL drawables on the DCs.The lifecycle of opengl_rrawable is no longer related to DC,Why is there still** ```c struct opengl_drawable *opengl_drawable ``` **in DC?** -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8958#note_118363

1 0

[PATCH v3 0/6] MR9150: comctl32: Remove v6 only exports.
by Zhiyi Zhang (＠zhiyi) Oct. 13, 2025

Oct. 13, 2025

-- v3: comctl32: Remove v6 only exports. comctl32: Remove syslink from comctl32 v5. comctl32: Remove taskdialog from comctl32 v5. comctl32/tests: Test v6 only exports. comctl32: Remove user32 control copies in comctl32 v5. comctl32/tests: Add RegisterClassNameW() tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/9150

3 7

Re: [PATCH v9 0/6] MR9147: rometadata: Implement CIL assembly/metadata reader + some IMetaDataTables methods.
by Hans Leidekker (＠hans) Oct. 13, 2025

Oct. 13, 2025

Hans Leidekker (@hans) commented about dlls/rometadata/assembly.c: > +{ > + const BYTE *ptr; > + ULONG size_len; > + HRESULT hr; > + > + if (idx >= assembly->stream_blobs.size) return E_INVALIDARG; > + ptr = assembly->stream_blobs.start + idx; > + if (FAILED(hr = decode_int(ptr, size, &size_len))) return hr; > + *blob = ptr + size_len; > + return S_OK; > +} > + > +const GUID *assembly_get_guid(const assembly_t *assembly, ULONG idx) > +{ > + idx = (idx - 1) * sizeof(GUID); /* Indices into the GUID heap are 1-based */ > + return idx < assembly->stream_guids.size ? (const GUID *)(assembly->stream_guids.start + idx) : NULL; Using an offset variable would be cleaner. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9147#note_118350

1 0

Re: [PATCH v9 0/6] MR9147: rometadata: Implement CIL assembly/metadata reader + some IMetaDataTables methods.
by Hans Leidekker (＠hans) Oct. 13, 2025

Oct. 13, 2025

Hans Leidekker (@hans) commented about dlls/rometadata/assembly.c: > + break; > + } > + } > + if (FAILED(hr)) return hr; > + /* The stream name is padded to the next 4-byte boundary (ECMA-335 Partition II.24.2.2) */ > + streams_cur += offsetof(struct stream_hdr, name[(streams[j].name_len + 4) & ~3]); > + } > + > + if (assembly->stream_strings.size) > + { > + /* IMetaDataTables::GetStringHeapSize returns the string heap size without the nul byte padding. */ > + const BYTE *ptr = assembly->stream_strings.start + assembly->stream_strings.size - 1; > + ULONG padding; > + > + for (padding = 0; !ptr[0] && !ptr[-1]; ptr--, padding++) /* nothing */; > + assembly->stream_strings.size -= padding; What if assembly->stream_strings.size == 1? This could be written without the padding variable. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9147#note_118348

1 0

Re: [PATCH v9 0/6] MR9147: rometadata: Implement CIL assembly/metadata reader + some IMetaDataTables methods.
by Hans Leidekker (＠hans) Oct. 13, 2025

Oct. 13, 2025

Hans Leidekker (@hans) commented about dlls/rometadata/assembly.c: > + ULONG i; > + > + for (i = 0; i < TABLE_MAX; i++) > + { > + struct table_schema *schema = table_schemas[i]; > + ULONG j; > + > + for (j = 0; j < schema->columns_len; j++) > + { > + if (schema->columns[j].primary_key) > + { > + schema->key_idx = j; > + break; > + } > + } > + } This is static data, it should be possible to encode this without an init function. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9147#note_118349

1 0

Re: [PATCH v9 0/6] MR9147: rometadata: Implement CIL assembly/metadata reader + some IMetaDataTables methods.
by Hans Leidekker (＠hans) Oct. 13, 2025

Oct. 13, 2025

Hans Leidekker (@hans) commented about dlls/rometadata/assembly.c: > + UINT32 size; > + const BYTE *start; > +}; > + > +struct assembly > +{ > + HANDLE file; > + HANDLE map; > + const BYTE *data; > + UINT64 size; > + > + struct metadata_stream stream_tables; > + struct metadata_stream stream_strings; > + struct metadata_stream stream_blobs; > + struct metadata_stream stream_guids; > + struct metadata_stream stream_user_strings; If you make this an array of struct metadata_stream and add the name to struct metadata_stream you don't need the streams array in assembly_parse_headers(). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9147#note_118347

1 0

[PATCH v2 0/6] MR9150: comctl32: Remove v6 only exports.
by Zhiyi Zhang (＠zhiyi) Oct. 13, 2025

Oct. 13, 2025

-- v2: comctl32: Remove v6 only exports. comctl32: Remove syslink from comctl32 v5. comctl32: Remove taskdialog from comctl32 v5. comctl32/tests: Test v6 only exports. comctl32: Remove user32 control copies in comctl32 v5. comctl32/tests: Add RegisterClassNameW() tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/9150

2 7