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

Nikolay Sivov : gdiplus: Use better naming for line alignment format field.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: c89de1dd08ca9d2dab7463780f62c8a0ea5fd4fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c89de1dd08ca9d2dab7463780… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 28 01:20:32 2017 +0300 gdiplus: Use better naming for line alignment format field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 8 ++++---- dlls/gdiplus/graphicspath.c | 4 ++-- dlls/gdiplus/stringformat.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 443370a..af7ef43 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -450,7 +450,7 @@ struct GpStringFormat{ StringAlignment align; StringTrimming trimming; HotkeyPrefix hkprefix; - StringAlignment vertalign; + StringAlignment line_align; StringDigitSubstitute digitsub; INT tabcount; REAL firsttab; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index beedb9e..4d8bdd7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5417,19 +5417,19 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string /* Should be no need to explicitly test for StringAlignmentNear as * that is default behavior if no alignment is passed. */ - if(format->vertalign != StringAlignmentNear){ + if(format->line_align != StringAlignmentNear){ RectF bounds, in_rect = *rect; in_rect.Height = 0.0; /* avoid height clipping */ GdipMeasureString(graphics, string, length, font, &in_rect, format, &bounds, 0, 0); TRACE("bounds %s\n", debugstr_rectf(&bounds)); - if(format->vertalign == StringAlignmentCenter) + if(format->line_align == StringAlignmentCenter) offsety = (rect->Height - bounds.Height) / 2; - else if(format->vertalign == StringAlignmentFar) + else if(format->line_align == StringAlignmentFar) offsety = (rect->Height - bounds.Height); } - TRACE("vertical align %d, offsety %f\n", format->vertalign, offsety); + TRACE("line align %d, offsety %f\n", format->line_align, offsety); } save_state = SaveDC(hdc); diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 4d70796..3d33c29 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1028,13 +1028,13 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT heap_free(backup); return status; } - if (format && format->vertalign == StringAlignmentCenter && layoutRect->Y + args.maxY < layoutRect->Height) + if (format && format->line_align == StringAlignmentCenter && layoutRect->Y + args.maxY < layoutRect->Height) { float inc = layoutRect->Height + layoutRect->Y - args.maxY; inc /= 2; for (i = backup->pathdata.Count; i < path->pathdata.Count; ++i) path->pathdata.Points[i].Y += inc; - } else if (format && format->vertalign == StringAlignmentFar) { + } else if (format && format->line_align == StringAlignmentFar) { float inc = layoutRect->Height + layoutRect->Y - args.maxY; for (i = backup->pathdata.Count; i < path->pathdata.Count; ++i) path->pathdata.Points[i].Y += inc; diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 660731d..e376e7b 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -178,7 +178,7 @@ GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat *format, if(!format || !align) return InvalidParameter; - *align = format->vertalign; + *align = format->line_align; return Ok; } @@ -282,7 +282,7 @@ GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat *format, if(!format) return InvalidParameter; - format->vertalign = align; + format->line_align = align; return Ok; }

1 0

Alexandre Julliard : Release 2.7.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 07cf14dc928a1a00baecbbc7ca5a6f3fe680238c URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cf14dc928a1a00baecbbc7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 28 19:42:09 2017 +0200 Release 2.7. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 811 ++++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 452 insertions(+), 379 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07cf14dc928a1a00baecb…

1 0

Tag wine-2.7 : Alexandre Julliard : Release 2.7
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: refs/tags/wine-2.7 Tag: fae68484d99312a10429881d20a7e79a5e39078d URL: http://source.winehq.org/git/wine.git/?a=tag;h=fae68484d99312a10429881d20a7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 28 19:42:09 2017 +0200 Release 2.7

1 0

Henri Verbeet : d3dx9/tests: Get rid of compare_rotation.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 8c81500daa264f11547c28152474c892087eb271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c81500daa264f11547c28152… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 27 23:52:40 2017 +0200 d3dx9/tests: Get rid of compare_rotation. 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 | 222 ++++++++++++++++++++++----------------------- 1 file changed, 109 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c81500daa264f11547c2…

1 0

Henri Verbeet : d3dx9/tests: Get rid of compare_scale.
by Alexandre Julliard 28 Apr '17

28 Apr '17

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

Henri Verbeet : d3dx9/tests: Get rid of compare_translation.
by Alexandre Julliard 28 Apr '17

28 Apr '17

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: Cleanup compare_vectors.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: a16cd73186361c1b6e70b5fabd1664af10ff9af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16cd73186361c1b6e70b5fab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 27 23:52:43 2017 +0200 d3dx9/tests: Cleanup compare_vectors. 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 | 111 +++++++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a16cd73186361c1b6e70b…

1 0

Henri Verbeet : d3dx9/tests: Get rid of compare_planes.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 733823c890f802c63bf97b5449d0ca658cd68f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=733823c890f802c63bf97b544… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 27 23:52:44 2017 +0200 d3dx9/tests: Get rid of compare_planes. 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, 10 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 763454d..c0f6bee 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -199,18 +199,6 @@ static void expect_vec4_array_(unsigned int line, SIZE_T count, const D3DXVECTOR } } -#define compare_planes(exp, out) \ - for (i = 0; i < ARRAY_SIZE + 2; ++i) { \ - ok(relative_error(exp[i].a, out[i].a) < admitted_error && \ - relative_error(exp[i].b, out[i].b) < admitted_error && \ - relative_error(exp[i].c, out[i].c) < admitted_error && \ - relative_error(exp[i].d, out[i].d) < admitted_error, \ - "Got (%f, %f, %f, %f), expected (%f, %f, %f, %f) for index %d.\n", \ - out[i].a, out[i].b, out[i].c, out[i].d, \ - exp[i].a, exp[i].b, exp[i].c, exp[i].d, \ - i); \ - } - static void D3DXColorTest(void) { D3DXCOLOR color, color1, color2, expected, got; @@ -2449,8 +2437,16 @@ static void test_D3DXVec_Array(void) exp_plane[3].a = 74.0f; exp_plane[3].b = 84.0f; exp_plane[3].c = 94.0f; exp_plane[3].d = 104.0f; exp_plane[4].a = 66.0f; exp_plane[4].b = 76.0f; exp_plane[4].c = 86.0f; exp_plane[4].d = 96.0f; exp_plane[5].a = 58.0f; exp_plane[5].b = 68.0f; exp_plane[5].c = 78.0f; exp_plane[5].d = 88.0f; - D3DXPlaneTransformArray(out_plane + 1, sizeof(D3DXPLANE), inp_plane, sizeof(D3DXPLANE), &mat, ARRAY_SIZE); - compare_planes(exp_plane, out_plane); + D3DXPlaneTransformArray(&out_plane[1], sizeof(*out_plane), inp_plane, sizeof(*inp_plane), &mat, ARRAY_SIZE); + for (i = 0; i < ARRAY_SIZE + 2; ++i) + { + BOOL equal = compare_plane(&exp_plane[i], &out_plane[i], 0); + ok(equal, "Got unexpected plane {%.8e, %.8e, %.8e, %.8e} at index %u, expected {%.8e, %.8e, %.8e, %.8e}.\n", + out_plane[i].a, out_plane[i].b, out_plane[i].c, out_plane[i].d, i, + exp_plane[i].a, exp_plane[i].b, exp_plane[i].c, exp_plane[i].d); + if (!equal) + break; + } } static void test_D3DXFloat_Array(void)

1 0

Paul Gofman : d3dx9: Fix register index for the scalar op case in parse_preshader().
by Alexandre Julliard 28 Apr '17

28 Apr '17

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

Paul Gofman : d3dx9/tests: Fix test blob data corruption in test_preshader_op().
by Alexandre Julliard 28 Apr '17

28 Apr '17

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