Skip to content

W
wine-winehq
Commit c414f232 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

server: Accept DBG_EXCEPTION_HANDLED parameter in continue_debug_event.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50453Signed-off-by: 's avatarRémi Bernon <rbernon@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 901366e3
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 13 deletions
dlls/ntdll/tests/exception.c
View file @ c414f232
......@@ -1053,7 +1053,7 @@ static void test_exceptions(void)
ok( res == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", res );
}
static void test_debugger(void)
static void test_debugger(DWORD cont_status)
{
char cmdline[MAX_PATH];
PROCESS_INFORMATION pi;
......@@ -1081,7 +1081,7 @@ static void test_debugger(void)
do
{
continuestatus = DBG_CONTINUE;
continuestatus = cont_status;
ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n");
ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef);
......@@ -1091,7 +1091,7 @@ static void test_debugger(void)
if (de.dwThreadId != pi.dwThreadId)
{
trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode);
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE);
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status);
continue;
}
......@@ -3288,7 +3288,7 @@ static void test_rtlraiseexception(void)
run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE);
}
static void test_debugger(void)
static void test_debugger(DWORD cont_status)
{
char cmdline[MAX_PATH];
PROCESS_INFORMATION pi;
......@@ -3316,7 +3316,7 @@ static void test_debugger(void)
do
{
continuestatus = DBG_CONTINUE;
continuestatus = cont_status;
ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n");
ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef);
......@@ -3326,7 +3326,7 @@ static void test_debugger(void)
if (de.dwThreadId != pi.dwThreadId)
{
trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode);
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE);
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status);
continue;
}
......@@ -4252,7 +4252,7 @@ static void test_thread_context(void)
#undef COMPARE
}
static void test_debugger(void)
static void test_debugger(DWORD cont_status)
{
char cmdline[MAX_PATH];
PROCESS_INFORMATION pi;
......@@ -4280,7 +4280,7 @@ static void test_debugger(void)
do
{
continuestatus = DBG_CONTINUE;
continuestatus = cont_status;
ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n");
ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef);
......@@ -4290,7 +4290,7 @@ static void test_debugger(void)
if (de.dwThreadId != pi.dwThreadId)
{
trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode);
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE);
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status);
continue;
}
......@@ -5500,7 +5500,7 @@ static void test_thread_context(void)
#undef COMPARE
}
static void test_debugger(void)
static void test_debugger(DWORD cont_status)
{
char cmdline[MAX_PATH];
PROCESS_INFORMATION pi;
......@@ -5528,7 +5528,7 @@ static void test_debugger(void)
do
{
continuestatus = DBG_CONTINUE;
continuestatus = cont_status;
ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n");
ret = ContinueDebugEvent(de.dwProcessId, de.dwThreadId, 0xdeadbeef);
......@@ -5538,7 +5538,7 @@ static void test_debugger(void)
if (de.dwThreadId != pi.dwThreadId)
{
trace("event %d not coming from main thread, ignoring\n", de.dwDebugEventCode);
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, DBG_CONTINUE);
ContinueDebugEvent(de.dwProcessId, de.dwThreadId, cont_status);
continue;
}
......@@ -8346,7 +8346,8 @@ START_TEST(exception)
#endif
test_debugger();
test_debugger(DBG_EXCEPTION_HANDLED);
test_debugger(DBG_CONTINUE);
test_thread_context();
test_outputdebugstring(1, FALSE);
test_ripevent(1);
......
server/debugger.c
View file @ c414f232
......@@ -677,6 +677,7 @@ DECL_HANDLER(continue_debug_event)
struct process *process;
if (req->status != DBG_EXCEPTION_NOT_HANDLED &&
req->status != DBG_EXCEPTION_HANDLED &&
req->status != DBG_CONTINUE &&
req->status != DBG_REPLY_LATER)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment