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

[PATCH 3/3] wsdapi/tests: Add tests for UnPublish.
by Owen Rudge April 25, 2018

April 25, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 138 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+)

2 1

[PATCH 2/3] wsdapi: Implement UnPublish.
by Owen Rudge April 25, 2018

April 25, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 14 +++++++-- dlls/wsdapi/soap.c | 72 +++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi_internal.h | 3 ++ 3 files changed, 86 insertions(+), 3 deletions(-)

1 0

gdiplus: how should GdipGraphicsClear work ?
by Rafał Mużyło April 25, 2018

April 25, 2018

This isn't marked as a patch, cause it's most likely incorrect in some way. Yet, it also improves the results in some cases. Namely, it seems that - contrary to the current state - clears with a color with a = 0 shouldn't be no-ops. I'm not sure what color should be used in such case; I'm using opaque black, cause neither transparent black nor transparent white give proper results. Obviously, a proper testcase is required.

1 0

[PATCH 1/3] d3d11: Add support for setting multiple scissor rectangles.
by Nikolay Sivov April 25, 2018

April 25, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 14 +++----- dlls/d3d11/tests/d3d11.c | 73 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a8251aad27..c6a7218fb7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -991,14 +991,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11De TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); - if (rect_count > 1) - FIXME("Multiple scissor rects not implemented.\n"); - - if (!rect_count) + if (rect_count > WINED3D_MAX_VIEWPORTS) return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, rect_count, rects); wined3d_mutex_unlock(); } @@ -4185,14 +4182,11 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetScissorRects(ID3D10Device1 *ifac TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); - if (rect_count > 1) - FIXME("Multiple scissor rects not implemented.\n"); - - if (!rect_count) + if (rect_count > WINED3D_MAX_VIEWPORTS) return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, rect_count, rects); wined3d_mutex_unlock(); } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 82790932b1..2f4ce25638 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10566,7 +10566,6 @@ static void test_clear_state(void) ID3D11DeviceContext_RSGetScissorRects(context, &count, tmp_rect); for (i = 0; i < D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { - todo_wine_if(!i) ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i); @@ -26188,10 +26187,14 @@ static void test_multiple_viewports(void) }; static const struct vec4 expected_values[] = { - {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, {0.0f, 4.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + {0.5f, 0.5f}, {0.0f, 6.0f}, {0.5f, 0.5f}, {1.0f, 6.0f}, {0.5f, 0.5f}, }; static const float clear_color[] = {0.5f, 0.5f, 0.0f, 0.0f}; + ID3D11RasterizerState *rasterizer_state; + D3D11_RASTERIZER_DESC rasterizer_desc; unsigned int count, i; + D3D11_RECT rects[2]; RECT rect; int width; @@ -26280,6 +26283,72 @@ static void test_multiple_viewports(void) draw_quad(&test_context); check_texture_sub_resource_vec4(texture, 0, NULL, &expected_values[4], 1); + /* Two viewports, only first scissor rectangle set. */ + memset(&rasterizer_desc, 0, sizeof(rasterizer_desc)); + rasterizer_desc.FillMode = D3D11_FILL_SOLID; + rasterizer_desc.CullMode = D3D11_CULL_BACK; + rasterizer_desc.DepthClipEnable = TRUE; + rasterizer_desc.ScissorEnable = TRUE; + hr = ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rasterizer_state); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_RSSetState(context, rasterizer_state); + ID3D11RasterizerState_Release(rasterizer_state); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetViewports(context, 2, vp); + + rects[0].left = 0; + rects[0].top = 0; + rects[0].right = width; + rects[0].bottom = texture_desc.Height / 2; + memset(&rects[1], 0, sizeof(*rects)); + ID3D11DeviceContext_RSSetScissorRects(context, 1, rects); + constant.draw_id = 4; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[5], 1); + SetRect(&rect, 0, texture_desc.Height / 2, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[6], 1); + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[7], 1); + + /* Set scissor count to zero. */ + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetScissorRects(context, 0, rects); + constant.draw_id = 5; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + SetRect(&rect, 0, 0, texture_desc.Width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[8], 1); + + /* Set both rectangles. */ + rects[0].left = 0; + rects[0].top = 0; + rects[0].right = width; + rects[0].bottom = texture_desc.Height / 2; + rects[1].left = width; + rects[1].top = 0; + rects[1].right = width * 2; + rects[1].bottom = texture_desc.Height / 2; + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetScissorRects(context, 2, rects); + constant.draw_id = 6; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[9], 1); + SetRect(&rect, 0, texture_desc.Height / 2, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[10], 1); + + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[11], 1); + SetRect(&rect, width, texture_desc.Height / 2, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[12], 1); + /* Viewport count exceeding maximum value. */ ID3D11DeviceContext_RSSetViewports(context, 1, vp); -- 2.17.0

2 3

[PATCH 1/7] wined3d: Scan output signatures for pass-through geometry shaders.
by Józef Kucia April 25, 2018

April 25, 2018

For shader_glsl_generate_sm4_output_setup(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/shader.c | 65 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b757d930da88..68d99543a3d0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -992,6 +992,40 @@ static void wined3d_insert_interpolation_mode(DWORD *packed_interpolation_mode, register_idx * WINED3D_PACKED_INTERPOLATION_BIT_COUNT, WINED3D_PACKED_INTERPOLATION_BIT_COUNT, mode); } +static HRESULT shader_scan_output_signature(struct wined3d_shader *shader) +{ + const struct wined3d_shader_signature *output_signature = &shader->output_signature; + struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + unsigned int i; + HRESULT hr; + + for (i = 0; i < output_signature->element_count; ++i) + { + const struct wined3d_shader_signature_element *e = &output_signature->elements[i]; + unsigned int mask; + + reg_maps->output_registers |= 1u << e->register_idx; + if (e->sysval_semantic == WINED3D_SV_CLIP_DISTANCE) + { + if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) + return hr; + reg_maps->clip_distance_mask |= mask; + } + else if (e->sysval_semantic == WINED3D_SV_CULL_DISTANCE) + { + if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) + return hr; + reg_maps->cull_distance_mask |= mask; + } + else if (e->sysval_semantic == WINED3D_SV_VIEWPORT_ARRAY_INDEX) + { + reg_maps->viewport_array = 1; + } + } + + return WINED3D_OK; +} + /* Note that this does not count the loop register as an address register. */ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const struct wined3d_shader_frontend *fe, struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature *input_signature, @@ -1789,29 +1823,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st if (output_signature->elements) { - for (i = 0; i < output_signature->element_count; ++i) - { - const struct wined3d_shader_signature_element *e = &output_signature->elements[i]; - unsigned int mask; - - reg_maps->output_registers |= 1u << e->register_idx; - if (e->sysval_semantic == WINED3D_SV_CLIP_DISTANCE) - { - if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) - return hr; - reg_maps->clip_distance_mask |= mask; - } - else if (e->sysval_semantic == WINED3D_SV_CULL_DISTANCE) - { - if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) - return hr; - reg_maps->cull_distance_mask |= mask; - } - else if (e->sysval_semantic == WINED3D_SV_VIEWPORT_ARRAY_INDEX) - { - reg_maps->viewport_array = 1; - } - } + if (FAILED(hr = shader_scan_output_signature(shader))) + return hr; } else if (reg_maps->output_registers) { @@ -3701,6 +3714,12 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device shader->reg_maps.shader_version.major = 4; shader->reg_maps.shader_version.minor = 0; shader_set_limits(shader); + + if (FAILED(hr = shader_scan_output_signature(shader))) + { + shader_cleanup(shader); + return hr; + } } shader->load_local_constsF = shader->lconst_inf_or_nan; -- 2.16.1

3 14

[PATCH vkd3d 1/3] include: Remove stdbool.h include from vkd3d_utils.h.
by Józef Kucia April 25, 2018

April 25, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- demos/demo_xcb.h | 1 + include/vkd3d_utils.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 38715565267e..40e25340b3f1 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -26,6 +26,7 @@ #include <limits.h> #include <unistd.h> #include <fcntl.h> +#include <stdbool.h> struct demo { diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 676d3330ed5e..49987d0343b0 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -19,8 +19,6 @@ #ifndef __VKD3D_UTILS_H #define __VKD3D_UTILS_H -#include <stdbool.h> - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -- 2.16.1

2 5

[PATCH] testbot/web: Standardize the packages inheritance.
by Francois Gouget April 25, 2018

April 25, 2018

Use "our" instead of fully prefixing @ISA. Also defining the package inheritance does not depend on the rest of the package so move these statements first, even before all the other imports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 6 ++++-- testbot/web/Feedback.pl | 6 ++++-- testbot/web/ForgotPassword.pl | 6 ++++-- testbot/web/JobDetails.pl | 7 +++++-- testbot/web/Login.pl | 6 ++++-- testbot/web/Logout.pl | 6 ++++-- testbot/web/PatchesList.pl | 6 ++++-- testbot/web/Register.pl | 6 ++++-- testbot/web/ResetPassword.pl | 6 ++++-- testbot/web/Stats.pl | 4 +++- testbot/web/Submit.pl | 6 ++++-- testbot/web/admin/BranchDetails.pl | 5 +++-- testbot/web/admin/BranchesList.pl | 4 +++- testbot/web/admin/Log.pl | 5 +++-- testbot/web/admin/UserDetails.pl | 4 +++- testbot/web/admin/UsersList.pl | 3 ++- testbot/web/admin/VMDetails.pl | 4 +++- testbot/web/admin/VMsList.pl | 4 +++- 18 files changed, 64 insertions(+), 30 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 08e0291ae..8b1fd6dc5 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -21,17 +21,18 @@ use strict; package ActivityPage; +use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + use POSIX qw(strftime); use URI::Escape; -use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::Log; use WineTestBot::Utils; use WineTestBot::VMs; -(a)ActivityPage::ISA = qw(ObjectModel::CGI::FreeFormPage); my $HOURS_DEFAULT = 12; @@ -297,6 +298,7 @@ sub GenerateFooter($) print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; } + package main; my $Request = shift; diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 2480243d4..2adc4cd40 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -21,11 +21,12 @@ use strict; package FeedbackPage; -use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; -(a)FeedbackPage::ISA = qw(ObjectModel::CGI::FreeFormPage); sub _initialize($$$) { @@ -125,6 +126,7 @@ sub GenerateBody($) $self->SUPER::GenerateBody(); } + package main; my $Request = shift; diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index 3c94c27e8..af79b65c7 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -21,13 +21,14 @@ use strict; package ForgotPasswordPage; -use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::CGI::Sessions; -(a)ForgotPasswordPage::ISA = qw(ObjectModel::CGI::FreeFormPage); sub _initialize($$$) { @@ -131,6 +132,7 @@ sub GenerateBody($) $self->SUPER::GenerateBody(); } + package main; my $Request = shift; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 70fb0fe98..0213eb5e2 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -21,14 +21,16 @@ use strict; package JobDetailsPage; -use URI::Escape; use ObjectModel::CGI::CollectionPage; +our @ISA = qw(ObjectModel::CGI::CollectionPage); + +use URI::Escape; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; -(a)JobDetailsPage::ISA = qw(ObjectModel::CGI::CollectionPage); sub _initialize($$$) { @@ -485,6 +487,7 @@ sub GenerateDataCell($$$$$) } } + package main; my $Request = shift; diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index b5b63651e..14cf4bda8 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -21,14 +21,15 @@ use strict; package LoginPage; -use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::CGI::Sessions; -(a)LoginPage::ISA = qw(ObjectModel::CGI::FreeFormPage); sub _initialize($$$) { @@ -153,6 +154,7 @@ sub OnAction($$) return $self->SUPER::OnAction($Action); } + package main; my $Request = shift; diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index 417232d08..17e81d2b8 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -22,10 +22,11 @@ use strict; package LogoutPage; use ObjectModel::CGI::Page; -use WineTestBot::CGI::Sessions; +our @ISA = qw(ObjectModel::CGI::Page); + use CGI qw(:standard); +use WineTestBot::CGI::Sessions; -(a)LogoutPage::ISA = qw(ObjectModel::CGI::Page); sub _initialize($$$) { @@ -72,6 +73,7 @@ sub GeneratePage($) $self->SUPER::GeneratePage(); } + package main; my $Request = shift; diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index f0571b126..6728a285f 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -21,11 +21,12 @@ use strict; package PatchesListPage; -use URI::Escape; use ObjectModel::CGI::CollectionPage; +our @ISA = qw(ObjectModel::CGI::CollectionPage); + +use URI::Escape; use WineTestBot::Patches; -(a)PatchesListPage::ISA = qw(ObjectModel::CGI::CollectionPage); sub _initialize($$$) { @@ -91,6 +92,7 @@ sub GenerateDataCell($$$$$) } } + package main; my $Request = shift; diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 4cbc8c953..207728e75 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -21,15 +21,16 @@ use strict; package RegisterPage; +use ObjectModel::CGI::ItemPage; +our @ISA = qw(ObjectModel::CGI::ItemPage); + use URI::Escape; use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::CGI::ItemPage; use WineTestBot::Config; use WineTestBot::Users; use WineTestBot::Utils; -(a)RegisterPage::ISA = qw(ObjectModel::CGI::ItemPage); sub _initialize($$$) { @@ -187,6 +188,7 @@ EOF $self->SUPER::GenerateBody(); } + package main; my $Request = shift; diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index db129dbf2..1e2b94d03 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -21,13 +21,14 @@ use strict; package ResetPasswordPage; -use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::CGI::Sessions; -(a)ResetPasswordPage::ISA = qw(ObjectModel::CGI::FreeFormPage); sub _initialize($$$) { @@ -183,6 +184,7 @@ sub GenerateBody($) $self->SUPER::GenerateBody(); } + package main; my $Request = shift; diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 90f546397..64f29bdcd 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -22,6 +22,8 @@ use strict; package StatsPage; use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); + use ObjectModel::Collection; use WineTestBot::Config; use WineTestBot::Activity; @@ -29,7 +31,6 @@ use WineTestBot::Log; use WineTestBot::Utils; use WineTestBot::VMs; -(a)StatsPage::ISA = qw(ObjectModel::CGI::Page); sub _initialize($$$) { @@ -336,6 +337,7 @@ sub GenerateBody($) print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; } + package main; my $Request = shift; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 9bf17814f..3b80841cc 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -21,6 +21,9 @@ use strict; package SubmitPage; +use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + use CGI qw(:standard); use Fcntl; # For O_XXX use IO::Handle; @@ -28,7 +31,6 @@ use POSIX qw(:fcntl_h); # For SEEK_XXX use File::Basename; use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::CGI::FreeFormPage; use WineTestBot::Branches; use WineTestBot::Config; use WineTestBot::Jobs; @@ -36,7 +38,6 @@ use WineTestBot::Engine::Notify; use WineTestBot::Utils; use WineTestBot::VMs; -(a)SubmitPage::ISA = qw(ObjectModel::CGI::FreeFormPage); sub _initialize($$$) { @@ -1006,6 +1007,7 @@ sub OnAction($$) return $self->SUPER::OnAction($Action); } + package main; my $Request = shift; diff --git a/testbot/web/admin/BranchDetails.pl b/testbot/web/admin/BranchDetails.pl index 36d946482..fe3ebd118 100644 --- a/testbot/web/admin/BranchDetails.pl +++ b/testbot/web/admin/BranchDetails.pl @@ -22,10 +22,10 @@ use strict; package BranchDetailsPage; use ObjectModel::CGI::ItemPage; -use WineTestBot::Config; +our @ISA = qw(ObjectModel::CGI::ItemPage); + use WineTestBot::Branches; -(a)BranchDetailsPage::ISA = qw(ObjectModel::CGI::ItemPage); sub _initialize($$$) { @@ -34,6 +34,7 @@ sub _initialize($$$) $self->SUPER::_initialize($Request, $RequiredRole, CreateBranches()); } + package main; my $Request = shift; diff --git a/testbot/web/admin/BranchesList.pl b/testbot/web/admin/BranchesList.pl index 716fbd713..7a496cddb 100644 --- a/testbot/web/admin/BranchesList.pl +++ b/testbot/web/admin/BranchesList.pl @@ -22,10 +22,11 @@ use strict; package BranchesListPage; use ObjectModel::CGI::CollectionPage; +our @ISA = qw(ObjectModel::CGI::CollectionPage); + use WineTestBot::Config; use WineTestBot::Branches; -(a)BranchesListPage::ISA = qw(ObjectModel::CGI::CollectionPage); sub _initialize($$$) { @@ -42,6 +43,7 @@ sub SortKeys($$$) return \@SortedKeys; } + package main; my $Request = shift; diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index 3ad35a476..8d6e52654 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -21,12 +21,13 @@ use strict; package LogPage; -use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; use WineTestBot::Log; -(a)LogPage::ISA = qw(ObjectModel::CGI::FreeFormPage); sub _initialize($$$) { diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 28eb4b5ca..2cf0f597f 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -23,11 +23,12 @@ use strict; package UserDetailsPage; use ObjectModel::CGI::ItemPage; +our @ISA = qw(ObjectModel::CGI::ItemPage); + use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Users; -(a)UserDetailsPage::ISA = qw(ObjectModel::CGI::ItemPage); sub _initialize($$$) { @@ -124,6 +125,7 @@ sub OnAction($$) return $self->SUPER::OnAction($Action); } + package main; my $Request = shift; diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index eb6c324c3..f46949d24 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -23,11 +23,12 @@ use strict; package UsersListPage; use ObjectModel::CGI::CollectionPage; +our @ISA = qw(ObjectModel::CGI::CollectionPage); + use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Users; -(a)UsersListPage::ISA = qw(ObjectModel::CGI::CollectionPage); sub _initialize($$$) { diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 11cec4cf1..f883884c7 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -23,9 +23,10 @@ use strict; package VMDetailsPage; use ObjectModel::CGI::ItemPage; +our @ISA = qw(ObjectModel::CGI::ItemPage); + use WineTestBot::VMs; -(a)VMDetailsPage::ISA = qw(ObjectModel::CGI::ItemPage); sub _initialize($$$) { @@ -62,6 +63,7 @@ sub Save($) return ! defined($self->{ErrMessage}); } + package main; my $Request = shift; diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 500442b5b..832c3bd4c 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -22,9 +22,10 @@ use strict; package VMsListPage; use ObjectModel::CGI::CollectionPage; +our @ISA = qw(ObjectModel::CGI::CollectionPage); + use WineTestBot::VMs; -(a)VMsListPage::ISA = qw(ObjectModel::CGI::CollectionPage); sub _initialize($$$) { @@ -65,6 +66,7 @@ sub OnItemAction($$$$) return $self->SUPER::OnItemAction($CollectionBlock, $Item, $Action); } + package main; my $Request = shift; -- 2.17.0

1 0

[PATCH] testbot: Take Step dependencies into account in Job::UpdateStatus().
by Francois Gouget April 25, 2018

April 25, 2018

Job::UpdateStatus() used to assume that Step n would always depend on Step n-1. But now Step n may depend on Step 1 or any other previous step instead. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 29f7860cb..0f80193f6 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -179,21 +179,26 @@ sub UpdateStatus($) my $Status = $self->Status; return $Status if ($Status ne "queued" && $Status ne "running"); - my (%Has, $Skip); - my @SortedSteps = sort { $a->No <=> $b->No } @{$self->Steps->GetItems()}; + my %Has; + my $Steps = $self->Steps; + my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; foreach my $Step (@SortedSteps) { - my $StepStatus = $Step->UpdateStatus($Skip); - $Has{$StepStatus} = 1; - - if ($StepStatus ne "queued" && $StepStatus ne "running" && - $StepStatus ne "completed" && - ($Step->Type eq "build" || $Step->Type eq "reconfig")) + my $Skip; + if ($Step->PreviousNo) { - # The following steps need binaries that this one was supposed to - # produce. So skip them. - $Skip = 1; + my $PrevStatus = $Steps->GetItem($Step->PreviousNo)->Status; + if ($PrevStatus ne "queued" && $PrevStatus ne "running" && + $PrevStatus ne "completed") + { + # The previous step was supposed to provide binaries but it failed + # or was canceled. So skip this one. + $Skip = 1; + } } + + my $StepStatus = $Step->UpdateStatus($Skip); + $Has{$StepStatus} = 1; } # Inherit the steps most significant status. -- 2.17.0

1 0

[PATCH 1/6] msi: Make MsiGetLanguage() RPC-compatible.
by Zebediah Figura April 25, 2018

April 25, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/install.c | 9 +-------- dlls/msi/package.c | 5 ++--- dlls/msi/tests/custom.c | 8 ++++++-- dlls/msi/winemsi.idl | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 63ffbfe..0ec1f24 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1379,18 +1379,11 @@ LANGID WINAPI MsiGetLanguage(MSIHANDLE hInstall) if (!package) { MSIHANDLE remote; - HRESULT hr; - LANGID lang; if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - hr = remote_GetLanguage(remote, &lang); - - if (SUCCEEDED(hr)) - return lang; - - return 0; + return remote_GetLanguage(remote); } langid = msi_get_property_int( package->db, szProductLanguage, 0 ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index b1b2cb4..869da8d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2545,10 +2545,9 @@ UINT __cdecl remote_SetComponentState(MSIHANDLE hinst, LPCWSTR component, INSTAL return MsiSetComponentStateW(hinst, component, state); } -HRESULT __cdecl remote_GetLanguage(MSIHANDLE hinst, LANGID *language) +LANGID __cdecl remote_GetLanguage(MSIHANDLE hinst) { - *language = MsiGetLanguage(hinst); - return S_OK; + return MsiGetLanguage(hinst); } HRESULT __cdecl remote_SetInstallLevel(MSIHANDLE hinst, int level) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 2f9ba5d..e9561d6 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -642,12 +642,16 @@ static void test_targetpath(MSIHANDLE hinst) ok(hinst, sz == srcsz, "got size %u\n", sz); } -static void test_mode(MSIHANDLE hinst) +static void test_misc(MSIHANDLE hinst) { + LANGID lang; UINT r; r = MsiSetMode(hinst, MSIRUNMODE_REBOOTATEND, FALSE); ok(hinst, !r, "got %u\n", r); + + lang = MsiGetLanguage(hinst); + ok(hinst, lang == 1033, "got %u\n", lang); } static void test_feature_states(MSIHANDLE hinst) @@ -767,7 +771,7 @@ UINT WINAPI main_test(MSIHANDLE hinst) test_db(hinst); test_doaction(hinst); test_targetpath(hinst); - test_mode(hinst); + test_misc(hinst); test_feature_states(hinst); return ERROR_SUCCESS; diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 132f140..b75f32f 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -85,7 +85,7 @@ interface IWineMsiRemote UINT remote_SetFeatureState( [in] MSIHANDLE hinst, [in, string] LPCWSTR feature, [in] INSTALLSTATE state ); UINT remote_GetComponentState( [in] MSIHANDLE hinst, [in, string] LPCWSTR component, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); UINT remote_SetComponentState( [in] MSIHANDLE hinst, [in, string] LPCWSTR component, [in] INSTALLSTATE state ); - HRESULT remote_GetLanguage( [in] MSIHANDLE hinst, [out] LANGID *language ); + LANGID remote_GetLanguage( [in] MSIHANDLE hinst ); HRESULT remote_SetInstallLevel( [in] MSIHANDLE hinst, [in] int level ); HRESULT remote_FormatRecord( [in] MSIHANDLE hinst, [in] MSIHANDLE record, [out] BSTR *value ); HRESULT remote_EvaluateCondition( [in] MSIHANDLE hinst, [in] BSTR condition ); -- 2.7.4

3 16

[PATCH resend2] shell32/tests: Mark a shell dispatch test as todo on x64 and ARM
by Alex Henrie April 25, 2018

April 25, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/tests/shelldispatch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index cc00757840..8186c0d0a2 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1010,6 +1010,9 @@ static void test_ShellWindows(void) hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, &IID_IShellWindows, (void**)&shellwindows); +#ifndef __i386__ +todo_wine +#endif ok(hr == S_OK, "got 0x%08x\n", hr); /* TODO: remove when explorer startup with clean prefix is fixed */ if (hr != S_OK) -- 2.17.0

1 0