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

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHAdd().
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 1f37f24ef66342a927038364431e75880a3e89c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f37f24ef66342a9270383644… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:15 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHAdd(). 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 | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c861d30..291fcdc 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2543,9 +2543,12 @@ static void test_D3DXFloat_Array(void) static void test_D3DXSHAdd(void) { - UINT i, k; - FLOAT *ret = (FLOAT *)0xdeadbeef; - const FLOAT in1[50] = + float out[50] = {0.0f}; + unsigned int i, k; + float *ret; + BOOL equal; + + static const float in1[50] = { 1.11f, 1.12f, 1.13f, 1.14f, 1.15f, 1.16f, 1.17f, 1.18f, 1.19f, 1.20f, 1.21f, 1.22f, 1.23f, 1.24f, 1.25f, 1.26f, @@ -2555,7 +2558,7 @@ static void test_D3DXSHAdd(void) 1.51f, 1.52f, 1.53f, 1.54f, 1.55f, 1.56f, 1.57f, 1.58f, 1.59f, 1.60f, }; - const FLOAT in2[50] = + static const float in2[50] = { 2.11f, 2.12f, 2.13f, 2.14f, 2.15f, 2.16f, 2.17f, 2.18f, 2.19f, 2.20f, 2.21f, 2.22f, 2.23f, 2.24f, 2.25f, 2.26f, @@ -2565,7 +2568,6 @@ static void test_D3DXSHAdd(void) 2.51f, 2.52f, 2.53f, 2.54f, 2.55f, 2.56f, 2.57f, 2.58f, 2.59f, 2.60f, }; - FLOAT out[50] = {0.0f}; /* * Order is not limited by D3DXSH_MINORDER and D3DXSH_MAXORDER! @@ -2581,10 +2583,11 @@ static void test_D3DXSHAdd(void) for (i = 0; i < count; ++i) { - ok(relative_error(in1[i] + in2[i], out[i]) < admitted_error, - "%u-%u: D3DXSHAdd() failed, got %f, expected %f\n", k, i, out[i], in1[i] + in2[i]); + equal = compare_float(in1[i] + in2[i], out[i], 0); + ok(equal, "%u-%u: Got %.8e, expected %.8e.\n", k, i, out[i], in1[i] + in2[i]); } - ok(relative_error(out[count], 0.0f) < admitted_error, "%u-%u: D3DXSHAdd() failed, got %f, expected 0.0\n", k, k * k, out[count]); + equal = compare_float(out[count], 0.0f, 0); + ok(equal, "%u-%u: Got %.8e, expected 0.0.\n", k, k * k, out[count]); } }

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXFloat_Array() .
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 0c0f5798ba4de4085b8045aa2f1f595707fa1786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0f5798ba4de4085b8045aa2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:14 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXFloat_Array(). 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 | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 35b72d7..c861d30 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2459,14 +2459,14 @@ static void test_D3DXFloat_Array(void) unsigned int i; void *out = NULL; D3DXFLOAT16 half; - FLOAT single; + BOOL equal; /* Input floats through bit patterns because compilers do not generate reliable INF and NaN values. */ union convert { DWORD d; - FLOAT f; - }; + float f; + } single; struct { @@ -2487,7 +2487,7 @@ static void test_D3DXFloat_Array(void) { { 0x477ff100 }, 0x7c00, 0x7c00, { 0x47800000 }, { 0x47800000 } }, /* 65521.0f */ { { 0x477ffe00 }, 0x7c00, 0x7c00, { 0x47800000 }, { 0x47800000 } }, /* 65534.0f */ - { { 0x477fff00 }, 0x7c00, 0x7c00, { 0x477fff00 }, { 0x47800000 } }, /* 65535.0f */ + { { 0x477fff00 }, 0x7c00, 0x7c00, { 0x47800000 }, { 0x47800000 } }, /* 65535.0f */ { { 0x47800000 }, 0x7c00, 0x7c00, { 0x47800000 }, { 0x47800000 } }, /* 65536.0f */ { { 0xc79c4000 }, 0xfc00, 0xfce2, { 0xc7800000 }, { 0xc79c4000 } }, /* -80000.0f */ { { 0xc77fdf00 }, 0xfbff, 0xfbff, { 0xc77fe000 }, { 0xc77fe000 } }, /* -65503.0f */ @@ -2496,7 +2496,7 @@ static void test_D3DXFloat_Array(void) { { 0xc77ff000 }, 0xfbff, 0xfc00, { 0xc77fe000 }, { 0xc7800000 } }, /* -65520.0f */ { { 0xc77ff100 }, 0xfc00, 0xfc00, { 0xc7800000 }, { 0xc7800000 } }, /* -65521.0f */ { { 0xc77ffe00 }, 0xfc00, 0xfc00, { 0xc7800000 }, { 0xc7800000 } }, /* -65534.0f */ - { { 0xc77fff00 }, 0xfc00, 0xfc00, { 0xc77fff00 }, { 0xc7800000 } }, /* -65535.0f */ + { { 0xc77fff00 }, 0xfc00, 0xfc00, { 0xc7800000 }, { 0xc7800000 } }, /* -65535.0f */ { { 0xc7800000 }, 0xfc00, 0xfc00, { 0xc7800000 }, { 0xc7800000 } }, /* -65536.0f */ { { 0x7f800000 }, 0x7c00, 0x7fff, { 0x47800000 }, { 0x47ffe000 } }, /* INF */ @@ -2505,21 +2505,21 @@ static void test_D3DXFloat_Array(void) { { 0xffc00000 }, 0xffff, 0xffff, { 0xc7ffe000 }, { 0xc7ffe000 } }, /* -NaN */ { { 0x00000000 }, 0x0000, 0x0000, { 0x00000000 }, { 0x00000000 } }, /* 0.0f */ - { { 0x80000000 }, 0x8000, 0x8000, { 0x00000000 }, { 0x00000000 } }, /* -0.0f */ + { { 0x80000000 }, 0x8000, 0x8000, { 0x80000000 }, { 0x80000000 } }, /* -0.0f */ { { 0x330007ff }, 0x0000, 0x0000, { 0x00000000 }, { 0x00000000 } }, /* 2.9809595e-08f */ { { 0xb30007ff }, 0x8000, 0x8000, { 0x80000000 }, { 0x80000000 } }, /* -2.9809595e-08f */ - { { 0x33000800 }, 0x0001, 0x0000, { 0x337ffff3 }, { 0x337ffff3 } }, /* 2.9809598e-08f */ + { { 0x33000800 }, 0x0001, 0x0000, { 0x33800000 }, { 0x00000000 } }, /* 2.9809598e-08f */ - { { 0xb3000800 }, 0x8001, 0x8000, { 0xb37ffff3 } ,{ 0xb37ffff3 } }, /* -2.9809598e-08f */ - { { 0x33c00000 }, 0x0002, 0x0001, { 0x33ffffd7 }, { 0x337ffff3 } }, /* 8.9406967e-08f */ + { { 0xb3000800 }, 0x8001, 0x8000, { 0xb3800000 }, { 0x80000000 } }, /* -2.9809598e-08f */ + { { 0x33c00000 }, 0x0002, 0x0001, { 0x34000000 }, { 0x33800000 } }, /* 8.9406967e-08f */ }; /* exception on NULL out or in parameter */ - out = D3DXFloat32To16Array(&half, &single, 0); + out = D3DXFloat32To16Array(&half, &single.f, 0); ok(out == &half, "Got %p, expected %p.\n", out, &half); - out = D3DXFloat16To32Array(&single, &half, 0); - ok(out == &single, "Got %p, expected %p.\n", out, &single); + out = D3DXFloat16To32Array(&single.f, &half, 0); + ok(out == &single.f, "Got %p, expected %p.\n", out, &single.f); for (i = 0; i < sizeof(testdata)/sizeof(testdata[0]); i++) { @@ -2529,15 +2529,15 @@ static void test_D3DXFloat_Array(void) "Got %x, expected %x or %x for index %d.\n", half.value, testdata[i].half_ver1, testdata[i].half_ver2, i); - out = D3DXFloat16To32Array(&single, (D3DXFLOAT16 *)&testdata[i].half_ver1, 1); - ok(out == &single, "Got %p, expected %p.\n", out, &single); - ok(relative_error(single, testdata[i].single_out_ver1.f) < admitted_error, - "Got %g, expected %g for index %d.\n", single, testdata[i].single_out_ver1.f, i); + out = D3DXFloat16To32Array(&single.f, (D3DXFLOAT16 *)&testdata[i].half_ver1, 1); + ok(out == &single.f, "Got %p, expected %p.\n", out, &single.f); + equal = compare_float(single.f, testdata[i].single_out_ver1.f, 0); + ok(equal, "Got %#x, expected %#x at index %u.\n", single.d, testdata[i].single_out_ver1.d, i); - out = D3DXFloat16To32Array(&single, (D3DXFLOAT16 *)&testdata[i].half_ver2, 1); - ok(out == &single, "Got %p, expected %p.\n", out, &single); - ok(relative_error(single, testdata[i].single_out_ver2.f) < admitted_error, - "Got %g, expected %g for index %d.\n", single, testdata[i].single_out_ver2.f, i); + out = D3DXFloat16To32Array(&single.f, (D3DXFLOAT16 *)&testdata[i].half_ver2, 1); + ok(out == &single.f, "Got %p, expected %p.\n", out, &single.f); + equal = compare_float(single.f, testdata[i].single_out_ver2.f, 0); + ok(equal, "Got %#x, expected %#x at index %u.\n", single.d, testdata[i].single_out_ver2.d, i); } }

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in D3DXVector4Test().
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: d8c45575e1900ee812cb19cc9a0ee658f7a8fced URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c45575e1900ee812cb19cc9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:13 2017 +0200 d3dx9/tests: Use compare_float() in D3DXVector4Test(). 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 | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 462ae3f..35b72d7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1537,8 +1537,9 @@ static void D3DXVector4Test(void) D3DXVECTOR4 expectedvec, gotvec, u, v, w, x; LPD3DXVECTOR4 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; + float coeff1, coeff2, got, scale; D3DXMATRIX mat; - FLOAT coeff1, coeff2, expected, got, scale; + BOOL equal; u.x = 1.0f; u.y = 2.0f; u.z = 4.0f; u.w = 10.0; v.x = -3.0f; v.y = 4.0f; v.z = -5.0f; v.w = 7.0; @@ -1579,16 +1580,16 @@ static void D3DXVector4Test(void) expect_vec4(&expectedvec, &gotvec, 0); /*_______________D3DXVec4Dot__________________________*/ - expected = 55.0f; - got = D3DXVec4Dot(&u,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; - got = D3DXVec4Dot(NULL,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - expected=0.0f; - got = D3DXVec4Dot(NULL,NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + got = D3DXVec4Dot(&u, &v); + equal = compare_float(got, 55.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); + /* Tests the case NULL. */ + got = D3DXVec4Dot(NULL, &v); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); + got = D3DXVec4Dot(NULL, NULL); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /*_______________D3DXVec4Hermite_________________________*/ expectedvec.x = 1224.625f; expectedvec.y = 3461.625f; expectedvec.z = -4758.875f; expectedvec.w = -5781.5f; @@ -1596,22 +1597,22 @@ static void D3DXVector4Test(void) expect_vec4(&expectedvec, &gotvec, 0); /*_______________D3DXVec4Length__________________________*/ - expected = 11.0f; - got = D3DXVec4Length(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + got = D3DXVec4Length(&u); + equal = compare_float(got, 11.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXVec4Length(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec4LengthSq________________________*/ - expected = 121.0f; got = D3DXVec4LengthSq(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + equal = compare_float(got, 121.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXVec4LengthSq(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec4Lerp__________________________*/ expectedvec.x = 27.0f; expectedvec.y = -11.0f; expectedvec.z = 62.5; expectedvec.w = 29.5;

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in D3DXVector3Test().
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: c8b95bbd62ad291ea158a8b3387cd48a67cff039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b95bbd62ad291ea158a8b33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:12 2017 +0200 d3dx9/tests: Use compare_float() in D3DXVector3Test(). 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 | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 08751a7..462ae3f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1301,7 +1301,8 @@ static void D3DXVector3Test(void) LPD3DXVECTOR3 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; D3DXMATRIX mat, projection, view, world; - FLOAT coeff1, coeff2, expected, got, scale; + float coeff1, coeff2, got, scale; + BOOL equal; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; u.x = 9.0f; u.y = 6.0f; u.z = 2.0f; @@ -1366,16 +1367,16 @@ static void D3DXVector3Test(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXVec3Dot__________________________*/ - expected = -8.0f; - got = D3DXVec3Dot(&u,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + got = D3DXVec3Dot(&u, &v); + equal = compare_float(got, -8.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /* Tests the case NULL */ - expected=0.0f; - got = D3DXVec3Dot(NULL,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - expected=0.0f; - got = D3DXVec3Dot(NULL,NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + got = D3DXVec3Dot(NULL, &v); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); + got = D3DXVec3Dot(NULL, NULL); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /*_______________D3DXVec3Hermite__________________________*/ expectedvec.x = -6045.75f; expectedvec.y = -6650.0f; expectedvec.z = 1358.875f; @@ -1383,22 +1384,22 @@ static void D3DXVector3Test(void) expect_vec3(&expectedvec, &gotvec, 0); /*_______________D3DXVec3Length__________________________*/ - expected = 11.0f; got = D3DXVec3Length(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + equal = compare_float(got, 11.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXVec3Length(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec3LengthSq________________________*/ - expected = 121.0f; got = D3DXVec3LengthSq(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + equal = compare_float(got, 121.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXVec3LengthSq(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec3Lerp__________________________*/ expectedvec.x = 54.5f; expectedvec.y = 64.5f, expectedvec.z = 41.0f ;

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in D3DXVector2Test().
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: a7d12ef7cf9f6a0f4f7ca9b9547aa8db246181b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d12ef7cf9f6a0f4f7ca9b95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:11 2017 +0200 d3dx9/tests: Use compare_float() in D3DXVector2Test(). 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 | 65 +++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 5b25e91..08751a7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1128,8 +1128,9 @@ static void D3DXVector2Test(void) D3DXVECTOR2 expectedvec, gotvec, nul, u, v, w, x; LPD3DXVECTOR2 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; + float coeff1, coeff2, got, scale; D3DXMATRIX mat; - FLOAT coeff1, coeff2, expected, got, scale; + BOOL equal; nul.x = 0.0f; nul.y = 0.0f; u.x = 3.0f; u.y = 4.0f; @@ -1166,28 +1167,28 @@ static void D3DXVector2Test(void) expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2CCW__________________________*/ - expected = 55.0f; - got = D3DXVec2CCW(&u,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; - got = D3DXVec2CCW(NULL,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - expected=0.0f; - got = D3DXVec2CCW(NULL,NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + got = D3DXVec2CCW(&u, &v); + equal = compare_float(got, 55.0f, 0); + ok(equal, "Got unexpected ccw %.8e.\n", got); + /* Tests the case NULL. */ + got = D3DXVec2CCW(NULL, &v); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected ccw %.8e.\n", got); + got = D3DXVec2CCW(NULL, NULL); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected ccw %.8e.\n", got); /*_______________D3DXVec2Dot__________________________*/ - expected = 15.0f; - got = D3DXVec2Dot(&u,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + got = D3DXVec2Dot(&u, &v); + equal = compare_float(got, 15.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /* Tests the case NULL */ - expected=0.0f; - got = D3DXVec2Dot(NULL,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - expected=0.0f; - got = D3DXVec2Dot(NULL,NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + got = D3DXVec2Dot(NULL, &v); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); + got = D3DXVec2Dot(NULL, NULL); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /*_______________D3DXVec2Hermite__________________________*/ expectedvec.x = 2604.625f; expectedvec.y = -4533.0f; @@ -1195,22 +1196,22 @@ static void D3DXVector2Test(void) expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2Length__________________________*/ - expected = 5.0f; - got = D3DXVec2Length(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + got = D3DXVec2Length(&u); + equal = compare_float(got, 5.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXVec2Length(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec2LengthSq________________________*/ - expected = 25.0f; - got = D3DXVec2LengthSq(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + got = D3DXVec2LengthSq(&u); + equal = compare_float(got, 25.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXVec2LengthSq(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec2Lerp__________________________*/ expectedvec.x = 68.0f; expectedvec.y = -28.5f;

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in D3DXQuaternionTest().
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: b4dca91a537ffb5b322392d2db53c08305a4033d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4dca91a537ffb5b322392d2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:10 2017 +0200 d3dx9/tests: Use compare_float() in D3DXQuaternionTest(). 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 | 47 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 2098e0f..5b25e91 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -738,10 +738,10 @@ static void D3DXQuaternionTest(void) { D3DXMATRIX mat; D3DXQUATERNION expectedquat, gotquat, Nq, Nq1, nul, smallq, smallr, q, r, s, t, u; + BOOL expectedbool, gotbool, equal; + float angle, got, scale, scale2; LPD3DXQUATERNION funcpointer; D3DXVECTOR3 axis, expectedvec; - FLOAT angle, expected, got, scale, scale2; - BOOL expectedbool, gotbool; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; nul.w = 0.0f; q.x = 1.0f, q.y = 2.0f; q.z = 4.0f; q.w = 10.0f; @@ -770,16 +770,16 @@ static void D3DXQuaternionTest(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXQuaternionDot______________________*/ - expected = 55.0f; got = D3DXQuaternionDot(&q,&r); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 55.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /* Tests the case NULL */ - expected=0.0f; got = D3DXQuaternionDot(NULL,&r); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - expected=0.0f; + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); got = D3DXQuaternionDot(NULL,NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /*_______________D3DXQuaternionExp______________________________*/ expectedquat.x = -0.216382f; expectedquat.y = -0.432764f; expectedquat.z = -0.8655270f; expectedquat.w = -0.129449f; @@ -827,22 +827,22 @@ static void D3DXQuaternionTest(void) ok(gotbool == FALSE, "Expected boolean: %d, Got boolean: %d\n", FALSE, gotbool); /*_______________D3DXQuaternionLength__________________________*/ - expected = 11.0f; - got = D3DXQuaternionLength(&q); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + got = D3DXQuaternionLength(&q); + equal = compare_float(got, 11.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXQuaternionLength(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXQuaternionLengthSq________________________*/ - expected = 121.0f; got = D3DXQuaternionLengthSq(&q); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 121.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /* Tests the case NULL */ - expected=0.0f; got = D3DXQuaternionLengthSq(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXQuaternionLn______________________________*/ expectedquat.x = 1.0f; expectedquat.y = 2.0f; expectedquat.z = 4.0f; expectedquat.w = 0.0f; @@ -1101,25 +1101,26 @@ static void D3DXQuaternionTest(void) /*_______________D3DXQuaternionToAxisAngle__________________*/ Nq.x = 1.0f/22.0f; Nq.y = 2.0f/22.0f; Nq.z = 4.0f/22.0f; Nq.w = 10.0f/22.0f; expectedvec.x = 1.0f/22.0f; expectedvec.y = 2.0f/22.0f; expectedvec.z = 4.0f/22.0f; - expected = 2.197869f; D3DXQuaternionToAxisAngle(&Nq,&axis,&angle); expect_vec3(&expectedvec, &axis, 0); - ok(relative_error(angle, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + equal = compare_float(angle, 2.197869f, 0); + ok(equal, "Got unexpected angle %.8e.\n", angle); /* Test if |w|>1.0f */ expectedvec.x = 1.0f; expectedvec.y = 2.0f; expectedvec.z = 4.0f; D3DXQuaternionToAxisAngle(&q,&axis,&angle); expect_vec3(&expectedvec, &axis, 0); /* Test the null quaternion */ expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; - expected = 3.141593f; D3DXQuaternionToAxisAngle(&nul, &axis, &angle); expect_vec3(&expectedvec, &axis, 0); - ok(relative_error(angle, expected) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + equal = compare_float(angle, 3.14159274e+00f, 0); + ok(equal, "Got unexpected angle %.8e.\n", angle); D3DXQuaternionToAxisAngle(&nul, &axis, NULL); D3DXQuaternionToAxisAngle(&nul, NULL, &angle); expect_vec3(&expectedvec, &axis, 0); - ok(relative_error(angle, expected) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + equal = compare_float(angle, 3.14159274e+00f, 0); + ok(equal, "Got unexpected angle %.8e.\n", angle); } static void D3DXVector2Test(void)

1 0

Paul Gofman : d3dx9/tests: Add test for D3DXFX_LARGEADDRESSAWARE effect creation flag.
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 0a5e85d0718f05b9908f5c950863297d5936b7be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5e85d0718f05b9908f5c950… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 28 21:24:11 2017 +0300 d3dx9/tests: Add test for D3DXFX_LARGEADDRESSAWARE effect creation 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/tests/effect.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 997c1fc..3e9d255 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -6150,6 +6150,39 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) ok(!refcount, "Effect pool was not properly freed, refcount %u.\n", refcount); } +static void test_effect_large_address_aware_flag(IDirect3DDevice9 *device) +{ + ID3DXEffect *effect; + D3DXHANDLE param; + static int expected_ivect[4] = {28, 29, 30, 31}; + int ivect[4]; + HRESULT hr; + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, D3DXFX_LARGEADDRESSAWARE, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + param = effect->lpVtbl->GetParameterByName(effect, NULL, "g_iVect"); + ok(!!param, "GetParameterByName failed.\n"); + + hr = effect->lpVtbl->SetValue(effect, param, expected_ivect, sizeof(expected_ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->GetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ok(!memcmp(ivect, expected_ivect, sizeof(expected_ivect)), "Vector value mismatch.\n"); + + if (0) + { + /* Native d3dx crashes in GetValue(). */ + hr = effect->lpVtbl->GetValue(effect, "g_iVect", ivect, sizeof(ivect)); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + } + + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { HWND wnd; @@ -6199,6 +6232,7 @@ START_TEST(effect) test_effect_state_manager(device); test_cross_effect_handle(device); test_effect_shared_parameters(device); + test_effect_large_address_aware_flag(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Piotr Caban : msvcrt: Fix '%z' format handling in strftime.
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 5823e5b9140dc3b6c82c16912f552e7625caf08c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5823e5b9140dc3b6c82c16912… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 3 12:37:26 2017 +0200 msvcrt: Fix '%z' format handling in strftime. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 480d533..57657ca 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1204,7 +1204,7 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f MSVCRT__tzset(); if(MSVCRT__get_tzname(&tmp, str+ret, max-ret, mstm->tm_isdst ? 1 : 0)) return 0; - ret += tmp; + ret += tmp-1; break; case 'U': case 'W':

1 0

Nikolay Sivov : comctl32/listview: Remove internal autoarrange flag, it breaks positioning.
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 791924a2e11b3b3ce71374126bca655d72247939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=791924a2e11b3b3ce71374126… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 3 14:09:27 2017 +0300 comctl32/listview: Remove internal autoarrange flag, it breaks positioning. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c01d816..acafbd3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -249,7 +249,6 @@ typedef struct tagLISTVIEW_INFO RANGES selectionRanges; INT nSelectionMark; /* item to start next multiselection from */ INT nHotItem; - BOOL bAutoarrange; /* Autoarrange flag when NOT in LVS_AUTOARRANGE */ /* columns */ HDPA hdpaColumns; /* array of COLUMN_INFO pointers */ @@ -1584,8 +1583,8 @@ static inline LRESULT CallWindowProcT(WNDPROC proc, HWND hwnd, UINT uMsg, static inline BOOL is_autoarrange(const LISTVIEW_INFO *infoPtr) { - return ((infoPtr->dwStyle & LVS_AUTOARRANGE) || infoPtr->bAutoarrange) && - (infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON); + return (infoPtr->dwStyle & LVS_AUTOARRANGE) && + (infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON); } static void toggle_checkbox_state(LISTVIEW_INFO *infoPtr, INT nItem) @@ -2782,7 +2781,6 @@ static BOOL LISTVIEW_Arrange(LISTVIEW_INFO *infoPtr, INT nAlignCode) default: return FALSE; } - infoPtr->bAutoarrange = TRUE; infoPtr->currIconPos.x = infoPtr->currIconPos.y = 0; for (i = 0; i < infoPtr->nItemCount; i++) { @@ -8936,8 +8934,6 @@ static BOOL LISTVIEW_SetItemPosition(LISTVIEW_INFO *infoPtr, INT nItem, const PO Pt.x -= Origin.x; Pt.y -= Origin.y; - infoPtr->bAutoarrange = FALSE; - return LISTVIEW_MoveIconTo(infoPtr, nItem, &Pt, FALSE); }

1 0

Dmitry Kislyuk : vbscript: Allow colons at the end of first line of loops.
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 4ecc00f6ffefecf1e5e857c99d5e5061b917050e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecc00f6ffefecf1e5e857c99… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Wed May 3 12:36:25 2017 +0200 vbscript: Allow colons at the end of first line of loops. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 12 ++++++------ dlls/vbscript/tests/lang.vbs | 32 +++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 9606592..6b303ee 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -180,15 +180,15 @@ SimpleStatement { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } | IfStatement { $$ = $1; } - | tWHILE Expression tNL StatementsNl_opt tWEND + | tWHILE Expression StSep StatementsNl_opt tWEND { $$ = new_while_statement(ctx, STAT_WHILE, $2, $4); CHECK_ERROR; } - | tDO DoType Expression tNL StatementsNl_opt tLOOP + | tDO DoType Expression StSep StatementsNl_opt tLOOP { $$ = new_while_statement(ctx, $2 ? STAT_WHILELOOP : STAT_UNTIL, $3, $5); CHECK_ERROR; } - | tDO tNL StatementsNl_opt tLOOP DoType Expression + | tDO StSep StatementsNl_opt tLOOP DoType Expression { $$ = new_while_statement(ctx, $5 ? STAT_DOWHILE : STAT_DOUNTIL, $6, $3); CHECK_ERROR; } - | tDO tNL StatementsNl_opt tLOOP { $$ = new_while_statement(ctx, STAT_DOWHILE, NULL, $3); CHECK_ERROR; } + | tDO StSep StatementsNl_opt tLOOP { $$ = new_while_statement(ctx, STAT_DOWHILE, NULL, $3); CHECK_ERROR; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } | tEXIT tDO { $$ = new_statement(ctx, STAT_EXITDO, 0); CHECK_ERROR; } | tEXIT tFOR { $$ = new_statement(ctx, STAT_EXITFOR, 0); CHECK_ERROR; } @@ -201,9 +201,9 @@ SimpleStatement | tON tERROR tRESUME tNEXT { $$ = new_onerror_statement(ctx, TRUE); CHECK_ERROR; } | tON tERROR tGOTO '0' { $$ = new_onerror_statement(ctx, FALSE); CHECK_ERROR; } | tCONST ConstDeclList { $$ = new_const_statement(ctx, $2); CHECK_ERROR; } - | tFOR Identifier '=' Expression tTO Expression Step_opt tNL StatementsNl_opt tNEXT + | tFOR Identifier '=' Expression tTO Expression Step_opt StSep StatementsNl_opt tNEXT { $$ = new_forto_statement(ctx, $2, $4, $6, $7, $9); CHECK_ERROR; } - | tFOR tEACH Identifier tIN Expression tNL StatementsNl_opt tNEXT + | tFOR tEACH Identifier tIN Expression StSep StatementsNl_opt tNEXT { $$ = new_foreach_statement(ctx, $3, $5, $7); } | tSELECT tCASE Expression StSep CaseClausules tEND tSELECT { $$ = new_select_statement(ctx, $3, $5); } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index b23b709..23402cd 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -325,6 +325,11 @@ end if while false wend +x = 0 +WHILE x < 3 : x = x + 1 +Wend +Call ok(x = 3, "x not equal to 3") + x = false y = false do while not (x and y) @@ -343,6 +348,11 @@ do while true ok false, "exit do didn't work" loop +x = 0 +Do While x < 2 : x = x + 1 +Loop +Call ok(x = 2, "x not equal to 2") + x = false y = false do until x and y @@ -361,6 +371,11 @@ do until false ok false, "exit do didn't work" loop +x = 0 +Do: :: x = x + 2 +Loop Until x = 4 +Call ok(x = 4, "x not equal to 4") + x = false do if x then exit do @@ -368,6 +383,14 @@ do loop call ok(x, "x is false after do..loop?") +x = 0 +Do :If x = 6 Then + Exit Do + End If + x = x + 3 +Loop +Call ok(x = 6, "x not equal to 6") + x = false y = false do @@ -451,6 +474,11 @@ for x = 5 to 8 step z next Call ok(y = "for7: 5 6 7 8", "y = " & y) +z = 0 +For x = 10 To 18 Step 2 : : z = z + 1 +Next +Call ok(z = 5, "z not equal to 5") + y = "for8:" for x = 5 to 8 y = y & " " & x @@ -482,11 +510,13 @@ wend Call collectionObj.reset() y = 0 x = 10 -for each x in collectionObj +z = 0 +for each x in collectionObj : z = z + 2 y = y+1 Call ok(x = y, "x <> y") next Call ok(y = 3, "y = " & y) +Call ok(z = 6, "z = " & z) Call ok(getVT(x) = "VT_EMPTY*", "getVT(x) = " & getVT(x)) Call collectionObj.reset()

1 0