Module: wine Branch: master Commit: 5fb502b06e60ce58a6def812e1cf0b25d6d4ff8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb502b06e60ce58a6def812e1...
Author: Daniel Lehman dlehman@esri.com Date: Fri Mar 31 14:07:03 2017 -0700
msvcp140: Add __crtWaitForThreadpoolTimerCallbacks.
Signed-off-by: Daniel Lehman dlehman@esri.com Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 1b5bdcb..c32514a 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3778,6 +3778,6 @@ @ stub __crtSetFileInformationByHandle @ cdecl __crtSetThreadpoolTimer(ptr ptr long long) MSVCP__crtSetThreadpoolTimer @ cdecl __crtSetThreadpoolWait(ptr long ptr) MSVCP__crtSetThreadpoolWait -@ stub __crtWaitForThreadpoolTimerCallbacks +@ cdecl __crtWaitForThreadpoolTimerCallbacks(ptr long) MSVCP__crtWaitForThreadpoolTimerCallbacks @ stub __set_stl_sync_api_mode @ cdecl xtime_get(ptr long) xtime_get diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ac23c2b..7b97b5c 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1296,6 +1296,15 @@ VOID CDECL MSVCP__crtSetThreadpoolTimer(TP_TIMER *timer, }
/********************************************************************* + * __crtWaitForThreadpoolTimerCallbacks (MSVCP140.@) + */ +VOID CDECL MSVCP__crtWaitForThreadpoolTimerCallbacks(TP_TIMER *timer, BOOL cancel) +{ + TRACE("(%p %d)\n", timer, cancel); + WaitForThreadpoolTimerCallbacks(timer, cancel); +} + +/********************************************************************* * __crtCreateThreadpoolWait (MSVCP140.@) */ PTP_WAIT CDECL MSVCP__crtCreateThreadpoolWait(PTP_WAIT_CALLBACK callback, diff --git a/include/winbase.h b/include/winbase.h index be1cb64..25e5077 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2636,6 +2636,7 @@ WINBASEAPI DWORD WINAPI WaitForMultipleObjects(DWORD,const HANDLE*,BOOL,DW WINBASEAPI DWORD WINAPI WaitForMultipleObjectsEx(DWORD,const HANDLE*,BOOL,DWORD,BOOL); WINBASEAPI DWORD WINAPI WaitForSingleObject(HANDLE,DWORD); WINBASEAPI DWORD WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL); +WINBASEAPI VOID WINAPI WaitForThreadpoolTimerCallbacks(PTP_TIMER,BOOL); WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD); WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD); #define WaitNamedPipe WINELIB_NAME_AW(WaitNamedPipe)