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
58c0d784
Commit
58c0d784
authored
Oct 11, 2022
by
Paul Gofman
Committed by
Alexandre Julliard
Oct 12, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp140: Import __ExceptionPtrRethrow implementation.
parent
95b8a3a1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
2 deletions
+25
-2
msvcp140.spec
dlls/msvcp140/msvcp140.spec
+2
-2
exception.c
dlls/msvcp90/exception.c
+23
-0
No files found.
dlls/msvcp140/msvcp140.spec
View file @
58c0d784
...
...
@@ -1703,8 +1703,8 @@
@ cdecl -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX@Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPEAX@Z
@ cdecl -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX@Z(ptr) __ExceptionPtrDestroy
@ cdecl -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX@Z(ptr) __ExceptionPtrDestroy
@ cdecl -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX@Z(ptr)
msvcr120.?__ExceptionPtrRethrow@@YAXPBX@Z
@ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX@Z(ptr)
msvcr120.?__ExceptionPtrRethrow@@YAXPEBX@Z
@ cdecl -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX@Z(ptr)
__ExceptionPtrRethrow
@ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX@Z(ptr)
__ExceptionPtrRethrow
@ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0@Z
@ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0@Z
@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX@Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPBX@Z
...
...
dlls/msvcp90/exception.c
View file @
58c0d784
...
...
@@ -1044,6 +1044,29 @@ void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign
if
(
ep
->
ref
)
InterlockedIncrement
(
ep
->
ref
);
}
/*********************************************************************
* ?__ExceptionPtrRethrow@@YAXPBX@Z
* ?__ExceptionPtrRethrow@@YAXPEBX@Z
*/
void
__cdecl
__ExceptionPtrRethrow
(
const
exception_ptr
*
ep
)
{
TRACE
(
"(%p)
\n
"
,
ep
);
if
(
!
ep
->
rec
)
{
static
const
char
*
exception_msg
=
"bad exception"
;
exception
e
;
MSVCP_exception_ctor
(
&
e
,
&
exception_msg
);
_CxxThrowException
(
&
e
,
&
exception_cxx_type
);
return
;
}
RaiseException
(
ep
->
rec
->
ExceptionCode
,
ep
->
rec
->
ExceptionFlags
&
(
~
EH_UNWINDING
),
ep
->
rec
->
NumberParameters
,
ep
->
rec
->
ExceptionInformation
);
}
#endif
#if _MSVCP_VER >= 70 || defined(_MSVCIRT)
...
...
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