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

Sebastian Lackner : vcomp: Export omp_init_nest_lock and omp_destroy_nest_lock.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 037a079fdf627fa538c54bf144cb51a478857ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=037a079fdf627fa538c54bf14… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 18 06:55:03 2015 +0200 vcomp: Export omp_init_nest_lock and omp_destroy_nest_lock. --- dlls/vcomp/tests/vcomp.c | 20 ++++++++++++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp110/vcomp110.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index b2f8fc4..dd734fd 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -31,6 +31,9 @@ static BOOL (WINAPI *pActivateActCtx)(HANDLE, ULONG_PTR*); static BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); static VOID (WINAPI *pReleaseActCtx)(HANDLE); +typedef CRITICAL_SECTION *omp_lock_t; +typedef CRITICAL_SECTION *omp_nest_lock_t; + 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); @@ -70,11 +73,15 @@ static int (CDECL *p_vcomp_sections_next)(void); static void (CDECL *p_vcomp_set_num_threads)(int num_threads); static int (CDECL *p_vcomp_single_begin)(int flags); static void (CDECL *p_vcomp_single_end)(void); +static void (CDECL *pomp_destroy_lock)(omp_lock_t *lock); +static void (CDECL *pomp_destroy_nest_lock)(omp_nest_lock_t *lock); 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_init_lock)(omp_lock_t *lock); +static void (CDECL *pomp_init_nest_lock)(omp_nest_lock_t *lock); static void (CDECL *pomp_set_nested)(int nested); static void (CDECL *pomp_set_num_threads)(int num_threads); @@ -249,11 +256,15 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_set_num_threads); VCOMP_GET_PROC(_vcomp_single_begin); VCOMP_GET_PROC(_vcomp_single_end); + VCOMP_GET_PROC(omp_destroy_lock); + VCOMP_GET_PROC(omp_destroy_nest_lock); VCOMP_GET_PROC(omp_get_max_threads); 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_init_lock); + VCOMP_GET_PROC(omp_init_nest_lock); VCOMP_GET_PROC(omp_set_nested); VCOMP_GET_PROC(omp_set_num_threads); @@ -1285,6 +1296,14 @@ static void test_vcomp_flush(void) p_vcomp_flush(); } +static void test_omp_init_nest_lock(void) +{ + ok(pomp_init_nest_lock == pomp_init_lock, "expected omp_init_nest_lock == %p, got %p\n", + pomp_init_lock, pomp_init_nest_lock); + ok(pomp_destroy_nest_lock == pomp_destroy_lock, "expected omp_destroy_nest_lock == %p, got %p\n", + pomp_destroy_lock, pomp_destroy_nest_lock); +} + static void test_atomic_integer32(void) { struct @@ -1405,6 +1424,7 @@ START_TEST(vcomp) test_vcomp_single_begin(); test_vcomp_enter_critsect(); test_vcomp_flush(); + test_omp_init_nest_lock(); test_atomic_integer32(); test_atomic_float(); test_atomic_double(); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index e078af9..418d176 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -89,7 +89,7 @@ @ cdecl _vcomp_single_begin(long) @ cdecl _vcomp_single_end() @ cdecl omp_destroy_lock(ptr) -@ stub omp_destroy_nest_lock +@ cdecl omp_destroy_nest_lock(ptr) omp_destroy_lock @ cdecl omp_get_dynamic() @ cdecl omp_get_max_threads() @ cdecl omp_get_nested() @@ -100,7 +100,7 @@ @ cdecl omp_get_wtime() @ cdecl omp_in_parallel() @ cdecl omp_init_lock(ptr) -@ stub omp_init_nest_lock +@ cdecl omp_init_nest_lock(ptr) omp_init_lock @ cdecl omp_set_dynamic(long) @ stub omp_set_lock @ stub omp_set_nest_lock diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 017f49e..8a26b15 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -89,7 +89,7 @@ @ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin @ cdecl _vcomp_single_end() vcomp._vcomp_single_end @ cdecl omp_destroy_lock(ptr) vcomp.omp_destroy_lock -@ stub omp_destroy_nest_lock +@ cdecl omp_destroy_nest_lock(ptr) vcomp.omp_destroy_nest_lock @ cdecl omp_get_dynamic() vcomp.omp_get_dynamic @ cdecl omp_get_max_threads() vcomp.omp_get_max_threads @ cdecl omp_get_nested() vcomp.omp_get_nested @@ -100,7 +100,7 @@ @ cdecl omp_get_wtime() vcomp.omp_get_wtime @ cdecl omp_in_parallel() vcomp.omp_in_parallel @ cdecl omp_init_lock(ptr) vcomp.omp_init_lock -@ stub omp_init_nest_lock +@ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock @ stub omp_set_nest_lock diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index a7be1d9..64a4016 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -90,7 +90,7 @@ @ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin @ cdecl _vcomp_single_end() vcomp._vcomp_single_end @ cdecl omp_destroy_lock(ptr) vcomp.omp_destroy_lock -@ stub omp_destroy_nest_lock +@ cdecl omp_destroy_nest_lock(ptr) vcomp.omp_destroy_nest_lock @ cdecl omp_get_dynamic() vcomp.omp_get_dynamic @ cdecl omp_get_max_threads() vcomp.omp_get_max_threads @ cdecl omp_get_nested() vcomp.omp_get_nested @@ -101,7 +101,7 @@ @ cdecl omp_get_wtime() vcomp.omp_get_wtime @ cdecl omp_in_parallel() vcomp.omp_in_parallel @ cdecl omp_init_lock(ptr) vcomp.omp_init_lock -@ stub omp_init_nest_lock +@ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock @ stub omp_set_nest_lock diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 017f49e..8a26b15 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -89,7 +89,7 @@ @ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin @ cdecl _vcomp_single_end() vcomp._vcomp_single_end @ cdecl omp_destroy_lock(ptr) vcomp.omp_destroy_lock -@ stub omp_destroy_nest_lock +@ cdecl omp_destroy_nest_lock(ptr) vcomp.omp_destroy_nest_lock @ cdecl omp_get_dynamic() vcomp.omp_get_dynamic @ cdecl omp_get_max_threads() vcomp.omp_get_max_threads @ cdecl omp_get_nested() vcomp.omp_get_nested @@ -100,7 +100,7 @@ @ cdecl omp_get_wtime() vcomp.omp_get_wtime @ cdecl omp_in_parallel() vcomp.omp_in_parallel @ cdecl omp_init_lock(ptr) vcomp.omp_init_lock -@ stub omp_init_nest_lock +@ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock @ stub omp_set_nest_lock

1 0

Sebastian Lackner : vcomp: Implement OpenMP nested locking functions.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: f212a137a6ae1eec774587a731c294448b75d532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f212a137a6ae1eec774587a73… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 18 06:56:17 2015 +0200 vcomp: Implement OpenMP nested locking functions. The test marked with todo_wine suggests that native OpenMP might use a separate counter for the nesting level. However, to implement the owner checks required for regular locks we need to access the critical section private members anyway. --- dlls/vcomp/main.c | 18 ++++++++++++++++++ dlls/vcomp/tests/vcomp.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 6 +++--- dlls/vcomp100/vcomp100.spec | 6 +++--- dlls/vcomp110/vcomp110.spec | 6 +++--- dlls/vcomp90/vcomp90.spec | 6 +++--- 6 files changed, 68 insertions(+), 12 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 81e3bc8..487d55c 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1057,6 +1057,24 @@ void CDECL omp_destroy_lock(omp_lock_t *lock) destroy_critsect(*lock); } +void CDECL omp_set_nest_lock(omp_nest_lock_t *lock) +{ + TRACE("(%p)\n", lock); + EnterCriticalSection(*lock); +} + +void CDECL omp_unset_nest_lock(omp_nest_lock_t *lock) +{ + TRACE("(%p)\n", lock); + LeaveCriticalSection(*lock); +} + +int CDECL omp_test_nest_lock(omp_nest_lock_t *lock) +{ + TRACE("(%p)\n", lock); + return TryEnterCriticalSection(*lock) ? (*lock)->RecursionCount : 0; +} + void CDECL _vcomp_enter_critsect(CRITICAL_SECTION **critsect) { TRACE("(%p)\n", critsect); diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index dd734fd..b064554 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -82,8 +82,11 @@ static int (CDECL *pomp_get_thread_num)(void); static int (CDECL *pomp_in_parallel)(void); static void (CDECL *pomp_init_lock)(omp_lock_t *lock); static void (CDECL *pomp_init_nest_lock)(omp_nest_lock_t *lock); +static void (CDECL *pomp_set_nest_lock)(omp_nest_lock_t *lock); static void (CDECL *pomp_set_nested)(int nested); static void (CDECL *pomp_set_num_threads)(int num_threads); +static int (CDECL *pomp_test_nest_lock)(omp_nest_lock_t *lock); +static void (CDECL *pomp_unset_nest_lock)(omp_nest_lock_t *lock); #define VCOMP_DYNAMIC_FLAGS_STATIC 0x01 #define VCOMP_DYNAMIC_FLAGS_CHUNKED 0x02 @@ -265,8 +268,11 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(omp_in_parallel); VCOMP_GET_PROC(omp_init_lock); VCOMP_GET_PROC(omp_init_nest_lock); + VCOMP_GET_PROC(omp_set_nest_lock); VCOMP_GET_PROC(omp_set_nested); VCOMP_GET_PROC(omp_set_num_threads); + VCOMP_GET_PROC(omp_test_nest_lock); + VCOMP_GET_PROC(omp_unset_nest_lock); return TRUE; } @@ -1298,10 +1304,42 @@ static void test_vcomp_flush(void) static void test_omp_init_nest_lock(void) { + omp_nest_lock_t lock; + int ret; + ok(pomp_init_nest_lock == pomp_init_lock, "expected omp_init_nest_lock == %p, got %p\n", pomp_init_lock, pomp_init_nest_lock); ok(pomp_destroy_nest_lock == pomp_destroy_lock, "expected omp_destroy_nest_lock == %p, got %p\n", pomp_destroy_lock, pomp_destroy_nest_lock); + + pomp_init_nest_lock(&lock); + + /* test omp_set_nest_lock */ + pomp_set_nest_lock(&lock); + pomp_set_nest_lock(&lock); + pomp_unset_nest_lock(&lock); + pomp_unset_nest_lock(&lock); + + /* test omp_test_nest_lock */ + ret = pomp_test_nest_lock(&lock); + ok(ret == 1, "expected ret == 1, got %d\n", ret); + ret = pomp_test_nest_lock(&lock); + ok(ret == 2, "expected ret == 2, got %d\n", ret); + ret = pomp_test_nest_lock(&lock); + ok(ret == 3, "expected ret == 3, got %d\n", ret); + pomp_unset_nest_lock(&lock); + pomp_unset_nest_lock(&lock); + pomp_unset_nest_lock(&lock); + + /* test with EnterCriticalSection */ + EnterCriticalSection(lock); + ret = pomp_test_nest_lock(&lock); + todo_wine + ok(ret == 1, "expected ret == 1, got %d\n", ret); + pomp_unset_nest_lock(&lock); + LeaveCriticalSection(lock); + + pomp_destroy_nest_lock(&lock); } static void test_atomic_integer32(void) diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 418d176..4c89879 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -103,10 +103,10 @@ @ cdecl omp_init_nest_lock(ptr) omp_init_lock @ cdecl omp_set_dynamic(long) @ stub omp_set_lock -@ stub omp_set_nest_lock +@ cdecl omp_set_nest_lock(ptr) @ cdecl omp_set_nested(long) @ cdecl omp_set_num_threads(long) @ stub omp_test_lock -@ stub omp_test_nest_lock +@ cdecl omp_test_nest_lock(ptr) @ stub omp_unset_lock -@ stub omp_unset_nest_lock +@ cdecl omp_unset_nest_lock(ptr) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 8a26b15..9021b10 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -103,10 +103,10 @@ @ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock -@ stub omp_set_nest_lock +@ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock @ cdecl omp_set_nested(long) vcomp.omp_set_nested @ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads @ stub omp_test_lock -@ stub omp_test_nest_lock +@ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock @ stub omp_unset_lock -@ stub omp_unset_nest_lock +@ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index 64a4016..4f7503f 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -104,10 +104,10 @@ @ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock -@ stub omp_set_nest_lock +@ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock @ cdecl omp_set_nested(long) vcomp.omp_set_nested @ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads @ stub omp_test_lock -@ stub omp_test_nest_lock +@ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock @ stub omp_unset_lock -@ stub omp_unset_nest_lock +@ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 8a26b15..9021b10 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -103,10 +103,10 @@ @ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock -@ stub omp_set_nest_lock +@ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock @ cdecl omp_set_nested(long) vcomp.omp_set_nested @ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads @ stub omp_test_lock -@ stub omp_test_nest_lock +@ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock @ stub omp_unset_lock -@ stub omp_unset_nest_lock +@ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock

1 0

Sebastian Lackner : vcomp: Implement OpenMP regular locking functions.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 146df7dab17b7417ebe3ba6ae5677b45c19c5bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=146df7dab17b7417ebe3ba6ae… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Aug 18 06:57:58 2015 +0200 vcomp: Implement OpenMP regular locking functions. Native OpenMP also immediately terminates the process (without exception) when calling omp_set_lock while holding the lock from the same thread. --- dlls/vcomp/main.c | 35 +++++++++++++++++++++++++++++++++++ dlls/vcomp/tests/vcomp.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 6 +++--- dlls/vcomp100/vcomp100.spec | 6 +++--- dlls/vcomp110/vcomp110.spec | 6 +++--- dlls/vcomp90/vcomp90.spec | 6 +++--- 6 files changed, 88 insertions(+), 12 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 487d55c..d442155 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1045,6 +1045,12 @@ static void destroy_critsect(CRITICAL_SECTION *critsect) HeapFree(GetProcessHeap(), 0, critsect); } +static BOOL critsect_is_locked(CRITICAL_SECTION *critsect) +{ + return critsect->OwningThread == ULongToHandle(GetCurrentThreadId()) && + critsect->RecursionCount; +} + void CDECL omp_init_lock(omp_lock_t *lock) { TRACE("(%p)\n", lock); @@ -1057,6 +1063,35 @@ void CDECL omp_destroy_lock(omp_lock_t *lock) destroy_critsect(*lock); } +void CDECL omp_set_lock(omp_lock_t *lock) +{ + TRACE("(%p)\n", lock); + + if (critsect_is_locked(*lock)) + { + ERR("omp_set_lock called while holding lock %p\n", *lock); + ExitProcess(1); + } + + EnterCriticalSection(*lock); +} + +void CDECL omp_unset_lock(omp_lock_t *lock) +{ + TRACE("(%p)\n", lock); + LeaveCriticalSection(*lock); +} + +int CDECL omp_test_lock(omp_lock_t *lock) +{ + TRACE("(%p)\n", lock); + + if (critsect_is_locked(*lock)) + return 0; + + return TryEnterCriticalSection(*lock); +} + void CDECL omp_set_nest_lock(omp_nest_lock_t *lock) { TRACE("(%p)\n", lock); diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index b064554..83125e1 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -82,10 +82,13 @@ static int (CDECL *pomp_get_thread_num)(void); static int (CDECL *pomp_in_parallel)(void); static void (CDECL *pomp_init_lock)(omp_lock_t *lock); static void (CDECL *pomp_init_nest_lock)(omp_nest_lock_t *lock); +static void (CDECL *pomp_set_lock)(omp_lock_t *lock); static void (CDECL *pomp_set_nest_lock)(omp_nest_lock_t *lock); static void (CDECL *pomp_set_nested)(int nested); static void (CDECL *pomp_set_num_threads)(int num_threads); +static int (CDECL *pomp_test_lock)(omp_lock_t *lock); static int (CDECL *pomp_test_nest_lock)(omp_nest_lock_t *lock); +static void (CDECL *pomp_unset_lock)(omp_lock_t *lock); static void (CDECL *pomp_unset_nest_lock)(omp_nest_lock_t *lock); #define VCOMP_DYNAMIC_FLAGS_STATIC 0x01 @@ -268,10 +271,13 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(omp_in_parallel); VCOMP_GET_PROC(omp_init_lock); VCOMP_GET_PROC(omp_init_nest_lock); + VCOMP_GET_PROC(omp_set_lock); VCOMP_GET_PROC(omp_set_nest_lock); VCOMP_GET_PROC(omp_set_nested); VCOMP_GET_PROC(omp_set_num_threads); + VCOMP_GET_PROC(omp_test_lock); VCOMP_GET_PROC(omp_test_nest_lock); + VCOMP_GET_PROC(omp_unset_lock); VCOMP_GET_PROC(omp_unset_nest_lock); return TRUE; @@ -1302,6 +1308,40 @@ static void test_vcomp_flush(void) p_vcomp_flush(); } +static void test_omp_init_lock(void) +{ + omp_lock_t lock; + int ret; + + pomp_init_lock(&lock); + + /* test omp_set_lock */ + pomp_set_lock(&lock); + pomp_unset_lock(&lock); + + /* test omp_test_lock */ + ret = pomp_test_lock(&lock); + ok(ret == 1, "expected ret == 1, got %d\n", ret); + ret = pomp_test_lock(&lock); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + pomp_unset_lock(&lock); + + /* test with EnterCriticalSection */ + EnterCriticalSection(lock); + ret = pomp_test_lock(&lock); + todo_wine + ok(ret == 1, "expected ret == 1, got %d\n", ret); + if (ret) + { + ret = pomp_test_lock(&lock); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + pomp_unset_lock(&lock); + } + LeaveCriticalSection(lock); + + pomp_destroy_lock(&lock); +} + static void test_omp_init_nest_lock(void) { omp_nest_lock_t lock; @@ -1462,6 +1502,7 @@ START_TEST(vcomp) test_vcomp_single_begin(); test_vcomp_enter_critsect(); test_vcomp_flush(); + test_omp_init_lock(); test_omp_init_nest_lock(); test_atomic_integer32(); test_atomic_float(); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 4c89879..52b929f 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -102,11 +102,11 @@ @ cdecl omp_init_lock(ptr) @ cdecl omp_init_nest_lock(ptr) omp_init_lock @ cdecl omp_set_dynamic(long) -@ stub omp_set_lock +@ cdecl omp_set_lock(ptr) @ cdecl omp_set_nest_lock(ptr) @ cdecl omp_set_nested(long) @ cdecl omp_set_num_threads(long) -@ stub omp_test_lock +@ cdecl omp_test_lock(ptr) @ cdecl omp_test_nest_lock(ptr) -@ stub omp_unset_lock +@ cdecl omp_unset_lock(ptr) @ cdecl omp_unset_nest_lock(ptr) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 9021b10..4b646eb 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -102,11 +102,11 @@ @ cdecl omp_init_lock(ptr) vcomp.omp_init_lock @ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic -@ stub omp_set_lock +@ cdecl omp_set_lock(ptr) vcomp.omp_set_lock @ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock @ cdecl omp_set_nested(long) vcomp.omp_set_nested @ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads -@ stub omp_test_lock +@ cdecl omp_test_lock(ptr) vcomp.omp_test_lock @ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock -@ stub omp_unset_lock +@ cdecl omp_unset_lock(ptr) vcomp.omp_unset_lock @ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index 4f7503f..1ee7fba 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -103,11 +103,11 @@ @ cdecl omp_init_lock(ptr) vcomp.omp_init_lock @ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic -@ stub omp_set_lock +@ cdecl omp_set_lock(ptr) vcomp.omp_set_lock @ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock @ cdecl omp_set_nested(long) vcomp.omp_set_nested @ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads -@ stub omp_test_lock +@ cdecl omp_test_lock(ptr) vcomp.omp_test_lock @ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock -@ stub omp_unset_lock +@ cdecl omp_unset_lock(ptr) vcomp.omp_unset_lock @ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 9021b10..4b646eb 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -102,11 +102,11 @@ @ cdecl omp_init_lock(ptr) vcomp.omp_init_lock @ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic -@ stub omp_set_lock +@ cdecl omp_set_lock(ptr) vcomp.omp_set_lock @ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock @ cdecl omp_set_nested(long) vcomp.omp_set_nested @ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads -@ stub omp_test_lock +@ cdecl omp_test_lock(ptr) vcomp.omp_test_lock @ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock -@ stub omp_unset_lock +@ cdecl omp_unset_lock(ptr) vcomp.omp_unset_lock @ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock

1 0

Nikolay Sivov : dwrite: Implement font style resolution from name strings.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 5185906006c077f84d86274112cd287d3591c5b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5185906006c077f84d8627411… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 18 07:40:27 2015 +0300 dwrite: Implement font style resolution from name strings. --- dlls/dwrite/font.c | 271 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 236 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5185906006c077f84d862…

1 0

Frédéric Delanoy : French translation for release 1.7.48
by Jeremy Newman 18 Aug '15

18 Aug '15

Module: website Branch: master Commit: d973ae089a38505dd424d127b11959c67e9eb914 URL: http://source.winehq.org/git/website.git/?a=commit;h=d973ae089a38505dd424d1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 17 09:55:06 2015 +0200 French translation for release 1.7.48 --- news/fr/2015072801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2015072801.xml b/news/fr/2015072801.xml new file mode 100644 index 0000000..39e665e --- /dev/null +++ b/news/fr/2015072801.xml @@ -0,0 +1,15 @@ +<news> +<date>28 juillet 2015</date> +<title>Sortie de Wine 1.7.48</title> +<body> + La version de développement 1.7.48 de Wine est disponible. + <a href="{$root}/announce/1.7.48">Nouveautés</a> de cette version : +<ul> + <li>Implémentation enrichie de OpenMP.</li> + <li>Prise en charge des flux d'E/S dans le moteur d'exécution C++ MSVCIRT.</li> + <li>Prise en charge du pixel snapping dans DirectWrite.</li> + <li>Meilleure prise en charge des contextes OpenGL core.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.48.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.49
by Jeremy Newman 18 Aug '15

18 Aug '15

Module: website Branch: master Commit: 2f61c800d270f071d20b187ceb67ef1137223106 URL: http://source.winehq.org/git/website.git/?a=commit;h=2f61c800d270f071d20b18… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Aug 15 13:06:18 2015 +0200 German translation for release 1.7.49 --- news/de/2015080801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015080801.xml b/news/de/2015080801.xml new file mode 100644 index 0000000..5afd9ef --- /dev/null +++ b/news/de/2015080801.xml @@ -0,0 +1,16 @@ +<news> +<date>8. August 2015</date> +<title>Wine 1.7.49 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.49 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.49">Neuerungen (en)</a> in dieser Version: +<ul> + <li>DirectWrite ist ausreichend ausgereift, um Text in Steam rendern zu können.</li> + <li>Eine größere Anzahl an Direct2D-Verbesserungen.</li> + <li>Einige zusätzliche OpenMP-Funktionen.</li> + <li>Unterstützung von Namespaces im IDL-Compiler.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.49.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.48
by Jeremy Newman 18 Aug '15

18 Aug '15

Module: website Branch: master Commit: 17c05b46f0cbc35b20da7d5c54f0ed0641a50417 URL: http://source.winehq.org/git/website.git/?a=commit;h=17c05b46f0cbc35b20da7d… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Aug 15 12:59:46 2015 +0200 German translation for release 1.7.48 --- news/de/2015072801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015072801.xml b/news/de/2015072801.xml new file mode 100644 index 0000000..cd5d854 --- /dev/null +++ b/news/de/2015072801.xml @@ -0,0 +1,16 @@ +<news> +<date>28. Juli 2015</date> +<title>Wine 1.7.48 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.48 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.48">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Ausgebaute OpenMP-Implementierung.</li> + <li>I/O-Stream-Unterstützung in der MSVCIRT C++-Laufzeit.</li> + <li>Unterstützung für "Pixel snapping" in DirectWrite.</li> + <li>Bessere Unterstützung von OpenGL core contexts.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.48.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.49
by Jeremy Newman 18 Aug '15

18 Aug '15

Module: website Branch: master Commit: d12f8dd9c1e982fbd6f37e90d7b7df385d2e7a59 URL: http://source.winehq.org/git/website.git/?a=commit;h=d12f8dd9c1e982fbd6f37e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 17 10:01:38 2015 +0200 French translation for release 1.7.49 --- news/fr/2015080801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2015080801.xml b/news/fr/2015080801.xml new file mode 100644 index 0000000..098c0a2 --- /dev/null +++ b/news/fr/2015080801.xml @@ -0,0 +1,15 @@ +<news> +<date>8 août 2015</date> +<title>Sortie de Wine 1.7.49</title> +<body> + La version de développement 1.7.49 de Wine est disponible. + <a href="{$root}/announce/1.7.49">Nouveautés</a> de cette version : +<ul> + <li>Implémentation de DirectWrite à présent suffisante pour le rendu de texte dans Steam.</li> + <li>Quelques améliorations dans Direct2D.</li> + <li>Fonctions OpenMP supplémentaires.</li> + <li>Prise en charge des espaces de nommage dans le compilateur IDL.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.49.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Henri Verbeet : d2d1: Make d2d_geometry_sink_vtbl static const.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 1bea5f44b033f9b00f260aa280de2f9f2baa741b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bea5f44b033f9b00f260aa28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 17 12:55:18 2015 +0200 d2d1: Make d2d_geometry_sink_vtbl static const. Spotted by Francois Gouget. --- dlls/d2d1/geometry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 056923e..79764e1 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1299,7 +1299,7 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddArc(ID2D1GeometrySink *iface, ++geometry->u.path.segment_count; } -struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = +static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = { d2d_geometry_sink_QueryInterface, d2d_geometry_sink_AddRef,

1 0

Thomas Faber : qmgr: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: bd7f43d7e8fca5cab20120b3819bfd5491436b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7f43d7e8fca5cab20120b38… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Aug 17 13:56:50 2015 +0200 qmgr: Do not omit mandatory argument to WriteFile. --- dlls/qmgr/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 4dccbfd..70d3a50 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -373,6 +373,7 @@ static BOOL transfer_file_http(BackgroundCopyFileImpl *file, URL_COMPONENTSW *uc DWORD flags = (uc->nScheme == INTERNET_SCHEME_HTTPS) ? WINHTTP_FLAG_SECURE : 0; char buf[4096]; BOOL ret = FALSE; + DWORD written; transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_CONNECTING); @@ -405,7 +406,7 @@ static BOOL transfer_file_http(BackgroundCopyFileImpl *file, URL_COMPONENTSW *uc break; } if (!file->read_size) break; - if (!(ret = WriteFile(handle, buf, file->read_size, NULL, NULL))) break; + if (!(ret = WriteFile(handle, buf, file->read_size, &written, NULL))) break; EnterCriticalSection(&job->cs); file->fileProgress.BytesTransferred += file->read_size;

1 0