Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
123185c3
Commit
123185c3
authored
Feb 19, 2016
by
Sebastian Lackner
Committed by
Alexandre Julliard
Feb 19, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
>
parent
d0cc0dd6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
signal_i386.c
dlls/ntdll/signal_i386.c
+4
-0
signal_x86_64.c
dlls/ntdll/signal_x86_64.c
+2
-0
exception.c
dlls/ntdll/tests/exception.c
+0
-4
No files found.
dlls/ntdll/signal_i386.c
View file @
123185c3
...
...
@@ -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
;
}
}
...
...
dlls/ntdll/signal_x86_64.c
View file @
123185c3
...
...
@@ -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
;
}
}
...
...
dlls/ntdll/tests/exception.c
View file @
123185c3
...
...
@@ -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
;
...
...
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