msvcrt: Fix order of extended qualifiers and qualifiers.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
This commit is contained in:
Eric Pouech 2022-08-31 10:39:16 +02:00 committed by Alexandre Julliard
parent 638b06015b
commit 9a98276f98
2 changed files with 3 additions and 4 deletions

View file

@ -1310,6 +1310,7 @@ static void test_demangle(void)
/* 146 */ {"?ptititi3@@3PEStititi@@IES1@", "unsigned int volatile tititi::* __ptr64 volatile __ptr64 ptititi3"},
/* 147 */ {"?ptititi4@@3PETtititi@@IET1@", "unsigned int const volatile tititi::* __ptr64 const volatile __ptr64 ptititi4"},
/* 148 */ {"?ptititi4v@@3RETtititi@@IET1@", "unsigned int const volatile tititi::* __ptr64 const volatile __ptr64 ptititi4v"},
/* 149 */ {"?meth@AAA@@QFCEXXZ", "public: void __thiscall AAA::meth(void)volatile __unaligned "},
};
int i, num_test = ARRAY_SIZE(test);
char* name;

View file

@ -456,10 +456,8 @@ static BOOL get_modifier(struct parsed_symbol *sym, struct datatype_t *xdt, cons
case 'T': mod = "const volatile"; break;
default: return FALSE;
}
if (xdt->left && mod)
xdt->left = str_printf(sym, "%s %s", xdt->left, mod);
else if (mod)
xdt->left = mod;
if (mod)
xdt->left = xdt->left ? str_printf(sym, "%s %s", mod, xdt->left) : mod;
if (ch >= 'Q' && ch <= 'T') /* pointer to member, fetch class */
{
const char* class = get_class_name(sym);