July 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : vcomp: Implement atomic float functions.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 2a0890fe55945d49ddaebe255a1694388b1bd099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0890fe55945d49ddaebe255… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 01:38:03 2015 +0200 vcomp: Implement atomic float functions. --- dlls/vcomp/main.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 8 ++++---- dlls/vcomp100/vcomp100.spec | 8 ++++---- dlls/vcomp90/vcomp90.spec | 8 ++++---- 4 files changed, 56 insertions(+), 12 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 6f0caf6..92c8eaf 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -286,6 +286,50 @@ void CDECL _vcomp_atomic_xor_i4(int *dest, int val) do old = *dest; while (interlocked_cmpxchg(dest, old ^ val, old) != old); } +void CDECL _vcomp_atomic_add_r4(float *dest, float val) +{ + int old, new; + do + { + old = *(int *)dest; + *(float *)&new = *(float *)&old + val; + } + while (interlocked_cmpxchg((int *)dest, new, old) != old); +} + +void CDECL _vcomp_atomic_div_r4(float *dest, float val) +{ + int old, new; + do + { + old = *(int *)dest; + *(float *)&new = *(float *)&old / val; + } + while (interlocked_cmpxchg((int *)dest, new, old) != old); +} + +void CDECL _vcomp_atomic_mul_r4(float *dest, float val) +{ + int old, new; + do + { + old = *(int *)dest; + *(float *)&new = *(float *)&old * val; + } + while (interlocked_cmpxchg((int *)dest, new, old) != old); +} + +void CDECL _vcomp_atomic_sub_r4(float *dest, float val) +{ + int old, new; + do + { + old = *(int *)dest; + *(float *)&new = *(float *)&old - val; + } + while (interlocked_cmpxchg((int *)dest, new, old) != old); +} + int CDECL omp_get_dynamic(void) { TRACE("stub\n"); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 768daef..bc963cb 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -2,7 +2,7 @@ @ stub _vcomp_atomic_add_i2 @ cdecl _vcomp_atomic_add_i4(ptr long) @ stub _vcomp_atomic_add_i8 -@ stub _vcomp_atomic_add_r4 +@ cdecl _vcomp_atomic_add_r4(ptr float) @ stub _vcomp_atomic_add_r8 @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 @@ -12,7 +12,7 @@ @ stub _vcomp_atomic_div_i2 @ cdecl _vcomp_atomic_div_i4(ptr long) @ stub _vcomp_atomic_div_i8 -@ stub _vcomp_atomic_div_r4 +@ cdecl _vcomp_atomic_div_r4(ptr float) @ stub _vcomp_atomic_div_r8 @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 @@ -22,7 +22,7 @@ @ stub _vcomp_atomic_mul_i2 @ cdecl _vcomp_atomic_mul_i4(ptr long) @ stub _vcomp_atomic_mul_i8 -@ stub _vcomp_atomic_mul_r4 +@ cdecl _vcomp_atomic_mul_r4(ptr float) @ stub _vcomp_atomic_mul_r8 @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 @@ -44,7 +44,7 @@ @ stub _vcomp_atomic_sub_i2 @ cdecl _vcomp_atomic_sub_i4(ptr long) @ stub _vcomp_atomic_sub_i8 -@ stub _vcomp_atomic_sub_r4 +@ cdecl _vcomp_atomic_sub_r4(ptr float) @ stub _vcomp_atomic_sub_r8 @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2 diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 7f77ce1..2f4401e 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -2,7 +2,7 @@ @ stub _vcomp_atomic_add_i2 @ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 @ stub _vcomp_atomic_add_i8 -@ stub _vcomp_atomic_add_r4 +@ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 @ stub _vcomp_atomic_add_r8 @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 @@ -12,7 +12,7 @@ @ stub _vcomp_atomic_div_i2 @ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 @ stub _vcomp_atomic_div_i8 -@ stub _vcomp_atomic_div_r4 +@ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 @ stub _vcomp_atomic_div_r8 @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 @@ -22,7 +22,7 @@ @ stub _vcomp_atomic_mul_i2 @ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 @ stub _vcomp_atomic_mul_i8 -@ stub _vcomp_atomic_mul_r4 +@ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 @ stub _vcomp_atomic_mul_r8 @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 @@ -44,7 +44,7 @@ @ stub _vcomp_atomic_sub_i2 @ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 @ stub _vcomp_atomic_sub_i8 -@ stub _vcomp_atomic_sub_r4 +@ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 @ stub _vcomp_atomic_sub_r8 @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2 diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 7f77ce1..2f4401e 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -2,7 +2,7 @@ @ stub _vcomp_atomic_add_i2 @ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 @ stub _vcomp_atomic_add_i8 -@ stub _vcomp_atomic_add_r4 +@ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 @ stub _vcomp_atomic_add_r8 @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 @@ -12,7 +12,7 @@ @ stub _vcomp_atomic_div_i2 @ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 @ stub _vcomp_atomic_div_i8 -@ stub _vcomp_atomic_div_r4 +@ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 @ stub _vcomp_atomic_div_r8 @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 @@ -22,7 +22,7 @@ @ stub _vcomp_atomic_mul_i2 @ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 @ stub _vcomp_atomic_mul_i8 -@ stub _vcomp_atomic_mul_r4 +@ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 @ stub _vcomp_atomic_mul_r8 @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 @@ -44,7 +44,7 @@ @ stub _vcomp_atomic_sub_i2 @ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 @ stub _vcomp_atomic_sub_i8 -@ stub _vcomp_atomic_sub_r4 +@ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 @ stub _vcomp_atomic_sub_r8 @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2

1 0

Sebastian Lackner : vcomp/tests: Add tests for atomic float functions.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: c14db31b9be37fb1b6d5384a0812384249c5f3a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14db31b9be37fb1b6d5384a0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 01:38:28 2015 +0200 vcomp/tests: Add tests for atomic float functions. --- dlls/vcomp/tests/vcomp.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 4974831..5be6965 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -32,15 +32,19 @@ static BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); static VOID (WINAPI *pReleaseActCtx)(HANDLE); static void (CDECL *p_vcomp_atomic_add_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_add_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_and_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_div_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_div_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_div_ui4)(unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_mul_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_mul_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_or_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shl_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shr_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shr_ui4)(unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_sub_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_sub_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_xor_i4)(int *dest, int val); static void (CDECL *p_vcomp_barrier)(void); static void (CDECL *p_vcomp_for_static_end)(void); @@ -187,15 +191,19 @@ static BOOL init_vcomp(void) } VCOMP_GET_PROC(_vcomp_atomic_add_i4); + VCOMP_GET_PROC(_vcomp_atomic_add_r4); VCOMP_GET_PROC(_vcomp_atomic_and_i4); VCOMP_GET_PROC(_vcomp_atomic_div_i4); + VCOMP_GET_PROC(_vcomp_atomic_div_r4); VCOMP_GET_PROC(_vcomp_atomic_div_ui4); VCOMP_GET_PROC(_vcomp_atomic_mul_i4); + VCOMP_GET_PROC(_vcomp_atomic_mul_r4); VCOMP_GET_PROC(_vcomp_atomic_or_i4); VCOMP_GET_PROC(_vcomp_atomic_shl_i4); VCOMP_GET_PROC(_vcomp_atomic_shr_i4); VCOMP_GET_PROC(_vcomp_atomic_shr_ui4); VCOMP_GET_PROC(_vcomp_atomic_sub_i4); + VCOMP_GET_PROC(_vcomp_atomic_sub_r4); VCOMP_GET_PROC(_vcomp_atomic_xor_i4); VCOMP_GET_PROC(_vcomp_barrier); VCOMP_GET_PROC(_vcomp_for_static_end); @@ -925,6 +933,31 @@ static void test_atomic_integer32(void) } } +static void test_atomic_float(void) +{ + struct + { + void (CDECL *func)(float *, float); + float v1, v2, expected; + } + tests[] = + { + { p_vcomp_atomic_add_r4, 42.0, 17.0, 42.0 + 17.0 }, + { p_vcomp_atomic_div_r4, 42.0, 17.0, 42.0 / 17.0 }, + { p_vcomp_atomic_mul_r4, 42.0, 17.0, 42.0 * 17.0 }, + { p_vcomp_atomic_sub_r4, 42.0, 17.0, 42.0 - 17.0 }, + }; + int i; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + float val = tests[i].v1; + tests[i].func(&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()) @@ -937,6 +970,7 @@ START_TEST(vcomp) test_vcomp_for_static_simple_init(); test_vcomp_for_static_init(); test_atomic_integer32(); + test_atomic_float(); release_vcomp(); }

1 0

Sebastian Lackner : vcomp: Implement atomic double functions.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 36fe1f8a82c0dca06a749dda8f2239e643e37fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=36fe1f8a82c0dca06a749dda8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 01:38:52 2015 +0200 vcomp: Implement atomic double functions. --- dlls/vcomp/main.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 8 ++++---- dlls/vcomp100/vcomp100.spec | 8 ++++---- dlls/vcomp90/vcomp90.spec | 8 ++++---- 4 files changed, 56 insertions(+), 12 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 92c8eaf..301370c 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -330,6 +330,50 @@ void CDECL _vcomp_atomic_sub_r4(float *dest, float val) while (interlocked_cmpxchg((int *)dest, new, old) != old); } +void CDECL _vcomp_atomic_add_r8(double *dest, double val) +{ + LONG64 old, new; + do + { + old = *(LONG64 *)dest; + *(double *)&new = *(double *)&old + val; + } + while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); +} + +void CDECL _vcomp_atomic_div_r8(double *dest, double val) +{ + LONG64 old, new; + do + { + old = *(LONG64 *)dest; + *(double *)&new = *(double *)&old / val; + } + while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); +} + +void CDECL _vcomp_atomic_mul_r8(double *dest, double val) +{ + LONG64 old, new; + do + { + old = *(LONG64 *)dest; + *(double *)&new = *(double *)&old * val; + } + while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); +} + +void CDECL _vcomp_atomic_sub_r8(double *dest, double val) +{ + LONG64 old, new; + do + { + old = *(LONG64 *)dest; + *(double *)&new = *(double *)&old - val; + } + while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); +} + int CDECL omp_get_dynamic(void) { TRACE("stub\n"); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index bc963cb..3a709df 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -3,7 +3,7 @@ @ cdecl _vcomp_atomic_add_i4(ptr long) @ stub _vcomp_atomic_add_i8 @ cdecl _vcomp_atomic_add_r4(ptr float) -@ stub _vcomp_atomic_add_r8 +@ cdecl _vcomp_atomic_add_r8(ptr double) @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 @ cdecl _vcomp_atomic_and_i4(ptr long) @@ -13,7 +13,7 @@ @ cdecl _vcomp_atomic_div_i4(ptr long) @ stub _vcomp_atomic_div_i8 @ cdecl _vcomp_atomic_div_r4(ptr float) -@ stub _vcomp_atomic_div_r8 +@ cdecl _vcomp_atomic_div_r8(ptr double) @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 @ cdecl _vcomp_atomic_div_ui4(ptr long) @@ -23,7 +23,7 @@ @ cdecl _vcomp_atomic_mul_i4(ptr long) @ stub _vcomp_atomic_mul_i8 @ cdecl _vcomp_atomic_mul_r4(ptr float) -@ stub _vcomp_atomic_mul_r8 +@ cdecl _vcomp_atomic_mul_r8(ptr double) @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 @ cdecl _vcomp_atomic_or_i4(ptr long) @@ -45,7 +45,7 @@ @ cdecl _vcomp_atomic_sub_i4(ptr long) @ stub _vcomp_atomic_sub_i8 @ cdecl _vcomp_atomic_sub_r4(ptr float) -@ stub _vcomp_atomic_sub_r8 +@ cdecl _vcomp_atomic_sub_r8(ptr double) @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2 @ cdecl _vcomp_atomic_xor_i4(ptr long) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 2f4401e..eb6e568 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -3,7 +3,7 @@ @ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 @ stub _vcomp_atomic_add_i8 @ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 -@ stub _vcomp_atomic_add_r8 +@ cdecl _vcomp_atomic_add_r8(ptr double) vcomp._vcomp_atomic_add_r8 @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 @ cdecl _vcomp_atomic_and_i4(ptr long) vcomp._vcomp_atomic_and_i4 @@ -13,7 +13,7 @@ @ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 @ stub _vcomp_atomic_div_i8 @ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 -@ stub _vcomp_atomic_div_r8 +@ cdecl _vcomp_atomic_div_r8(ptr double) vcomp._vcomp_atomic_div_r8 @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 @ cdecl _vcomp_atomic_div_ui4(ptr long) vcomp._vcomp_atomic_div_ui4 @@ -23,7 +23,7 @@ @ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 @ stub _vcomp_atomic_mul_i8 @ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 -@ stub _vcomp_atomic_mul_r8 +@ cdecl _vcomp_atomic_mul_r8(ptr double) vcomp._vcomp_atomic_mul_r8 @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 @ cdecl _vcomp_atomic_or_i4(ptr long) vcomp._vcomp_atomic_or_i4 @@ -45,7 +45,7 @@ @ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 @ stub _vcomp_atomic_sub_i8 @ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 -@ stub _vcomp_atomic_sub_r8 +@ cdecl _vcomp_atomic_sub_r8(ptr double) vcomp._vcomp_atomic_sub_r8 @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2 @ cdecl _vcomp_atomic_xor_i4(ptr long) vcomp._vcomp_atomic_xor_i4 diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 2f4401e..eb6e568 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -3,7 +3,7 @@ @ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 @ stub _vcomp_atomic_add_i8 @ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 -@ stub _vcomp_atomic_add_r8 +@ cdecl _vcomp_atomic_add_r8(ptr double) vcomp._vcomp_atomic_add_r8 @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 @ cdecl _vcomp_atomic_and_i4(ptr long) vcomp._vcomp_atomic_and_i4 @@ -13,7 +13,7 @@ @ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 @ stub _vcomp_atomic_div_i8 @ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 -@ stub _vcomp_atomic_div_r8 +@ cdecl _vcomp_atomic_div_r8(ptr double) vcomp._vcomp_atomic_div_r8 @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 @ cdecl _vcomp_atomic_div_ui4(ptr long) vcomp._vcomp_atomic_div_ui4 @@ -23,7 +23,7 @@ @ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 @ stub _vcomp_atomic_mul_i8 @ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 -@ stub _vcomp_atomic_mul_r8 +@ cdecl _vcomp_atomic_mul_r8(ptr double) vcomp._vcomp_atomic_mul_r8 @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 @ cdecl _vcomp_atomic_or_i4(ptr long) vcomp._vcomp_atomic_or_i4 @@ -45,7 +45,7 @@ @ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 @ stub _vcomp_atomic_sub_i8 @ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 -@ stub _vcomp_atomic_sub_r8 +@ cdecl _vcomp_atomic_sub_r8(ptr double) vcomp._vcomp_atomic_sub_r8 @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2 @ cdecl _vcomp_atomic_xor_i4(ptr long) vcomp._vcomp_atomic_xor_i4

1 0

Sebastian Lackner : vcomp/tests: Add tests for atomic double functions.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: dfe32d6c523f4e126be1a1c30806165af2bdea8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe32d6c523f4e126be1a1c30… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 01:39:34 2015 +0200 vcomp/tests: Add tests for atomic double functions. --- dlls/vcomp/tests/vcomp.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 5be6965..f021a72 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -33,18 +33,22 @@ static VOID (WINAPI *pReleaseActCtx)(HANDLE); static void (CDECL *p_vcomp_atomic_add_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_add_r4)(float *dest, float val); +static void (CDECL *p_vcomp_atomic_add_r8)(double *dest, double val); static void (CDECL *p_vcomp_atomic_and_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_div_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_div_r4)(float *dest, float val); +static void (CDECL *p_vcomp_atomic_div_r8)(double *dest, double val); static void (CDECL *p_vcomp_atomic_div_ui4)(unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_mul_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_mul_r4)(float *dest, float val); +static void (CDECL *p_vcomp_atomic_mul_r8)(double *dest, double val); static void (CDECL *p_vcomp_atomic_or_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shl_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shr_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_shr_ui4)(unsigned int *dest, unsigned int val); static void (CDECL *p_vcomp_atomic_sub_i4)(int *dest, int val); static void (CDECL *p_vcomp_atomic_sub_r4)(float *dest, float val); +static void (CDECL *p_vcomp_atomic_sub_r8)(double *dest, double val); static void (CDECL *p_vcomp_atomic_xor_i4)(int *dest, int val); static void (CDECL *p_vcomp_barrier)(void); static void (CDECL *p_vcomp_for_static_end)(void); @@ -192,18 +196,22 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_atomic_add_i4); VCOMP_GET_PROC(_vcomp_atomic_add_r4); + VCOMP_GET_PROC(_vcomp_atomic_add_r8); VCOMP_GET_PROC(_vcomp_atomic_and_i4); VCOMP_GET_PROC(_vcomp_atomic_div_i4); VCOMP_GET_PROC(_vcomp_atomic_div_r4); + VCOMP_GET_PROC(_vcomp_atomic_div_r8); VCOMP_GET_PROC(_vcomp_atomic_div_ui4); VCOMP_GET_PROC(_vcomp_atomic_mul_i4); VCOMP_GET_PROC(_vcomp_atomic_mul_r4); + VCOMP_GET_PROC(_vcomp_atomic_mul_r8); VCOMP_GET_PROC(_vcomp_atomic_or_i4); VCOMP_GET_PROC(_vcomp_atomic_shl_i4); VCOMP_GET_PROC(_vcomp_atomic_shr_i4); VCOMP_GET_PROC(_vcomp_atomic_shr_ui4); VCOMP_GET_PROC(_vcomp_atomic_sub_i4); VCOMP_GET_PROC(_vcomp_atomic_sub_r4); + VCOMP_GET_PROC(_vcomp_atomic_sub_r8); VCOMP_GET_PROC(_vcomp_atomic_xor_i4); VCOMP_GET_PROC(_vcomp_barrier); VCOMP_GET_PROC(_vcomp_for_static_end); @@ -958,6 +966,31 @@ static void test_atomic_float(void) } } +static void test_atomic_double(void) +{ + struct + { + void (CDECL *func)(double *, double); + double v1, v2, expected; + } + tests[] = + { + { p_vcomp_atomic_add_r8, 42.0, 17.0, 42.0 + 17.0 }, + { p_vcomp_atomic_div_r8, 42.0, 17.0, 42.0 / 17.0 }, + { p_vcomp_atomic_mul_r8, 42.0, 17.0, 42.0 * 17.0 }, + { p_vcomp_atomic_sub_r8, 42.0, 17.0, 42.0 - 17.0 }, + }; + int i; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + double val = tests[i].v1; + tests[i].func(&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()) @@ -971,6 +1004,7 @@ START_TEST(vcomp) test_vcomp_for_static_init(); test_atomic_integer32(); test_atomic_float(); + test_atomic_double(); release_vcomp(); }

1 0

Alexandre Julliard : Release 1.7.48.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 797c037bff2f7621f5b3d632bd899349529d6b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=797c037bff2f7621f5b3d632b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 20:21:18 2015 +0200 Release 1.7.48. --- ANNOUNCE | 774 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 358 insertions(+), 437 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=797c037bff2f7621f5b3d…

1 0

Tag wine-1.7.48 : Alexandre Julliard : Release 1.7.48
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: refs/tags/wine-1.7.48 Tag: 6682264780a6c13adcc221ab3708c2192444e4c0 URL: http://source.winehq.org/git/wine.git/?a=tag;h=6682264780a6c13adcc221ab3708… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 20:21:18 2015 +0200 Release 1.7.48

1 0

Henri Verbeet : include: Add WIC error codes to winerror.h.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: e9e21ab4f9b40c983e317acff75103d005434ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e21ab4f9b40c983e317acff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 19:32:04 2015 +0200 include: Add WIC error codes to winerror.h. --- include/wincodec.idl | 17 ----------------- include/winerror.h | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 7216d07..639d925 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -220,23 +220,6 @@ typedef struct WICBitmapPattern { typedef UINT32 WICColor; -cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04") -cpp_quote("#define WINCODEC_ERR_VALUEOUTOFRANGE 0x88982f05") -cpp_quote("#define WINCODEC_ERR_NOTINITIALIZED 0x88982f0c") -cpp_quote("#define WINCODEC_ERR_ALREADYLOCKED 0x88982f0d") -cpp_quote("#define WINCODEC_ERR_PROPERTYNOTFOUND 0x88982f40") -cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") -cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") -cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50") -cpp_quote("#define WINCODEC_ERR_BADIMAGE 0x88982f60") -cpp_quote("#define WINCODEC_ERR_FRAMEMISSING 0x88982f62") -cpp_quote("#define WINCODEC_ERR_BADMETADATAHEADER 0x88982f63") -cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80") -cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") -cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c") -cpp_quote("#define WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE 0x88982f8e") -cpp_quote("#define WINCODEC_ERR_WIN32ERROR 0x88982f94") - interface IWICPalette; [ diff --git a/include/winerror.h b/include/winerror.h index f1c2f3b..1c9df07 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2995,6 +2995,47 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define SCARD_W_CACHE_ITEM_STALE _HRESULT_TYPEDEF_(0x80100071) #define SCARD_W_CACHE_ITEM_TOO_BIG _HRESULT_TYPEDEF_(0x80100072) +#define WINCODEC_ERR_WRONGSTATE _HRESULT_TYPEDEF_(0x88982f04) +#define WINCODEC_ERR_VALUEOUTOFRANGE _HRESULT_TYPEDEF_(0x88982f05) +#define WINCODEC_ERR_UNKNOWNIMAGEFORMAT _HRESULT_TYPEDEF_(0x88982f07) +#define WINCODEC_ERR_UNSUPPORTEDVERSION _HRESULT_TYPEDEF_(0x88982f0b) +#define WINCODEC_ERR_NOTINITIALIZED _HRESULT_TYPEDEF_(0x88982f0c) +#define WINCODEC_ERR_ALREADYLOCKED _HRESULT_TYPEDEF_(0x88982f0d) +#define WINCODEC_ERR_PROPERTYNOTFOUND _HRESULT_TYPEDEF_(0x88982f40) +#define WINCODEC_ERR_PROPERTYNOTSUPPORTED _HRESULT_TYPEDEF_(0x88982f41) +#define WINCODEC_ERR_PROPERTYSIZE _HRESULT_TYPEDEF_(0x88982f42) +#define WINCODEC_ERR_CODECPRESENT _HRESULT_TYPEDEF_(0x88982f43) +#define WINCODEC_ERR_CODECNOTHUMBNAIL _HRESULT_TYPEDEF_(0x88982f44) +#define WINCODEC_ERR_PALETTEUNAVAILABLE _HRESULT_TYPEDEF_(0x88982f45) +#define WINCODEC_ERR_CODECTOOMANYSCANLINES _HRESULT_TYPEDEF_(0x88982f46) +#define WINCODEC_ERR_INTERNALERROR _HRESULT_TYPEDEF_(0x88982f48) +#define WINCODEC_ERR_SOURCERECTDOESNOTMATCHDIMENSIONS _HRESULT_TYPEDEF_(0x88982f49) +#define WINCODEC_ERR_COMPONENTNOTFOUND _HRESULT_TYPEDEF_(0x88982f50) +#define WINCODEC_ERR_IMAGESIZEOUTOFRANGE _HRESULT_TYPEDEF_(0x88982f51) +#define WINCODEC_ERR_TOOMUCHMETADATA _HRESULT_TYPEDEF_(0x88982f52) +#define WINCODEC_ERR_BADIMAGE _HRESULT_TYPEDEF_(0x88982f60) +#define WINCODEC_ERR_BADHEADER _HRESULT_TYPEDEF_(0x88982f61) +#define WINCODEC_ERR_FRAMEMISSING _HRESULT_TYPEDEF_(0x88982f62) +#define WINCODEC_ERR_BADMETADATAHEADER _HRESULT_TYPEDEF_(0x88982f63) +#define WINCODEC_ERR_BADSTREAMDATA _HRESULT_TYPEDEF_(0x88982f70) +#define WINCODEC_ERR_STREAMWRITE _HRESULT_TYPEDEF_(0x88982f71) +#define WINCODEC_ERR_STREAMREAD _HRESULT_TYPEDEF_(0x88982f72) +#define WINCODEC_ERR_STREAMNOTAVAILABLE _HRESULT_TYPEDEF_(0x88982f73) +#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT _HRESULT_TYPEDEF_(0x88982f80) +#define WINCODEC_ERR_UNSUPPORTEDOPERATION _HRESULT_TYPEDEF_(0x88982f81) +#define WINCODEC_ERR_INVALIDREGISTRATION _HRESULT_TYPEDEF_(0x88982f8a) +#define WINCODEC_ERR_COMPONENTINITIALIZEFAILURE _HRESULT_TYPEDEF_(0x88982f8b) +#define WINCODEC_ERR_INSUFFICIENTBUFFER _HRESULT_TYPEDEF_(0x88982f8c) +#define WINCODEC_ERR_DUPLICATEMETADATAPRESENT _HRESULT_TYPEDEF_(0x88982f8d) +#define WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE _HRESULT_TYPEDEF_(0x88982f8e) +#define WINCODEC_ERR_UNEXPECTEDSIZE _HRESULT_TYPEDEF_(0x88982f8f) +#define WINCODEC_ERR_INVALIDQUERYREQUEST _HRESULT_TYPEDEF_(0x88982f90) +#define WINCODEC_ERR_UNEXPECTEDMETADATATYPE _HRESULT_TYPEDEF_(0x88982f91) +#define WINCODEC_ERR_REQUESTONLYVALIDATMETADATAROOT _HRESULT_TYPEDEF_(0x88982f92) +#define WINCODEC_ERR_INVALIDQUERYCHARACTER _HRESULT_TYPEDEF_(0x88982f93) +#define WINCODEC_ERR_WIN32ERROR _HRESULT_TYPEDEF_(0x88982f94) +#define WINCODEC_ERR_INVALIDPROGRESSIVELEVEL _HRESULT_TYPEDEF_(0x88982f95) + #define DWRITE_E_FILEFORMAT _HRESULT_TYPEDEF_(0x88985000) #define DWRITE_E_UNEXPECTED _HRESULT_TYPEDEF_(0x88985001) #define DWRITE_E_NOFONT _HRESULT_TYPEDEF_(0x88985002)

1 0

Henri Verbeet : d2d1: Also infer the alpha mode in d2d_d3d_render_target_CreateBitmapFromWicBitmap ().
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: ccc347038bd38d793536ca3c080f9198372c7e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc347038bd38d793536ca3c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 23 19:32:05 2015 +0200 d2d1: Also infer the alpha mode in d2d_d3d_render_target_CreateBitmapFromWicBitmap(). --- dlls/d2d1/render_target.c | 48 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index e939fef..1c641e7 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -300,14 +300,28 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderT static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap(ID2D1RenderTarget *iface, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { + const D2D1_PIXEL_FORMAT *d2d_format; D2D1_BITMAP_PROPERTIES bitmap_desc; + WICPixelFormatGUID wic_format; unsigned int bpp, data_size; D2D1_SIZE_U size; + unsigned int i; WICRect rect; UINT32 pitch; HRESULT hr; void *data; + static const struct + { + const WICPixelFormatGUID *wic; + D2D1_PIXEL_FORMAT d2d; + } + format_lookup[] = + { + {&GUID_WICPixelFormat32bppPBGRA, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, + {&GUID_WICPixelFormat32bppBGR, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, + }; + TRACE("iface %p, bitmap_source %p, desc %p, bitmap %p.\n", iface, bitmap_source, desc, bitmap); @@ -329,28 +343,32 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap bitmap_desc = *desc; } - if (bitmap_desc.pixelFormat.format == DXGI_FORMAT_UNKNOWN) + if (FAILED(hr = IWICBitmapSource_GetPixelFormat(bitmap_source, &wic_format))) { - WICPixelFormatGUID wic_format; + WARN("Failed to get bitmap format, hr %#x.\n", hr); + return hr; + } - if (FAILED(hr = IWICBitmapSource_GetPixelFormat(bitmap_source, &wic_format))) + for (i = 0, d2d_format = NULL; i < sizeof(format_lookup) / sizeof(*format_lookup); ++i) + { + if (IsEqualGUID(&wic_format, format_lookup[i].wic)) { - WARN("Failed to get bitmap format, hr %#x.\n", hr); - return hr; + d2d_format = &format_lookup[i].d2d; + break; } + } - if (IsEqualGUID(&wic_format, &GUID_WICPixelFormat32bppPBGRA) - || IsEqualGUID(&wic_format, &GUID_WICPixelFormat32bppBGR)) - { - bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; - } - else - { - WARN("Unsupported WIC bitmap format %s.\n", debugstr_guid(&wic_format)); - return D2DERR_UNSUPPORTED_PIXEL_FORMAT; - } + if (!d2d_format) + { + WARN("Unsupported WIC bitmap format %s.\n", debugstr_guid(&wic_format)); + return D2DERR_UNSUPPORTED_PIXEL_FORMAT; } + if (bitmap_desc.pixelFormat.format == DXGI_FORMAT_UNKNOWN) + bitmap_desc.pixelFormat.format = d2d_format->format; + if (bitmap_desc.pixelFormat.alphaMode == D2D1_ALPHA_MODE_UNKNOWN) + bitmap_desc.pixelFormat.alphaMode = d2d_format->alphaMode; + switch (bitmap_desc.pixelFormat.format) { case DXGI_FORMAT_B8G8R8A8_UNORM:

1 0

Nikolay Sivov : user32: Initialize buffer before sending WM_GETTEXT.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: ee72b0fdc7ada3a9f83650bd5db996b14ac98c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee72b0fdc7ada3a9f83650bd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 23 22:30:41 2015 +0300 user32: Initialize buffer before sending WM_GETTEXT. --- dlls/user32/tests/win.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/win.c | 8 ++++ 2 files changed, 130 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 689f0a2..309b699 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -717,6 +717,14 @@ static void test_enum_thread_windows(void) CloseHandle( handle ); } +static struct wm_gettext_override_data +{ + BOOL enabled; /* when 1 bypasses default procedure */ + char *buff; /* expected text buffer pointer */ + WCHAR *buffW; /* same, for W test */ + int len; +} g_wm_gettext_override; + static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -798,6 +806,14 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR break; case WM_GETTEXT: num_gettext_msgs++; + if (g_wm_gettext_override.enabled) + { + char *text = (char*)lparam; + ok(g_wm_gettext_override.buff == text, "expected buffer %p, got %p\n", g_wm_gettext_override.buff, text); + if (g_wm_gettext_override.len) + ok(*text == 0, "expected empty string buffer %x\n", *text); + return 0; + } break; case WM_SETTEXT: num_settext_msgs++; @@ -807,6 +823,26 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR return DefWindowProcA(hwnd, msg, wparam, lparam); } +static LRESULT WINAPI main_window_procW(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_GETTEXT: + num_gettext_msgs++; + if (g_wm_gettext_override.enabled) + { + WCHAR *text = (WCHAR*)lparam; + ok(g_wm_gettext_override.buffW == text, "expected buffer %p, got %p\n", g_wm_gettext_override.buffW, text); + if (g_wm_gettext_override.len) + ok(*text == 0, "expected empty string buffer %x\n", *text); + return 0; + } + break; + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + static LRESULT WINAPI tool_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -832,8 +868,11 @@ static LRESULT WINAPI tool_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR return DefWindowProcA(hwnd, msg, wparam, lparam); } +static const WCHAR mainclassW[] = {'M','a','i','n','W','i','n','d','o','w','C','l','a','s','s','W',0}; + static BOOL RegisterWindowClasses(void) { + WNDCLASSW clsW; WNDCLASSA cls; cls.style = CS_DBLCLKS; @@ -849,6 +888,19 @@ static BOOL RegisterWindowClasses(void) if(!RegisterClassA(&cls)) return FALSE; + clsW.style = CS_DBLCLKS; + clsW.lpfnWndProc = main_window_procW; + clsW.cbClsExtra = 0; + clsW.cbWndExtra = 0; + clsW.hInstance = GetModuleHandleA(0); + clsW.hIcon = 0; + clsW.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + clsW.hbrBackground = GetStockObject(WHITE_BRUSH); + clsW.lpszMenuName = NULL; + clsW.lpszClassName = mainclassW; + + if(!RegisterClassW(&clsW)) return FALSE; + cls.style = 0; cls.lpfnWndProc = tool_window_procA; cls.cbClsExtra = 0; @@ -5726,11 +5778,12 @@ static DWORD CALLBACK settext_msg_thread( LPVOID arg ) static void test_gettext(void) { DWORD tid, num_msgs; + WCHAR bufW[32]; HANDLE thread; BOOL success; char buf[32]; INT buf_len; - HWND hwnd; + HWND hwnd, hwnd2; LRESULT r; MSG msg; @@ -5745,6 +5798,74 @@ static void test_gettext(void) ok( !strcmp(buf, "caption"), "got wrong window text '%s'\n", buf ); ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + /* other process window */ + strcpy( buf, "a" ); + buf_len = GetWindowTextA( GetDesktopWindow(), buf, sizeof(buf) ); + ok( buf_len == 0, "expected a nonempty window text\n" ); + ok( *buf == 0, "got wrong window text '%s'\n", buf ); + + strcpy( buf, "blah" ); + buf_len = GetWindowTextA( GetDesktopWindow(), buf, 0 ); + ok( buf_len == 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "blah"), "got wrong window text '%s'\n", buf ); + + bufW[0] = 0xcc; + buf_len = GetWindowTextW( GetDesktopWindow(), bufW, 0 ); + ok( buf_len == 0, "expected a nonempty window text\n" ); + ok( bufW[0] == 0xcc, "got %x\n", bufW[0] ); + + g_wm_gettext_override.enabled = TRUE; + + num_gettext_msgs = 0; + memset( buf, 0xcc, sizeof(buf) ); + g_wm_gettext_override.buff = buf; + g_wm_gettext_override.len = sizeof(buf); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len == 0, "got %d\n", buf_len ); + ok( *buf == 0, "got %x\n", *buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + strcpy( buf, "blah" ); + g_wm_gettext_override.buff = buf; + g_wm_gettext_override.len = 0; + buf_len = GetWindowTextA( hwnd, buf, 0 ); + ok( buf_len == 0, "got %d\n", buf_len ); + ok( !strcmp(buf, "blah"), "got %s\n", buf ); +todo_wine + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + g_wm_gettext_override.enabled = FALSE; + + /* same for W window */ + hwnd2 = CreateWindowExW( 0, mainclassW, NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL ); + ok( hwnd2 != 0, "CreateWindowExA error %d\n", GetLastError() ); + + g_wm_gettext_override.enabled = TRUE; + + num_gettext_msgs = 0; + memset( bufW, 0xcc, sizeof(bufW) ); + g_wm_gettext_override.buffW = bufW; + g_wm_gettext_override.len = sizeof(bufW)/sizeof(WCHAR); + buf_len = GetWindowTextW( hwnd2, bufW, sizeof(bufW)/sizeof(WCHAR) ); + ok( buf_len == 0, "got %d\n", buf_len ); + ok( *bufW == 0, "got %x\n", *bufW ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + memset( bufW, 0xcc, sizeof(bufW) ); + g_wm_gettext_override.buffW = bufW; + g_wm_gettext_override.len = 0; + buf_len = GetWindowTextW( hwnd2, bufW, 0 ); + ok( buf_len == 0, "got %d\n", buf_len ); + ok( *bufW == 0xcccc, "got %x\n", *bufW ); +todo_wine + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + g_wm_gettext_override.enabled = FALSE; + + DestroyWindow( hwnd2 ); + /* test WM_GETTEXT */ num_gettext_msgs = 0; memset( buf, 0, sizeof(buf) ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7a3f484..91f1871 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2679,7 +2679,11 @@ INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) if (!lpString) return 0; if (WIN_IsCurrentProcess( hwnd )) + { + if (nMaxCount > 0) + lpString[0] = 0; return (INT)SendMessageA( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + } /* when window belongs to other process, don't send a message */ if (nMaxCount <= 0) return 0; @@ -2724,7 +2728,11 @@ INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount ) if (!lpString) return 0; if (WIN_IsCurrentProcess( hwnd )) + { + if (nMaxCount > 0) + lpString[0] = 0; return (INT)SendMessageW( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + } /* when window belongs to other process, don't send a message */ if (nMaxCount <= 0) return 0;

1 0

Nikolay Sivov : user32: Don't send WM_GETTEXT from GetWindowText() with invalid buffer length.
by Alexandre Julliard 28 Jul '15

28 Jul '15

Module: wine Branch: master Commit: 516b21f4eec17beaf59412756a6436c242b90441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516b21f4eec17beaf59412756… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 23 22:31:07 2015 +0300 user32: Don't send WM_GETTEXT from GetWindowText() with invalid buffer length. --- dlls/user32/tests/win.c | 13 ++----------- dlls/user32/win.c | 12 ++++-------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 309b699..9f6c224 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -722,7 +722,6 @@ static struct wm_gettext_override_data BOOL enabled; /* when 1 bypasses default procedure */ char *buff; /* expected text buffer pointer */ WCHAR *buffW; /* same, for W test */ - int len; } g_wm_gettext_override; static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -810,8 +809,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR { char *text = (char*)lparam; ok(g_wm_gettext_override.buff == text, "expected buffer %p, got %p\n", g_wm_gettext_override.buff, text); - if (g_wm_gettext_override.len) - ok(*text == 0, "expected empty string buffer %x\n", *text); + ok(*text == 0, "expected empty string buffer %x\n", *text); return 0; } break; @@ -833,8 +831,7 @@ static LRESULT WINAPI main_window_procW(HWND hwnd, UINT msg, WPARAM wparam, LPAR { WCHAR *text = (WCHAR*)lparam; ok(g_wm_gettext_override.buffW == text, "expected buffer %p, got %p\n", g_wm_gettext_override.buffW, text); - if (g_wm_gettext_override.len) - ok(*text == 0, "expected empty string buffer %x\n", *text); + ok(*text == 0, "expected empty string buffer %x\n", *text); return 0; } break; @@ -5819,7 +5816,6 @@ static void test_gettext(void) num_gettext_msgs = 0; memset( buf, 0xcc, sizeof(buf) ); g_wm_gettext_override.buff = buf; - g_wm_gettext_override.len = sizeof(buf); buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); ok( buf_len == 0, "got %d\n", buf_len ); ok( *buf == 0, "got %x\n", *buf ); @@ -5828,11 +5824,9 @@ static void test_gettext(void) num_gettext_msgs = 0; strcpy( buf, "blah" ); g_wm_gettext_override.buff = buf; - g_wm_gettext_override.len = 0; buf_len = GetWindowTextA( hwnd, buf, 0 ); ok( buf_len == 0, "got %d\n", buf_len ); ok( !strcmp(buf, "blah"), "got %s\n", buf ); -todo_wine ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); g_wm_gettext_override.enabled = FALSE; @@ -5846,7 +5840,6 @@ todo_wine num_gettext_msgs = 0; memset( bufW, 0xcc, sizeof(bufW) ); g_wm_gettext_override.buffW = bufW; - g_wm_gettext_override.len = sizeof(bufW)/sizeof(WCHAR); buf_len = GetWindowTextW( hwnd2, bufW, sizeof(bufW)/sizeof(WCHAR) ); ok( buf_len == 0, "got %d\n", buf_len ); ok( *bufW == 0, "got %x\n", *bufW ); @@ -5855,11 +5848,9 @@ todo_wine num_gettext_msgs = 0; memset( bufW, 0xcc, sizeof(bufW) ); g_wm_gettext_override.buffW = bufW; - g_wm_gettext_override.len = 0; buf_len = GetWindowTextW( hwnd2, bufW, 0 ); ok( buf_len == 0, "got %d\n", buf_len ); ok( *bufW == 0xcccc, "got %x\n", *bufW ); -todo_wine ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); g_wm_gettext_override.enabled = FALSE; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 91f1871..e3650f5 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2676,17 +2676,15 @@ INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) { WCHAR *buffer; - if (!lpString) return 0; + if (!lpString || nMaxCount <= 0) return 0; if (WIN_IsCurrentProcess( hwnd )) { - if (nMaxCount > 0) - lpString[0] = 0; + lpString[0] = 0; return (INT)SendMessageA( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); } /* when window belongs to other process, don't send a message */ - if (nMaxCount <= 0) return 0; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, nMaxCount * sizeof(WCHAR) ))) return 0; get_server_window_text( hwnd, buffer, nMaxCount ); if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpString, nMaxCount, NULL, NULL )) @@ -2725,17 +2723,15 @@ INT WINAPI InternalGetWindowText(HWND hwnd,LPWSTR lpString,INT nMaxCount ) */ INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount ) { - if (!lpString) return 0; + if (!lpString || nMaxCount <= 0) return 0; if (WIN_IsCurrentProcess( hwnd )) { - if (nMaxCount > 0) - lpString[0] = 0; + lpString[0] = 0; return (INT)SendMessageW( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); } /* when window belongs to other process, don't send a message */ - if (nMaxCount <= 0) return 0; get_server_window_text( hwnd, lpString, nMaxCount ); return strlenW(lpString); }

1 0