Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
f52b33c6
Commit
f52b33c6
authored
Apr 22, 2020
by
Piotr Caban
Committed by
Alexandre Julliard
Apr 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vcruntime140_1: Fix rethrow handling in __CxxFrameHandler4.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
962bb993
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
except_x86_64.c
dlls/vcruntime140_1/except_x86_64.c
+4
-3
No files found.
dlls/vcruntime140_1/except_x86_64.c
View file @
f52b33c6
...
@@ -452,12 +452,12 @@ static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c)
...
@@ -452,12 +452,12 @@ static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c)
EXCEPTION_RECORD
*
rec
=
eptrs
->
ExceptionRecord
;
EXCEPTION_RECORD
*
rec
=
eptrs
->
ExceptionRecord
;
cxx_catch_ctx
*
ctx
=
c
;
cxx_catch_ctx
*
ctx
=
c
;
FlsSetValue
(
fls_index
,
(
void
*
)(
DWORD_PTR
)
ctx
->
search_state
);
if
(
rec
->
ExceptionCode
==
CXX_EXCEPTION
&&
!
rec
->
ExceptionInformation
[
1
]
&&
!
rec
->
ExceptionInformation
[
2
])
return
EXCEPTION_EXECUTE_HANDLER
;
FlsSetValue
(
fls_index
,
(
void
*
)(
DWORD_PTR
)
ctx
->
search_state
);
if
(
rec
->
ExceptionCode
!=
CXX_EXCEPTION
)
if
(
rec
->
ExceptionCode
!=
CXX_EXCEPTION
)
return
EXCEPTION_CONTINUE_SEARCH
;
return
EXCEPTION_CONTINUE_SEARCH
;
if
(
!
rec
->
ExceptionInformation
[
1
]
&&
!
rec
->
ExceptionInformation
[
2
])
return
EXCEPTION_EXECUTE_HANDLER
;
if
(
rec
->
ExceptionInformation
[
1
]
==
((
EXCEPTION_RECORD
*
)
*
__current_exception
())
->
ExceptionInformation
[
1
])
if
(
rec
->
ExceptionInformation
[
1
]
==
((
EXCEPTION_RECORD
*
)
*
__current_exception
())
->
ExceptionInformation
[
1
])
ctx
->
rethrow
=
TRUE
;
ctx
->
rethrow
=
TRUE
;
return
EXCEPTION_CONTINUE_SEARCH
;
return
EXCEPTION_CONTINUE_SEARCH
;
...
@@ -499,6 +499,7 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec)
...
@@ -499,6 +499,7 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec)
{
{
TRACE
(
"detect rethrow: exception code: %x
\n
"
,
prev_rec
->
ExceptionCode
);
TRACE
(
"detect rethrow: exception code: %x
\n
"
,
prev_rec
->
ExceptionCode
);
ctx
.
rethrow
=
TRUE
;
ctx
.
rethrow
=
TRUE
;
FlsSetValue
(
fls_index
,
(
void
*
)(
DWORD_PTR
)
ctx
.
search_state
);
if
(
untrans_rec
)
if
(
untrans_rec
)
{
{
...
...
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