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

Henri Verbeet : d3dx9/tests: Cleanup expect_plane.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 2b9425952aabd5b49678e7feb73b0426f89cbf10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9425952aabd5b49678e7feb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 26 00:10:59 2017 +0200 d3dx9/tests: Cleanup expect_plane. 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 | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9f40d86..85ea4a3 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -53,6 +53,14 @@ static BOOL compare_color(const D3DXCOLOR *c1, const D3DXCOLOR *c2, unsigned int && compare_float(c1->a, c2->a, ulps); } +static BOOL compare_plane(const D3DXPLANE *p1, const D3DXPLANE *p2, unsigned int ulps) +{ + return compare_float(p1->a, p2->a, ulps) + && compare_float(p1->b, p2->b, ulps) + && compare_float(p1->c, p2->c, ulps) + && compare_float(p1->d, p2->d, ulps); +} + static BOOL compare_matrix(const D3DXMATRIX *m1, const D3DXMATRIX *m2, unsigned int ulps) { unsigned int i, j; @@ -78,6 +86,15 @@ static void expect_color_(unsigned int line, const D3DXCOLOR *expected, const D3 color->r, color->g, color->b, color->a, expected->r, expected->g, expected->b, expected->a); } +#define expect_plane(expected, plane, ulps) expect_plane_(__LINE__, expected, plane, ulps) +static void expect_plane_(unsigned int line, const D3DXPLANE *expected, const D3DXPLANE *plane, unsigned int ulps) +{ + BOOL equal = compare_plane(expected, plane, ulps); + ok_(__FILE__, line)(equal, + "Got unexpected plane {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + plane->a, plane->b, plane->c, plane->d, expected->a, expected->b, expected->c, expected->d); +} + #define expect_matrix(expected, matrix, ulps) expect_matrix_(__LINE__, expected, matrix, ulps) static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const D3DXMATRIX *matrix, unsigned int ulps) { @@ -146,8 +163,6 @@ static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const i); \ } -#define expect_plane(expectedplane,gotplane) ok((relative_error(expectedplane.a, gotplane.a)<admitted_error)&&(relative_error(expectedplane.b, gotplane.b)<admitted_error)&&(relative_error(expectedplane.c, gotplane.c)<admitted_error)&&(relative_error(expectedplane.d, gotplane.d)<admitted_error),"Expected Plane= (%f, %f, %f, %f)\n , Got Plane= (%f, %f, %f, %f)\n", expectedplane.a, expectedplane.b, expectedplane.c, expectedplane.d, gotplane.a, gotplane.b, gotplane.c, gotplane.d); - #define expect_vec(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error),"Expected Vector= (%f, %f)\n , Got Vector= (%f, %f)\n", expectedvec.x, expectedvec.y, gotvec.x, gotvec.y); #define expect_vec3(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error)&&(relative_error(expectedvec.z, gotvec.z)<admitted_error),"Expected Vector= (%f, %f, %f)\n , Got Vector= (%f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, gotvec.x, gotvec.y, gotvec.z); @@ -644,14 +659,14 @@ static void D3DXPlaneTest(void) vec2.x = 17.0f; vec2.y = 31.0f; vec2.z = 24.0f; expectedplane.a = 17.0f; expectedplane.b = 31.0f; expectedplane.c = 24.0f; expectedplane.d = -950.0f; D3DXPlaneFromPointNormal(&gotplane, &vec1, &vec2); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); gotplane.a = vec2.x; gotplane.b = vec2.y; gotplane.c = vec2.z; D3DXPlaneFromPointNormal(&gotplane, &vec1, (D3DXVECTOR3 *)&gotplane); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); gotplane.a = vec1.x; gotplane.b = vec1.y; gotplane.c = vec1.z; expectedplane.d = -1826.0f; D3DXPlaneFromPointNormal(&gotplane, (D3DXVECTOR3 *)&gotplane, &vec2); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); /*_______________D3DXPlaneFromPoints_______*/ vec1.x = 1.0f; vec1.y = 2.0f; vec1.z = 3.0f; @@ -659,7 +674,7 @@ static void D3DXPlaneTest(void) vec3.x = 83.0f; vec3.y = 74.0f; vec3.z = 65.0f; expectedplane.a = 0.085914f; expectedplane.b = -0.704492f; expectedplane.c = 0.704492f; expectedplane.d = -0.790406f; D3DXPlaneFromPoints(&gotplane,&vec1,&vec2,&vec3); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 64); /*_______________D3DXPlaneIntersectLine___________*/ vec1.x = 9.0f; vec1.y = 6.0f; vec1.z = 3.0f; @@ -677,16 +692,16 @@ static void D3DXPlaneTest(void) /*_______________D3DXPlaneNormalize______________*/ expectedplane.a = -3.0f/sqrt(26.0f); expectedplane.b = -1.0f/sqrt(26.0f); expectedplane.c = 4.0f/sqrt(26.0f); expectedplane.d = 7.0/sqrt(26.0f); D3DXPlaneNormalize(&gotplane, &plane); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 2); nulplane.a = 0.0; nulplane.b = 0.0f, nulplane.c = 0.0f; nulplane.d = 0.0f; expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; D3DXPlaneNormalize(&gotplane, &nulplane); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); /*_______________D3DXPlaneTransform____________*/ expectedplane.a = 49.0f; expectedplane.b = -98.0f; expectedplane.c = 55.0f; expectedplane.d = -165.0f; D3DXPlaneTransform(&gotplane,&plane,&mat); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); } static void D3DXQuaternionTest(void)

1 0

Henri Verbeet : d3dx9/tests: Avoid using expect_vec4 for comparing quaternions.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: cbda84abd9aeac48279d9f5d08f4aafc225330c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbda84abd9aeac48279d9f5d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 26 00:11:00 2017 +0200 d3dx9/tests: Avoid using expect_vec4 for comparing quaternions. 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 | 121 ++++++++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbda84abd9aeac48279d9…

1 0

Henri Verbeet : d3dx9/tests: Cleanup expect_vec.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: c0dabf1e6d2825f58a5cc33bc0035c2e8ab2a115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0dabf1e6d2825f58a5cc33bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 26 00:11:01 2017 +0200 d3dx9/tests: Cleanup expect_vec. 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 | 62 +++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 69ca5ad..9aa1df0 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -45,6 +45,11 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } +static BOOL compare_vec2(const D3DXVECTOR2 *v1, const D3DXVECTOR2 *v2, unsigned int ulps) +{ + return compare_float(v1->x, v2->x, ulps) && compare_float(v1->y, v2->y, ulps); +} + static BOOL compare_color(const D3DXCOLOR *c1, const D3DXCOLOR *c2, unsigned int ulps) { return compare_float(c1->r, c2->r, ulps) @@ -85,6 +90,15 @@ static BOOL compare_matrix(const D3DXMATRIX *m1, const D3DXMATRIX *m2, unsigned return TRUE; } +#define expect_vec2(expected, vector, ulps) expect_vec2_(__LINE__, expected, vector, ulps) +static void expect_vec2_(unsigned int line, const D3DXVECTOR2 *expected, const D3DXVECTOR2 *vector, unsigned int ulps) +{ + BOOL equal = compare_vec2(expected, vector, ulps); + ok_(__FILE__, line)(equal, + "Got unexpected vector {%.8e, %.8e}, expected {%.8e, %.8e}.\n", + vector->x, vector->y, expected->x, expected->y); +} + #define expect_color(expected, color, ulps) expect_color_(__LINE__, expected, color, ulps) static void expect_color_(unsigned int line, const D3DXCOLOR *expected, const D3DXCOLOR *color, unsigned int ulps) { @@ -182,8 +196,6 @@ static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const i); \ } -#define expect_vec(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error),"Expected Vector= (%f, %f)\n , Got Vector= (%f, %f)\n", expectedvec.x, expectedvec.y, gotvec.x, gotvec.y); - #define expect_vec3(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error)&&(relative_error(expectedvec.z, gotvec.z)<admitted_error),"Expected Vector= (%f, %f, %f)\n , Got Vector= (%f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, gotvec.x, gotvec.y, gotvec.z); #define expect_vec4(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error)&&(relative_error(expectedvec.z, gotvec.z)<admitted_error)&&(relative_error(expectedvec.w, gotvec.w)<admitted_error),"Expected Vector= (%f, %f, %f, %f)\n , Got Vector= (%f, %f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, expectedvec.w, gotvec.x, gotvec.y, gotvec.z, gotvec.w); @@ -1136,7 +1148,7 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Add__________________________*/ expectedvec.x = -4.0f; expectedvec.y = 13.0f; D3DXVec2Add(&gotvec,&u,&v); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec2Add(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1146,12 +1158,12 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2BaryCentric___________________*/ expectedvec.x = -12.0f; expectedvec.y = -21.0f; D3DXVec2BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2CatmullRom____________________*/ expectedvec.x = 5820.25f; expectedvec.y = -3654.5625f; D3DXVec2CatmullRom(&gotvec,&u,&v,&w,&x,scale); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2CCW__________________________*/ expected = 55.0f; @@ -1180,7 +1192,7 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Hermite__________________________*/ expectedvec.x = 2604.625f; expectedvec.y = -4533.0f; D3DXVec2Hermite(&gotvec,&u,&v,&w,&x,scale); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2Length__________________________*/ expected = 5.0f; @@ -1201,20 +1213,20 @@ static void D3DXVector2Test(void) ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); /*_______________D3DXVec2Lerp__________________________*/ - expectedvec.x = 68.0f; expectedvec.y = -28.5f; - D3DXVec2Lerp(&gotvec,&u,&v,scale); - expect_vec(expectedvec,gotvec); - /* Tests the case NULL */ + expectedvec.x = 68.0f; expectedvec.y = -28.5f; + D3DXVec2Lerp(&gotvec, &u, &v, scale); + expect_vec2(&expectedvec, &gotvec, 0); + /* Tests the case NULL. */ funcpointer = D3DXVec2Lerp(&gotvec,NULL,&v,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); funcpointer = D3DXVec2Lerp(NULL,NULL,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXVec2Maximize__________________________*/ - expectedvec.x = 3.0f; expectedvec.y = 9.0f; - D3DXVec2Maximize(&gotvec,&u,&v); - expect_vec(expectedvec,gotvec); - /* Tests the case NULL */ + expectedvec.x = 3.0f; expectedvec.y = 9.0f; + D3DXVec2Maximize(&gotvec, &u, &v); + expect_vec2(&expectedvec, &gotvec, 0); + /* Tests the case NULL. */ funcpointer = D3DXVec2Maximize(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); funcpointer = D3DXVec2Maximize(NULL,NULL,NULL); @@ -1223,7 +1235,7 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Minimize__________________________*/ expectedvec.x = -7.0f; expectedvec.y = 4.0f; D3DXVec2Minimize(&gotvec,&u,&v); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec2Minimize(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1233,16 +1245,16 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Normalize_________________________*/ expectedvec.x = 0.6f; expectedvec.y = 0.8f; D3DXVec2Normalize(&gotvec,&u); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /* Test the nul vector */ expectedvec.x = 0.0f; expectedvec.y = 0.0f; D3DXVec2Normalize(&gotvec,&nul); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2Scale____________________________*/ expectedvec.x = -19.5f; expectedvec.y = -26.0f; D3DXVec2Scale(&gotvec,&u,scale); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec2Scale(&gotvec,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1250,10 +1262,10 @@ static void D3DXVector2Test(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXVec2Subtract__________________________*/ - expectedvec.x = 10.0f; expectedvec.y = -5.0f; - D3DXVec2Subtract(&gotvec,&u,&v); - expect_vec(expectedvec,gotvec); - /* Tests the case NULL */ + expectedvec.x = 10.0f; expectedvec.y = -5.0f; + D3DXVec2Subtract(&gotvec, &u, &v); + expect_vec2(&expectedvec, &gotvec, 0); + /* Tests the case NULL. */ funcpointer = D3DXVec2Subtract(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); funcpointer = D3DXVec2Subtract(NULL,NULL,NULL); @@ -1270,15 +1282,15 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2TransformCoord_______________________*/ expectedvec.x = 0.6f; expectedvec.y = 11.0f/15.0f; D3DXVec2TransformCoord(&gotvec, &u, &mat); - expect_vec(expectedvec, gotvec); + expect_vec2(&expectedvec, &gotvec, 1); gotvec.x = u.x; gotvec.y = u.y; D3DXVec2TransformCoord(&gotvec, (D3DXVECTOR2 *)&gotvec, &mat); - expect_vec(expectedvec, gotvec); + expect_vec2(&expectedvec, &gotvec, 1); /*_______________D3DXVec2TransformNormal______________________*/ expectedvec.x = 23.0f; expectedvec.y = 30.0f; D3DXVec2TransformNormal(&gotvec,&u,&mat); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); } static void D3DXVector3Test(void)

1 0

Henri Verbeet : d3dx9/tests: Cleanup expect_vec3.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 398e701deb117b8a118b93a97a22df71cb813cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=398e701deb117b8a118b93a97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 26 20:23:19 2017 +0200 d3dx9/tests: Cleanup expect_vec3. 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 | 83 +++++++++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=398e701deb117b8a118b9…

1 0

Henri Verbeet : d3dx9/tests: Cleanup expect_vec4.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 739703dc3cba6facc195b8f2c3e3a876dd88a638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739703dc3cba6facc195b8f2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 26 00:11:03 2017 +0200 d3dx9/tests: Cleanup expect_vec4. 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 | 52 +++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index a57b620..586be2d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -57,6 +57,14 @@ static BOOL compare_vec3(const D3DXVECTOR3 *v1, const D3DXVECTOR3 *v2, unsigned && compare_float(v1->z, v2->z, ulps); } +static BOOL compare_vec4(const D3DXVECTOR4 *v1, const D3DXVECTOR4 *v2, unsigned int ulps) +{ + return compare_float(v1->x, v2->x, ulps) + && compare_float(v1->y, v2->y, ulps) + && compare_float(v1->z, v2->z, ulps) + && compare_float(v1->w, v2->w, ulps); +} + static BOOL compare_color(const D3DXCOLOR *c1, const D3DXCOLOR *c2, unsigned int ulps) { return compare_float(c1->r, c2->r, ulps) @@ -115,6 +123,15 @@ static void expect_vec3_(unsigned int line, const D3DXVECTOR3 *expected, const D vector->x, vector->y, vector->z, expected->x, expected->y, expected->z); } +#define expect_vec4(expected, vector, ulps) expect_vec4_(__LINE__, expected, vector, ulps) +static void expect_vec4_(unsigned int line, const D3DXVECTOR4 *expected, const D3DXVECTOR4 *vector, unsigned int ulps) +{ + BOOL equal = compare_vec4(expected, vector, ulps); + ok_(__FILE__, line)(equal, + "Got unexpected vector {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + vector->x, vector->y, vector->z, vector->w, expected->x, expected->y, expected->z, expected->w); +} + #define expect_color(expected, color, ulps) expect_color_(__LINE__, expected, color, ulps) static void expect_color_(unsigned int line, const D3DXCOLOR *expected, const D3DXCOLOR *color, unsigned int ulps) { @@ -212,9 +229,6 @@ static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const i); \ } -#define expect_vec4(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error)&&(relative_error(expectedvec.z, gotvec.z)<admitted_error)&&(relative_error(expectedvec.w, gotvec.w)<admitted_error),"Expected Vector= (%f, %f, %f, %f)\n , Got Vector= (%f, %f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, expectedvec.w, gotvec.x, gotvec.y, gotvec.z, gotvec.w); - - static void D3DXColorTest(void) { D3DXCOLOR color, color1, color2, expected, got; @@ -1288,10 +1302,10 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Transform_______________________*/ expectedtrans.x = 36.0f; expectedtrans.y = 44.0f; expectedtrans.z = 52.0f; expectedtrans.w = 60.0f; D3DXVec2Transform(&gottrans, &u, &mat); - expect_vec4(expectedtrans, gottrans); + expect_vec4(&expectedtrans, &gottrans, 0); gottrans.x = u.x; gottrans.y = u.y; D3DXVec2Transform(&gottrans, (D3DXVECTOR2 *)&gottrans, &mat); - expect_vec4(expectedtrans, gottrans); + expect_vec4(&expectedtrans, &gottrans, 0); /*_______________D3DXVec2TransformCoord_______________________*/ expectedvec.x = 0.6f; expectedvec.y = 11.0f/15.0f; @@ -1475,11 +1489,11 @@ static void D3DXVector3Test(void) /*_______________D3DXVec3Transform_______________________*/ expectedtrans.x = 70.0f; expectedtrans.y = 88.0f; expectedtrans.z = 106.0f; expectedtrans.w = 124.0f; D3DXVec3Transform(&gottrans, &u, &mat); - expect_vec4(expectedtrans, gottrans); + expect_vec4(&expectedtrans, &gottrans, 0); gottrans.x = u.x; gottrans.y = u.y; gottrans.z = u.z; D3DXVec3Transform(&gottrans, (D3DXVECTOR3 *)&gottrans, &mat); - expect_vec4(expectedtrans, gottrans); + expect_vec4(&expectedtrans, &gottrans, 0); /*_______________D3DXVec3TransformCoord_______________________*/ expectedvec.x = 70.0f/124.0f; expectedvec.y = 88.0f/124.0f; expectedvec.z = 106.0f/124.0f; @@ -1568,7 +1582,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Add__________________________*/ expectedvec.x = -2.0f; expectedvec.y = 6.0f; expectedvec.z = -1.0f; expectedvec.w = 17.0f; D3DXVec4Add(&gotvec,&u,&v); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec4Add(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1578,17 +1592,17 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4BaryCentric____________________*/ expectedvec.x = 8.0f; expectedvec.y = 26.0; expectedvec.z = -44.0f; expectedvec.w = -41.0f; D3DXVec4BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /*_______________D3DXVec4CatmullRom____________________*/ expectedvec.x = 2754.625f; expectedvec.y = 2367.5625f; expectedvec.z = 1060.1875f; expectedvec.w = 131.3125f; D3DXVec4CatmullRom(&gotvec,&u,&v,&w,&x,scale); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /*_______________D3DXVec4Cross_________________________*/ expectedvec.x = 390.0f; expectedvec.y = -393.0f; expectedvec.z = -316.0f; expectedvec.w = 166.0f; D3DXVec4Cross(&gotvec,&u,&v,&w); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /*_______________D3DXVec4Dot__________________________*/ expected = 55.0f; @@ -1605,7 +1619,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Hermite_________________________*/ expectedvec.x = 1224.625f; expectedvec.y = 3461.625f; expectedvec.z = -4758.875f; expectedvec.w = -5781.5f; D3DXVec4Hermite(&gotvec,&u,&v,&w,&x,scale); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /*_______________D3DXVec4Length__________________________*/ expected = 11.0f; @@ -1628,7 +1642,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Lerp__________________________*/ expectedvec.x = 27.0f; expectedvec.y = -11.0f; expectedvec.z = 62.5; expectedvec.w = 29.5; D3DXVec4Lerp(&gotvec,&u,&v,scale); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec4Lerp(&gotvec,NULL,&v,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1638,7 +1652,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Maximize__________________________*/ expectedvec.x = 1.0f; expectedvec.y = 4.0f; expectedvec.z = 4.0f; expectedvec.w = 10.0; D3DXVec4Maximize(&gotvec,&u,&v); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec4Maximize(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1648,7 +1662,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Minimize__________________________*/ expectedvec.x = -3.0f; expectedvec.y = 2.0f; expectedvec.z = -5.0f; expectedvec.w = 7.0; D3DXVec4Minimize(&gotvec,&u,&v); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec4Minimize(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1658,12 +1672,12 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Normalize_________________________*/ expectedvec.x = 1.0f/11.0f; expectedvec.y = 2.0f/11.0f; expectedvec.z = 4.0f/11.0f; expectedvec.w = 10.0f/11.0f; D3DXVec4Normalize(&gotvec,&u); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 1); /*_______________D3DXVec4Scale____________________________*/ expectedvec.x = -6.5f; expectedvec.y = -13.0f; expectedvec.z = -26.0f; expectedvec.w = -65.0f; D3DXVec4Scale(&gotvec,&u,scale); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec4Scale(&gotvec,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1673,7 +1687,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Subtract__________________________*/ expectedvec.x = 4.0f; expectedvec.y = -2.0f; expectedvec.z = 9.0f; expectedvec.w = 3.0f; D3DXVec4Subtract(&gotvec,&u,&v); - expect_vec4(expectedvec,gotvec); + expect_vec4(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec4Subtract(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1683,7 +1697,7 @@ static void D3DXVector4Test(void) /*_______________D3DXVec4Transform_______________________*/ expectedtrans.x = 177.0f; expectedtrans.y = 194.0f; expectedtrans.z = 211.0f; expectedtrans.w = 228.0f; D3DXVec4Transform(&gottrans,&u,&mat); - expect_vec4(expectedtrans,gottrans); + expect_vec4(&expectedtrans, &gottrans, 0); } static void test_matrix_stack(void)

1 0

Paul Gofman : d3dx9: Reference effect pool implementation in d3dx9_base_effect structure.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 9043ff030ea846e52a56d907f949071e7aa3d799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9043ff030ea846e52a56d907f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Apr 26 12:21:02 2017 +0300 d3dx9: Reference effect pool implementation in d3dx9_base_effect structure. 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 | 84 +++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0f5e3e5..b732c67 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -148,6 +148,8 @@ struct d3dx9_base_effect struct d3dx_parameter *parameters; struct d3dx_technique *techniques; struct d3dx_object *objects; + + struct d3dx_effect_pool *pool; }; struct ID3DXEffectImpl @@ -171,6 +173,12 @@ struct ID3DXEffectImpl BOOL material_updated; }; +struct d3dx_effect_pool +{ + ID3DXEffectPool ID3DXEffectPool_iface; + LONG refcount; +}; + struct ID3DXEffectCompilerImpl { ID3DXEffectCompiler ID3DXEffectCompiler_iface; @@ -3032,6 +3040,11 @@ static BOOL is_same_parameter(void *param1_, struct d3dx_parameter *param2) return TRUE; } +static inline struct d3dx_effect_pool *impl_from_ID3DXEffectPool(ID3DXEffectPool *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx_effect_pool, ID3DXEffectPool_iface); +} + static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) { return CONTAINING_RECORD(iface, struct ID3DXEffectImpl, ID3DXEffect_iface); @@ -6029,16 +6042,17 @@ err_out: static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT eflags, ID3DBlob **errors, struct ID3DXEffectImpl *effect) + UINT eflags, ID3DBlob **errors, struct ID3DXEffectImpl *effect, struct d3dx_effect_pool *pool) { DWORD tag, offset; const char *ptr = data; HRESULT hr; ID3DBlob *bytecode = NULL, *temp_errors = NULL; - TRACE("base %p, data %p, data_size %lu, effect %p\n", base, data, data_size, effect); + TRACE("base %p, data %p, data_size %lu, effect %p, pool %p.\n", base, data, data_size, effect, pool); base->effect = effect; + base->pool = pool; read_dword(&ptr, &tag); TRACE("Tag: %x\n", tag); @@ -6111,20 +6125,25 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3 UINT eflags, ID3DBlob **error_messages, struct ID3DXEffectPool *pool) { HRESULT hr; + struct d3dx_effect_pool *pool_impl = NULL; TRACE("effect %p, device %p, data %p, data_size %lu, pool %p\n", effect, device, data, data_size, pool); effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; - if (pool) pool->lpVtbl->AddRef(pool); + if (pool) + { + pool->lpVtbl->AddRef(pool); + pool_impl = impl_from_ID3DXEffectPool(pool); + } effect->pool = pool; IDirect3DDevice9_AddRef(device); effect->device = device; if (FAILED(hr = d3dx9_base_effect_init(&effect->base_effect, data, data_size, defines, include, - eflags, error_messages, effect))) + eflags, error_messages, effect, pool_impl))) { FIXME("Failed to parse effect, hr %#x.\n", hr); free_effect(effect); @@ -6211,7 +6230,7 @@ static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compil compiler->ref = 1; if (FAILED(hr = d3dx9_base_effect_init(&compiler->base_effect, data, data_size, defines, - include, eflags, error_messages, NULL))) + include, eflags, error_messages, NULL, NULL))) { FIXME("Failed to parse effect, hr %#x.\n", hr); free_effect_compiler(compiler); @@ -6256,21 +6275,10 @@ HRESULT WINAPI D3DXCreateEffectCompiler(const char *srcdata, UINT srcdatalen, co return D3D_OK; } -struct ID3DXEffectPoolImpl -{ - ID3DXEffectPool ID3DXEffectPool_iface; - LONG ref; -}; - -static inline struct ID3DXEffectPoolImpl *impl_from_ID3DXEffectPool(ID3DXEffectPool *iface) -{ - return CONTAINING_RECORD(iface, struct ID3DXEffectPoolImpl, ID3DXEffectPool_iface); -} - /*** IUnknown methods ***/ -static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool *iface, REFIID riid, void **object) +static HRESULT WINAPI d3dx_effect_pool_QueryInterface(ID3DXEffectPool *iface, REFIID riid, void **object) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXEffectPool)) @@ -6285,41 +6293,47 @@ static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool *iface, return E_NOINTERFACE; } -static ULONG WINAPI ID3DXEffectPoolImpl_AddRef(ID3DXEffectPool *iface) +static ULONG WINAPI d3dx_effect_pool_AddRef(ID3DXEffectPool *iface) { - struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); + struct d3dx_effect_pool *pool = impl_from_ID3DXEffectPool(iface); + ULONG refcount = InterlockedIncrement(&pool->refcount); - TRACE("(%p)->(): AddRef from %u\n", This, This->ref); + TRACE("%p increasing refcount to %u.\n", pool, refcount); - return InterlockedIncrement(&This->ref); + return refcount; } -static ULONG WINAPI ID3DXEffectPoolImpl_Release(ID3DXEffectPool *iface) +static void free_effect_pool(struct d3dx_effect_pool *pool) { - struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); - ULONG ref = InterlockedDecrement(&This->ref); + HeapFree(GetProcessHeap(), 0, pool); +} - TRACE("(%p)->(): Release from %u\n", This, ref + 1); +static ULONG WINAPI d3dx_effect_pool_Release(ID3DXEffectPool *iface) +{ + struct d3dx_effect_pool *pool = impl_from_ID3DXEffectPool(iface); + ULONG refcount = InterlockedDecrement(&pool->refcount); - if (!ref) - HeapFree(GetProcessHeap(), 0, This); + TRACE("%p decreasing refcount to %u.\n", pool, refcount); - return ref; + if (!refcount) + free_effect_pool(pool); + + return refcount; } static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl = { /*** IUnknown methods ***/ - ID3DXEffectPoolImpl_QueryInterface, - ID3DXEffectPoolImpl_AddRef, - ID3DXEffectPoolImpl_Release + d3dx_effect_pool_QueryInterface, + d3dx_effect_pool_AddRef, + d3dx_effect_pool_Release }; HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool) { - struct ID3DXEffectPoolImpl *object; + struct d3dx_effect_pool *object; - TRACE("(%p)\n", pool); + TRACE("pool %p.\n", pool); if (!pool) return D3DERR_INVALIDCALL; @@ -6329,7 +6343,7 @@ HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool) return E_OUTOFMEMORY; object->ID3DXEffectPool_iface.lpVtbl = &ID3DXEffectPool_Vtbl; - object->ref = 1; + object->refcount = 1; *pool = &object->ID3DXEffectPool_iface;

1 0

Paul Gofman : d3dx9/tests: Add test for releasing pool before effects referencing it.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: eb9febab0393613c804345f8268829d82aea30fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb9febab0393613c804345f82… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Apr 26 12:21:03 2017 +0300 d3dx9/tests: Add test for releasing pool before effects referencing it. 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 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 9a436d5..dbf91c4 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -6130,6 +6130,21 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) hr = effect2->lpVtbl->End(effect2); ok(hr == D3D_OK, "Got result %#x.\n", hr); + if (0) + { + refcount = pool->lpVtbl->Release(pool); + ok(refcount == 2, "Unexpected refcount %u.\n", refcount); + + refcount = pool->lpVtbl->Release(pool); + ok(refcount == 1, "Unexpected refcount %u.\n", refcount); + + refcount = pool->lpVtbl->Release(pool); + ok(!refcount, "Unexpected refcount %u.\n", refcount); + + /* Native d3dx crashes in GetFloat(). */ + effect2->lpVtbl->GetFloat(effect2, "arr2[0]", &fvect.x); + } + effect1->lpVtbl->Release(effect1); effect2->lpVtbl->Release(effect2);

1 0

Paul Gofman : d3dx9: Support parameters sharing in effect.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 6f99cf01e1b88c9bb09fe6b9bff3443514db5ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f99cf01e1b88c9bb09fe6b9b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Apr 26 20:25:46 2017 +0200 d3dx9: Support parameters sharing in effect. 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 | 8 +- dlls/d3dx9_36/effect.c | 209 +++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/effect.c | 21 ++--- 3 files changed, 224 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f99cf01e1b88c9bb09fe…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 0351f7ed93b68a7fc47153fb3206e79c28833033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0351f7ed93b68a7fc47153fb3… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 26 09:06:25 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2cd4fa6..07ab574 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-03-22 23:05+0300\n" +"PO-Revision-Date: 2017-04-26 09:05+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -9383,7 +9383,7 @@ msgstr "Atributas ar reikšmė egzistuoja" #: wldap32.rc:53 msgid "Invalid Syntax" -msgstr "Neteisinga sintaksė" +msgstr "Netinkama sintaksė" #: wldap32.rc:64 msgid "No Such Object" @@ -12107,10 +12107,8 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Nepavyko pašalinti registro klasės „%1“.\n" #: regedit.rc:398 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Eilutė „%1“ neatpažinta.\n" +msgstr "regedit: Eilutėje yra netinkama sintaksė.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 7fda9dcf5889a2f4245d882a5aa84665d8b6f61b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fda9dcf5889a2f4245d882a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 26 10:29:23 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 027a4af..212285c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-04-21 14:36+0300\n" +"PO-Revision-Date: 2017-04-26 10:24+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12101,10 +12101,8 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: не удалось удалить класс «%1».\n" #: regedit.rc:398 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: строка «%1» не распознана.\n" +msgstr "regedit: некорректный формат строки.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0