Eric Pouech : msvcrt: Fix demangling of RTTI type descriptor.

Alexandre Julliard julliard at winehq.org
Mon Jul 18 15:45:50 CDT 2022


Module: wine
Branch: master
Commit: d89e7cd443cecbd178ca06832f5e2d957255417a
URL:    https://gitlab.winehq.org/wine/wine/-/commit/d89e7cd443cecbd178ca06832f5e2d957255417a

Author: Eric Pouech <eric.pouech at gmail.com>
Date:   Sat Jul 16 12:20:25 2022 +0200

msvcrt: Fix demangling of RTTI type descriptor.

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>

---

 dlls/msvcrt/tests/cpp.c | 1 +
 dlls/msvcrt/undname.c   | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c
index 15105ca60dd..8c6b059e788 100644
--- a/dlls/msvcrt/tests/cpp.c
+++ b/dlls/msvcrt/tests/cpp.c
@@ -1291,6 +1291,7 @@ static void test_demangle(void)
            "??$run at XVTask_Render_Preview@@@QtConcurrent@@YA?AV?$QFuture at X@@PEAVTask_Render_Preview@@P82 at EAAXXZ@Z"},
 /* 130 */ {"??_E?$TStrArray@$$BY0BAA at D$0BA@@@UAEPAXI at Z",
            "public: virtual void * __thiscall TStrArray<char [256],16>::`vector deleting destructor'(unsigned int)"},
+/* 131 */ {"??_R0?AVCC at DD@@@8", "class DD::CC `RTTI Type Descriptor'"},
     };
     int i, num_test = ARRAY_SIZE(test);
     char* name;
diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c
index bee171de42f..d71738efd5f 100644
--- a/dlls/msvcrt/undname.c
+++ b/dlls/msvcrt/undname.c
@@ -1452,11 +1452,8 @@ static BOOL symbol_demangle(struct parsed_symbol* sym)
                 case '0':
                     {
                         struct datatype_t       ct;
-                        struct array pmt;
 
                         sym->current++;
-                        str_array_init(&pmt);
-                        demangle_datatype(sym, &ct, &pmt, FALSE);
                         if (!demangle_datatype(sym, &ct, NULL, FALSE))
                             goto done;
                         function_name = str_printf(sym, "%s%s `RTTI Type Descriptor'",




More information about the wine-cvs mailing list