Eric Pouech : msvcrt: Some more fixes to name demangling.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: f7441f9e1a5017138a436d7cf524d0b4d596264b
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=f7441f9e1a5017138a436d7cf524d0b4d596264b

Author: Eric Pouech <eric.pouech at wanadoo.fr>
Date:   Sun Mar  5 21:48:35 2006 +0100

msvcrt: Some more fixes to name demangling.

---

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

diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c
index 8165ffd..94c7a58 100644
--- a/dlls/msvcrt/tests/cpp.c
+++ b/dlls/msvcrt/tests/cpp.c
@@ -972,6 +972,7 @@ static void test_demangle(void)
 {"??0aa.a@@QAE at XZ", "??0aa.a@@QAE at XZ"},
 {"??0aa$_3a@@QAE at XZ", "public: __thiscall aa$_3a::aa$_3a(void)"},
 {"??2?$aaa at AAUbbb@@AAUccc@@AAU2@@ddd at 1eee@2 at QAEHXZ", "public: int __thiscall eee::eee::ddd::ddd::aaa<struct bbb &,struct ccc &,struct ccc &>::operator new(void)"},
+{"?pSW@@3P6GHKPAX0PAU_tagSTACKFRAME@@0P6GH0K0KPAK at ZP6GPAX0K@ZP6GK0K at ZP6GK00PAU_tagADDRESS@@@Z at 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;
diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c
index d2e7668..1cda196 100644
--- a/dlls/msvcrt/undname.c
+++ b/dlls/msvcrt/undname.c
@@ -851,7 +851,11 @@ static BOOL handle_data(struct parsed_sy
     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;
         }