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

ntdll: Set correct number of arguments for breakpoint exceptions. 

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sebastian Lackner 2016-02-19 03:09:17 +01:00 committed by Alexandre Julliard
parent d0cc0dd69f
commit 123185c3a2
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/ntdll/signal_i386.c
View File

@ -2170,6 +2170,10 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext )
/* fall through */
default:
rec->ExceptionCode = EXCEPTION_BREAKPOINT;
rec->NumberParameters = is_wow64 ? 1 : 3;
rec->ExceptionInformation[0] = 0;
rec->ExceptionInformation[1] = 0; /* FIXME */
rec->ExceptionInformation[2] = 0; /* FIXME */
break;
}
}

2
dlls/ntdll/signal_x86_64.c
View File

@ -2658,6 +2658,8 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext )
/* fall through */
default:
rec->ExceptionCode = EXCEPTION_BREAKPOINT;
rec->NumberParameters = 1;
rec->ExceptionInformation[0] = 0;
break;
}
}

4
dlls/ntdll/tests/exception.c
View File

@ -2073,20 +2073,16 @@ static LONG CALLBACK breakpoint_handler(EXCEPTION_POINTERS *ExceptionInfo)
#ifdef __i386__
ok(ExceptionInfo->ContextRecord->Eip == (DWORD)code_mem + 1,
"expected Eip = %x, got %x\n", (DWORD)code_mem + 1, ExceptionInfo->ContextRecord->Eip);
todo_wine
ok(rec->NumberParameters == (is_wow64 ? 1 : 3),
"ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3);
todo_wine
ok(rec->ExceptionInformation[0] == 0,
"got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]);
ExceptionInfo->ContextRecord->Eip = (DWORD)code_mem + 2;
#else
ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 1,
"expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 1, ExceptionInfo->ContextRecord->Rip);
todo_wine
ok(rec->NumberParameters == 1,
"ExceptionParameters is %d instead of 1\n", rec->NumberParameters);
todo_wine
ok(rec->ExceptionInformation[0] == 0,
"got ExceptionInformation[0] = %lx\n", rec->ExceptionInformation[0]);
ExceptionInfo->ContextRecord->Rip = (DWORD_PTR)code_mem + 2;