Piotr Caban : msvcrt: Add support for vtordispex demangling.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0aa72d880a9d6a3a72252f4e0d75cab4608185dd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0aa72d880a9d6a3a72252f4e0d75cab4608185dd

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Mon Oct  7 13:01:24 2013 +0200

msvcrt: Add support for vtordispex demangling.

---

 dlls/msvcrt/tests/cpp.c |    3 +++
 dlls/msvcrt/undname.c   |   32 +++++++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c
index f36641e..e545a5f 100644
--- a/dlls/msvcrt/tests/cpp.c
+++ b/dlls/msvcrt/tests/cpp.c
@@ -1315,6 +1315,9 @@ static void test_demangle(void)
 /* 124 */ {"??_9CView@@$BBII at AE",
            "[thunk]: __thiscall CView::`vcall'{392,{flat}}' }'",
            "[thunk]: __thiscall CView::`vcall'{392,{flat}}' "},
+/* 125 */ {"?_dispatch at _impl_Engine@SalomeApp@@$R4CE at BA@PPPPPPPM at 7AE_NAAVomniCallHandle@@@Z",
+           "[thunk]:public: virtual bool __thiscall SalomeApp::_impl_Engine::_dispatch`vtordispex{36,16,4294967292,8}' (class omniCallHandle &)",
+           "?_dispatch at _impl_Engine@SalomeApp@@$R4CE at BA@PPPPPPPM at 7AE_NAAVomniCallHandle@@@Z"},
     };
     int i, num_test = (sizeof(test)/sizeof(test[0]));
     char* name;
diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c
index bc2a6fb..396a003 100644
--- a/dlls/msvcrt/undname.c
+++ b/dlls/msvcrt/undname.c
@@ -1113,12 +1113,15 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op)
      * "$4" public: thunk vtordisp
      * "$5" public: thunk vtordisp
      * "$B" vcall thunk
+     * "$R" thunk vtordispex
      */
     accmem = *sym->current++;
     if (accmem == '$')
     {
         if (*sym->current >= '0' && *sym->current <= '5')
             access_id = (*sym->current - '0') / 2;
+        else if (*sym->current == 'R')
+            access_id = (sym->current[1] - '0') / 2;
         else if (*sym->current != 'B')
             goto done;
     }
@@ -1136,7 +1139,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op)
     if (accmem == '$' || (accmem - 'A') % 8 == 6 || (accmem - 'A') % 8 == 7)
         access = str_printf(sym, "[thunk]:%s", access ? access : " ");
 
-    if (accmem == '$' && *sym->current >= '0' && *sym->current <= '5')
+    if (accmem == '$' && *sym->current != 'B')
         member_type = "virtual ";
     else if (accmem <= 'X')
     {
@@ -1154,19 +1157,38 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op)
 
     name = get_class_string(sym, 0);
 
-    if (accmem == '$' && *sym->current++ == 'B') /* vcall thunk */
+    if (accmem == '$' && *sym->current == 'B') /* vcall thunk */
     {
-        const char *n = get_number(sym);
+        const char *n;
+
+        sym->current++;
+        n = get_number(sym);
 
         if(!n || *sym->current++ != 'A') goto done;
         name = str_printf(sym, "%s{%s,{flat}}' }'", name, n);
         has_args = FALSE;
         has_ret = FALSE;
     }
+    else if (accmem == '$' && *sym->current == 'R') /* vtordispex thunk */
+    {
+        const char *n1, *n2, *n3, *n4;
+
+        sym->current += 2;
+        n1 = get_number(sym);
+        n2 = get_number(sym);
+        n3 = get_number(sym);
+        n4 = get_number(sym);
+
+        if(!n1 || !n2 || !n3 || !n4) goto done;
+        name = str_printf(sym, "%s`vtordispex{%s,%s,%s,%s}' ", name, n1, n2, n3, n4);
+    }
     else if (accmem == '$') /* vtordisp thunk */
     {
-        const char *n1 = get_number(sym);
-        const char *n2 = get_number(sym);
+        const char *n1, *n2;
+
+        sym->current++;
+        n1 = get_number(sym);
+        n2 = get_number(sym);
 
         if (!n1 || !n2) goto done;
         name = str_printf(sym, "%s`vtordisp{%s,%s}' ", name, n1, n2);