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

Henri Verbeet : d2d1: Implement initial support for drawing bezier curves.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: b33786ce6da790d1d120cb00c68e007b974e93bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33786ce6da790d1d120cb00c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 20 11:07:28 2015 +0200 d2d1: Implement initial support for drawing bezier curves. --- dlls/d2d1/brush.c | 17 +-- dlls/d2d1/d2d1_private.h | 39 +++++- dlls/d2d1/geometry.c | 123 +++++++++++++++++-- dlls/d2d1/render_target.c | 282 +++++++++++++++++++++++++++++++------------- dlls/d2d1/tests/d2d1.c | 293 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 643 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b33786ce6da790d1d120c…

1 0

YongHao Hu : msvcp110: Fix TRACE msg of tr2 functions.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: 4980830ba62e2b2a75a1c03d8a8ebb91964b5905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4980830ba62e2b2a75a1c03d8… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Jul 18 02:19:21 2015 +0800 msvcp110: Fix TRACE msg of tr2 functions. --- dlls/msvcp90/ios.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 2311c58..53c1089 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14202,7 +14202,7 @@ ULONGLONG __cdecl tr2_sys__File_size(const char* path) { WIN32_FILE_ATTRIBUTE_DATA fad; - TRACE("(%p)\n", path); + TRACE("(%s)\n", debugstr_a(path)); if(!GetFileAttributesExA(path, GetFileExInfoStandard, &fad)) return 0; if(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) @@ -14218,7 +14218,7 @@ int __cdecl tr2_sys__Equivalent(char const* path1, char const* path2) HANDLE h1, h2; int ret; BY_HANDLE_FILE_INFORMATION info1, info2; - TRACE("(%p %p)\n", path1, path2); + TRACE("(%s %s)\n", debugstr_a(path1), debugstr_a(path2)); h1 = CreateFileA(path1, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); @@ -14251,7 +14251,7 @@ int __cdecl tr2_sys__Equivalent(char const* path1, char const* path2) /* ?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z */ char* __cdecl tr2_sys__Current_get(char *current_path) { - TRACE("(%p)\n", current_path); + TRACE("(%s)\n", debugstr_a(current_path)); if(!GetCurrentDirectoryA(MAX_PATH, current_path)) return NULL; @@ -14262,7 +14262,7 @@ char* __cdecl tr2_sys__Current_get(char *current_path) /* ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z */ MSVCP_bool __cdecl tr2_sys__Current_set(char const* path) { - TRACE("(%p)\n", path); + TRACE("(%s)\n", debugstr_a(path)); return SetCurrentDirectoryA(path) != 0; } @@ -14270,7 +14270,7 @@ MSVCP_bool __cdecl tr2_sys__Current_set(char const* path) /* ?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z */ int __cdecl tr2_sys__Make_dir(char const* path) { - TRACE("(%p)\n", path); + TRACE("(%s)\n", debugstr_a(path)); if(!CreateDirectoryA(path, NULL)) { if(GetLastError() == ERROR_ALREADY_EXISTS) @@ -14286,7 +14286,7 @@ int __cdecl tr2_sys__Make_dir(char const* path) /* ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z */ MSVCP_bool __cdecl tr2_sys__Remove_dir(char const* path) { - TRACE("(%p)\n", path); + TRACE("(%s)\n", debugstr_a(path)); return RemoveDirectoryA(path) != 0; }

1 0

Iván Matellanes : msvcirt: Implement ios::width.
by Alexandre Julliard July 20, 2015

July 20, 2015

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

Sebastian Lackner : vcomp: Implement _vcomp_for_static_simple_init and _vcomp_for_static_end.
by Alexandre Julliard July 20, 2015

July 20, 2015

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

Iván Matellanes : msvcirt: Implement ios::bitalloc.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: f2037e2e96e5ec79902ed5ef80527bf2e05f2c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2037e2e96e5ec79902ed5ef8… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:37:14 2015 +0200 msvcirt: Implement ios::bitalloc. --- dlls/msvcirt/msvcirt.c | 11 +++++++++-- dlls/msvcirt/msvcirt.spec | 2 +- dlls/msvcirt/tests/msvcirt.c | 17 ++++++++++++++++- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index bbcefbf..0ce9fff 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -46,6 +46,8 @@ CRITICAL_SECTION_DEBUG ios_static_lock_debug = 0, 0, { (DWORD_PTR)(__FILE__ ": ios_static_lock") } }; CRITICAL_SECTION ios_static_lock = { &ios_static_lock_debug, -1, 0, 0, 0, 0 }; +/* ?x_maxbit(a)ios@@0JA */ +LONG ios_maxbit = 0x8000; /* class streambuf */ typedef struct { @@ -90,8 +92,10 @@ typedef struct { ios* __thiscall ios_assign(ios*, const ios*); int __thiscall ios_fail(const ios*); void __cdecl ios_lock(ios*); +void __cdecl ios_lockc(void); LONG __thiscall ios_setf_mask(ios*, LONG, LONG); void __cdecl ios_unlock(ios*); +void __cdecl ios_unlockc(void); /* class ostream */ typedef struct _ostream { @@ -858,8 +862,11 @@ int __thiscall ios_bad(const ios *this) /* ?bitalloc(a)ios@@SAJXZ */ LONG __cdecl ios_bitalloc(void) { - FIXME("() stub\n"); - return 0; + TRACE("()\n"); + ios_lockc(); + ios_maxbit <<= 1; + ios_unlockc(); + return ios_maxbit; } /* ?clear(a)ios@@QAEXH(a)Z */ diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index b64b41a..b4dcdc2 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -778,7 +778,7 @@ @ stub -arch=win64 ?ws@@YAAEAVistream@@AEAV1@@Z # @ extern ?x_curindex(a)ios@@0HA # static int ios::x_curindex @ extern ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A ios_static_lock -# @ extern ?x_maxbit(a)ios@@0JA # static long ios::x_maxbit +@ extern ?x_maxbit(a)ios@@0JA ios_maxbit # @ extern ?x_statebuf(a)ios@@0PAJA # static long * ios::x_statebuf @ cdecl ?xalloc(a)ios@@SAHXZ() ios_xalloc @ thiscall -arch=win32 ?xsgetn(a)streambuf@@UAEHPADH(a)Z(ptr ptr long) streambuf_xsgetn diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index c65d419..5fac801 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -147,6 +147,8 @@ static int (*__thiscall p_ios_bad)(const ios*); static int (*__thiscall p_ios_eof)(const ios*); static int (*__thiscall p_ios_fail)(const ios*); static void (*__thiscall p_ios_clear)(ios*, int); +static LONG *p_ios_maxbit; +static LONG (*__cdecl p_ios_bitalloc)(void); /* Emulate a __thiscall */ #ifdef __i386__ @@ -317,6 +319,8 @@ static BOOL init(void) SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); SET(p_ios_unlockc, "?unlockc(a)ios@@KAXXZ"); + SET(p_ios_maxbit, "?x_maxbit(a)ios@@0JA"); + SET(p_ios_bitalloc, "?bitalloc(a)ios@@SAJXZ"); init_thiscall_thunk(); return TRUE; @@ -889,7 +893,8 @@ static void test_ios(void) struct ios_lock_arg lock_arg; HANDLE thread; BOOL locked; - LONG ret; + LONG expected, ret; + int i; memset(&ios_obj, 0xab, sizeof(ios)); memset(&ios_obj2, 0xab, sizeof(ios)); @@ -1084,6 +1089,16 @@ static void test_ios(void) ios_obj.do_lock = -1; SetEvent(lock_arg.release[0]); + + /* bitalloc */ + expected = 0x10000; + for (i = 0; i < 20; i++) { + ret = p_ios_bitalloc(); + ok(ret == expected, "expected %x got %x\n", expected, ret); + ok(*p_ios_maxbit == expected, "expected %x got %x\n", expected, *p_ios_maxbit); + expected <<= 1; + } + SetEvent(lock_arg.release[1]); SetEvent(lock_arg.release[2]); WaitForSingleObject(thread, INFINITE); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index aa6f5bc..529c0d9 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -766,7 +766,7 @@ @ stub -arch=win64 ?ws@@YAAEAVistream@@AEAV1@@Z # @ extern ?x_curindex(a)ios@@0HA @ extern ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A msvcirt.?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A -# @ extern ?x_maxbit(a)ios@@0JA +@ extern ?x_maxbit(a)ios@@0JA msvcirt.?x_maxbit(a)ios@@0JA # @ extern ?x_statebuf(a)ios@@0QAJA @ cdecl ?xalloc(a)ios@@SAHXZ() msvcirt.?xalloc(a)ios@@SAHXZ @ thiscall -arch=win32 ?xsgetn(a)streambuf@@UAEHPADH(a)Z(ptr ptr long) msvcirt.?xsgetn(a)streambuf@@UAEHPADH(a)Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index a80fd20..e5a2852 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -840,7 +840,7 @@ @ stub -arch=win64 ?ws@@YAAEAVistream@@AEAV1@@Z # @ extern ?x_curindex(a)ios@@0HA @ extern ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A msvcirt.?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A -# @ extern ?x_maxbit(a)ios@@0JA +@ extern ?x_maxbit(a)ios@@0JA msvcirt.?x_maxbit(a)ios@@0JA # @ extern ?x_statebuf(a)ios@@0PAJA @ cdecl ?xalloc(a)ios@@SAHXZ() msvcirt.?xalloc(a)ios@@SAHXZ @ thiscall -arch=win32 ?xsgetn(a)streambuf@@UAEHPADH(a)Z(ptr ptr long) msvcirt.?xsgetn(a)streambuf@@UAEHPADH(a)Z

1 0

Sebastian Lackner : vcomp: Fix handling of _vcomp_fork with ifval == FALSE.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: c06167b172a3db8d903a275b38af87ec8851c7d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c06167b172a3db8d903a275b3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 20 05:15:49 2015 +0200 vcomp: Fix handling of _vcomp_fork with ifval == FALSE. Forks with ifval == FALSE do not count as "parallel", so nested forks are still allowed. Please note that calling _vcomp_fork(FALSE, ...) or directly calling the callback is still different in some aspects, the synchronization functions run in a different context for example. --- dlls/vcomp/main.c | 10 ++++++++-- dlls/vcomp/tests/vcomp.c | 23 ++++++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 6e99d21..1dad029 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -54,6 +54,7 @@ struct vcomp_thread_data struct vcomp_team_data *team; struct vcomp_task_data *task; int thread_num; + BOOL parallel; int fork_threads; /* only used for concurrent tasks */ @@ -203,6 +204,7 @@ static struct vcomp_thread_data *vcomp_init_thread_data(void) thread_data->team = NULL; thread_data->task = &data->task; thread_data->thread_num = 0; + thread_data->parallel = FALSE; thread_data->fork_threads = 0; thread_data->section = 1; @@ -410,10 +412,11 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) TRACE("(%d, %d, %p, ...)\n", ifval, nargs, wrapper); + if (prev_thread_data->parallel && !vcomp_nested_fork) + ifval = FALSE; + if (!ifval) num_threads = 1; - else if (prev_thread_data->team && !vcomp_nested_fork) - num_threads = 1; else if (prev_thread_data->fork_threads) num_threads = prev_thread_data->fork_threads; else @@ -433,6 +436,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) thread_data.team = &team_data; thread_data.task = &task_data; thread_data.thread_num = 0; + thread_data.parallel = ifval || prev_thread_data->parallel; thread_data.fork_threads = 0; thread_data.section = 1; list_init(&thread_data.entry); @@ -450,6 +454,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->team = &team_data; data->task = &task_data; data->thread_num = team_data.num_threads++; + data->parallel = thread_data.parallel; data->fork_threads = 0; data->section = 1; list_remove(&data->entry); @@ -470,6 +475,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->team = &team_data; data->task = &task_data; data->thread_num = team_data.num_threads; + data->parallel = thread_data.parallel; data->fork_threads = 0; data->section = 1; InitializeConditionVariable(&data->cond); diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index a96f957..dd91b4f 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -208,17 +208,21 @@ static void CDECL num_threads_cb(BOOL nested, int nested_threads, LONG *count) thread_count = 0; p_vcomp_fork(TRUE, 1, num_threads_cb2, &thread_count); if (nested) - ok(thread_count == nested_threads, "expected %d thread, got %d\n", nested_threads, thread_count); + 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); + thread_count = 0; + p_vcomp_fork(FALSE, 1, num_threads_cb2, &thread_count); + ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); + p_vcomp_set_num_threads(4); thread_count = 0; p_vcomp_fork(TRUE, 1, num_threads_cb2, &thread_count); if (nested) - ok(thread_count == 4 , "expected 4 thread, got %d\n", thread_count); + 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); + ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); } static void test_omp_get_num_threads(BOOL nested) @@ -241,6 +245,19 @@ static void test_omp_get_num_threads(BOOL nested) p_vcomp_fork(TRUE, 3, num_threads_cb, nested, max_threads, &thread_count); ok(thread_count == max_threads, "expected %d threads, got %d\n", max_threads, thread_count); + 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); + ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); + + 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); + ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); + pomp_set_num_threads(2); num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads);

1 0

Vincent Povirk : winex11.drv: Don' t change net_wm maximized state for minimized windows.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: ce409c01d51c20386edab73c31930ceaa82c9e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce409c01d51c20386edab73c3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 17 15:48:24 2015 -0500 winex11.drv: Don't change net_wm maximized state for minimized windows. In Win32, minimized windows are generally not considered maximized, but restoring a minimized window that had been maximized returns it to the maximized state. In X11, at least with some window managers (I tested metacity and gnome shell), the maximized state is meaningful for minimized windows. If we remove the net_wm maximized state from windows we minimize, they will still be unmaximized when the WM restores them. --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 50c3290..7651590 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -976,7 +976,7 @@ void update_net_wm_states( struct x11drv_win_data *data ) style = GetWindowLongW( data->hwnd, GWL_STYLE ); if (style & WS_MINIMIZE) - new_state |= data->net_wm_state & (1 << NET_WM_STATE_FULLSCREEN); + new_state |= data->net_wm_state & ((1 << NET_WM_STATE_FULLSCREEN)|(1 << NET_WM_STATE_MAXIMIZED)); if (is_window_rect_fullscreen( &data->whole_rect )) { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION)

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: a75e1bdabab1af39a76cb1b2dac0b8d262d273f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a75e1bdabab1af39a76cb1b2d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 18 09:14:33 2015 +0200 po: Update French translation. --- po/fr.po | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/po/fr.po b/po/fr.po index f4894e3..e37262e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-12 14:55+0100\n" +"PO-Revision-Date: 2015-07-18 09:12+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: French\n" "Language: fr\n" @@ -7493,10 +7493,8 @@ msgid "Add Control" msgstr "Ajouter un contrôle" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "&Police..." +msgstr "&Convertir..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8960,10 +8958,6 @@ msgstr "" "assez d'espace disque ou que vous êtes toujours connecté au réseau." #: winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." @@ -9300,10 +9294,8 @@ msgid "Wine Sound Mapper" msgstr "Programme d'installation de Mono pour Wine" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "colonne" +msgstr "Volume" #: winmm.rc:138 msgid "Master Volume" @@ -13662,14 +13654,10 @@ msgid "Command history" msgstr "Historique des commandes" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Taille mémoire tampon écran" +msgstr "&Taille mém. tampon :" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" msgstr "&Supprimer les doublons" @@ -13683,25 +13671,19 @@ msgstr "&Contrôle" #: wineconsole.rc:76 msgid "S&hift" -msgstr "Ma&j" +msgstr "M&aj" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "&Fermer la console" +msgstr "Console" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Édition rapide" +msgstr "Mode é&dition rapide" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "Mode &expert" +msgstr "Mode &insertion" #: wineconsole.rc:88 msgid "&Font"

1 0

André Hentschel : wordpad: Copy the correct amount of data with lstrcpynW (Coverity).
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: b5c3408a5e2060792058b9db1c64b69c9efe9731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c3408a5e2060792058b9db1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 19 23:30:15 2015 +0200 wordpad: Copy the correct amount of data with lstrcpynW (Coverity). --- programs/wordpad/wordpad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index f1a7ceb..bb34f2e 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1232,7 +1232,7 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) if (pFr->lpstrFindWhat != custom_data->findBuffer) { lstrcpynW(custom_data->findBuffer, pFr->lpstrFindWhat, - sizeof(custom_data->findBuffer)); + sizeof(custom_data->findBuffer) / sizeof(WCHAR)); pFr->lpstrFindWhat = custom_data->findBuffer; }

1 0

André Hentschel : mcicda: Remove dead code (Coverity) .
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: fd490262ce5cf422d0e96c391ac278af5dc97815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd490262ce5cf422d0e96c391… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 19 22:49:52 2015 +0200 mcicda: Remove dead code (Coverity). --- dlls/mcicda/mcicda.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 1ea9a58..c7bacff 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -655,10 +655,9 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) if (!ret) { TRACE("=> %s\n", debugstr_w(str)); if (lpParms->dwRetSize) { - WCHAR zero = 0; /* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize * to the number of characters written, excluding \0. */ - lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize); } else ret = MCIERR_PARAM_OVERFLOW; } if (MMSYSERR_NOERROR==ret && (dwFlags & MCI_NOTIFY))

1 0