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

Hans Leidekker : webservices: Support appending text with multiple WsWriteText calls.
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: 40b5dc95412f99bfd0322a52ee2c8d2b76a44d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b5dc95412f99bfd0322a52e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 28 12:12:46 2017 +0200 webservices: Support appending text with multiple WsWriteText calls. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 175 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 130 ++++++++++++++++++++++------- 2 files changed, 276 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40b5dc95412f99bfd0322…

1 0

Alexandre Julliard : configure: Add a separate variable for wineloader-specific flags.
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: 655e5e8c70c361d43a644fb3fe3b24fd3064d092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=655e5e8c70c361d43a644fb3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 28 11:57:05 2017 +0200 configure: Add a separate variable for wineloader-specific flags. And apply the common link flags also to the wineserver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 22 ++++++++++++---------- configure.ac | 20 ++++++++++---------- loader/Makefile.in | 4 ++-- server/Makefile.in | 2 +- 5 files changed, 26 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=655e5e8c70c361d43a644…

1 0

Jacek Caban : secur32: Fixed compilation with prediluvian gnutls.
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: 855d73e927a059573582850565c3b6357cd89657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855d73e927a05957358285056… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 28 14:50:51 2017 +0200 secur32: Fixed compilation with prediluvian gnutls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index deefa8d..bc3bbaf 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -83,6 +83,8 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); #define GNUTLS_CIPHER_AES_128_GCM 93 #define GNUTLS_CIPHER_AES_256_GCM 94 +#define GNUTLS_MAC_AEAD 200 + #define GNUTLS_KX_ANON_ECDH 11 #define GNUTLS_KX_ECDHE_RSA 12 #define GNUTLS_KX_ECDHE_ECDSA 13

1 0

Paul Gofman : d3dx9: Return an error for out of bounds input register in parse_preshader().
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: 30bc3bab3090dce8e96880fb9f0026473dc18379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30bc3bab3090dce8e96880fb9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 27 14:05:46 2017 +0300 d3dx9: Return an error for out of bounds input register in parse_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/preshader.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 0f23488..a5a8bb7 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -749,6 +749,7 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u pres->regs.table_sizes[PRES_REGTAB_IMMED] = const_count; + update_table_sizes_consts(pres->regs.table_sizes, &pres->inputs); for (i = 0; i < pres->ins_count; ++i) { for (j = 0; j < pres_op_info[pres->ins[i].op].input_count; ++j) @@ -770,13 +771,17 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u table = pres->ins[i].inputs[j].index_reg.table; reg_idx = get_reg_offset(table, pres->ins[i].inputs[j].index_reg.offset); } - update_table_size(pres->regs.table_sizes, table, reg_idx); + if (reg_idx >= pres->regs.table_sizes[table]) + { + FIXME("Out of bounds register index, i %u, j %u, table %u, reg_idx %u.", + i, j, table, reg_idx); + return D3DXERR_INVALIDDATA; + } } update_table_size(pres->regs.table_sizes, pres->ins[i].output.reg.table, get_reg_offset(pres->ins[i].output.reg.table, pres->ins[i].output.reg.offset + pres->ins[i].component_count - 1)); } - update_table_sizes_consts(pres->regs.table_sizes, &pres->inputs); if (FAILED(regstore_alloc_table(&pres->regs, PRES_REGTAB_IMMED))) return E_OUTOFMEMORY; regstore_set_values(&pres->regs, PRES_REGTAB_IMMED, dconst, 0, const_count);

1 0

Paul Gofman : d3dx9/tests: Fix test blob data corruption in test_preshader_op().
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: 5b38f1cf2e88a9f1af881a19b4ac2cd2dda07d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b38f1cf2e88a9f1af881a19b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 27 14:05:44 2017 +0300 d3dx9/tests: Fix test blob data corruption in test_preshader_op(). 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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index f7d7ba8..997c1fc 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4415,12 +4415,13 @@ static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effe { unsigned int pos; unsigned int result_index; + unsigned int ins_count; } blob_position[] = { - {0, 0}, - {5549, 0}, - {5400, 2} + {0, 0, 0}, + {5549, 0, 4}, + {5400, 2, 1} }; DWORD *test_effect_blob; HRESULT hr; @@ -4436,7 +4437,7 @@ static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effe test_effect_blob = HeapAlloc(GetProcessHeap(), 0, sample_effect_blob_size); memcpy(test_effect_blob, sample_effect_blob, sample_effect_blob_size); - for (i = 0; i < 4; ++i) + for (i = 0; i < blob_position[test->args_count].ins_count; ++i) test_effect_blob[op_pos + i * op_step] = test->opcode; hr = D3DXCreateEffect(device, test_effect_blob, sample_effect_blob_size,

1 0

Paul Gofman : d3dx9: Fix register index for the scalar op case in parse_preshader().
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: 905421351f0cafec94fa1c0be28de23f7ea65214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905421351f0cafec94fa1c0be… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 28 00:10:15 2017 +0200 d3dx9: Fix register index for the scalar op case in parse_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/preshader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 896aca5..0f23488 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -758,9 +758,12 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u if (pres->ins[i].inputs[j].index_reg.table == PRES_REGTAB_COUNT) { + unsigned int last_component_index = pres->ins[i].scalar_op && !j ? 0 + : pres->ins[i].component_count - 1; + table = pres->ins[i].inputs[j].reg.table; reg_idx = get_reg_offset(table, pres->ins[i].inputs[j].reg.offset - + pres->ins[i].component_count - 1); + + last_component_index); } else {

1 0

Henri Verbeet : d3dx9/tests: Get rid of compare_translation.
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: 6890d7492cbc0fd640458dbcefba657ceb06e6ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6890d7492cbc0fd640458dbce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 27 23:52:42 2017 +0200 d3dx9/tests: Get rid of compare_translation. 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 | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 791b7be..9dec710 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -180,14 +180,6 @@ static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const U(*expected).m[3][0], U(*expected).m[3][1], U(*expected).m[3][2], U(*expected).m[3][3]); } -#define compare_translation(exp, got) \ - ok(relative_error(exp.x, got.x) < admitted_error && \ - relative_error(exp.y, got.y) < admitted_error && \ - relative_error(exp.z, got.z) < admitted_error, \ - "Expected translation = (%f, %f, %f), \ - got translation = (%f, %f, %f)\n", \ - exp.x, exp.y, exp.z, got.x, got.y, got.z) - #define compare_vectors(exp, out) \ for (i = 0; i < ARRAY_SIZE + 2; ++i) { \ ok(relative_error(exp[i].x, out[i].x) < admitted_error && \ @@ -1924,7 +1916,7 @@ static void test_Matrix_Decompose(void) D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); expect_vec3(&exp_scale, &got_scale, 1); expect_quaternion(&exp_rotation, &got_rotation, 1); - compare_translation(exp_translation, got_translation); + expect_vec3(&exp_translation, &got_translation, 0); /*_________*/ @@ -1961,7 +1953,7 @@ static void test_Matrix_Decompose(void) D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); expect_vec3(&exp_scale, &got_scale, 0); expect_quaternion(&exp_rotation, &got_rotation, 2); - compare_translation(exp_translation, got_translation); + expect_vec3(&exp_translation, &got_translation, 0); /*_____________*/ @@ -1998,7 +1990,7 @@ static void test_Matrix_Decompose(void) D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); expect_vec3(&exp_scale, &got_scale, 1); expect_quaternion(&exp_rotation, &got_rotation, 1); - compare_translation(exp_translation, got_translation); + expect_vec3(&exp_translation, &got_translation, 0); /*_____________*/ @@ -2035,7 +2027,7 @@ static void test_Matrix_Decompose(void) D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); expect_vec3(&exp_scale, &got_scale, 1); expect_quaternion(&exp_rotation, &got_rotation, 1); - compare_translation(exp_translation, got_translation); + expect_vec3(&exp_translation, &got_translation, 0); /*__________*/ @@ -2076,7 +2068,7 @@ static void test_Matrix_Decompose(void) equal |= compare_quaternion(&exp_rotation, &got_rotation, 2); ok(equal, "Got unexpected quaternion {%.8e, %.8e, %.8e, %.8e}.\n", got_rotation.x, got_rotation.y, got_rotation.z, got_rotation.w); - compare_translation(exp_translation, got_translation); + expect_vec3(&exp_translation, &got_translation, 0); /*__________*/ @@ -2113,7 +2105,7 @@ static void test_Matrix_Decompose(void) D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); expect_vec3(&exp_scale, &got_scale, 0); expect_quaternion(&exp_rotation, &got_rotation, 1); - compare_translation(exp_translation, got_translation); + expect_vec3(&exp_translation, &got_translation, 0); /*_____________*/ @@ -2150,7 +2142,7 @@ static void test_Matrix_Decompose(void) D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); expect_vec3(&exp_scale, &got_scale, 1); expect_quaternion(&exp_rotation, &got_rotation, 2); - compare_translation(exp_translation, got_translation); + expect_vec3(&exp_translation, &got_translation, 0); /*_________*/ @@ -2187,7 +2179,7 @@ static void test_Matrix_Decompose(void) D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); expect_vec3(&exp_scale, &got_scale, 0); expect_quaternion(&exp_rotation, &got_rotation, 1); - compare_translation(exp_translation, got_translation); + expect_vec3(&exp_translation, &got_translation, 0); /*__________*/

1 0

Henri Verbeet : d3dx9/tests: Get rid of compare_scale.
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: 97980f5f54619f28c8f309cd53e7521235817eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=97980f5f54619f28c8f309cd5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 27 23:52:41 2017 +0200 d3dx9/tests: Get rid of compare_scale. 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 | 80 +++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 48 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 8bbde4e..791b7be 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -180,14 +180,6 @@ static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const U(*expected).m[3][0], U(*expected).m[3][1], U(*expected).m[3][2], U(*expected).m[3][3]); } -#define compare_scale(exp, got) \ - ok(relative_error(exp.x, got.x) < admitted_error && \ - relative_error(exp.y, got.y) < admitted_error && \ - relative_error(exp.z, got.z) < admitted_error, \ - "Expected scale = (%f, %f, %f), \ - got scale = (%f, %f, %f)\n", \ - exp.x, exp.y, exp.z, got.x, got.y, got.z) - #define compare_translation(exp, got) \ ok(relative_error(exp.x, got.x) < admitted_error && \ relative_error(exp.y, got.y) < admitted_error && \ @@ -1916,9 +1908,9 @@ static void test_Matrix_Decompose(void) U(pm).m[2][3] = 0.00000000e+00f; U(pm).m[3][3] = 1.00000000e+00f; - exp_scale.x = 1.0f; - exp_scale.y = 1.0f; - exp_scale.z = 1.0f; + exp_scale.x = 9.99999881e-01f; + exp_scale.y = 9.99999881e-01f; + exp_scale.z = 9.99999881e-01f; exp_rotation.x = 2.14862776e-08f; exp_rotation.y = 6.93519890e-01f; @@ -1930,8 +1922,7 @@ static void test_Matrix_Decompose(void) exp_translation.z = 10.0f; D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); - - compare_scale(exp_scale, got_scale); + expect_vec3(&exp_scale, &got_scale, 1); expect_quaternion(&exp_rotation, &got_rotation, 1); compare_translation(exp_translation, got_translation); @@ -1954,9 +1945,9 @@ static void test_Matrix_Decompose(void) U(pm).m[2][3] = 0.0f; U(pm).m[3][3] = 1.0f; - exp_scale.x = 3.0f; - exp_scale.y = 3.0f; - exp_scale.z = 3.0f; + exp_scale.x = 2.99999928e+00f; + exp_scale.y = 2.99999905e+00f; + exp_scale.z = 2.99999952e+00f; exp_rotation.x = 3.52180451e-01f; exp_rotation.y = 6.16315663e-01f; @@ -1968,8 +1959,7 @@ static void test_Matrix_Decompose(void) exp_translation.z = 3.0f; D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); - - compare_scale(exp_scale, got_scale); + expect_vec3(&exp_scale, &got_scale, 0); expect_quaternion(&exp_rotation, &got_rotation, 2); compare_translation(exp_translation, got_translation); @@ -1992,9 +1982,9 @@ static void test_Matrix_Decompose(void) U(pm).m[2][3] = 0.0f; U(pm).m[3][3] = 1.0f; - exp_scale.x = 3.0f; - exp_scale.y = 3.0f; - exp_scale.z = 3.0f; + exp_scale.x = 2.99999976e+00f; + exp_scale.y = 3.00000000e+00f; + exp_scale.z = 2.99999976e+00f; exp_rotation.x = 0.00000000e+00f; exp_rotation.y = 3.09016883e-01f; @@ -2006,8 +1996,7 @@ static void test_Matrix_Decompose(void) exp_translation.z = 5.0f; D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); - - compare_scale(exp_scale, got_scale); + expect_vec3(&exp_scale, &got_scale, 1); expect_quaternion(&exp_rotation, &got_rotation, 1); compare_translation(exp_translation, got_translation); @@ -2030,9 +2019,9 @@ static void test_Matrix_Decompose(void) U(pm).m[2][3] = 0.00000000e+00f; U(pm).m[3][3] = 1.00000000e+00f; - exp_scale.x = 1.0f; - exp_scale.y = 1.0f; - exp_scale.z = 1.0f; + exp_scale.x = 9.99999881e-01f; + exp_scale.y = 9.99999881e-01f; + exp_scale.z = 9.99999881e-01f; exp_rotation.x = 2.14862776e-08f; exp_rotation.y = 6.93519890e-01f; @@ -2044,8 +2033,7 @@ static void test_Matrix_Decompose(void) exp_translation.z = 10.0f; D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); - - compare_scale(exp_scale, got_scale); + expect_vec3(&exp_scale, &got_scale, 1); expect_quaternion(&exp_rotation, &got_rotation, 1); compare_translation(exp_translation, got_translation); @@ -2068,9 +2056,9 @@ static void test_Matrix_Decompose(void) U(pm).m[2][3] = 0.00000000e+00f; U(pm).m[3][3] = 1.00000000e+00f; - exp_scale.x = 1.0f; - exp_scale.y = 2.0f; - exp_scale.z = 3.0f; + exp_scale.x = 9.99999583e-01f; + exp_scale.y = 1.99999940e+00f; + exp_scale.z = 2.99999928e+00f; exp_rotation.x = 1.07431388e-08f; exp_rotation.y = 6.93519890e-01f; @@ -2082,8 +2070,7 @@ static void test_Matrix_Decompose(void) exp_translation.z = 10.0f; D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); - - compare_scale(exp_scale, got_scale); + expect_vec3(&exp_scale, &got_scale, 1); equal = compare_quaternion(&exp_rotation, &got_rotation, 1); exp_rotation.x = 0.0f; equal |= compare_quaternion(&exp_rotation, &got_rotation, 2); @@ -2110,9 +2097,9 @@ static void test_Matrix_Decompose(void) U(pm).m[2][3] = 0.0f; U(pm).m[3][3] = 1.0f; - exp_scale.x = 1.0f; - exp_scale.y = 1.0f; - exp_scale.z = 1.0f; + exp_scale.x = 9.99999940e-01f; + exp_scale.y = 1.00000012e+00f; + exp_scale.z = 1.00000012e+00f; exp_rotation.x = 9.05394852e-01f; exp_rotation.y = -3.23355347e-01f; @@ -2124,8 +2111,7 @@ static void test_Matrix_Decompose(void) exp_translation.z = 10.0f; D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); - - compare_scale(exp_scale, got_scale); + expect_vec3(&exp_scale, &got_scale, 0); expect_quaternion(&exp_rotation, &got_rotation, 1); compare_translation(exp_translation, got_translation); @@ -2148,9 +2134,9 @@ static void test_Matrix_Decompose(void) U(pm).m[2][3] = 0.0f; U(pm).m[3][3] = 1.0f; - exp_scale.x = 1.0f; - exp_scale.y = 1.0f; - exp_scale.z = 1.0f; + exp_scale.x = 9.99999940e-01f; + exp_scale.y = 9.99999940e-01f; + exp_scale.z = 9.99999881e-01f; exp_rotation.x = 7.03357518e-01f; exp_rotation.y = -5.86131275e-01f; @@ -2162,8 +2148,7 @@ static void test_Matrix_Decompose(void) exp_translation.z = 10.0f; D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); - - compare_scale(exp_scale, got_scale); + expect_vec3(&exp_scale, &got_scale, 1); expect_quaternion(&exp_rotation, &got_rotation, 2); compare_translation(exp_translation, got_translation); @@ -2186,9 +2171,9 @@ static void test_Matrix_Decompose(void) U(pm).m[2][3] = 0.00000000e+00f; U(pm).m[3][3] = 1.00000000e+00f; - exp_scale.x = 15.0f; - exp_scale.y = 15.0f; - exp_scale.z = 15.0f; + exp_scale.x = 1.49999933e+01f; + exp_scale.y = 1.49999933e+01f; + exp_scale.z = 1.49999943e+01f; exp_rotation.x = 7.68714130e-01f; exp_rotation.y = 0.00000000e+00f; @@ -2200,8 +2185,7 @@ static void test_Matrix_Decompose(void) exp_translation.z = 2.0f; D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); - - compare_scale(exp_scale, got_scale); + expect_vec3(&exp_scale, &got_scale, 0); expect_quaternion(&exp_rotation, &got_rotation, 1); compare_translation(exp_translation, got_translation);

1 0

Paul Gofman : d3dx9: Downgrade unknown DWORD FIXMEs() to WARN() messages.
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: 0750e758cc46bcf9bd58c208a815e74729de85f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0750e758cc46bcf9bd58c208a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 27 14:05:52 2017 +0300 d3dx9: Downgrade unknown DWORD FIXMEs() to WARN() messages. 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/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a55c20b..6a5afff 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -425,11 +425,11 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) unsigned int i; DWORD d; - FIXME("Skipping %u unknown DWORDs:\n", count); + WARN("Skipping %u unknown DWORDs:\n", count); for (i = 0; i < count; ++i) { read_dword(ptr, &d); - FIXME("\t0x%08x\n", d); + WARN("\t0x%08x\n", d); } }

1 0

Paul Gofman : d3dx9: Remove unused parameter 'effect' from d3dx9_get_param_value_ptr().
by Alexandre Julliard April 28, 2017

April 28, 2017

Module: wine Branch: master Commit: f0e9dea59c320987124fa8ab8456ce27c5731e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e9dea59c320987124fa8ab8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 27 14:05:51 2017 +0300 d3dx9: Remove unused parameter 'effect' from d3dx9_get_param_value_ptr(). 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/effect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c2fb1d0..a55c20b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2578,8 +2578,8 @@ static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base, return E_NOTIMPL; } -static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, - struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param, +static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_state *state, + void **param_value, struct d3dx_parameter **out_param, BOOL update_all, BOOL *param_dirty) { struct d3dx_parameter *param = &state->parameter; @@ -2881,7 +2881,7 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas 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, + if (FAILED(hr = d3dx9_get_param_value_ptr(pass, state, &param_value, &param, update_all, &param_dirty))) { if (hr == E_FAIL)

1 0