- Wine-GitLab - list.winehq.org

[PATCH v11 0/2] MR10659: combase: Implement restricted WinRT error handling APIs.
by Anna R Békefi (＠annareginabekefi) April 24, 2026

April 24, 2026

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58900 Bug 58900 This series implements restricted WinRT error handling in combase and\ adds conformance tests for the new behavior. Implemented APIs include restricted error creation / retrieval,\ error context capture, transform, matching, and unhandled error reporting\ paths. Tests were added under dlls/combase/tests and pass locally.\ The existing combase tests also continue to pass. -- v11: combase/tests: Add tests for restricted WinRT error handling. combase: Implement restricted WinRT error handling APIs. https://gitlab.winehq.org/wine/wine/-/merge_requests/10659

2 2

Re: [PATCH v46 0/2] MR10295: Fix ImageGetDigestStream
by eric pouech (＠epo) April 24, 2026

April 24, 2026

eric pouech (@epo) commented about dlls/imagehlp/integrity.c: > - */ > - nt_hdr->OptionalHeader.SizeOfInitializedData = 0; > - nt_hdr->OptionalHeader.SizeOfImage = 0; > - nt_hdr->OptionalHeader.CheckSum = 0; > - size = sizeof(nt_hdr->Signature) + sizeof(nt_hdr->FileHeader) + > - nt_hdr->FileHeader.SizeOfOptionalHeader; > + NumberOfRvaAndSizes = nthdr32->OptionalHeader.NumberOfRvaAndSizes; > + DataDirectory = nthdr32->OptionalHeader.DataDirectory; > + if( nthdr32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC ) > + { > + nthdr64 = (IMAGE_NT_HEADERS64 *)nthdr32; > + NumberOfRvaAndSizes = nthdr64->OptionalHeader.NumberOfRvaAndSizes; > + DataDirectory = nthdr64->OptionalHeader.DataDirectory; > + /* NOTE: Fields up to SizeOfStackCommit are the same size/offset, except for ImageBase */ > + } > + memcpy(DataDirBackup, DataDirectory, sizeof(DataDirBackup)); it looks a bit ackward to save ntheader+section headers, modify the memory of mapping, then restore the saved bits in the mapping it would be more straightforward to keep mapping as is, and allocate a buffer for tempering ntheader + section headers and pass pointer into this buffer in the callback this is how native behaves BTW this would save one memcpy and avoids dirty:ing the mapping which results with COW of the modified pages -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10295#note_137581

1 0

Re: [PATCH v46 0/2] MR10295: Fix ImageGetDigestStream
by eric pouech (＠epo) April 24, 2026

April 24, 2026

hi retested again a range of images and I still get discrepancies from native imagehlp behavior as you didn't add any FIXME for non supported DigestLeve, I assumed you meant all values of DigestLevel are supported some examples of missed callbacks: * DigestLevel = 0,4, callback with chunks inside IMPORT data directory * DigestLevel = 2,6, callback with section containing DEBUG directory also what's suspicious in the code is that there are actions taken when data directory points at the very start of a section (when checking respective VirtualAddress: fields), but a data directory could point to anywhere within a section (for the record, it looks a bit ackward to save ntheader+section headers, modify the memory of mapping, then restore the saved bits in the mapping; it would be more straightforward to keep mapping as is, and allocate a buffer for tempering ntheader + section headers and pass pointer into this buffer in the callback; this is how native behaves BTW); this would save one copy and avoids dirty:ing the mapping again, I strongly suggest to start with a unique value of DigestLevel (the one you need to support), get it right (and testing native / bultin behavior on all .exe/.dll you can find) (by testing I mean writing a small program that does print, for each callback invocation, size and CRC of passed chunk; using native and builtin imagehlp should produce the very same output) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10295#note_137580

1 0

Re: [PATCH v46 0/2] MR10295: Fix ImageGetDigestStream
by eric pouech (＠epo) April 24, 2026

April 24, 2026

eric pouech (@epo) commented about dlls/imagehlp/integrity.c: > if( !ret ) > goto end; > > + memcpy(DataDirectory, DataDirBackup, NumberOfRvaAndSizes * sizeof(*DataDirectory)); > + > /* Read the section headers */ > offset += size; > - num_sections = nt_hdr->FileHeader.NumberOfSections; > + num_sections = nthdr32->FileHeader.NumberOfSections; > size = num_sections * sizeof(IMAGE_SECTION_HEADER); > if( offset + size > fileSize ) > goto invalid_parameter; > + section_headers = (IMAGE_SECTION_HEADER *)(map + offset); > + > + /* Zero out some sections */ > + for( i = 0; DigestLevel != 0 && (DigestLevel & CERT_PE_IMAGE_DIGEST_RESOURCES) == 0 && i < num_sections; i++ ) for readibilty, it would be better to write it as ``` if (...) { for (i = 0; i < num_sections; i++) ``` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10295#note_137579

1 0

Re: [PATCH v46 0/2] MR10295: Fix ImageGetDigestStream
by eric pouech (＠epo) April 24, 2026

April 24, 2026

eric pouech (@epo) commented about dlls/imagehlp/integrity.c: > + memcpy(DataDirectory, DataDirBackup, NumberOfRvaAndSizes * sizeof(*DataDirectory)); > + > /* Read the section headers */ > offset += size; > - num_sections = nt_hdr->FileHeader.NumberOfSections; > + num_sections = nthdr32->FileHeader.NumberOfSections; > size = num_sections * sizeof(IMAGE_SECTION_HEADER); > if( offset + size > fileSize ) > goto invalid_parameter; > + section_headers = (IMAGE_SECTION_HEADER *)(map + offset); > + > + /* Zero out some sections */ > + for( i = 0; DigestLevel != 0 && (DigestLevel & CERT_PE_IMAGE_DIGEST_RESOURCES) == 0 && i < num_sections; i++ ) > + { > + IMAGE_SECTION_HEADER *hdr = &section_headers[i]; > + if( hdr->VirtualAddress == DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress ) you should also check that this datadirectory is present in the image -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10295#note_137578

1 0

Re: [PATCH v46 0/2] MR10295: Fix ImageGetDigestStream
by eric pouech (＠epo) April 24, 2026

April 24, 2026

eric pouech (@epo) commented about dlls/imagehlp/integrity.c: > + section_headers = (IMAGE_SECTION_HEADER *)(map + offset); > + > + /* Zero out some sections */ > + for( i = 0; DigestLevel != 0 && (DigestLevel & CERT_PE_IMAGE_DIGEST_RESOURCES) == 0 && i < num_sections; i++ ) > + { > + IMAGE_SECTION_HEADER *hdr = &section_headers[i]; > + if( hdr->VirtualAddress == DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress ) > + { > + rsrc_i = i; > + memcpy(&rsrc, hdr, sizeof(rsrc)); > + hdr->Misc.VirtualSize = 0; > + hdr->VirtualAddress = 0; > + hdr->SizeOfRawData = 0; > + hdr->PointerToRawData = 0; > + } > + if( hdr->VirtualAddress == DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress ) ditto -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10295#note_137577

1 0

Re: [PATCH v46 0/2] MR10295: Fix ImageGetDigestStream
by eric pouech (＠epo) April 24, 2026

April 24, 2026

eric pouech (@epo) commented about dlls/imagehlp/integrity.c: > - map, fileSize, DigestFunction, DigestHandle ); > - IMAGEHLP_ReportImportSection( section_headers, num_sections, > - map, fileSize, DigestLevel, DigestFunction, DigestHandle ); > - if( DigestLevel & CERT_PE_IMAGE_DIGEST_DEBUG_INFO ) > - IMAGEHLP_ReportSection( section_headers, num_sections, ".debug", > - map, fileSize, DigestFunction, DigestHandle ); > - if( DigestLevel & CERT_PE_IMAGE_DIGEST_RESOURCES ) > - IMAGEHLP_ReportSection( section_headers, num_sections, ".rsrc", > - map, fileSize, DigestFunction, DigestHandle ); > + /* Restore zeroed out sections */ > + if( rsrc_i != -1 ) > + memcpy(&section_headers[rsrc_i], &rsrc, sizeof(rsrc)); > + if( reloc_i != -1 ) > + memcpy(&section_headers[reloc_i], &reloc, sizeof(reloc)); > + > + for( i = 0; ret && i < num_sections; i++ ) testing ret is useless (it's always TRUE) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10295#note_137576

1 0

[PATCH 0/2] MR10725: win32u: Check config again before setting win32 window position.
by Zhiyi Zhang (＠zhiyi) April 24, 2026

April 24, 2026

For example, Homeworld Remastered Collection (244160) Homeworld 2 Classic changes the display mode after NtUserSetActiveWindow(), then the following NtUserSetInternalWindowPos() call sets the window rect to the window rect before the display mode change. Thus, the game window can end up having an unexpected rect. There is a similar problem when LOWORD(state_cmd) == 0. Fix a regression from be60f77909fc9ce2c9b6f1abd005e3b4aabaafec. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10725

3 9

[PATCH v10 0/3] MR10659: combase: Implement restricted WinRT error handling APIs.
by Anna R Békefi (＠annareginabekefi) April 24, 2026

April 24, 2026

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58900 Bug 58900 This series implements restricted WinRT error handling in combase and\ adds conformance tests for the new behavior. Implemented APIs include restricted error creation / retrieval,\ error context capture, transform, matching, and unhandled error reporting\ paths. Tests were added under dlls/combase/tests and pass locally.\ The existing combase tests also continue to pass. -- v10: combase/tests: Temporarily disable restricted error handling test. https://gitlab.winehq.org/wine/wine/-/merge_requests/10659

3 4

[PATCH 0/3] MR10628: nsiproxy.sys: Avoid null pointer dereference on if_nameindex() failure.
by Michał Durak (＠mdurak) April 24, 2026

April 24, 2026

`if_nameindex()` always fails with EACCES on my Android 15 device under Termux. On failure, `if_nameindex()` returns null and sets errno. The original implementation in Wine didn't check for this, which meant that `entry->if_index` would be dereferencing null and failing with an access violation error. As all calls to `if_list_lock()` are guarded with a mutex lock, the lock would never be released, causing deadlocks. To reproduce this on my PC, I used the \`LD_PRELOAD\` trick with this dummy dynamic library: ```c #define _GNU_SOURCE #include <net/if.h> #include <errno.h> #include <stdlib.h> struct if_nameindex *if_nameindex(void) { errno = EACCES; return NULL; } ``` ```console $ LD_PRELOAD=/home/user/wine/libborked_if_nameindex.so WINEDEBUG=+nsi,+iphlpapi,+seh ./wine ipconfig 0054:trace:nsi:DriverEntry (00007FFFFF219CF0, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\nsiproxy") 0054:trace:iphlpapi:GetIfTable2 table 00007FFFFEC0FA00 0054:trace:iphlpapi:GetIfTable2Ex level 0, table 00007FFFFEC0FA00 0054:trace:nsi:NsiAllocateAndGetTable 1 00006FFFFDD254F0 0 00007FFFFEC0F940 8 00007FFFFEC0F948 1092 00007FFFFEC0F950 216 00007FFFFEC0F958 600 00007FFFFEC0F93C 0 0054:trace:nsi:NsiEnumerateObjectsAllParameters 1 0 00006FFFFDD254F0 0 00007FFFFF27F150 8 00007FFFFF27F360 1092 00007FFFFF290470 216 00007FFFFF293A80 600 00007FFFFEC0F83C 0058:trace:nsi:nsi_ioctl ioctl 121000 insize 56 outsize 122628 0058:trace:nsi:ifinfo_enumerate_all 0x7fffff2bafa4 8 0x7fffff2bb1a4 1092 0x7fffff2cc2a4 216 0x7fffff2cf8a4 600 0x7ffffef0f948 0058:trace:seh:handle_syscall_fault code=c0000005 flags=0 addr=0x7fdb07114783 ip=7fdb07114783 tid=0058 0058:trace:seh:handle_syscall_fault info[0]=0000000000000000 0058:trace:seh:handle_syscall_fault info[1]=0000000000000000 0058:trace:seh:handle_syscall_fault rax=0000000000000000 rbx=00007fffff2bb1a4 rcx=0000000000000000 rdx=0000000000000001 0058:trace:seh:handle_syscall_fault rsi=0000000000000000 rdi=00007fdb0711cf80 rbp=00007fffff2cc2a4 rsp=00007ffffed0e8f0 0058:trace:seh:handle_syscall_fault r8=0000000000000000 r9=0000000000000000 r10=00007fdb0768a898 r11=00007fdb076a0250 0058:trace:seh:handle_syscall_fault r12=00007ffffef0f948 r13=00007fffff2bafa4 r14=0000000000000008 r15=0000000000000038 0058:trace:seh:handle_syscall_fault returning to user mode ip=00006ffffde12515 ret=c0000005 0054:trace:nsi:NsiFreeTable 00007FFFFF27F150 00007FFFFF27F360 00007FFFFF290470 00007FFFFF293A80 00a4:err:ntoskrnl:ZwLoadDriver failed to create driver L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\winebth": c00000e5 003c:fixme:service:scmdatabase_autostart_services Auto-start service L"winebth" failed to start: 1359 00e4:trace:iphlpapi:GetAdaptersAddresses (0, 00000080, 0000000000000000, 00007FFFFE32E280, 00007FFFFE2FFA8C) 00e4:trace:nsi:NsiAllocateAndGetTable 1 00006FFFFDD254F0 0 00007FFFFE2FF9B0 8 00007FFFFE2FF9B8 1092 00007FFFFE2FF9C0 216 00007FFFFE2FF9C8 600 00007FFFFE2FF9AC 0 00e4:trace:nsi:NsiEnumerateObjectsAllParameters 1 0 00006FFFFDD254F0 0 00007FFFFE32F290 8 00007FFFFE8F7DC0 1092 00007FFFFE908ED0 216 00007FFFFE90C4E0 600 00007FFFFE2FF87C 0058:trace:nsi:nsi_ioctl ioctl 121000 insize 56 outsize 122628 0058:trace:nsi:ifinfo_enumerate_all 0x7fffff27f224 8 0x7fffff27f424 1092 0x7fffff290524 216 0x7fffff293b24 600 0x7ffffef0f948 <-- stuck in pthread_mutex_lock( &if_list_lock ); ``` The changes to `adapters_addresses_alloc` and `ipv4_neighbour_enumerate_all` deal with the edge case of no network adapters being present/detectable by Wine. On systems where `if_nameindex()` always fails, `add_entry()` in ndis.c would never be called. On the topic of correctness, MSDN says that `GetAdaptersAddresses` may return `ERROR_NO_DATA` if "No addresses were found for the requested parameters", which sounds right to me, but I wasn't able to come up with an invocation that would give me that return to put in the tests. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10628

3 4