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

Nikolay Sivov : dwrite: Reset calculated text height before updating it.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 8b566b1da71a412fe58c3cc1988d610c2aba5f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b566b1da71a412fe58c3cc19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 3 11:01:12 2015 +0300 dwrite: Reset calculated text height before updating it. --- dlls/dwrite/layout.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index fbd7df0..980eff5 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1215,6 +1215,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) layout->metrics.left = layout->metrics.top = 0.0; layout->metrics.maxBidiReorderingDepth = 1; /* FIXME */ layout->metrics.lineCount = layout->line_count; + layout->metrics.height = 0.0; /* Now all line info is here, update effective runs positions in flow direction */ erun = layout_get_next_erun(layout, NULL);

1 0

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

03 Jul '15

Module: wine Branch: master Commit: 1165cc095359d64c6ef3d63f3a1511afe9f09aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1165cc095359d64c6ef3d63f3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 3 01:59:38 2015 +0200 kernel32: Forward threadpool work functions to ntdll. --- dlls/kernel32/kernel32.spec | 8 ++++---- dlls/kernel32/thread.c | 21 +++++++++++++++++++++ include/winternl.h | 4 ++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b48ea3b..882013c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -234,7 +234,7 @@ # @ stub CloseThreadpoolIo # @ stub CloseThreadpoolTimer # @ stub CloseThreadpoolWait -# @ stub CloseThreadpoolWork +@ stdcall CloseThreadpoolWork(ptr) ntdll.TpReleaseWork @ stdcall CmdBatNotification(long) @ stdcall CommConfigDialogA(str long ptr) @ stdcall CommConfigDialogW(wstr long ptr) @@ -336,7 +336,7 @@ # @ stub CreateThreadpoolIo # @ stub CreateThreadpoolTimer # @ stub CreateThreadpoolWait -# @ stub CreateThreadpoolWork +@ stdcall CreateThreadpoolWork(ptr ptr ptr) @ stdcall CreateTimerQueue () @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateToolhelp32Snapshot(long long) @@ -1482,7 +1482,7 @@ # @ stub SortCloseHandle # @ stub SortGetHandle # @ stub StartThreadpoolIo -# @ stub SubmitThreadpoolWork +@ stdcall SubmitThreadpoolWork(ptr) ntdll.TpPostWork @ stdcall SuspendThread(long) @ stdcall SwitchToFiber(ptr) @ stdcall SwitchToThread() @@ -1573,7 +1573,7 @@ # @ stub WaitForThreadpoolIoCallbacks # @ stub WaitForThreadpoolTimerCallbacks # @ stub WaitForThreadpoolWaitCallbacks -# @ stub WaitForThreadpoolWorkCallbacks +@ stdcall WaitForThreadpoolWorkCallbacks(ptr long) ntdll.TpWaitForWork @ stdcall WaitNamedPipeA (str long) @ stdcall WaitNamedPipeW (wstr long) @ stdcall WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index b2b9def..313295c 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -880,3 +880,24 @@ PTP_CLEANUP_GROUP WINAPI CreateThreadpoolCleanupGroup( void ) return group; } + +/*********************************************************************** + * CreateThreadpoolWork (KERNEL32.@) + */ +PTP_WORK WINAPI CreateThreadpoolWork( PTP_WORK_CALLBACK callback, PVOID userdata, + TP_CALLBACK_ENVIRON *environment ) +{ + TP_WORK *work; + NTSTATUS status; + + TRACE( "%p, %p, %p\n", callback, userdata, environment ); + + status = TpAllocWork( &work, callback, userdata, environment ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return NULL; + } + + return work; +} diff --git a/include/winternl.h b/include/winternl.h index c918e09..ab8de5e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2619,8 +2619,12 @@ NTSYSAPI NTSTATUS WINAPI RtlLargeIntegerToChar(const ULONGLONG *,ULONG,ULONG,PC /* Threadpool functions */ NTSYSAPI NTSTATUS WINAPI TpAllocCleanupGroup(TP_CLEANUP_GROUP **); +NTSYSAPI NTSTATUS WINAPI TpAllocWork(TP_WORK **,PTP_WORK_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); +NTSYSAPI void WINAPI TpPostWork(TP_WORK *); NTSYSAPI void WINAPI TpReleaseCleanupGroup(TP_CLEANUP_GROUP *); NTSYSAPI void WINAPI TpReleaseCleanupGroupMembers(TP_CLEANUP_GROUP *,BOOL,PVOID); +NTSYSAPI void WINAPI TpReleaseWork(TP_WORK *); +NTSYSAPI void WINAPI TpWaitForWork(TP_WORK *,BOOL); /* Wine internal functions */

1 0

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

03 Jul '15

Module: wine Branch: master Commit: 4b0ecd3e22b0187ebb6c1f86c51518d85545ac92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b0ecd3e22b0187ebb6c1f86c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 3 01:59:55 2015 +0200 kernel32: Forward threadpool timer functions to ntdll. --- dlls/kernel32/kernel32.spec | 10 +++++----- dlls/kernel32/thread.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 5 +++++ 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 882013c..3d3a68b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -232,7 +232,7 @@ @ stdcall CloseThreadpoolCleanupGroup(ptr) ntdll.TpReleaseCleanupGroup @ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) ntdll.TpReleaseCleanupGroupMembers # @ stub CloseThreadpoolIo -# @ stub CloseThreadpoolTimer +@ stdcall CloseThreadpoolTimer(ptr) ntdll.TpReleaseTimer # @ stub CloseThreadpoolWait @ stdcall CloseThreadpoolWork(ptr) ntdll.TpReleaseWork @ stdcall CmdBatNotification(long) @@ -334,7 +334,7 @@ # @ stub CreateThreadpool @ stdcall CreateThreadpoolCleanupGroup() # @ stub CreateThreadpoolIo -# @ stub CreateThreadpoolTimer +@ stdcall CreateThreadpoolTimer(ptr ptr ptr) # @ stub CreateThreadpoolWait @ stdcall CreateThreadpoolWork(ptr ptr ptr) @ stdcall CreateTimerQueue () @@ -981,7 +981,7 @@ @ stub -i386 IsSLCallback @ stdcall IsSystemResumeAutomatic() @ stdcall IsThreadAFiber() -# @ stub IsThreadpoolTimerSet +@ stdcall IsThreadpoolTimerSet(ptr) ntdll.TpIsTimerSet # @ stub IsTimeZoneRedirectionEnabled # @ stub IsValidCalDateTime @ stdcall IsValidCodePage(long) @@ -1456,7 +1456,7 @@ # @ stub SetThreadpoolStackInformation # @ stub SetThreadpoolThreadMaximum # @ stub SetThreadpoolThreadMinimum -# @ stub SetThreadpoolTimer +@ stdcall SetThreadpoolTimer(ptr ptr long long) # @ stub SetThreadpoolWait @ stdcall SetTimeZoneInformation(ptr) @ stub SetTimerQueueTimer @@ -1571,7 +1571,7 @@ @ stdcall WaitForSingleObject(long long) @ stdcall WaitForSingleObjectEx(long long long) # @ stub WaitForThreadpoolIoCallbacks -# @ stub WaitForThreadpoolTimerCallbacks +@ stdcall WaitForThreadpoolTimerCallbacks(ptr long) ntdll.TpWaitForTimer # @ stub WaitForThreadpoolWaitCallbacks @ stdcall WaitForThreadpoolWorkCallbacks(ptr long) ntdll.TpWaitForWork @ stdcall WaitNamedPipeA (str long) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 313295c..1ca0945 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -882,6 +882,27 @@ PTP_CLEANUP_GROUP WINAPI CreateThreadpoolCleanupGroup( void ) } /*********************************************************************** + * CreateThreadpoolTimer (KERNEL32.@) + */ +PTP_TIMER WINAPI CreateThreadpoolTimer( PTP_TIMER_CALLBACK callback, PVOID userdata, + TP_CALLBACK_ENVIRON *environment ) +{ + TP_TIMER *timer; + NTSTATUS status; + + TRACE( "%p, %p, %p\n", callback, userdata, environment ); + + status = TpAllocTimer( &timer, callback, userdata, environment ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return NULL; + } + + return timer; +} + +/*********************************************************************** * CreateThreadpoolWork (KERNEL32.@) */ PTP_WORK WINAPI CreateThreadpoolWork( PTP_WORK_CALLBACK callback, PVOID userdata, @@ -901,3 +922,22 @@ PTP_WORK WINAPI CreateThreadpoolWork( PTP_WORK_CALLBACK callback, PVOID userdata return work; } + +/*********************************************************************** + * SetThreadpoolTimer (KERNEL32.@) + */ +VOID WINAPI SetThreadpoolTimer( TP_TIMER *timer, FILETIME *due_time, + DWORD period, DWORD window_length ) +{ + LARGE_INTEGER timeout; + + TRACE( "%p, %p, %u, %u\n", timer, due_time, period, window_length ); + + if (due_time) + { + timeout.u.LowPart = due_time->dwLowDateTime; + timeout.u.HighPart = due_time->dwHighDateTime; + } + + TpSetTimer( timer, due_time ? &timeout : NULL, period, window_length ); +} diff --git a/include/winternl.h b/include/winternl.h index ab8de5e..ab64a71 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2619,11 +2619,16 @@ NTSYSAPI NTSTATUS WINAPI RtlLargeIntegerToChar(const ULONGLONG *,ULONG,ULONG,PC /* Threadpool functions */ NTSYSAPI NTSTATUS WINAPI TpAllocCleanupGroup(TP_CLEANUP_GROUP **); +NTSYSAPI NTSTATUS WINAPI TpAllocTimer(TP_TIMER **,PTP_TIMER_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); NTSYSAPI NTSTATUS WINAPI TpAllocWork(TP_WORK **,PTP_WORK_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); +NTSYSAPI BOOL WINAPI TpIsTimerSet(TP_TIMER *); NTSYSAPI void WINAPI TpPostWork(TP_WORK *); NTSYSAPI void WINAPI TpReleaseCleanupGroup(TP_CLEANUP_GROUP *); NTSYSAPI void WINAPI TpReleaseCleanupGroupMembers(TP_CLEANUP_GROUP *,BOOL,PVOID); +NTSYSAPI void WINAPI TpReleaseTimer(TP_TIMER *); NTSYSAPI void WINAPI TpReleaseWork(TP_WORK *); +NTSYSAPI void WINAPI TpSetTimer(TP_TIMER *, LARGE_INTEGER *,LONG,LONG); +NTSYSAPI void WINAPI TpWaitForTimer(TP_TIMER *,BOOL); NTSYSAPI void WINAPI TpWaitForWork(TP_WORK *,BOOL); /* Wine internal functions */

1 0

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

03 Jul '15

Module: wine Branch: master Commit: 56b9af1150b706ed410f0bb0836f72cf6d9e8a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b9af1150b706ed410f0bb08… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 3 02:00:14 2015 +0200 kernel32: Forward threadpool instance functions to ntdll. --- dlls/kernel32/kernel32.spec | 14 +++++++------- dlls/kernel32/thread.c | 19 +++++++++++++++++++ include/winternl.h | 7 +++++++ 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3d3a68b..0825bdb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -204,7 +204,7 @@ @ stdcall BuildCommDCBAndTimeoutsA(str ptr ptr) @ stdcall BuildCommDCBAndTimeoutsW(wstr ptr ptr) @ stdcall BuildCommDCBW(wstr ptr) -# @ stub CallbackMayRunLong +@ stdcall CallbackMayRunLong(ptr) @ stdcall CallNamedPipeA(str ptr long ptr long ptr long) @ stdcall CallNamedPipeW(wstr ptr long ptr long ptr long) @ stub CancelDeviceWakeupRequest @@ -369,7 +369,7 @@ @ stdcall DeleteFileW(wstr) # @ stub DeleteProcThreadAttributeList # @ stub DisableThreadProfiling -# @ stub DisassociateCurrentThreadFromCallback +@ stdcall DisassociateCurrentThreadFromCallback(ptr) ntdll.TpDisassociateCallback @ stdcall DeleteTimerQueue(long) @ stdcall DeleteTimerQueueEx (long long) @ stdcall DeleteTimerQueueTimer(long long long) @@ -495,7 +495,6 @@ @ stdcall FindFirstVolumeMountPointA(str ptr long) @ stdcall FindFirstVolumeMountPointW(wstr ptr long) @ stdcall FindFirstVolumeW(ptr long) -# @ stub FreeLibraryWhenCallbackReturns @ stdcall FindNextChangeNotification(long) @ stdcall FindNextFileA(long ptr) # @ stub FindNextFileNameW @@ -533,6 +532,7 @@ @ stub -i386 FreeLSCallback @ stdcall FreeLibrary(long) @ stdcall FreeLibraryAndExitThread(long long) +@ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) ntdll.TpCallbackUnloadDllOnCompletion @ stdcall FreeResource(long) @ stdcall -i386 -private FreeSLCallback(long) krnl386.exe16.FreeSLCallback @ stub FreeUserPhysicalPages @@ -1035,7 +1035,7 @@ @ stdcall LZSeek(long long long) @ stdcall LZStart() @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection -# @ stub LeaveCriticalSectionWhenCallbackReturns +@ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) ntdll.TpCallbackLeaveCriticalSectionOnCompletion # @ stub LoadAppInitDlls @ stdcall LoadLibraryA(str) @ stdcall LoadLibraryExA( str long long) @@ -1252,9 +1252,9 @@ @ stdcall ReinitializeCriticalSection(ptr) @ stdcall ReleaseActCtx(ptr) @ stdcall ReleaseMutex(long) -# @ stub ReleaseMutexWhenCallbackReturns +@ stdcall ReleaseMutexWhenCallbackReturns(ptr long) ntdll.TpCallbackReleaseMutexOnCompletion @ stdcall ReleaseSemaphore(long long ptr) -# @ stub ReleaseSemaphoreWhenCallbackReturns +@ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) ntdll.TpCallbackReleaseSemaphoreOnCompletion @ stdcall ReleaseSRWLockExclusive(ptr) ntdll.RtlReleaseSRWLockExclusive @ stdcall ReleaseSRWLockShared(ptr) ntdll.RtlReleaseSRWLockShared @ stdcall RemoveDirectoryA(str) @@ -1385,7 +1385,7 @@ @ stdcall SetEnvironmentVariableW(wstr wstr) @ stdcall SetErrorMode(long) @ stdcall SetEvent(long) -# @ stub SetEventWhenCallbackReturns +@ stdcall SetEventWhenCallbackReturns(ptr long) ntdll.TpCallbackSetEventOnCompletion @ stdcall SetFileApisToANSI() @ stdcall SetFileApisToOEM() @ stdcall SetFileAttributesA(str long) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 1ca0945..c8e906d 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -862,6 +862,25 @@ BOOL WINAPI GetThreadPreferredUILanguages( DWORD flags, PULONG count, PCZZWSTR b } /*********************************************************************** + * CallbackMayRunLong (KERNEL32.@) + */ +BOOL WINAPI CallbackMayRunLong( TP_CALLBACK_INSTANCE *instance ) +{ + NTSTATUS status; + + TRACE( "%p\n", instance ); + + status = TpCallbackMayRunLong( instance ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + + return TRUE; +} + +/*********************************************************************** * CreateThreadpoolCleanupGroup (KERNEL32.@) */ PTP_CLEANUP_GROUP WINAPI CreateThreadpoolCleanupGroup( void ) diff --git a/include/winternl.h b/include/winternl.h index ab64a71..5b07994 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2621,6 +2621,13 @@ NTSYSAPI NTSTATUS WINAPI RtlLargeIntegerToChar(const ULONGLONG *,ULONG,ULONG,PC NTSYSAPI NTSTATUS WINAPI TpAllocCleanupGroup(TP_CLEANUP_GROUP **); NTSYSAPI NTSTATUS WINAPI TpAllocTimer(TP_TIMER **,PTP_TIMER_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 *); +NTSYSAPI void WINAPI TpCallbackReleaseMutexOnCompletion(TP_CALLBACK_INSTANCE *,HANDLE); +NTSYSAPI void WINAPI TpCallbackReleaseSemaphoreOnCompletion(TP_CALLBACK_INSTANCE *,HANDLE,DWORD); +NTSYSAPI void WINAPI TpCallbackSetEventOnCompletion(TP_CALLBACK_INSTANCE *,HANDLE); +NTSYSAPI void WINAPI TpCallbackUnloadDllOnCompletion(TP_CALLBACK_INSTANCE *,HMODULE); +NTSYSAPI void WINAPI TpDisassociateCallback(TP_CALLBACK_INSTANCE *); NTSYSAPI BOOL WINAPI TpIsTimerSet(TP_TIMER *); NTSYSAPI void WINAPI TpPostWork(TP_WORK *); NTSYSAPI void WINAPI TpReleaseCleanupGroup(TP_CLEANUP_GROUP *);

1 0

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

03 Jul '15

Module: wine Branch: master Commit: eadd27a38a218e6ab27404d2981f3fe521f13361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eadd27a38a218e6ab27404d29… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 3 02:00:31 2015 +0200 kernel32: Forward remaining threadpool functions to ntdll. --- dlls/kernel32/kernel32.spec | 10 +++++----- dlls/kernel32/tests/thread.c | 6 +++--- dlls/kernel32/thread.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 5 +++++ 4 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0825bdb..a14d03b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -228,7 +228,7 @@ # @ stub ClosePrivateNamespace @ stdcall CloseProfileUserMapping() @ stub CloseSystemHandle -# @ stub CloseThreadpool +@ stdcall CloseThreadpool(ptr) ntdll.TpReleasePool @ stdcall CloseThreadpoolCleanupGroup(ptr) ntdll.TpReleaseCleanupGroup @ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) ntdll.TpReleaseCleanupGroupMembers # @ stub CloseThreadpoolIo @@ -331,7 +331,7 @@ @ stdcall CreateSymbolicLinkW(wstr wstr long) @ stdcall CreateTapePartition(long long long long) @ stdcall CreateThread(ptr long ptr long long ptr) -# @ stub CreateThreadpool +@ stdcall CreateThreadpool(ptr) @ stdcall CreateThreadpoolCleanupGroup() # @ stub CreateThreadpoolIo @ stdcall CreateThreadpoolTimer(ptr ptr ptr) @@ -1454,8 +1454,8 @@ # @ stub SetThreadToken @ stdcall SetThreadUILanguage(long) # @ stub SetThreadpoolStackInformation -# @ stub SetThreadpoolThreadMaximum -# @ stub SetThreadpoolThreadMinimum +@ stdcall SetThreadpoolThreadMaximum(ptr long) ntdll.TpSetPoolMaxThreads +@ stdcall SetThreadpoolThreadMinimum(ptr long) ntdll.TpSetPoolMinThreads @ stdcall SetThreadpoolTimer(ptr ptr long long) # @ stub SetThreadpoolWait @ stdcall SetTimeZoneInformation(ptr) @@ -1509,7 +1509,7 @@ @ stdcall TryAcquireSRWLockExclusive(ptr) ntdll.RtlTryAcquireSRWLockExclusive @ stdcall TryAcquireSRWLockShared(ptr) ntdll.RtlTryAcquireSRWLockShared @ stdcall TryEnterCriticalSection(ptr) ntdll.RtlTryEnterCriticalSection -# @ stub TrySubmitThreadpoolCallback +@ stdcall TrySubmitThreadpoolCallback(ptr ptr ptr) @ stdcall TzSpecificLocalTimeToSystemTime(ptr ptr ptr) # @ stub TzSpecificLocalTimeToSystemTimeEx # @ stub -arch=x86_64 uaw_lstrcmpW diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index d3ecd2a..25801b2 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1627,8 +1627,8 @@ static void test_threadpool(void) int workcalled = 0; if (!pCreateThreadpool) { - todo_wine win_skip("thread pool apis not supported.\n"); - return; + win_skip("thread pool apis not supported.\n"); + return; } work = pCreateThreadpoolWork(threadpool_workcallback, &workcalled, NULL); @@ -1640,7 +1640,7 @@ static void test_threadpool(void) ok (workcalled == 1, "expected work to be called once, got %d\n", workcalled); pool = pCreateThreadpool(NULL); - todo_wine ok (pool != NULL, "CreateThreadpool failed\n"); + ok (pool != NULL, "CreateThreadpool failed\n"); } static void test_reserved_tls(void) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index c8e906d..21ec276 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -881,6 +881,26 @@ BOOL WINAPI CallbackMayRunLong( TP_CALLBACK_INSTANCE *instance ) } /*********************************************************************** + * CreateThreadpool (KERNEL32.@) + */ +PTP_POOL WINAPI CreateThreadpool( PVOID reserved ) +{ + TP_POOL *pool; + NTSTATUS status; + + TRACE( "%p\n", reserved ); + + status = TpAllocPool( &pool, reserved ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return NULL; + } + + return pool; +} + +/*********************************************************************** * CreateThreadpoolCleanupGroup (KERNEL32.@) */ PTP_CLEANUP_GROUP WINAPI CreateThreadpoolCleanupGroup( void ) @@ -960,3 +980,23 @@ VOID WINAPI SetThreadpoolTimer( TP_TIMER *timer, FILETIME *due_time, TpSetTimer( timer, due_time ? &timeout : NULL, period, window_length ); } + +/*********************************************************************** + * TrySubmitThreadpoolCallback (KERNEL32.@) + */ +BOOL WINAPI TrySubmitThreadpoolCallback( PTP_SIMPLE_CALLBACK callback, PVOID userdata, + TP_CALLBACK_ENVIRON *environment ) +{ + NTSTATUS status; + + TRACE( "%p, %p, %p\n", callback, userdata, environment ); + + status = TpSimpleTryPost( callback, userdata, environment ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + + return TRUE; +} diff --git a/include/winternl.h b/include/winternl.h index 5b07994..e1707fd 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2619,6 +2619,7 @@ NTSYSAPI NTSTATUS WINAPI RtlLargeIntegerToChar(const ULONGLONG *,ULONG,ULONG,PC /* Threadpool functions */ 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 TpAllocWork(TP_WORK **,PTP_WORK_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); NTSYSAPI void WINAPI TpCallbackLeaveCriticalSectionOnCompletion(TP_CALLBACK_INSTANCE *,RTL_CRITICAL_SECTION *); @@ -2632,9 +2633,13 @@ NTSYSAPI BOOL WINAPI TpIsTimerSet(TP_TIMER *); NTSYSAPI void WINAPI TpPostWork(TP_WORK *); 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 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 NTSTATUS WINAPI TpSimpleTryPost(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); NTSYSAPI void WINAPI TpWaitForTimer(TP_TIMER *,BOOL); NTSYSAPI void WINAPI TpWaitForWork(TP_WORK *,BOOL);

1 0

Sebastian Lackner : kernel32/tests: Fix leak of threadpool object.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: d2a3c9c20ef25e399046ce21d3b9d75e97702905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a3c9c20ef25e399046ce21d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 3 02:00:59 2015 +0200 kernel32/tests: Fix leak of threadpool object. --- dlls/kernel32/tests/thread.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 25801b2..35e978e 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -86,6 +86,7 @@ static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); static void (WINAPI *pReleaseActCtx)(HANDLE); static PTP_POOL (WINAPI *pCreateThreadpool)(PVOID); +static void (WINAPI *pCloseThreadpool)(PTP_POOL); static PTP_WORK (WINAPI *pCreateThreadpoolWork)(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); static void (WINAPI *pSubmitThreadpoolWork)(PTP_WORK); static void (WINAPI *pWaitForThreadpoolWorkCallbacks)(PTP_WORK,BOOL); @@ -1641,6 +1642,7 @@ static void test_threadpool(void) pool = pCreateThreadpool(NULL); ok (pool != NULL, "CreateThreadpool failed\n"); + pCloseThreadpool(pool); } static void test_reserved_tls(void) @@ -1705,6 +1707,7 @@ static void init_funcs(void) X(ReleaseActCtx); X(CreateThreadpool); + X(CloseThreadpool); X(CreateThreadpoolWork); X(SubmitThreadpoolWork); X(WaitForThreadpoolWorkCallbacks);

1 0

Matteo Bruni : wined3d: Fix GLSL backend with non-GLSL vertex and pixel pipeline combination.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 93c88d34a8a7e9aa1ff9c20626e9580948c07e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c88d34a8a7e9aa1ff9c2062… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 2 17:41:31 2015 +0200 wined3d: Fix GLSL backend with non-GLSL vertex and pixel pipeline combination. That can only happen by manually modifying select_vertex_implementation() and select_fragment_implementation(), which may be useful for testing non-default vertex / fragment pipeline implementations. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1f6ce09..54922e1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6584,7 +6584,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const WORD attribs_map; struct wined3d_string_buffer *tmp_name; - if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_VERTEX))) + if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_VERTEX)) && ctx_data->glsl_program) { vs_id = ctx_data->glsl_program->vs.id; vs_list = &ctx_data->glsl_program->vs.shader_entry; @@ -6624,7 +6624,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const vs_list = &ffp_shader->linked_programs; } - if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_PIXEL))) + if (!(context->shader_update_mask & (1 << WINED3D_SHADER_TYPE_PIXEL)) && ctx_data->glsl_program) { ps_id = ctx_data->glsl_program->ps.id; ps_list = &ctx_data->glsl_program->ps.shader_entry;

1 0

Matteo Bruni : wined3d: Replace an open-coded implementation of LIST_FOR_EACH_ENTRY_SAFE.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 30031f6da48ac76fdb9f4c400b5091177e910165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30031f6da48ac76fdb9f4c400… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 2 17:41:32 2015 +0200 wined3d: Replace an open-coded implementation of LIST_FOR_EACH_ENTRY_SAFE. --- dlls/wined3d/shader.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5b32528..e9be51e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -409,16 +409,10 @@ static unsigned int shader_get_float_offset(enum wined3d_shader_register_type re static void shader_delete_constant_list(struct list *clist) { - struct wined3d_shader_lconst *constant; - struct list *ptr; + struct wined3d_shader_lconst *constant, *constant_next; - ptr = list_head(clist); - while (ptr) - { - constant = LIST_ENTRY(ptr, struct wined3d_shader_lconst, entry); - ptr = list_next(clist, ptr); + LIST_FOR_EACH_ENTRY_SAFE(constant, constant_next, clist, struct wined3d_shader_lconst, entry) HeapFree(GetProcessHeap(), 0, constant); - } list_init(clist); } @@ -2046,6 +2040,11 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b TRACE("shader %p, byte_code %p, output_signature %p, float_const_count %u.\n", shader, byte_code, output_signature, float_const_count); + list_init(&shader->constantsF); + list_init(&shader->constantsB); + list_init(&shader->constantsI); + shader->lconst_inf_or_nan = FALSE; + fe = shader_select_frontend(*byte_code); if (!fe) { @@ -2064,12 +2063,6 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b if (TRACE_ON(d3d_shader)) shader_trace_init(fe, shader->frontend_data, byte_code); - /* Initialize immediate constant lists. */ - list_init(&shader->constantsF); - list_init(&shader->constantsB); - list_init(&shader->constantsI); - shader->lconst_inf_or_nan = FALSE; - /* Second pass: figure out which registers are used, what the semantics are, etc. */ if (FAILED(hr = shader_get_registers_used(shader, fe, reg_maps, &shader->input_signature, &shader->output_signature, byte_code, float_const_count)))

1 0

Matteo Bruni : wined3d: Fix NP2 fixups in GLSL fragment FFP replacement.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: a8fb1eee49476bcc71458a2ab8a8458a588b9762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8fb1eee49476bcc71458a2ab… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 2 17:41:33 2015 +0200 wined3d: Fix NP2 fixups in GLSL fragment FFP replacement. --- dlls/wined3d/glsl_shader.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 54922e1..06afa65 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7858,6 +7858,31 @@ static void glsl_vertex_pipe_texmatrix(struct wined3d_context *context, context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_TEXMATRIX; } +static void glsl_vertex_pipe_texmatrix_np2(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + DWORD sampler = state_id - STATE_SAMPLER(0); + const struct wined3d_texture *texture = state->textures[sampler]; + BOOL np2; + + if (!texture) + return; + + if (sampler >= MAX_TEXTURES) + return; + + if ((np2 = !(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) + || context->lastWasPow2Texture & (1 << sampler)) + { + if (np2) + context->lastWasPow2Texture |= 1 << sampler; + else + context->lastWasPow2Texture &= ~(1 << sampler); + + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_TEXMATRIX; + } +} + static void glsl_vertex_pipe_material(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -7996,28 +8021,28 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = * matrix. */ {STATE_SAMPLER(0), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(0), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(0), {STATE_SAMPLER(0), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(0), {STATE_SAMPLER(0), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(1), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(1), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(1), {STATE_SAMPLER(1), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(1), {STATE_SAMPLER(1), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(2), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(2), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(2), {STATE_SAMPLER(2), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(2), {STATE_SAMPLER(2), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(3), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(3), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(3), {STATE_SAMPLER(3), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(3), {STATE_SAMPLER(3), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(4), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(4), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(4), {STATE_SAMPLER(4), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(4), {STATE_SAMPLER(4), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(5), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(5), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(5), {STATE_SAMPLER(5), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(5), {STATE_SAMPLER(5), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(6), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(6), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(6), {STATE_SAMPLER(6), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(6), {STATE_SAMPLER(6), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(7), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(7), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(7), {STATE_SAMPLER(7), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(7), {STATE_SAMPLER(7), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_POINT_ENABLE, {STATE_POINT_ENABLE, glsl_vertex_pipe_shader}, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, {0, NULL }, WINED3D_GL_EXT_NONE }, };

1 0

Matteo Bruni : wined3d: Improve NP2 fixups in GLSL PS texture sampling code.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 4f575813100de1ab397f7ed3079ae2a7f0aa29d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f575813100de1ab397f7ed30… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 2 17:41:34 2015 +0200 wined3d: Improve NP2 fixups in GLSL PS texture sampling code. --- dlls/wined3d/glsl_shader.c | 57 ++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 06afa65..15cf873 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2710,13 +2710,8 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; fixup = priv->cur_ps_args->color_fixup[sampler]; - if(priv->cur_ps_args->np2_fixup & (1 << sampler)) { - if(bias) { - FIXME("Biased sampling from NP2 textures is unsupported\n"); - } else { - np2_fixup = TRUE; - } - } + if (priv->cur_ps_args->np2_fixup & (1 << sampler)) + np2_fixup = TRUE; } else { @@ -2739,25 +2734,42 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s break; } - if(bias) { - shader_addline(ins->ctx->buffer, ", %s)%s);\n", bias, dst_swizzle); - } else { - if (np2_fixup) { - const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; - const unsigned char idx = priv->cur_np2fixup_info->idx[sampler]; - - shader_addline(ins->ctx->buffer, " * ps_samplerNP2Fixup[%u].%s)%s);\n", idx >> 1, - (idx % 2) ? "zw" : "xy", dst_swizzle); - } else if(dx && dy) { - shader_addline(ins->ctx->buffer, ", %s, %s)%s);\n", dx, dy, dst_swizzle); - } else { - shader_addline(ins->ctx->buffer, ")%s);\n", dst_swizzle); + if (np2_fixup) + { + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const unsigned char idx = priv->cur_np2fixup_info->idx[sampler]; + + switch (shader_glsl_get_write_mask_size(sample_function->coord_mask)) + { + case 1: + shader_addline(ins->ctx->buffer, " * ps_samplerNP2Fixup[%u].%s", + idx >> 1, (idx % 2) ? "z" : "x"); + break; + case 2: + shader_addline(ins->ctx->buffer, " * ps_samplerNP2Fixup[%u].%s", + idx >> 1, (idx % 2) ? "zw" : "xy"); + break; + case 3: + shader_addline(ins->ctx->buffer, " * vec3(ps_samplerNP2Fixup[%u].%s, 1.0)", + idx >> 1, (idx % 2) ? "zw" : "xy"); + break; + case 4: + shader_addline(ins->ctx->buffer, " * vec4(ps_samplerNP2Fixup[%u].%s, 1.0, 1.0)", + idx >> 1, (idx % 2) ? "zw" : "xy"); + break; } } + if (dx && dy) + shader_addline(ins->ctx->buffer, ", %s, %s)", dx, dy); + else if (bias) + shader_addline(ins->ctx->buffer, ", %s)", bias); + else + shader_addline(ins->ctx->buffer, ")"); - if(!is_identity_fixup(fixup)) { + shader_addline(ins->ctx->buffer, "%s);\n", dst_swizzle); + + if (!is_identity_fixup(fixup)) shader_glsl_color_correction(ins, fixup); - } } /***************************************************************************** @@ -3989,6 +4001,7 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) shader_glsl_get_sample_function(ins->ctx, resource_idx, sample_flags, &sample_function); mask |= sample_function.coord_mask; + sample_function.coord_mask = mask; if (shader_version < WINED3D_SHADER_VERSION(2,0)) swizzle = WINED3DSP_NOSWIZZLE; else swizzle = ins->src[1].swizzle;

1 0