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

Matteo Bruni : d3d9/tests: Add more tests to test_viewport().
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: wine Branch: master Commit: 12016da9e11d97201bfedfe0322c43155fad94f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12016da9e11d97201bfedfe0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 26 23:30:12 2018 +0200 d3d9/tests: Add more tests to test_viewport(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6609e48..a50cb19 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13918,7 +13918,12 @@ static void test_viewport(void) { {{ 0, 0, 640, 480}, { 0, 120, 479, 359}, "Viewport (0, 0) - (640, 480)"}, {{ 0, 0, 320, 240}, { 0, 60, 239, 179}, "Viewport (0, 0) - (320, 240)"}, + {{ 0, 0, 1280, 960}, { 0, 240, 639, 479}, "Viewport (0, 0) - (1280, 960)"}, + {{ 0, 0, 2000, 1600}, { 0, 400, 639, 479}, "Viewport (0, 0) - (2000, 1600)"}, {{100, 100, 640, 480}, {100, 220, 579, 459}, "Viewport (100, 100) - (640, 480)"}, + {{ 0, 0, 8192, 8192}, {-10, -10, -10, -10}, "Viewport (0, 0) - (8192, 8192)"}, + /* AMD HD 2600 on XP draws nothing visible for this one. */ + /* {{ 0, 0, 8192, 480}, {-10, -10, -1, -1}, "(0, 0) - (8192, 480) viewport"}, */ }; static const struct vec3 quad[] = {

1 0

Francois Gouget : testbot: Remove a couple of unneeded WineTestBot:: Patches imports.
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: tools Branch: master Commit: 6936e9ca4e5bfd4d194525de268d1e7d44f101c1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6936e9ca4e5bfd4d194525d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 26 23:59:33 2018 +0200 testbot: Remove a couple of unneeded WineTestBot::Patches imports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PendingPatchSets.pm | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 26a5642..7a54499 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -42,7 +42,6 @@ use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); use WineTestBot::Config; -use WineTestBot::Patches; use WineTestBot::Utils; @@ -163,7 +162,6 @@ use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::PendingPatches; -use WineTestBot::Patches; use WineTestBot::Utils;

1 0

Francois Gouget : testbot: Fix a WineTestBot::PendingPatchSets import.
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: tools Branch: master Commit: 3509bc176073db3f4781d15203ed1894f18e37a2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3509bc176073db3f4781d15… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 26 23:59:46 2018 +0200 testbot: Fix a WineTestBot::PendingPatchSets import. The import is useless if it is in the wrong package. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 955e336..5edeab0 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -40,7 +40,6 @@ use Encode qw/decode/; use File::Basename; use WineTestBot::Config; -use WineTestBot::PendingPatchSets; use WineTestBot::Jobs; use WineTestBot::Users; use WineTestBot::Utils; @@ -374,6 +373,7 @@ BEGIN use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; +use WineTestBot::PendingPatchSets; sub CreateItem($) @@ -510,7 +510,7 @@ sub NewPatch($$$) link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); if (! defined($ErrMessage)) { - $ErrMessage = WineTestBot::PendingPatchSets::CreatePendingPatchSets()->NewSubmission($Patch); + $ErrMessage = CreatePendingPatchSets()->NewSubmission($Patch); } } else

1 0

Francois Gouget : testbot: Remove an unneeded Item import in WineTestBotObjects.
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: tools Branch: master Commit: dce0dc6084a5964dfa611d1b8008f4009a487155 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dce0dc6084a5964dfa611d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 26 23:57:51 2018 +0200 testbot: Remove an unneeded Item import in WineTestBotObjects. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/WineTestBotObjects.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index ba84805..d559a76 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -51,7 +51,6 @@ use ObjectModel::Collection; our @ISA = qw(ObjectModel::Collection); use ObjectModel::BackEnd; -use ObjectModel::Item; use WineTestBot::Config; sub GetBackEnd($)

1 0

Francois Gouget : testbot: Remove an unneeded WineTestBot:: PendingPatchSets prefix.
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: tools Branch: master Commit: 0d9c5820f6c1a98d91014b2507b3e63871a4077b URL: https://source.winehq.org/git/tools.git/?a=commit;h=0d9c5820f6c1a98d91014b2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 26 23:59:18 2018 +0200 testbot: Remove an unneeded WineTestBot::PendingPatchSets prefix. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f39ec5f..75e7995 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -625,7 +625,7 @@ sub SafetyNet() ScheduleJobs(); HandleWinePatchWebSubmission(); - my $Set = WineTestBot::PendingPatchSets::CreatePendingPatchSets(); + my $Set = CreatePendingPatchSets(); my $ErrMessage = $Set->CheckForCompleteSet(); if (defined($ErrMessage)) {

1 0

Józef Kucia : dxgi: Remove useless FIXME() messages about adapter type.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: 0d90a7ba893347b843e596baf751dd541b31186c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d90a7ba893347b843e596ba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 26 14:53:23 2018 +0200 dxgi: Remove useless FIXME() messages about adapter type. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 2 -- dlls/dxgi/utils.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index c266cae..5a810fa 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -422,8 +422,6 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l return E_FAIL; } - FIXME("Ignoring adapter type.\n"); - hr = wined3d_device_create(dxgi_factory->wined3d, dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, wined3d_device_parent, &device->wined3d_device); if (FAILED(hr)) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 74f0ae05..063ec5a 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -645,8 +645,6 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, WINED3DCAPS caps; HRESULT hr; - FIXME("Ignoring adapter type.\n"); - wined3d_mutex_lock(); hr = wined3d_get_device_caps(factory->wined3d, adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); wined3d_mutex_unlock();

1 0

Józef Kucia : wined3d: Disable transform feedback when there are no varyings to record.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: f6160d2ae80d6dd53ce74b53fe006163ee3e720a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6160d2ae80d6dd53ce74b53… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 26 14:53:24 2018 +0200 wined3d: Disable transform feedback when there are no varyings to record. In order to avoid GL errors when glBeginTransformFeedback() is called. This is required only because we do not fully support stream output component ranges. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e29730c..5d1f118 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -804,11 +804,12 @@ static void append_transform_feedback_skip_components(const char **varyings, } } -static void shader_glsl_generate_transform_feedback_varyings(const struct wined3d_stream_output_desc *so_desc, +static BOOL shader_glsl_generate_transform_feedback_varyings(const struct wined3d_stream_output_desc *so_desc, struct wined3d_string_buffer *buffer, const char **varyings, unsigned int *varying_count, char *strings, unsigned int *strings_length, GLenum buffer_mode) { unsigned int i, buffer_idx, count, length, highest_output_slot, stride; + BOOL have_varyings_to_record = FALSE; count = length = 0; highest_output_slot = 0; @@ -858,6 +859,8 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 string_buffer_sprintf(buffer, "shader_in_out.reg%u", e->register_idx); append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); } + + have_varyings_to_record = TRUE; } if (buffer_idx < so_desc->buffer_stride_count @@ -882,10 +885,12 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 *varying_count = count; if (strings_length) *strings_length = length; + + return have_varyings_to_record; } static void shader_glsl_init_transform_feedback(const struct wined3d_context *context, - struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader *shader) + struct shader_glsl_priv *priv, GLuint program_id, struct wined3d_shader *shader) { const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -941,7 +946,12 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co buffer = string_buffer_get(&priv->string_buffers); - shader_glsl_generate_transform_feedback_varyings(so_desc, buffer, NULL, &count, NULL, &length, mode); + if (!shader_glsl_generate_transform_feedback_varyings(so_desc, buffer, NULL, &count, NULL, &length, mode)) + { + FIXME("No varyings to record, disabling transform feedback.\n"); + shader->u.gs.so_desc.element_count = 0; + return; + } if (!(varyings = heap_calloc(count, sizeof(*varyings)))) {

1 0

Józef Kucia : d3d11: Use WARN() instead of FIXME() in d3d11_device_GetDeviceRemovedReason().
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: ee641ef8e749d6ed7b3d20d753cc7c90e5547c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee641ef8e749d6ed7b3d20d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 26 14:53:25 2018 +0200 d3d11: Use WARN() instead of FIXME() in d3d11_device_GetDeviceRemovedReason(). It's harmless. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 538f4af..d3155d5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3517,7 +3517,7 @@ static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device *iface) static HRESULT STDMETHODCALLTYPE d3d11_device_GetDeviceRemovedReason(ID3D11Device *iface) { - FIXME("iface %p stub!\n", iface); + WARN("iface %p stub!\n", iface); return S_OK; }

1 0

Zhiyi Zhang : comctl32: Fix checkbox wrong box alignment with BS_VCENTER.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: 84ce2922179591e3aa6b2667d8945ec6f024a874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84ce2922179591e3aa6b2667… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 25 21:17:22 2018 +0800 comctl32: Fix checkbox wrong box alignment with BS_VCENTER. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1feb07a..507820c 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1150,14 +1150,14 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) /* rbox must have the correct height */ delta = rbox.bottom - rbox.top - checkBoxHeight; - if (style & BS_TOP) { + if ((style & BS_VCENTER) == BS_TOP) { if (delta > 0) { rbox.bottom = rbox.top + checkBoxHeight; } else { rbox.top -= -delta/2 + 1; rbox.bottom = rbox.top + checkBoxHeight; } - } else if (style & BS_BOTTOM) { + } else if ((style & BS_VCENTER) == BS_BOTTOM) { if (delta > 0) { rbox.top = rbox.bottom - checkBoxHeight; } else {

1 0

Francois Gouget : wsdapi: Make send_udp_multicast_of_type() static.
by Alexandre Julliard 26 Apr '18

26 Apr '18

Module: wine Branch: master Commit: ef8aa7fb5bafe46cff0e3b29eafba078fb3c8646 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef8aa7fb5bafe46cff0e3b29… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 18 03:24:26 2018 +0200 wsdapi: Make send_udp_multicast_of_type() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index bea63fb..f86b3b4 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -98,7 +98,7 @@ static DWORD WINAPI sending_thread(LPVOID lpParam) return 0; } -BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_delay, ULONG family) +static BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_delay, ULONG family) { IP_ADAPTER_ADDRESSES *adapter_addresses = NULL, *adapter_addr; static const struct in6_addr i_addr_zero;

1 0