Skip to content

W
wine-winehq
Commit 9fb5f9e9 authored by Daniel Lehman's avatar Daniel Lehman Committed by Alexandre Julliard
Browse files
Options

msvcp: Sync num_put<> put_double.

parent 9416918a
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 12 deletions
dlls/msvcp100/locale.c
View file @ 9fb5f9e9
...@@ -6071,6 +6071,11 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this, ...@@ -6071,6 +6071,11 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this,
return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v); return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v);
} }
static inline streamsize get_precision(const ios_base *base)
{
return base->prec <= 0 && !(base->fmtfl & FMTFLAG_fixed) ? 6 : base->prec;
}
/* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DN@Z */ /* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DN@Z */
/* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AEAVios_base@2@DN@Z */ /* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AEAVios_base@2@DN@Z */
/* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DO@Z */ /* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DO@Z */
...@@ -6088,11 +6093,13 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t ...@@ -6088,11 +6093,13 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t
char *tmp; char *tmp;
char fmt[8]; /* strlen("%+#.*lg")+1 */ char fmt[8]; /* strlen("%+#.*lg")+1 */
int size; int size;
streamsize prec;
TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v);
num_put_char__Ffmt(this, fmt, '\0', base->fmtfl); num_put_char__Ffmt(this, fmt, '\0', base->fmtfl);
size = _scprintf(fmt, base->prec, v); prec = get_precision(base);
size = _scprintf(fmt, prec, v);
/* TODO: don't use dynamic allocation */ /* TODO: don't use dynamic allocation */
tmp = MSVCRT_operator_new(size*2); tmp = MSVCRT_operator_new(size*2);
...@@ -6100,7 +6107,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t ...@@ -6100,7 +6107,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
} }
num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v)); num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v));
MSVCRT_operator_delete(tmp); MSVCRT_operator_delete(tmp);
return ret; return ret;
} }
...@@ -6907,11 +6914,13 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put ...@@ -6907,11 +6914,13 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put
char *tmp; char *tmp;
char fmt[8]; /* strlen("%+#.*lg")+1 */ char fmt[8]; /* strlen("%+#.*lg")+1 */
int size; int size;
streamsize prec;
TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v);
num_put_wchar__Ffmt(this, fmt, '\0', base->fmtfl); num_put_wchar__Ffmt(this, fmt, '\0', base->fmtfl);
size = _scprintf(fmt, base->prec, v); prec = get_precision(base);
size = _scprintf(fmt, prec, v);
/* TODO: don't use dynamic allocation */ /* TODO: don't use dynamic allocation */
tmp = MSVCRT_operator_new(size*2); tmp = MSVCRT_operator_new(size*2);
...@@ -6919,7 +6928,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put ...@@ -6919,7 +6928,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
} }
num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v), num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v),
numpunct_short_use_facet(base->loc)); numpunct_short_use_facet(base->loc));
MSVCRT_operator_delete(tmp); MSVCRT_operator_delete(tmp);
return ret; return ret;
......
dlls/msvcp60/locale.c
View file @ 9fb5f9e9
...@@ -6136,6 +6136,11 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this, ...@@ -6136,6 +6136,11 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this,
return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v); return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v);
} }
static inline streamsize get_precision(const ios_base *base)
{
return base->prec <= 0 && !(base->fmtfl & FMTFLAG_fixed) ? 6 : base->prec;
}
/* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DN@Z */ /* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DN@Z */
/* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AEAVios_base@2@DN@Z */ /* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AEAVios_base@2@DN@Z */
/* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DO@Z */ /* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DO@Z */
...@@ -6153,11 +6158,13 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t ...@@ -6153,11 +6158,13 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t
char *tmp; char *tmp;
char fmt[8]; /* strlen("%+#.*lg")+1 */ char fmt[8]; /* strlen("%+#.*lg")+1 */
int size; int size;
streamsize prec;
TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v);
num_put_char__Ffmt(this, fmt, '\0', base->fmtfl); num_put_char__Ffmt(this, fmt, '\0', base->fmtfl);
size = _scprintf(fmt, base->prec, v); prec = get_precision(base);
size = _scprintf(fmt, prec, v);
/* TODO: don't use dynamic allocation */ /* TODO: don't use dynamic allocation */
tmp = MSVCRT_operator_new(size*2); tmp = MSVCRT_operator_new(size*2);
...@@ -6165,7 +6172,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t ...@@ -6165,7 +6172,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
} }
num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v)); num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v));
MSVCRT_operator_delete(tmp); MSVCRT_operator_delete(tmp);
return ret; return ret;
} }
...@@ -6928,11 +6935,13 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put ...@@ -6928,11 +6935,13 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put
char *tmp; char *tmp;
char fmt[8]; /* strlen("%+#.*lg")+1 */ char fmt[8]; /* strlen("%+#.*lg")+1 */
int size; int size;
streamsize prec;
TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v);
num_put_wchar__Ffmt(this, fmt, '\0', base->fmtfl); num_put_wchar__Ffmt(this, fmt, '\0', base->fmtfl);
size = _scprintf(fmt, base->prec, v); prec = get_precision(base);
size = _scprintf(fmt, prec, v);
/* TODO: don't use dynamic allocation */ /* TODO: don't use dynamic allocation */
tmp = MSVCRT_operator_new(size*2); tmp = MSVCRT_operator_new(size*2);
...@@ -6940,7 +6949,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put ...@@ -6940,7 +6949,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
} }
num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v), num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v),
numpunct_short_use_facet(base->loc)); numpunct_short_use_facet(base->loc));
MSVCRT_operator_delete(tmp); MSVCRT_operator_delete(tmp);
return ret; return ret;
......
dlls/msvcp71/locale.c
View file @ 9fb5f9e9
...@@ -6465,6 +6465,11 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this, ...@@ -6465,6 +6465,11 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this,
return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v); return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v);
} }
static inline streamsize get_precision(const ios_base *base)
{
return base->prec <= 0 && !(base->fmtfl & FMTFLAG_fixed) ? 6 : base->prec;
}
/* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DN@Z */ /* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DN@Z */
/* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AEAVios_base@2@DN@Z */ /* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AEAVios_base@2@DN@Z */
/* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DO@Z */ /* ?do_put@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DO@Z */
...@@ -6482,11 +6487,13 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t ...@@ -6482,11 +6487,13 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t
char *tmp; char *tmp;
char fmt[8]; /* strlen("%+#.*lg")+1 */ char fmt[8]; /* strlen("%+#.*lg")+1 */
int size; int size;
streamsize prec;
TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v);
num_put_char__Ffmt(this, fmt, '\0', base->fmtfl); num_put_char__Ffmt(this, fmt, '\0', base->fmtfl);
size = _scprintf(fmt, base->prec, v); prec = get_precision(base);
size = _scprintf(fmt, prec, v);
/* TODO: don't use dynamic allocation */ /* TODO: don't use dynamic allocation */
tmp = MSVCRT_operator_new(size*2); tmp = MSVCRT_operator_new(size*2);
...@@ -6494,7 +6501,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t ...@@ -6494,7 +6501,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *t
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
} }
num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v)); num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v));
MSVCRT_operator_delete(tmp); MSVCRT_operator_delete(tmp);
return ret; return ret;
} }
...@@ -7301,11 +7308,13 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put ...@@ -7301,11 +7308,13 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put
char *tmp; char *tmp;
char fmt[8]; /* strlen("%+#.*lg")+1 */ char fmt[8]; /* strlen("%+#.*lg")+1 */
int size; int size;
streamsize prec;
TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v);
num_put_wchar__Ffmt(this, fmt, '\0', base->fmtfl); num_put_wchar__Ffmt(this, fmt, '\0', base->fmtfl);
size = _scprintf(fmt, base->prec, v); prec = get_precision(base);
size = _scprintf(fmt, prec, v);
/* TODO: don't use dynamic allocation */ /* TODO: don't use dynamic allocation */
tmp = MSVCRT_operator_new(size*2); tmp = MSVCRT_operator_new(size*2);
...@@ -7313,7 +7322,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put ...@@ -7313,7 +7322,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_double(const num_put
ERR("Out of memory\n"); ERR("Out of memory\n");
throw_exception(EXCEPTION_BAD_ALLOC, NULL); throw_exception(EXCEPTION_BAD_ALLOC, NULL);
} }
num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v), num_put__fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, prec, v),
numpunct_short_use_facet(base->loc)); numpunct_short_use_facet(base->loc));
MSVCRT_operator_delete(tmp); MSVCRT_operator_delete(tmp);
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment