ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correctly pass the exception to the application when 

BreakOnFirstChance is 0.
This commit is contained in:
Alexandre Julliard 2003-08-21 21:28:51 +00:00
parent ef9636c51f
commit 1f467ffca6
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
programs/winedbg/winedbg.c
View File

@ -364,7 +364,6 @@ BOOL DEBUG_Attach(DWORD pid, BOOL cofe, BOOL wfe)
while (DEBUG_CurrProcess && WaitForDebugEvent(&de, INFINITE)) while (DEBUG_CurrProcess && WaitForDebugEvent(&de, INFINITE))
{ {
if (DEBUG_HandleDebugEvent(&de)) break; if (DEBUG_HandleDebugEvent(&de)) break;
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE);
} }
if (DEBUG_CurrProcess) DEBUG_InteractiveP = TRUE; if (DEBUG_CurrProcess) DEBUG_InteractiveP = TRUE;
} }
@ -506,7 +505,7 @@ static void DEBUG_ExceptionEpilog(void)
DEBUG_InException = FALSE; DEBUG_InException = FALSE;
} }
static BOOL DEBUG_HandleException(EXCEPTION_RECORD *rec, BOOL first_chance, BOOL force) static DWORD DEBUG_HandleException(EXCEPTION_RECORD *rec, BOOL first_chance, BOOL force)
{ {
BOOL is_debug = FALSE; BOOL is_debug = FALSE;
THREADNAME_INFO *pThreadName; THREADNAME_INFO *pThreadName;
@ -532,13 +531,13 @@ static BOOL DEBUG_HandleException(EXCEPTION_RECORD *rec, BOOL first_chance, BOOL
DEBUG_Printf (DBG_CHN_MESG, DEBUG_Printf (DBG_CHN_MESG,
"Thread ID=0x%lx renamed using MS VC6 extension (name==\"%s\")\n", "Thread ID=0x%lx renamed using MS VC6 extension (name==\"%s\")\n",
pThread->tid, pThread->name); pThread->tid, pThread->name);
return FALSE; return DBG_CONTINUE;
} }
if (first_chance && !is_debug && !force && !DBG_IVAR(BreakOnFirstChance)) if (first_chance && !is_debug && !force && !DBG_IVAR(BreakOnFirstChance))
{ {
/* pass exception to program except for debug exceptions */ /* pass exception to program except for debug exceptions */
return FALSE; return DBG_EXCEPTION_NOT_HANDLED;
} }
if (!is_debug) if (!is_debug)
@ -596,7 +595,7 @@ static BOOL DEBUG_HandleException(EXCEPTION_RECORD *rec, BOOL first_chance, BOOL
if (!DBG_IVAR(BreakOnCritSectTimeOut)) if (!DBG_IVAR(BreakOnCritSectTimeOut))
{ {
DEBUG_Printf(DBG_CHN_MESG, "\n"); DEBUG_Printf(DBG_CHN_MESG, "\n");
return FALSE; return DBG_EXCEPTION_NOT_HANDLED;
} }
break; break;
case EXCEPTION_WINE_STUB: case EXCEPTION_WINE_STUB:
@ -653,23 +652,23 @@ static BOOL DEBUG_HandleException(EXCEPTION_RECORD *rec, BOOL first_chance, BOOL
{ {
DEBUG_ExceptionProlog(is_debug, FALSE, rec->ExceptionCode); DEBUG_ExceptionProlog(is_debug, FALSE, rec->ExceptionCode);
DEBUG_ExceptionEpilog(); DEBUG_ExceptionEpilog();
return TRUE; /* terminate execution */ return 0; /* terminate execution */
} }
if (DEBUG_ExceptionProlog(is_debug, force, rec->ExceptionCode)) if (DEBUG_ExceptionProlog(is_debug, force, rec->ExceptionCode))
{ {
DEBUG_InteractiveP = TRUE; DEBUG_InteractiveP = TRUE;
return TRUE; return 0;
} }
DEBUG_ExceptionEpilog(); DEBUG_ExceptionEpilog();
return FALSE; return DBG_CONTINUE;
} }
static BOOL DEBUG_HandleDebugEvent(DEBUG_EVENT* de) static BOOL DEBUG_HandleDebugEvent(DEBUG_EVENT* de)
{ {
char buffer[256]; char buffer[256];
BOOL ret = FALSE; DWORD cont = DBG_CONTINUE;
DEBUG_CurrPid = de->dwProcessId; DEBUG_CurrPid = de->dwProcessId;
DEBUG_CurrTid = de->dwThreadId; DEBUG_CurrTid = de->dwThreadId;
@ -701,10 +700,10 @@ static BOOL DEBUG_HandleDebugEvent(DEBUG_EVENT* de)
if (DEBUG_FetchContext()) if (DEBUG_FetchContext())
{ {
ret = DEBUG_HandleException(&de->u.Exception.ExceptionRecord, cont = DEBUG_HandleException(&de->u.Exception.ExceptionRecord,
de->u.Exception.dwFirstChance, de->u.Exception.dwFirstChance,
DEBUG_CurrThread->wait_for_first_exception); DEBUG_CurrThread->wait_for_first_exception);
if (!ret && DEBUG_CurrThread) if (cont && DEBUG_CurrThread)
{ {
DEBUG_CurrThread->wait_for_first_exception = 0; DEBUG_CurrThread->wait_for_first_exception = 0;
SetThreadContext(DEBUG_CurrThread->handle, &DEBUG_context); SetThreadContext(DEBUG_CurrThread->handle, &DEBUG_context);
@ -850,7 +849,7 @@ static BOOL DEBUG_HandleDebugEvent(DEBUG_EVENT* de)
{ {
DEBUG_Printf(DBG_CHN_MESG, "Stopping on DLL %s loading at %08lx\n", DEBUG_Printf(DBG_CHN_MESG, "Stopping on DLL %s loading at %08lx\n",
buffer, (unsigned long)de->u.LoadDll.lpBaseOfDll); buffer, (unsigned long)de->u.LoadDll.lpBaseOfDll);
ret = DEBUG_FetchContext(); if (DEBUG_FetchContext()) cont = 0;
} }
break; break;
@ -885,8 +884,9 @@ static BOOL DEBUG_HandleDebugEvent(DEBUG_EVENT* de)
DEBUG_Printf(DBG_CHN_TRACE, "%08lx:%08lx: unknown event (%ld)\n", DEBUG_Printf(DBG_CHN_TRACE, "%08lx:%08lx: unknown event (%ld)\n",
de->dwProcessId, de->dwThreadId, de->dwDebugEventCode); de->dwProcessId, de->dwThreadId, de->dwDebugEventCode);
} }
if (!cont) return TRUE; /* stop execution */
return ret; ContinueDebugEvent(de->dwProcessId, de->dwThreadId, cont);
return FALSE; /* continue execution */
} }
static void DEBUG_ResumeDebuggee(DWORD cont) static void DEBUG_ResumeDebuggee(DWORD cont)
@ -931,7 +931,6 @@ void DEBUG_WaitNextException(DWORD cont, int count, i
while (DEBUG_CurrProcess && WaitForDebugEvent(&de, INFINITE)) while (DEBUG_CurrProcess && WaitForDebugEvent(&de, INFINITE))
{ {
if (DEBUG_HandleDebugEvent(&de)) break; if (DEBUG_HandleDebugEvent(&de)) break;
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE);
} }
if (!DEBUG_CurrProcess) return; if (!DEBUG_CurrProcess) return;
DEBUG_InteractiveP = TRUE; DEBUG_InteractiveP = TRUE;
@ -957,7 +956,6 @@ static DWORD DEBUG_MainLoop(void)
while (WaitForDebugEvent(&de, INFINITE)) while (WaitForDebugEvent(&de, INFINITE))
{ {
if (DEBUG_HandleDebugEvent(&de)) break; if (DEBUG_HandleDebugEvent(&de)) break;
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE);
} }
if (local_mode == automatic_mode) if (local_mode == automatic_mode)
{ {