On Fri May 12 21:07:04 2023 +0000, Matteo Bruni wrote:
> Ah, now I realize I read the "go further" in the MR description as
> "work". I'd like to know that too.
I kind of ask because—while I don't want to hold up progress upstream—as the person who is both maintaining the Wine-Staging patch, and working on (admittedly long stalled) actual tests for tangents, if this doesn't actually help the bug, all this patch is going to do is add more rebase headache for me.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/2795#note_32671
On Fri May 12 21:07:04 2023 +0000, Zebediah Figura wrote:
> Does this actually make the program work?
Ah, now I realize I read the "go further" in the MR description as "work". I'd like to know that too.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/2795#note_32670
Matteo Bruni (@Mystral) commented about dlls/d3dx9_36/mesh.c:
> return hr;
> }
>
> +/*************************************************************************
> + * D3DXComputeTangent (D3DX9_36.@)
> + */
Your choice, but I would just get rid of this comment header.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/2795#note_32668
This fixes two issues:
- since WineContentView became layer-backed in Wine 6.17, windows do not display correctly on a non-retina monitor when high-res/retina mode is enabled. (The needed downscaling was not being done).
- additionally on macOS 10.13 and earlier, the desired minification/downscaling filter was being ignored, causing poor image quality. Enabling rasterization for the layer seems to work around this and uses the correct filter.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/2805
Turns out Windows is more conservative both in initial allocation when creating new heap and also in growing the heap.
Comments:
- Without patch 1 the related test in test_block_layout fails on x64 for me ("unexpected padding") after the last patch. I don't think the last patches really changes much in this regard, looks like the test just depends on the uninitialized data;
- Without patch 2 test_HeapCreate fails (line 601 where it checks the last block pointer). I think it is also only triggered by my patch, I think that last block detection only works correctly now when commit size is smaller than the subheap size (which happens to be not the case in the test after the last patch);
- The last patch extends a bit a todo in test_block_layout(). The actual reason for (extended) todo is that we are probably not handling pending free blocks quite like on Windows. I watched the pointers on Windows in the same test and they are always withing the same subheap allocation which suggests that Windows might be reusing pending free block once it can't find normal free block and before extending the heap. So the last patch changes subheap sizes and that triggers different subheaps for the allocated pointers in Wine. So it looks like not an actual issue with my patch. Reusing pending free pointers is apparently possible to implement but it seems to me that it doesn't worth the trouble until anything depends on that (since those pending free blocks are only there when heap debug flags are enabled which is rarely the case outside of debugging).
--
v2: ntdll: Better match Windows subheap sizes.
kernel32/tests: Add tests for subheap sizes.
ntdll: Fix last block detection in heap_walk_blocks().
ntdll: Fix tail padding in mark_block_tail().
https://gitlab.winehq.org/wine/wine/-/merge_requests/2800
Turns out Windows is more conservative both in initial allocation when creating new heap and also in growing the heap.
Comments:
- Without patch 1 the related test in test_block_layout fails on x64 for me ("unexpected padding") after the last patch. I don't think the last patches really changes much in this regard, looks like the test just depends on the uninitialized data;
- Without patch 2 test_HeapCreate fails (line 601 where it checks the last block pointer). I think it is also only triggered by my patch, I think that last block detection only works correctly now when commit size is smaller than the subheap size (which happens to be not the case in the test after the last patch);
- The last patch extends a bit a todo in test_block_layout(). The actual reason for (extended) todo is that we are probably not handling pending free blocks quite like on Windows. I watched the pointers on Windows in the same test and they are always withing the same subheap allocation which suggests that Windows might be reusing pending free block once it can't find normal free block and before extending the heap. So the last patch changes subheap sizes and that triggers different subheaps for the allocated pointers in Wine. So it looks like not an actual issue with my patch. Reusing pending free pointers is apparently possible to implement but it seems to me that it doesn't worth the trouble until anything depends on that (since those pending free blocks are only there when heap debug flags are enabled which is rarely the case outside of debugging).
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/2800
Rationale:
- currently, winetest is built either as a 32bit exec or a 64bit exec,
containaing a bunch of tests of same bitness.
- there's no simple support for having parent process in one bitness,
and child process in a different bitness.
- lots of cases are not covered in ntdll, kernel32 and kernelbase tests.
- there are here and there a couple of tweaks to workaround this,
but nothing a bit solid.
Attached is a proposal to extend winetest to support better these
use cases:
- the idea is to add an extra-option to winetest.exe (64bit)
passing the path to the corresponding winetest.exe (32bit).
- when running test X (64bit), the path to corresponding test X (32bit)
will be passed to test X (64 bit), allowing it to trigger test
with test X (32bit).
- nothing more is provided: it's up to the test designer to decide
whether to use the 32bit child (and to adapt potentially the test)
to cope with the difference in bitness between parent and child.
- this can be used either in current wow64 setup, and also in
multi-arch wow64 setup (just need to change the patch to 32bit
winetest.exe)
There's an example of such test at the end of the serie.
Comments, ideas welcomed. And especially if it's something worth
continuing.
Note:
- this is first shot at it, it should be improved (especially in
ensuring that the 32bit/64bit pair is correct).
A+
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/2002