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

Piotr Caban : mshtml: Test body.offsetHeight value in quirks mode.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 1a0c4efba9430382e3427cb3f355906bc2a66861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0c4efba9430382e3427cb3f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 20 16:52:34 2015 +0200 mshtml: Test body.offsetHeight value in quirks mode. --- dlls/mshtml/tests/dom.c | 412 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 412 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a0c4efba9430382e3427…

1 0

Sebastian Lackner : vcomp: Implement omp_in_parallel and add tests.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: bc10d127b472d456e5308903e3556b72d8c80fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc10d127b472d456e5308903e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 20 05:16:12 2015 +0200 vcomp: Implement omp_in_parallel and add tests. --- dlls/vcomp/main.c | 6 +++++ dlls/vcomp/tests/vcomp.c | 61 +++++++++++++++++++++++++++++++++------------ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 5 files changed, 54 insertions(+), 19 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 1dad029..d76df1e 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -361,6 +361,12 @@ int CDECL _vcomp_sections_next(void) return i; } +int CDECL omp_in_parallel(void) +{ + TRACE("()\n"); + return vcomp_init_thread_data()->parallel; +} + static DWORD WINAPI _vcomp_fork_worker(void *param) { struct vcomp_thread_data *thread_data = param; diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index dd91b4f..7346655 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -40,6 +40,7 @@ static int (CDECL *pomp_get_max_threads)(void); static int (CDECL *pomp_get_nested)(void); static int (CDECL *pomp_get_num_threads)(void); static int (CDECL *pomp_get_thread_num)(void); +static int (CDECL *pomp_in_parallel)(void); static void (CDECL *pomp_set_nested)(int nested); static void (CDECL *pomp_set_num_threads)(int num_threads); @@ -178,6 +179,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(omp_get_nested); VCOMP_GET_PROC(omp_get_num_threads); VCOMP_GET_PROC(omp_get_thread_num); + VCOMP_GET_PROC(omp_in_parallel); VCOMP_GET_PROC(omp_set_nested); VCOMP_GET_PROC(omp_set_num_threads); @@ -186,14 +188,17 @@ static BOOL init_vcomp(void) #undef VCOMP_GET_PROC -static void CDECL num_threads_cb2(LONG *count) +static void CDECL num_threads_cb2(int parallel, LONG *count) { + int is_parallel = pomp_in_parallel(); + ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); + InterlockedIncrement(count); } -static void CDECL num_threads_cb(BOOL nested, int nested_threads, LONG *count) +static void CDECL num_threads_cb(BOOL nested, int parallel, int nested_threads, LONG *count) { - int num_threads, thread_num; + int is_parallel, num_threads, thread_num; LONG thread_count; InterlockedIncrement(count); @@ -205,29 +210,41 @@ static void CDECL num_threads_cb(BOOL nested, int nested_threads, LONG *count) ok(thread_num >= 0 && thread_num < num_threads, "expected thread_num in range [0, %d], got %d\n", num_threads - 1, thread_num); + is_parallel = pomp_in_parallel(); + ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); + thread_count = 0; - p_vcomp_fork(TRUE, 1, num_threads_cb2, &thread_count); + p_vcomp_fork(TRUE, 2, num_threads_cb2, TRUE, &thread_count); if (nested) ok(thread_count == nested_threads, "expected %d threads, got %d\n", nested_threads, thread_count); else ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); + is_parallel = pomp_in_parallel(); + ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); + thread_count = 0; - p_vcomp_fork(FALSE, 1, num_threads_cb2, &thread_count); + p_vcomp_fork(FALSE, 2, num_threads_cb2, parallel, &thread_count); ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); + is_parallel = pomp_in_parallel(); + ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); + p_vcomp_set_num_threads(4); thread_count = 0; - p_vcomp_fork(TRUE, 1, num_threads_cb2, &thread_count); + p_vcomp_fork(TRUE, 2, num_threads_cb2, TRUE, &thread_count); if (nested) ok(thread_count == 4, "expected 4 threads, got %d\n", thread_count); else ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); + + is_parallel = pomp_in_parallel(); + ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); } static void test_omp_get_num_threads(BOOL nested) { - int is_nested, max_threads, num_threads, thread_num; + int is_nested, is_parallel, max_threads, num_threads, thread_num; LONG thread_count; pomp_set_nested(nested); @@ -239,61 +256,73 @@ static void test_omp_get_num_threads(BOOL nested) thread_num = pomp_get_thread_num(); ok(thread_num == 0, "expected thread_num == 0, got %d\n", thread_num); + is_parallel = pomp_in_parallel(); + ok(is_parallel == FALSE, "expected FALSE, got %d\n", is_parallel); + num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, max_threads, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, max_threads, &thread_count); ok(thread_count == max_threads, "expected %d threads, got %d\n", max_threads, thread_count); + is_parallel = pomp_in_parallel(); + ok(is_parallel == FALSE, "expected FALSE, got %d\n", is_parallel); + num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(FALSE, 3, num_threads_cb, TRUE, max_threads, &thread_count); + p_vcomp_fork(FALSE, 4, num_threads_cb, TRUE, FALSE, max_threads, &thread_count); ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); + is_parallel = pomp_in_parallel(); + ok(is_parallel == FALSE, "expected FALSE, got %d\n", is_parallel); + pomp_set_num_threads(1); num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 1, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 1, &thread_count); ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); + is_parallel = pomp_in_parallel(); + ok(is_parallel == FALSE, "expected FALSE, got %d\n", is_parallel); + pomp_set_num_threads(2); num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 2, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 2, &thread_count); ok(thread_count == 2, "expected 2 threads, got %d\n", thread_count); pomp_set_num_threads(4); num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 4, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 4, &thread_count); ok(thread_count == 4, "expected 4 threads, got %d\n", thread_count); p_vcomp_set_num_threads(8); num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 4, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 4, &thread_count); ok(thread_count == 8, "expected 8 threads, got %d\n", thread_count); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 4, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 4, &thread_count); ok(thread_count == 4, "expected 4 threads, got %d\n", thread_count); p_vcomp_set_num_threads(0); num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 4, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 4, &thread_count); ok(thread_count == 4, "expected 4 threads, got %d\n", thread_count); pomp_set_num_threads(0); num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 4, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 4, &thread_count); ok(thread_count == 4, "expected 4 threads, got %d\n", thread_count); pomp_set_num_threads(max_threads); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index dfbd184..5a5b114 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -98,7 +98,7 @@ @ cdecl omp_get_thread_num() @ stub omp_get_wtick @ cdecl omp_get_wtime() -@ stub omp_in_parallel +@ cdecl omp_in_parallel() @ stub omp_init_lock @ stub omp_init_nest_lock @ cdecl omp_set_dynamic(long) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 6eb6ae5..debc5ff 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -98,7 +98,7 @@ @ cdecl omp_get_thread_num() vcomp.omp_get_thread_num @ stub omp_get_wtick @ cdecl omp_get_wtime() vcomp.omp_get_wtime -@ stub omp_in_parallel +@ cdecl omp_in_parallel() vcomp.omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 6eb6ae5..debc5ff 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -98,7 +98,7 @@ @ cdecl omp_get_thread_num() vcomp.omp_get_thread_num @ stub omp_get_wtick @ cdecl omp_get_wtime() vcomp.omp_get_wtime -@ stub omp_in_parallel +@ cdecl omp_in_parallel() vcomp.omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic

1 0

Sebastian Lackner : vcomp: Implement _vcomp_for_static_simple_init and _vcomp_for_static_end.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 6f34d0fe1f67632cc24b304a536a9790e9365ec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f34d0fe1f67632cc24b304a5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 20 05:16:47 2015 +0200 vcomp: Implement _vcomp_for_static_simple_init and _vcomp_for_static_end. --- dlls/vcomp/main.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 4 files changed, 63 insertions(+), 6 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index d76df1e..c06625a 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -361,6 +361,63 @@ int CDECL _vcomp_sections_next(void) return i; } +void CDECL _vcomp_for_static_simple_init(unsigned int first, unsigned int last, int step, + BOOL increment, unsigned int *begin, unsigned int *end) +{ + unsigned int iterations, per_thread, remaining; + struct vcomp_thread_data *thread_data = vcomp_init_thread_data(); + struct vcomp_team_data *team_data = thread_data->team; + int num_threads = team_data ? team_data->num_threads : 1; + int thread_num = thread_data->thread_num; + + TRACE("(%u, %u, %d, %u, %p, %p)\n", first, last, step, increment, begin, end); + + if (num_threads == 1) + { + *begin = first; + *end = last; + return; + } + + if (step <= 0) + { + *begin = 0; + *end = increment ? -1 : 1; + return; + } + + if (increment) + iterations = 1 + (last - first) / step; + else + { + iterations = 1 + (first - last) / step; + step *= -1; + } + + per_thread = iterations / num_threads; + remaining = iterations - per_thread * num_threads; + + if (thread_num < remaining) + per_thread++; + else if (per_thread) + first += remaining * step; + else + { + *begin = first; + *end = first - step; + return; + } + + *begin = first + per_thread * thread_num * step; + *end = *begin + (per_thread - 1) * step; +} + +void CDECL _vcomp_for_static_end(void) +{ + TRACE("()\n"); + /* nothing to do here */ +} + int CDECL omp_in_parallel(void) { TRACE("()\n"); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 5a5b114..d6b8bf5 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -59,10 +59,10 @@ @ stub _vcomp_for_dynamic_init_i8 @ stub _vcomp_for_dynamic_next @ stub _vcomp_for_dynamic_next_i8 -@ stub _vcomp_for_static_end +@ cdecl _vcomp_for_static_end() @ stub _vcomp_for_static_init @ stub _vcomp_for_static_init_i8 -@ stub _vcomp_for_static_simple_init +@ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) @ stub _vcomp_get_thread_num diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index debc5ff..a6933c8 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -59,10 +59,10 @@ @ stub _vcomp_for_dynamic_init_i8 @ stub _vcomp_for_dynamic_next @ stub _vcomp_for_dynamic_next_i8 -@ stub _vcomp_for_static_end +@ cdecl _vcomp_for_static_end() vcomp._vcomp_for_static_end @ stub _vcomp_for_static_init @ stub _vcomp_for_static_init_i8 -@ stub _vcomp_for_static_simple_init +@ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork @ stub _vcomp_get_thread_num diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index debc5ff..a6933c8 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -59,10 +59,10 @@ @ stub _vcomp_for_dynamic_init_i8 @ stub _vcomp_for_dynamic_next @ stub _vcomp_for_dynamic_next_i8 -@ stub _vcomp_for_static_end +@ cdecl _vcomp_for_static_end() vcomp._vcomp_for_static_end @ stub _vcomp_for_static_init @ stub _vcomp_for_static_init_i8 -@ stub _vcomp_for_static_simple_init +@ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork @ stub _vcomp_get_thread_num

1 0

Sebastian Lackner : vcomp/tests: Add tests for _vcomp_for_static_simple_init.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 02054a75226f941c9f5c4f31d34db6423be3dca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02054a75226f941c9f5c4f31d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 20 05:17:05 2015 +0200 vcomp/tests: Add tests for _vcomp_for_static_simple_init. --- dlls/vcomp/tests/vcomp.c | 173 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 7346655..ec845c4 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -32,6 +32,9 @@ static BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); static VOID (WINAPI *pReleaseActCtx)(HANDLE); static void (CDECL *p_vcomp_barrier)(void); +static void (CDECL *p_vcomp_for_static_end)(void); +static void (CDECL *p_vcomp_for_static_simple_init)(unsigned int first, unsigned int last, int step, + BOOL increment, unsigned int *begin, unsigned int *end); static void (WINAPIV *p_vcomp_fork)(BOOL ifval, int nargs, void *wrapper, ...); static void (CDECL *p_vcomp_sections_init)(int n); static int (CDECL *p_vcomp_sections_next)(void); @@ -171,6 +174,8 @@ static BOOL init_vcomp(void) } VCOMP_GET_PROC(_vcomp_barrier); + VCOMP_GET_PROC(_vcomp_for_static_end); + VCOMP_GET_PROC(_vcomp_for_static_simple_init); VCOMP_GET_PROC(_vcomp_fork); VCOMP_GET_PROC(_vcomp_sections_init); VCOMP_GET_PROC(_vcomp_sections_next); @@ -458,6 +463,173 @@ if (0) pomp_set_num_threads(max_threads); } +static void my_for_static_simple_init(unsigned int first, unsigned int last, int step, + BOOL increment, unsigned int *begin, unsigned int *end) +{ + unsigned int iterations, per_thread, remaining; + int num_threads = pomp_get_num_threads(); + int thread_num = pomp_get_thread_num(); + + if (num_threads == 1) + { + *begin = first; + *end = last; + return; + } + + if (step <= 0) + { + *begin = 0; + *end = increment ? -1 : 1; + return; + } + + if (increment) + iterations = 1 + (last - first) / step; + else + { + iterations = 1 + (first - last) / step; + step *= -1; + } + + per_thread = iterations / num_threads; + remaining = iterations - per_thread * num_threads; + + if (thread_num < remaining) + per_thread++; + else if (per_thread) + first += remaining * step; + else + { + *begin = first; + *end = first - step; + return; + } + + *begin = first + per_thread * thread_num * step; + *end = *begin + (per_thread - 1) * step; +} + + +static void CDECL for_static_simple_cb(void) +{ + static const struct + { + unsigned int first; + unsigned int last; + int step; + } + tests[] = + { + { 0, 0, 1 }, /* 0 */ + { 0, 1, 1 }, + { 0, 2, 1 }, + { 0, 3, 1 }, + { 0, 100, 0 }, + { 0, 100, 1 }, + { 0, 100, 2 }, + { 0, 100, 3 }, + { 0, 100, -1 }, + { 0, 100, -2 }, + { 0, 100, -3 }, /* 10 */ + { 0, 100, 10 }, + { 0, 100, 50 }, + { 0, 100, 100 }, + { 0, 100, 150 }, + { 0, 0x80000000, 1 }, + { 0, 0xfffffffe, 1 }, + { 0, 0xffffffff, 1 }, + { 50, 50, 0 }, + { 50, 50, 1 }, + { 50, 50, 2 }, /* 20 */ + { 50, 50, 3 }, + { 50, 50, -1 }, + { 50, 50, -2 }, + { 50, 50, -3 }, + { 100, 200, 1 }, + { 100, 200, 5 }, + { 100, 200, 10 }, + { 100, 200, 50 }, + { 100, 200, 100 }, + { 100, 200, 150 }, /* 30 */ + }; + int num_threads = pomp_get_num_threads(); + int thread_num = pomp_get_thread_num(); + int i; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + unsigned int my_begin, my_end, begin, end; + + begin = end = 0xdeadbeef; + my_for_static_simple_init(tests[i].first, tests[i].last, tests[i].step, FALSE, &my_begin, &my_end); + p_vcomp_for_static_simple_init(tests[i].first, tests[i].last, tests[i].step, FALSE, &begin, &end); + + ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", + i, thread_num, num_threads, my_begin, end); + ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", + i, thread_num, num_threads, my_end, end); + + p_vcomp_for_static_end(); + p_vcomp_barrier(); + + begin = end = 0xdeadbeef; + my_for_static_simple_init(tests[i].first, tests[i].last, tests[i].step, TRUE, &my_begin, &my_end); + p_vcomp_for_static_simple_init(tests[i].first, tests[i].last, tests[i].step, TRUE, &begin, &end); + + ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", + i, thread_num, num_threads, my_begin, end); + ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", + i, thread_num, num_threads, my_end, end); + + p_vcomp_for_static_end(); + p_vcomp_barrier(); + + if (tests[i].first == tests[i].last) continue; + + begin = end = 0xdeadbeef; + my_for_static_simple_init(tests[i].last, tests[i].first, tests[i].step, FALSE, &my_begin, &my_end); + p_vcomp_for_static_simple_init(tests[i].last, tests[i].first, tests[i].step, FALSE, &begin, &end); + + ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", + i, thread_num, num_threads, my_begin, end); + ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", + i, thread_num, num_threads, my_end, end); + + p_vcomp_for_static_end(); + p_vcomp_barrier(); + + begin = end = 0xdeadbeef; + my_for_static_simple_init(tests[i].last, tests[i].first, tests[i].step, TRUE, &my_begin, &my_end); + p_vcomp_for_static_simple_init(tests[i].last, tests[i].first, tests[i].step, TRUE, &begin, &end); + + ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", + i, thread_num, num_threads, my_begin, end); + ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", + i, thread_num, num_threads, my_end, end); + + p_vcomp_for_static_end(); + p_vcomp_barrier(); + } +} + +static void test_vcomp_for_static_simple_init(void) +{ + int max_threads = pomp_get_max_threads(); + int i; + + for_static_simple_cb(); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + p_vcomp_fork(TRUE, 0, for_static_simple_cb); + p_vcomp_fork(FALSE, 0, for_static_simple_cb); + } + + pomp_set_num_threads(max_threads); +} + START_TEST(vcomp) { if (!init_vcomp()) @@ -467,6 +639,7 @@ START_TEST(vcomp) test_omp_get_num_threads(TRUE); test_vcomp_fork(); test_vcomp_sections_init(); + test_vcomp_for_static_simple_init(); release_vcomp(); }

1 0

Sebastian Lackner : vcomp: Implement _vcomp_for_static_init.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: c34c9b4f39ec11ca89f4fa3a0f61c4547f031fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34c9b4f39ec11ca89f4fa3a0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 20 05:17:47 2015 +0200 vcomp: Implement _vcomp_for_static_init. --- dlls/vcomp/main.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 4 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index c06625a..ae5623b 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -412,6 +412,69 @@ void CDECL _vcomp_for_static_simple_init(unsigned int first, unsigned int last, *end = *begin + (per_thread - 1) * step; } +void CDECL _vcomp_for_static_init(int first, int last, int step, int chunksize, unsigned int *loops, + int *begin, int *end, int *next, int *lastchunk) +{ + unsigned int iterations, num_chunks, per_thread, remaining; + struct vcomp_thread_data *thread_data = vcomp_init_thread_data(); + struct vcomp_team_data *team_data = thread_data->team; + int num_threads = team_data ? team_data->num_threads : 1; + int thread_num = thread_data->thread_num; + + TRACE("(%d, %d, %d, %d, %p, %p, %p, %p, %p)\n", + first, last, step, chunksize, loops, begin, end, next, lastchunk); + + if (num_threads == 1 && chunksize != 1) + { + *loops = 1; + *begin = first; + *end = last; + *next = 0; + *lastchunk = first; + return; + } + + if (first == last) + { + *loops = !thread_num; + if (!thread_num) + { + *begin = first; + *end = last; + *next = 0; + *lastchunk = first; + } + return; + } + + if (step <= 0) + { + *loops = 0; + return; + } + + if (first < last) + iterations = 1 + (last - first) / step; + else + { + iterations = 1 + (first - last) / step; + step *= -1; + } + + if (chunksize < 1) + chunksize = 1; + + num_chunks = ((DWORD64)iterations + chunksize - 1) / chunksize; + per_thread = num_chunks / num_threads; + remaining = num_chunks - per_thread * num_threads; + + *loops = per_thread + (thread_num < remaining); + *begin = first + thread_num * chunksize * step; + *end = *begin + (chunksize - 1) * step; + *next = chunksize * num_threads * step; + *lastchunk = first + (num_chunks - 1) * chunksize * step; +} + void CDECL _vcomp_for_static_end(void) { TRACE("()\n"); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index d6b8bf5..7083ce4 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -60,7 +60,7 @@ @ stub _vcomp_for_dynamic_next @ stub _vcomp_for_dynamic_next_i8 @ cdecl _vcomp_for_static_end() -@ stub _vcomp_for_static_init +@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) @ stub _vcomp_for_static_init_i8 @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) @ stub _vcomp_for_static_simple_init_i8 diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index a6933c8..56c7ae3 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -60,7 +60,7 @@ @ stub _vcomp_for_dynamic_next @ stub _vcomp_for_dynamic_next_i8 @ cdecl _vcomp_for_static_end() vcomp._vcomp_for_static_end -@ stub _vcomp_for_static_init +@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) vcomp._vcomp_for_static_init @ stub _vcomp_for_static_init_i8 @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index a6933c8..56c7ae3 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -60,7 +60,7 @@ @ stub _vcomp_for_dynamic_next @ stub _vcomp_for_dynamic_next_i8 @ cdecl _vcomp_for_static_end() vcomp._vcomp_for_static_end -@ stub _vcomp_for_static_init +@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) vcomp._vcomp_for_static_init @ stub _vcomp_for_static_init_i8 @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8

1 0

Sebastian Lackner : vcomp/tests: Add tests for _vcomp_for_static_init.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: a250c0b29f47aa6fe9c5d3ab12091d266475b9cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a250c0b29f47aa6fe9c5d3ab1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 20 05:18:45 2015 +0200 vcomp/tests: Add tests for _vcomp_for_static_init. --- dlls/vcomp/tests/vcomp.c | 220 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a250c0b29f47aa6fe9c5d…

1 0

Iván Matellanes : msvcirt: Implement ios::fill.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 9b42f88e49c5cdc3df77947515d9c6328f14a4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b42f88e49c5cdc3df7794751… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:22 2015 +0200 msvcirt: Implement ios::fill. --- dlls/msvcirt/msvcirt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a0d670f..068beab 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -921,8 +921,12 @@ int __thiscall ios_fail(const ios *this) DEFINE_THISCALL_WRAPPER(ios_fill_set, 8) char __thiscall ios_fill_set(ios *this, char fill) { - FIXME("(%p %d) stub\n", this, fill); - return EOF; + char prev = this->fill; + + TRACE("(%p %d)\n", this, fill); + + this->fill = fill; + return prev; } /* ?fill(a)ios@@QBEDXZ */ @@ -930,8 +934,8 @@ char __thiscall ios_fill_set(ios *this, char fill) DEFINE_THISCALL_WRAPPER(ios_fill_get, 4) char __thiscall ios_fill_get(const ios *this) { - FIXME("(%p) stub\n", this); - return EOF; + TRACE("(%p)\n", this); + return this->fill; } /* ?flags(a)ios@@QAEJJ(a)Z */

1 0

Iván Matellanes : msvcirt: Implement ios::precision.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 80f5fd53617fcf5797318c111b24c127d5b901f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f5fd53617fcf5797318c111… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:27 2015 +0200 msvcirt: Implement ios::precision. --- dlls/msvcirt/msvcirt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 068beab..275a849 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1047,8 +1047,12 @@ ios* __cdecl ios_oct(ios *this) DEFINE_THISCALL_WRAPPER(ios_precision_set, 8) int __thiscall ios_precision_set(ios *this, int prec) { - FIXME("(%p %d) stub\n", this, prec); - return 0; + int prev = this->precision; + + TRACE("(%p %d)\n", this, prec); + + this->precision = prec; + return prev; } /* ?precision(a)ios@@QBEHXZ */ @@ -1056,8 +1060,8 @@ int __thiscall ios_precision_set(ios *this, int prec) DEFINE_THISCALL_WRAPPER(ios_precision_get, 4) int __thiscall ios_precision_get(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->precision; } /* ?pword(a)ios@@QBEAAPAXH(a)Z */

1 0

Iván Matellanes : msvcirt: Implement ios::width.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: c21fa9c532dfc41d33b21c4d2fb5ab6937c4c8d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21fa9c532dfc41d33b21c4d2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:32 2015 +0200 msvcirt: Implement ios::width. --- dlls/msvcirt/msvcirt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 275a849..4e4315e 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1199,8 +1199,12 @@ LONG __thiscall ios_unsetf(ios *this, LONG flags) DEFINE_THISCALL_WRAPPER(ios_width_set, 8) int __thiscall ios_width_set(ios *this, int width) { - FIXME("(%p %d) stub\n", this, width); - return 0; + int prev = this->width; + + TRACE("(%p %d)\n", this, width); + + this->width = width; + return prev; } /* ?width(a)ios@@QBEHXZ */ @@ -1208,8 +1212,8 @@ int __thiscall ios_width_set(ios *this, int width) DEFINE_THISCALL_WRAPPER(ios_width_get, 4) int __thiscall ios_width_get(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->width; } /* ?xalloc(a)ios@@SAHXZ */

1 0

Iván Matellanes : msvcirt: Implement ios::tie.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 5fea62039986fb736c50b6de268a33985d11809e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fea62039986fb736c50b6de2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:40 2015 +0200 msvcirt: Implement ios::tie. --- dlls/msvcirt/msvcirt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 4e4315e..d1c5509 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1142,8 +1142,12 @@ void __cdecl ios_sync_with_stdio(void) DEFINE_THISCALL_WRAPPER(ios_tie_set, 8) ostream* __thiscall ios_tie_set(ios *this, ostream *ostr) { - FIXME("(%p %p) stub\n", this, ostr); - return NULL; + ostream *prev = this->tie; + + TRACE("(%p %p)\n", this, ostr); + + this->tie = ostr; + return prev; } /* ?tie(a)ios@@QBEPAVostream@@XZ */ @@ -1151,8 +1155,8 @@ ostream* __thiscall ios_tie_set(ios *this, ostream *ostr) DEFINE_THISCALL_WRAPPER(ios_tie_get, 4) ostream* __thiscall ios_tie_get(const ios *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return this->tie; } /* ?unlock(a)ios@@QAAXXZ */

1 0