Module: wine Branch: master Commit: 2c491feb4b7a766a5317048cd328505e71cddf00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c491feb4b7a766a5317048cd3... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 19:57:56 2009 +0200 kernel32: Moved ToolHelpHook16 to kernel16.c, it's not a toolhelp function. --- dlls/kernel32/kernel16.c | 11 +++++++++++ dlls/kernel32/toolhelp16.c | 18 ------------------ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c index 094156d..c004a3d 100644 --- a/dlls/kernel32/kernel16.c +++ b/dlls/kernel32/kernel16.c @@ -106,6 +106,17 @@ LONG WINAPI KERNEL_nop(void) return 0; } +/*********************************************************************** + * ToolHelpHook (KERNEL.341) + * see "Undocumented Windows" + */ +FARPROC16 WINAPI ToolHelpHook16(FARPROC16 func) +{ + static FARPROC16 hook; + + FIXME("(%p), stub.\n", func); + return InterlockedExchangePointer( (void **)&hook, func ); +} /* thunk for 16-bit CreateThread */ struct thread_args diff --git a/dlls/kernel32/toolhelp16.c b/dlls/kernel32/toolhelp16.c index a98971a..4d67b73 100644 --- a/dlls/kernel32/toolhelp16.c +++ b/dlls/kernel32/toolhelp16.c @@ -52,8 +52,6 @@ static struct notify static int nrofnotifys = 0; -static FARPROC16 HookNotify = NULL; - /*********************************************************************** * TaskFindHandle (TOOLHELP.65) @@ -226,19 +224,3 @@ BOOL16 WINAPI SystemHeapInfo16( SYSHEAPINFO *pHeapInfo ) FreeLibrary16( gdi ); return TRUE; } - - -/*********************************************************************** - * ToolHelpHook (KERNEL.341) - * see "Undocumented Windows" - */ -FARPROC16 WINAPI ToolHelpHook16(FARPROC16 lpfnNotifyHandler) -{ - FARPROC16 tmp; - - FIXME("(%p), stub.\n", lpfnNotifyHandler); - tmp = HookNotify; - HookNotify = lpfnNotifyHandler; - /* just return previously installed notification function */ - return tmp; -}