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

Olivier F. R. Dierick : kernel32: Fail gracefully in K32EnumProcessModules with NULL pointer.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: c3f95eddc1bf73b0c5dc95fdfde2b0f8a6d292a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f95eddc1bf73b0c5dc95fdf… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Thu Jul 2 04:23:22 2015 +0200 kernel32: Fail gracefully in K32EnumProcessModules with NULL pointer. --- dlls/kernel32/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index f495e81..dac66c1 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1226,7 +1226,7 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, if (!init_module_iterator(&iter, process)) return FALSE; - if (!needed) + if ((cb && !lphModule) || !needed) { SetLastError(ERROR_NOACCESS); return FALSE;

1 0

Sebastian Lackner : ntdll: Implement TpSetWait and TpWaitForWait.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 185247576bdba4c1f77ae56550c3f88f931e76db URL: http://source.winehq.org/git/wine.git/?a=commit;h=185247576bdba4c1f77ae5655… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 5 02:23:43 2015 +0200 ntdll: Implement TpSetWait and TpWaitForWait. --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/threadpool.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 78814cd..75dc647 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -993,8 +993,10 @@ @ stdcall TpSetPoolMaxThreads(ptr long) @ stdcall TpSetPoolMinThreads(ptr long) @ stdcall TpSetTimer(ptr ptr long long) +@ stdcall TpSetWait(ptr long ptr) @ stdcall TpSimpleTryPost(ptr ptr ptr) @ stdcall TpWaitForTimer(ptr long) +@ stdcall TpWaitForWait(ptr long) @ stdcall TpWaitForWork(ptr long) @ stdcall -ret64 VerSetConditionMask(int64 long long) @ stdcall WinSqmIsOptedIn() diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 7e7563e..6aefce8 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -2836,6 +2836,67 @@ VOID WINAPI TpSetTimer( TP_TIMER *timer, LARGE_INTEGER *timeout, LONG period, LO } /*********************************************************************** + * TpSetWait (NTDLL.@) + */ +VOID WINAPI TpSetWait( TP_WAIT *wait, HANDLE handle, LARGE_INTEGER *timeout ) +{ + struct threadpool_object *this = impl_from_TP_WAIT( wait ); + ULONGLONG timestamp = TIMEOUT_INFINITE; + BOOL submit_wait = FALSE; + + TRACE( "%p %p %p\n", wait, handle, timeout ); + + RtlEnterCriticalSection( &waitqueue.cs ); + + assert( this->u.wait.bucket ); + this->u.wait.handle = handle; + + if (handle || this->u.wait.wait_pending) + { + struct waitqueue_bucket *bucket = this->u.wait.bucket; + list_remove( &this->u.wait.wait_entry ); + + /* Convert relative timeout to absolute timestamp. */ + if (handle && timeout) + { + timestamp = timeout->QuadPart; + if ((LONGLONG)timestamp < 0) + { + LARGE_INTEGER now; + NtQuerySystemTime( &now ); + timestamp = now.QuadPart - timestamp; + } + else if (!timestamp) + { + submit_wait = TRUE; + handle = NULL; + } + } + + /* Add wait object back into one of the queues. */ + if (handle) + { + list_add_tail( &bucket->waiting, &this->u.wait.wait_entry ); + this->u.wait.wait_pending = TRUE; + this->u.wait.timeout = timestamp; + } + else + { + list_add_tail( &bucket->reserved, &this->u.wait.wait_entry ); + this->u.wait.wait_pending = FALSE; + } + + /* Wake up the wait queue thread. */ + NtSetEvent( bucket->update_event, NULL ); + } + + RtlLeaveCriticalSection( &waitqueue.cs ); + + if (submit_wait) + tp_object_submit( this, FALSE ); +} + +/*********************************************************************** * TpSimpleTryPost (NTDLL.@) */ NTSTATUS WINAPI TpSimpleTryPost( PTP_SIMPLE_CALLBACK callback, PVOID userdata, @@ -2880,6 +2941,20 @@ VOID WINAPI TpWaitForTimer( TP_TIMER *timer, BOOL cancel_pending ) } /*********************************************************************** + * TpWaitForWait (NTDLL.@) + */ +VOID WINAPI TpWaitForWait( TP_WAIT *wait, BOOL cancel_pending ) +{ + struct threadpool_object *this = impl_from_TP_WAIT( wait ); + + TRACE( "%p %d\n", wait, cancel_pending ); + + if (cancel_pending) + tp_object_cancel( this, FALSE, NULL ); + tp_object_wait( this, FALSE ); +} + +/*********************************************************************** * TpWaitForWork (NTDLL.@) */ VOID WINAPI TpWaitForWork( TP_WORK *work, BOOL cancel_pending )

1 0

Sebastian Lackner : ntdll/tests: Add basic tests for threadpool wait objects.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 553ae488d04be572b3125eab486e35abb1bfee6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=553ae488d04be572b3125eab4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 5 02:24:02 2015 +0200 ntdll/tests: Add basic tests for threadpool wait objects. --- dlls/ntdll/tests/threadpool.c | 266 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 266 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=553ae488d04be572b3125…

1 0

Sebastian Lackner : ntdll/tests: Add threadpool wait tests with more than 63 objects.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 634bbed3fbfde3fe8ee77dc3c5a090716dc35563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=634bbed3fbfde3fe8ee77dc3c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 5 02:24:49 2015 +0200 ntdll/tests: Add threadpool wait tests with more than 63 objects. --- dlls/ntdll/tests/threadpool.c | 120 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index b40e0c1..c69902b 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -1171,6 +1171,125 @@ static void test_tp_wait(void) CloseHandle(semaphores[1]); } +static struct +{ + HANDLE semaphore; + DWORD result; +} multi_wait_info; + +static void CALLBACK multi_wait_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, TP_WAIT *wait, TP_WAIT_RESULT result) +{ + DWORD index = (DWORD)(DWORD_PTR)userdata; + + if (result == WAIT_OBJECT_0) + multi_wait_info.result = index; + else if (result == WAIT_TIMEOUT) + multi_wait_info.result = 0x10000 | index; + else + ok(0, "unexpected result %u\n", result); + ReleaseSemaphore(multi_wait_info.semaphore, 1, NULL); +} + +static void test_tp_multi_wait(void) +{ + TP_CALLBACK_ENVIRON environment; + HANDLE semaphores[512]; + TP_WAIT *waits[512]; + LARGE_INTEGER when; + HANDLE semaphore; + NTSTATUS status; + TP_POOL *pool; + DWORD result; + int i; + + semaphore = CreateSemaphoreW(NULL, 0, 512, NULL); + ok(semaphore != NULL, "failed to create semaphore\n"); + multi_wait_info.semaphore = semaphore; + + /* allocate new threadpool */ + pool = NULL; + status = pTpAllocPool(&pool, NULL); + ok(!status, "TpAllocPool failed with status %x\n", status); + ok(pool != NULL, "expected pool != NULL\n"); + + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.Pool = pool; + + /* create semaphores and corresponding wait objects */ + for (i = 0; i < sizeof(semaphores)/sizeof(semaphores[0]); i++) + { + semaphores[i] = CreateSemaphoreW(NULL, 0, 1, NULL); + ok(semaphores[i] != NULL, "failed to create semaphore %i\n", i); + + waits[i] = NULL; + status = pTpAllocWait(&waits[i], multi_wait_cb, (void *)(DWORD_PTR)i, &environment); + ok(!status, "TpAllocWait failed with status %x\n", status); + ok(waits[i] != NULL, "expected waits[%d] != NULL\n", i); + + pTpSetWait(waits[i], semaphores[i], NULL); + } + + /* release all semaphores and wait for callback */ + for (i = 0; i < sizeof(semaphores)/sizeof(semaphores[0]); i++) + { + multi_wait_info.result = 0; + ReleaseSemaphore(semaphores[i], 1, NULL); + + result = WaitForSingleObject(semaphore, 100); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(multi_wait_info.result == i, "expected result %d, got %u\n", i, multi_wait_info.result); + + pTpSetWait(waits[i], semaphores[i], NULL); + } + + /* repeat the same test in reverse order */ + for (i = sizeof(semaphores)/sizeof(semaphores[0]) - 1; i >= 0; i--) + { + multi_wait_info.result = 0; + ReleaseSemaphore(semaphores[i], 1, NULL); + + result = WaitForSingleObject(semaphore, 100); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(multi_wait_info.result == i, "expected result %d, got %u\n", i, multi_wait_info.result); + + pTpSetWait(waits[i], semaphores[i], NULL); + } + + /* test timeout of wait objects */ + multi_wait_info.result = 0; + for (i = 0; i < sizeof(semaphores)/sizeof(semaphores[0]); i++) + { + when.QuadPart = (ULONGLONG)50 * -10000; + pTpSetWait(waits[i], semaphores[i], &when); + } + + for (i = 0; i < sizeof(semaphores)/sizeof(semaphores[0]); i++) + { + result = WaitForSingleObject(semaphore, 150); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + } + + ok(multi_wait_info.result >> 16, "expected multi_wait_info.result >> 16 != 0\n"); + + /* destroy the wait objects and semaphores while waiting */ + for (i = 0; i < sizeof(semaphores)/sizeof(semaphores[0]); i++) + { + pTpSetWait(waits[i], semaphores[i], NULL); + } + + Sleep(50); + + for (i = 0; i < sizeof(semaphores)/sizeof(semaphores[0]); i++) + { + pTpReleaseWait(waits[i]); + NtClose(semaphores[i]); + } + + pTpReleasePool(pool); + CloseHandle(semaphore); +} + START_TEST(threadpool) { if (!init_threadpool()) @@ -1185,4 +1304,5 @@ START_TEST(threadpool) test_tp_timer(); test_tp_window_length(); test_tp_wait(); + test_tp_multi_wait(); }

1 0

Sebastian Lackner : ntdll: Try to merge threadpool wait queue buckets if possible.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 00215697780f16780c5229cade9dfaa585e86125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00215697780f16780c5229cad… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 5 02:25:32 2015 +0200 ntdll: Try to merge threadpool wait queue buckets if possible. When the number of elements per bucket is too small, then try to reduce the number of threads by merging buckets. This is to ensure that the number of running wait queue threads doesn't get too big. --- dlls/ntdll/threadpool.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 6aefce8..3f54208 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1528,6 +1528,46 @@ static void CALLBACK waitqueue_thread_proc( void *param ) tp_object_release( wait ); } } + + /* Try to merge bucket with other threads. */ + if (waitqueue.num_buckets > 1 && bucket->objcount && + bucket->objcount <= MAXIMUM_WAITQUEUE_OBJECTS * 1 / 3) + { + struct waitqueue_bucket *other_bucket; + LIST_FOR_EACH_ENTRY( other_bucket, &waitqueue.buckets, struct waitqueue_bucket, bucket_entry ) + { + if (other_bucket != bucket && other_bucket->objcount && + other_bucket->objcount + bucket->objcount <= MAXIMUM_WAITQUEUE_OBJECTS * 2 / 3) + { + other_bucket->objcount += bucket->objcount; + bucket->objcount = 0; + + /* Update reserved list. */ + LIST_FOR_EACH_ENTRY( wait, &bucket->reserved, struct threadpool_object, u.wait.wait_entry ) + { + assert( wait->type == TP_OBJECT_TYPE_WAIT ); + wait->u.wait.bucket = other_bucket; + } + list_move_tail( &other_bucket->reserved, &bucket->reserved ); + + /* Update waiting list. */ + LIST_FOR_EACH_ENTRY( wait, &bucket->waiting, struct threadpool_object, u.wait.wait_entry ) + { + assert( wait->type == TP_OBJECT_TYPE_WAIT ); + wait->u.wait.bucket = other_bucket; + } + list_move_tail( &other_bucket->waiting, &bucket->waiting ); + + /* Move bucket to the end, to keep the probability of + * newly added wait objects as small as possible. */ + list_remove( &bucket->bucket_entry ); + list_add_tail( &waitqueue.buckets, &bucket->bucket_entry ); + + NtSetEvent( other_bucket->update_event, NULL ); + break; + } + } + } } /* Remove this bucket from the list. */

1 0

Sebastian Lackner : kernel32: Forward threadpool wait functions to ntdll.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 6c586d5db87091b89823173584c6f868c85ff204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c586d5db87091b8982317358… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 5 02:26:00 2015 +0200 kernel32: Forward threadpool wait functions to ntdll. --- dlls/kernel32/kernel32.spec | 8 ++++---- dlls/kernel32/thread.c | 43 +++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 4 ++++ 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a14d03b..77e55e1 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -233,7 +233,7 @@ @ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) ntdll.TpReleaseCleanupGroupMembers # @ stub CloseThreadpoolIo @ stdcall CloseThreadpoolTimer(ptr) ntdll.TpReleaseTimer -# @ stub CloseThreadpoolWait +@ stdcall CloseThreadpoolWait(ptr) ntdll.TpReleaseWait @ stdcall CloseThreadpoolWork(ptr) ntdll.TpReleaseWork @ stdcall CmdBatNotification(long) @ stdcall CommConfigDialogA(str long ptr) @@ -335,7 +335,7 @@ @ stdcall CreateThreadpoolCleanupGroup() # @ stub CreateThreadpoolIo @ stdcall CreateThreadpoolTimer(ptr ptr ptr) -# @ stub CreateThreadpoolWait +@ stdcall CreateThreadpoolWait(ptr ptr ptr) @ stdcall CreateThreadpoolWork(ptr ptr ptr) @ stdcall CreateTimerQueue () @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) @@ -1457,7 +1457,7 @@ @ stdcall SetThreadpoolThreadMaximum(ptr long) ntdll.TpSetPoolMaxThreads @ stdcall SetThreadpoolThreadMinimum(ptr long) ntdll.TpSetPoolMinThreads @ stdcall SetThreadpoolTimer(ptr ptr long long) -# @ stub SetThreadpoolWait +@ stdcall SetThreadpoolWait(ptr long ptr) @ stdcall SetTimeZoneInformation(ptr) @ stub SetTimerQueueTimer # @ stub -arch=x86_64 SetUmsThreadInformation @@ -1572,7 +1572,7 @@ @ stdcall WaitForSingleObjectEx(long long long) # @ stub WaitForThreadpoolIoCallbacks @ stdcall WaitForThreadpoolTimerCallbacks(ptr long) ntdll.TpWaitForTimer -# @ stub WaitForThreadpoolWaitCallbacks +@ stdcall WaitForThreadpoolWaitCallbacks(ptr long) ntdll.TpWaitForWait @ stdcall WaitForThreadpoolWorkCallbacks(ptr long) ntdll.TpWaitForWork @ stdcall WaitNamedPipeA (str long) @ stdcall WaitNamedPipeW (wstr long) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 21ec276..c992e0d 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -942,6 +942,27 @@ PTP_TIMER WINAPI CreateThreadpoolTimer( PTP_TIMER_CALLBACK callback, PVOID userd } /*********************************************************************** + * CreateThreadpoolWait (KERNEL32.@) + */ +PTP_WAIT WINAPI CreateThreadpoolWait( PTP_WAIT_CALLBACK callback, PVOID userdata, + TP_CALLBACK_ENVIRON *environment ) +{ + TP_WAIT *wait; + NTSTATUS status; + + TRACE( "%p, %p, %p\n", callback, userdata, environment ); + + status = TpAllocWait( &wait, callback, userdata, environment ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return NULL; + } + + return wait; +} + +/*********************************************************************** * CreateThreadpoolWork (KERNEL32.@) */ PTP_WORK WINAPI CreateThreadpoolWork( PTP_WORK_CALLBACK callback, PVOID userdata, @@ -982,6 +1003,28 @@ VOID WINAPI SetThreadpoolTimer( TP_TIMER *timer, FILETIME *due_time, } /*********************************************************************** + * SetThreadpoolWait (KERNEL32.@) + */ +VOID WINAPI SetThreadpoolWait( TP_WAIT *wait, HANDLE handle, FILETIME *due_time ) +{ + LARGE_INTEGER timeout; + + TRACE( "%p, %p, %p\n", wait, handle, due_time ); + + if (!handle) + { + due_time = NULL; + } + else if (due_time) + { + timeout.u.LowPart = due_time->dwLowDateTime; + timeout.u.HighPart = due_time->dwHighDateTime; + } + + TpSetWait( wait, handle, due_time ? &timeout : NULL ); +} + +/*********************************************************************** * TrySubmitThreadpoolCallback (KERNEL32.@) */ BOOL WINAPI TrySubmitThreadpoolCallback( PTP_SIMPLE_CALLBACK callback, PVOID userdata, diff --git a/include/winternl.h b/include/winternl.h index e1707fd..7ab1bd8 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2621,6 +2621,7 @@ NTSYSAPI NTSTATUS WINAPI RtlLargeIntegerToChar(const ULONGLONG *,ULONG,ULONG,PC NTSYSAPI NTSTATUS WINAPI TpAllocCleanupGroup(TP_CLEANUP_GROUP **); NTSYSAPI NTSTATUS WINAPI TpAllocPool(TP_POOL **,PVOID); NTSYSAPI NTSTATUS WINAPI TpAllocTimer(TP_TIMER **,PTP_TIMER_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); +NTSYSAPI NTSTATUS WINAPI TpAllocWait(TP_WAIT **,PTP_WAIT_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); NTSYSAPI NTSTATUS WINAPI TpAllocWork(TP_WORK **,PTP_WORK_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); NTSYSAPI void WINAPI TpCallbackLeaveCriticalSectionOnCompletion(TP_CALLBACK_INSTANCE *,RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI TpCallbackMayRunLong(TP_CALLBACK_INSTANCE *); @@ -2635,12 +2636,15 @@ NTSYSAPI void WINAPI TpReleaseCleanupGroup(TP_CLEANUP_GROUP *); NTSYSAPI void WINAPI TpReleaseCleanupGroupMembers(TP_CLEANUP_GROUP *,BOOL,PVOID); NTSYSAPI void WINAPI TpReleasePool(TP_POOL *); NTSYSAPI void WINAPI TpReleaseTimer(TP_TIMER *); +NTSYSAPI void WINAPI TpReleaseWait(TP_WAIT *); NTSYSAPI void WINAPI TpReleaseWork(TP_WORK *); NTSYSAPI void WINAPI TpSetPoolMaxThreads(TP_POOL *,DWORD); NTSYSAPI BOOL WINAPI TpSetPoolMinThreads(TP_POOL *,DWORD); NTSYSAPI void WINAPI TpSetTimer(TP_TIMER *, LARGE_INTEGER *,LONG,LONG); +NTSYSAPI void WINAPI TpSetWait(TP_WAIT *,HANDLE,LARGE_INTEGER *); NTSYSAPI NTSTATUS WINAPI TpSimpleTryPost(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); NTSYSAPI void WINAPI TpWaitForTimer(TP_TIMER *,BOOL); +NTSYSAPI void WINAPI TpWaitForWait(TP_WAIT *,BOOL); NTSYSAPI void WINAPI TpWaitForWork(TP_WORK *,BOOL); /* Wine internal functions */

1 0

Alex Henrie : cmd: Consistently wrap lines to 75 characters.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 660021d0fcb22cf7d7b0a0b0ee222b4b83f6d6b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=660021d0fcb22cf7d7b0a0b0e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jul 3 01:13:35 2015 -0600 cmd: Consistently wrap lines to 75 characters. 75 characters is the maximum length of a line before gettext breaks it, so this convention will cause each translatable string to fit snugly into the po files. It's also about what we were doing anyway, just not consistently. The biggest advantage to consistent line wrapping is that translators will no longer have to guess where they should insert line breaks. I have rewrapped the Catalan, Czech, Danish, German, Spanish, Finnish, French, Croatian, Hungarian, Italian, Lithuanian, Norwegian, Dutch, Polish, Portuguese, Romanian, Russian, Slovene, Swedish, Turkish, and Ukranian translations so as to not burden their maintainers. The Bulgarian, Greek, Esperanto, Farsi, Hindi, Malayalam, Oriya, Punjabi, Romansh, Slovak, Serbian, Telugu, Thai, and Walloon translations did not need to be rewrapped. I removed Hebrew "translations" of cmd.rc that were just copies of the English strings, and marked cmd.rc:142 as fuzzy if the translation mentioned wine.conf. Single-line translations that were 80 characters long or less were not wrapped. The Arabic, Japanese, Korean, and Chinese translations still need to be rewrapped. --- po/ar.po | 495 +++++++++++++++++++++++------------ po/bg.po | 315 ++++++++++++----------- po/ca.po | 334 ++++++++++++------------ po/cs.po | 412 +++++++++++++++--------------- po/da.po | 401 +++++++++++++++-------------- po/de.po | 465 +++++++++++++++++---------------- po/el.po | 315 ++++++++++++----------- po/en.po | 448 ++++++++++++++++---------------- po/en_US.po | 448 ++++++++++++++++---------------- po/eo.po | 315 ++++++++++++----------- po/es.po | 454 ++++++++++++++++----------------- po/fa.po | 315 ++++++++++++----------- po/fi.po | 412 +++++++++++++++--------------- po/fr.po | 519 ++++++++++++++++++------------------- po/he.po | 666 ++++++++++++++++-------------------------------- po/hi.po | 315 ++++++++++++----------- po/hr.po | 319 +++++++++++------------ po/hu.po | 462 ++++++++++++++++----------------- po/it.po | 434 ++++++++++++++++--------------- po/ja.po | 505 ++++++++++++++++++++++++------------ po/ko.po | 495 +++++++++++++++++++++++------------ po/lt.po | 423 +++++++++++++++--------------- po/ml.po | 315 ++++++++++++----------- po/nb_NO.po | 442 ++++++++++++++++---------------- po/nl.po | 456 ++++++++++++++++----------------- po/or.po | 315 ++++++++++++----------- po/pa.po | 315 ++++++++++++----------- po/pl.po | 497 ++++++++++++++++++------------------ po/pt_BR.po | 412 +++++++++++++++--------------- po/pt_PT.po | 390 ++++++++++++++-------------- po/rm.po | 315 ++++++++++++----------- po/ro.po | 357 +++++++++++++------------- po/ru.po | 458 ++++++++++++++++----------------- po/sk.po | 315 ++++++++++++----------- po/sl.po | 437 ++++++++++++++++--------------- po/sr_RS(a)cyrillic.po | 315 ++++++++++++----------- po/sr_RS(a)latin.po | 315 ++++++++++++----------- po/sv.po | 375 ++++++++++++++------------- po/te.po | 315 ++++++++++++----------- po/th.po | 315 ++++++++++++----------- po/tr.po | 412 +++++++++++++++--------------- po/uk.po | 431 ++++++++++++++++--------------- po/wa.po | 315 ++++++++++++----------- po/wine.pot | 315 ++++++++++++----------- po/zh_CN.po | 315 ++++++++++++----------- po/zh_TW.po | 495 +++++++++++++++++++++++------------ programs/cmd/cmd.rc | 202 +++++++++------ programs/start/start.rc | 39 +-- 48 files changed, 9420 insertions(+), 9030 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=660021d0fcb22cf7d7b0a…

1 0

Michael Stefaniuc : dmime: Implement the remaining E_NOTIMPL methods of IDirectMusicTrack8.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 8e959e1203c4a9f39e30ade35adf217cc1f353a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e959e1203c4a9f39e30ade35… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 6 00:02:51 2015 +0200 dmime: Implement the remaining E_NOTIMPL methods of IDirectMusicTrack8. --- dlls/dmime/segtriggertrack.c | 58 +++++++++++++++++++++++++++++--------------- dlls/dmime/tempotrack.c | 44 +++++++++++++++++++++------------ 2 files changed, 67 insertions(+), 35 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 882ada2..e37454e 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -91,6 +91,11 @@ static const IUnknownVtbl DirectMusicSegTriggerTrack_Unknown_Vtbl = { }; /* IDirectMusicSegTriggerTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicSegTriggerTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, TrackVtbl); +} + static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); @@ -155,16 +160,22 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_IsParamSuppo return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { @@ -194,16 +205,23 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_SetParamEx ( return S_OK; } -static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD trackgroup, IDirectMusicTrack **track) +{ + IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, + IDirectMusicTrack *newtrack, MUSIC_TIME join, IUnknown *context, DWORD trackgroup, + IDirectMusicTrack **resulttrack) +{ + IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); + TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + trackgroup, resulttrack); + return E_NOTIMPL; } static const IDirectMusicTrack8Vtbl DirectMusicSegTriggerTrack_Track_Vtbl = { @@ -217,14 +235,14 @@ static const IDirectMusicTrack8Vtbl DirectMusicSegTriggerTrack_Track_Vtbl = { IDirectMusicSegTriggerTrack_IDirectMusicTrack_GetParam, IDirectMusicSegTriggerTrack_IDirectMusicTrack_SetParam, IDirectMusicSegTriggerTrack_IDirectMusicTrack_IsParamSupported, - IDirectMusicSegTriggerTrack_IDirectMusicTrack_AddNotificationType, - IDirectMusicSegTriggerTrack_IDirectMusicTrack_RemoveNotificationType, + IDirectMusicTrack8Impl_AddNotificationType, + IDirectMusicTrack8Impl_RemoveNotificationType, IDirectMusicSegTriggerTrack_IDirectMusicTrack_Clone, IDirectMusicSegTriggerTrack_IDirectMusicTrack_PlayEx, IDirectMusicSegTriggerTrack_IDirectMusicTrack_GetParamEx, IDirectMusicSegTriggerTrack_IDirectMusicTrack_SetParamEx, - IDirectMusicSegTriggerTrack_IDirectMusicTrack_Compose, - IDirectMusicSegTriggerTrack_IDirectMusicTrack_Join + IDirectMusicTrack8Impl_Compose, + IDirectMusicTrack8Impl_Join }; /* IDirectMusicSegTriggerTrack IPersistStream part: */ diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 569a61e..104e65c 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -92,6 +92,11 @@ static const IUnknownVtbl DirectMusicTempoTrack_Unknown_Vtbl = { }; /* IDirectMusicTempoTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicTempoTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicTempoTrack, TrackVtbl); +} + static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicTempoTrack, TrackVtbl, iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); @@ -228,16 +233,22 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_IsParamSupported return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicTempoTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicTempoTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { @@ -267,10 +278,13 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_SetParamEx (LPDIR return S_OK; } -static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicTempoTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD trackgroup, IDirectMusicTrack **track) +{ + IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { @@ -290,13 +304,13 @@ static const IDirectMusicTrack8Vtbl DirectMusicTempoTrack_Track_Vtbl = { IDirectMusicTempoTrack_IDirectMusicTrack_GetParam, IDirectMusicTempoTrack_IDirectMusicTrack_SetParam, IDirectMusicTempoTrack_IDirectMusicTrack_IsParamSupported, - IDirectMusicTempoTrack_IDirectMusicTrack_AddNotificationType, - IDirectMusicTempoTrack_IDirectMusicTrack_RemoveNotificationType, + IDirectMusicTrack8Impl_AddNotificationType, + IDirectMusicTrack8Impl_RemoveNotificationType, IDirectMusicTempoTrack_IDirectMusicTrack_Clone, IDirectMusicTempoTrack_IDirectMusicTrack_PlayEx, IDirectMusicTempoTrack_IDirectMusicTrack_GetParamEx, IDirectMusicTempoTrack_IDirectMusicTrack_SetParamEx, - IDirectMusicTempoTrack_IDirectMusicTrack_Compose, + IDirectMusicTrack8Impl_Compose, IDirectMusicTempoTrack_IDirectMusicTrack_Join };

1 0

Sebastian Lackner : ntdll: Implement TpAllocWait and TpReleaseWait.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 4523a54c62191438e97d30a073487235ba14e9af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4523a54c62191438e97d30a07… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 5 02:22:11 2015 +0200 ntdll: Implement TpAllocWait and TpReleaseWait. --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/threadpool.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ce9d1bb..78814cd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -973,6 +973,7 @@ @ stdcall TpAllocCleanupGroup(ptr) @ stdcall TpAllocPool(ptr ptr) @ stdcall TpAllocTimer(ptr ptr ptr ptr) +@ stdcall TpAllocWait(ptr ptr ptr ptr) @ stdcall TpAllocWork(ptr ptr ptr ptr) @ stdcall TpCallbackLeaveCriticalSectionOnCompletion(ptr ptr) @ stdcall TpCallbackMayRunLong(ptr) @@ -987,6 +988,7 @@ @ stdcall TpReleaseCleanupGroupMembers(ptr long ptr) @ stdcall TpReleasePool(ptr) @ stdcall TpReleaseTimer(ptr) +@ stdcall TpReleaseWait(ptr) @ stdcall TpReleaseWork(ptr) @ stdcall TpSetPoolMaxThreads(ptr long) @ stdcall TpSetPoolMinThreads(ptr long) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index ef502ba..b9aece4 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -159,7 +159,8 @@ enum threadpool_objtype { TP_OBJECT_TYPE_SIMPLE, TP_OBJECT_TYPE_WORK, - TP_OBJECT_TYPE_TIMER + TP_OBJECT_TYPE_TIMER, + TP_OBJECT_TYPE_WAIT }; /* internal threadpool object representation */ @@ -209,6 +210,10 @@ struct threadpool_object LONG period; LONG window_length; } timer; + struct + { + PTP_WAIT_CALLBACK callback; + } wait; } u; }; @@ -286,6 +291,13 @@ static inline struct threadpool_object *impl_from_TP_TIMER( TP_TIMER *timer ) return object; } +static inline struct threadpool_object *impl_from_TP_WAIT( TP_WAIT *wait ) +{ + struct threadpool_object *object = (struct threadpool_object *)wait; + assert( object->type == TP_OBJECT_TYPE_WAIT ); + return object; +} + static inline struct threadpool_group *impl_from_TP_CLEANUP_GROUP( TP_CLEANUP_GROUP *group ) { return (struct threadpool_group *)group; @@ -1907,6 +1919,15 @@ static void CALLBACK threadpool_worker_proc( void *param ) break; } + case TP_OBJECT_TYPE_WAIT: + { + TRACE( "executing wait callback %p(%p, %p, %p, %u)\n", + object->u.wait.callback, callback_instance, object->userdata, object, WAIT_OBJECT_0 ); + object->u.wait.callback( callback_instance, object->userdata, (TP_WAIT *)object, WAIT_OBJECT_0 ); + TRACE( "callback %p returned\n", object->u.wait.callback ); + break; + } + default: assert(0); break; @@ -2052,6 +2073,37 @@ NTSTATUS WINAPI TpAllocTimer( TP_TIMER **out, PTP_TIMER_CALLBACK callback, PVOID } /*********************************************************************** + * TpAllocWait (NTDLL.@) + */ +NTSTATUS WINAPI TpAllocWait( TP_WAIT **out, PTP_WAIT_CALLBACK callback, PVOID userdata, + TP_CALLBACK_ENVIRON *environment ) +{ + struct threadpool_object *object; + struct threadpool *pool; + NTSTATUS status; + + TRACE( "%p %p %p %p\n", out, callback, userdata, environment ); + + object = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*object) ); + if (!object) + return STATUS_NO_MEMORY; + + status = tp_threadpool_lock( &pool, environment ); + if (status) + { + RtlFreeHeap( GetProcessHeap(), 0, object ); + return status; + } + + object->type = TP_OBJECT_TYPE_WAIT; + object->u.wait.callback = callback; + tp_object_initialize( object, pool, userdata, environment ); + + *out = (TP_WAIT *)object; + return STATUS_SUCCESS; +} + +/*********************************************************************** * TpAllocWork (NTDLL.@) */ NTSTATUS WINAPI TpAllocWork( TP_WORK **out, PTP_WORK_CALLBACK callback, PVOID userdata, @@ -2356,6 +2408,19 @@ VOID WINAPI TpReleaseTimer( TP_TIMER *timer ) } /*********************************************************************** + * TpReleaseWait (NTDLL.@) + */ +VOID WINAPI TpReleaseWait( TP_WAIT *wait ) +{ + struct threadpool_object *this = impl_from_TP_WAIT( wait ); + + TRACE( "%p\n", wait ); + + tp_object_shutdown( this ); + tp_object_release( this ); +} + +/*********************************************************************** * TpReleaseWork (NTDLL.@) */ VOID WINAPI TpReleaseWork( TP_WORK *work )

1 0

Sebastian Lackner : ntdll: Implement threadpool wait queues.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: f1be5dcac07b40bec3d0914110ce9372c0b50b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1be5dcac07b40bec3d091411… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 5 02:22:52 2015 +0200 ntdll: Implement threadpool wait queues. To implement waiting for an arbitrary number of handles, we group them in buckets up to (MAXIMUM_WAIT_OBJECTS - 1) objects, and then assign a dedicated wait queue thread. The last handle is used to notify about changes. --- dlls/ntdll/threadpool.c | 290 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 282 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1be5dcac07b40bec3d09…

1 0