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
b5cd47f5
Commit
b5cd47f5
authored
Nov 30, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Skip NtRaiseException() call on ARM64 when debugger is not present.
parent
d6bd2644
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
signal_arm64.c
dlls/ntdll/signal_arm64.c
+5
-1
exception.c
dlls/ntdll/tests/exception.c
+0
-1
No files found.
dlls/ntdll/signal_arm64.c
View file @
b5cd47f5
...
@@ -1550,7 +1550,11 @@ __ASM_GLOBAL_FUNC( RtlRaiseException,
...
@@ -1550,7 +1550,11 @@ __ASM_GLOBAL_FUNC( RtlRaiseException,
"stp x4, x5, [x1, #0xf0]
\n\t
"
/* context->Fp, Lr */
"stp x4, x5, [x1, #0xf0]
\n\t
"
/* context->Fp, Lr */
"str x5, [x1, #0x108]
\n\t
"
/* context->Pc */
"str x5, [x1, #0x108]
\n\t
"
/* context->Pc */
"str x5, [x0, #0x10]
\n\t
"
/* rec->ExceptionAddress */
"str x5, [x0, #0x10]
\n\t
"
/* rec->ExceptionAddress */
"mov x2, #1
\n\t
"
"ldr x3, [x18, #0x60]
\n\t
"
/* peb */
"ldrb w2, [x3, #2]
\n\t
"
/* peb->BeingDebugged */
"cbnz w2, 1f
\n\t
"
"bl "
__ASM_NAME
(
"dispatch_exception"
)
"
\n
"
"1:
\t
mov x2, #1
\n\t
"
"bl "
__ASM_NAME
(
"NtRaiseException"
)
"
\n\t
"
"bl "
__ASM_NAME
(
"NtRaiseException"
)
"
\n\t
"
"bl "
__ASM_NAME
(
"RtlRaiseStatus"
)
/* does not return */
);
"bl "
__ASM_NAME
(
"RtlRaiseStatus"
)
/* does not return */
);
...
...
dlls/ntdll/tests/exception.c
View file @
b5cd47f5
...
@@ -8646,7 +8646,6 @@ static void test_KiUserExceptionDispatcher(void)
...
@@ -8646,7 +8646,6 @@ static void test_KiUserExceptionDispatcher(void)
pRtlRaiseException
(
&
record
);
pRtlRaiseException
(
&
record
);
ok
(
got_exception
,
"Handler was not called.
\n
"
);
ok
(
got_exception
,
"Handler was not called.
\n
"
);
todo_wine
ok
(
!
hook_called
,
"Hook was called.
\n
"
);
ok
(
!
hook_called
,
"Hook was called.
\n
"
);
memcpy
(
pKiUserExceptionDispatcher
,
patched_code
,
sizeof
(
patched_code
)
);
memcpy
(
pKiUserExceptionDispatcher
,
patched_code
,
sizeof
(
patched_code
)
);
...
...
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