Skip to content

W
wine-winehq
Commit c66eb79e authored by Daniel Lehman's avatar Daniel Lehman Committed by Alexandre Julliard
Browse files
Options

msvcp110: Add std::_Throw_future_error.

parent 844efaee
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 10 deletions
dlls/msvcp110/msvcp110.spec
View file @ c66eb79e
...@@ -1780,8 +1780,8 @@ ...@@ -1780,8 +1780,8 @@
@ cdecl -arch=win64 ?_Syserror_map@std@@YAPEBDH@Z(long) _Syserror_map @ cdecl -arch=win64 ?_Syserror_map@std@@YAPEBDH@Z(long) _Syserror_map
@ stub ?_Throw_C_error@std@@YAXH@Z @ stub ?_Throw_C_error@std@@YAXH@Z
@ stub ?_Throw_Cpp_error@std@@YAXH@Z @ stub ?_Throw_Cpp_error@std@@YAXH@Z
@ stub -arch=win32 ?_Throw_future_error@std@@YAXABVerror_code@1@@Z @ cdecl -arch=win32 ?_Throw_future_error@std@@YAXABVerror_code@1@@Z(ptr) _Throw_future_error
@ stub -arch=win64 ?_Throw_future_error@std@@YAXAEBVerror_code@1@@Z @ cdecl -arch=win64 ?_Throw_future_error@std@@YAXAEBVerror_code@1@@Z(ptr) _Throw_future_error
@ stub ?_Throw_lock_error@threads@stdext@@YAXXZ @ stub ?_Throw_lock_error@threads@stdext@@YAXXZ
@ stub ?_Throw_resource_error@threads@stdext@@YAXXZ @ stub ?_Throw_resource_error@threads@stdext@@YAXXZ
@ cdecl -arch=arm ?_Tidy@?$_Yarn@D@std@@AAAXXZ(ptr) _Yarn_char__Tidy @ cdecl -arch=arm ?_Tidy@?$_Yarn@D@std@@AAAXXZ(ptr) _Yarn_char__Tidy
......
dlls/msvcp120/msvcp120.spec
View file @ c66eb79e
...@@ -1741,8 +1741,8 @@ ...@@ -1741,8 +1741,8 @@
@ cdecl -arch=win64 ?_Syserror_map@std@@YAPEBDH@Z(long) _Syserror_map @ cdecl -arch=win64 ?_Syserror_map@std@@YAPEBDH@Z(long) _Syserror_map
@ stub ?_Throw_C_error@std@@YAXH@Z @ stub ?_Throw_C_error@std@@YAXH@Z
@ stub ?_Throw_Cpp_error@std@@YAXH@Z @ stub ?_Throw_Cpp_error@std@@YAXH@Z
@ stub -arch=win32 ?_Throw_future_error@std@@YAXABVerror_code@1@@Z @ cdecl -arch=win32 ?_Throw_future_error@std@@YAXABVerror_code@1@@Z(ptr) _Throw_future_error
@ stub -arch=win64 ?_Throw_future_error@std@@YAXAEBVerror_code@1@@Z @ cdecl -arch=win64 ?_Throw_future_error@std@@YAXAEBVerror_code@1@@Z(ptr) _Throw_future_error
@ stub ?_Throw_lock_error@threads@stdext@@YAXXZ @ stub ?_Throw_lock_error@threads@stdext@@YAXXZ
@ stub ?_Throw_resource_error@threads@stdext@@YAXXZ @ stub ?_Throw_resource_error@threads@stdext@@YAXXZ
@ cdecl -arch=arm ?_Tidy@?$_Yarn@D@std@@AAAXXZ(ptr) _Yarn_char__Tidy @ cdecl -arch=arm ?_Tidy@?$_Yarn@D@std@@AAAXXZ(ptr) _Yarn_char__Tidy
......
dlls/msvcp120_app/msvcp120_app.spec
View file @ c66eb79e
...@@ -1741,8 +1741,8 @@ ...@@ -1741,8 +1741,8 @@
@ cdecl -arch=win64 ?_Syserror_map@std@@YAPEBDH@Z(long) msvcp120.?_Syserror_map@std@@YAPEBDH@Z @ cdecl -arch=win64 ?_Syserror_map@std@@YAPEBDH@Z(long) msvcp120.?_Syserror_map@std@@YAPEBDH@Z
@ stub ?_Throw_C_error@std@@YAXH@Z @ stub ?_Throw_C_error@std@@YAXH@Z
@ stub ?_Throw_Cpp_error@std@@YAXH@Z @ stub ?_Throw_Cpp_error@std@@YAXH@Z
@ stub -arch=win32 ?_Throw_future_error@std@@YAXABVerror_code@1@@Z @ cdecl -arch=win32 ?_Throw_future_error@std@@YAXABVerror_code@1@@Z(ptr) msvcp120.?_Throw_future_error@std@@YAXABVerror_code@1@@Z
@ stub -arch=win64 ?_Throw_future_error@std@@YAXAEBVerror_code@1@@Z @ cdecl -arch=win64 ?_Throw_future_error@std@@YAXAEBVerror_code@1@@Z(ptr) msvcp120.?_Throw_future_error@std@@YAXAEBVerror_code@1@@Z
@ stub ?_Throw_lock_error@threads@stdext@@YAXXZ @ stub ?_Throw_lock_error@threads@stdext@@YAXXZ
@ stub ?_Throw_resource_error@threads@stdext@@YAXXZ @ stub ?_Throw_resource_error@threads@stdext@@YAXXZ
@ cdecl -arch=arm ?_Tidy@?$_Yarn@D@std@@AAAXXZ(ptr) msvcp120.?_Tidy@?$_Yarn@D@std@@AAAXXZ @ cdecl -arch=arm ?_Tidy@?$_Yarn@D@std@@AAAXXZ(ptr) msvcp120.?_Tidy@?$_Yarn@D@std@@AAAXXZ
......
dlls/msvcp140/msvcp140.spec
View file @ c66eb79e
...@@ -1625,8 +1625,8 @@ ...@@ -1625,8 +1625,8 @@
@ cdecl -arch=win64 ?_Syserror_map@std@@YAPEBDH@Z(long) _Syserror_map @ cdecl -arch=win64 ?_Syserror_map@std@@YAPEBDH@Z(long) _Syserror_map
@ stub ?_Throw_C_error@std@@YAXH@Z @ stub ?_Throw_C_error@std@@YAXH@Z
@ stub ?_Throw_Cpp_error@std@@YAXH@Z @ stub ?_Throw_Cpp_error@std@@YAXH@Z
@ stub -arch=win32 ?_Throw_future_error@std@@YAXABVerror_code@1@@Z @ cdecl -arch=win32 ?_Throw_future_error@std@@YAXABVerror_code@1@@Z(ptr) _Throw_future_error
@ stub -arch=win64 ?_Throw_future_error@std@@YAXAEBVerror_code@1@@Z @ cdecl -arch=win64 ?_Throw_future_error@std@@YAXAEBVerror_code@1@@Z(ptr) _Throw_future_error
@ cdecl -arch=arm ?_Tidy@?$_Yarn@D@std@@AAAXXZ(ptr) _Yarn_char__Tidy @ cdecl -arch=arm ?_Tidy@?$_Yarn@D@std@@AAAXXZ(ptr) _Yarn_char__Tidy
@ thiscall -arch=i386 ?_Tidy@?$_Yarn@D@std@@AAEXXZ(ptr) _Yarn_char__Tidy @ thiscall -arch=i386 ?_Tidy@?$_Yarn@D@std@@AAEXXZ(ptr) _Yarn_char__Tidy
@ cdecl -arch=win64 ?_Tidy@?$_Yarn@D@std@@AEAAXXZ(ptr) _Yarn_char__Tidy @ cdecl -arch=win64 ?_Tidy@?$_Yarn@D@std@@AEAAXXZ(ptr) _Yarn_char__Tidy
......
dlls/msvcp90/exception.c
View file @ c66eb79e
...@@ -950,6 +950,68 @@ bool __cdecl MSVCP__uncaught_exception(void) ...@@ -950,6 +950,68 @@ bool __cdecl MSVCP__uncaught_exception(void)
#if _MSVCP_VER >= 110 #if _MSVCP_VER >= 110
typedef struct typedef struct
{ {
int code;
void *category;
} error_code;
typedef struct
{
logic_error base;
error_code code;
} future_error;
extern const vtable_ptr future_error_vtable;
DEFINE_THISCALL_WRAPPER(future_error_copy_ctor, 8)
future_error* __thiscall future_error_copy_ctor(future_error *this, const future_error *rhs)
{
logic_error_copy_ctor(&this->base, &rhs->base);
this->code = rhs->code;
this->base.e.vtable = &future_error_vtable;
return this;
}
DEFINE_THISCALL_WRAPPER(MSVCP_future_error_what, 4)
const char* __thiscall MSVCP_future_error_what(future_error *this)
{
const char *names[4] = {
"broken promise",
"future already retrieved",
"promise already satisfied",
"no state",
};
#if _MSVCP_VER == 110
int code = this->code.code;
#else
int code = this->code.code-1;
#endif
TRACE("%p\n", this);
return code >= 0 && code < ARRAY_SIZE(names) ? names[code] : NULL;
}
DEFINE_RTTI_DATA3(future_error, 0, &future_error_rtti_base_descriptor,
&logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor,
".?AVfuture_error@std@@")
DEFINE_CXX_DATA3(future_error, &logic_error_cxx_type_info, &logic_error_cxx_type_info,
&exception_cxx_type_info, MSVCP_logic_error_dtor)
/* ?_Throw_future_error@std@@YAXABVerror_code@1@@Z */
/* ?_Throw_future_error@std@@YAXAEBVerror_code@1@@Z */
void __cdecl DECLSPEC_NORETURN _Throw_future_error( const error_code *error_code )
{
future_error e;
const char *name = "";
TRACE("(%p)\n", error_code);
MSVCP_logic_error_ctor(&e.base, EXCEPTION_NAME(name));
e.code = *error_code;
e.base.e.vtable = &future_error_vtable;
_CxxThrowException(&e, &future_error_cxx_type);
}
typedef struct
{
EXCEPTION_RECORD *rec; EXCEPTION_RECORD *rec;
LONG *ref; /* not binary compatible with native */ LONG *ref; /* not binary compatible with native */
} exception_ptr; } exception_ptr;
...@@ -1360,6 +1422,11 @@ __ASM_BLOCK_BEGIN(exception_vtables) ...@@ -1360,6 +1422,11 @@ __ASM_BLOCK_BEGIN(exception_vtables)
EXCEPTION_VTABLE(runtime_error, EXCEPTION_VTABLE(runtime_error,
VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor) VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor)
VTABLE_ADD_FUNC(MSVCP_runtime_error_what)); VTABLE_ADD_FUNC(MSVCP_runtime_error_what));
#if _MSVCP_VER >= 110
EXCEPTION_VTABLE(future_error,
VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor)
VTABLE_ADD_FUNC(MSVCP_future_error_what));
#endif
#if _MSVCP_VER > 110 #if _MSVCP_VER > 110
EXCEPTION_VTABLE(_System_error, EXCEPTION_VTABLE(_System_error,
VTABLE_ADD_FUNC(MSVCP_failure_vector_dtor) VTABLE_ADD_FUNC(MSVCP_failure_vector_dtor)
...@@ -1422,6 +1489,9 @@ void init_exception(void *base) ...@@ -1422,6 +1489,9 @@ void init_exception(void *base)
init_out_of_range_rtti(base); init_out_of_range_rtti(base);
init_invalid_argument_rtti(base); init_invalid_argument_rtti(base);
init_runtime_error_rtti(base); init_runtime_error_rtti(base);
#if _MSVCP_VER >= 110
init_future_error_rtti(base);
#endif
#if _MSVCP_VER > 110 #if _MSVCP_VER > 110
init__System_error_rtti(base); init__System_error_rtti(base);
#endif #endif
...@@ -1439,6 +1509,9 @@ void init_exception(void *base) ...@@ -1439,6 +1509,9 @@ void init_exception(void *base)
init_out_of_range_cxx(base); init_out_of_range_cxx(base);
init_invalid_argument_cxx(base); init_invalid_argument_cxx(base);
init_runtime_error_cxx(base); init_runtime_error_cxx(base);
#if _MSVCP_VER >= 110
init_future_error_cxx(base);
#endif
#if _MSVCP_VER > 110 #if _MSVCP_VER > 110
init__System_error_cxx_type_info(base); init__System_error_cxx_type_info(base);
#endif #endif
......
dlls/msvcp_win/msvcp_win.spec
View file @ c66eb79e
...@@ -1625,8 +1625,8 @@ ...@@ -1625,8 +1625,8 @@
@ cdecl -arch=win64 ?_Syserror_map@std@@YAPEBDH@Z(long) msvcp140.?_Syserror_map@std@@YAPEBDH@Z @ cdecl -arch=win64 ?_Syserror_map@std@@YAPEBDH@Z(long) msvcp140.?_Syserror_map@std@@YAPEBDH@Z
@ stub ?_Throw_C_error@std@@YAXH@Z @ stub ?_Throw_C_error@std@@YAXH@Z
@ stub ?_Throw_Cpp_error@std@@YAXH@Z @ stub ?_Throw_Cpp_error@std@@YAXH@Z
@ stub -arch=win32 ?_Throw_future_error@std@@YAXABVerror_code@1@@Z @ cdecl -arch=win32 ?_Throw_future_error@std@@YAXABVerror_code@1@@Z(ptr) msvcp140.?_Throw_future_error@std@@YAXABVerror_code@1@@Z
@ stub -arch=win64 ?_Throw_future_error@std@@YAXAEBVerror_code@1@@Z @ cdecl -arch=win64 ?_Throw_future_error@std@@YAXAEBVerror_code@1@@Z(ptr) msvcp140.?_Throw_future_error@std@@YAXAEBVerror_code@1@@Z
@ cdecl -arch=arm ?_Tidy@?$_Yarn@D@std@@AAAXXZ(ptr) msvcp140.?_Tidy@?$_Yarn@D@std@@AAAXXZ @ cdecl -arch=arm ?_Tidy@?$_Yarn@D@std@@AAAXXZ(ptr) msvcp140.?_Tidy@?$_Yarn@D@std@@AAAXXZ
@ thiscall -arch=i386 ?_Tidy@?$_Yarn@D@std@@AAEXXZ(ptr) msvcp140.?_Tidy@?$_Yarn@D@std@@AAEXXZ @ thiscall -arch=i386 ?_Tidy@?$_Yarn@D@std@@AAEXXZ(ptr) msvcp140.?_Tidy@?$_Yarn@D@std@@AAEXXZ
@ cdecl -arch=win64 ?_Tidy@?$_Yarn@D@std@@AEAAXXZ(ptr) msvcp140.?_Tidy@?$_Yarn@D@std@@AEAAXXZ @ cdecl -arch=win64 ?_Tidy@?$_Yarn@D@std@@AEAAXXZ(ptr) msvcp140.?_Tidy@?$_Yarn@D@std@@AEAAXXZ
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment