niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

oleaut32: Handle exponent in VarBstrFromR[48] in non-English locales.

Browse source
This commit is contained in:
Daniel Lehman 2024-02-06 22:46:20 -08:00 • committed by Alexandre Julliard
parent 5ffed8830c
commit 834558245b
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/oleaut32/tests/vartype.c
View file

@ -4570,11 +4570,11 @@ static void test_VarBstrFromR4(void)
{ 1.0e14, L"1E+14" },
{ 999999999999999.0, L"1E+15" },
{ 1000000000000000.0, L"1E+15" },
{ 1200000000000000.0, L"1,2E+15", TRUE },
{ 1200000000000000.0, L"1,2E+15" },
{ 1.0e15, L"1E+15" },
{ 1.000e16, L"1E+16" },
{ 1.234e16, L"1,234E+16", TRUE },
{ 1.234e16, L"1,234E+16" },
{ M_PI, L"3,141593" },
{ 0.0, NULL }
@ -4710,11 +4710,11 @@ static void test_VarBstrFromR8(void)
{ 1.0e14, L"100000000000000" },
{ 999999999999999.0, L"999999999999999" },
{ 1000000000000000.0, L"1E+15" },
{ 1200000000000000.0, L"1,2E+15", TRUE },
{ 1200000000000000.0, L"1,2E+15" },
{ 1.0e15, L"1E+15" },
{ 1.000e16, L"1E+16" },
{ 1.234e16, L"1,234E+16", TRUE },
{ 1.234e16, L"1,234E+16" },
{ 0.0, NULL }
};

13
dlls/oleaut32/vartype.c
View file

@ -6497,7 +6497,7 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl
}
else
{
WCHAR *p;
WCHAR *p, *e;
WCHAR numbuff[256];
WCHAR empty[] = L"";
NUMBERFMTW minFormat;
@ -6512,9 +6512,11 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl
(WCHAR *)&minFormat.LeadingZero, sizeof(DWORD)/sizeof(WCHAR) );
/* count number of decimal digits in string */
p = wcschr( buff, '.' );
if (p) minFormat.NumDigits = lstrlenW(p + 1);
p = wcschr(buff, '.');
e = wcschr(p ? ++p : buff, 'E');
if (p) minFormat.NumDigits = e ? e - p : lstrlenW(p);
if (e) *e = '\0';
numbuff[0] = '\0';
if (!GetNumberFormatW(lcid, 0, buff, &minFormat, numbuff, ARRAY_SIZE(numbuff)))
{
@ -6523,6 +6525,11 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl
}
else
{
if (e)
{
*e = 'E';
wcscat(numbuff, e);
}
TRACE("created minimal NLS string %s\n", debugstr_w(numbuff));
bstrOut = SysAllocString(numbuff);
}