system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 10:54:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msvcrt: Add support for C++11 operator "" in demangling.

Browse source 
Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
This commit is contained in:
Eric Pouech 2022-07-16 12:20:25 +02:00 committed by Alexandre Julliard
parent d89e7cd443
commit e0b6ceeaac
2 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlls/msvcrt/undname.c
View file

@ -1488,6 +1488,19 @@ static BOOL symbol_demangle(struct parsed_symbol* sym)
case 'V': function_name = "operator delete[]"; break;
case 'X': function_name = "`placement delete closure'"; break;
case 'Y': function_name = "`placement delete[] closure'"; break;
case '_':
switch (*++sym->current)
{
case 'K':
sym->current++;
function_name = str_printf(sym, "operator \"\" %s", get_literal_string(sym));
--sym->current;
break;
default:
FIXME("Unknown operator: __%c\n", *sym->current);
return FALSE;
}
break;
default:
ERR("Unknown operator: _%c\n", *sym->current);
return FALSE;

31
dlls/ucrtbase/tests/cpp.c
View file

@ -192,19 +192,24 @@ static void test___std_type_info(void)
static void test___unDName(void)
{
char *name;
name = p___unDName(0, "??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z", 0, malloc, free, 0);
ok(!strcmp(name, "public: class QDnsDomainNameRecord & __thiscall "
"QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord &&)"),
"unDName returned %s\n", wine_dbgstr_a(name));
free(name);
name = p___unDName(0, "??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z", 0, malloc, free, 0);
ok(!strcmp(name, "public: class QDnsDomainNameRecord & __thiscall "
"QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord && __ptr64)"),
"unDName returned %s\n", wine_dbgstr_a(name));
free(name);
static struct {const char *in; const char *out; const char *broken;} und_tests[] =
{
/* 1 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z",
"public: class QDnsDomainNameRecord & __thiscall QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord &&)"},
/* 2 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z",
"public: class QDnsDomainNameRecord & __thiscall QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord && __ptr64)"},
/* 3 */ {"??__K_l@@YA?AUCC@@I@Z", "struct CC __cdecl operator \"\" _l(unsigned int)",
"??__K_l@@YA?AUCC@@I@Z" /* W10 1507 fails on this :-( */},
};
unsigned i;
for (i = 0; i < ARRAY_SIZE(und_tests); i++)
{
char *name = p___unDName(0, und_tests[i].in, 0, malloc, free, 0);
ok(!strcmp(name, und_tests[i].out) ||
(broken(und_tests[i].broken && !strcmp(und_tests[i].broken, name))),
"unDName returned %s for #%u\n", wine_dbgstr_a(name), i);
free(name);
}
}
START_TEST(cpp)