- Wine-GitLab - list.winehq.org

[PATCH 0/4] MR1046: MfMediaEngine audio and invalid format fix.
by Bernhard Kölbl Oct. 17, 2022

Oct. 17, 2022

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

6 44

[PATCH v3 0/3] MR1037: win32u: Add font link for MS UI Gothic.
by Ziqing Hui (＠zhui) Oct. 17, 2022

Oct. 17, 2022

See this testbot result: https://testbot.winehq.org/JobDetails.pl?Key=124827&f101=exe32.report&f118=… Source code of the test program in the tests above is attached. [font_link_reg.c](/uploads/0f18bd2ab664e5d78ee2e16ef9037e60/font_link_reg.c) The tests show the reg key value of font link on different Windows machine, -- v3: win32u: Add more linked fonts for Tahoma. win32u: Add font link for MS UI Gothic. win32u: Add mechanism for font specific system links. https://gitlab.winehq.org/wine/wine/-/merge_requests/1037

4 5

[PATCH v3 0/6] MR29: vkd3d-shader/hlsl: Support complex implicit casts, complex explicit casts and complex broadcasts. (PART 1/2)
by Francisco Casas (＠fcasas) Oct. 17, 2022

Oct. 17, 2022

Hello, this is the first part of a patch series to support: * Complex broadcasts. * Complex implicit casts between component-wise equal types. * Complex explicit casts between component-wise compatible types. This first part of the series includes mostly tests. Following patches in: https://gitlab.winehq.org/fcasas/vkd3d/-/commits/complex_broadcasts_2/ This supersedes !16 . -- v3: tests: Test explicit casts between types that are component-wise tests: Test implicit casts between types that are equal component-wise. vkd3d-shader/hlsl: Always go through implicit conversion in assignments. tests: Test for invalid complex broadcasts. tests: Rename structs for readability in broadcast test. tests: Set ULPs to 2 in normalize() test. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/29

4 8

[PATCH 0/1] MR31: tests: Add missing backslash to restore skipped tests.
by Francisco Casas (＠fcasas) Oct. 17, 2022

Oct. 17, 2022

Tests after this missing backslash are not being executed since e9829fdc6524e455f85893445ad8a2d703f02a2e. --- Thanks Giovanni for pointing this out. I am so sorry! -- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/31

5 4

[PATCH 0/6] MR28: Support length(), int division and int absolute value.
by Giovanni Mascellani (＠giomasce) Oct. 17, 2022

Oct. 17, 2022

-- https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/28

4 8

[PATCH v2 0/1] MR18: include: Use __MINGW_PRINTF_FORMAT when compiling with MinGW.
by Zebediah Figura (＠zfigura) Oct. 17, 2022

Oct. 17, 2022

The default for MinGW is always ms_printf rather than gnu_printf, but if we are using ucrtbase or ANSI stdio, we want gnu_printf. -- v2: include: Use __MINGW_PRINTF_FORMAT when compiling with MinGW. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/18

4 5

[PATCH v3 0/2] MR1030: Add stubs and tests for GetConsoleOriginalTitleA/W
by Hugh McMaster (＠hmc) Oct. 17, 2022

Oct. 17, 2022

-- v3: kernel32/tests: Add tests for GetConsoleOriginalTitleA/W() kernelbase: Add stubs for GetConsoleOriginalTitleA/W() https://gitlab.winehq.org/wine/wine/-/merge_requests/1030

3 3

[PATCH 0/1] MR1077: kernel32/tests: Remove tests comparing expected output in certain functions
by Hugh McMaster (＠hmc) Oct. 17, 2022

Oct. 17, 2022

The Windows versions of [Read|Write]ConsoleOutput[Attribute|Character] appear to assign an uninitialized internal DWORD to the given pointer address before returning. As the functions fail (intentionally) in these tests, the value of the DWORD is never set, so the tests end up comparing the expected value of zero with random values. This value of this test is very limited and is best removed. Fixes https://bugs.winehq.org/show_bug.cgi?id=53686 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1077

2 1

Re: [PATCH v2 0/1] MR1065: ntdll: Add CFI unwind info to __wine_syscall_dispatcher (x86_64)
by Rémi Bernon Oct. 17, 2022

Oct. 17, 2022

Rémi Bernon (@rbernon) commented about dlls/ntdll/unix/signal_x86_64.c: > "movq %gs:0x30,%rcx\n\t" > "movq 0x328(%rcx),%rcx\n\t" /* amd64_thread_data()->syscall_frame */ > "popq 0x70(%rcx)\n\t" /* frame->rip */ > + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") > + // $rip = frame->rip // (*(0x70($rcx))) I understand the point but I don't think we need to keep these comments. We also don't use C++-style comments. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1065#note_10939

1 0

Re: [PATCH v2 0/1] MR1065: ntdll: Add CFI unwind info to __wine_syscall_dispatcher (x86_64)
by Rémi Bernon Oct. 17, 2022

Oct. 17, 2022

Rémi Bernon (@rbernon) commented about dlls/ntdll/unix/signal_x86_64.c: > + > +#define __ASM_CFI_REG_IS_AT_OFFSET2_FROM_RCX(REG, OFFSET1, OFFSET2) \ > + __ASM_CFI_REG_IS_AT_OFFSET2_FROM_BREG(REG, __ASM_CFI_DW_OP_breg2, OFFSET1, OFFSET2) > + > +#define __ASM_CFI_REG_IS_AT_OFFSET1_FROM_RCX(REG, OFFSET) \ > + __ASM_CFI_REG_IS_AT_OFFSET1_FROM_BREG(REG, __ASM_CFI_DW_OP_breg2, OFFSET) > + > +#define __ASM_CFI_CFA_IS_AT_OFFSET_FROM_RBP(OFFSET) \ > + __ASM_CFI_CFA_IS_AT_OFFSET1_FROM_BREG(__ASM_CFI_DW_OP_breg6, OFFSET) > + > +#define __ASM_CFI_CFA_IS_AT_OFFSET_FROM_RSP(OFFSET) \ > + __ASM_CFI_CFA_IS_AT_OFFSET1_FROM_BREG(__ASM_CFI_DW_OP_breg7, OFFSET) > + > +#define __ASM_CFI_CFA_IS_AT_OFFSET_FROM_RCX(OFFSET1, OFFSET2) \ > + __ASM_CFI_CFA_IS_AT_OFFSET2_FROM_BREG(__ASM_CFI_DW_OP_breg2, OFFSET1, OFFSET2) > + What about something simpler like, 1) #define the `DW_` constants above in the file instead of the enums, and 2) re-use them here in the expressions, with something like: ```c #define DW_OP_rcx DW_OP_breg2 #define DW_OP_rbp DW_OP_breg6 #define DW_OP_rsp DW_OP_breg7 #define DW_REG_rbx 0x03 #define DW_REG_rsi 0x04 #define DW_REG_rdi 0x05 #define DW_REG_rbp 0x06 #define DW_REG_rsp 0x07 #define DW_REG_r12 0x0c #define DW_REG_r13 0x0d #define DW_REG_r14 0x0e #define DW_REG_r15 0x0f #define DW_REG_rip 0x10 #define __ASM_CFI_STR(...) #__VA_ARGS__ #define __ASM_CFI_ESC(...) __ASM_CFI(".cfi_escape " __ASM_CFI_STR(__VA_ARGS__) "\n\t") #define __ASM_CFI_CFA_IS_AT(base, lo, hi) __ASM_CFI_ESC(DW_CFA_def_cfa_expression, 0x04, DW_OP_ ## base, lo, hi, DW_OP_deref) #define __ASM_CFI_REG_IS_AT(reg, base, lo, hi) __ASM_CFI_ESC(DW_CFA_expression, DW_REG_ ## reg, 0x03, DW_OP_ ## base, lo, hi) ``` And use that below as `__ASM_CFI_CFA_IS_AT(rcx,0x88,0x01)`, `__ASM_CFI_REG_IS_AT(rip,rcx,0xf0,0x00)`, etc... I think using two bytes offsets everywhere simplifies the macros, although we'll need a bit more offset mangling by hand to encode them. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1065#note_10938

1 0

[PATCH 0/5] MR1072: comctl32: preparation for HPROPSHEETPAGE structure layout changes
by Piotr Caban (＠piotr) Oct. 17, 2022

Oct. 17, 2022

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

4 9

Re: [PATCH v2 0/1] MR1065: ntdll: Add CFI unwind info to __wine_syscall_dispatcher (x86_64)
by Florian Kübler Oct. 17, 2022

Oct. 17, 2022

>Yes, in my case I'm mostly only interested in the case with DWARF debug info in PE files. The applications I'm working with usually don't have debug information anyway and I'm trying to get stack traces and tooling support for Wine code specifically. Okay, yeah that makes a lot of sense now. Just to note that Windows "runtime function" unwind information was almost always available when we checked. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1065#note_10931

1 0

Re: [PATCH v2 0/1] MR1065: ntdll: Add CFI unwind info to __wine_syscall_dispatcher (x86_64)
by Rémi Bernon Oct. 17, 2022

Oct. 17, 2022

> > FWIW this also works with Valgrind, and you might be interested in https://gitlab.winehq.org/wine/wine/-/merge_requests/1074 too. > > That is interesting. So, but do I see correctly that this only works, if the Windows Pe/Coff files, actually have **DWARF** unwind information embedded. Which is as far as I am aware only the case for cross-compilation with mingw, right? > > I should probably add that it only does that when it has the debug info for the PE modules, this isn't currently well supported, and needs to be done somehow manually. > > Are you referring to the Windows unwind information (runtime function), or the DWARF information mentioned above? Our LLDB patch (which we hopefully upstream soon), as well as the libunwindstack implementation actually takes care of all kind of PE/Coff modules, and is able to use runtime function as well, as DWARF information. Yes, in my case I'm mostly only interested in the case with DWARF debug info in PE files. The applications I'm working with usually don't have debug information anyway and I'm trying to get stack traces and tooling support for Wine code specifically. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1065#note_10930

1 0

Re: [PATCH v2 0/1] MR1065: ntdll: Add CFI unwind info to __wine_syscall_dispatcher (x86_64)
by Florian Kübler Oct. 17, 2022

Oct. 17, 2022

>Hmm, I need to think about that. When I said it fully works, I should maybe indicate that GDB doesn't usually display local variables for the first frame below the syscall, so maybe it's because of this even though it manages to catch up for lower frames. As far as I remember, local variables were available in all frames in our case. It should be mostly because we specify callee-save registers right away when they get stored. Also it is likely, that if the computation in not correct in the first place, that it will catch up later, as there will be new unwind information mostly specifying "register foo is saved at that position on the stack". >FWIW this also works with Valgrind, and you might be interested in https://gitlab.winehq.org/wine/wine/-/merge_requests/1074 too. That is interesting. So, but do I see correctly that this only works, if the Windows Pe/Coff files, actually have **DWARF** unwind information embedded. Which is as far as I am aware only the case for cross-compilation with mingw, right? >It's not exactly the `pushfl` but more that the dispatcher pops `rip` first, which effectively removes the return address from the stack, then `pushfl` overrides its value. It's not causing problems later because the dispatcher uses the poped `rip` value to return to the caller, but it temporarily confuses GDB stack unwinding. Maybe with your CFI instructions it's not required. Right! And that is the reason why we don't need it, as we do specify "RIP" based on syscall frame and not based on CFA, right as it gets popped. I think that's another case, where it is actually better to do the `breg` instructions, as it gives you the freedom to specify some variables based on CFA and some based on register content. >The reason I've been told, is that some DRMs are checking that the NT syscalls didn't touch the stack. I don't really know more. Oh interesting. That makes a lot of sense, and our lives so much harder... :smile: >Yes, it's already an issue for `perf` captures when you want stack traces that cross user and kernel stacks, and I don't really have any good solution for that. Having an optional working mode which would interleave kernel frames and user frames may be possible but it doesn't seem much tractable. Yep, `perf` is actually using the same `perf_event_open` syscall that we are using. So it makes sense that we are observing the same issue. The "bruteforce" way we worked around with that, is to inject into the syscall dispatcher (using a uprobe) and always collect the "user-space" stack, then for the actual samples, make both stacks available to the unwinder. This obviously comes with a big performance hit, and might corrupt your performance characteristics. However, it actually turned out to be useful to find some issues. An alternative solution, that we never ended up actually implementing would be to use a eBPF program for the sampling/stack collection. We could make it copy both stacks explicitly. Obvious the more elegant solution would be, as you mentioned, to either have a switch in Wine to only have one stack, or alternatively, make it possible in perf_event_open, to collect both stacks. It would be be not the first time that Linux kernel has special handling for wine. >I should probably add that it only does that when it has the debug info for the PE modules, this isn't currently well supported, and needs to be done somehow manually. Are you referring to the Windows unwind information (runtime function), or the DWARF information mentioned above? Our LLDB patch (which we hopefully upstream soon), as well as the libunwindstack implementation actually takes care of all kind of PE/Coff modules, and is able to use runtime function as well, as DWARF information. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1065#note_10929

1 0

Re: [PATCH v2 0/1] MR1065: ntdll: Add CFI unwind info to __wine_syscall_dispatcher (x86_64)
by Rémi Bernon Oct. 17, 2022

Oct. 17, 2022

> Ah, that is good to know, thanks. Apparently gdb's unwinder works slightly different, than the used we looked at. Also, I am surprised it actually can unwind Windows PE/Coff-based frames. I should probably add that it only does that when it has the debug info for the PE modules, this isn't currently well supported, and needs to be done somehow manually. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1065#note_10927

1 0

Re: [PATCH v2 0/1] MR1065: ntdll: Add CFI unwind info to __wine_syscall_dispatcher (x86_64)
by Rémi Bernon Oct. 17, 2022

Oct. 17, 2022

> > BTW, if the issue is only that the CFA is supposed to stay constant within a CFI procedure, would it work if we were splitting the dispatcher with some jumps / call / fake CFI procedures, at the points where we need to change its register? > > My point is, that the issue is actually not about CFA not being constant, but that CFA has a semantic that many unwinding tools/libraries rely on, i.e. that CFA is suppose to be the value of the stack pointer at the caller, right before the call. In particular, CFA is suppose to be a value that would be a valid stack pointer. > > In your change, however, CFA gets later set to be a pointer into syscall_frame. Hmm, I need to think about that. When I said it fully works, I should maybe indicate that GDB doesn't usually display local variables for the first frame below the syscall, so maybe it's because of this even though it manages to catch up for lower frames. > > With GDB and with the two other changes I mentioned, it fully works yes. > > Ah, that is good to know, thanks. Apparently gdb's unwinder works slightly different, than the used we looked at. Also, I am surprised it actually can unwind Windows PE/Coff-based frames. FWIW this also works with Valgrind, and you might be interested in https://gitlab.winehq.org/wine/wine/-/merge_requests/1074 too. > > I'm a bit surprised that you don't need the flags push/pop change, as I believe it corrupts the return address on the stack, but maybe the unwinder has other ways to get it back. > > Interesting. I am wondering why the `pushfl` instruction corrupts the return address. If this would be the case, wouldn't that not lead to actual runtime issues when the dispatcher returns? Maybe the reason why we don't see an issue with that, is that we are actually setting the CFI rule for the return address based on `syscall_frame` right away? It's not exactly the `pushfl` but more that the dispatcher pops `rip` first, which effectively removes the return address from the stack, then `pushfl` overrides its value. It's not causing problems later because the dispatcher uses the poped `rip` value to return to the caller, but it temporarily confuses GDB stack unwinding. Maybe with your CFI instructions it's not required. > > Yes, that's what I've been told (maybe even *you* did). > > No, that wasnt me :smile:, it's actually my first PR. Also note, that I am not a wine expert, so please forgive me, if I miss something obvious. Well, nothing in this area is obvious to me either. > > Now the other part where unwinding doesn't work well is with the other side of syscalls, with KiUserCallbackDispatcher callbacks. > > Unfortunately, I am not aware of the `KiUserCallbackDispatcher`. So I can't tell if there is more work to be done/how this could be fixed. > > We basically looked at reported unwinding errors in Orbit, and discovered the missing unwind info (CFI) being the root cause of most of them. With this, and some adjustments to our unwinder to cope with certain corner-cases of PE/Coff files, we ended up with less than 1% of unwinding errors. > > Actually, another issue that kept us quite busy is, that the `kernel_stack` is not allocated on the "normal"/"user" stack. That apparently used to be the case before Wine 7. This way, Linux performance collector tools, such as perf_event_open, fail to collect the "user-space" part of the stack. For debugging this is fine, as the program execution is halted and we can just read the data from memory, but for Profiling, we needed to massively work around that. Does someone know about the reason for the two separated stacks? Would it be maybe possible, to actually allocate that "kernel_stack" at the normal stack? The reason I've been told, is that some DRMs are checking that the NT syscalls didn't touch the stack. I don't really know more. Yes, it's already an issue for `perf` captures when you want stack traces that cross user and kernel stacks, and I don't really have any good solution for that. Having an optional working mode which would interleave kernel frames and user frames may be possible but it doesn't seem much tractable. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1065#note_10925

1 0

Re: [PATCH v2 0/1] MR1065: ntdll: Add CFI unwind info to __wine_syscall_dispatcher (x86_64)
by Florian Kübler Oct. 17, 2022

Oct. 17, 2022

>BTW, if the issue is only that the CFA is supposed to stay constant within a CFI procedure, would it work if we were splitting the dispatcher with some jumps / call / fake CFI procedures, at the points where we need to change its register? My point is, that the issue is actually not about CFA not being constant, but that CFA has a semantic that many unwinding tools/libraries rely on, i.e. that CFA is suppose to be the value of the stack pointer at the caller, right before the call. In particular, CFA is suppose to be a value that would be a valid stack pointer. In your change, however, CFA gets later set to be a pointer into syscall_frame. >With GDB and with the two other changes I mentioned, it fully works yes. Ah, that is good to know, thanks. Apparently gdb's unwinder works slightly different, than the used we looked at. Also, I am surprised it actually can unwind Windows PE/Coff-based frames. >I'm a bit surprised that you don't need the flags push/pop change, as I believe it corrupts the return address on the stack, but maybe the unwinder has other ways to get it back. Interesting. I am wondering why the `pushfl` instruction corrupts the return address. If this would be the case, wouldn't that not lead to actual runtime issues when the dispatcher returns? Maybe the reason why we don't see an issue with that, is that we are actually setting the CFI rule for the return address based on `syscall_frame` right away? >Yes, that's what I've been told (maybe even *you* did). No, that wasnt me :smile:, it's actually my first PR. Also note, that I am not a wine expert, so please forgive me, if I miss something obvious. >Now the other part where unwinding doesn't work well is with the other side of syscalls, with KiUserCallbackDispatcher callbacks. Unfortunately, I am not aware of the `KiUserCallbackDispatcher`. So I can't tell if there is more work to be done/how this could be fixed. We basically looked at reported unwinding errors in Orbit, and discovered the missing unwind info (CFI) being the root cause of most of them. With this, and some adjustments to our unwinder to cope with certain corner-cases of PE/Coff files, we ended up with less than 1% of unwinding errors. Actually, another issue that kept us quite busy is, that the `kernel_stack` is not allocated on the "normal"/"user" stack. That apparently used to be the case before Wine 7. This way, Linux performance collector tools, such as perf_event_open, fail to collect the "user-space" part of the stack. For debugging this is fine, as the program execution is halted and we can just read the data from memory, but for Profiling, we needed to massively work around that. Does someone know about the reason for the two separated stacks? Would it be maybe possible, to actually allocate that "kernel_stack" at the normal stack? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1065#note_10922

1 0

[PATCH 0/4] MR1076: opengl32: Cleanup extension disabling override in preparation for https://gitlab.winehq.org/wine/wine/-/merge_requests/1010.
by Rémi Bernon Oct. 17, 2022

Oct. 17, 2022

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

2 5

[PATCH 0/13] MR1074: Draft: ntdll: Improve Valgrind and GDB integration.
by Rémi Bernon Oct. 17, 2022

Oct. 17, 2022

Valgrind support requires a fork, which I've published to https://gitlab.winehq.org/rbernon/valgrind. The fork implements loading DWARF debug info from PE files, instead of the old and broken upstream PDB support. I've tried to upstream these changes a long time ago but didn't receive any feedback. I think we could maybe consider keeping a fork, which I'm happy to maintain, as the changes aren't too large. We may want to investigate adding 32-on-64 support, which may require a bit more changes (to VEX specifically, because its amd64 guest doesn't support segment register manipulation). The changes here are not all related to Valgrind, and I'll create separate MR for those which may make sense independently from Valgrind / GDB. Also included is a suppression file to silent some annoying false positives, many of which are coming from the cross-stack accesses during syscalls, which are confusing Valgrind's stack heuristics. One can try this out with something like: `WINELOADERNOEXEC=1 valgrind --suppressions=tools/valgrind.supp wine64/loader/wine64 wine64/programs/winecfg/winecfg.exe` -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1074

4 32

[PATCH 0/1] MR1075: include: Add TOOLINFO[AW].
by Alex Henrie (＠alexhenrie) Oct. 17, 2022

Oct. 17, 2022

Needed to compile Tera Term. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1075

3 2

[PATCH 0/2] MR1073: Fix video flickering.
by Akihiro Sagawa (＠sgwaki) Oct. 17, 2022

Oct. 17, 2022

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

4 4

[PATCH 0/1] MR1002: win32u: Fix data race in NtUserGetProcessDpiAwarenessContext.
by Jinoh Kang (＠iamahuman) Oct. 16, 2022

Oct. 16, 2022

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

5 9

[PATCH v3 0/1] MR363: user32/tests: Test for window exposure behaviours.
by Jinoh Kang (＠iamahuman) Oct. 16, 2022

Oct. 16, 2022

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v3: user32/tests: Test for window exposure behaviours. https://gitlab.winehq.org/wine/wine/-/merge_requests/363

3 3

[PATCH 0/4] MR1052: uiautomationcore: Initial patches for multi-provider HUIANODEs.
by Connor McAdams (＠cmcadams) Oct. 16, 2022

Oct. 16, 2022

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

4 8

[PATCH v6 0/1] MR1024: xmllite/writer: Null terminate duplicated strings.
by David Kahurani (＠kahurani) Oct. 16, 2022

Oct. 16, 2022

Currently, the code copies one extra character than requested and does not terminate the string. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> -- v6: xmllite/writer: Null terminate duplicated strings. https://gitlab.winehq.org/wine/wine/-/merge_requests/1024

4 4