system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-25 11:36:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msvcrt: Better handle multiple width specifiers.

Browse source 
Includes feedback from David Gow <david@davidgow.net> and Piotr Caban.

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Andrew Eikum 2021-11-08 09:42:45 -06:00 committed by Alexandre Julliard
parent e57e19c236
commit 0c6bab9339
3 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/msvcrt/printf.h
View file

@ -1050,7 +1050,14 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API
flags.LeftAlign = TRUE;
flags.FieldLength = -flags.FieldLength;
}
} else while (*p >= '0' && *p <= '9') {
}
#if _MSVCR_VER >= 140
if (*p >= '0' && *p <= '9')
flags.FieldLength = 0;
#endif
while (*p >= '0' && *p <= '9') {
flags.FieldLength *= 10;
flags.FieldLength += *p++ - '0';
}

12
dlls/msvcrt/tests/printf.c
View file

@ -396,6 +396,18 @@ static void test_sprintf( void )
ok(!strcmp(buffer, "string to copy"), "failed: \"%s\"\n", buffer);
setlocale(LC_ALL, "C");
r = p_sprintf(buffer, "%*1d", 1, 3);
ok(r==11, "r = %d\n", r);
ok(!strcmp(buffer, " 3"), "failed: \"%s\"\n", buffer);
r = p_sprintf(buffer, "%0*0d", 1, 2);
ok(r==10, "r = %d\n", r);
ok(!strcmp(buffer, "0000000002"), "failed: \"%s\"\n", buffer);
r = p_sprintf(buffer, "% *2d", 0, 7);
ok(r==2, "r = %d\n", r);
ok(!strcmp(buffer, " 7"), "failed: \"%s\"\n", buffer);
}
static void test_swprintf( void )

19
dlls/ucrtbase/tests/printf.c
View file

@ -845,6 +845,24 @@ static void test_printf_fp(void)
}
}
static void test_printf_width_specification(void)
{
int r;
char buffer[20];
r = vsprintf_wrapper(0, buffer, sizeof(buffer), "%0*2d", 1, 3);
ok(r == 2, "r = %d\n", r);
ok(!strcmp(buffer, "03"), "buffer wrong, got=%s\n", buffer);
r = vsprintf_wrapper(0, buffer, sizeof(buffer), "%*0d", 1, 2);
ok(r == 1, "r = %d\n", r);
ok(!strcmp(buffer, "2"), "buffer wrong, got=%s\n", buffer);
r = vsprintf_wrapper(0, buffer, sizeof(buffer), "% *2d", 0, 7);
ok(r == 2, "r = %d\n", r);
ok(!strcmp(buffer, " 7"), "buffer wrong, got=%s\n", buffer);
}
START_TEST(printf)
{
ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL,
@ -862,4 +880,5 @@ START_TEST(printf)
test_printf_c99();
test_printf_natural_string();
test_printf_fp();
test_printf_width_specification();
}