marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct handling of zero-padded negative numbers; transfer the sign 

BEFORE adding the zeroes.
oldstable
Bill Medland 2002-04-20 20:53:59 +00:00 committed by Alexandre Julliard
parent c31086870f
commit 28cbea801c
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/user/wsprintf.c
View File

@ -277,7 +277,7 @@ static INT16 wvsnprintf16( LPSTR buffer, UINT16 maxlen, LPCSTR spec,
{ {
WPRINTF_FORMAT format; WPRINTF_FORMAT format;
LPSTR p = buffer; LPSTR p = buffer;
UINT i, len; UINT i, len, sign;
CHAR number[20]; CHAR number[20];
WPRINTF_DATA cur_arg; WPRINTF_DATA cur_arg;
SEGPTR seg_str; SEGPTR seg_str;
@ -318,6 +318,7 @@ static INT16 wvsnprintf16( LPSTR buffer, UINT16 maxlen, LPCSTR spec,
continue; continue;
} }
len = WPRINTF_GetLen( &format, &cur_arg, number, maxlen - 1 ); len = WPRINTF_GetLen( &format, &cur_arg, number, maxlen - 1 );
sign = 0;
if (!(format.flags & WPRINTF_LEFTALIGN)) if (!(format.flags & WPRINTF_LEFTALIGN))
for (i = format.precision; i < format.width; i++, maxlen--) for (i = format.precision; i < format.width; i++, maxlen--)
*p++ = ' '; *p++ = ' ';
@ -346,9 +347,16 @@ static INT16 wvsnprintf16( LPSTR buffer, UINT16 maxlen, LPCSTR spec,
} }
/* fall through */ /* fall through */
case WPR_SIGNED: case WPR_SIGNED:
/* Transfer the sign now, just in case it will be zero-padded*/
if (number[0] == '-')
{
*p++ = '-';
sign = 1;
}
/* fall through */
case WPR_UNSIGNED: case WPR_UNSIGNED:
for (i = len; i < format.precision; i++, maxlen--) *p++ = '0'; for (i = len; i < format.precision; i++, maxlen--) *p++ = '0';
if (len) memcpy( p, number, len ); if (len > sign) memcpy( p, number + sign, len - sign );
p += len; p += len;
break; break;
case WPR_UNKNOWN: case WPR_UNKNOWN:
@ -371,7 +379,7 @@ INT WINAPI wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args )
{ {
WPRINTF_FORMAT format; WPRINTF_FORMAT format;
LPSTR p = buffer; LPSTR p = buffer;
UINT i, len; UINT i, len, sign;
CHAR number[20]; CHAR number[20];
WPRINTF_DATA argData; WPRINTF_DATA argData;
@ -409,6 +417,7 @@ INT WINAPI wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args )
} }
len = WPRINTF_GetLen( &format, &argData, number, maxlen - 1 ); len = WPRINTF_GetLen( &format, &argData, number, maxlen - 1 );
sign = 0;
if (!(format.flags & WPRINTF_LEFTALIGN)) if (!(format.flags & WPRINTF_LEFTALIGN))
for (i = format.precision; i < format.width; i++, maxlen--) for (i = format.precision; i < format.width; i++, maxlen--)
*p++ = ' '; *p++ = ' ';
@ -440,10 +449,17 @@ INT WINAPI wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, va_list args )
} }
/* fall through */ /* fall through */
case WPR_SIGNED: case WPR_SIGNED:
/* Transfer the sign now, just in case it will be zero-padded*/
if (number[0] == '-')
{
*p++ = '-';
sign = 1;
}
/* fall through */
case WPR_UNSIGNED: case WPR_UNSIGNED:
for (i = len; i < format.precision; i++, maxlen--) *p++ = '0'; for (i = len; i < format.precision; i++, maxlen--) *p++ = '0';
memcpy( p, number, len ); memcpy( p, number + sign, len - sign );
p += len; p += len - sign;
break; break;
case WPR_UNKNOWN: case WPR_UNKNOWN:
continue; continue;
@ -466,7 +482,7 @@ INT WINAPI wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, va_list args )
{ {
WPRINTF_FORMAT format; WPRINTF_FORMAT format;
LPWSTR p = buffer; LPWSTR p = buffer;
UINT i, len; UINT i, len, sign;
CHAR number[20]; CHAR number[20];
WPRINTF_DATA argData; WPRINTF_DATA argData;
@ -504,6 +520,7 @@ INT WINAPI wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, va_list args )
} }
len = WPRINTF_GetLen( &format, &argData, number, maxlen - 1 ); len = WPRINTF_GetLen( &format, &argData, number, maxlen - 1 );
sign = 0;
if (!(format.flags & WPRINTF_LEFTALIGN)) if (!(format.flags & WPRINTF_LEFTALIGN))
for (i = format.precision; i < format.width; i++, maxlen--) for (i = format.precision; i < format.width; i++, maxlen--)
*p++ = ' '; *p++ = ' ';
@ -535,9 +552,16 @@ INT WINAPI wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, va_list args )
} }
/* fall through */ /* fall through */
case WPR_SIGNED: case WPR_SIGNED:
/* Transfer the sign now, just in case it will be zero-padded*/
if (number[0] == '-')
{
*p++ = '-';
sign = 1;
}
/* fall through */
case WPR_UNSIGNED: case WPR_UNSIGNED:
for (i = len; i < format.precision; i++, maxlen--) *p++ = '0'; for (i = len; i < format.precision; i++, maxlen--) *p++ = '0';
for (i = 0; i < len; i++) *p++ = (WCHAR)number[i]; for (i = sign; i < len; i++) *p++ = (WCHAR)number[i];
break; break;
case WPR_UNKNOWN: case WPR_UNKNOWN:
continue; continue;