Piotr Caban : msvcp140: Add _XGetLastError implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1d917529f13a14fc304cec8540e18c48ba39c15a
URL:    https://gitlab.winehq.org/wine/wine/-/commit/1d917529f13a14fc304cec8540e18c4...

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Sat Jan 20 20:20:54 2024 +0100

msvcp140: Add _XGetLastError implementation.

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