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

Bugfix: Perform proper process shutdown on 'quit' and error.

Browse source
This commit is contained in:
Ulrich Weigand 1999-10-23 16:49:49 +00:00 committed by Alexandre Julliard
parent c6ad2b6fc3
commit 3723c2c8e9
4 changed files with 48 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
debugger/dbg.y
View file

@ -123,7 +123,7 @@ line: command
| error tEOL { yyerrok; }
command:
tQUIT tEOL { exit(0); }
tQUIT tEOL { DEBUG_Exit(0); }
| tHELP tEOL { DEBUG_Help(); }
| tHELP tINFO tEOL { DEBUG_HelpInfo(); }
| tCONT tEOL { dbg_exec_count = 1;
@ -431,6 +431,41 @@ void mode_command(int newmode)
else fprintf(stderr,"Invalid mode (use 16 or 32)\n");
}
/***********************************************************************
* DEBUG_Freeze
*/
static void DEBUG_Freeze( BOOL freeze )
{
static BOOL frozen = FALSE;
if ( freeze && !frozen )
{
/* Don't freeze thread currently holding the X crst! */
EnterCriticalSection( &X11DRV_CritSection );
CLIENT_DebuggerRequest( DEBUGGER_FREEZE_ALL );
LeaveCriticalSection( &X11DRV_CritSection );
frozen = TRUE;
}
if ( !freeze && frozen )
{
CLIENT_DebuggerRequest( DEBUGGER_UNFREEZE_ALL );
frozen = FALSE;
}
}
/***********************************************************************
* DEBUG_Exit
*
* Kill current process.
*/
void DEBUG_Exit( DWORD exit_code )
{
DEBUG_Freeze( FALSE );
TASK_KillTask( 0 ); /* FIXME: should not be necessary */
TerminateProcess( GetCurrentProcess(), exit_code );
}
/***********************************************************************
* DEBUG_Main
@ -440,7 +475,6 @@ void mode_command(int newmode)
static void DEBUG_Main( BOOL is_debug )
{
static int loaded_symbols = 0;
static BOOL frozen = FALSE;
static BOOL in_debugger = FALSE;
char SymbolTableFile[256];
int newmode;
@ -452,7 +486,7 @@ static void DEBUG_Main( BOOL is_debug )
if (in_debugger)
{
fprintf( stderr, " inside debugger, exiting.\n" );
exit(1);
DEBUG_Exit(1);
}
in_debugger = TRUE;
yyin = stdin;
@ -472,14 +506,7 @@ static void DEBUG_Main( BOOL is_debug )
{
loaded_symbols++;
if ( !frozen )
{
/* Don't freeze thread currently holding the X crst! */
EnterCriticalSection( &X11DRV_CritSection );
CLIENT_DebuggerRequest( DEBUGGER_FREEZE_ALL );
LeaveCriticalSection( &X11DRV_CritSection );
frozen = TRUE;
}
DEBUG_Freeze( TRUE );
#ifdef DBG_need_heap
/*
@ -540,14 +567,7 @@ static void DEBUG_Main( BOOL is_debug )
GlobalUnlock16( GetCurrentTask() );
if ( !frozen )
{
/* Don't freeze thread currently holding the X crst! */
EnterCriticalSection( &X11DRV_CritSection );
CLIENT_DebuggerRequest( DEBUGGER_FREEZE_ALL );
LeaveCriticalSection( &X11DRV_CritSection );
frozen = TRUE;
}
DEBUG_Freeze( TRUE );
/* Put the display in a correct state */
USER_Driver->pBeginDebugging();
@ -619,11 +639,7 @@ static void DEBUG_Main( BOOL is_debug )
{
dbg_exec_count = 0;
if ( frozen )
{
CLIENT_DebuggerRequest( DEBUGGER_UNFREEZE_ALL );
frozen = FALSE;
}
DEBUG_Freeze( FALSE );
}
in_debugger = FALSE;
@ -645,7 +661,7 @@ DWORD wine_debugger( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance
is_debug = TRUE;
break;
case CONTROL_C_EXIT:
if (!Options.debug) exit(0);
if (!Options.debug) DEBUG_Exit(0);
break;
}

4
debugger/debug.l
View file

@ -239,7 +239,7 @@ static int dbg_read(char * buf, int size)
if (!line)
{
fprintf( stderr, "\n" );
exit(0);
DEBUG_Exit(0);
}
/* Remove leading and trailing whitespace from the line */
@ -264,7 +264,7 @@ static int dbg_read(char * buf, int size)
if (size < len + 1)
{
fprintf(stderr,"Fatal readline goof.\n");
exit(0);
DEBUG_Exit(0);
}
strcpy(buf, line);
buf[len] = '\n';

8
debugger/expr.c
View file

@ -634,7 +634,7 @@ DEBUG_EvalExpr(struct expr * exp)
break;
default:
fprintf(stderr,"Unexpected expression.\n");
exit(123);
DEBUG_Exit(123);
break;
}
@ -794,7 +794,7 @@ DEBUG_DisplayExpr(struct expr * exp)
break;
default:
fprintf(stderr,"Unexpected expression.\n");
exit(123);
DEBUG_Exit(123);
break;
}
@ -855,7 +855,7 @@ DEBUG_CloneExpr(struct expr * exp)
break;
default:
fprintf(stderr,"Unexpected expression.\n");
exit(123);
DEBUG_Exit(123);
break;
}
@ -912,7 +912,7 @@ DEBUG_FreeExpr(struct expr * exp)
break;
default:
fprintf(stderr,"Unexpected expression.\n");
exit(123);
DEBUG_Exit(123);
break;
}

1
include/debugger.h
View file

@ -317,6 +317,7 @@ extern void DEBUG_Disassemble( const DBG_ADDR *, const DBG_ADDR*, int offset );
/* debugger/dbg.y */
extern DWORD wine_debugger( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance );
extern void DEBUG_Exit( DWORD exit_code );
/* Choose your allocator! */
#if 1