Eric Pouech : winedump: Correctly unmangle qualified pointer to function/method.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d45cbca3780a0f69d16f22fd9811b10fdebddf39
URL:    https://gitlab.winehq.org/wine/wine/-/commit/d45cbca3780a0f69d16f22fd9811b10...

Author: Eric Pouech 
Date:   Fri May 17 11:27:51 2024 +0200

winedump: Correctly unmangle qualified pointer to function/method.

Signed-off-by: Eric Pouech

---

tools/winedump/msmangle.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c
index 2ac96a3fe5a..17954740cff 100644
--- a/tools/winedump/msmangle.c
+++ b/tools/winedump/msmangle.c
@@ -887,14 +887,22 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct,
     case 'B': /* volatile reference */
         if (!get_qualified_type(ct, sym, dt, flags)) goto done;
         break;
+    case 'P': /* Pointer */
     case 'Q': /* const pointer */
     case 'R': /* volatile pointer */
     case 'S': /* const volatile pointer */
-        if (!get_qualified_type(ct, sym, (flags & IN_ARGS) ? dt : 'P', flags)) goto done;
-        break;
-    case 'P': /* Pointer */
+        if (!(flags & IN_ARGS)) dt = 'P';
         if (isdigit(*sym->current))
-	{
+        {
+            const char *ptr_qualif;
+            switch (dt)
+            {
+            default:
+            case 'P': ptr_qualif = NULL; break;
+            case 'Q': ptr_qualif = "const"; break;
+            case 'R': ptr_qualif = "volatile"; break;
+            case 'S': ptr_qualif = "const volatile"; break;
+            }
             /* FIXME:
              *   P6 = Function pointer
              *   P8 = Member function pointer
@@ -912,10 +920,10 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct,
                 if (!get_function_qualifier(sym, &function_qualifier))
                     goto done;
                 if (!get_function_signature(sym, &fs))
-                     goto done;
+                    goto done;

-                ct->left  = str_printf(sym, "%s%s (%s %s::*",
-                                       fs.return_ct.left, fs.return_ct.right, fs.call_conv, class);
+                ct->left  = str_printf(sym, "%s%s (%s %s::*%s",
+                                       fs.return_ct.left, fs.return_ct.right, fs.call_conv, class, ptr_qualif);
                 ct->right = str_printf(sym, ")%s%s", fs.arguments, function_qualifier);
             }
             else if (*sym->current == '6')
@@ -927,14 +935,14 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct,
                 if (!get_function_signature(sym, &fs))
                      goto done;

-                ct->left  = str_printf(sym, "%s%s (%s*",
-                                       fs.return_ct.left, fs.return_ct.right, fs.call_conv);
+                ct->left  = str_printf(sym, "%s%s (%s*%s",
+                                       fs.return_ct.left, fs.return_ct.right, fs.call_conv, ptr_qualif);
                 ct->flags = DT_NO_LEADING_WS;
                 ct->right = str_printf(sym, ")%s", fs.arguments);
             }
             else goto done;
    }
-	else if (!get_qualified_type(ct, sym, 'P', flags)) goto done;
+	else if (!get_qualified_type(ct, sym, dt, flags)) goto done;
         break;
     case 'W':
         if (*sym->current == '4')