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

msvcrt: Add parameters to mimic *_s function behaviour in pf_vsnprintf.

Browse Source
This commit is contained in:
Piotr Caban 2010-04-19 10:57:31 +02:00 committed by Alexandre Julliard
parent 419f902546
commit 09a32152d5
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/msvcrt/wcs.c
View File

@ -554,7 +554,8 @@ static void pf_fixup_exponent( char *buf )
* *
* implements both A and W vsnprintf functions * implements both A and W vsnprintf functions
*/ */
static int pf_vsnprintf( pf_output *out, const WCHAR *format, MSVCRT__locale_t locale, __ms_va_list valist ) static int pf_vsnprintf( pf_output *out, const WCHAR *format,
MSVCRT__locale_t locale, BOOL valid, __ms_va_list valist )
{ {
int r; int r;
LPCWSTR q, p = format; LPCWSTR q, p = format;
@ -785,9 +786,20 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, MSVCRT__locale_t l
r = pf_output_stringA( out, x, -1 ); r = pf_output_stringA( out, x, -1 );
if( x != number ) if( x != number )
HeapFree( GetProcessHeap(), 0, x ); HeapFree( GetProcessHeap(), 0, x );
if(r < 0)
return r;
} }
else else
{
if( valid )
{
MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 );
*MSVCRT__errno() = MSVCRT_EINVAL;
return -1;
}
continue; continue;
}
if( r<0 ) if( r<0 )
return r; return r;
@ -821,7 +833,7 @@ int CDECL MSVCRT_vsnprintf( char *str, unsigned int len,
formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) );
MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz );
r = pf_vsnprintf( &out, formatW, NULL, valist ); r = pf_vsnprintf( &out, formatW, NULL, FALSE, valist );
HeapFree( GetProcessHeap(), 0, formatW ); HeapFree( GetProcessHeap(), 0, formatW );
@ -878,7 +890,7 @@ int CDECL MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len,
out.used = 0; out.used = 0;
out.len = len; out.len = len;
return pf_vsnprintf( &out, format, NULL, valist ); return pf_vsnprintf( &out, format, NULL, FALSE, valist );
} }
/********************************************************************* /*********************************************************************