March 2017 - Wine-commits - list.winehq.org

Matteo Bruni : d3dx9: Override d3dx9_get_param_value_ptr() return value only on array overflow.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: f68de78d9ecd8babbf166866400e751f401a5bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68de78d9ecd8babbf1668664… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 21 19:04:09 2017 +0100 d3dx9: Override d3dx9_get_param_value_ptr() return value only on array overflow. Incidentally this exposes a few test failures (due to not supporting relative addressing in preshaders) previously masked by the broad override. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 22 +++++++++++++++++----- dlls/d3dx9_36/tests/effect.c | 4 ++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 202a9a3..75254c1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2572,8 +2572,9 @@ static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct TRACE("Array index %u.\n", array_idx); if (array_idx >= param->element_count) { - ERR("Computed array index %u is out of bound %u.\n", array_idx, param->element_count); - return D3DERR_INVALIDCALL; + WARN("Computed array index %u is larger than array size %u.\n", + array_idx, param->element_count); + return E_FAIL; } param = &param->members[array_idx]; @@ -2816,10 +2817,21 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas HRESULT hr; TRACE("operation %u, index %u, type %u.\n", state->operation, state->index, state->type); + if (FAILED(hr = d3dx9_get_param_value_ptr(effect, pass, state, &param_value, &param))) - /* Native d3dx returns D3D_OK from BeginPass or Commit involving out of bounds array - * access and does not touch affected state. */ - return D3D_OK; + { + if (hr == E_FAIL) + { + /* Native d3dx9 returns D3D_OK from BeginPass or Commit involving + * out of bounds array access and does not touch the affected + * state, except for BeginPass when the out of bounds array index + * depends on dirty parameters. The latter case is supposed to + * return E_FAIL but is currently TODO. */ + WARN("Returning D3D_OK on out of bounds array access.\n"); + return D3D_OK; + } + return hr; + } switch (state_table[state->operation].class) { diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 24817dc..6aa2aaf 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4153,7 +4153,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) ok(hr == D3D_OK, "SetVector failed, hr %#x.\n", hr); hr = effect->lpVtbl->BeginPass(effect, 0); - ok(hr == D3D_OK, "Got result %#x.\n", hr); + todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = effect->lpVtbl->BeginPass(effect, 0); ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); @@ -4327,7 +4327,7 @@ static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effe } hr = effect->lpVtbl->BeginPass(effect, 0); - ok(hr == D3D_OK, "Got result %#x.\n", hr); + todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = IDirect3DDevice9_GetLight(device, blob_position[test->args_count].result_index, &light); ok(hr == D3D_OK, "Got result %#x.\n", hr);

1 0

Paul Gofman : d3dx9: Don't apply unmodified states in CommitChanges().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: a844ce7dc43c34b18a9a76649d228de1dd83c58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a844ce7dc43c34b18a9a76649… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Mar 21 19:04:10 2017 +0100 d3dx9: Don't apply unmodified states in CommitChanges(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 10 +++- dlls/d3dx9_36/effect.c | 126 +++++++++++++++++++++++++++--------------- dlls/d3dx9_36/preshader.c | 42 +++++++++++--- 3 files changed, 122 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a844ce7dc43c34b18a9a7…

1 0

Paul Gofman : d3dx9/tests: Factor out vertex shader constants check helper function from test_effect_preshader ().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 68d1fd2e812c80a5ee91a4b411ddc5b349a46dd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d1fd2e812c80a5ee91a4b41… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Mar 21 19:04:11 2017 +0100 d3dx9/tests: Factor out vertex shader constants check helper function from test_effect_preshader(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 196 +++++++++++++++++++++++++++---------------- 1 file changed, 122 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68d1fd2e812c80a5ee91a…

1 0

Paul Gofman : d3dx9/tests: Add test for CommitChanges().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 32ccc940d351c2b1fabd26c9365f9082a910c3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ccc940d351c2b1fabd26c93… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Mar 21 19:04:12 2017 +0100 d3dx9/tests: Add test for CommitChanges(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 356 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32ccc940d351c2b1fabd2…

1 0

Bas Weelinck : start: Ignore multiple quoted arguments as title.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 5b4f8a385b46a8a8a8b09b8ca6578aa7b7995a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4f8a385b46a8a8a8b09b8ca… Author: Bas Weelinck <bas.weelinck(a)gmail.com> Date: Mon Mar 20 18:14:19 2017 +0100 start: Ignore multiple quoted arguments as title. Signed-off-by: Bas Weelinck <bas.weelinck(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/start/start.c b/programs/start/start.c index 9f2c3f7..4010bef 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -224,7 +224,8 @@ int wmain (int argc, WCHAR *argv[]) * flags start with / and are case insensitive. */ for (i=1; i<argc; i++) { - if (argv[i][0] == '"') { + /* parse first quoted argument as console title */ + if (!title && argv[i][0] == '"') { title = argv[i]; continue; }

1 0

Henri Verbeet : wined3d: Inline surface_blt_to_drawable() into ffp_blit_blit_surface().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 07a6637d7ef48db5ca8acd9e9d21eca0adbc4656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a6637d7ef48db5ca8acd9e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:11 2017 +0100 wined3d: Inline surface_blt_to_drawable() into ffp_blit_blit_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 60 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 12ed35a..a35feb1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2786,24 +2786,68 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { struct wined3d_texture *src_texture = src_surface->container; + struct wined3d_texture *dst_texture = dst_surface->container; const struct wined3d_gl_info *gl_info = context->gl_info; - - /* Blit from offscreen surface to render target */ - struct wined3d_color_key old_blt_key = src_texture->async.src_blt_color_key; - DWORD old_color_key_flags = src_texture->async.color_key_flags; + struct wined3d_color_key old_blt_key; + DWORD old_color_key_flags; + RECT r; TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); + old_blt_key = src_texture->async.src_blt_color_key; + old_color_key_flags = src_texture->async.color_key_flags; wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT, color_key); - if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + /* Make sure the surface is up-to-date. This should probably use + * surface_load_location() and worry about the destination surface too, + * unless we're overwriting it completely. */ + wined3d_texture_load(src_texture, context, FALSE); + + /* Activate the destination context, set it up for blitting. */ + context_apply_blit_state(context, device); + + if (!wined3d_resource_is_offscreen(&dst_texture->resource)) + { + r = *dst_rect; + surface_translate_drawable_coords(dst_surface, context->win_handle, &r); + dst_rect = &r; + } + + ffp_blit_set(device->blit_priv, context, src_surface, NULL); + + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) + { gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); + checkGLcall("glEnable(GL_ALPHA_TEST)"); + } + + if (color_key) + { + /* For P8 surfaces, the alpha component contains the palette index. + * Which means that the colorkey is one of the palette entries. In + * other cases pixels that should be masked away have alpha set to 0. */ + if (src_texture->resource.format->id == WINED3DFMT_P8_UINT) + gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, + (float)src_texture->async.src_blt_color_key.color_space_low_value / 255.0f); + else + gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, 0.0f); + checkGLcall("glAlphaFunc"); + } - surface_blt_to_drawable(device, context, filter, - !!color_key, src_surface, src_rect, dst_surface, dst_rect); + draw_textured_quad(src_surface, context, src_rect, dst_rect, filter); - if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) + { gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable(GL_ALPHA_TEST)"); + } + + /* Leave the OpenGL state valid for blitting. */ + ffp_blit_unset(gl_info); + + if (wined3d_settings.strict_draw_ordering + || (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)) + gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ /* Restore the color key parameters */ wined3d_texture_set_color_key(src_texture, WINED3D_CKEY_SRC_BLT,

1 0

Henri Verbeet : wined3d: Get rid of the (now) redundant "alpha_test" parameter to surface_blt_to_drawable().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: 8c9990157dbca8f81c26cbccb9d3136059e7c9aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9990157dbca8f81c26cbccb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:12 2017 +0100 wined3d: Get rid of the (now) redundant "alpha_test" parameter to surface_blt_to_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a35feb1..fcbb8e5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2100,8 +2100,7 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW /* Context activation is done by the caller. */ static void surface_blt_to_drawable(const struct wined3d_device *device, - struct wined3d_context *old_ctx, - enum wined3d_texture_filter_type filter, BOOL alpha_test, + struct wined3d_context *old_ctx, enum wined3d_texture_filter_type filter, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { @@ -2137,35 +2136,8 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, device->blitter->set_shader(device->blit_priv, context, src_surface, NULL); - if (alpha_test) - { - gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); - checkGLcall("glEnable(GL_ALPHA_TEST)"); - - /* For P8 surfaces, the alpha component contains the palette index. - * Which means that the colorkey is one of the palette entries. In - * other cases pixels that should be masked away have alpha set to 0. */ - if (src_texture->resource.format->id == WINED3DFMT_P8_UINT) - gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, - (float)src_texture->async.src_blt_color_key.color_space_low_value / 255.0f); - else - gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, 0.0f); - checkGLcall("glAlphaFunc"); - } - else - { - gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable(GL_ALPHA_TEST)"); - } - draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); - if (alpha_test) - { - gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable(GL_ALPHA_TEST)"); - } - /* Leave the opengl state valid for blitting */ device->blitter->unset_shader(context->gl_info); @@ -2413,7 +2385,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, surface_get_rect(surface, NULL, &r); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); surface_blt_to_drawable(texture->resource.device, context, - WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); + WINED3D_TEXF_POINT, surface, &r, surface, &r); return TRUE; }

1 0

Henri Verbeet : wined3d: Use blit_shader.blit_surface() in surface_blt_to_drawable().
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: wine Branch: master Commit: cbede20ae84988dddfb0e3ff24a7b2137b719b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbede20ae84988dddfb0e3ff2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 20 23:34:13 2017 +0100 wined3d: Use blit_shader.blit_surface() in surface_blt_to_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fcbb8e5..008ca47 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2099,51 +2099,23 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW } /* Context activation is done by the caller. */ -static void surface_blt_to_drawable(const struct wined3d_device *device, - struct wined3d_context *old_ctx, enum wined3d_texture_filter_type filter, +static void surface_blt_to_drawable(struct wined3d_device *device, + struct wined3d_context *context, enum wined3d_texture_filter_type filter, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; - RECT src_rect, dst_rect; - - src_rect = *src_rect_in; - dst_rect = *dst_rect_in; - restore_rt = context_get_rt_surface(old_ctx); + restore_rt = context_get_rt_surface(context); if (restore_rt != dst_surface) context = context_acquire(device, dst_texture, dst_sub_resource_idx); else restore_rt = NULL; - gl_info = context->gl_info; - - /* Make sure the surface is up-to-date. This should probably use - * surface_load_location() and worry about the destination surface too, - * unless we're overwriting it completely. */ - wined3d_texture_load(src_texture, context, FALSE); - - /* Activate the destination context, set it up for blitting */ - context_apply_blit_state(context, device); - - if (!wined3d_resource_is_offscreen(&dst_texture->resource)) - surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); - - device->blitter->set_shader(device->blit_priv, context, src_surface, NULL); - - draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); - - /* Leave the opengl state valid for blitting */ - device->blitter->unset_shader(context->gl_info); - - if (wined3d_settings.strict_draw_ordering - || (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)) - gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ + device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, + src_surface, src_rect_in, dst_surface, dst_rect_in, NULL, filter); if (restore_rt) context_restore(context, restore_rt);

1 0

Francois Gouget : testbot: Detect the 'invalid unit test' error messages.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: tools Branch: master Commit: aed32f045354e6bc8d88142e13c67430d86e9431 URL: http://source.winehq.org/git/tools.git/?a=commit;h=aed32f045354e6bc8d88142e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 20 23:57:08 2017 +0100 testbot: Detect the 'invalid unit test' error messages. Take them into account so we don't complain the test returns non-zero when it has no test failure. Also show these errors in the web report summary. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 9 +++++++++ testbot/web/JobDetails.pl | 1 + 2 files changed, 10 insertions(+) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index fcde9f8..faf8314 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -484,6 +484,15 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # If the failure is not for the current test unit we'll let its # developer hash it out with the polluter ;-) $CurrentIsPolluted = 1 if ($1 ne $CurrentUnit); + + $LineFailures++; + } + elsif ($Line =~ /^Fatal: test '([_a-z0-9]+)' does not exist/) + { + # This also replaces a test summary line. + $CurrentPids{0} = 1; + $SummaryFailures++; + $LineFailures++; } elsif ($Line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index c57094b..4a5596c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -350,6 +350,7 @@ sub GenerateBody($) $CurrentDll = $1; } if ($FullLog || $Line =~ m/: Test failed: / || + $Line =~ m/Fatal: test '[^']+' does not exist/ || $Line =~ m/ done $258$/ || $Line =~ m/: unhandled exception [0-9a-fA-F]{8} at /) {

1 0

Francois Gouget : testbot/WineSendLog: Simplify the detection of timeout errors.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: tools Branch: master Commit: 349eb70c3d21809d613f8f3cc15322b7a14da332 URL: http://source.winehq.org/git/tools.git/?a=commit;h=349eb70c3d21809d613f8f3c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 20 23:57:22 2017 +0100 testbot/WineSendLog: Simplify the detection of timeout errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 983ae37..922811d 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -104,8 +104,7 @@ sub ReadLog($$$) $Line =~ s/[\r\n]*$//; if ($Line =~ m/${BaseName}:${TestSet} done/) { - if ($Line =~ m/${BaseName}:${TestSet} done $(\d+)$/ && - $1 eq "258") + if ($Line =~ m/${BaseName}:${TestSet} done $258$/) { $Messages[@Messages] = "The test timed out"; }

1 0