[PATCH 0/3] MR4893: msvcp140: Add _XGetLastError implementation.
From: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/exception.c | 8 ++++++++ dlls/msvcp_win/msvcp_win.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index c04e870eb72..bc18d7b5be8 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1672,7 +1672,7 @@ @ cdecl ?_Winerror_map(a)std@@YAHH(a)Z(long) _Winerror_map @ cdecl -arch=win32 ?_Winerror_message(a)std@@YAKKPADK(a)Z(long ptr long) _Winerror_message @ cdecl -arch=win64 ?_Winerror_message(a)std@@YAKKPEADK(a)Z(long ptr long) _Winerror_message -@ stub ?_XGetLastError(a)std@@YAXXZ +@ cdecl ?_XGetLastError(a)std@@YAXXZ() _XGetLastError @ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) std__XLgamma_float @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 01cb2bb5dab..4cfa70c4c72 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -997,6 +997,14 @@ bool __cdecl MSVCP__uncaught_exception(void) return __uncaught_exception(); } +#if _MSVCP_VER >= 140 +/* ?_XGetLastError(a)std@@YAXXZ */ +void __cdecl _XGetLastError(void) +{ + FIXME("stub\n"); +} +#endif + #if _MSVCP_VER >= 110 typedef struct { diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index 813d2ba67da..71dc2c1e953 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -1672,7 +1672,7 @@ @ cdecl ?_Winerror_map(a)std@@YAHH(a)Z(long) msvcp140.?_Winerror_map(a)std@@YAHH(a)Z @ cdecl -arch=win32 ?_Winerror_message(a)std@@YAKKPADK(a)Z(long ptr long) msvcp140.?_Winerror_message(a)std@@YAKKPADK(a)Z @ cdecl -arch=win64 ?_Winerror_message(a)std@@YAKKPEADK(a)Z(long ptr long) msvcp140.?_Winerror_message(a)std@@YAKKPEADK(a)Z -@ stub ?_XGetLastError(a)std@@YAXXZ +@ cdecl ?_XGetLastError(a)std@@YAXXZ() msvcp140.?_XGetLastError(a)std@@YAXXZ @ cdecl ?_XLgamma(a)std@@YAMM(a)Z(float) msvcp140.?_XLgamma(a)std@@YAMM(a)Z @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) msvcp140.?_XLgamma(a)std@@YANN(a)Z @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) msvcp140.?_XLgamma(a)std@@YAOO(a)Z -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4893
From: Piotr Caban <piotr(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46904 --- dlls/msvcp90/exception.c | 14 +++++++++++- dlls/msvcp90/misc.c | 49 ++++++++++++++++++++++++++++------------ dlls/msvcp90/msvcp90.h | 3 +++ 3 files changed, 50 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 4cfa70c4c72..c881b37cd97 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1001,7 +1001,19 @@ bool __cdecl MSVCP__uncaught_exception(void) /* ?_XGetLastError(a)std@@YAXXZ */ void __cdecl _XGetLastError(void) { - FIXME("stub\n"); + int err = GetLastError(); + system_error se; + const char *msg; + + TRACE("() GetLastError()=%d\n", err); + + msg = _Winerror_map_str(err); + MSVCP_runtime_error_ctor(&se.base, &msg); + se.code.code = err; + se.code.category = std_system_category(); + se.base.e.vtable = &system_error_vtable; + + _CxxThrowException(&se, &system_error_cxx_type); } #endif diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index f82456cbf4b..a08101052da 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1063,6 +1063,13 @@ bool __thiscall custom_category_equivalent_code(custom_category *this, return FALSE; } +DEFINE_THISCALL_WRAPPER(custom_category_message, 12) +basic_string_char* __thiscall custom_category_message(const custom_category *this, + basic_string_char *ret, int err) +{ + return MSVCP_basic_string_char_ctor_cstr(ret, strerror(err)); +} + DEFINE_THISCALL_WRAPPER(iostream_category_name, 4) const char* __thiscall iostream_category_name(const custom_category *this) { @@ -1090,7 +1097,7 @@ const error_category* __cdecl std_iostream_category(void) } #endif -#if _MSVCP_VER == 100 +#if _MSVCP_VER == 100 || _MSVCP_VER >= 140 static custom_category system_category; DEFINE_RTTI_DATA1(system_category, 0, &error_category_rtti_base_descriptor, ".?AV_System_error_category(a)std@@") @@ -1099,13 +1106,32 @@ extern const vtable_ptr system_category_vtable; static void system_category_ctor(custom_category *this) { this->base.vtable = &system_category_vtable; +#if _MSVCP_VER == 100 this->type = "system"; +#endif } -DEFINE_THISCALL_WRAPPER(custom_category_name, 4) -const char* __thiscall custom_category_name(const custom_category *this) +DEFINE_THISCALL_WRAPPER(system_category_name, 4) +const char* __thiscall system_category_name(const custom_category *this) { +#if _MSVCP_VER == 100 return this->type; +#else + return "system"; +#endif +} + +DEFINE_THISCALL_WRAPPER(system_category_message, 12) +basic_string_char* __thiscall system_category_message(const custom_category *this, + basic_string_char *ret, int err) +{ +#if _MSVCP_VER > 100 + const char *msg = _Winerror_map_str(err); + if (!msg) return MSVCP_basic_string_char_ctor_cstr(ret, "unknown error"); + return MSVCP_basic_string_char_ctor_cstr(ret, msg); +#else + return custom_category_message(this, ret, err); +#endif } /* ?system_category(a)std@@YAABVerror_category(a)1@XZ */ @@ -1140,13 +1166,6 @@ const char* __thiscall generic_category_name(const custom_category *this) #endif } -DEFINE_THISCALL_WRAPPER(custom_category_message, 12) -basic_string_char* __thiscall custom_category_message(const custom_category *this, - basic_string_char *ret, int err) -{ - return MSVCP_basic_string_char_ctor_cstr(ret, strerror(err)); -} - /* ?generic_category(a)std@@YAABVerror_category(a)1@XZ */ /* ?generic_category(a)std@@YAAEBVerror_category(a)1@XZ */ const error_category* __cdecl std_generic_category(void) @@ -1729,11 +1748,11 @@ __ASM_BLOCK_BEGIN(misc_vtables) VTABLE_ADD_FUNC(custom_category_default_error_condition) VTABLE_ADD_FUNC(custom_category_equivalent) VTABLE_ADD_FUNC(custom_category_equivalent_code)); -#if _MSVCP_VER == 100 +#if _MSVCP_VER == 100 || _MSVCP_VER >= 140 __ASM_VTABLE(system_category, VTABLE_ADD_FUNC(custom_category_vector_dtor) - VTABLE_ADD_FUNC(custom_category_name) - VTABLE_ADD_FUNC(custom_category_message) + VTABLE_ADD_FUNC(system_category_name) + VTABLE_ADD_FUNC(system_category_message) VTABLE_ADD_FUNC(custom_category_default_error_condition) VTABLE_ADD_FUNC(custom_category_equivalent) VTABLE_ADD_FUNC(custom_category_equivalent_code)); @@ -1759,7 +1778,7 @@ void init_misc(void *base) init_generic_category_rtti(base); init_iostream_category_rtti(base); #endif -#if _MSVCP_VER == 100 +#if _MSVCP_VER == 100 || _MSVCP_VER >= 140 init_system_category_rtti(base); #endif #if _MSVCP_VER >= 110 @@ -1772,7 +1791,7 @@ void init_misc(void *base) generic_category_ctor(&generic_category); #endif -#if _MSVCP_VER == 100 +#if _MSVCP_VER == 100 || _MSVCP_VER >= 140 system_category_ctor(&system_category); #endif } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 3b97cfefd4b..9471b896ba5 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -694,12 +694,15 @@ typedef struct { const error_category* __cdecl std_iostream_category(void); const error_category* __cdecl std_generic_category(void); +const error_category* __cdecl std_system_category(void); typedef struct { int code; const error_category *category; } error_code; + +const char *_Winerror_map_str(int err); #endif #if _MSVCP_VER < 80 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4893
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index a08101052da..3ae190abeb3 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -28,6 +28,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #if _MSVCP_VER >= 110 /* error strings generated with glibc strerror */ +#if _MSVCP_VER >= 140 +static const char str_SUCC[] = "success"; +#endif static const char str_EPERM[] = "operation not permitted"; static const char str_ENOENT[] = "no such file or directory"; static const char str_ESRCH[] = "no such process"; @@ -112,6 +115,9 @@ static const struct { const char *str; } syserror_map[] = { +#if _MSVCP_VER >= 140 + {0, str_SUCC}, +#endif {EPERM, str_EPERM}, {ENOENT, str_ENOENT}, {ESRCH, str_ESRCH}, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4893
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=142182 Your paranoid android. === debian11 (32 bit report) === msvcp140: msvcp140.c:1401: Test failed: r1 = 78E2DE24(success), r2 = 78E2C836(unknown error) === debian11b (64 bit WoW report) === msvcp140: msvcp140.c:1401: Test failed: r1 = 00000000742148F8(success), r2 = 000000007421305A(unknown error)
Piotr, according to the bug report we might also need to implement the regex exceptions @ stub ?\_Xregex_error(a)std@@YAXW4error_type(a)regex_constants@1@@Z ,which is almost the same as, @ stub ?\_Xbad(a)tr1@std@@YAXW4error_type(a)regex_constants@12@@Z -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4893#note_58279
participants (5)
-
Marvin -
Piotr Caban -
Piotr Caban (＠piotr)
-
Vijay Kiran Kamuju
-
Vijay Kiran Kamuju (＠infyquest)