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
503f3462
Commit
503f3462
authored
Aug 27, 2021
by
Piotr Caban
Committed by
Alexandre Julliard
Aug 27, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp90: Don't use throw_exception helper for out_of_range exception.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
73c4ae66
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
18 additions
and
26 deletions
+18
-26
msvcp.h
dlls/msvcp60/msvcp.h
+1
-0
string.c
dlls/msvcp60/string.c
+1
-3
cxx.h
dlls/msvcp90/cxx.h
+0
-1
details.c
dlls/msvcp90/details.c
+6
-11
exception.c
dlls/msvcp90/exception.c
+7
-7
locale.c
dlls/msvcp90/locale.c
+1
-1
msvcp90.h
dlls/msvcp90/msvcp90.h
+1
-0
string.c
dlls/msvcp90/string.c
+1
-3
No files found.
dlls/msvcp60/msvcp.h
View file @
503f3462
...
@@ -487,3 +487,4 @@ typedef struct {
...
@@ -487,3 +487,4 @@ typedef struct {
void
WINAPI
DECLSPEC_NORETURN
_CxxThrowException
(
void
*
,
const
cxx_exception_type
*
);
void
WINAPI
DECLSPEC_NORETURN
_CxxThrowException
(
void
*
,
const
cxx_exception_type
*
);
void
__cdecl
DECLSPEC_NORETURN
_Xlength_error
(
const
char
*
);
void
__cdecl
DECLSPEC_NORETURN
_Xlength_error
(
const
char
*
);
void
__cdecl
DECLSPEC_NORETURN
_Xmem
(
void
);
void
__cdecl
DECLSPEC_NORETURN
_Xmem
(
void
);
void
__cdecl
DECLSPEC_NORETURN
_Xout_of_range
(
const
char
*
);
dlls/msvcp60/string.c
View file @
503f3462
...
@@ -46,10 +46,8 @@ typedef struct {
...
@@ -46,10 +46,8 @@ typedef struct {
/* ?_Xran@std@@YAXXZ */
/* ?_Xran@std@@YAXXZ */
void
__cdecl
_Xran
(
void
)
void
__cdecl
_Xran
(
void
)
{
{
static
const
char
msg
[]
=
"invalid string position"
;
TRACE
(
"
\n
"
);
TRACE
(
"
\n
"
);
throw_exception
(
EXCEPTION_OUT_OF_RANGE
,
msg
);
_Xout_of_range
(
"invalid string position"
);
}
}
/* ?_Xlen@std@@YAXXZ */
/* ?_Xlen@std@@YAXXZ */
...
...
dlls/msvcp90/cxx.h
View file @
503f3462
...
@@ -319,7 +319,6 @@ typedef enum __exception_type {
...
@@ -319,7 +319,6 @@ typedef enum __exception_type {
EXCEPTION
,
EXCEPTION
,
EXCEPTION_BAD_CAST
,
EXCEPTION_BAD_CAST
,
EXCEPTION_LOGIC_ERROR
,
EXCEPTION_LOGIC_ERROR
,
EXCEPTION_OUT_OF_RANGE
,
EXCEPTION_FAILURE
,
EXCEPTION_FAILURE
,
EXCEPTION_RANGE_ERROR
,
EXCEPTION_RANGE_ERROR
,
}
exception_type
;
}
exception_type
;
...
...
dlls/msvcp90/details.c
View file @
503f3462
...
@@ -470,19 +470,14 @@ size_t __cdecl _vector_base_v4__Segment_index_of(size_t x)
...
@@ -470,19 +470,14 @@ size_t __cdecl _vector_base_v4__Segment_index_of(size_t x)
DEFINE_THISCALL_WRAPPER
(
_vector_base_v4__Internal_throw_exception
,
8
)
DEFINE_THISCALL_WRAPPER
(
_vector_base_v4__Internal_throw_exception
,
8
)
void
__thiscall
_vector_base_v4__Internal_throw_exception
(
void
/*_vector_base_v4*/
*
this
,
size_t
idx
)
void
__thiscall
_vector_base_v4__Internal_throw_exception
(
void
/*_vector_base_v4*/
*
this
,
size_t
idx
)
{
{
static
const
struct
{
exception_type
type
;
const
char
*
msg
;
}
exceptions
[]
=
{
{
EXCEPTION_OUT_OF_RANGE
,
"Index out of range"
},
{
EXCEPTION_OUT_OF_RANGE
,
"Index out of segments table range"
},
{
EXCEPTION_RANGE_ERROR
,
"Index is inside segment which failed to be allocated"
},
};
TRACE
(
"(%p %Iu)
\n
"
,
this
,
idx
);
TRACE
(
"(%p %Iu)
\n
"
,
this
,
idx
);
if
(
idx
<
ARRAY_SIZE
(
exceptions
))
switch
(
idx
)
{
throw_exception
(
exceptions
[
idx
].
type
,
exceptions
[
idx
].
msg
);
case
0
:
_Xout_of_range
(
"Index out of range"
);
case
1
:
_Xout_of_range
(
"Index out of segments table range"
);
case
2
:
throw_exception
(
EXCEPTION_RANGE_ERROR
,
"Index is inside segment which failed to be allocated"
);
}
}
}
#ifdef _WIN64
#ifdef _WIN64
...
...
dlls/msvcp90/exception.c
View file @
503f3462
...
@@ -916,10 +916,15 @@ void __cdecl DECLSPEC_NORETURN _Xlength_error(const char *str)
...
@@ -916,10 +916,15 @@ void __cdecl DECLSPEC_NORETURN _Xlength_error(const char *str)
/* ?_Xout_of_range@std@@YAXPBD@Z */
/* ?_Xout_of_range@std@@YAXPBD@Z */
/* ?_Xout_of_range@std@@YAXPEBD@Z */
/* ?_Xout_of_range@std@@YAXPEBD@Z */
void
__cdecl
_Xout_of_range
(
const
char
*
str
)
void
__cdecl
DECLSPEC_NORETURN
_Xout_of_range
(
const
char
*
str
)
{
{
exception_name
name
=
EXCEPTION_NAME
(
str
);
out_of_range
e
;
TRACE
(
"(%s)
\n
"
,
debugstr_a
(
str
));
TRACE
(
"(%s)
\n
"
,
debugstr_a
(
str
));
throw_exception
(
EXCEPTION_OUT_OF_RANGE
,
str
);
MSVCP_out_of_range_ctor
(
&
e
,
name
);
_CxxThrowException
(
&
e
,
&
out_of_range_cxx_type
);
}
}
/* ?_Xruntime_error@std@@YAXPBD@Z */
/* ?_Xruntime_error@std@@YAXPBD@Z */
...
@@ -1081,11 +1086,6 @@ void throw_exception(exception_type et, const char *str)
...
@@ -1081,11 +1086,6 @@ void throw_exception(exception_type et, const char *str)
MSVCP_logic_error_ctor
(
&
e
,
name
);
MSVCP_logic_error_ctor
(
&
e
,
name
);
_CxxThrowException
(
&
e
,
&
logic_error_cxx_type
);
_CxxThrowException
(
&
e
,
&
logic_error_cxx_type
);
}
}
case
EXCEPTION_OUT_OF_RANGE
:
{
out_of_range
e
;
MSVCP_out_of_range_ctor
(
&
e
,
name
);
_CxxThrowException
(
&
e
,
&
out_of_range_cxx_type
);
}
case
EXCEPTION_FAILURE
:
{
case
EXCEPTION_FAILURE
:
{
failure
e
;
failure
e
;
MSVCP_failure_ctor
(
&
e
,
name
);
MSVCP_failure_ctor
(
&
e
,
name
);
...
...
dlls/msvcp90/locale.c
View file @
503f3462
...
@@ -1613,7 +1613,7 @@ ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int fla
...
@@ -1613,7 +1613,7 @@ ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int fla
/* ?_Xran@ctype_base@std@@KAXXZ */
/* ?_Xran@ctype_base@std@@KAXXZ */
void
__cdecl
ctype_base__Xran
(
void
)
void
__cdecl
ctype_base__Xran
(
void
)
{
{
throw_exception
(
EXCEPTION_OUT_OF_RANGE
,
"out of range in ctype<T>"
);
_Xout_of_range
(
"out of range in ctype<T>"
);
}
}
/* ?id@?$ctype@D@std@@2V0locale@2@A */
/* ?id@?$ctype@D@std@@2V0locale@2@A */
...
...
dlls/msvcp90/msvcp90.h
View file @
503f3462
...
@@ -667,4 +667,5 @@ void WINAPI DECLSPEC_NORETURN _CxxThrowException(void*,const cxx_exception_type*
...
@@ -667,4 +667,5 @@ void WINAPI DECLSPEC_NORETURN _CxxThrowException(void*,const cxx_exception_type*
void
__cdecl
DECLSPEC_NORETURN
_Xinvalid_argument
(
const
char
*
);
void
__cdecl
DECLSPEC_NORETURN
_Xinvalid_argument
(
const
char
*
);
void
__cdecl
DECLSPEC_NORETURN
_Xlength_error
(
const
char
*
);
void
__cdecl
DECLSPEC_NORETURN
_Xlength_error
(
const
char
*
);
void
__cdecl
DECLSPEC_NORETURN
_Xmem
(
void
);
void
__cdecl
DECLSPEC_NORETURN
_Xmem
(
void
);
void
__cdecl
DECLSPEC_NORETURN
_Xout_of_range
(
const
char
*
);
void
__cdecl
DECLSPEC_NORETURN
_Xruntime_error
(
const
char
*
);
void
__cdecl
DECLSPEC_NORETURN
_Xruntime_error
(
const
char
*
);
dlls/msvcp90/string.c
View file @
503f3462
...
@@ -468,10 +468,8 @@ void __thiscall _String_base__Xlen(const void/*_String_base*/ *this)
...
@@ -468,10 +468,8 @@ void __thiscall _String_base__Xlen(const void/*_String_base*/ *this)
/* ?_Xran@_String_base@std@@SAXXZ */
/* ?_Xran@_String_base@std@@SAXXZ */
void
CDECL
MSVCP__String_base_Xran
(
void
)
void
CDECL
MSVCP__String_base_Xran
(
void
)
{
{
static
const
char
msg
[]
=
"invalid string position"
;
TRACE
(
"
\n
"
);
TRACE
(
"
\n
"
);
throw_exception
(
EXCEPTION_OUT_OF_RANGE
,
msg
);
_Xout_of_range
(
"invalid string position"
);
}
}
/* ?_Xran@_String_base@std@@QBEXXZ */
/* ?_Xran@_String_base@std@@QBEXXZ */
...
...
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