April 2021 - Wine-Devel - list.winehq.org

Re: [PATCH 03/12] msvcrt: Implement lrint using rint function.

by Piotr Caban

Hi Alexandre, The rint() implementation is broken (the 1st patch in the series is wrong). Thanks, Piotr

April 30, 2021

Re: [PATCH 03/12] msvcrt: Implement lrint using rint function.

by Alexandre Julliard

Piotr Caban <piotr(a)codeweavers.com> writes: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > configure.ac | 1 - > dlls/msvcrt/math.c | 9 ++++++++- > dlls/msvcrt/unixlib.c | 13 ------------- > dlls/msvcrt/unixlib.h | 1 - > 4 files changed, 8 insertions(+), 16 deletions(-) This breaks the tests: tools/runtest -q -P wine -T . -M d3dx9_36.dll -p dlls/d3dx9_36/tests/d3dx9_36_test.exe effect && touch dlls/d3dx9_36/tests/effect.ok effect.c:259: Tests skipped: Failed to compile effect, skipping test. effect.c:4680: Test failed: Operation reladdr, component 0, expected 0xc00ccccd, got 0 (0). effect.c:4680: Test failed: Operation reladdr, component 1, expected 0x3f800000, got 0x40800000 (4). effect.c:4680: Test failed: Operation reladdr, component 3, expected 0x41200000, got 0 (0). effect.c:4680: Test failed: Operation reladdr2, component 0, expected 0, got 0x45052000 (2130). effect.c:4680: Test failed: Operation reladdr2, component 1, expected 0, got 0x40800000 (4). effect.c:4680: Test failed: Operation reladdr2, component 2, expected 0x447ac000, got 0x447a4000 (1001). effect.c:4680: Test failed: Operation reladdr2, component 3, expected 0x40000000, got 0x3f800000 (1). effect.c:5466: Test failed: Operation reladdr, component 0, expected 0xc00ccccd, got 0 (0). effect.c:5466: Test failed: Operation reladdr, component 1, expected 0x3f800000, got 0x40800000 (4). effect.c:5466: Test failed: Operation reladdr, component 3, expected 0x41200000, got 0 (0). effect.c:5466: Test failed: Operation reladdr2, component 0, expected 0, got 0x45052000 (2130). effect.c:5466: Test failed: Operation reladdr2, component 1, expected 0, got 0x40800000 (4). effect.c:5466: Test failed: Operation reladdr2, component 2, expected 0x447ac000, got 0x447a4000 (1001). effect.c:5466: Test failed: Operation reladdr2, component 3, expected 0x40000000, got 0x3f800000 (1). effect.c:5466: Test failed: Operation reladdr, component 0, expected 0xc00ccccd, got 0 (0). effect.c:5466: Test failed: Operation reladdr, component 1, expected 0x3f800000, got 0x40800000 (4). effect.c:5466: Test failed: Operation reladdr, component 3, expected 0x41200000, got 0 (0). effect.c:5466: Test failed: Operation reladdr2, component 0, expected 0, got 0x45052000 (2130). effect.c:5466: Test failed: Operation reladdr2, component 1, expected 0, got 0x40800000 (4). effect.c:5466: Test failed: Operation reladdr2, component 2, expected 0x447ac000, got 0x447a4000 (1001). effect.c:5466: Test failed: Operation reladdr2, component 3, expected 0x40000000, got 0x3f800000 (1). effect.c:5971: Test failed: Test 0, component 0, expected 0 (0), got 0x447a4000 (1001). effect.c:5971: Test failed: Test 0, component 2, expected 0x3f800000 (1), got 0 (0). effect.c:5971: Test failed: Test 0, component 3, expected 0 (0), got 0x457a3000 (4003). effect.c:5971: Test failed: Test 1, component 0, expected 0x447ac000 (1003), got 0x447a4000 (1001). effect.c:5971: Test failed: Test 1, component 2, expected 0x3f800000 (1), got 0 (0). effect.c:5971: Test failed: Test 1, component 3, expected 0 (0), got 0x457a3000 (4003). etc... -- Alexandre Julliard julliard(a)winehq.org

April 30, 2021

[PATCH 5/5] msvcrt: Fix _unDName crash when demangling class function pointer.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/cpp.c | 2 ++ dlls/msvcrt/undname.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)

April 30, 2021

[PATCH 4/5] msvcrt/tests: Cleanup datatype demangle tests.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/cpp.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)

April 30, 2021

[PATCH 3/5] msvcrt/tests: Remove strcmp_space helper.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/cpp.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-)

April 30, 2021

[PATCH 2/5] msvcrt/tests: Remove old versions workarounds from RTTI tests.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/cpp.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)

April 30, 2021

[PATCH 1/5] msvcrt/tests: Link to malloc/free functions in cpp tests.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/cpp.c | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-)

April 30, 2021

Re: [PATCH v3 4/5] ws2_32: Do not free a static critical section.

by Zebediah Figura (she/her)

On 4/30/21 12:52 PM, Marvin wrote: > Hi, > > While running your changed tests, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > > Full results can be found at: > https://testbot.winehq.org/JobDetails.pl?Key=89669 > > Your paranoid android. > > > === debiant2 (32 bit report) === > > ws2_32: > sock.c:2676: Test succeeded inside todo block: Test[2]: expected 0, got 0 > This one, at least, is preëxisting...

April 30, 2021

Re: [PATCH v2 5/7] d3d11/tests: Test drawing to a multisampled texture.

by Zebediah Figura (she/her)

On 4/30/21 12:00 PM, Henri Verbeet wrote: > On Fri, 30 Apr 2021 at 18:09, Zebediah Figura <z.figura12(a)gmail.com> wrote: >> +static void test_multisample_draw(const D3D_FEATURE_LEVEL feature_level) >> +{ >> + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = >> + { >> + {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, >> + }; >> + static const DWORD vs_code[] = >> + { >> +#if 0 >> + float4 main(float4 position : POSITION) : SV_POSITION >> + { >> + return position; >> + } >> +#endif >> + 0x43425844, 0x06bbe9c8, 0x927aedde, 0xb3c454df, 0xd739785a, 0x00000001, 0x00000140, 0x00000004, >> + 0x00000030, 0x00000094, 0x000000d8, 0x0000010c, 0x396e6f41, 0x0000005c, 0x0000005c, 0xfffe0200, >> + 0x00000034, 0x00000028, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240001, 0x00000000, >> + 0xfffe0200, 0x0200001f, 0x80000005, 0x900f0000, 0x04000004, 0xc0030000, 0x90ff0000, 0xa0e40000, >> + 0x90e40000, 0x02000001, 0xc00c0000, 0x90e40000, 0x0000ffff, 0x52444853, 0x0000003c, 0x00010040, >> + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, >> + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x4e475349, 0x0000002c, >> + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, >> + 0x49534f50, 0x4e4f4954, 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, >> + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, >> + }; >> + static const DWORD ps_code[] = >> + { >> +#if 0 >> + float4 main() : sv_target >> + { >> + return float4(1.0, 1.0, 1.0, 1.0); >> + } >> +#endif >> + 0x43425844, 0xe8ed6039, 0xd42f2bf4, 0x38efe2fd, 0x9dc3406f, 0x00000001, 0x00000118, 0x00000004, >> + 0x00000030, 0x00000094, 0x000000d4, 0x000000e4, 0x396e6f41, 0x0000005c, 0x0000005c, 0xffff0200, >> + 0x00000038, 0x00000024, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0xffff0200, >> + 0x05000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x02000001, 0x800f0000, >> + 0xa0000000, 0x02000001, 0x800f0800, 0x80e40000, 0x0000ffff, 0x52444853, 0x00000038, 0x00000040, >> + 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, >> + 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e, 0x4e475349, 0x00000008, 0x00000000, >> + 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, >> + 0x00000003, 0x00000000, 0x0000000f, 0x745f7673, 0x65677261, 0xabab0074, >> + }; >> + static const struct vec3 tri[] = >> + { >> + { 0.9f, -0.5f, 0.0f}, >> + {-0.8f, -0.9f, 0.0f}, >> + { 0.2f, 0.7f, 0.0f}, >> + }; > Would it be possible to use draw_color_quad() in this test, perhaps in > a similar way to e.g. test_stencil_separate() and test_face_culling()? > It's not a great fit, especially given the line tests, but also the different set and number of vertices. Of course it's unfortunate to duplicate the vertex shader, but it doesn't strike me as better to modify draw_color_quad().

April 30, 2021

[PATCH] kernel32/tests: Fix test_GlobalMemoryStatus() for Win up to 8.1 and RAM size above 4GB.

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- See https://www.winehq.org/pipermail/wine-devel/2021-April/185972.html. dlls/kernel32/tests/heap.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 0a4e3367f60..8558bd7f1b3 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1223,9 +1223,9 @@ static BOOL compare_ulong64(ULONG64 v1, ULONG64 v2, ULONG64 max_diff) static void test_GlobalMemoryStatus(void) { static const ULONG64 max_diff = 0x200000; + SIZE_T size, size_broken; MEMORYSTATUSEX memex; MEMORYSTATUS mem; - SIZE_T size; mem.dwLength = sizeof(mem); GlobalMemoryStatus(&mem); @@ -1236,10 +1236,16 @@ static void test_GlobalMemoryStatus(void) * GlobalMemoryStatus() and GlobalMemoryStatusEx() calls. */ size = min(memex.ullTotalPhys, ~(SIZE_T)0 >> 1); - ok(compare_ulong64(mem.dwTotalPhys, size, max_diff), "Got unexpected dwTotalPhys %s, size %s.\n", + size_broken = min(memex.ullTotalPhys, ~(SIZE_T)0); + ok(compare_ulong64(mem.dwTotalPhys, size, max_diff) + || broken(compare_ulong64(mem.dwTotalPhys, size_broken, max_diff)) /* Win <= 8.1 with RAM size > 4GB */, + "Got unexpected dwTotalPhys %s, size %s.\n", wine_dbgstr_longlong(mem.dwTotalPhys), wine_dbgstr_longlong(size)); size = min(memex.ullAvailPhys, ~(SIZE_T)0 >> 1); - ok(compare_ulong64(mem.dwAvailPhys, size, max_diff), "Got unexpected dwAvailPhys %s, size %s.\n", + size_broken = min(memex.ullAvailPhys, ~(SIZE_T)0); + ok(compare_ulong64(mem.dwAvailPhys, size, max_diff) + || broken(compare_ulong64(mem.dwAvailPhys, size_broken, max_diff)) /* Win <= 8.1 with RAM size > 4GB */, + "Got unexpected dwAvailPhys %s, size %s.\n", wine_dbgstr_longlong(mem.dwAvailPhys), wine_dbgstr_longlong(size)); size = min(memex.ullTotalPageFile, ~(SIZE_T)0); -- 2.31.1

April 30, 2021