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
eebc5c50
Commit
eebc5c50
authored
Aug 26, 2021
by
Piotr Caban
Committed by
Alexandre Julliard
Aug 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp90: Don't use throw_exception helper for rethrow.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
38d6dbc6
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
7 deletions
+7
-7
ios.c
dlls/msvcp60/ios.c
+1
-1
msvcp.h
dlls/msvcp60/msvcp.h
+2
-0
cxx.h
dlls/msvcp90/cxx.h
+0
-1
details.c
dlls/msvcp90/details.c
+1
-1
exception.c
dlls/msvcp90/exception.c
+0
-3
ios.c
dlls/msvcp90/ios.c
+1
-1
msvcp90.h
dlls/msvcp90/msvcp90.h
+2
-0
No files found.
dlls/msvcp60/ios.c
View file @
eebc5c50
...
...
@@ -4847,7 +4847,7 @@ void __thiscall ios_base_clear_reraise(ios_base *this, IOSB_iostate state, bool
return
;
if
(
reraise
)
throw_exception
(
EXCEPTION_RERAISE
,
NULL
);
_CxxThrowException
(
NULL
,
NULL
);
else
if
(
this
->
state
&
this
->
except
&
IOSTATE_eofbit
)
throw_exception
(
EXCEPTION_FAILURE
,
"eofbit is set"
);
else
if
(
this
->
state
&
this
->
except
&
IOSTATE_failbit
)
...
...
dlls/msvcp60/msvcp.h
View file @
eebc5c50
...
...
@@ -483,3 +483,5 @@ typedef struct {
double
real
;
double
imag
;
}
complex_double
;
void
WINAPI
DECLSPEC_NORETURN
_CxxThrowException
(
exception
*
,
const
cxx_exception_type
*
);
dlls/msvcp90/cxx.h
View file @
eebc5c50
...
...
@@ -316,7 +316,6 @@ typedef struct __exception
/* Internal: throws selected exception */
typedef
enum
__exception_type
{
EXCEPTION_RERAISE
,
EXCEPTION
,
EXCEPTION_BAD_ALLOC
,
EXCEPTION_BAD_CAST
,
...
...
dlls/msvcp90/details.c
View file @
eebc5c50
...
...
@@ -526,7 +526,7 @@ static void concurrent_vector_alloc_segment(_Concurrent_vector_base_v4 *this,
__EXCEPT_ALL
{
this
->
segment
[
seg
]
=
NULL
;
throw_exception
(
EXCEPTION_RERAISE
,
NULL
);
_CxxThrowException
(
NULL
,
NULL
);
}
__ENDTRY
if
(
!
this
->
segment
[
seg
])
...
...
dlls/msvcp90/exception.c
View file @
eebc5c50
...
...
@@ -31,7 +31,6 @@ CREATE_TYPE_INFO_VTABLE
#define CLASS_IS_SIMPLE_TYPE 1
#define CLASS_HAS_VIRTUAL_BASE_CLASS 4
void
WINAPI
_CxxThrowException
(
exception
*
,
const
cxx_exception_type
*
);
int
*
__cdecl
__processing_throw
(
void
);
#if _MSVCP_VER >= 70 || defined(_MSVCIRT)
...
...
@@ -1044,8 +1043,6 @@ void throw_exception(exception_type et, const char *str)
exception_name
name
=
EXCEPTION_NAME
(
str
);
switch
(
et
)
{
case
EXCEPTION_RERAISE
:
_CxxThrowException
(
NULL
,
NULL
);
case
EXCEPTION
:
{
exception
e
;
MSVCP_exception_ctor
(
&
e
,
name
);
...
...
dlls/msvcp90/ios.c
View file @
eebc5c50
...
...
@@ -5264,7 +5264,7 @@ void __thiscall ios_base_clear_reraise(ios_base *this, IOSB_iostate state, bool
return
;
if
(
reraise
)
throw_exception
(
EXCEPTION_RERAISE
,
NULL
);
_CxxThrowException
(
NULL
,
NULL
);
else
if
(
this
->
state
&
this
->
except
&
IOSTATE_eofbit
)
throw_exception
(
EXCEPTION_FAILURE
,
"eofbit is set"
);
else
if
(
this
->
state
&
this
->
except
&
IOSTATE_failbit
)
...
...
dlls/msvcp90/msvcp90.h
View file @
eebc5c50
...
...
@@ -662,3 +662,5 @@ static inline int mbstowcs_wrapper( size_t *ret, wchar_t *wcs, size_t size, cons
#define mbstowcs_s( ret, wcs, size, mbs, count ) mbstowcs_wrapper( ret, wcs, size, mbs, count )
#define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) ))
#endif
void
WINAPI
_CxxThrowException
(
exception
*
,
const
cxx_exception_type
*
);
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