wine-devel July 2021

wine-devel@winehq.org

86 participants
642 discussions

[tools] winetest: Detect and report tests blocked by anti-virus tools.
by Francois Gouget 05 Jul '21

05 Jul '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This happened to httpapi:httpapi: https://test.winehq.org/data/patterns.html#httpapi:httpapi WineTest also sometimes fails to run this test (error -2) but does not report the GetLastError(). I suspect these are cases where the test executable was quarantined by the anti-virus. It used to be possible to disable Microsoft Defender through the registry but then that stopped working and WineTest.exe started getting blocked by the anti-virus. Since disabling Microsoft Defender is no longer possible I told it to ignore the directory where WineTest.exe is downloaded and that helped. But WineTest.exe does not extract the tests in that directory which lead to the current round of issues. So I will have to update some configuration snapshots and/or the TestBot. Again :-( --- winetest/build-patterns | 1 + winetest/dissect | 5 +++++ winetest/gather | 10 ++++++++-- winetest/report.css | 3 +++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 0b33512a7..d530ad2f8 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -929,6 +929,7 @@ my %status2html = ( "missingsxs" => ["v", "v", "missing side-by-side dll version", "version", ""], "stub" => ["u", "u", "stub Windows dll", "version", ""], "native" => ["N", "N", "native Windows dll", "version", ""], + "loaderror225" => ["V", "V", "blocked by the anti-virus", "version", ""], "loaderror258" => ["I", "I", "timed out while getting the test list", "version", ""], # Other status values "skipped" => ["-", "s", "skipped by user request", "", ""], diff --git a/winetest/dissect b/winetest/dissect index 3f89e1064..55d0a7299 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -937,6 +937,11 @@ foreach my $dll (sort keys %dllinfo) $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">timed out getting the test list</td></tr>\n", escapeHTML($dll); } + elsif ($dllinfo{$dll}->{version} eq "load error 225") + { + $box->{data} .= sprintf "<td>%s</td><td class=\"failed\">test blocked by the anti-virus</td></tr>\n", + escapeHTML($dll); + } elsif ($dllinfo{$dll}->{version} =~ /^load error (\d+)$/) { # Flag unknown errors diff --git a/winetest/gather b/winetest/gather index e6d5a9a30..5aabe4e48 100755 --- a/winetest/gather +++ b/winetest/gather @@ -663,8 +663,10 @@ sub get_result_title($$) if ($result->{status} =~ /^loaderror(.*)$/) { my $code = $1; - return "Not run because getting the test list ". - ($code eq "258" ? "timed out" : "failed with error $code"); + return $code eq "225" ? + "Not run because the test was blocked by the anti-virus" : + ("Not run because getting the test list ". + ($code eq "258" ? "timed out" : "failed with error $code")); } if ($result->{status} eq "native") { return "Not run because $dll is a native Windows dll (not allowed for Wine tests)"; } if ($result->{status} eq "stub") { return "Not run because $dll is a stub Windows dll"; } @@ -716,6 +718,10 @@ sub singletest($$$) { !$result->{errors}->[1] ? $result->{todos}->[1] : "$result->{errors}->[1]+$result->{todos}->[1]"; } + elsif ($status eq "loaderror225") + { + $msg = "virus"; + } elsif ($status =~ /^loaderror/) { $msg = "no list"; diff --git a/winetest/report.css b/winetest/report.css index bd8b73fec..4594c5d49 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -116,6 +116,9 @@ div.pattern :hover { color: black; text-decoration: underline; } .patL { /* error while getting the test list */ background-color: #80aaff; } +.patV { /* test blocked by the anti-virus */ + background-color: #99e6ff; +} .commitR { color: #cc0000; -- 2.20.1

1 0

[PATCH] ntdll/tests: Improve the RtlWaitOnAddress() timeout checks.
by Francois Gouget 05 Jul '21

05 Jul '21

GetTickCount()'s granularity represents 15% of the time we want to mesure, making it hard to not get failures. So use NtQuerySystemTime() instead since we already depend on it. Narrow down the acceptable range again. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- We still got a couple of failures after the acceptable elapsed time range was widened in an attempt to account for GetTickCount()'s granularity: https://test.winehq.org/data/patterns.html#ntdll:om om.c:2322: Test failed: got 78 om.c:2307: Test failed: got 62 With this patch I did not get any failures in thousands of runs but it was already really hard to reproduce (<1%) so it's not a 100% guarantee that it will work now. --- dlls/ntdll/tests/om.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 82f8188d176..81be7de00f6 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2266,10 +2266,10 @@ static void test_semaphore(void) static void test_wait_on_address(void) { - DWORD ticks; SIZE_T size; NTSTATUS status; - LARGE_INTEGER timeout; + LARGE_INTEGER start, end, timeout; + DWORD elapsed; LONG64 address, compare; if (!pRtlWaitOnAddress) @@ -2298,13 +2298,13 @@ static void test_wait_on_address(void) /* values match */ address = 0; compare = 0; - pNtQuerySystemTime(&timeout); - timeout.QuadPart += 100*10000; - ticks = GetTickCount(); + pNtQuerySystemTime(&start); + timeout.QuadPart = start.QuadPart + 100 * 10000; status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); - ticks = GetTickCount() - ticks; + pNtQuerySystemTime(&end); ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); + elapsed = (end.QuadPart - start.QuadPart) / 10000; + ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); @@ -2314,12 +2314,13 @@ static void test_wait_on_address(void) compare = ~0; compare <<= size * 8; + pNtQuerySystemTime(&start); timeout.QuadPart = -100 * 10000; - ticks = GetTickCount(); status = pRtlWaitOnAddress(&address, &compare, size, &timeout); - ticks = GetTickCount() - ticks; + pNtQuerySystemTime(&end); ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); + elapsed = (end.QuadPart - start.QuadPart) / 10000; + ok(90 <= elapsed && elapsed <= 900, "timed out in %u ms\n", elapsed); status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); ok(!status, "got 0x%08x\n", status); -- 2.20.1

1 0

[PATCH] ntdll/tests: TZinfo sometimes does not get a MUI string.
by Francois Gouget 05 Jul '21

05 Jul '21

RtlQuery*TimeZoneInformation() should return a MUI string but there are rare cases where it does not in Windows 10 2004. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Specifically this is the case for w10pro64. But the same Windows version with just the language packs installed behaves as expected. Yet the ntdll version did not change so it should not be that RtlQuery*TimeZoneInformation() behaves differently. --- dlls/ntdll/tests/time.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 90737521a4d..ee683e9a0aa 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -234,10 +234,12 @@ static void test_RtlQueryTimeZoneInformation(void) status = pRtlQueryDynamicTimeZoneInformation(&tzinfo); ok(status == STATUS_SUCCESS, "RtlQueryDynamicTimeZoneInformation failed, got %08x\n", status); - ok(tzinfo.StandardName[0] == '@', + ok(tzinfo.StandardName[0] == '@' || + broken(tzinfo.StandardName[0]), /* some win10 2004 */ "standard time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.StandardName)); - ok(tzinfo.DaylightName[0] == '@', + ok(tzinfo.DaylightName[0] == '@' || + broken(tzinfo.DaylightName[0]), /* some win10 2004 */ "daylight time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.DaylightName)); @@ -251,10 +253,12 @@ static void test_RtlQueryTimeZoneInformation(void) status = pRtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); ok(status == STATUS_SUCCESS, "RtlQueryTimeZoneInformation failed, got %08x\n", status); - ok(tzinfo.StandardName[0] == '@', + ok(tzinfo.StandardName[0] == '@' || + broken(tzinfo.StandardName[0]), /* some win10 2004 */ "standard time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.StandardName)); - ok(tzinfo.DaylightName[0] == '@', + ok(tzinfo.DaylightName[0] == '@' || + broken(tzinfo.DaylightName[0]), /* some win10 2004 */ "daylight time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.DaylightName)); @@ -262,10 +266,12 @@ static void test_RtlQueryTimeZoneInformation(void) status = pRtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); ok(status == STATUS_SUCCESS, "RtlQueryTimeZoneInformation failed, got %08x\n", status); - ok(tzinfo.StandardName[0] == '@', + ok(tzinfo.StandardName[0] == '@' || + broken(tzinfo.StandardName[0]), /* some win10 2004 */ "standard time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.StandardName)); - ok(tzinfo.DaylightName[0] == '@', + ok(tzinfo.DaylightName[0] == '@' || + broken(tzinfo.DaylightName[0]), /* some win10 2004 */ "daylight time zone name isn't an indirect string, got %s\n", wine_dbgstr_w(tzinfo.DaylightName)); -- 2.20.1

1 0

[PATCH 1/5] d3d11: Only complain once about d3d10 interface emulation in d3d11_device_context_SwapDeviceContextState().
by Henri Verbeet 05 Jul '21

05 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d043af7051a..f8bd8578cdc 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2980,6 +2980,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_SwapDeviceContextState(ID3D11 struct d3d_device_context_state *state_impl, *prev_impl; struct d3d_device *device = context->device; struct wined3d_state *wined3d_state; + static unsigned int once; TRACE("iface %p, state %p, prev %p.\n", iface, state, prev); @@ -3010,7 +3011,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_SwapDeviceContextState(ID3D11 device->state = state_impl; d3d_device_context_state_private_release(prev_impl); - if (d3d_device_is_d3d10_active(device)) + if (d3d_device_is_d3d10_active(device) && !once++) FIXME("D3D10 interface emulation not fully implemented yet!\n"); wined3d_mutex_unlock(); } -- 2.20.1

2 1

[PATCH 5/5] wined3d: Use wined3d_mask_from_size() in wined3d_render_pass_vk_init().
by Henri Verbeet 05 Jul '21

05 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index f91261ebbbe..cbff3968179 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1154,7 +1154,7 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, rt_count = 0; attachment_count = 0; - mask = key->rt_mask & ((1u << WINED3D_MAX_RENDER_TARGETS) - 1); + mask = key->rt_mask & wined3d_mask_from_size(WINED3D_MAX_RENDER_TARGETS); while (mask) { i = wined3d_bit_scan(&mask); @@ -1181,7 +1181,7 @@ static bool wined3d_render_pass_vk_init(struct wined3d_render_pass_vk *pass, rt_count = i + 1; } - mask = ~key->rt_mask & ((1u << rt_count) - 1); + mask = ~key->rt_mask & wined3d_mask_from_size(rt_count); while (mask) { i = wined3d_bit_scan(&mask); -- 2.20.1

1 0

[PATCH 4/5] wined3d: Use wined3d_mask_from_size() in wined3d_context_vk_apply_draw_state().
by Henri Verbeet 05 Jul '21

05 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 87fcb868197..f91261ebbbe 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3231,7 +3231,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STENCIL_REF) && dsv) { VK_CALL(vkCmdSetStencilReference(vk_command_buffer, VK_STENCIL_FACE_FRONT_AND_BACK, - state->stencil_ref & ((1 << dsv->format->stencil_size) - 1))); + state->stencil_ref & wined3d_mask_from_size(dsv->format->stencil_size))); } if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STREAMSRC)) -- 2.20.1

1 0

[PATCH 3/5] wined3d: Use wined3d_mask_from_size() in state_stencil().
by Henri Verbeet 05 Jul '21

05 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 264a9974b40..a9183278d86 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1072,7 +1072,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ if (!(func_back = wined3d_gl_compare_func(d->desc.back.func))) func_back = GL_ALWAYS; mask = d->desc.stencil_read_mask; - ref = state->stencil_ref & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); + ref = state->stencil_ref & wined3d_mask_from_size(state->fb.depth_stencil->format->stencil_size); stencilFail = gl_stencil_op(d->desc.front.fail_op); depthFail = gl_stencil_op(d->desc.front.depth_fail_op); stencilPass = gl_stencil_op(d->desc.front.pass_op); -- 2.20.1

1 0

[PATCH 2/5] d2d1: Do not clear the device context state in d2d_device_context_draw().
by Henri Verbeet 05 Jul '21

05 Jul '21

Clearing the state should no longer be needed now that we use SwapDeviceContextState() and have our own dedicated state object. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 3b444321c87..44840f0010f 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -139,7 +139,6 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D11Device1_GetImmediateContext1(device, &context); ID3D11DeviceContext1_SwapDeviceContextState(context, render_target->d3d_state, &prev_state); - ID3D11DeviceContext1_ClearState(context); ID3D11DeviceContext1_IASetInputLayout(context, shape_resources->il); ID3D11DeviceContext1_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); -- 2.20.1

1 0

[PATCH 8/8] gdi32: Move CreateDiscardableBitmap implementation to objects.c.
by Jacek Caban 05 Jul '21

05 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 18 ------------------ dlls/gdi32/objects.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 18 deletions(-)

2 1

[PATCH 7/8] gdi32: Use ntgdi names for bitmap functions.
by Jacek Caban 05 Jul '21

05 Jul '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 18 +++++++++--------- dlls/gdi32/gdi32.spec | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-)

2 1

← Newer
1
...
49
50
51
52
53
54
55
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel July 2021