system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 17:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a generic mechanism to set up hooks for dispatching signal

Browse source 
handlers outside ntdll.
This commit is contained in:
Eric Pouech 2002-07-31 18:46:09 +00:00 committed by Alexandre Julliard
parent a6cff2b3c8
commit 3d4d7e0153
4 changed files with 64 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/kernel/kernel_main.c
View file

@ -24,6 +24,7 @@
#include <ctype.h>
#include <string.h>
#include <sys/stat.h>
#include <signal.h>
#include "winbase.h"
@ -38,6 +39,8 @@
extern void CODEPAGE_Init(void);
extern BOOL RELAY_Init(void);
extern int __wine_set_signal_handler(unsigned, int (*)(unsigned));
extern int CONSOLE_HandleCtrlC(unsigned);
/***********************************************************************
* KERNEL process initialisation routine
@ -100,6 +103,9 @@ static BOOL process_attach(void)
/* Create the shared heap for broken win95 native dlls */
HeapCreate( HEAP_SHARED, 0, 0 );
/* finish the process initialisation, if needed */
__wine_set_signal_handler(SIGINT, CONSOLE_HandleCtrlC);
return TRUE;
}

3
dlls/ntdll/ntdll.spec
View file

@ -1026,3 +1026,6 @@
# Codepages
@ cdecl __wine_init_codepages(ptr ptr) __wine_init_codepages
# signal handling
@ cdecl __wine_set_signal_handler(long ptr) __wine_set_signal_handler

29
dlls/ntdll/signal_i386.c
View file

@ -380,9 +380,23 @@ typedef struct
WINE_DEFAULT_DEBUG_CHANNEL(seh);
typedef int (*wine_signal_handler)(unsigned sig);
static wine_signal_handler handlers[256];
static sigset_t all_sigs;
/***********************************************************************
* dispatch_signal
*/
inline static int dispatch_signal(unsigned sig)
{
if (handlers[sig] == NULL) return 0;
return handlers[sig](sig);
}
/***********************************************************************
* get_trap_code
*
@ -974,8 +988,7 @@ static HANDLER_DEF(fpe_handler)
*/
static HANDLER_DEF(int_handler)
{
extern int CONSOLE_HandleCtrlC(void);
if (!CONSOLE_HandleCtrlC())
if (!dispatch_signal(SIGINT))
{
EXCEPTION_RECORD rec;
CONTEXT context;
@ -1034,6 +1047,18 @@ static int set_handler( int sig, int have_sigaltstack, void (*func)() )
}
/***********************************************************************
* __wine_set_signal_handler (NTDLL.@)
*/
int __wine_set_signal_handler(unsigned sig, wine_signal_handler wsh)
{
if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1;
if (handlers[sig] != NULL) return -2;
handlers[sig] = wsh;
return 0;
}
/**********************************************************************
* SIGNAL_Init
*/

30
dlls/ntdll/signal_sparc.c
View file

@ -40,8 +40,23 @@
WINE_DEFAULT_DEBUG_CHANNEL(seh);
typedef int (*wine_signal_handler)(unsigned sig);
static wine_signal_handler handlers[256];
static sigset_t all_sigs;
/***********************************************************************
* dispatch_signal
*/
inline static int dispatch_signal(unsigned sig)
{
if (handlers[sig] == NULL) return 0;
return handlers[sig](sig);
}
/*
* FIXME: All this works only on Solaris for now
*/
@ -310,8 +325,7 @@ static void fpe_handler( int signal, siginfo_t *info, ucontext_t *ucontext )
*/
static void int_handler( int signal, siginfo_t *info, ucontext_t *ucontext )
{
extern int CONSOLE_HandleCtrlC(void);
if (!CONSOLE_HandleCtrlC())
if (!dispatch_signal(SIGINT))
{
EXCEPTION_RECORD rec;
CONTEXT context;
@ -346,6 +360,18 @@ static int set_handler( int sig, void (*func)() )
}
/***********************************************************************
* __wine_set_signal_handler (NTDLL.@)
*/
int __wine_set_signal_handler(unsigned sig, wine_signal_handler wsh)
{
if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1;
if (handlers[sig] != NULL) return -2;
handlers[sig] = wsh;
return 0;
}
/***********************************************************************
* SIGNAL_Unblock
*