system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 05:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

ucrtbase: Handle empty list in variadic template.

Browse source
This commit is contained in:
Piotr Caban 2024-05-14 18:43:05 +02:00 committed by Alexandre Julliard
parent ab9201be5c
commit 841f33afbb
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/msvcrt/undname.c
View file

@ -378,6 +378,12 @@ static char* get_args(struct parsed_symbol* sym, BOOL z_term,
sym->current++;
break;
}
/* Handle empty list in variadic template */
if (!z_term && sym->current[0] == '$' && sym->current[1] == '$' && sym->current[2] == 'V')
{
sym->current += 3;
continue;
}
if (!demangle_datatype(sym, &ct, IN_ARGS))
return NULL;
/* 'void' terminates an argument list in a function */

10
dlls/ucrtbase/tests/cpp.c
View file

@ -24,6 +24,8 @@
#include <windef.h>
#include <winbase.h>
#include <verrsrc.h>
#include <dbghelp.h>
#include "wine/test.h"
typedef unsigned char MSVCRT_bool;
@ -209,11 +211,15 @@ static void test___unDName(void)
/* 5 */ {"?meth@Q@@QEGBA?AV1@XZ",
"public: class Q Q::meth(void)const & ",
"public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */,
0x02 /*UNDNAME_NO_MS_KEYWORDS*/},
UNDNAME_NO_MS_KEYWORDS},
/* 6 */ {"?meth@Q@@QEHAA?AV1@XZ",
"public: class Q Q::meth(void)&& ",
"public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */,
0x02 /*UNDNAME_NO_MS_KEYWORDS*/},
UNDNAME_NO_MS_KEYWORDS},
/* 7 */ {"?AU?$my_iter@H$0A@$$V@@",
"struct my_iter<int,0>",
NULL,
UNDNAME_NO_ARGUMENTS},
};
unsigned i;
for (i = 0; i < ARRAY_SIZE(und_tests); i++)