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
818d20ad
Commit
818d20ad
authored
Oct 20, 2017
by
Piotr Caban
Committed by
Alexandre Julliard
Oct 20, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp: Fix logic_error and runtime_error class layout if _MSVCP_VER>90.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
237788a5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
16 deletions
+24
-16
exception.c
dlls/msvcp90/exception.c
+24
-16
No files found.
dlls/msvcp90/exception.c
View file @
818d20ad
...
@@ -297,7 +297,7 @@ DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor)
...
@@ -297,7 +297,7 @@ DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor)
/* logic_error class data */
/* logic_error class data */
typedef
struct
{
typedef
struct
{
exception
e
;
exception
e
;
#if
ndef
_MSVCIRT
#if
_MSVCP_VER <= 90 && !defined
_MSVCIRT
basic_string_char
str
;
basic_string_char
str
;
#endif
#endif
}
logic_error
;
}
logic_error
;
...
@@ -308,12 +308,15 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_ctor, 8)
...
@@ -308,12 +308,15 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_ctor, 8)
logic_error
*
__thiscall
MSVCP_logic_error_ctor
(
logic_error
*
this
,
exception_name
name
)
logic_error
*
__thiscall
MSVCP_logic_error_ctor
(
logic_error
*
this
,
exception_name
name
)
{
{
TRACE
(
"%p %s
\n
"
,
this
,
EXCEPTION_STR
(
name
));
TRACE
(
"%p %s
\n
"
,
this
,
EXCEPTION_STR
(
name
));
#ifdef _MSVCIRT
#if _MSVCP_VER <= 90 && !defined _MSVCIRT
MSVCP_exception_ctor
(
&
this
->
e
,
name
);
#if _MSVCP_VER == 60
MSVCP_exception_ctor
(
&
this
->
e
,
""
);
#else
#else
this
->
e
.
name
=
NULL
;
MSVCP_exception_ctor
(
&
this
->
e
,
NULL
)
;
this
->
e
.
do_free
=
FALSE
;
#endif
MSVCP_basic_string_char_ctor_cstr
(
&
this
->
str
,
EXCEPTION_STR
(
name
));
MSVCP_basic_string_char_ctor_cstr
(
&
this
->
str
,
EXCEPTION_STR
(
name
));
#else
MSVCP_exception_ctor
(
&
this
->
e
,
name
);
#endif
#endif
this
->
e
.
vtable
=
&
MSVCP_logic_error_vtable
;
this
->
e
.
vtable
=
&
MSVCP_logic_error_vtable
;
return
this
;
return
this
;
...
@@ -327,7 +330,7 @@ logic_error* __thiscall MSVCP_logic_error_copy_ctor(
...
@@ -327,7 +330,7 @@ logic_error* __thiscall MSVCP_logic_error_copy_ctor(
{
{
TRACE
(
"%p %p
\n
"
,
this
,
rhs
);
TRACE
(
"%p %p
\n
"
,
this
,
rhs
);
MSVCP_exception_copy_ctor
(
&
this
->
e
,
&
rhs
->
e
);
MSVCP_exception_copy_ctor
(
&
this
->
e
,
&
rhs
->
e
);
#if
ndef
_MSVCIRT
#if
_MSVCP_VER <= 90 && !defined
_MSVCIRT
MSVCP_basic_string_char_copy_ctor
(
&
this
->
str
,
&
rhs
->
str
);
MSVCP_basic_string_char_copy_ctor
(
&
this
->
str
,
&
rhs
->
str
);
#endif
#endif
this
->
e
.
vtable
=
&
MSVCP_logic_error_vtable
;
this
->
e
.
vtable
=
&
MSVCP_logic_error_vtable
;
...
@@ -357,7 +360,7 @@ void __thiscall MSVCP_logic_error_dtor(logic_error *this)
...
@@ -357,7 +360,7 @@ void __thiscall MSVCP_logic_error_dtor(logic_error *this)
{
{
TRACE
(
"%p
\n
"
,
this
);
TRACE
(
"%p
\n
"
,
this
);
MSVCP_exception_dtor
(
&
this
->
e
);
MSVCP_exception_dtor
(
&
this
->
e
);
#if
ndef
_MSVCIRT
#if
_MSVCP_VER <= 90 && !defined
_MSVCIRT
MSVCP_basic_string_char_dtor
(
&
this
->
str
);
MSVCP_basic_string_char_dtor
(
&
this
->
str
);
#endif
#endif
}
}
...
@@ -408,7 +411,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_what, 4)
...
@@ -408,7 +411,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_what, 4)
const
char
*
__thiscall
MSVCP_logic_error_what
(
logic_error
*
this
)
const
char
*
__thiscall
MSVCP_logic_error_what
(
logic_error
*
this
)
{
{
TRACE
(
"%p
\n
"
,
this
);
TRACE
(
"%p
\n
"
,
this
);
#if
def
_MSVCIRT
#if
_MSVCP_VER > 90 || defined
_MSVCIRT
return
MSVCP_exception_what
(
&
this
->
e
);
return
MSVCP_exception_what
(
&
this
->
e
);
#else
#else
return
MSVCP_basic_string_char_c_str
(
&
this
->
str
);
return
MSVCP_basic_string_char_c_str
(
&
this
->
str
);
...
@@ -543,18 +546,23 @@ DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_t
...
@@ -543,18 +546,23 @@ DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_t
/* runtime_error class data */
/* runtime_error class data */
typedef
struct
{
typedef
struct
{
exception
e
;
exception
e
;
#if _MSVCP_VER <= 90 && !defined _MSVCIRT
basic_string_char
str
;
basic_string_char
str
;
#endif
}
runtime_error
;
}
runtime_error
;
static
runtime_error
*
MSVCP_runtime_error_ctor
(
runtime_error
*
this
,
exception_name
name
)
static
runtime_error
*
MSVCP_runtime_error_ctor
(
runtime_error
*
this
,
exception_name
name
)
{
{
TRACE
(
"%p %s
\n
"
,
this
,
EXCEPTION_STR
(
name
));
TRACE
(
"%p %s
\n
"
,
this
,
EXCEPTION_STR
(
name
));
#ifdef _MSVCIRT
#if _MSVCP_VER <= 90 && !defined _MSVCIRT
MSVCP_exception_ctor
(
&
this
->
e
,
name
);
#if _MSVCP_VER == 60
MSVCP_exception_ctor
(
&
this
->
e
,
""
);
#else
#else
this
->
e
.
name
=
NULL
;
MSVCP_exception_ctor
(
&
this
->
e
,
NULL
)
;
this
->
e
.
do_free
=
FALSE
;
#endif
MSVCP_basic_string_char_ctor_cstr
(
&
this
->
str
,
EXCEPTION_STR
(
name
));
MSVCP_basic_string_char_ctor_cstr
(
&
this
->
str
,
EXCEPTION_STR
(
name
));
#else
MSVCP_exception_ctor
(
&
this
->
e
,
name
);
#endif
#endif
this
->
e
.
vtable
=
&
MSVCP_runtime_error_vtable
;
this
->
e
.
vtable
=
&
MSVCP_runtime_error_vtable
;
return
this
;
return
this
;
...
@@ -568,7 +576,7 @@ runtime_error* __thiscall MSVCP_runtime_error_copy_ctor(
...
@@ -568,7 +576,7 @@ runtime_error* __thiscall MSVCP_runtime_error_copy_ctor(
{
{
TRACE
(
"%p %p
\n
"
,
this
,
rhs
);
TRACE
(
"%p %p
\n
"
,
this
,
rhs
);
MSVCP_exception_copy_ctor
(
&
this
->
e
,
&
rhs
->
e
);
MSVCP_exception_copy_ctor
(
&
this
->
e
,
&
rhs
->
e
);
#if
ndef
_MSVCIRT
#if
_MSVCP_VER <= 90 && !defined
_MSVCIRT
MSVCP_basic_string_char_copy_ctor
(
&
this
->
str
,
&
rhs
->
str
);
MSVCP_basic_string_char_copy_ctor
(
&
this
->
str
,
&
rhs
->
str
);
#endif
#endif
this
->
e
.
vtable
=
&
MSVCP_runtime_error_vtable
;
this
->
e
.
vtable
=
&
MSVCP_runtime_error_vtable
;
...
@@ -596,7 +604,7 @@ void __thiscall MSVCP_runtime_error_dtor(runtime_error *this)
...
@@ -596,7 +604,7 @@ void __thiscall MSVCP_runtime_error_dtor(runtime_error *this)
{
{
TRACE
(
"%p
\n
"
,
this
);
TRACE
(
"%p
\n
"
,
this
);
MSVCP_exception_dtor
(
&
this
->
e
);
MSVCP_exception_dtor
(
&
this
->
e
);
#if
ndef
_MSVCIRT
#if
_MSVCP_VER <= 90 && !defined
_MSVCIRT
MSVCP_basic_string_char_dtor
(
&
this
->
str
);
MSVCP_basic_string_char_dtor
(
&
this
->
str
);
#endif
#endif
}
}
...
@@ -637,7 +645,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_what, 4)
...
@@ -637,7 +645,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_what, 4)
const
char
*
__thiscall
MSVCP_runtime_error_what
(
runtime_error
*
this
)
const
char
*
__thiscall
MSVCP_runtime_error_what
(
runtime_error
*
this
)
{
{
TRACE
(
"%p
\n
"
,
this
);
TRACE
(
"%p
\n
"
,
this
);
#if
def
_MSVCIRT
#if
_MSVCP_VER > 90 || defined
_MSVCIRT
return
MSVCP_exception_what
(
&
this
->
e
);
return
MSVCP_exception_what
(
&
this
->
e
);
#else
#else
return
MSVCP_basic_string_char_c_str
(
&
this
->
str
);
return
MSVCP_basic_string_char_c_str
(
&
this
->
str
);
...
@@ -911,7 +919,7 @@ void __asm_dummy_vtables(void) {
...
@@ -911,7 +919,7 @@ void __asm_dummy_vtables(void) {
VTABLE_ADD_FUNC
(
MSVCP_exception_what
));
VTABLE_ADD_FUNC
(
MSVCP_exception_what
));
EXCEPTION_VTABLE
(
range_error
,
EXCEPTION_VTABLE
(
range_error
,
VTABLE_ADD_FUNC
(
MSVCP_runtime_error_vector_dtor
)
VTABLE_ADD_FUNC
(
MSVCP_runtime_error_vector_dtor
)
VTABLE_ADD_FUNC
(
MSVCP_
exception
_what
));
VTABLE_ADD_FUNC
(
MSVCP_
runtime_error
_what
));
#ifndef __GNUC__
#ifndef __GNUC__
}
}
#endif
#endif
...
...
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