Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
136a0ac4
Commit
136a0ac4
authored
Jul 02, 2019
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winedbg: Move continue_on_first_exception handling out of dbg_attach_debuggee.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5252d760
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
dbg.y
programs/winedbg/dbg.y
+1
-1
debugger.h
programs/winedbg/debugger.h
+1
-1
stack.c
programs/winedbg/stack.c
+1
-1
tgt_active.c
programs/winedbg/tgt_active.c
+4
-4
No files found.
programs/winedbg/dbg.y
View file @
136a0ac4
...
...
@@ -137,7 +137,7 @@ command:
| tSYMBOLFILE pathname { symbol_read_symtable($2, 0); }
| tSYMBOLFILE pathname expr_rvalue { symbol_read_symtable($2, $3); }
| tWHATIS expr_lvalue { dbg_printf("type = "); types_print_type(&$2.type, FALSE); dbg_printf("\n"); }
| tATTACH tNUM { dbg_attach_debuggee($2
, FALSE
); dbg_active_wait_for_first_exception(); }
| tATTACH tNUM { dbg_attach_debuggee($2); dbg_active_wait_for_first_exception(); }
| tDETACH { dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); }
| tKILL { dbg_curr_process->process_io->close_process(dbg_curr_process, TRUE); }
| tMINIDUMP pathname { minidump_write($2, (dbg_curr_thread && dbg_curr_thread->in_exception) ? &dbg_curr_thread->excpt_record : NULL);}
...
...
programs/winedbg/debugger.h
View file @
136a0ac4
...
...
@@ -431,7 +431,7 @@ extern enum dbg_start dbg_active_launch(int argc, char* argv[]);
extern
enum
dbg_start
dbg_active_auto
(
int
argc
,
char
*
argv
[]);
extern
enum
dbg_start
dbg_active_minidump
(
int
argc
,
char
*
argv
[]);
extern
void
dbg_active_wait_for_first_exception
(
void
);
extern
BOOL
dbg_attach_debuggee
(
DWORD
pid
,
BOOL
cofe
);
extern
BOOL
dbg_attach_debuggee
(
DWORD
pid
);
/* tgt_minidump.c */
extern
void
minidump_write
(
const
char
*
,
const
EXCEPTION_RECORD
*
);
...
...
programs/winedbg/stack.c
View file @
136a0ac4
...
...
@@ -412,7 +412,7 @@ static void backtrace_all(void)
}
else
if
(
entry
.
th32OwnerProcessID
!=
dbg_curr_pid
)
{
if
(
!
dbg_attach_debuggee
(
entry
.
th32OwnerProcessID
,
FALSE
))
if
(
!
dbg_attach_debuggee
(
entry
.
th32OwnerProcessID
))
{
dbg_printf
(
"
\n
warning: could not attach to %04x
\n
"
,
entry
.
th32OwnerProcessID
);
...
...
programs/winedbg/tgt_active.c
View file @
136a0ac4
...
...
@@ -71,7 +71,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de);
* wfe is set to TRUE if dbg_attach_debuggee should also proceed with all debug events
* until the first exception is received (aka: attach to an already running process)
*/
BOOL
dbg_attach_debuggee
(
DWORD
pid
,
BOOL
cofe
)
BOOL
dbg_attach_debuggee
(
DWORD
pid
)
{
if
(
!
(
dbg_curr_process
=
dbg_add_process
(
&
be_process_active_io
,
pid
,
0
)))
return
FALSE
;
...
...
@@ -81,7 +81,6 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe)
dbg_del_process
(
dbg_curr_process
);
return
FALSE
;
}
dbg_curr_process
->
continue_on_first_exception
=
cofe
;
SetEnvironmentVariableA
(
"DBGHELP_NOLIVE"
,
NULL
);
...
...
@@ -776,19 +775,20 @@ enum dbg_start dbg_active_attach(int argc, char* argv[])
/* try the form <myself> pid */
if
(
argc
==
1
&&
str2int
(
argv
[
0
],
&
pid
)
&&
pid
!=
0
)
{
if
(
!
dbg_attach_debuggee
(
pid
,
FALSE
))
if
(
!
dbg_attach_debuggee
(
pid
))
return
start_error_init
;
}
/* try the form <myself> pid evt (Win32 JIT debugger) */
else
if
(
argc
==
2
&&
str2int
(
argv
[
0
],
&
pid
)
&&
pid
!=
0
&&
str2int
(
argv
[
1
],
&
evt
)
&&
evt
!=
0
)
{
if
(
!
dbg_attach_debuggee
(
pid
,
TRUE
))
if
(
!
dbg_attach_debuggee
(
pid
))
{
/* don't care about result */
SetEvent
((
HANDLE
)
evt
);
return
start_error_init
;
}
dbg_curr_process
->
continue_on_first_exception
=
TRUE
;
if
(
!
SetEvent
((
HANDLE
)
evt
))
{
WINE_ERR
(
"Invalid event handle: %lx
\n
"
,
evt
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment