msvcrt: Some more fixes to name demangling.

This commit is contained in:
Eric Pouech 2006-03-05 21:48:35 +01:00 committed by Alexandre Julliard
parent e70617883b
commit f7441f9e1a
2 changed files with 6 additions and 1 deletions

View File

@ -972,6 +972,7 @@ static void test_demangle(void)
{"??0aa.a@@QAE@XZ", "??0aa.a@@QAE@XZ"},
{"??0aa$_3a@@QAE@XZ", "public: __thiscall aa$_3a::aa$_3a(void)"},
{"??2?$aaa@AAUbbb@@AAUccc@@AAU2@@ddd@1eee@2@QAEHXZ", "public: int __thiscall eee::eee::ddd::ddd::aaa<struct bbb &,struct ccc &,struct ccc &>::operator new(void)"},
{"?pSW@@3P6GHKPAX0PAU_tagSTACKFRAME@@0P6GH0K0KPAK@ZP6GPAX0K@ZP6GK0K@ZP6GK00PAU_tagADDRESS@@@Z@ZA", "int (__stdcall* pSW)(unsigned long,void *,void *,struct _tagSTACKFRAME *,void *,int (__stdcall*)(void *,unsigned long,void *,unsigned long,unsigned long *),void * (__stdcall*)(void *,unsigned long),unsigned long (__stdcall*)(void *,unsigned long),unsigned long (__stdcall*)(void *,void *,struct _tagADDRESS *))"},
};
int i, num_test = (sizeof(test)/sizeof(test[0]));
char* name;

View File

@ -851,7 +851,11 @@ static BOOL handle_data(struct parsed_symbol* sym)
case '3': case '4': case '5':
{
unsigned mark = sym->stack.num;
if (!demangle_datatype(sym, &ct, NULL, FALSE)) goto done;
struct array pmt;
str_array_init(&pmt);
if (!demangle_datatype(sym, &ct, &pmt, FALSE)) goto done;
if (!get_modifier(*sym->current++, &modifier)) goto done;
sym->stack.num = mark;
}