- Wine-gitlab - list.winehq.org

[PATCH v4 0/1] MR1638: ntoskrnl.exe: use KeQueryMaximumProcessorCountEx for KeQueryMaximumProcessorCount.
by Etaash Mathamsetty (＠etaash.mathamsetty) 03 Dec '22

03 Dec '22

this fixes a typo in one of my previously merged patches -- v4: ntoskrnl.exe: Use KeQueryMaximumProcessorCountEx for KeQueryMaximumProcessorCount. https://gitlab.winehq.org/wine/wine/-/merge_requests/1638

2 1

Re: [PATCH v2 0/1] MR1552: winevulkan: Use direct calls for vkGetDescriptorEXT.
by Jacek Caban (＠jacek) 03 Dec '22

03 Dec '22

> Can we get rid of direct calls now? :wink: I sure hope so. :wink: I created !1667. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1552#note_18564

1 0

Re: [PATCH v2 0/3] MR1616: loader: In macOS preloader, manually set 'environ' to work around a bug in macOS 12 and later.
by Huw Davies (＠huw) 03 Dec '22

03 Dec '22

On Sat Dec 3 04:33:26 2022 +0000, Brendan Shanks wrote: > Hmm, and this worked correctly before? Are you running from the build directory? > I didn't realize this before, but any DYLD_ environment variables will > be stripped when running from the build directory, because `./wine` or > `./wine64` is a shell script, and system binaries (including `/bin/sh`) > ignore/strip `DYLD_` env vars. But if you edit `wine`/`wine64` and > set/export `DYLD_FALLBACK_LIBRARY_PATH` inside the script, it works. > Or, if you install Wine and then run it from there, `wine`/`wine64` is a > binary, so `DYLD_FALLBACK_LIBRARY_PATH` works correctly. > I did some tests with the preloader and couldn't find any cases where it > loses or mishandles the environment variables. Yes, this is from the build dir. I'm setting `DYLD_FALLBACK_LIBRARY_PATH` in `.winewrapper` to avoid the issue of `/bin/sh` stripping the `DYLD_` variables, which worked before the mentioned commit. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1616#note_18558

1 0

[PATCH v3 0/1] MR1626: kernelbase: Workaround for linux-side redirection.
by Michel Zou (＠xantares) 03 Dec '22

03 Dec '22

Patch from @bernhardu Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51813 ``` 1016195.340:0114:0118:Call KERNEL32.GetFileType(00000014) ret=1022e621 1016195.340:0114:0118:Call ntdll.NtQueryVolumeInformationFile(00000014,0060f598,0060f590,00000008,00000004) ret=7b01f4a5 1016195.340:0114:0118:Ret ntdll.NtQueryVolumeInformationFile() retval=00000000 ret=7b01f4a5 1016195.340:0114:0118:Ret KERNEL32.GetFileType() retval=00000001 ret=1022e621 1016195.340:0114:0118:Call KERNEL32.GetFileInformationByHandle(00000014,0060f608) ret=1022e6ac 1016195.340:0114:0118:Call ntdll.NtQueryInformationFile(00000014,0060f508,0060f528,00000068,00000012) ret=7b01eacc 1016195.340:0114:0118:trace:file:NtQueryInformationFile (0x14,0x60f508,0x60f528,0x00000068,0x00000012) 1016195.340:0114:0118:Ret ntdll.NtQueryInformationFile() retval=c0000024 ret=7b01eacc 1016195.340:0114:0118:Call ntdll.RtlNtStatusToDosError(c0000024) ret=7b01eae3 1016195.340:0114:0118:Ret ntdll.RtlNtStatusToDosError() retval=00000006 ret=7b01eae3 1016195.340:0114:0118:Ret KERNEL32.GetFileInformationByHandle() retval=00000000 ret=1022e6ac ``` Allocation of the fd structure, fd->unix_name is set to NULL: ``` 1697 fd->unix_name = NULL; #0 alloc_fd_object () at /home/bernhard/data/entwicklung/2021/wine/wine-git/wine-git/server/fd.c:1697 #1 0x000056259dd386d8 in create_anonymous_fd (fd_user_ops=fd_user_ops(a)entry=0x56259dda4900 <file_fd_ops>, unix_fd=unix_fd(a)entry=28, user=user(a)entry=0x56259f42db70, options=options(a)entry=32) at /home/bernhard/data/entwicklung/2021/wine/wine-git/wine-git/server/fd.c:2074 #2 0x000056259dd3b477 in create_file_for_fd (fd=28, access=1074790400, sharing=sharing(a)entry=3) at /home/bernhard/data/entwicklung/2021/wine/wine-git/wine-git/server/file.c:152 #3 0x000056259dd3b874 in req_alloc_file_handle (req=0x56259f27b768, reply=0x7ffc518872e0) at /home/bernhard/data/entwicklung/2021/wine/wine-git/wine-git/server/file.c:730 #4 0x000056259dd594b3 in call_req_handler (thread=thread(a)entry=0x56259f27b620) at /home/bernhard/data/entwicklung/2021/wine/wine-git/wine-git/server/request.c:309 ``` Because unix_name is not set no file information get returned: ``` 2780 if (fd->unix_name) #0 req_get_handle_unix_name (req=<optimized out>, reply=0x7ffc518872e0) at /home/bernhard/data/entwicklung/2021/wine/wine-git/wine-git/server/fd.c:2780 #1 0x000056259dd594b3 in call_req_handler (thread=thread(a)entry=0x56259f432020) at /home/bernhard/data/entwicklung/2021/wine/wine-git/wine-git/server/request.c:309 ... #0 wine_server_call (req_ptr=0x62fac0) at /home/bernhard/data/entwicklung/2021/wine/wine-git/wine-git/dlls/ntdll/unix/server.c:286 #1 0xf7b98514 in server_get_unix_name (handle=handle(a)entry=0x14, unix_name=unix_name(a)entry=0x62fb94) at /home/bernhard/data/entwicklung/2021/wine/wine-git/wine-git/dlls/ntdll/unix/file.c:1776 #2 0xf7ba3b1f in NtQueryInformationFile (handle=0x14, io=0x60f568, ptr=0x60f588, len=104, class=FileAllInformation) at /home/bernhard/data/entwicklung/2021/wine/wine-git/wine-git/dlls/ntdll/unix/file.c:4177 #3 0xf7bbd679 in __wine_syscall_dispatcher () at /home/bernhard/data/entwicklung/2021/wine/wine-git/wine-git/dlls/ntdll/unix/signal_i386.c:153 ... ``` https://github.com/python/cpython/blob/99fcf1505218464c489d419d4500f126b6d6… https://github.com/python/cpython/blob/99fcf1505218464c489d419d4500f126b6d6… -- v3: kernelbase: Workaround for linux-side redirection. https://gitlab.winehq.org/wine/wine/-/merge_requests/1626

3 15

Re: [PATCH v2 0/3] MR1616: loader: In macOS preloader, manually set 'environ' to work around a bug in macOS 12 and later.
by Brendan Shanks (＠bshanks) 02 Dec '22

02 Dec '22

On Sat Dec 3 04:33:26 2022 +0000, Huw Davies wrote: > commit 588e5554252 is preventing a 32-bit build on Mojave from finding > the 32-bit libfreetype.6.dylib which I have in a non-standard location. > I suspect that DYLD_FALLBACK_LIBRARY_PATH is somehow being lost. Hmm, and this worked correctly before? Are you running from the build directory? I didn't realize this before, but any DYLD_ environment variables will be stripped when running from the build directory, because `./wine` or `./wine64` is a shell script, and system binaries (including `/bin/sh`) ignore/strip `DYLD_` env vars. But if you edit `wine`/`wine64` and set/export `DYLD_FALLBACK_LIBRARY_PATH` inside the script, it works. Or, if you install Wine and then run it from there, `wine`/`wine64` is a binary, so `DYLD_FALLBACK_LIBRARY_PATH` works correctly. I did some tests with the preloader and couldn't find any cases where it loses or mishandles the environment variables. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1616#note_18544

1 0

[PATCH 0/3] MR1662: winegstreamer: Map MF_SD_LANGUAGE to ISO 639-1.
by Shaun Ren (＠shaunren) 02 Dec '22

02 Dec '22

This behaviour is expected by games such as Borderlands 3. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1662

3 4

[PATCH v5 0/6] MR1588: Add windows.system.profile.systemmanufacturers DLL.
by Mohamad Al-Jaf (＠maljaf) 02 Dec '22

02 Dec '22

The test for ISmbiosInformationStatics_get_SerialNumber is broken on Window 10 testbot VMs, presumably because they don't have a serial number? It results in an HRESULT of E_UNEXPECTED. I added a broken test case for it. I'm assuming that normal installations of Windows return a valid serial number or at least something like "Not Specified" and not NULL. Also, on my Linux OS running cat /sys/class/dmi/id/product_serial returns "To be filled by O.E.M". So I added a fallback to return 0 as the number. Or is it fine to just return whatever string is found? On the Windows 8 VMs, the test crashes at line 75, hr = ISmbiosInformationStatics_get_SerialNumber( smbios_statics, &serial ). Not sure what I should do in this case. I was hoping for a flag that checks if the VM is Windows 8, but there doesn't seem to be one. Should I wrap the test in if (0) or is there an alternative way? Another weird thing is the test fails prematurely on only the 32-bit version of debian11b, saying that the runtimeclass is not registered. I'm assuming it's an issue with the testbot. Debian11 32 bit runs fine. -- v5: windows.system.profile.systemmanufacturers: Implement ISmbiosInformationStatics_get_SerialNumber. https://gitlab.winehq.org/wine/wine/-/merge_requests/1588

5 10

Re: [PATCH v2 0/1] MR1552: winevulkan: Use direct calls for vkGetDescriptorEXT.
by Alexandre Julliard (＠julliard) 02 Dec '22

02 Dec '22

> * direct call: 5761 > * unpatched Wine: 13933 > * ret.diff: 6823 (55% time spent in \__wine_unix_call_dispatcher, 29% in PE vkGetPhysicalDeviceProperties) > > Looks impressive! Thanks, committed as 0aae4b05633cb9b38eb37cc662f5a3aadb3ce108. Can we get rid of direct calls now? :wink: -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1552#note_18536

1 0

Re: [PATCH v3 0/5] MR1622: d3d10/effect: Add support for more instructions. - approved
by Alexandre Julliard (＠julliard) 02 Dec '22

02 Dec '22

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

1 0

Re: [PATCH v6 0/3] MR1542: winegstreamer: Get MF_SD_LANGUAGE and (for QT demuxer only) MF_SD_STREAM_NAME. - approved
by Alexandre Julliard (＠julliard) 02 Dec '22

02 Dec '22

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

1 0