ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Fix precision handling for string arguments. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2017-08-31 19:22:55 +02:00 committed by Alexandre Julliard
parent 3eb0d2868c
commit 2a2f525eb3
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcrt/msvcrt.h
View File

@ -1094,6 +1094,8 @@ char*** __cdecl MSVCRT___p__environ(void);
int* __cdecl __p___mb_cur_max(void); int* __cdecl __p___mb_cur_max(void);
unsigned int* __cdecl __p__fmode(void); unsigned int* __cdecl __p__fmode(void);
MSVCRT_wchar_t* __cdecl MSVCRT__wcsdup(const MSVCRT_wchar_t*); MSVCRT_wchar_t* __cdecl MSVCRT__wcsdup(const MSVCRT_wchar_t*);
MSVCRT_size_t __cdecl MSVCRT_strnlen(const char *,MSVCRT_size_t);
MSVCRT_size_t __cdecl MSVCRT_wcsnlen(const MSVCRT_wchar_t*,MSVCRT_size_t);
MSVCRT_wchar_t*** __cdecl MSVCRT___p__wenviron(void); MSVCRT_wchar_t*** __cdecl MSVCRT___p__wenviron(void);
INT __cdecl MSVCRT_wctomb(char*,MSVCRT_wchar_t); INT __cdecl MSVCRT_wctomb(char*,MSVCRT_wchar_t);
char* __cdecl MSVCRT__strdate(char* date); char* __cdecl MSVCRT__strdate(char* date);

18
dlls/msvcrt/printf.h
View File

@ -165,8 +165,13 @@ static inline int FUNC_NAME(pf_output_format_wstr)(FUNC_NAME(puts_clbk) pf_puts,
{ {
int r, ret; int r, ret;
if(len < 0) if(len < 0) {
len = strlenW(str); /* Do not search past the length specified by the precision. */
if(flags->Precision>=0)
len = MSVCRT_wcsnlen(str, flags->Precision);
else
len = strlenW(str);
}
if(flags->Precision>=0 && flags->Precision<len) if(flags->Precision>=0 && flags->Precision<len)
len = flags->Precision; len = flags->Precision;
@ -190,8 +195,13 @@ static inline int FUNC_NAME(pf_output_format_str)(FUNC_NAME(puts_clbk) pf_puts,
{ {
int r, ret; int r, ret;
if(len < 0) if(len < 0) {
len = strlen(str); /* Do not search past the length specified by the precision. */
if(flags->Precision>=0)
len = MSVCRT_strnlen(str, flags->Precision);
else
len = strlen(str);
}
if(flags->Precision>=0 && flags->Precision<len) if(flags->Precision>=0 && flags->Precision<len)
len = flags->Precision; len = flags->Precision;