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

msvcrt: Fix NAN handling in printf.

This commit is contained in:
Piotr Caban 2015-03-25 14:22:02 +01:00 committed by Alexandre Julliard
parent 6de6e42a36
commit 46db64ce1b
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/msvcrt/printf.h
View File

@ -26,6 +26,10 @@
#define FUNC_NAME(func) func ## _a #define FUNC_NAME(func) func ## _a
#endif #endif
#ifndef signbit
#define signbit(x) ((x) < 0)
#endif
typedef struct FUNC_NAME(pf_flags_t) typedef struct FUNC_NAME(pf_flags_t)
{ {
APICHAR Sign, LeftAlign, Alternate, PadZero; APICHAR Sign, LeftAlign, Alternate, PadZero;
@ -539,19 +543,23 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API
int len = flags.Precision + 10; int len = flags.Precision + 10;
double val = pf_args(args_ctx, pos, VT_R8, valist).get_double; double val = pf_args(args_ctx, pos, VT_R8, valist).get_double;
int r; int r;
BOOL inf = FALSE, nan = FALSE; BOOL inf = FALSE, nan = FALSE, ind = FALSE;
if(isinf(val)) if(isinf(val))
inf = TRUE; inf = TRUE;
else if(isnan(val)) else if(isnan(val)) {
nan = TRUE; /* FIXME: NaN value may be displayed as #IND or #QNAN */ if(!signbit(val))
nan = TRUE;
else
ind = TRUE;
}
if(inf || nan) { if(inf || nan || ind) {
if(nan || val<0) if(ind || val<0)
flags.Sign = '-'; flags.Sign = '-';
if(flags.Format=='g' || flags.Format=='G') if(flags.Format=='g' || flags.Format=='G')
val = 1.1234; /* fraction will be overwritten with #INF or #IND string */ val = (nan ? 1.12345 : 1.1234); /* fraction will be overwritten with #INF, #IND or #QNAN string */
else else
val = 1; val = 1;
@ -592,18 +600,33 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API
if(decimal_point) { if(decimal_point) {
*decimal_point = *locinfo->lconv->decimal_point; *decimal_point = *locinfo->lconv->decimal_point;
if(inf || nan) { if(inf || nan || ind) {
static const char inf_str[] = "#INF"; static const char inf_str[] = "#INF";
static const char ind_str[] = "#IND"; static const char ind_str[] = "#IND";
static const char nan_str[] = "#QNAN";
for(i=1; i<(inf ? sizeof(inf_str) : sizeof(ind_str)); i++) { const char *str;
int size;
if(inf) {
str = inf_str;
size = sizeof(inf_str);
}else if(ind) {
str = ind_str;
size = sizeof(ind_str);
}else {
str = nan_str;
size = sizeof(nan_str);
}
for(i=1; i<size; i++) {
if(decimal_point[i]<'0' || decimal_point[i]>'9') if(decimal_point[i]<'0' || decimal_point[i]>'9')
break; break;
decimal_point[i] = inf ? inf_str[i-1] : ind_str[i-1]; decimal_point[i] = str[i-1];
} }
if(i!=sizeof(inf_str) && i!=1) if(i!=size && i!=1)
decimal_point[i-1]++; decimal_point[i-1]++;
} }
} }