ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Add support for function namespaces in symbol demangling.

This commit is contained in:
Alexandre Julliard 2011-05-15 19:55:56 +02:00
parent 5d12e970ff
commit 0c45c8b58e
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/msvcrt/tests/cpp.c
View File

@ -1056,6 +1056,9 @@ static void test_demangle(void)
/* 121 */ {"??$?DM@std@@YA?AV?$complex@M@0@ABMABV10@@Z", /* 121 */ {"??$?DM@std@@YA?AV?$complex@M@0@ABMABV10@@Z",
"class std::complex<float> __cdecl std::operator*<float>(float const &,class std::complex<float> const &)", "class std::complex<float> __cdecl std::operator*<float>(float const &,class std::complex<float> const &)",
"??$?DM@std@@YA?AV?$complex@M@0@ABMABV10@@Z"}, "??$?DM@std@@YA?AV?$complex@M@0@ABMABV10@@Z"},
/* 122 */ {"?_R2@?BN@???$_Fabs@N@std@@YANAEBV?$complex@N@1@PEAH@Z@4NB",
"double const `double __cdecl std::_Fabs<double>(class std::complex<double> const & __ptr64,int * __ptr64)'::`29'::_R2",
"?_R2@?BN@???$_Fabs@N@std@@YANAEBV?$complex@N@1@PEAH@Z@4NB"},
}; };
int i, num_test = (sizeof(test)/sizeof(test[0])); int i, num_test = (sizeof(test)/sizeof(test[0]));

29
dlls/msvcrt/undname.c
View File

@ -106,6 +106,8 @@ struct datatype_t
const char* right; const char* right;
}; };
static BOOL symbol_demangle(struct parsed_symbol* sym);
/****************************************************************** /******************************************************************
* und_alloc * und_alloc
* *
@ -597,12 +599,31 @@ static BOOL get_class(struct parsed_symbol* sym)
name = str_array_get_ref(&sym->names, *sym->current++ - '0'); name = str_array_get_ref(&sym->names, *sym->current++ - '0');
break; break;
case '?': case '?':
if (*++sym->current == '$') switch (*++sym->current)
{ {
case '$':
sym->current++; sym->current++;
if ((name = get_template_name(sym)) && if ((name = get_template_name(sym)) &&
!str_array_push(sym, name, -1, &sym->names)) !str_array_push(sym, name, -1, &sym->names))
return FALSE; return FALSE;
break;
case '?':
{
struct array stack = sym->stack;
unsigned int start = sym->names.start;
unsigned int num = sym->names.num;
str_array_init( &sym->stack );
if (symbol_demangle( sym )) name = str_printf( sym, "`%s'", sym->result );
sym->names.start = start;
sym->names.num = num;
sym->stack = stack;
}
break;
default:
if (!(name = get_number( sym ))) return FALSE;
name = str_printf( sym, "`%s'", name );
break;
} }
break; break;
default: default:
@ -1233,8 +1254,6 @@ static BOOL symbol_demangle(struct parsed_symbol* sym)
/* MS mangled names always begin with '?' */ /* MS mangled names always begin with '?' */
if (*sym->current != '?') return FALSE; if (*sym->current != '?') return FALSE;
str_array_init(&sym->names);
str_array_init(&sym->stack);
sym->current++; sym->current++;
/* Then function name or operator code */ /* Then function name or operator code */
@ -1436,7 +1455,7 @@ static BOOL symbol_demangle(struct parsed_symbol* sym)
sym->flags &= ~UNDNAME_NO_FUNCTION_RETURNS; sym->flags &= ~UNDNAME_NO_FUNCTION_RETURNS;
break; break;
case 5: case 5:
sym->names.start = 1; sym->names.start++;
break; break;
} }
@ -1497,6 +1516,8 @@ char* CDECL __unDNameEx(char* buffer, const char* mangled, int buflen,
sym.mem_alloc_ptr = memget; sym.mem_alloc_ptr = memget;
sym.mem_free_ptr = memfree; sym.mem_free_ptr = memfree;
sym.current = mangled; sym.current = mangled;
str_array_init( &sym.names );
str_array_init( &sym.stack );
result = symbol_demangle(&sym) ? sym.result : mangled; result = symbol_demangle(&sym) ? sym.result : mangled;
if (buffer && buflen) if (buffer && buflen)