Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-27 07:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRT]

Browse source 
Fix miscalculation of number of decimal points to shift for %f format. Should fix shlwapi:string tests and bug 5818.

svn path=/trunk/; revision=50385
This commit is contained in:
Timo Kreuzer 2011-01-14 20:00:10 +00:00
parent e1fd32ceb8
commit 3d2338dcfb
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
reactos/lib/sdk/crt/printf/streamout.c
View file

@ -115,14 +115,6 @@ format_float(
exponent = get_exp(fpval); exponent = get_exp(fpval);
sign = fpval < 0 ? -1 : 1; sign = fpval < 0 ? -1 : 1;
/* Shift the decimal point and round */
fpval2 = round(sign * fpval * pow(10., precision - exponent));
if (fpval2 >= (unsigned __int64)pow(10., precision + 1))
{
exponent++;
fpval2 = round(sign * fpval * pow(10., precision - exponent));
}
switch (chr) switch (chr)
{ {
case _T('G'): case _T('G'):
@ -131,6 +123,9 @@ format_float(
if (precision > 0) precision--; if (precision > 0) precision--;
if (exponent < -4 || exponent >= precision) goto case_e; if (exponent < -4 || exponent >= precision) goto case_e;
/* Shift the decimal point and round */
fpval2 = round(sign * fpval * pow(10., precision));
/* Skip trailing zeroes */ /* Skip trailing zeroes */
while (precision && (unsigned __int64)fpval2 % 10 == 0) while (precision && (unsigned __int64)fpval2 % 10 == 0)
{ {
@ -143,6 +138,16 @@ format_float(
digits = digits_u; digits = digits_u;
case _T('e'): case _T('e'):
case_e: case_e:
/* Shift the decimal point and round */
fpval2 = round(sign * fpval * pow(10., precision - exponent));
/* Compensate for changed exponent through rounding */
if (fpval2 >= (unsigned __int64)pow(10., precision + 1))
{
exponent++;
fpval2 = round(sign * fpval * pow(10., precision - exponent));
}
val32 = exponent >= 0 ? exponent : -exponent; val32 = exponent >= 0 ? exponent : -exponent;
// FIXME: handle length of exponent field: // FIXME: handle length of exponent field:
@ -168,6 +173,8 @@ format_float(
// FIXME: TODO // FIXME: TODO
case _T('f'): case _T('f'):
/* Shift the decimal point and round */
fpval2 = round(sign * fpval * pow(10., precision));
break; break;
} }