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

[PATCH 1/6] wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_viewports().
by Zebediah Figura 16 Mar '21

16 Mar '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 886a76284ff..d7a413057c9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1147,18 +1147,18 @@ static void wined3d_cs_exec_set_viewports(struct wined3d_cs *cs, const void *dat device_invalidate_state(cs->c.device, STATE_VIEWPORT); } -void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_count, +void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports) { struct wined3d_cs_set_viewports *op; - op = wined3d_device_context_require_space(&cs->c, FIELD_OFFSET(struct wined3d_cs_set_viewports, viewports[viewport_count]), - WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, + FIELD_OFFSET(struct wined3d_cs_set_viewports,viewports[viewport_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_VIEWPORTS; memcpy(op->viewports, viewports, viewport_count * sizeof(*viewports)); op->viewport_count = viewport_count; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_scissor_rects(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ca179c753ab..62a3e990cf1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1698,7 +1698,7 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned memset(state->viewports, 0, sizeof(state->viewports)); state->viewport_count = viewport_count; - wined3d_cs_emit_set_viewports(device->cs, viewport_count, viewports); + wined3d_device_context_emit_set_viewports(&device->cs->c, viewport_count, viewports); } void CDECL wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, @@ -1983,7 +1983,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_cs_emit_set_material(device->cs, &state->material); - wined3d_cs_emit_set_viewports(device->cs, state->viewport_count, state->viewports); + wined3d_device_context_emit_set_viewports(context, state->viewport_count, state->viewports); wined3d_cs_emit_set_scissor_rects(device->cs, state->scissor_rect_count, state->scissor_rects); for (i = 0; i < LIGHTMAP_SIZE; ++i) @@ -5191,7 +5191,7 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device state->viewports[0].min_z = 0.0f; state->viewports[0].max_z = 1.0f; state->viewport_count = 1; - wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); + wined3d_device_context_emit_set_viewports(&device->cs->c, 1, state->viewports); SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); state->scissor_rect_count = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a8947f444cd..524b6ae7ce3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4793,7 +4793,6 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined unsigned int initial_count) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_count, const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN; void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, @@ -4827,6 +4826,8 @@ void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_cont struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, + const struct wined3d_viewport *viewports) DECLSPEC_HIDDEN; static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) { -- 2.20.1

2 11

[PATCH 5/5] d3d11: Replace the FIXME in d3d11_immediate_context_SwapDeviceContextState() with a TRACE.
by Henri Verbeet 16 Mar '21

16 Mar '21

This is implemented. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c938e0df883..e053cf1c0a5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2844,7 +2844,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SwapDeviceContextState(ID3 struct d3d_device_context_state *state_impl, *prev_impl; struct wined3d_state *wined3d_state; - FIXME("iface %p, state %p, prev %p semi-stub!\n", iface, state, prev); + TRACE("iface %p, state %p, prev %p.\n", iface, state, prev); if (!state) { -- 2.20.1

1 0

[PATCH 4/5] d3d11: Use the supplied feature levels in d3d11_device_CreateDeviceContextState().
by Henri Verbeet 16 Mar '21

16 Mar '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 76 +++++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 26 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8453419cf52..c938e0df883 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4073,39 +4073,62 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeviceContextState(ID3D11Dev { struct d3d_device *device = impl_from_ID3D11Device2(iface); struct d3d_device_context_state *state_impl; + struct wined3d_state *wined3d_state; D3D_FEATURE_LEVEL feature_level; HRESULT hr = E_INVALIDARG; - FIXME("iface %p, flags %#x, feature_levels %p, feature_level_count %u, sdk_version %u, " - "emulated_interface %s, chosen_feature_level %p, state %p semi-stub!\n", - iface, flags, feature_levels, feature_level_count, sdk_version, - debugstr_guid(emulated_interface), chosen_feature_level, state); + TRACE("iface %p, flags %#x, feature_levels %p, feature_level_count %u, " + "sdk_version %u, emulated_interface %s, chosen_feature_level %p, state %p.\n", + iface, flags, feature_levels, feature_level_count, + sdk_version, debugstr_guid(emulated_interface), chosen_feature_level, state); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + wined3d_mutex_lock(); if (!feature_level_count) goto fail; + if (FAILED(hr = wined3d_state_create(device->wined3d_device, + (const enum wined3d_feature_level *)feature_levels, feature_level_count, &wined3d_state))) + goto fail; + feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); + if (chosen_feature_level) - FIXME("Device context state feature level not implemented yet.\n"); + *chosen_feature_level = feature_level; - if (state) + if (!state) { - if (!(state_impl = heap_alloc_zero(sizeof(*state_impl)))) - { - hr = E_OUTOFMEMORY; - goto fail; - } + wined3d_state_destroy(wined3d_state); + wined3d_mutex_unlock(); + return S_FALSE; + } - feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level( - wined3d_device_get_state(device->wined3d_device))); - d3d_device_context_state_init(state_impl, device, feature_level, emulated_interface); - *state = &state_impl->ID3DDeviceContextState_iface; + if (!(state_impl = heap_alloc_zero(sizeof(*state_impl)))) + { + wined3d_state_destroy(wined3d_state); + hr = E_OUTOFMEMORY; + goto fail; + } + + d3d_device_context_state_init(state_impl, device, feature_level, emulated_interface); + if (!d3d_device_context_state_add_entry(state_impl, device, wined3d_state)) + { + wined3d_state_destroy(wined3d_state); + ID3DDeviceContextState_Release(&state_impl->ID3DDeviceContextState_iface); + hr = E_FAIL; + goto fail; } + *state = &state_impl->ID3DDeviceContextState_iface; device->d3d11_only = FALSE; - if (chosen_feature_level) *chosen_feature_level = ID3D11Device2_GetFeatureLevel(iface); - return state ? S_OK : S_FALSE; + wined3d_mutex_unlock(); + + return S_OK; fail: + wined3d_mutex_unlock(); if (chosen_feature_level) *chosen_feature_level = 0; if (state) @@ -6470,10 +6493,9 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par struct wined3d_device *wined3d_device) { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); + struct d3d_device_context_state *state; struct wined3d_state *wined3d_state; D3D_FEATURE_LEVEL feature_level; - ID3DDeviceContextState *state; - HRESULT hr; TRACE("device_parent %p, wined3d_device %p.\n", device_parent, wined3d_device); @@ -6484,19 +6506,21 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par wined3d_state = wined3d_device_get_state(device->wined3d_device); feature_level = d3d_feature_level_from_wined3d(wined3d_state_get_feature_level(wined3d_state)); - if (FAILED(hr = d3d11_device_CreateDeviceContextState(&device->ID3D11Device2_iface, 0, &feature_level, 1, - D3D11_SDK_VERSION, device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1, NULL, &state))) + if (!(state = heap_alloc_zero(sizeof(*state)))) { - ERR("Failed to create the initial device context state, hr %#x.\n", hr); + ERR("Failed to create the initial device context state.\n"); return; } - device->state = impl_from_ID3DDeviceContextState(state); - if (!d3d_device_context_state_add_entry(device->state, device, wined3d_state)) + d3d_device_context_state_init(state, device, feature_level, + device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1); + + device->state = state; + if (!d3d_device_context_state_add_entry(state, device, wined3d_state)) ERR("Failed to add entry for wined3d state %p, device %p.\n", wined3d_state, device); - d3d_device_context_state_private_addref(device->state); - ID3DDeviceContextState_Release(state); + d3d_device_context_state_private_addref(state); + ID3DDeviceContextState_Release(&state->ID3DDeviceContextState_iface); } static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) -- 2.20.1

1 0

[PATCH 2/5] wined3d: Take the layer index into account in wined3d_shader_resource_view_gl_generate_mipmap().
by Henri Verbeet 16 Mar '21

16 Mar '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index fec7e950a64..cd13da02078 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1197,7 +1197,7 @@ static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resou void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resource_view_gl *view_gl, struct wined3d_context_gl *context_gl) { - unsigned int i, j, layer_count, level_count, base_level, max_level; + unsigned int i, j, layer_count, level_count, base_level, base_layer; const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_texture_gl *texture_gl; struct gl_texture *gl_tex; @@ -1209,14 +1209,16 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou layer_count = view_gl->v.desc.u.texture.layer_count; level_count = view_gl->v.desc.u.texture.level_count; base_level = view_gl->v.desc.u.texture.level_idx; - max_level = base_level + level_count - 1; + base_layer = view_gl->v.desc.u.texture.layer_idx; texture_gl = wined3d_texture_gl(texture_from_resource(view_gl->v.resource)); srgb = !!(texture_gl->t.flags & WINED3D_TEXTURE_IS_SRGB); location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; for (i = 0; i < layer_count; ++i) { - wined3d_texture_load_location(&texture_gl->t, i * level_count + base_level, &context_gl->c, location); + if (!wined3d_texture_load_location(&texture_gl->t, + (base_layer + i) * level_count + base_level, &context_gl->c, location)) + ERR("Failed to load source layer %u.\n", base_layer + i); } if (view_gl->gl_view.name) @@ -1227,7 +1229,7 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou { wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, base_level); - gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, max_level); + gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, base_level + level_count - 1); } if (gl_info->supported[ARB_SAMPLER_OBJECTS]) @@ -1245,10 +1247,12 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou for (i = 0; i < layer_count; ++i) { - for (j = base_level + 1; j <= max_level; ++j) + for (j = 1; j < level_count; ++j) { - wined3d_texture_validate_location(&texture_gl->t, i * level_count + j, location); - wined3d_texture_invalidate_location(&texture_gl->t, i * level_count + j, ~location); + wined3d_texture_validate_location(&texture_gl->t, + (base_layer + i) * level_count + base_level + j, location); + wined3d_texture_invalidate_location(&texture_gl->t, + (base_layer + i) * level_count + base_level + j, ~location); } } -- 2.20.1

1 0

[PATCH 1/5] wined3d: Add a missing barrier to wined3d_shader_resource_view_vk_generate_mipmap().
by Henri Verbeet 16 Mar '21

16 Mar '21

Specifically, the one for using the new destination as blit target. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 74a100405aa..fec7e950a64 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1369,14 +1369,20 @@ void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resou } else { + region.srcSubresource.mipLevel = ++vk_src_range.baseMipLevel; + region.dstSubresource.mipLevel = ++vk_dst_range.baseMipLevel; + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + texture_vk->vk_image, &vk_src_range); + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + vk_access_mask_from_bind_flags(texture_vk->t.resource.bind_flags), + VK_ACCESS_TRANSFER_WRITE_BIT, + texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, texture_vk->vk_image, &vk_dst_range); - - region.srcSubresource.mipLevel = ++vk_src_range.baseMipLevel; - region.dstSubresource.mipLevel = ++vk_dst_range.baseMipLevel; } } -- 2.20.1

1 0

[PATCH] webservices: Implement WS_CHANNEL_PROPERTY_NO_DELAY.
by Hans Leidekker 16 Mar '21

16 Mar '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index f2906c86733..fd7c8d6029d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -971,6 +971,7 @@ static HRESULT connect_channel_tcp( struct channel *channel ) { struct sockaddr_storage storage; struct sockaddr *addr = (struct sockaddr *)&storage; + BOOL nodelay = FALSE; int addr_len; WS_URL_SCHEME_TYPE scheme; WCHAR *host; @@ -1002,6 +1003,8 @@ static HRESULT connect_channel_tcp( struct channel *channel ) return HRESULT_FROM_WIN32( WSAGetLastError() ); } + prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_NO_DELAY, &nodelay, sizeof(nodelay) ); + setsockopt( channel->u.tcp.socket, IPPROTO_TCP, TCP_NODELAY, (const char *)&nodelay, sizeof(nodelay) ); return S_OK; } @@ -2410,7 +2413,12 @@ HRESULT channel_accept_tcp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE return E_INVALIDARG; } - hr = sock_accept( socket, wait, cancel, &channel->u.tcp.socket ); + if ((hr = sock_accept( socket, wait, cancel, &channel->u.tcp.socket )) == S_OK) + { + BOOL nodelay = FALSE; + prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_NO_DELAY, &nodelay, sizeof(nodelay) ); + setsockopt( channel->u.tcp.socket, IPPROTO_TCP, TCP_NODELAY, (const char *)&nodelay, sizeof(nodelay) ); + } LeaveCriticalSection( &channel->cs ); return hr; -- 2.30.2

1 0

[tools] winetest: Remove support for CVS revisions.
by Francois Gouget 16 Mar '21

16 Mar '21

Don't expect them in the WineTest reports and don't store them in the per-report summary.txt files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This will allow removing the corresponding placeholders from WineTest and TestLauncher next. --- winetest/dissect | 28 ++++++++++++++-------------- winetest/gather | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index dbbbe6b6d..4f0e95b36 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -239,11 +239,11 @@ open IN, "<:raw", $report or mydie "could not open '$report' for reading: $!"; # summary.txt file format: # Version <version> -# - <dll> - missing - - - - - -# - <dll> - skipped - - - - - -# - <dll> <unit> skipped - - - <source> <rev> -# - <dll> <unit> failed (258|crash) - - <source> <rev> -# - <dll> <unit> <total> <todo> <failures> <skipped> <source> <rev> +# - <dll> - missing - - - - +# - <dll> - skipped - - - - +# - <dll> <unit> skipped - - - <source> +# - <dll> <unit> failed (258|crash) - - <source> +# - <dll> <unit> <total> <todo> <failures> <skipped> <source> open SUM, ">$tmpdir/summary.txt" or mydie "could not open '$tmpdir/summary.txt' for writing: $!"; my $line = <IN> || ""; @@ -431,11 +431,11 @@ while ($line = <IN> || "") # For compatibility with old WineTest versions $info =~ /^(?:failed|unknown|version not available)$/) { - print SUM "- $dll - missing - - - - -\n"; + print SUM "- $dll - missing - - - -\n"; } elsif ($info eq "skipped") { - print SUM "- $dll - skipped - - - - -\n"; + print SUM "- $dll - skipped - - - -\n"; mydie "too many dlls skipped by user request (>$maxuserskips at $dll)" if ++$skipped_units > $maxuserskips; } } @@ -445,7 +445,7 @@ while ($line = <IN> || "") # Parse the tests output # -my ($dll, $unit, $units_re, $source, $rev, $result) = ("", "", "", ""); +my ($dll, $unit, $units_re, $source, $result) = ("", "", "", ""); my $unitsize = 0; my %units; my ($failures, $todo, $skipped) = (0, 0, 0); @@ -570,7 +570,7 @@ sub close_test_unit($) $failures += $extra_failures; $summary = "$s_total $todo $failures $skipped" if (!defined $summary); - print SUM "- $dll $unit $summary $source $rev\n"; + print SUM "- $dll $unit $summary $source\n"; if ($failures && ++$failed_units > $maxfailedtests) { mydie "too many failed test units (>$maxfailedtests at $dll:$unit)"; } @@ -591,14 +591,14 @@ while ($line = <IN>) { next if ($line =~ /^\s*$/); # empty lines have no impact chomp $line; $line =~ s/\r+$//; - if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+) (-|[.0-9a-f]+)$%) + if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+)%) { - my ($l_dll, $l_unit, $l_type, $l_source, $l_rev) = ($1, $2, $3, $4, $5); + my ($l_dll, $l_unit, $l_type, $l_source) = ($1, $2, $3, $4); # Close the previous test unit close_test_unit(0) if ($dll ne ""); - ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, $l_source, $l_rev); + ($dll, $unit, $source) = ($l_dll, $l_unit, $l_source); %units = ($unit => 1); $units_re = $unit; @@ -606,7 +606,7 @@ while ($line = <IN>) { if ($l_type eq "skipped") { add_test_line("skipped", "Skipped by user request"); - print SUM "- $dll $unit skipped - - - $source $rev\n"; + print SUM "- $dll $unit skipped - - - $source\n"; mydie "too many test units skipped by user request (>$maxuserskips at $dll:$unit)" if ++$skipped_units > $maxuserskips; $rc = 0; } @@ -771,7 +771,7 @@ while ($line = <IN>) { # Then switch to the new test unit, not for the past lines, but for # those before the next 'start' line. This 'new' test unit may have # inconsistent results too. - ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-"); + ($dll, $unit, $source) = ($l_dll, $l_unit, "-"); %units = ($unit => 1); $units_re = $unit; $broken = 1; diff --git a/winetest/gather b/winetest/gather index 392e8e63f..a0b259b0d 100755 --- a/winetest/gather +++ b/winetest/gather @@ -312,7 +312,7 @@ foreach my $file (glob "$builddir/*/summary.txt") { while (<TEST>) { next if /^Archive: /; my ($dummy, $dll, $unit, $count, $todos, $errors, $skips, - $source, $rev) = split; + $source) = split; my $testname = "$dll:$unit"; if ($count eq "missing") -- 2.20.1

1 0

[tools] testbot/TestLauncher: Don't use an empty test unit name on skip lines.
by Francois Gouget 16 Mar '21

16 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/TestLauncher.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 7b58c9ad1..b92d09bf2 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -87,7 +87,11 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) if (Reason) { Skips++; - printf("%s.c:0: Tests skipped: %s (details below)\n", Subtest, Reason); + /* An empty test unit name is allowed on the start, summary and done + * lines, but not on individual failure / skip lines. + */ + printf("%s.c:0: Tests skipped: %s (details below)\n", + (*Subtest ? Subtest : "testlauncher"), Reason); printf("| %s\n", Buffer); EnumChildWindows(TopWnd, DumpCriticalErrorDescription, (LPARAM)TopWnd); /* Leave the dialog open so it appears on screenshots */ -- 2.20.1

1 0

[tools] testbot/TestLauncher: Show the tool name in error messages.
by Francois Gouget 16 Mar '21

16 Mar '21

Format the error messages so that they are easily recognized as such. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/TestLauncher.c | 58 +++++++++++++++++++------ 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index b92d09bf2..dd34a7626 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -27,6 +27,28 @@ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +/* + * Error handling + */ + +#ifdef __GNUC__ +# define FORMAT(fmt, arg1) __attribute__((format (printf, fmt, arg1) )) +#else +# define FORMAT(fmt, arg1) +#endif +void Error(const char* Format, ...) FORMAT(1,2); + +static const char *Name0; +void Error(const char* Format, ...) +{ + va_list valist; + fprintf(stderr, "%s:error: ", Name0); + va_start(valist, Format); + vfprintf(stderr, Format, valist); + va_end(valist); +} + + /* * Missing dll and entry point detection. */ @@ -116,12 +138,20 @@ int main(int argc, char *argv[]) const char *Suffix; char TestName[MAX_PATH]; int TestArg; - char *CommandLine; + char *CommandLine, *p; int CommandLen; STARTUPINFOA StartupInfo; PROCESS_INFORMATION ProcessInformation; DWORD ExitCode; + Name0 = p = argv[0]; + while (*p != '\0') + { + if (*p == '/' || *p == '\\') + Name0 = p + 1; + p++; + } + TimeOut = INFINITE; CommandLine = NULL; Arg = 1; @@ -138,8 +168,8 @@ int main(int argc, char *argv[]) TimeOut = (DWORD) strtoul(argv[Arg + 1], &EndPtr, 10) * 1000; if (*EndPtr != '\0') { - fprintf(stderr, "Invalid TimeOut value %s\n", argv[Arg + 1]); - exit(1); + Error("Invalid TimeOut value %s\n", argv[Arg + 1]); + return 1; } } else @@ -150,9 +180,9 @@ int main(int argc, char *argv[]) { if (GetFullPathNameA(argv[Arg], ARRAY_SIZE(TestExeFullName), TestExeFullName, &TestExeFileName) == 0) { - fprintf(stderr, "Can't determine full path of test executable %s, error %lu\n", + Error("Cauld not get the test executable full path %s (error %lu)\n", argv[Arg], GetLastError()); - exit(1); + return 1; } Suffix = strstr(TestExeFileName, "_test.exe"); if (Suffix == NULL) @@ -175,8 +205,8 @@ int main(int argc, char *argv[]) CommandLine = (char *) malloc(CommandLen); if (CommandLine == NULL) { - fprintf(stderr, "Unable to allocate memory for child command line\n"); - exit(1); + Error("Unable to allocate memory for child command line\n"); + return 1; } CommandLine[0] = '"'; @@ -197,7 +227,7 @@ int main(int argc, char *argv[]) if (UsageError) { fprintf(stderr, "Usage: %s [-t TimeOut] TestExecutable.exe [TestParameter...]\n", argv[0]); - exit(1); + return 1; } Start = GetTickCount(); @@ -218,8 +248,8 @@ int main(int argc, char *argv[]) */ if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) { - fprintf(stderr, "CreateProcess failed with error %lu\n", GetLastError()); - exit(1); + Error("CreateProcess failed (error %lu)\n", GetLastError()); + return 1; } CloseHandle(ProcessInformation.hThread); @@ -253,7 +283,7 @@ int main(int argc, char *argv[]) switch (ExitCode) { case WAIT_FAILED: - fprintf(stderr, "Wait for child failed, error %lu\n", GetLastError()); + Error("Wait for child failed (error %lu)\n", GetLastError()); break; case WAIT_TIMEOUT: @@ -261,15 +291,15 @@ int main(int argc, char *argv[]) break; default: - fprintf(stderr, "Unexpected return value %lu from wait for child\n", ExitCode); + Error("Unexpected return value %lu from wait for child\n", ExitCode); break; } if (!TerminateProcess(ProcessInformation.hProcess, 257)) - fprintf(stderr, "TerminateProcess failed, error %lu\n", GetLastError()); + Error("TerminateProcess failed (error %lu)\n", GetLastError()); } else if (!Skips && !GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) { - fprintf(stderr, "Can't get child exit code, error %lu\n", GetLastError()); + Error("Could not get the child exit code (error %lu)\n", GetLastError()); ExitCode = 259; } CloseHandle(ProcessInformation.hProcess); -- 2.20.1

1 0

[tools] testbot/LibvirtTool: Always shut down for '-off' snapshots.
by Francois Gouget 16 Mar '21

16 Mar '21

Snapshots with a name ending in '-off' request that the VM be cleanly shut down if possible rather than summarily powered off. So check the domain's current snapshot and do a clean shutdown before powering off for every operation, including checkoff, monitor and revert. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 118 ++++++++++++++++++++++--------------- 1 file changed, 72 insertions(+), 46 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f135b9b51..c4dbffbaa 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -257,6 +257,66 @@ sub ChangeStatus($$;$) return 0; } +sub ShutDown() +{ + my $Domain = $VM->GetDomain(); + my $CurrentSnapshot = $Domain->GetSnapshotName(); + if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off$/ or + !$Domain->IsPoweredOn()) + { + return 1; + } + + Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey $CurrentSnapshot\n"); + LogMsg "Performing a clean shutdown of $VMKey $CurrentSnapshot\n"; + + # Use SetTime() to detect if privileged operations are allowed. + my $TA = $VM->GetAgent(); + if (!$TA->SetTime()) + { + # Not a fatal error. Try the next port in case the VM runs a privileged + # TestAgentd daemon there. + $TA->Disconnect(); + $TA = $VM->GetAgent(1); + if (!$TA->SetTime()) + { + Error "Unable to get a privileged TestAgent: ". $TA->GetLastError() ."\n"; + $TA->Disconnect(); + return 0; + } + } + + my $Success = 1; + my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? + ["shutdown.exe", "/p", "/d", "00:00"] : + ["/sbin/shutdown", "--poweroff", "now"]; + Debug(Elapsed($Start), " Running @$Cmd\n"); + if (!$TA->Run($Cmd, 0)) + { + Error "Could not run @$Cmd: ". $TA->GetLastError() ."\n"; + $Success = 0; + } + else + { + Debug(Elapsed($Start), " Waiting for the VM to power off\n"); + my $Deadline = time() + $WaitForShutdown; + while ($Domain->IsPoweredOn()) + { + if (time() >= $Deadline) + { + Error "Timed out waiting for $VMKey to perform a clean shutdown. Forcefully shutting down now...\n"; + $Success = 0; + last; + } + sleep(1); + } + } + $TA->Disconnect(); + Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); + LogMsg "Successfully shut down $VMKey\n"; + return $Success; +} + sub Monitor() { # Still try recovering the VM in case of repeated errors, but space out @@ -301,6 +361,9 @@ sub Monitor() my $IsReady = $VM->GetDomain()->IsReady(); if ($IsReady and $VM->GetDomain()->IsPoweredOn()) { + # Try to perform a clean shutdown if requested + ShutDown(); + my $ErrMessage = $VM->GetDomain()->PowerOff(); if (defined $ErrMessage) { @@ -324,55 +387,12 @@ sub Monitor() sub PowerOff() { - my $Domain = $VM->GetDomain(); - if ($VM->IdleSnapshot =~ /-off$/ and $Domain->IsPoweredOn()) - { - # Attempt to perform a clean shutdown. - # Use SetTime() to detect if privileged operations are allowed. - my $TA = $VM->GetAgent(); - if (!$TA->SetTime()) - { - # Not a fatal error. Try the next port in case the VM runs a privileged - # TestAgentd daemon there. - $TA->Disconnect(); - $TA = $VM->GetAgent(1); - if (!$TA->SetTime()) - { - Error "Unable to get a privileged TestAgent: ". $TA->GetLastError() ."\n"; - $TA->Disconnect(); - $TA = undef; - } - } - if ($TA) - { - my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ? - ["shutdown.exe", "/p", "/d", "00:00"] : - ["/sbin/shutdown", "--poweroff", "now"]; - Debug(Elapsed($Start), " Running @$Cmd\n"); - if (!$TA->Run($Cmd, 0)) - { - Error "Could not run @$Cmd: ". $TA->GetLastError() ."\n"; - } - else - { - Debug(Elapsed($Start), " Waiting for the VM to power off\n"); - my $Deadline = time() + $WaitForShutdown; - while ($Domain->IsPoweredOn()) - { - if (time() >= $Deadline) - { - Error "Timed out waiting for ". $VM->Name ." to perform a clean shutdown. Forcefully shutting down now...\n"; - last; - } - sleep(1); - } - } - } - } + # Try to perform a clean shutdown if requested + ShutDown(); # Power off the VM no matter what its initial status is $CurrentStatus = $VM->Status; - my $ErrMessage = $Domain->PowerOff(); + my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); return ChangeStatus(undef, "off", "done"); @@ -407,6 +427,9 @@ sub CheckOff() FatalError("$ErrMessage\n") if (defined $ErrMessage); if ($SnapshotName eq $VM->IdleSnapshot) { + # Try to perform a clean shutdown if requested + ShutDown(); + my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); } @@ -584,6 +607,9 @@ sub Revert() $VM->Save(); } + # Before reverting, try to perform a clean shutdown if requested + ShutDown(); + # Revert the VM (and power it on if necessary) Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot\n"); my ($ErrMessage, $Booting) = $Domain->RevertToSnapshot($DomainSnapshot); -- 2.20.1

1 0