From 7d57998bad31a9525d514bfce30bdc02931c0c1b Mon Sep 17 00:00:00 2001 From: Daniel Lehman Date: Fri, 31 Mar 2017 13:50:31 -0700 Subject: [PATCH 1/7] msvcp140: Add __crtCloseThreadpoolTimer include: Add CloseThreadpoolTimer declaration Signed-off-by: Daniel Lehman --- 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 ecf2b26..31d437e 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3752,7 +3752,7 @@ @ cdecl _Xtime_diff_to_millis2(ptr ptr) _Xtime_diff_to_millis2 @ cdecl -ret64 _Xtime_get_ticks() _Xtime_get_ticks @ stub __Wcrtomb_lk -@ stub __crtCloseThreadpoolTimer +@ cdecl __crtCloseThreadpoolTimer(ptr) MSVCP__crtCloseThreadpoolTimer @ stub __crtCloseThreadpoolWait @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ stub __crtCompareStringEx diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index fa5ac1d..1098cb7 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1277,6 +1277,15 @@ PTP_TIMER CDECL MSVCP__crtCreateThreadpoolTimer(PTP_TIMER_CALLBACK callback, } /********************************************************************* + * __crtCloseThreadpoolTimer (MSVCP140.@) + */ +VOID CDECL MSVCP__crtCloseThreadpoolTimer(TP_TIMER *timer) +{ + TRACE("(%p)\n", timer); + CloseThreadpoolTimer(timer); +} + +/********************************************************************* * __crtSetThreadpoolTimer (MSVCP140.@) */ VOID CDECL MSVCP__crtSetThreadpoolTimer(TP_TIMER *timer, diff --git a/include/winbase.h b/include/winbase.h index 894156c..be1cb64 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1752,6 +1752,7 @@ WINBASEAPI BOOL WINAPI CloseHandle(HANDLE); WINBASEAPI VOID WINAPI CloseThreadpool(PTP_POOL); WINBASEAPI VOID WINAPI CloseThreadpoolCleanupGroup(PTP_CLEANUP_GROUP); WINBASEAPI VOID WINAPI CloseThreadpoolCleanupGroupMembers(PTP_CLEANUP_GROUP,BOOL,PVOID); +WINBASEAPI VOID WINAPI CloseThreadpoolTimer(PTP_TIMER); WINBASEAPI VOID WINAPI CloseThreadpoolWait(PTP_WAIT); WINBASEAPI VOID WINAPI CloseThreadpoolWork(PTP_WORK); WINBASEAPI BOOL WINAPI CommConfigDialogA(LPCSTR,HWND,LPCOMMCONFIG); -- 1.9.5