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

msvcrt: Fix demangling of function pointers by maintaining the left/right distinction for type references.

This commit is contained in:
Alexandre Julliard 2007-10-10 19:52:16 +02:00
parent 836cdb88ce
commit 49864b084d
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -979,6 +979,8 @@ static void test_demangle(void)
{"?$aaa@Vbbb@ccc@@Vddd@2@", "aaa<class ccc::bbb,class ccc::ddd>"}, {"?$aaa@Vbbb@ccc@@Vddd@2@", "aaa<class ccc::bbb,class ccc::ddd>"},
{ "??0?$Foo@P6GHPAX0@Z@@QAE@PAD@Z", "public: __thiscall Foo<int (__stdcall*)(void *,void *)>::Foo<int (__stdcall*)(void *,void *)>(char *)"}, { "??0?$Foo@P6GHPAX0@Z@@QAE@PAD@Z", "public: __thiscall Foo<int (__stdcall*)(void *,void *)>::Foo<int (__stdcall*)(void *,void *)>(char *)"},
{ "??0?$Foo@P6GHPAX0@Z@@QAE@PAD@Z", "__thiscall Foo<int (__stdcall*)(void *,void *)>::Foo<int (__stdcall*)(void *,void *)>(char *)", 0x880}, { "??0?$Foo@P6GHPAX0@Z@@QAE@PAD@Z", "__thiscall Foo<int (__stdcall*)(void *,void *)>::Foo<int (__stdcall*)(void *,void *)>(char *)", 0x880},
{ "?Qux@Bar@@0PAP6AHPAV1@AAH1PAH@ZA", "private: static int (__cdecl** Bar::Qux)(class Bar *,int &,int &,int *)" },
{ "?Qux@Bar@@0PAP6AHPAV1@AAH1PAH@ZA", "Bar::Qux", 0x1800},
}; };
int i, num_test = (sizeof(test)/sizeof(test[0])); int i, num_test = (sizeof(test)/sizeof(test[0]));
char* name; char* name;
@ -987,7 +989,9 @@ static void test_demangle(void)
{ {
name = p__unDName(0, test[i].in, 0, pmalloc, pfree, test[i].flags); name = p__unDName(0, test[i].in, 0, pmalloc, pfree, test[i].flags);
ok(name != NULL && !strcmp_space(test[i].out, name), ok(name != NULL && !strcmp_space(test[i].out, name),
"Got name \"%s\" for %d\n", name, i); "Got name \"%s\" for %d\n", name, i );
ok(name != NULL && !strcmp_space(test[i].out, name),
"Expected \"%s\"\n", test[i].out );
pfree(name); pfree(name);
} }
} }

46
dlls/msvcrt/undname.c
View File

@ -180,7 +180,7 @@ static void str_array_init(struct array* a)
* str_array_push * str_array_push
* Adding a new string to an array * Adding a new string to an array
*/ */
static void str_array_push(struct parsed_symbol* sym, const char* ptr, size_t len, static void str_array_push(struct parsed_symbol* sym, const char* ptr, int len,
struct array* a) struct array* a)
{ {
assert(ptr); assert(ptr);
@ -366,10 +366,10 @@ static BOOL get_modifier(char ch, const char** ret)
return TRUE; return TRUE;
} }
static const char* get_modified_type(struct parsed_symbol* sym, char modif) static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym,
struct array *pmt_ref, char modif)
{ {
const char* modifier; const char* modifier;
const char* ret = NULL;
const char* str_modif; const char* str_modif;
switch (modif) switch (modif)
@ -381,7 +381,7 @@ static const char* get_modified_type(struct parsed_symbol* sym, char modif)
case 'R': str_modif = " * volatile"; break; case 'R': str_modif = " * volatile"; break;
case 'S': str_modif = " * const volatile"; break; case 'S': str_modif = " * const volatile"; break;
case '?': str_modif = ""; break; case '?': str_modif = ""; break;
default: return NULL; default: return FALSE;
} }
if (get_modifier(*sym->current++, &modifier)) if (get_modifier(*sym->current++, &modifier))
@ -390,14 +390,21 @@ static const char* get_modified_type(struct parsed_symbol* sym, char modif)
struct datatype_t sub_ct; struct datatype_t sub_ct;
/* Recurse to get the referred-to type */ /* Recurse to get the referred-to type */
if (!demangle_datatype(sym, &sub_ct, NULL, FALSE)) if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE))
return NULL; return FALSE;
ret = str_printf(sym, "%s%s%s%s%s", if (modifier)
sub_ct.left, sub_ct.left && modifier ? " " : NULL, ct->left = str_printf(sym, "%s %s%s", sub_ct.left, modifier, str_modif );
modifier, sub_ct.right, str_modif); else
{
/* don't insert a space between duplicate '*' */
if (str_modif[0] && str_modif[1] == '*' && sub_ct.left[strlen(sub_ct.left)-1] == '*')
str_modif++;
ct->left = str_printf(sym, "%s%s", sub_ct.left, str_modif );
}
ct->right = sub_ct.right;
sym->stack.num = mark; sym->stack.num = mark;
} }
return ret; return TRUE;
} }
/****************************************************************** /******************************************************************
@ -707,16 +714,16 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct,
break; break;
case '?': case '?':
/* not all the time is seems */ /* not all the time is seems */
if (!(ct->left = get_modified_type(sym, '?'))) goto done; if (!get_modified_type(ct, sym, pmt_ref, '?')) goto done;
break; break;
case 'A': /* reference */ case 'A': /* reference */
case 'B': /* volatile reference */ case 'B': /* volatile reference */
if (!(ct->left = get_modified_type(sym, dt))) goto done; if (!get_modified_type(ct, sym, pmt_ref, dt)) goto done;
break; break;
case 'Q': /* const pointer */ case 'Q': /* const pointer */
case 'R': /* volatile pointer */ case 'R': /* volatile pointer */
case 'S': /* const volatile pointer */ case 'S': /* const volatile pointer */
if (!(ct->left = get_modified_type(sym, in_args ? dt : 'P'))) goto done; if (!get_modified_type(ct, sym, pmt_ref, in_args ? dt : 'P')) goto done;
break; break;
case 'P': /* Pointer */ case 'P': /* Pointer */
if (isdigit(*sym->current)) if (isdigit(*sym->current))
@ -746,7 +753,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct,
} }
else goto done; else goto done;
} }
else if (!(ct->left = get_modified_type(sym, 'P'))) goto done; else if (!get_modified_type(ct, sym, pmt_ref, 'P')) goto done;
break; break;
case 'W': case 'W':
if (*sym->current == '4') if (*sym->current == '4')
@ -765,7 +772,9 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct,
case '0': case '1': case '2': case '3': case '4': case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9': case '5': case '6': case '7': case '8': case '9':
/* Referring back to previously parsed type */ /* Referring back to previously parsed type */
ct->left = str_array_get_ref(pmt_ref, dt - '0'); /* left and right are pushed as two separate strings */
ct->left = str_array_get_ref(pmt_ref, (dt - '0') * 2);
ct->right = str_array_get_ref(pmt_ref, (dt - '0') * 2 + 1);
if (!ct->left) goto done; if (!ct->left) goto done;
add_pmt = FALSE; add_pmt = FALSE;
break; break;
@ -804,8 +813,11 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct,
break; break;
} }
if (add_pmt && pmt_ref && in_args) if (add_pmt && pmt_ref && in_args)
str_array_push(sym, str_printf(sym, "%s%s", ct->left, ct->right), {
-1, pmt_ref); /* left and right are pushed as two separate strings */
str_array_push(sym, ct->left ? ct->left : "", -1, pmt_ref);
str_array_push(sym, ct->right ? ct->right : "", -1, pmt_ref);
}
done: done:
return ct->left != NULL; return ct->left != NULL;