Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
3723c2c8
Commit
3723c2c8
authored
25 years ago
by
Ulrich Weigand
Committed by
Alexandre Julliard
25 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Bugfix: Perform proper process shutdown on 'quit' and error.
parent
c6ad2b6f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
debugger/dbg.y
+41
-25
41 additions, 25 deletions
debugger/dbg.y
debugger/debug.l
+2
-2
2 additions, 2 deletions
debugger/debug.l
debugger/expr.c
+4
-4
4 additions, 4 deletions
debugger/expr.c
include/debugger.h
+1
-0
1 addition, 0 deletions
include/debugger.h
with
48 additions
and
31 deletions
debugger/dbg.y
+
41
−
25
View file @
3723c2c8
...
...
@@ -123,7 +123,7 @@ line: command
| error tEOL { yyerrok; }
command:
tQUIT tEOL {
e
xit(0); }
tQUIT tEOL {
DEBUG_E
xit(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" );
e
xit(1);
DEBUG_E
xit(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)
e
xit(0);
if (!Options.debug)
DEBUG_E
xit(0);
break;
}
...
...
This diff is collapsed.
Click to expand it.
debugger/debug.l
+
2
−
2
View file @
3723c2c8
...
...
@@ -239,7 +239,7 @@ static int dbg_read(char * buf, int size)
if (!line)
{
fprintf( stderr, "\n" );
e
xit(0);
DEBUG_E
xit(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");
e
xit(0);
DEBUG_E
xit(0);
}
strcpy(buf, line);
buf[len] = '\n';
...
...
This diff is collapsed.
Click to expand it.
debugger/expr.c
+
4
−
4
View file @
3723c2c8
...
...
@@ -634,7 +634,7 @@ DEBUG_EvalExpr(struct expr * exp)
break
;
default:
fprintf
(
stderr
,
"Unexpected expression.
\n
"
);
e
xit
(
123
);
DEBUG_E
xit
(
123
);
break
;
}
...
...
@@ -794,7 +794,7 @@ DEBUG_DisplayExpr(struct expr * exp)
break
;
default:
fprintf
(
stderr
,
"Unexpected expression.
\n
"
);
e
xit
(
123
);
DEBUG_E
xit
(
123
);
break
;
}
...
...
@@ -855,7 +855,7 @@ DEBUG_CloneExpr(struct expr * exp)
break
;
default:
fprintf
(
stderr
,
"Unexpected expression.
\n
"
);
e
xit
(
123
);
DEBUG_E
xit
(
123
);
break
;
}
...
...
@@ -912,7 +912,7 @@ DEBUG_FreeExpr(struct expr * exp)
break
;
default:
fprintf
(
stderr
,
"Unexpected expression.
\n
"
);
e
xit
(
123
);
DEBUG_E
xit
(
123
);
break
;
}
...
...
This diff is collapsed.
Click to expand it.
include/debugger.h
+
1
−
0
View file @
3723c2c8
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment