May 2021 - Wine-devel - list.winehq.org

[PATCH v3 1/5] msxml3/tests: Don't '\0' terminate output after ::save().
by Dmitry Timoshkov 06 May '21

06 May '21

This fixes heap corruption when running the domdoc tests. v3: Apparently Windows 8 and later started to \0 terminate buffer in ::save, so to avoid test failures perform comparisons with memcmp() instead of strcmp(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/tests/domdoc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6f8e2b44ed3..ba8453430c6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8586,8 +8586,7 @@ todo_wine hr = GetHGlobalFromStream(stream, &global); ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); - p[GlobalSize(global)] = 0; - ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine), "got %s\n", wine_dbgstr_a(p)); + ok(!memcmp(p, xml2, sizeof(xml2) - 1) || !memcmp(p, xml2_wine, sizeof(xml2_wine) - 1), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); /* Verify the result after load+save */ @@ -8609,8 +8608,7 @@ todo_wine hr = GetHGlobalFromStream(stream, &global); ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); - p[GlobalSize(global)] = 0; - ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine), "got %s\n", wine_dbgstr_a(p)); + ok(!memcmp(p, xml2, sizeof(xml2) - 1) || !memcmp(p, xml2_wine, sizeof(xml2_wine) - 1), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); IStream_Release(stream); @@ -8631,8 +8629,7 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); - p[GlobalSize(global)] = 0; - ok(!strcmp(p, xml3) || !strcmp(p, xml3_wine), "got %s\n", wine_dbgstr_a(p)); + ok(!memcmp(p, xml3, sizeof(xml3) - 1) || !memcmp(p, xml3_wine, sizeof(xml3_wine) - 1), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); IStream_Release(stream); -- 2.31.1

2 1

[PATCH] mfplat: Fix the spelling of a comment.
by Francois Gouget 06 May '21

06 May '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mfplat/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f1d0aaad94d..c8d74b5d42c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -9034,7 +9034,7 @@ static void llmult128(ULARGE_INTEGER *c1, ULARGE_INTEGER *c0, LONGLONG val, LONG b0.QuadPart = (ULONGLONG)v.HighPart * n.LowPart; /* add the high word of a0 to the low words of a1 and b0 using c1 as - * scrach space to capture the carry. the low word of the result becomes + * scratch space to capture the carry. the low word of the result becomes * the final high word of c0 */ c1->QuadPart = (ULONGLONG)c0->HighPart + a1.LowPart + b0.LowPart; c0->HighPart = c1->LowPart; -- 2.20.1

2 1

[PATCH] msvcp140_1/tests: Fix the spelling of test_get_set_default_resource().
by Francois Gouget 06 May '21

06 May '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcp140_1/tests/msvcp140_1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140_1/tests/msvcp140_1.c b/dlls/msvcp140_1/tests/msvcp140_1.c index a773e4a236c..115e870031d 100644 --- a/dlls/msvcp140_1/tests/msvcp140_1.c +++ b/dlls/msvcp140_1/tests/msvcp140_1.c @@ -259,7 +259,7 @@ static void test_null_memory_resource(void) "Resource should not be equal to a random pointer.\n"); } -static void test_get_set_defult_resource( +static void test_get_set_default_resource( memory_resource *(__cdecl *new_delete_resource)(void), memory_resource *(__cdecl *set_default_resource)(memory_resource*)) { @@ -295,9 +295,9 @@ START_TEST(msvcp140_1) test_null_memory_resource(); - test_get_set_defult_resource(p__Aligned_new_delete_resource, + test_get_set_default_resource(p__Aligned_new_delete_resource, p__Aligned_set_default_resource); - test_get_set_defult_resource(p__Unaligned_new_delete_resource, + test_get_set_default_resource(p__Unaligned_new_delete_resource, p__Unaligned_set_default_resource); FreeLibrary(msvcp); -- 2.20.1

1 0

[PATCH] ntdll/tests: Fix the speilling of an ok() message.
by Francois Gouget 06 May '21

06 May '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/tests/om.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 7d9ca47be12..fb7d48e7fe1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2593,7 +2593,7 @@ static void test_get_next_thread(void) thread = CreateThread( NULL, 0, test_get_next_thread_proc, event, 0, &thread_id ); status = pNtGetNextThread(hprocess, NULL, THREAD_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, NULL); - ok(status == STATUS_ACCESS_VIOLATION, "Got unexected status %#x.\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); found = FALSE; prev = NULL; -- 2.20.1

1 0

[PATCH] ucrtbase/tests: Add a trailing linefeed to an ok() message.
by Francois Gouget 06 May '21

06 May '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ucrtbase/tests/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/thread.c b/dlls/ucrtbase/tests/thread.c index 512d2158b66..8fffbffb38e 100644 --- a/dlls/ucrtbase/tests/thread.c +++ b/dlls/ucrtbase/tests/thread.c @@ -176,7 +176,7 @@ START_TEST(thread) test_thread_library_reference(thread_dll, use_beginthreadex, thread_exit_endthreadex); ret = DeleteFileA(thread_dll); - ok(ret, "Failed to remove the test dll, err: %u", GetLastError()); + ok(ret, "Failed to remove the test dll, err: %u\n", GetLastError()); test_thread_invalid_params(); } -- 2.20.1

1 0

[PATCH] wined3d: Add a trailing linefeed to a couple of FIXME().
by Francois Gouget 06 May '21

06 May '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5c85b2c91bb..473d6312b7d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -405,7 +405,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont } if (src_location == WINED3D_LOCATION_DRAWABLE) - FIXME("WINED3D_LOCATION_DRAWABLE not supported for the source of a typeless resolve."); + FIXME("WINED3D_LOCATION_DRAWABLE not supported for the source of a typeless resolve.\n"); device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_RAW_BLIT, context, src_texture, src_sub_resource_idx, src_location, src_rect, @@ -543,7 +543,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont if (dst_texture != dst_save_texture) { if (dst_location == WINED3D_LOCATION_DRAWABLE) - FIXME("WINED3D_LOCATION_DRAWABLE not supported for the destination of a typeless resolve."); + FIXME("WINED3D_LOCATION_DRAWABLE not supported for the destination of a typeless resolve.\n"); device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_RAW_BLIT, context, dst_texture, 0, dst_location, dst_rect, -- 2.20.1

1 0

[tools] winetest/gather: Dynamically set the scroll-margin-top property on the platform-specific index pages
by Hugh McMaster 06 May '21

06 May '21

The sticky <th> header row often has a different height depending on the platform page being accessed. This prevents us from hard-coding the scroll-margin-top property using CSS alone. Dynamically setting this value ensures each bookmark is shown as expected. --- winetest/gather | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/winetest/gather b/winetest/gather index 4698ac3..b4526bf 100755 --- a/winetest/gather +++ b/winetest/gather @@ -911,6 +911,12 @@ EOF To run the tests on your Windows machine, download the <a href="/builds/winetest-$short_build.exe">32-bit winetest</a>. If you have a 64-bit Windows OS, you can also run the <a href="/builds/winetest64-$short_build.exe">64-bit winetest</a>. </div> +<script> + var sticky_height = document.querySelector('.sticky').offsetHeight + 1; + var style = document.createElement('style'); + style.innerHTML = 'div.group table.report td.test a { scroll-margin-top: ' + sticky_height + 'px; }'; + document.head.appendChild(style); +</script> </body> </html> EOF -- 2.31.1

2 1

[PATCH v2] urlmon/tests: Check that .Net is present in the user-agent string.
by Francois Gouget 06 May '21

06 May '21

This also fixes a failure in the 64-bit urlmon:misc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I figured that if .Net is mandatory we should check for it explicitly, which shows more clearly that it is missing for all versions. If we wanted the tests to pass without Wine-Mono that would be wrong but I don't think we want to run the tests in such a configuration. dlls/urlmon/tests/misc.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 2b3df65d5fc..00de143a53c 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1544,6 +1544,7 @@ static void test_user_agent(void) }else if(sizeof(void*) == 8) { p += check_prefix(p, "Win64; "); #ifdef __x86_64__ + todo_wine p += check_prefix(p, "x64; "); #endif } @@ -1556,15 +1557,19 @@ static void test_user_agent(void) } p++; /* skip version number */ p += check_prefix(p, ".0"); + if (*p == ';') + p += check_prefix(p, "; "); } if(i == 11) { - p += check_prefix(p, "; rv:11.0) like Gecko"); + p += check_prefix(p, "rv:11.0) like Gecko"); + }else if (i >= 9) { + p += check_prefix(p, ")"); }else { - if(i != 1) - ok(*p == ';' || *p == ')', "unexpected suffix %s for version %u\n", - wine_dbgstr_a(p), i); - if(i < 9) - p = strchr(p, ')'); +#ifdef __x86_64__ + todo_wine +#endif + p += check_prefix(p, ".NET"); + p = strchr(p, ')'); p += check_prefix(p, ")"); } -- 2.20.1

3 2

Re: TestBot job 89319 results: [PATCH 1/4] msxml3/tests: Add more tests for processing instruction attributes.
by Dmitry Timoshkov 06 May '21

06 May '21

Marvin <testbot(a)winehq.org> wrote: > VM Status Failures Command > build success > w2008s64 success 0 msxml3_test.exe domdoc > w7u_2qxl success 0 msxml3_test.exe domdoc > w7u_adm success 0 msxml3_test.exe domdoc > w7u_el success 0 msxml3_test.exe domdoc > w8 success 0 msxml3_test.exe domdoc > w8adm success 0 msxml3_test.exe domdoc > w864 success 0 msxml3_test.exe domdoc > w1064v1507 success 0 msxml3_test.exe domdoc > w1064v1809 success 0 msxml3_test.exe domdoc > w1064 success 0 msxml3_test.exe domdoc > w10pro64 success 0 msxml3_test.exe domdoc > wvistau64 failed 1 msxml3_test64.exe domdoc > w2008s64 failed 1 msxml3_test64.exe domdoc > w864 failed 1 msxml3_test64.exe domdoc > w1064v1507 failed 1 msxml3_test64.exe domdoc > w1064v1809 failed 1 msxml3_test64.exe domdoc > w1064 failed 1 msxml3_test64.exe domdoc > w1064_2qxl failed 1 msxml3_test64.exe domdoc > w10pro64 failed 1 msxml3_test64.exe domdoc > w10pro64_ar failed 1 msxml3_test64.exe domdoc > w10pro64_he failed 1 msxml3_test64.exe domdoc > w10pro64_ja failed 1 msxml3_test64.exe domdoc > w10pro64_zh_CN failed 1 msxml3_test64.exe domdoc > debiant2 success 0 > debiant2 failed 1 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=89319 Same patch sent separately runs without failures: https://testbot.winehq.org/JobDetails.pl?Key=89342 -- Dmitry.

5 9

[PATCH 3/5] wined3d: Reject blits between depth/stencil and colour resources in the raw blitter.
by Henri Verbeet 06 May '21

06 May '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 7 ++++--- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/texture.c | 11 +++++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index def80870fd5..6c381f62840 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -16217,8 +16217,9 @@ static void test_format_compatibility(void) colour = get_readback_color(&rb, x, y); expected = test_data[i].success && x >= texel_dwords && y ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].dst_ds && colour) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); @@ -16231,7 +16232,7 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - todo_wine_if(test_data[i].src_ds) + todo_wine_if(test_data[i].dst_ds || test_data[i].src_format == DXGI_FORMAT_R16_TYPELESS) ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", i, colour, x, y, expected); } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c1834540484..36c3995e7ad 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28306,7 +28306,7 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - todo_wine_if(test_data[i].src_ds || test_data[i].dst_ds) + todo_wine_if(!test_data[i].dst_ds && test_data[i].src_format == DXGI_FORMAT_R16_TYPELESS) ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", i, colour, x, y, expected); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5c85b2c91bb..f3a48faf5ca 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6082,12 +6082,19 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit unsigned int src_level, src_layer, dst_level, dst_layer; struct wined3d_blitter *next; GLuint src_name, dst_name; + bool src_ds, dst_ds; DWORD location; + src_ds = src_texture->resource.format->depth_size || src_texture->resource.format->stencil_size; + dst_ds = dst_texture->resource.format->depth_size || dst_texture->resource.format->stencil_size; + /* If we would need to copy from a renderbuffer or drawable, we'd probably * be better off using the FBO blitter directly, since we'd need to use it - * to copy the resource contents to the texture anyway. */ - if (op != WINED3D_BLIT_OP_RAW_BLIT + * to copy the resource contents to the texture anyway. + * + * We also can't copy between depth/stencil and colour resources, since + * the formats are considered incompatible in OpenGL. */ + if (op != WINED3D_BLIT_OP_RAW_BLIT || (src_ds != dst_ds) || (src_texture->resource.format->id == dst_texture->resource.format->id && (!(src_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) || !(dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB))))) -- 2.20.1

2 1