September 2016 - Wine-commits

Sebastian Lackner : vcomp: Implement _vcomp_reduction_r4 and add tests.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: 363d8d2140e6750c6093f4e9a62043f240cacc3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=363d8d2140e6750c6093f4e9a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 11:48:32 2016 +0200 vcomp: Implement _vcomp_reduction_r4 and add tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 40 ++++++++++++++++++++++++++++++++ dlls/vcomp/tests/vcomp.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp110/vcomp110.spec | 2 +- dlls/vcomp120/vcomp120.spec | 2 +- dlls/vcomp140/vcomp140.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 8 files changed, 102 insertions(+), 6 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 8523155..d4c9366 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -810,6 +810,46 @@ void CDECL _vcomp_atomic_sub_r4(float *dest, float val) while (interlocked_cmpxchg((int *)dest, new, old) != old); } +static void CDECL _vcomp_atomic_bool_and_r4(float *dest, float val) +{ + int old, new; + do + { + old = *(int *)dest; + *(float *)&new = (*(float *)&old != 0.0) ? (val != 0.0) : 0.0; + } + while (interlocked_cmpxchg((int *)dest, new, old) != old); +} + +static void CDECL _vcomp_atomic_bool_or_r4(float *dest, float val) +{ + int old, new; + do + { + old = *(int *)dest; + *(float *)&new = (*(float *)&old != 0.0) ? *(float *)&old : (val != 0.0); + } + while (interlocked_cmpxchg((int *)dest, new, old) != old); +} + +void CDECL _vcomp_reduction_r4(unsigned int flags, float *dest, float val) +{ + static void (CDECL * const funcs[])(float *, float) = + { + _vcomp_atomic_add_r4, + _vcomp_atomic_add_r4, + _vcomp_atomic_mul_r4, + _vcomp_atomic_bool_or_r4, + _vcomp_atomic_bool_or_r4, + _vcomp_atomic_bool_or_r4, + _vcomp_atomic_bool_and_r4, + _vcomp_atomic_bool_or_r4, + }; + unsigned int op = (flags >> 8) & 0xf; + op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + funcs[op](dest, val); +} + void CDECL _vcomp_atomic_add_r8(double *dest, double val) { LONG64 old, new; diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 088f256..15fc473 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -107,6 +107,7 @@ static void (CDECL *p_vcomp_reduction_i1)(unsigned int flags, char *dest, cha static void (CDECL *p_vcomp_reduction_i2)(unsigned int flags, short *dest, short val); static void (CDECL *p_vcomp_reduction_i4)(unsigned int flags, int *dest, int val); static void (CDECL *p_vcomp_reduction_i8)(unsigned int flags, LONG64 *dest, LONG64 val); +static void (CDECL *p_vcomp_reduction_r4)(unsigned int flags, float *dest, float val); static void (CDECL *p_vcomp_reduction_u1)(unsigned int flags, unsigned char *dest, unsigned char val); static void (CDECL *p_vcomp_reduction_u2)(unsigned int flags, unsigned short *dest, unsigned short val); static void (CDECL *p_vcomp_reduction_u4)(unsigned int flags, unsigned int *dest, unsigned int val); @@ -356,6 +357,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_reduction_i2); VCOMP_GET_PROC(_vcomp_reduction_i4); VCOMP_GET_PROC(_vcomp_reduction_i8); + VCOMP_GET_PROC(_vcomp_reduction_r4); VCOMP_GET_PROC(_vcomp_reduction_u1); VCOMP_GET_PROC(_vcomp_reduction_u2); VCOMP_GET_PROC(_vcomp_reduction_u4); @@ -2108,6 +2110,59 @@ static void test_reduction_integer64(void) } } +static void test_reduction_float(void) +{ + static const struct + { + unsigned int flags; + float v1, v2, expected; + } + tests[] = + { + { 0x000, 42.0, 17.0, 42.0 + 17.0 }, + { VCOMP_REDUCTION_FLAGS_ADD, 42.0, 17.0, 42.0 + 17.0 }, + { VCOMP_REDUCTION_FLAGS_MUL, 42.0, 17.0, 42.0 * 17.0 }, + { 0x300, 0.0, 2.0, 1.0 }, + { 0x400, 0.0, 2.0, 1.0 }, + { 0x500, 0.0, 2.0, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, -0.0, 1.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 0.0, 0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 0.0, 2.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 1.0, -0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 1.0, 0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 1.0, 1.0e-5, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 1.0, 2.0, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 2.0, 0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_AND, 2.0, 2.0, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, -0.0, 0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 0.0, -0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 0.0, 0.0, 0.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 0.0, 1.0e-5, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 0.0, 2.0, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 1.0, 0.0, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 1.0, 2.0, 1.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 2.0, 0.0, 2.0 }, + { VCOMP_REDUCTION_FLAGS_BOOL_OR, 2.0, 2.0, 2.0 }, + { 0x800, 0.0, 2.0, 1.0 }, + { 0x900, 0.0, 2.0, 1.0 }, + { 0xa00, 0.0, 2.0, 1.0 }, + { 0xb00, 0.0, 2.0, 1.0 }, + { 0xc00, 0.0, 2.0, 1.0 }, + { 0xd00, 0.0, 2.0, 1.0 }, + { 0xe00, 0.0, 2.0, 1.0 }, + { 0xf00, 0.0, 2.0, 1.0 }, + }; + int i; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + float val = tests[i].v1; + p_vcomp_reduction_r4(tests[i].flags, &val, tests[i].v2); + ok(tests[i].expected - 0.001 < val && val < tests[i].expected + 0.001, + "test %d: expected val == %f, got %f\n", i, tests[i].expected, val); + } +} + START_TEST(vcomp) { if (!init_vcomp()) @@ -2136,6 +2191,7 @@ START_TEST(vcomp) test_reduction_integer16(); test_reduction_integer32(); test_reduction_integer64(); + test_reduction_float(); release_vcomp(); } diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 6f57746..22f06cb 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -77,7 +77,7 @@ @ cdecl _vcomp_reduction_i2(long ptr long) @ cdecl _vcomp_reduction_i4(long ptr long) @ cdecl _vcomp_reduction_i8(long ptr int64) -@ stub _vcomp_reduction_r4 +@ cdecl _vcomp_reduction_r4(long ptr float) @ stub _vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) _vcomp_reduction_i1 @ cdecl _vcomp_reduction_u2(long ptr long) _vcomp_reduction_i2 diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 564b3d7..b87bd8b 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -77,7 +77,7 @@ @ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 -@ stub _vcomp_reduction_r4 +@ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index fa6c047..e86d50b 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -78,7 +78,7 @@ @ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 -@ stub _vcomp_reduction_r4 +@ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 diff --git a/dlls/vcomp120/vcomp120.spec b/dlls/vcomp120/vcomp120.spec index fa6c047..e86d50b 100644 --- a/dlls/vcomp120/vcomp120.spec +++ b/dlls/vcomp120/vcomp120.spec @@ -78,7 +78,7 @@ @ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 -@ stub _vcomp_reduction_r4 +@ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 diff --git a/dlls/vcomp140/vcomp140.spec b/dlls/vcomp140/vcomp140.spec index fa6c047..e86d50b 100644 --- a/dlls/vcomp140/vcomp140.spec +++ b/dlls/vcomp140/vcomp140.spec @@ -78,7 +78,7 @@ @ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 -@ stub _vcomp_reduction_r4 +@ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 564b3d7..b87bd8b 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -77,7 +77,7 @@ @ cdecl _vcomp_reduction_i2(long ptr long) vcomp._vcomp_reduction_i2 @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 -@ stub _vcomp_reduction_r4 +@ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 @ stub _vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2

1 0

Sebastian Lackner : vcomp: Implement _vcomp_reduction_r8 and add tests.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: 0c4c6d603bad5c24ccf54439ae9e5c2f6c436f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4c6d603bad5c24ccf54439a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 08:22:11 2016 +0200 vcomp: Implement _vcomp_reduction_r8 and add tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/tests/vcomp.c | 13 +++++++++++-- dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp110/vcomp110.spec | 2 +- dlls/vcomp120/vcomp120.spec | 2 +- dlls/vcomp140/vcomp140.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 8 files changed, 57 insertions(+), 8 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index d4c9366..34e327e 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -894,6 +894,46 @@ void CDECL _vcomp_atomic_sub_r8(double *dest, double val) while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); } +static void CDECL _vcomp_atomic_bool_and_r8(double *dest, double val) +{ + LONG64 old, new; + do + { + old = *(LONG64 *)dest; + *(double *)&new = (*(double *)&old != 0.0) ? (val != 0.0) : 0.0; + } + while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); +} + +static void CDECL _vcomp_atomic_bool_or_r8(double *dest, double val) +{ + LONG64 old, new; + do + { + old = *(LONG64 *)dest; + *(double *)&new = (*(double *)&old != 0.0) ? *(double *)&old : (val != 0.0); + } + while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); +} + +void CDECL _vcomp_reduction_r8(unsigned int flags, double *dest, double val) +{ + static void (CDECL * const funcs[])(double *, double) = + { + _vcomp_atomic_add_r8, + _vcomp_atomic_add_r8, + _vcomp_atomic_mul_r8, + _vcomp_atomic_bool_or_r8, + _vcomp_atomic_bool_or_r8, + _vcomp_atomic_bool_or_r8, + _vcomp_atomic_bool_and_r8, + _vcomp_atomic_bool_or_r8, + }; + unsigned int op = (flags >> 8) & 0xf; + op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + funcs[op](dest, val); +} + int CDECL omp_get_dynamic(void) { TRACE("stub\n"); diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 15fc473..96a3d9c 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -108,6 +108,7 @@ static void (CDECL *p_vcomp_reduction_i2)(unsigned int flags, short *dest, sh static void (CDECL *p_vcomp_reduction_i4)(unsigned int flags, int *dest, int val); static void (CDECL *p_vcomp_reduction_i8)(unsigned int flags, LONG64 *dest, LONG64 val); static void (CDECL *p_vcomp_reduction_r4)(unsigned int flags, float *dest, float val); +static void (CDECL *p_vcomp_reduction_r8)(unsigned int flags, double *dest, double val); static void (CDECL *p_vcomp_reduction_u1)(unsigned int flags, unsigned char *dest, unsigned char val); static void (CDECL *p_vcomp_reduction_u2)(unsigned int flags, unsigned short *dest, unsigned short val); static void (CDECL *p_vcomp_reduction_u4)(unsigned int flags, unsigned int *dest, unsigned int val); @@ -358,6 +359,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_reduction_i4); VCOMP_GET_PROC(_vcomp_reduction_i8); VCOMP_GET_PROC(_vcomp_reduction_r4); + VCOMP_GET_PROC(_vcomp_reduction_r8); VCOMP_GET_PROC(_vcomp_reduction_u1); VCOMP_GET_PROC(_vcomp_reduction_u2); VCOMP_GET_PROC(_vcomp_reduction_u4); @@ -2110,7 +2112,7 @@ static void test_reduction_integer64(void) } } -static void test_reduction_float(void) +static void test_reduction_float_double(void) { static const struct { @@ -2161,6 +2163,13 @@ static void test_reduction_float(void) ok(tests[i].expected - 0.001 < val && val < tests[i].expected + 0.001, "test %d: expected val == %f, got %f\n", i, tests[i].expected, val); } + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + double val = tests[i].v1; + p_vcomp_reduction_r8(tests[i].flags, &val, tests[i].v2); + ok(tests[i].expected - 0.001 < val && val < tests[i].expected + 0.001, + "test %d: expected val == %f, got %f\n", i, tests[i].expected, val); + } } START_TEST(vcomp) @@ -2191,7 +2200,7 @@ START_TEST(vcomp) test_reduction_integer16(); test_reduction_integer32(); test_reduction_integer64(); - test_reduction_float(); + test_reduction_float_double(); release_vcomp(); } diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 22f06cb..f2231c0 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -78,7 +78,7 @@ @ cdecl _vcomp_reduction_i4(long ptr long) @ cdecl _vcomp_reduction_i8(long ptr int64) @ cdecl _vcomp_reduction_r4(long ptr float) -@ stub _vcomp_reduction_r8 +@ cdecl _vcomp_reduction_r8(long ptr double) @ cdecl _vcomp_reduction_u1(long ptr long) _vcomp_reduction_i1 @ cdecl _vcomp_reduction_u2(long ptr long) _vcomp_reduction_i2 @ cdecl _vcomp_reduction_u4(long ptr long) _vcomp_reduction_i4 diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index b87bd8b..afea2f2 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -78,7 +78,7 @@ @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 @ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 -@ stub _vcomp_reduction_r8 +@ cdecl _vcomp_reduction_r8(long ptr double) vcomp._vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index e86d50b..cec1c99 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -79,7 +79,7 @@ @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 @ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 -@ stub _vcomp_reduction_r8 +@ cdecl _vcomp_reduction_r8(long ptr double) vcomp._vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 diff --git a/dlls/vcomp120/vcomp120.spec b/dlls/vcomp120/vcomp120.spec index e86d50b..cec1c99 100644 --- a/dlls/vcomp120/vcomp120.spec +++ b/dlls/vcomp120/vcomp120.spec @@ -79,7 +79,7 @@ @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 @ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 -@ stub _vcomp_reduction_r8 +@ cdecl _vcomp_reduction_r8(long ptr double) vcomp._vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 diff --git a/dlls/vcomp140/vcomp140.spec b/dlls/vcomp140/vcomp140.spec index e86d50b..cec1c99 100644 --- a/dlls/vcomp140/vcomp140.spec +++ b/dlls/vcomp140/vcomp140.spec @@ -79,7 +79,7 @@ @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 @ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 -@ stub _vcomp_reduction_r8 +@ cdecl _vcomp_reduction_r8(long ptr double) vcomp._vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4 diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index b87bd8b..afea2f2 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -78,7 +78,7 @@ @ cdecl _vcomp_reduction_i4(long ptr long) vcomp._vcomp_reduction_i4 @ cdecl _vcomp_reduction_i8(long ptr int64) vcomp._vcomp_reduction_i8 @ cdecl _vcomp_reduction_r4(long ptr float) vcomp._vcomp_reduction_r4 -@ stub _vcomp_reduction_r8 +@ cdecl _vcomp_reduction_r8(long ptr double) vcomp._vcomp_reduction_r8 @ cdecl _vcomp_reduction_u1(long ptr long) vcomp._vcomp_reduction_u1 @ cdecl _vcomp_reduction_u2(long ptr long) vcomp._vcomp_reduction_u2 @ cdecl _vcomp_reduction_u4(long ptr long) vcomp._vcomp_reduction_u4

1 0

Aric Stewart : winebus.sys: Add initial udev stub driver.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: 6d3e5f8441136d359274af7791c787eb5d205cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3e5f8441136d359274af779… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 8 10:12:50 2016 +0200 winebus.sys: Add initial udev stub driver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 107 +++++++++++++++++++++++++++++++++++++++++++ configure.ac | 14 ++++++ dlls/winebus.sys/Makefile.in | 2 + dlls/winebus.sys/bus.h | 23 ++++++++++ dlls/winebus.sys/bus_udev.c | 60 ++++++++++++++++++++++++ dlls/winebus.sys/main.c | 34 ++++++++++++++ include/config.h.in | 6 +++ 7 files changed, 246 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d3e5f8441136d359274a…

1 0

Huw Davies : winmm/tests: Call CoInitialize() to enable tests to run on Win 10.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: 5b622cfd84a1d690c5b1ccea4470c404f09f5c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b622cfd84a1d690c5b1ccea4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 8 11:48:20 2016 +0100 winmm/tests: Call CoInitialize() to enable tests to run on Win 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/Makefile.in | 2 +- dlls/winmm/tests/midi.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in index 5d81e38..1b191cb 100644 --- a/dlls/winmm/tests/Makefile.in +++ b/dlls/winmm/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = winmm.dll -IMPORTS = winmm user32 advapi32 +IMPORTS = winmm ole32 user32 advapi32 C_SRCS = \ capture.c \ diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index f3ea62c..1024c2c 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -22,6 +22,7 @@ #include <stddef.h> #include "windows.h" #include "mmsystem.h" +#include "objbase.h" #include "wine/test.h" extern const char* mmsys_error(MMRESULT error); /* from wave.c */ @@ -835,10 +836,15 @@ static void test_midi_outfns(HWND hwnd) START_TEST(midi) { HWND hwnd = 0; + + CoInitialize(NULL); /* Needed for Win 10 */ + if (1) /* select 1 for CALLBACK_WINDOW or 0 for CALLBACK_FUNCTION */ hwnd = CreateWindowExA(0, "static", "winmm midi test", WS_POPUP, 0,0,100,100, 0, 0, 0, NULL); test_midi_infns(hwnd); test_midi_outfns(hwnd); if (hwnd) DestroyWindow(hwnd); + + CoUninitialize(); }

1 0

Michael Stefaniuc : sti: Standardize COM aggregation in StillImage.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: 4f114ad6239af9ade333dd43eeabc03cb024c4ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f114ad6239af9ade333dd43e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 13:22:11 2016 +0200 sti: Standardize COM aggregation in StillImage. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sti/sti.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/sti/sti.c b/dlls/sti/sti.c index de5f426..41c94f5 100644 --- a/dlls/sti/sti.c +++ b/dlls/sti/sti.c @@ -44,9 +44,9 @@ static const WCHAR registeredAppsLaunchPath[] = { typedef struct _stillimage { + IUnknown IUnknown_inner; IStillImageW IStillImageW_iface; - IUnknown IUnknown_iface; - IUnknown *pUnkOuter; + IUnknown *outer_unk; LONG ref; } stillimage; @@ -59,19 +59,19 @@ static HRESULT WINAPI stillimagew_QueryInterface(IStillImageW *iface, REFIID rii { stillimage *This = impl_from_IStillImageW(iface); TRACE("(%p %s %p)\n", This, debugstr_guid(riid), ppvObject); - return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObject); } static ULONG WINAPI stillimagew_AddRef(IStillImageW *iface) { stillimage *This = impl_from_IStillImageW(iface); - return IUnknown_AddRef(This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI stillimagew_Release(IStillImageW *iface) { stillimage *This = impl_from_IStillImageW(iface); - return IUnknown_Release(This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI stillimagew_Initialize(IStillImageW *iface, HINSTANCE hinst, DWORD dwVersion) @@ -261,7 +261,7 @@ static const struct IStillImageWVtbl stillimagew_vtbl = static inline stillimage *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, stillimage, IUnknown_iface); + return CONTAINING_RECORD(iface, stillimage, IUnknown_inner); } static HRESULT WINAPI Internal_QueryInterface(IUnknown *iface, REFIID riid, void **ppvObject) @@ -335,18 +335,18 @@ HRESULT WINAPI StiCreateInstanceW(HINSTANCE hinst, DWORD dwVer, PSTIW *ppSti, LP if (This) { This->IStillImageW_iface.lpVtbl = &stillimagew_vtbl; - This->IUnknown_iface.lpVtbl = &internal_unk_vtbl; + This->IUnknown_inner.lpVtbl = &internal_unk_vtbl; if (pUnkOuter) - This->pUnkOuter = pUnkOuter; + This->outer_unk = pUnkOuter; else - This->pUnkOuter = &This->IUnknown_iface; + This->outer_unk = &This->IUnknown_inner; This->ref = 1; hr = IStillImage_Initialize(&This->IStillImageW_iface, hinst, dwVer); if (SUCCEEDED(hr)) { if (pUnkOuter) - *ppSti = (IStillImageW*) &This->IUnknown_iface; + *ppSti = (IStillImageW*) &This->IUnknown_inner; else *ppSti = &This->IStillImageW_iface; }

1 0

Bruno Jesus : winejoystick.drv: Test for new joysticks in intervals of 2 seconds.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: caaedf1cd610012f944f96a53627d9702358d2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caaedf1cd610012f944f96a53… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 8 00:08:33 2016 -0300 winejoystick.drv: Test for new joysticks in intervals of 2 seconds. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_linux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 289e728..287f4be 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -163,10 +163,17 @@ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) { char buf[20]; int flags, fd, found_ix, i; + static DWORD last_attempt; + DWORD now; if (jstick->dev > 0) return jstick->dev; + now = GetTickCount(); + if (now - last_attempt < 2000) + return -1; + last_attempt = now; + #ifdef HAVE_LINUX_22_JOYSTICK_API flags = O_RDONLY | O_NONBLOCK; #else @@ -189,6 +196,7 @@ static int JSTCK_OpenDevice(WINE_JSTCK* jstick) { TRACE("Found joystick[%d] at %s\n", jstick->joyIntf, buf); jstick->dev = fd; + last_attempt = 0; break; }

1 0

Sebastian Lackner : mshtml/tests: Fix incorrect usage of broken() function.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: 01581bfc48161c3c55027334b1ecb9e909873a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=01581bfc48161c3c55027334b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 11:17:15 2016 +0200 mshtml/tests: Fix incorrect usage of broken() function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 92a6f67..e8b3d19 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1968,7 +1968,7 @@ static void test_func(IDispatchEx *obj) memset(&ei, 0, sizeof(ei)); VariantInit(&var); hres = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, &var, &ei, NULL); - ok(hres == S_OK || broken(E_ACCESSDENIED), "InvokeEx failed: %08x\n", hres); + ok(hres == S_OK || broken(hres == E_ACCESSDENIED), "InvokeEx failed: %08x\n", hres); if(SUCCEEDED(hres)) { DISPID named_args[2] = { DISPID_THIS, 0xdeadbeef }; VARIANT args[2];

1 0

Sebastian Lackner : jscript: Change prototype of jsstr_alloc_buf and fix some error handling issues.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: 69437afed123117cff3002cd99bb9ce58490a85f URL: http://source.winehq.org/git/wine.git/?a=commit;h=69437afed123117cff3002cd9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 10:50:11 2016 +0200 jscript: Change prototype of jsstr_alloc_buf and fix some error handling issues. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 6 +++--- dlls/jscript/date.c | 22 +++++++++++----------- dlls/jscript/error.c | 4 ++-- dlls/jscript/function.c | 4 ++-- dlls/jscript/global.c | 22 +++++++++++----------- dlls/jscript/jsregexp.c | 4 ++-- dlls/jscript/jsstr.c | 17 +++++++++-------- dlls/jscript/jsstr.h | 6 +++--- dlls/jscript/number.c | 4 ++-- dlls/jscript/object.c | 4 ++-- dlls/jscript/string.c | 24 ++++++++++++------------ 11 files changed, 59 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69437afed123117cff300…

1 0

Sebastian Lackner : jscript: Do not include terminating \0 in result returned by Date_toLocale{Date, Time}String.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: 18420826aae58b25bdace5dc52ee7c6568e46aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18420826aae58b25bdace5dc5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 7 19:04:48 2016 +0200 jscript: Do not include terminating \0 in result returned by Date_toLocale{Date,Time}String. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 4 ++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index b35d812..b6997ab 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -925,7 +925,7 @@ static HRESULT Date_toLocaleDateString(script_ctx_t *ctx, vdisp_t *jsthis, WORD WCHAR *ptr; len = GetDateFormatW(ctx->lcid, DATE_LONGDATE, &st, NULL, NULL, 0); - date_str = jsstr_alloc_buf(len, &ptr); + date_str = jsstr_alloc_buf(len-1, &ptr); if(!date_str) return E_OUTOFMEMORY; GetDateFormatW(ctx->lcid, DATE_LONGDATE, &st, NULL, ptr, len); @@ -964,7 +964,7 @@ static HRESULT Date_toLocaleTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD WCHAR *ptr; len = GetTimeFormatW(ctx->lcid, 0, &st, NULL, NULL, 0); - date_str = jsstr_alloc_buf(len, &ptr); + date_str = jsstr_alloc_buf(len-1, &ptr); if(!date_str) return E_OUTOFMEMORY; GetTimeFormatW(ctx->lcid, 0, &st, NULL, ptr, len); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1ca974d..c7f2bcd 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2130,6 +2130,11 @@ ok(Date.parse("Tue, 22 Mar 2016 09:57:55 -0300") === Date.parse("Tue, 22 Mar 201 ok(Date.parse("Tue, 22 Mar 2016 09:57:55 +0400") === Date.parse("Tue, 22 Mar 2016 09:57:55 UTC+0400"), "Date.parse(\"Tue, 22 Mar 2016 09:57:55 +0400\") = " + Date.parse("Tue, 22 Mar 2016 09:57:55 +0400")); +tmp = (new Date()).toLocaleDateString(); +ok(tmp.charCodeAt(tmp.length-1) != 0, "invalid null byte"); +tmp = (new Date()).toLocaleTimeString(); +ok(tmp.charCodeAt(tmp.length-1) != 0, "invalid null byte"); + ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI); Math.PI = "test";

1 0

Alistair Leslie-Hughes : ws2_32: Accept shouldn' t fail when addrlen32 is NULL.
by Alexandre Julliard 08 Sep '16

08 Sep '16

Module: wine Branch: master Commit: f9d40575740fba3e48c5ab2638e630b4a24f3126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d40575740fba3e48c5ab263… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 7 04:31:42 2016 +0000 ws2_32: Accept shouldn't fail when addrlen32 is NULL. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ccd50f8..f0dc04f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2653,7 +2653,7 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) SERVER_END_REQ; if (!status) { - if (addr && WS_getpeername(as, addr, addrlen32)) + if (addr && addrlen32 && WS_getpeername(as, addr, addrlen32)) { WS_closesocket(as); return SOCKET_ERROR; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 98ff7c7..be98691 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4068,7 +4068,7 @@ static void test_accept(void) int ret; SOCKET server_socket, accepted = INVALID_SOCKET, connector; struct sockaddr_in address; - SOCKADDR_STORAGE ss; + SOCKADDR_STORAGE ss, ss_empty; int socklen; select_thread_params thread_params; HANDLE thread_handle = NULL; @@ -4199,6 +4199,19 @@ static void test_accept(void) ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); ok(socklen != sizeof(ss), "unexpected length\n"); ok(ss.ss_family, "family not set\n"); + closesocket(accepted); + closesocket(connector); + accepted = connector = INVALID_SOCKET; + + socklen = sizeof(address); + connector = setup_connector_socket(&address, socklen, FALSE); + if (connector == INVALID_SOCKET) goto done; + + memset(&ss, 0, sizeof(ss)); + memset(&ss_empty, 0, sizeof(ss_empty)); + accepted = accept(server_socket, (struct sockaddr *)&ss, NULL); + ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); + ok(!memcmp(&ss, &ss_empty, sizeof(ss)), "structure is different\n"); done: if (accepted != INVALID_SOCKET)

1 0