June 2017 - Wine-Commits - list.winehq.org

Paul Gofman : d3dx9: Don't add const setting entries with zero count.
by Alexandre Julliard June 1, 2017

June 1, 2017

Module: wine Branch: master Commit: 4c7653ef5d48670f40ee28d14df20e0631b99298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7653ef5d48670f40ee28d14… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 31 23:35:52 2017 +0200 d3dx9: Don't add const setting entries with zero count. 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/preshader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 5974329..7afbc03 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1226,6 +1226,11 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC const_set.register_count = desc.RegisterCount; table_type = table_info[const_set.table].type; get_const_upload_info(&const_set, &info); + if (!info.count) + { + TRACE("%s has zero count, skipping.\n", debugstr_a(param->name)); + return D3D_OK; + } if (table_type_from_param_type(param->type) == PRES_VT_COUNT) return D3DERR_INVALIDCALL;

1 0

Paul Gofman : d3dx9: Precompute and store a constant direct copy flag.
by Alexandre Julliard June 1, 2017

June 1, 2017

Module: wine Branch: master Commit: 1816d8a9fabc9aa0a8fd1379f1e6f6e17e8af7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1816d8a9fabc9aa0a8fd1379f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 30 12:38:30 2017 +0300 d3dx9: Precompute and store a constant direct copy flag. 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 | 1 + dlls/d3dx9_36/preshader.c | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 62213ac..ccb8e8a 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -154,6 +154,7 @@ struct d3dx_const_param_eval_output enum D3DXPARAMETER_CLASS constant_class; unsigned int register_index; unsigned int register_count; + BOOL direct_copy; }; struct d3dx_const_tab diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index e2bd26b..5974329 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1050,17 +1050,14 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const if (!is_param_dirty(param, const_tab->update_version)) continue; - get_const_upload_info(const_set, &info); start_offset = get_offset_reg(table, const_set->register_index); - - if (table_type_from_param_type(param->type) == table_type - && !info.transpose && info.minor == info.major_stride - && info.count == get_offset_reg(table, const_set->register_count) - && info.count * sizeof(unsigned int) <= param->bytes) + if (const_set->direct_copy) { - regstore_set_values(rs, table, param->data, start_offset, info.count); + regstore_set_values(rs, table, param->data, start_offset, + get_offset_reg(table, const_set->register_count)); continue; } + get_const_upload_info(const_set, &info); for (i = 0; i < info.major_count; ++i) { @@ -1149,6 +1146,8 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC unsigned int const_count, param_count, i; BOOL get_element; struct d3dx_const_param_eval_output const_set; + struct const_upload_info info; + enum pres_value_type table_type; HRESULT hr; if (FAILED(get_ctab_constant_desc(ctab, hc, &desc))) @@ -1225,6 +1224,17 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC return D3DERR_INVALIDCALL; } const_set.register_count = desc.RegisterCount; + table_type = table_info[const_set.table].type; + get_const_upload_info(&const_set, &info); + + if (table_type_from_param_type(param->type) == PRES_VT_COUNT) + return D3DERR_INVALIDCALL; + + const_set.direct_copy = table_type_from_param_type(param->type) == table_type + && !info.transpose && info.minor == info.major_stride + && info.count == get_offset_reg(const_set.table, const_set.register_count) + && info.count * sizeof(unsigned int) <= param->bytes; + if (FAILED(hr = append_const_set(const_tab, &const_set))) return hr;

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHRotateZ().
by Alexandre Julliard June 1, 2017

June 1, 2017

Module: wine Branch: master Commit: af7125e56b898c734458b9c4cdbdd9cebffd4952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af7125e56b898c734458b9c4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 22:01:38 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHRotateZ(). 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/d3dx9_36/tests/math.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 6f81de4..15fb945 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3546,11 +3546,11 @@ static void test_D3DXSHRotateZ(void) else end = 48; - for (j = 0; j < 3; j++) + for (j = 0; j < ARRAY_SIZE(angle); ++j) { for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) { - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(out); ++i) { out[i] = ( i + 1.0f ) * ( i + 1.0f ); in[i] = i + 1.01f;

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHMultiply4().
by Alexandre Julliard June 1, 2017

June 1, 2017

Module: wine Branch: master Commit: 1b83660c593fa02d370c904500a5721cafac4ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b83660c593fa02d370c90450… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 22:01:36 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHMultiply4(). 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/d3dx9_36/tests/math.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index b709321..22fd5d3 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3323,7 +3323,7 @@ static void test_D3DXSHMultiply4(void) 1.80000007e+00f, 1.89999998e+00f, }; - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(a); ++i) { a[i] = 1.0f + i / 100.0f; b[i] = 3.0f - i / 100.0f; @@ -3331,30 +3331,30 @@ static void test_D3DXSHMultiply4(void) } D3DXSHMultiply4(c, a, b); - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(c); ++i) { equal = compare_float(c[i], expected[i], 16); ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[i], c[i]); } - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(b); ++i) { b[i] = 3.0f - i / 100.0f; c[i] = i; } D3DXSHMultiply4(c, c, b); - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(c); ++i) { equal = compare_float(c[i], expected[20 + i], 32); ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[20 + i], c[i]); } - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(c); ++i) c[i] = 0.1f * i; D3DXSHMultiply4(c, c, c); - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(c); ++i) { equal = compare_float(c[i], expected[40 + i], 8); ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[40 + i], c[i]);

1 0

Rosanne DiMesio : adminScreenshots: avoid database error
by Jeremy Newman June 1, 2017

June 1, 2017

Module: appdb Branch: master Commit: 49a78f65efc9629199427b9ce859d78b8c10b6bf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=49a78f65efc9629199427b9c… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Jun 1 09:22:10 2017 -0500 adminScreenshots: avoid database error Allows the Screenshots Management page to load even if there are no screenshots in the database. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin/adminScreenshots.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/admin/adminScreenshots.php b/admin/adminScreenshots.php index 96e3759..d552ca8 100644 --- a/admin/adminScreenshots.php +++ b/admin/adminScreenshots.php @@ -59,7 +59,10 @@ $ItemsPerPage = isset($aClean['iItemsPerPage']) ? $aClean['iItemsPerPage'] : 6; $currentPage = isset($aClean['iPage']) ? $aClean['iPage'] : 1; $ItemsPerPage = min($ItemsPerPage,100); -$totalPages = ceil(screenshot::objectGetEntriesCount('accepted')/$ItemsPerPage); +$realTotalPages = screenshot::objectGetEntriesCount('accepted'); +$totalPages = 1; +if($realTotalPages >= $ItemsPerPage) + $totalPages = ceil($realTotalPages/$ItemsPerPage); $currentPage = min($currentPage,$totalPages); $offset = (($currentPage-1) * $ItemsPerPage);

1 0