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
7662fe0b
Commit
7662fe0b
authored
Jan 02, 2020
by
Zebediah Figura
Committed by
Alexandre Julliard
Jan 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll/tests: Fix some exception test failures.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a191a0c2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
exception.c
dlls/ntdll/tests/exception.c
+10
-6
No files found.
dlls/ntdll/tests/exception.c
View file @
7662fe0b
...
...
@@ -367,8 +367,9 @@ static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *Exce
trace
(
"vect. handler %08x addr:%p context.Eip:%x
\n
"
,
rec
->
ExceptionCode
,
rec
->
ExceptionAddress
,
context
->
Eip
);
ok
(
rec
->
ExceptionAddress
==
(
char
*
)
code_mem
+
0xb
,
"ExceptionAddress at %p instead of %p
\n
"
,
rec
->
ExceptionAddress
,
(
char
*
)
code_mem
+
0xb
);
ok
(
rec
->
ExceptionAddress
==
(
char
*
)
code_mem
+
0xb
||
broken
(
rec
->
ExceptionAddress
==
code_mem
||
!
rec
->
ExceptionAddress
)
/* 2008 */
,
"ExceptionAddress at %p instead of %p
\n
"
,
rec
->
ExceptionAddress
,
(
char
*
)
code_mem
+
0xb
);
if
(
NtCurrentTeb
()
->
Peb
->
BeingDebugged
)
ok
((
void
*
)
context
->
Eax
==
pRtlRaiseException
||
...
...
@@ -403,8 +404,9 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR
trace
(
"exception: %08x flags:%x addr:%p context: Eip:%x
\n
"
,
rec
->
ExceptionCode
,
rec
->
ExceptionFlags
,
rec
->
ExceptionAddress
,
context
->
Eip
);
ok
(
rec
->
ExceptionAddress
==
(
char
*
)
code_mem
+
0xb
,
"ExceptionAddress at %p instead of %p
\n
"
,
rec
->
ExceptionAddress
,
(
char
*
)
code_mem
+
0xb
);
ok
(
rec
->
ExceptionAddress
==
(
char
*
)
code_mem
+
0xb
||
broken
(
rec
->
ExceptionAddress
==
code_mem
||
!
rec
->
ExceptionAddress
)
/* 2008 */
,
"ExceptionAddress at %p instead of %p
\n
"
,
rec
->
ExceptionAddress
,
(
char
*
)
code_mem
+
0xb
);
ok
(
context
->
ContextFlags
==
CONTEXT_ALL
||
context
->
ContextFlags
==
(
CONTEXT_ALL
|
CONTEXT_XSTATE
)
||
broken
(
context
->
ContextFlags
==
CONTEXT_FULL
),
/* win2003 */
...
...
@@ -515,8 +517,10 @@ static DWORD unwind_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECOR
ok
(
rec
->
ExceptionCode
==
STATUS_UNWIND
,
"ExceptionCode is %08x instead of %08x
\n
"
,
rec
->
ExceptionCode
,
STATUS_UNWIND
);
ok
(
rec
->
ExceptionAddress
==
(
char
*
)
code_mem
+
0x22
,
"ExceptionAddress at %p instead of %p
\n
"
,
rec
->
ExceptionAddress
,
(
char
*
)
code_mem
+
0x22
);
ok
(
rec
->
ExceptionAddress
==
(
char
*
)
code_mem
+
0x22
||
broken
(
TRUE
)
/* Win10 1709 */
,
"ExceptionAddress at %p instead of %p
\n
"
,
rec
->
ExceptionAddress
,
(
char
*
)
code_mem
+
0x22
);
ok
(
context
->
Eip
==
(
DWORD
)
code_mem
+
0x22
,
"context->Eip is %08x instead of %08x
\n
"
,
context
->
Eip
,
(
DWORD
)
code_mem
+
0x22
);
ok
(
context
->
Eax
==
unwind_expected_eax
,
"context->Eax is %08x instead of %08x
\n
"
,
context
->
Eax
,
unwind_expected_eax
);
...
...
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