ntdll: Fix exception parameters on x86-64.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
5644022c26
commit
a462735270
|
@ -2876,6 +2876,9 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext )
|
||||||
if (!err && (rec->ExceptionCode = is_privileged_instr( win_context ))) break;
|
if (!err && (rec->ExceptionCode = is_privileged_instr( win_context ))) break;
|
||||||
if ((err & 7) == 2 && handle_interrupt( err >> 3, rec, win_context )) break;
|
if ((err & 7) == 2 && handle_interrupt( err >> 3, rec, win_context )) break;
|
||||||
rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION;
|
rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION;
|
||||||
|
rec->NumberParameters = 2;
|
||||||
|
rec->ExceptionInformation[0] = 0;
|
||||||
|
rec->ExceptionInformation[1] = 0xffffffffffffffff;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case TRAP_x86_PAGEFLT: /* Page fault */
|
case TRAP_x86_PAGEFLT: /* Page fault */
|
||||||
|
|
|
@ -2370,7 +2370,6 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame,
|
||||||
else
|
else
|
||||||
parameter_count = except->alt_nb_params;
|
parameter_count = except->alt_nb_params;
|
||||||
|
|
||||||
todo_wine_if( rec->NumberParameters != parameter_count )
|
|
||||||
ok( rec->NumberParameters == parameter_count,
|
ok( rec->NumberParameters == parameter_count,
|
||||||
"%u: Unexpected parameter count %u/%u\n", entry, rec->NumberParameters, parameter_count );
|
"%u: Unexpected parameter count %u/%u\n", entry, rec->NumberParameters, parameter_count );
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue