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

Henri Verbeet : d3dx9/tests: Use a more reasonable ARRAY_SIZE macro.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 9729f3fccf3fce0f8a79fbebd7c14549ceec46b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9729f3fccf3fce0f8a79fbebd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 5 13:40:30 2017 +0200 d3dx9/tests: Use a more reasonable ARRAY_SIZE macro. 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 | 70 ++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 6effa74..258e959 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -23,7 +23,7 @@ #include "d3dx9.h" #include <math.h> -#define ARRAY_SIZE 5 +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) static BOOL compare_float(float f, float g, unsigned int ulps) { @@ -2299,29 +2299,24 @@ static void test_Matrix_Transformation2D(void) static void test_D3DXVec_Array(void) { - unsigned int i; - D3DVIEWPORT9 viewport; + D3DXPLANE inp_plane[5], out_plane[7], exp_plane[7]; + D3DXVECTOR4 inp_vec[5], out_vec[7], exp_vec[7]; D3DXMATRIX mat, projection, view, world; - D3DXVECTOR4 inp_vec[ARRAY_SIZE]; - D3DXVECTOR4 out_vec[ARRAY_SIZE + 2]; - D3DXVECTOR4 exp_vec[ARRAY_SIZE + 2]; - D3DXPLANE inp_plane[ARRAY_SIZE]; - D3DXPLANE out_plane[ARRAY_SIZE + 2]; - D3DXPLANE exp_plane[ARRAY_SIZE + 2]; + D3DVIEWPORT9 viewport; + unsigned int i; viewport.Width = 800; viewport.MinZ = 0.2f; viewport.X = 10; viewport.Height = 680; viewport.MaxZ = 0.9f; viewport.Y = 5; - for (i = 0; i < ARRAY_SIZE + 2; ++i) { - out_vec[i].x = out_vec[i].y = out_vec[i].z = out_vec[i].w = 0.0f; - exp_vec[i].x = exp_vec[i].y = exp_vec[i].z = exp_vec[i].w = 0.0f; - out_plane[i].a = out_plane[i].b = out_plane[i].c = out_plane[i].d = 0.0f; - exp_plane[i].a = exp_plane[i].b = exp_plane[i].c = exp_plane[i].d = 0.0f; - } + memset(out_vec, 0, sizeof(out_vec)); + memset(exp_vec, 0, sizeof(exp_vec)); + memset(out_plane, 0, sizeof(out_plane)); + memset(exp_plane, 0, sizeof(exp_plane)); - for (i = 0; i < ARRAY_SIZE; ++i) { + for (i = 0; i < ARRAY_SIZE(inp_vec); ++i) + { inp_plane[i].a = inp_plane[i].c = inp_vec[i].x = inp_vec[i].z = i; - inp_plane[i].b = inp_plane[i].d = inp_vec[i].y = inp_vec[i].w = ARRAY_SIZE - i; + inp_plane[i].b = inp_plane[i].d = inp_vec[i].y = inp_vec[i].w = ARRAY_SIZE(inp_vec) - i; } U(mat).m[0][0] = 1.0f; U(mat).m[0][1] = 2.0f; U(mat).m[0][2] = 3.0f; U(mat).m[0][3] = 4.0f; @@ -2350,8 +2345,8 @@ static void test_D3DXVec_Array(void) exp_vec[4].x = 5.90909123e-01f; exp_vec[4].y = 7.27272749e-01f; exp_vec[5].x = 5.49999952e-01f; exp_vec[5].y = 6.99999928e-01f; D3DXVec2TransformCoordArray((D3DXVECTOR2 *)&out_vec[1], sizeof(*out_vec), - (D3DXVECTOR2 *)inp_vec, sizeof(*inp_vec), &mat, ARRAY_SIZE); - expect_vec4_array(ARRAY_SIZE + 2, exp_vec, out_vec, 1); + (D3DXVECTOR2 *)inp_vec, sizeof(*inp_vec), &mat, ARRAY_SIZE(inp_vec)); + expect_vec4_array(ARRAY_SIZE(exp_vec), exp_vec, out_vec, 1); /* D3DXVec2TransformNormalArray */ exp_vec[1].x = 25.0f; exp_vec[1].y = 30.0f; @@ -2360,8 +2355,8 @@ static void test_D3DXVec_Array(void) exp_vec[4].x = 13.0f; exp_vec[4].y = 18.0f; exp_vec[5].x = 9.0f; exp_vec[5].y = 14.0f; D3DXVec2TransformNormalArray((D3DXVECTOR2 *)&out_vec[1], sizeof(*out_vec), - (D3DXVECTOR2 *)inp_vec, sizeof(*inp_vec), &mat, ARRAY_SIZE); - expect_vec4_array(ARRAY_SIZE + 2, exp_vec, out_vec, 0); + (D3DXVECTOR2 *)inp_vec, sizeof(*inp_vec), &mat, ARRAY_SIZE(inp_vec)); + expect_vec4_array(ARRAY_SIZE(exp_vec), exp_vec, out_vec, 0); /* D3DXVec3TransformCoordArray */ exp_vec[1].x = 6.78571403e-01f; exp_vec[1].y = 7.85714269e-01f; exp_vec[1].z = 8.92857075e-01f; @@ -2370,8 +2365,8 @@ static void test_D3DXVec_Array(void) exp_vec[4].x = 6.62499964e-01f; exp_vec[4].y = 7.74999976e-01f; exp_vec[4].z = 8.87499928e-01f; exp_vec[5].x = 6.59090877e-01f; exp_vec[5].y = 7.72727251e-01f; exp_vec[5].z = 8.86363566e-01f; D3DXVec3TransformCoordArray((D3DXVECTOR3 *)&out_vec[1], sizeof(*out_vec), - (D3DXVECTOR3 *)inp_vec, sizeof(*inp_vec), &mat, ARRAY_SIZE); - expect_vec4_array(ARRAY_SIZE + 2, exp_vec, out_vec, 1); + (D3DXVECTOR3 *)inp_vec, sizeof(*inp_vec), &mat, ARRAY_SIZE(inp_vec)); + expect_vec4_array(ARRAY_SIZE(exp_vec), exp_vec, out_vec, 1); /* D3DXVec3TransformNormalArray */ exp_vec[1].x = 25.0f; exp_vec[1].y = 30.0f; exp_vec[1].z = 35.0f; @@ -2380,8 +2375,8 @@ static void test_D3DXVec_Array(void) exp_vec[4].x = 40.0f; exp_vec[4].y = 48.0f; exp_vec[4].z = 56.0f; exp_vec[5].x = 45.0f; exp_vec[5].y = 54.0f; exp_vec[5].z = 63.0f; D3DXVec3TransformNormalArray((D3DXVECTOR3 *)&out_vec[1], sizeof(*out_vec), - (D3DXVECTOR3 *)inp_vec, sizeof(*inp_vec), &mat, ARRAY_SIZE); - expect_vec4_array(ARRAY_SIZE + 2, exp_vec, out_vec, 0); + (D3DXVECTOR3 *)inp_vec, sizeof(*inp_vec), &mat, ARRAY_SIZE(inp_vec)); + expect_vec4_array(ARRAY_SIZE(exp_vec), exp_vec, out_vec, 0); /* D3DXVec3ProjectArray */ exp_vec[1].x = 1.08955420e+03f; exp_vec[1].y = -2.26590622e+02f; exp_vec[1].z = 2.15272754e-01f; @@ -2390,8 +2385,8 @@ static void test_D3DXVec_Array(void) exp_vec[4].x = 1.03734888e+03f; exp_vec[4].y = 6.06827393e+02f; exp_vec[4].z = 1.33812696e-01f; exp_vec[5].x = 1.02502356e+03f; exp_vec[5].y = 8.03591248e+02f; exp_vec[5].z = 1.14580572e-01f; D3DXVec3ProjectArray((D3DXVECTOR3 *)&out_vec[1], sizeof(*out_vec), (D3DXVECTOR3 *)inp_vec, - sizeof(*inp_vec), &viewport, &projection, &view, &world, ARRAY_SIZE); - expect_vec4_array(ARRAY_SIZE + 2, exp_vec, out_vec, 8); + sizeof(*inp_vec), &viewport, &projection, &view, &world, ARRAY_SIZE(inp_vec)); + expect_vec4_array(ARRAY_SIZE(exp_vec), exp_vec, out_vec, 8); /* D3DXVec3UnprojectArray */ exp_vec[1].x = -6.12403107e+00f; exp_vec[1].y = 3.22536016e+00f; exp_vec[1].z = 6.20571136e-01f; @@ -2400,8 +2395,8 @@ static void test_D3DXVec_Array(void) exp_vec[4].x = -2.45622563e+00f; exp_vec[4].y = 1.35928988e+00f; exp_vec[4].z = 3.45631927e-01f; exp_vec[5].x = -2.16789746e+00f; exp_vec[5].y = 1.21259713e+00f; exp_vec[5].z = 3.24018806e-01f; D3DXVec3UnprojectArray((D3DXVECTOR3 *)&out_vec[1], sizeof(*out_vec), (D3DXVECTOR3 *)inp_vec, - sizeof(*inp_vec), &viewport, &projection, &view, &world, ARRAY_SIZE); - expect_vec4_array(ARRAY_SIZE + 2, exp_vec, out_vec, 4); + sizeof(*inp_vec), &viewport, &projection, &view, &world, ARRAY_SIZE(inp_vec)); + expect_vec4_array(ARRAY_SIZE(exp_vec), exp_vec, out_vec, 4); /* D3DXVec2TransformArray */ exp_vec[1].x = 38.0f; exp_vec[1].y = 44.0f; exp_vec[1].z = 50.0f; exp_vec[1].w = 56.0f; @@ -2410,8 +2405,8 @@ static void test_D3DXVec_Array(void) exp_vec[4].x = 26.0f; exp_vec[4].y = 32.0f; exp_vec[4].z = 38.0f; exp_vec[4].w = 44.0f; exp_vec[5].x = 22.0f; exp_vec[5].y = 28.0f; exp_vec[5].z = 34.0f; exp_vec[5].w = 40.0f; D3DXVec2TransformArray(&out_vec[1], sizeof(*out_vec), (D3DXVECTOR2 *)inp_vec, - sizeof(*inp_vec), &mat, ARRAY_SIZE); - expect_vec4_array(ARRAY_SIZE + 2, exp_vec, out_vec, 0); + sizeof(*inp_vec), &mat, ARRAY_SIZE(inp_vec)); + expect_vec4_array(ARRAY_SIZE(exp_vec), exp_vec, out_vec, 0); /* D3DXVec3TransformArray */ exp_vec[1].x = 38.0f; exp_vec[1].y = 44.0f; exp_vec[1].z = 50.0f; exp_vec[1].w = 56.0f; @@ -2420,8 +2415,8 @@ static void test_D3DXVec_Array(void) exp_vec[4].x = 53.0f; exp_vec[4].y = 62.0f; exp_vec[4].z = 71.0f; exp_vec[4].w = 80.0f; exp_vec[5].x = 58.0f; exp_vec[5].y = 68.0f; exp_vec[5].z = 78.0f; exp_vec[5].w = 88.0f; D3DXVec3TransformArray(&out_vec[1], sizeof(*out_vec), (D3DXVECTOR3 *)inp_vec, - sizeof(*inp_vec), &mat, ARRAY_SIZE); - expect_vec4_array(ARRAY_SIZE + 2, exp_vec, out_vec, 0); + sizeof(*inp_vec), &mat, ARRAY_SIZE(inp_vec)); + expect_vec4_array(ARRAY_SIZE(exp_vec), exp_vec, out_vec, 0); /* D3DXVec4TransformArray */ exp_vec[1].x = 90.0f; exp_vec[1].y = 100.0f; exp_vec[1].z = 110.0f; exp_vec[1].w = 120.0f; @@ -2429,8 +2424,8 @@ static void test_D3DXVec_Array(void) exp_vec[3].x = 74.0f; exp_vec[3].y = 84.0f; exp_vec[3].z = 94.0f; exp_vec[3].w = 104.0f; exp_vec[4].x = 66.0f; exp_vec[4].y = 76.0f; exp_vec[4].z = 86.0f; exp_vec[4].w = 96.0f; exp_vec[5].x = 58.0f; exp_vec[5].y = 68.0f; exp_vec[5].z = 78.0f; exp_vec[5].w = 88.0f; - D3DXVec4TransformArray(&out_vec[1], sizeof(*out_vec), inp_vec, sizeof(*inp_vec), &mat, ARRAY_SIZE); - expect_vec4_array(ARRAY_SIZE + 2, exp_vec, out_vec, 0); + D3DXVec4TransformArray(&out_vec[1], sizeof(*out_vec), inp_vec, sizeof(*inp_vec), &mat, ARRAY_SIZE(inp_vec)); + expect_vec4_array(ARRAY_SIZE(exp_vec), exp_vec, out_vec, 0); /* D3DXPlaneTransformArray */ exp_plane[1].a = 90.0f; exp_plane[1].b = 100.0f; exp_plane[1].c = 110.0f; exp_plane[1].d = 120.0f; @@ -2438,8 +2433,9 @@ 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(*out_plane), inp_plane, sizeof(*inp_plane), &mat, ARRAY_SIZE); - for (i = 0; i < ARRAY_SIZE + 2; ++i) + D3DXPlaneTransformArray(&out_plane[1], sizeof(*out_plane), inp_plane, + sizeof(*inp_plane), &mat, ARRAY_SIZE(inp_plane)); + for (i = 0; i < ARRAY_SIZE(exp_plane); ++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",

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXFloat_Array().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 38587126f1b949708d045250a41dfcba8b26fe53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38587126f1b949708d045250a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 5 13:40:31 2017 +0200 d3dx9/tests: Use ARRAY_SIZE 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 258e959..2cf22a4 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2513,7 +2513,7 @@ static void test_D3DXFloat_Array(void) 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++) + for (i = 0; i < ARRAY_SIZE(testdata); ++i) { out = D3DXFloat32To16Array(&half, &testdata[i].single_in.f, 1); ok(out == &half, "Got %p, expected %p.\n", out, &half);

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHDot().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 9ccbb303a111e4f1ac34c58823f12a9d3f844446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ccbb303a111e4f1ac34c5882… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 5 13:40:32 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHDot(). 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 2cf22a4..c9bf881 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2591,7 +2591,7 @@ static void test_D3DXSHDot(void) static const float expected[] = {0.5f, 0.5f, 25.0f, 262.5f, 1428.0f, 5362.5f, 15873.0f, 39812.5f}; - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(a); ++i) { a[i] = i + 1.0f; b[i] = i + 0.5f;

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHEvalConeLight().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: ce50cded817c2fdba38144ca0edf81bb1467e839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce50cded817c2fdba38144ca0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 5 13:40:33 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHEvalConeLight(). 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c9bf881..7e00df8 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2680,7 +2680,7 @@ static void test_D3DXSHEvalConeLight(void) dir.x = 1.1f; dir.y = 1.2f; dir.z = 2.76f; - for (l = 0; l < sizeof(test) / sizeof(test[0]); l++) + for (l = 0; l < ARRAY_SIZE(test); ++l) { for (order = D3DXSH_MINORDER; order <= D3DXSH_MAXORDER; order++) {

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHEvalDirection().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 1ff005856666acedf01512b8f01b94118d25d957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff005856666acedf01512b8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 5 13:40:34 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHEvalDirection(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 7e00df8..541f4d9 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2796,13 +2796,13 @@ static void test_D3DXSHEvalDirection(void) for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) { - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(a); ++i) a[i] = 1.5f + i; received_ptr = D3DXSHEvalDirection(a, order, &d); ok(received_ptr == a, "Expected %p, received %p\n", a, received_ptr); - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(a); ++i) { /* if the order is < D3DXSH_MINORDER or order > D3DXSH_MAXORDER or * the index of the element is greater than order * order - 1,

1 0

Piotr Caban : msvcp90: Call invalid_parameter_handler on index out of range in basic_string:: operator[].
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: a5767dc3ef7d5af5f966369c8d4a090c5c7e305f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5767dc3ef7d5af5f966369c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 5 20:28:09 2017 +0200 msvcp90: Call invalid_parameter_handler on index out of range in basic_string::operator[]. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/string.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index e102020..317373b 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -22,7 +22,6 @@ #include "msvcp90.h" #include "stdio.h" -#include "assert.h" #include "windef.h" #include "winbase.h" @@ -1979,7 +1978,11 @@ char* __thiscall MSVCP_basic_string_char_operator_at( { TRACE("%p %lu\n", this, pos); - assert(this->size >= pos); +#if _MSVCP_VER >= 80 + if (this->size < pos) + _invalid_parameter(NULL, NULL, NULL, 0, 0); +#endif + return basic_string_char_ptr(this)+pos; } @@ -1991,7 +1994,11 @@ const char* __thiscall MSVCP_basic_string_char_const_operator_at( { TRACE("%p %lu\n", this, pos); - assert(this->size >= pos); +#if _MSVCP_VER >= 80 + if (this->size < pos) + _invalid_parameter(NULL, NULL, NULL, 0, 0); +#endif + return basic_string_char_const_ptr(this)+pos; } @@ -3951,7 +3958,11 @@ wchar_t* __thiscall MSVCP_basic_string_wchar_operator_at( { TRACE("%p %lu\n", this, pos); - assert(this->size >= pos); +#if _MSVCP_VER >= 80 + if (this->size < pos) + _invalid_parameter(NULL, NULL, NULL, 0, 0); +#endif + return basic_string_wchar_ptr(this)+pos; } @@ -3965,7 +3976,11 @@ const wchar_t* __thiscall MSVCP_basic_string_wchar_const_operator_at( { TRACE("%p %lu\n", this, pos); - assert(this->size >= pos); +#if _MSVCP_VER >= 80 + if (this->size < pos) + _invalid_parameter(NULL, NULL, NULL, 0, 0); +#endif + return basic_string_wchar_const_ptr(this)+pos; }

1 0

Piotr Caban : msvcp110: Add placeholder::_Ph* exports.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: f95c26ab697c9538a3fefb6a39821846526036a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f95c26ab697c9538a3fefb6a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 5 22:25:15 2017 +0200 msvcp110: Add placeholder::_Ph* exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 40 ++++++++++++++++++------------------- dlls/msvcp120/msvcp120.spec | 40 ++++++++++++++++++------------------- dlls/msvcp120_app/msvcp120_app.spec | 40 ++++++++++++++++++------------------- dlls/msvcp90/misc.c | 13 ++++++++++++ 4 files changed, 73 insertions(+), 60 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 52524c5..17e8531 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1077,26 +1077,26 @@ @ stub -arch=win64 ?NFS_Free(a)details@Concurrency@@YAXPEAX(a)Z @ stub -arch=win32 ?NFS_GetLineSize(a)details@Concurrency@@YAIXZ @ stub -arch=win64 ?NFS_GetLineSize(a)details@Concurrency@@YA_KXZ -# extern ?_10(a)placeholders@std@@3V?$_Ph@$09(a)2@A -# extern ?_11(a)placeholders@std@@3V?$_Ph@$0L@@2(a)A -# extern ?_12(a)placeholders@std@@3V?$_Ph@$0M@@2(a)A -# extern ?_13(a)placeholders@std@@3V?$_Ph@$0N@@2(a)A -# extern ?_14(a)placeholders@std@@3V?$_Ph@$0O@@2(a)A -# extern ?_15(a)placeholders@std@@3V?$_Ph@$0P@@2(a)A -# extern ?_16(a)placeholders@std@@3V?$_Ph@$0BA@@2(a)A -# extern ?_17(a)placeholders@std@@3V?$_Ph@$0BB@@2(a)A -# extern ?_18(a)placeholders@std@@3V?$_Ph@$0BC@@2(a)A -# extern ?_19(a)placeholders@std@@3V?$_Ph@$0BD@@2(a)A -# extern ?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A -# extern ?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A -# extern ?_2(a)placeholders@std@@3V?$_Ph@$01(a)2@A -# extern ?_3(a)placeholders@std@@3V?$_Ph@$02(a)2@A -# extern ?_4(a)placeholders@std@@3V?$_Ph@$03(a)2@A -# extern ?_5(a)placeholders@std@@3V?$_Ph@$04(a)2@A -# extern ?_6(a)placeholders@std@@3V?$_Ph@$05(a)2@A -# extern ?_7(a)placeholders@std@@3V?$_Ph@$06(a)2@A -# extern ?_8(a)placeholders@std@@3V?$_Ph@$07(a)2@A -# extern ?_9(a)placeholders@std@@3V?$_Ph@$08(a)2@A +@ extern ?_10(a)placeholders@std@@3V?$_Ph@$09(a)2@A _Ph_10 +@ extern ?_11(a)placeholders@std@@3V?$_Ph@$0L@@2(a)A _Ph_11 +@ extern ?_12(a)placeholders@std@@3V?$_Ph@$0M@@2(a)A _Ph_12 +@ extern ?_13(a)placeholders@std@@3V?$_Ph@$0N@@2(a)A _Ph_13 +@ extern ?_14(a)placeholders@std@@3V?$_Ph@$0O@@2(a)A _Ph_14 +@ extern ?_15(a)placeholders@std@@3V?$_Ph@$0P@@2(a)A _Ph_15 +@ extern ?_16(a)placeholders@std@@3V?$_Ph@$0BA@@2(a)A _Ph_16 +@ extern ?_17(a)placeholders@std@@3V?$_Ph@$0BB@@2(a)A _Ph_17 +@ extern ?_18(a)placeholders@std@@3V?$_Ph@$0BC@@2(a)A _Ph_18 +@ extern ?_19(a)placeholders@std@@3V?$_Ph@$0BD@@2(a)A _Ph_19 +@ extern ?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A _Ph_1 +@ extern ?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A _Ph_20 +@ extern ?_2(a)placeholders@std@@3V?$_Ph@$01(a)2@A _Ph_2 +@ extern ?_3(a)placeholders@std@@3V?$_Ph@$02(a)2@A _Ph_3 +@ extern ?_4(a)placeholders@std@@3V?$_Ph@$03(a)2@A _Ph_4 +@ extern ?_5(a)placeholders@std@@3V?$_Ph@$04(a)2@A _Ph_5 +@ extern ?_6(a)placeholders@std@@3V?$_Ph@$05(a)2@A _Ph_6 +@ extern ?_7(a)placeholders@std@@3V?$_Ph@$06(a)2@A _Ph_7 +@ extern ?_8(a)placeholders@std@@3V?$_Ph@$07(a)2@A _Ph_8 +@ extern ?_9(a)placeholders@std@@3V?$_Ph@$08(a)2@A _Ph_9 @ stub -arch=arm ?_Add_vtordisp1@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ @ stub -arch=i386 ?_Add_vtordisp1@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UAEXXZ @ stub -arch=win64 ?_Add_vtordisp1@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UEAAXXZ diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 173728a..0146719 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1078,26 +1078,26 @@ @ stub -arch=win64 ?NFS_Free(a)details@Concurrency@@YAXPEAX(a)Z @ stub -arch=win32 ?NFS_GetLineSize(a)details@Concurrency@@YAIXZ @ stub -arch=win64 ?NFS_GetLineSize(a)details@Concurrency@@YA_KXZ -# extern ?_10(a)placeholders@std@@3V?$_Ph@$09(a)2@A -# extern ?_11(a)placeholders@std@@3V?$_Ph@$0L@@2(a)A -# extern ?_12(a)placeholders@std@@3V?$_Ph@$0M@@2(a)A -# extern ?_13(a)placeholders@std@@3V?$_Ph@$0N@@2(a)A -# extern ?_14(a)placeholders@std@@3V?$_Ph@$0O@@2(a)A -# extern ?_15(a)placeholders@std@@3V?$_Ph@$0P@@2(a)A -# extern ?_16(a)placeholders@std@@3V?$_Ph@$0BA@@2(a)A -# extern ?_17(a)placeholders@std@@3V?$_Ph@$0BB@@2(a)A -# extern ?_18(a)placeholders@std@@3V?$_Ph@$0BC@@2(a)A -# extern ?_19(a)placeholders@std@@3V?$_Ph@$0BD@@2(a)A -# extern ?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A -# extern ?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A -# extern ?_2(a)placeholders@std@@3V?$_Ph@$01(a)2@A -# extern ?_3(a)placeholders@std@@3V?$_Ph@$02(a)2@A -# extern ?_4(a)placeholders@std@@3V?$_Ph@$03(a)2@A -# extern ?_5(a)placeholders@std@@3V?$_Ph@$04(a)2@A -# extern ?_6(a)placeholders@std@@3V?$_Ph@$05(a)2@A -# extern ?_7(a)placeholders@std@@3V?$_Ph@$06(a)2@A -# extern ?_8(a)placeholders@std@@3V?$_Ph@$07(a)2@A -# extern ?_9(a)placeholders@std@@3V?$_Ph@$08(a)2@A +@ extern ?_10(a)placeholders@std@@3V?$_Ph@$09(a)2@A _Ph_10 +@ extern ?_11(a)placeholders@std@@3V?$_Ph@$0L@@2(a)A _Ph_11 +@ extern ?_12(a)placeholders@std@@3V?$_Ph@$0M@@2(a)A _Ph_12 +@ extern ?_13(a)placeholders@std@@3V?$_Ph@$0N@@2(a)A _Ph_13 +@ extern ?_14(a)placeholders@std@@3V?$_Ph@$0O@@2(a)A _Ph_14 +@ extern ?_15(a)placeholders@std@@3V?$_Ph@$0P@@2(a)A _Ph_15 +@ extern ?_16(a)placeholders@std@@3V?$_Ph@$0BA@@2(a)A _Ph_16 +@ extern ?_17(a)placeholders@std@@3V?$_Ph@$0BB@@2(a)A _Ph_17 +@ extern ?_18(a)placeholders@std@@3V?$_Ph@$0BC@@2(a)A _Ph_18 +@ extern ?_19(a)placeholders@std@@3V?$_Ph@$0BD@@2(a)A _Ph_19 +@ extern ?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A _Ph_1 +@ extern ?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A _Ph_20 +@ extern ?_2(a)placeholders@std@@3V?$_Ph@$01(a)2@A _Ph_2 +@ extern ?_3(a)placeholders@std@@3V?$_Ph@$02(a)2@A _Ph_3 +@ extern ?_4(a)placeholders@std@@3V?$_Ph@$03(a)2@A _Ph_4 +@ extern ?_5(a)placeholders@std@@3V?$_Ph@$04(a)2@A _Ph_5 +@ extern ?_6(a)placeholders@std@@3V?$_Ph@$05(a)2@A _Ph_6 +@ extern ?_7(a)placeholders@std@@3V?$_Ph@$06(a)2@A _Ph_7 +@ extern ?_8(a)placeholders@std@@3V?$_Ph@$07(a)2@A _Ph_8 +@ extern ?_9(a)placeholders@std@@3V?$_Ph@$08(a)2@A _Ph_9 @ cdecl -arch=arm ?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z(ptr long str) _Locinfo__Addcats @ thiscall -arch=i386 ?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z(ptr long str) _Locinfo__Addcats @ cdecl -arch=win64 ?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z(ptr long str) _Locinfo__Addcats diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 8a03b41..70fa429 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1078,26 +1078,26 @@ @ stub -arch=win64 ?NFS_Free(a)details@Concurrency@@YAXPEAX(a)Z @ stub -arch=win32 ?NFS_GetLineSize(a)details@Concurrency@@YAIXZ @ stub -arch=win64 ?NFS_GetLineSize(a)details@Concurrency@@YA_KXZ -# extern ?_10(a)placeholders@std@@3V?$_Ph@$09(a)2@A -# extern ?_11(a)placeholders@std@@3V?$_Ph@$0L@@2(a)A -# extern ?_12(a)placeholders@std@@3V?$_Ph@$0M@@2(a)A -# extern ?_13(a)placeholders@std@@3V?$_Ph@$0N@@2(a)A -# extern ?_14(a)placeholders@std@@3V?$_Ph@$0O@@2(a)A -# extern ?_15(a)placeholders@std@@3V?$_Ph@$0P@@2(a)A -# extern ?_16(a)placeholders@std@@3V?$_Ph@$0BA@@2(a)A -# extern ?_17(a)placeholders@std@@3V?$_Ph@$0BB@@2(a)A -# extern ?_18(a)placeholders@std@@3V?$_Ph@$0BC@@2(a)A -# extern ?_19(a)placeholders@std@@3V?$_Ph@$0BD@@2(a)A -# extern ?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A -# extern ?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A -# extern ?_2(a)placeholders@std@@3V?$_Ph@$01(a)2@A -# extern ?_3(a)placeholders@std@@3V?$_Ph@$02(a)2@A -# extern ?_4(a)placeholders@std@@3V?$_Ph@$03(a)2@A -# extern ?_5(a)placeholders@std@@3V?$_Ph@$04(a)2@A -# extern ?_6(a)placeholders@std@@3V?$_Ph@$05(a)2@A -# extern ?_7(a)placeholders@std@@3V?$_Ph@$06(a)2@A -# extern ?_8(a)placeholders@std@@3V?$_Ph@$07(a)2@A -# extern ?_9(a)placeholders@std@@3V?$_Ph@$08(a)2@A +@ extern ?_10(a)placeholders@std@@3V?$_Ph@$09(a)2@A msvcp120.?_10(a)placeholders@std@@3V?$_Ph@$09(a)2@A +@ extern ?_11(a)placeholders@std@@3V?$_Ph@$0L@@2(a)A msvcp120.?_11(a)placeholders@std@@3V?$_Ph@$0L@@2(a)A +@ extern ?_12(a)placeholders@std@@3V?$_Ph@$0M@@2(a)A msvcp120.?_12(a)placeholders@std@@3V?$_Ph@$0M@@2(a)A +@ extern ?_13(a)placeholders@std@@3V?$_Ph@$0N@@2(a)A msvcp120.?_13(a)placeholders@std@@3V?$_Ph@$0N@@2(a)A +@ extern ?_14(a)placeholders@std@@3V?$_Ph@$0O@@2(a)A msvcp120.?_14(a)placeholders@std@@3V?$_Ph@$0O@@2(a)A +@ extern ?_15(a)placeholders@std@@3V?$_Ph@$0P@@2(a)A msvcp120.?_15(a)placeholders@std@@3V?$_Ph@$0P@@2(a)A +@ extern ?_16(a)placeholders@std@@3V?$_Ph@$0BA@@2(a)A msvcp120.?_16(a)placeholders@std@@3V?$_Ph@$0BA@@2(a)A +@ extern ?_17(a)placeholders@std@@3V?$_Ph@$0BB@@2(a)A msvcp120.?_17(a)placeholders@std@@3V?$_Ph@$0BB@@2(a)A +@ extern ?_18(a)placeholders@std@@3V?$_Ph@$0BC@@2(a)A msvcp120.?_18(a)placeholders@std@@3V?$_Ph@$0BC@@2(a)A +@ extern ?_19(a)placeholders@std@@3V?$_Ph@$0BD@@2(a)A msvcp120.?_19(a)placeholders@std@@3V?$_Ph@$0BD@@2(a)A +@ extern ?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A msvcp120.?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A +@ extern ?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A msvcp120.?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A +@ extern ?_2(a)placeholders@std@@3V?$_Ph@$01(a)2@A msvcp120.?_2(a)placeholders@std@@3V?$_Ph@$01(a)2@A +@ extern ?_3(a)placeholders@std@@3V?$_Ph@$02(a)2@A msvcp120.?_3(a)placeholders@std@@3V?$_Ph@$02(a)2@A +@ extern ?_4(a)placeholders@std@@3V?$_Ph@$03(a)2@A msvcp120.?_4(a)placeholders@std@@3V?$_Ph@$03(a)2@A +@ extern ?_5(a)placeholders@std@@3V?$_Ph@$04(a)2@A msvcp120.?_5(a)placeholders@std@@3V?$_Ph@$04(a)2@A +@ extern ?_6(a)placeholders@std@@3V?$_Ph@$05(a)2@A msvcp120.?_6(a)placeholders@std@@3V?$_Ph@$05(a)2@A +@ extern ?_7(a)placeholders@std@@3V?$_Ph@$06(a)2@A msvcp120.?_7(a)placeholders@std@@3V?$_Ph@$06(a)2@A +@ extern ?_8(a)placeholders@std@@3V?$_Ph@$07(a)2@A msvcp120.?_8(a)placeholders@std@@3V?$_Ph@$07(a)2@A +@ extern ?_9(a)placeholders@std@@3V?$_Ph@$08(a)2@A msvcp120.?_9(a)placeholders@std@@3V?$_Ph@$08(a)2@A @ cdecl -arch=arm ?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z(ptr long str) msvcp120.?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z @ thiscall -arch=i386 ?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z(ptr long str) msvcp120.?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z @ cdecl -arch=win64 ?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z(ptr long str) msvcp120.?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 828c4c2..28d1af3 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1632,3 +1632,16 @@ void __cdecl _Release_chore(_Threadpool_chore *chore) chore->work = NULL; } #endif + +#if _MSVCP_VER >= 110 && _MSVCP_VER <= 120 +typedef struct { + char dummy; +} _Ph; + +/* ?_1(a)placeholders@std@@3V?$_Ph@$00(a)2@A */ +/* ?_20(a)placeholders@std@@3V?$_Ph@$0BE@@2(a)A */ +_Ph _Ph_1 = {0}, _Ph_2 = {0}, _Ph_3 = {0}, _Ph_4 = {0}, _Ph_5 = {0}; +_Ph _Ph_6 = {0}, _Ph_7 = {0}, _Ph_8 = {0}, _Ph_9 = {0}, _Ph_10 = {0}; +_Ph _Ph_11 = {0}, _Ph_12 = {0}, _Ph_13 = {0}, _Ph_14 = {0}, _Ph_15 = {0}; +_Ph _Ph_16 = {0}, _Ph_17 = {0}, _Ph_18 = {0}, _Ph_19 = {0}, _Ph_20 = {0}; +#endif

1 0

Nikolay Sivov : dwrite: Update to IDWriteFactory5.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: a7aca059f27e68b6991c4dec04a59b576b1f45b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7aca059f27e68b6991c4dec0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 7 22:38:15 2017 +0300 dwrite: Update to IDWriteFactory5. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 10 +- dlls/dwrite/dwrite_private.h | 24 +-- dlls/dwrite/font.c | 50 +++---- dlls/dwrite/gdiinterop.c | 12 +- dlls/dwrite/layout.c | 14 +- dlls/dwrite/main.c | 346 ++++++++++++++++++++++++++----------------- dlls/dwrite/tests/font.c | 11 +- 7 files changed, 271 insertions(+), 196 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7aca059f27e68b6991c4…

1 0

Nikolay Sivov : webservices/tests: Enable WsInitializeMessage() tests ( Coverity).
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: aaf4e75a62bb711c4f25968af91ae238595f5f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf4e75a62bb711c4f25968af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 23:24:57 2017 +0300 webservices/tests: Enable WsInitializeMessage() tests (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/msg.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index f6a6ba1..868ead5 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -165,7 +165,6 @@ static void test_WsInitializeMessage(void) WS_ADDRESSING_VERSION addr_version; BOOL addressed; - return; hr = WsInitializeMessage( NULL, WS_REQUEST_MESSAGE, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr );

1 0

Rosanne DiMesio : commonReply.php: fix incorrect call to query_insert_id
by Jeremy Newman 08 May '17

08 May '17

Module: appdb Branch: master Commit: b039a0ca7d71e3a7c8e4994448063eb1b5d9fe4a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b039a0ca7d71e3a7c8e49944… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri May 5 19:25:04 2017 -0500 commonReply.php: fix incorrect call to query_insert_id Should be query_appdb_insert_id. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/commonReply.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/commonReply.php b/include/commonReply.php index a276cc4..8362e7e 100644 --- a/include/commonReply.php +++ b/include/commonReply.php @@ -42,7 +42,7 @@ class CommonReply extends ObjectManagerBase if(!$hResult) return false; - $this->iId = query_insert_id(); + $this->iId = query_appdb_insert_id(); foreach($this->aTags as $iTag) { @@ -146,4 +146,4 @@ class CommonReply extends ObjectManagerBase } } -?> \ No newline at end of file +?>

1 0